Control: tags 831587 pending Control: tags 986653 pending Uploaded an NMU to DELAYED/10 fixing these reproducible builds and cross-building issues:
diff -Nru stressapptest-1.0.6/debian/changelog stressapptest-1.0.6/debian/changelog --- stressapptest-1.0.6/debian/changelog 2022-09-04 14:42:31.000000000 -0700 +++ stressapptest-1.0.6/debian/changelog 2022-11-17 14:06:40.000000000 -0800 @@ -1,3 +1,15 @@ +stressapptest (1.0.6-2.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Bernhard M. Wiedemann ] + * Allow to override build date with SOURCE_DATE_EPOCH (Closes: #831587) + + [ Helmut Grohne ] + * Fix FTCBFS. (Closes: #986653) + + -- Vagrant Cascadian <vagr...@debian.org> Thu, 17 Nov 2022 14:06:40 -0800 + stressapptest (1.0.6-2.1) unstable; urgency=low * Non-maintainer upload. diff -Nru stressapptest-1.0.6/debian/patches/allow-to-override-build-date-with-source.patch stressapptest-1.0.6/debian/patches/allow-to-override-build-date-with-source.patch --- stressapptest-1.0.6/debian/patches/allow-to-override-build-date-with-source.patch 1969-12-31 16:00:00.000000000 -0800 +++ stressapptest-1.0.6/debian/patches/allow-to-override-build-date-with-source.patch 2022-11-17 14:06:40.000000000 -0800 @@ -0,0 +1,36 @@ +From: Bernhard M. Wiedemann <bwiedem...@suse.de> +Date: Sun, 9 Sep 2018 05:34:37 +0200 +X-Dgit-Generated: 1.0.6-2.2 5763ff92141056c712e2f63a5c1363090e2581aa +Subject: Allow to override build date with SOURCE_DATE_EPOCH + +(Closes: #831587) + +in order to make builds reproducible. +See https://reproducible-builds.org/ for why this is good +and https://reproducible-builds.org/specs/source-date-epoch/ +for the definition of this variable. +This date call works with all variants of date (GNU,BSD,Solaris). + +Also do not capture build user+host in this case +to allow to get the same build results anywhere and anytime. + +--- + +diff --git a/configure.ac b/configure.ac +index 603ba73..818d357 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,13 @@ timestamp=$(date) + AC_MSG_CHECKING([current timestamp]) + AC_MSG_RESULT([$timestamp]) + ++if test -n "$SOURCE_DATE_EPOCH" ++then ++ timestamp=$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u) ++ username=reproducible ++ hostname=reproducible ++fi ++ + AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP], + "$username @ $hostname on $timestamp", + [Timestamp when ./configure was executed]) diff -Nru stressapptest-1.0.6/debian/patches/fix-ftcbfs.-closes-986653.patch stressapptest-1.0.6/debian/patches/fix-ftcbfs.-closes-986653.patch --- stressapptest-1.0.6/debian/patches/fix-ftcbfs.-closes-986653.patch 1969-12-31 16:00:00.000000000 -0800 +++ stressapptest-1.0.6/debian/patches/fix-ftcbfs.-closes-986653.patch 2022-11-17 14:06:40.000000000 -0800 @@ -0,0 +1,41 @@ +From: Helmut Grohne <hel...@subdivi.de> +Date: Thu, 8 Apr 2021 20:38:30 +0200 +X-Dgit-Generated: 1.0.6-2.2 3b999e567fe8d9786f08825a389114ddf6e6cf15 +Subject: Fix FTCBFS. (Closes: #986653) + + +--- + +diff --git a/configure.ac b/configure.ac +index 818d357..82de856 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,26 +127,9 @@ AC_SEARCH_LIBS([io_setup], [aio]) + AC_CHECK_HEADERS([sys/shm.h]) + AC_SEARCH_LIBS([shm_open], [rt]) + +-AC_MSG_CHECKING(for pthread_barrier) +-AC_CACHE_VAL( +- ac_cv_func_pthread_barrier, +- AC_TRY_RUN( +- [ +- #include <pthread.h> +- int main(void) +- { +- pthread_barrier_t t; +- return 0; +- } +- ], +- ac_cv_func_pthread_barrier=yes, +- ac_cv_func_pthread_barrier=no +- ) +-) +-AC_MSG_RESULT($ac_cv_func_pthread_barrier) +-if test "$ac_cv_func_pthread_barrier" = "yes"; then ++AC_CHECK_TYPE([pthread_barrier_t],[ + AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.]) +-fi ++],[],[#include <pthread.h>]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff -Nru stressapptest-1.0.6/debian/patches/series stressapptest-1.0.6/debian/patches/series --- stressapptest-1.0.6/debian/patches/series 2022-09-04 14:42:31.000000000 -0700 +++ stressapptest-1.0.6/debian/patches/series 2022-11-17 14:06:40.000000000 -0800 @@ -2,3 +2,5 @@ support_i486_builds support_i586_builds gcc-12 +allow-to-override-build-date-with-source.patch +fix-ftcbfs.-closes-986653.patch The reproducible builds patch was pulled from upstream git, which was similar to the patch originally submitted. live well, vagrant
signature.asc
Description: PGP signature
