Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package procmeter for openSUSE:Factory checked in at 2023-07-13 17:17:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procmeter (Old) and /work/SRC/openSUSE:Factory/.procmeter.new.8922 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procmeter" Thu Jul 13 17:17:46 2023 rev:25 rq:1098391 version:3.6+svn415 Changes: -------- --- /work/SRC/openSUSE:Factory/procmeter/procmeter.changes 2022-02-11 23:12:20.643455223 +0100 +++ /work/SRC/openSUSE:Factory/.procmeter.new.8922/procmeter.changes 2023-07-13 17:17:49.380860396 +0200 @@ -1,0 +2,6 @@ +Wed Jul 12 08:58:23 UTC 2023 - Bernhard Wiedemann <[email protected]> + +- Add procmeter-avoid-build-race.patch to make + package build reproducible (boo#1102408) + +------------------------------------------------------------------- New: ---- procmeter-avoid-build-race.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procmeter.spec ++++++ --- /var/tmp/diff_new_pack.OnnLRW/_old 2023-07-13 17:17:50.484866911 +0200 +++ /var/tmp/diff_new_pack.OnnLRW/_new 2023-07-13 17:17:50.488866935 +0200 @@ -27,6 +27,8 @@ Source1: procmeter3.desktop # PATCH-FIX-UPSTREAM procmeter3-loff_t.patch Patch0: procmeter3-loff_t.patch +# PATCH-FIX-UPSTREAM boo#1102408 +Patch1: procmeter-avoid-build-race.patch BuildRequires: libsensors4-devel BuildRequires: update-desktop-files Provides: procmtr @@ -58,6 +60,7 @@ %prep %setup -q -n procmeter3-%{version} %patch0 -p1 +%patch1 -p1 %build make %{?_smp_mflags} INSTDIR=%{_prefix} CFLAGS="%{optflags}" ++++++ procmeter-avoid-build-race.patch ++++++ sent upstream via email fixes an instance of https://bugzilla.opensuse.org/show_bug.cgi?id=1102408 packages do not build reproducibly from race conditions commit 83df1ac1bfa2269284be6ffa648c4aca651ca848 Author: Bernhard M. Wiedemann <[email protected]> Date: Mon Jul 10 04:50:53 2023 +0200 Avoid race condition during build While working on reproducible builds for openSUSE, I found that our procmeter3-3.6+svn415 package sometimes was randomly missing one of its libsensors-*.so files when building with make -j4 This patch avoids the underlying race condition by using unique filenames for temporary files. See also https://github.com/bmwiedemann/theunreproduciblepackage/tree/master/race diff --git a/modules/check-no-libsensors.sh b/modules/check-no-libsensors.sh index 339382f..43945c4 100755 --- a/modules/check-no-libsensors.sh +++ b/modules/check-no-libsensors.sh @@ -2,20 +2,21 @@ CC=$1 CFLAGS=$2 +libsensorstest=libsensorstest-$$ -cat <<EOF > libsensors-test.c +cat <<EOF > $libsensorstest.c #include <sensors/sensors.h> #if ( (SENSORS_API_VERSION & 0xf00) != 0x400 ) && ( (SENSORS_API_VERSION & 0xf00) != 0x500 ) #error #endif EOF -$CC -c $CFLAGS libsensors-test.c -o libsensors-test.o 2> /dev/null +$CC -c $CFLAGS $libsensorstest.c -o $libsensorstest.o 2> /dev/null -rm libsensors-test.c +rm $libsensorstest.c -if [ -f libsensors-test.o ]; then - rm libsensors-test.o +if [ -f $libsensorstest.o ]; then + rm $libsensorstest.o exit 1 else echo "libsensors does not appear to be installed - skipping compilation."
