Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at Wed Jun 10 14:57:39 CEST 2009. -------- --- sysstat/sysstat.changes 2009-05-29 17:09:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysstat/sysstat.changes 2009-06-10 12:56:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 10 12:56:04 CEST 2009 - prusnak@suse.cz + +- merge some changes from package in server:monitoring project + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysstat-9.0.3-msg.diff sysstat-9.0.3-pagesize.diff sysstat-9.0.3-sa1sa2lock.diff sysstat-9.0.3-sysconfdir.diff New: ---- sysstat-8.0.4-msg.diff sysstat-8.0.4-pagesize.diff sysstat-8.0.4-sysconfdir.diff sysstat-8.1.6-sa1sa2lock.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.o26727/_old 2009-06-10 14:57:12.000000000 +0200 +++ /var/tmp/diff_new_pack.o26727/_new 2009-06-10 14:57:12.000000000 +0200 @@ -20,7 +20,7 @@ Name: sysstat Version: 9.0.3 -Release: 1 +Release: 2 PreReq: %insserv_prereq %fillup_prereq BuildRequires: findutils sed update-desktop-files Requires: procmail gettext @@ -32,10 +32,10 @@ Source1: isag.desktop Source2: sysstat.cron.suse Source3: sysstat.init.suse -Patch0: %{name}-%{version}-sa1sa2lock.diff -Patch1: %{name}-%{version}-msg.diff -Patch2: %{name}-%{version}-pagesize.diff -Patch3: %{name}-%{version}-sysconfdir.diff +Patch0: %{name}-8.1.6-sa1sa2lock.diff +Patch1: %{name}-8.0.4-msg.diff +Patch2: %{name}-8.0.4-pagesize.diff +Patch3: %{name}-8.0.4-sysconfdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -105,6 +105,7 @@ fi ln -s %{_sysconfdir}/init.d/boot.sysstat $RPM_BUILD_ROOT%{_sbindir}/rcsysstat %find_lang %{name} +install -d $RPM_BUILD_ROOT%{_localstatedir}/lock/sa %preun %{stop_on_removal boot.sysstat} @@ -134,7 +135,8 @@ %{_sbindir}/* %exclude %{_bindir}/isag %{_libdir}/sa -%{_localstatedir}/log/sa +%dir %{_localstatedir}/lock/sa +%dir %{_localstatedir}/log/sa %files isag %defattr(-,root,root) @@ -144,6 +146,8 @@ %{_datadir}/applications/isag* %changelog +* Wed Jun 10 2009 prusnak@suse.cz +- merge some changes from package in server:monitoring project * Fri May 29 2009 prusnak@suse.cz - updated to 9.0.3 * [Michael Blakeley]: Option -z added to iostat. This option ++++++ sysstat-9.0.3-msg.diff -> sysstat-8.0.4-msg.diff ++++++ ++++++ sysstat-9.0.3-pagesize.diff -> sysstat-8.0.4-pagesize.diff ++++++ ++++++ sysstat-9.0.3-sysconfdir.diff -> sysstat-8.0.4-sysconfdir.diff ++++++ ++++++ sysstat-9.0.3-sa1sa2lock.diff -> sysstat-8.1.6-sa1sa2lock.diff ++++++ --- sysstat/sysstat-9.0.3-sa1sa2lock.diff 2009-05-29 17:09:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysstat/sysstat-8.1.6-sa1sa2lock.diff 2009-06-10 12:56:53.000000000 +0200 @@ -1,17 +1,18 @@ --- sa1.in +++ sa1.in -@@ -29,17 +29,23 @@ +@@ -29,17 +29,24 @@ rm -f ${CURRENTFILE} ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE} fi +set -e umask 0022 ENDIR=@SA_LIB_DIR@ -+LOCKFILE=/var/log/sa/sadc.LOCK cd ${ENDIR} + -+lockfile -r2 -30 $LOCKFILE 2>/dev/null -+trap "rm -f $LOCKFILE" EXIT ++LOCKFILE=/var/lock/sa/sadc.LOCK ++mkdir -p /var/lock/sa ++lockfile -r2 -30 "$LOCKFILE" 2>/dev/null ++trap "/bin/rm -f $LOCKFILE" EXIT + [ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n if [ $# = 0 ] && [ "${BOOT}" = "n" ] @@ -28,19 +29,20 @@ --- sa2.in +++ sa2.in -@@ -48,6 +48,16 @@ +@@ -48,6 +48,17 @@ DFILE=${CURRENTDIR}/${CURRENTFILE} [ -f "$DFILE" ] || exit 0 cd ${ENDIR} + -+LOCKFILE=/var/log/sa/sadc.LOCK ++LOCKFILE=/var/lock/sa/sadc.LOCK ++mkdir -p /var/lock/sa +if ! lockfile -r6 -600 $LOCKFILE 2>/dev/null; then + if test `find $LOCKFILE -mmin +180 2>/dev/null`; then + rm -f $LOCKFILE + logger -p cron.alert "$0: detected an old lockfile "$LOCKFILE"." + fi +fi -+trap "rm -f $LOCKFILE" EXIT ++trap "/bin/rm -f $LOCKFILE" EXIT + [ -L ${RPT} ] && rm -f ${RPT} ${ENDIR}/sar $* -f ${DFILE} > ${RPT} ++++++ sysstat.init.suse ++++++ --- /var/tmp/diff_new_pack.o26727/_old 2009-06-10 14:57:13.000000000 +0200 +++ /var/tmp/diff_new_pack.o26727/_new 2009-06-10 14:57:13.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (c) 2000-2008 SuSE GmbH Nuernberg, Germany. +# Copyright (c) 2000-2009 SuSE GmbH Nuernberg, Germany. # # /etc/init.d/boot.sysstat # @@ -10,37 +10,14 @@ # Required-Stop: boot.rootfsck boot.cleanup # Should-Stop: $local_fs $remote_fs # Default-Start: B -# Default-Stop: +# Default-Stop: $null # Short-Description: Write information about system start to sysstat log # Description: Write information about system start to sysstat log ### END INIT INFO -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status - . /etc/rc.status rc_reset -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - misc error -# 2 - invalid or excess args -# 3 - unimplemented feature (e.g. reload) -# 4 - insufficient privilege -# 5 - program not installed -# 6 - program not configured -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. - case "$1" in start) echo "Running sadc" @@ -50,7 +27,7 @@ stop) echo "Removing sysstat's crontab" - rm -f /etc/cron.d/sysstat + /bin/rm -f /etc/cron.d/sysstat rc_status -v ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org