Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2024-08-22 18:10:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat" Thu Aug 22 18:10:34 2024 rev:109 rq:1195173 version:12.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2024-06-12 15:37:22.332038545 +0200 +++ /work/SRC/openSUSE:Factory/.sysstat.new.2698/sysstat.changes 2024-08-22 18:10:46.891450589 +0200 @@ -1,0 +2,7 @@ +Thu Aug 8 06:07:30 UTC 2024 - Johannes Segitz <[email protected]> + +- Updated sysstat-8.1.6-sa1sa2lock.diff to use flock to create the + lockfile. Using lockfile would require additional SELinux permissions. + Require util-linux instead of procmail for this (bsc#1228246) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.OcYQRO/_old 2024-08-22 18:10:47.611480492 +0200 +++ /var/tmp/diff_new_pack.OcYQRO/_new 2024-08-22 18:10:47.615480658 +0200 @@ -42,7 +42,7 @@ BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files -Requires: procmail +Requires: util-linux Requires: xz %{?systemd_ordering} %ifnarch s390 s390x ++++++ sysstat-8.1.6-sa1sa2lock.diff ++++++ --- /var/tmp/diff_new_pack.OcYQRO/_old 2024-08-22 18:10:47.655482320 +0200 +++ /var/tmp/diff_new_pack.OcYQRO/_new 2024-08-22 18:10:47.659482486 +0200 @@ -2,7 +2,7 @@ =================================================================== --- sysstat-12.7.5.orig/sa1.in +++ sysstat-12.7.5/sa1.in -@@ -31,8 +31,14 @@ then +@@ -31,8 +31,16 @@ then LONG_NAME=y fi @@ -11,13 +11,15 @@ cd ${ENDIR} +LOCKFILE=/var/run/sysstat/sadc.LOCK +mkdir -p /var/run/sysstat -+lockfile -r2 -30 "$LOCKFILE" 2>/dev/null ++touch "$LOCKFILE" ++exec 4<>"$LOCKFILE" ++flock -w 60 4 +trap "/bin/rm -f $LOCKFILE" EXIT + [ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n [ "$1" = "--sleep" ] && shift && SLEEP=y || SLEEP=n -@@ -51,13 +57,13 @@ fi +@@ -51,13 +59,13 @@ fi if [ "${SLEEP}" = "y" ] then @@ -38,14 +40,16 @@ =================================================================== --- sysstat-12.7.5.orig/sa2.in +++ sysstat-12.7.5/sa2.in -@@ -59,6 +59,17 @@ fi +@@ -59,6 +59,19 @@ fi [ -f "${DFILE}" ] || exit 0 cd ${ENDIR} + +LOCKFILE=/var/run/sysstat/sadc.LOCK +mkdir -p /var/run/sysstat -+if ! lockfile -r6 -600 $LOCKFILE 2>/dev/null; then ++touch "$LOCKFILE" ++exec 4<>"$LOCKFILE" ++if ! flock -w 3600 4; then + if test `find $LOCKFILE -mmin +180 2>/dev/null`; then + rm -f $LOCKFILE + logger -p cron.alert "$0: detected an old lockfile \"$LOCKFILE\"."
