Bug#1061300: lcm: Update to version 1.5.0
On 2024-01-22, Jose Luis Rivero wrote: > lcm upstream released the version 1.5.0 on April 2023. It would be great to > have it packaged and available on Debian Sid. > > I canhelp with code changes if the maintainer or the team are willing to > sponsor and review them. Well the "team" is the Debian QA Group, which effectively means it needs an actual maintainer: https://bugs.debian.org/965945 On the positive side, any Debian Developer can make changes to the package, so your pool of potential sponsors is quite large! If you want to prepare an upload for someone to sponsor, this has some helpful information and infrastructure: https://mentors.debian.net/ live well, vagrant signature.asc Description: PGP signature
Bug#1035375: mtools: interprets SOURCE_DATE_EPOCH in system timezone instead of UTC
On 2023-05-02, Chris Lamb wrote: >> I came across timestamp differences in FAT filesystem images while >> trying to build debian-installer with debrepro (among many other >> things), and tracked it down to mmd/mcopy calls. Here's a short reproducer: > > Ah, interesting! And your reproducer is extremely helpful, and > I've managed to put together a proof-of-concept patch: > > --- a/directory.c > +++ b/directory.c > @@ -104,7 +104,7 @@ struct directory *mk_entry(const dos_name_t *dn, > unsigned char attr, > uint8_t hour, min_hi, min_low, sec; > uint8_t year, month_hi, month_low, day; > > - now = localtime(); > + now = gmtime(); > dosnameToDirentry(dn, ndir); > ndir->attr = attr; > ndir->ctime_ms = 0; > -- > 2.40.1 > > I've gone ahead and forwarded this to the mtools mailing list here: > > https://lists.gnu.org/archive/html/info-mtools/2023-05/msg0.html Did that get a response from upstream? Seems like a simple patch with limited chance of introducing problems... maybe a slightly more complicated veresion that only does this when SOURCE_DATE_EPOCH is set. Maybe it could be applied to the debian mtools package to at least give it some real-world testing? :) live well, vagrant signature.asc Description: PGP signature
Bug#1024286: lcm: reproducible-builds: Embedded build path and usrmerge paths in Makefile
Control: notfixed 1024286 1.3.1+repack1-6
On 2022-11-16, Vagrant Cascadian wrote:
> The build path and binary paths are embedded in
> /usr/share/doc/lcm-doc/examples/Makefile:
>
>
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/lcm.html
>
> ACLOCAL·=·${SHELL}·'/build/1st/lcm-1.3.1+repack1/missing'·aclocal-1.16
> vs.
> ACLOCAL·=·${SHELL}·'/build/2/lcm-1.3.1+repack1/2nd/missing'·aclocal-1.16
>
> EGREP·=·/bin/grep·-E
> vs.
> EGREP·=·/usr/bin/grep·-E
>
> The attached patch fixes this by removing the example Makefile, which
> would have to be regenerated anyways to match the system to run it on.
... but the switch to debhelper-compat 13 moved the location of the
shipped Makefile, and was not actually removed in debian/rules... fixed
upload incoming...
live well,
vagrant
signature.asc
Description: PGP signature
Bug#1026049: tracker.debian.org: package information out of date on numerous packages
Package: tracker.debian.org Severity: normal X-Debbugs-Cc: Vagrant Cascadian I've recently noticed numerous package page information is out of date for well over 24+ hours, for example: https://tracker.debian.org/pkg/guix Shows an upload of 1.4.0~rc2-1 to unstable on 2022-12-11 in the "news" section, but "versions" only lists 1.3.0-5 for unstable. Sometimes this happens and I'd just sleep on it and it sorts itself out by morning, but I've done that two nights in a row to no effect. :) Similarly: https://tracker.debian.org/pkg/guile-gcrypt https://tracker.debian.org/pkg/guile-json https://tracker.debian.org/pkg/guile-ssh "news" lists it as having migrated to testing, "versions" does not show it in testing, and "testing migrations" lists it as 3 of 5 days old. And for good measure: https://tracker.debian.org/pkg/u-boot-menu Has a handful of discrepancies, e.g. "news" sees updates, the rest of tracker does not reflect the changes... I have definitely come to rely on the hugely useful tracker.debian.org service, so a correspondingly huge thanks for maintaining it! live well, vagrant signature.asc Description: PGP signature
Bug#941296: tuxcmd-modules FTCBFS: uses build architecture build tools
Control: found 941296 0.6.70+ds-5.1 On 2022-11-23, Chris Lamb wrote: >> This hasn't yet landed in the archive, was it actually uploaded to >> DELAYED/3? > > Somewhat unclear. I am pretty sure it was uploaded as I can find an > .upload file for it: > > $ cat tuxcmd-modules_0.6.70+ds-5.1_amd64.ssh-upload.upload > Successfully uploaded tuxcmd-modules_0.6.70+ds-5.1.dsc to > ssh.upload.debian.org for ssh-upload. ... > Successfully uploaded tuxcmd-modules_0.6.70+ds-5.1_amd64.changes to > ssh.upload.debian.org for ssh-upload. > >> It could have been uploaded to DELAYED/0 (e.g. without delay) as a QA >> upload rather than as an NMU... > > Oh sure, but 3 days delay easily allows issues to be caught... > > However, in lieu of working out what has happened here, I'll re-upload > now without any DELAYED value. Thanks. :) Hrm. Seems like the original version without the cross-building patches are what actually landed in sid today... live well, vagrant signature.asc Description: PGP signature
Bug#1011500: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
On 2022-11-18, Chris Lamb wrote: > I've just uploaded an updated version of tuxcmd-modules 0.6.70+ds-5.1 > to DELAYED/3. This variant of the upload actually includes the fix for > #941296 which was missed when preparing the upload. This hasn't yet landed in the archive, was it actually uploaded to DELAYED/3? It could have been uploaded to DELAYED/0 (e.g. without delay) as a QA upload rather than as an NMU... > tuxcmd-modules (0.6.70+ds-5.1) unstable; urgency=medium > . > * Non-maintainer upload. > * Apply a patch by Vagrant Cascadian to ensure that tuxcmd-modules does > not > embed build paths in various binaries. (Closes: #1011500) > * Apply a patch by Helmut Grohne to make it possible to cross-build > tuxcmd-modules. (Closes: #941296) live well, vagrant signature.asc Description: PGP signature
Bug#1024286: lcm: reproducible-builds: Embedded build path and usrmerge paths in Makefile
Source: lcm
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath usrmerge
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path and binary paths are embedded in
/usr/share/doc/lcm-doc/examples/Makefile:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/lcm.html
ACLOCAL·=·${SHELL}·'/build/1st/lcm-1.3.1+repack1/missing'·aclocal-1.16
vs.
ACLOCAL·=·${SHELL}·'/build/2/lcm-1.3.1+repack1/2nd/missing'·aclocal-1.16
EGREP·=·/bin/grep·-E
vs.
EGREP·=·/usr/bin/grep·-E
The attached patch fixes this by removing the example Makefile, which
would have to be regenerated anyways to match the system to run it on.
If removing the example Makefile is not viable, it might be possible to
sanitize the build paths, and all relevent arguments to configure
(e.g. EGREP='/bin/grep -e') to use the specified paths.
According to my local tests, With this patch applied lcm should build
reproducibly on tests.reproducible-builds.org!
Thanks for maintaining lcm!
live well,
vagrant
From 65bc199c9a7bdb9f8a7fde7dc3aad441105394cf Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Thu, 17 Nov 2022 00:25:41 +
Subject: [PATCH] debian/rules: Remove example Makefile that embedded build
paths and binary paths.
---
debian/rules | 6 ++
1 file changed, 6 insertions(+)
diff --git a/debian/rules b/debian/rules
index f29f30d..c9efc4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,12 @@ override_dh_auto_install:
# I build the docs after the 'make install' because the python docs require an installed lcm
cd docs; ./build-docs.sh
+override_dh_installdocs:
+ dh_installdocs
+ # Remove example makefile which contains build paths and
+ # binary paths
+ rm -vf debian/liblcm-doc/usr/share/doc/liblcm-doc/examples/Makefile
+
override_dh_auto_clean:
dh_auto_clean
rm -rf docs/html
--
2.38.1
signature.asc
Description: PGP signature
Bug#1024284: gentoo: reproducible-builds: home directory embedded in /usr/bin/gentoo
Source: gentoo Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: environment X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The home directory of the build user is embedded in /usr/bin/gentoo: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gentoo.html The attached patch to src/Makefile.am fixes this by adding setting the configuration option to a fixed value. According to my local tests, with this patch applied, gentoo should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining gentoo! live well, vagrant From 2445243834ff430f55ed0e6bfa2abb4846a2f9dc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Nov 2022 23:33:50 + Subject: [PATCH] src/Makefile.am: Do not embed the build user's home directory --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index eb0194c..07bd08b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -203,7 +203,7 @@ localedir=@localedir@ AM_CFLAGS=@GENTOO_CFLAGS@ @GTK_CFLAGS@ -I../widgets \ -DPATH_CFG=\"$(sysconfdir)\" \ - -DPATH_GRC=\"$$HOME/\" \ + -DPATH_GRC=\"/nonexistent/\" \ -DPATH_ICN=\"$(datadir)/gentoo/icons\"\ -DLOCALEDIR=\"$(localedir)\" -- 2.38.1 signature.asc Description: PGP signature
Bug#1024283: ipsvd: reproducible-builds: buildid differences in various binaries
Source: ipsvd Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid differs when built from a different path for various binaries in /usr/bin: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/ipsvd.html The attached patch to debian/rules fixes this by adding -ffile-prefix-map to CFLAGS. Switching to dh and a recent debhelper compat level might also solve this problem. According to my local tests, with this patch applied, ipsvd should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining ipsvd! live well, vagrant From 7310c68df7db93c4b837e18e70cebfde1a60f9ae Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Nov 2022 23:30:03 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f3d69a5..97ec522 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP =: nostrip endif -CFLAGS =-g -O2 -Wall +CFLAGS =-g -O2 -Wall -ffile-prefix-map=$(CURDIR)=. LDFLAGS =-Os CC =gcc ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) -- 2.38.1 signature.asc Description: PGP signature
Bug#1024282: twoftpd: reproducible-builds: buildid differences in various binaries
Source: twoftpd Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid differs when built from a different path: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/twoftpd.html The attached patch to debian/rules fixes this by adding -ffile-prefix-map to CFLAGS. Switching to dh and a recent debhelper compat level might also solve this problem. According to my local tests, with this patch applied, twoftpd should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining twoftpd! live well, vagrant From cecd1ef2c4696e009cb18ae2ad3661169cc34dea Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Nov 2022 23:15:16 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4342317..4bc21ee 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP =: nostrip endif -CFLAGS =-g -O2 -Wall +CFLAGS =-g -O2 -Wall -ffile-prefix-map=$(CURDIR)=. LDFLAGS = CC =gcc BGLIBS =/usr/lib/bglibs -- 2.38.1 signature.asc Description: PGP signature
Bug#1024279: tolua++: reproducible-builds: build path embedded in tolua++5.1
Source: tolua++ Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/tolua++5.1: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tolua++.html /build/1st/tolua++-1.0.93/src/bin/tolua.c:84 vs. /build/2/tolua++-1.0.93/2nd/src/bin/tolua.c:84 The attached patch to debian/rules fixes this by adding -ffile-prefix-map to the CCFLAGS included in debian/custom.py. According to my local tests, with this patch applied tolua++ should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining tolua++! live well, vagrant From d911d743084b67294d20379c4f9375f75dcac9f1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Nov 2022 22:52:46 + Subject: [PATCH] debian/rules: Avoid embedding build paths by adding -ffile-prefix-map to CCFLAGS. --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 1f3c3d5..8552863 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,8 @@ override_dh_clean: override_dh_auto_configure: cp $(CURDIR)/debian/custom.py $(CURDIR) + # Add -ffile-prefix-map to CCFLAGS to avoid embedding build paths. + sed -i -e "s,CCFLAGS = .,CCFLAGS =['-ffile-prefix-map=$(CURDIR)=.'\,,g" $(CURDIR)/custom.py scons prefix=$(CURDIR)/debian/libtolua++5.1-dev/usr configure override_dh_auto_build: -- 2.38.1 signature.asc Description: PGP signature
Bug#1024126: hunt: reproducible-builds: build path embedded in various binaries
Source: hunt Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/hunt.html /usr/sbin/hunt /build/1st/hunt-1.5/main.c:461 vs. /build/2/hunt-1.5/2nd/main.c:461 The attached patch to upstream Makefiles fixes this by adding the -ffile-prefix-map argument to CFLAGS, which avoids embedding the full build path. According to my local tests, with this patch applied hunt should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining hunt! live well, vagrant From 928b51d50a0d756ef3ca77a42c6e9df5b8a8341e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 15 Nov 2022 02:34:43 + Subject: [PATCH] Makefile, tpserv/Makefile: Add -ffile-prefix-map to CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- Makefile| 2 +- tpserv/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1631984..98b5af1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Wall -O2 -g -D_REENTRANT -std=gnu89 +CFLAGS=-Wall -O2 -g -D_REENTRANT -std=gnu89 -ffile-prefix-map=$(CURDIR)=. #CFLAGS+=-DSYNC_FAST #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR diff --git a/tpserv/Makefile b/tpserv/Makefile index a24cf4c..751be46 100644 --- a/tpserv/Makefile +++ b/tpserv/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Wall -O2 -g +CFLAGS=-Wall -O2 -g -ffile-prefix-map=$(CURDIR)=. all: tpserv -- 2.38.1 signature.asc Description: PGP signature
Bug#1024125: ucspi-proxy: reproducible-builds: build path, timestamps and umask issues
Source: ucspi-proxy Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath timestamps umask X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildids of various binaries differred when built in different build paths, timestamps were embedded in manpages, and the mode of several directories was dependent on the umask of the build environment: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/ucspi-proxy.html /usr/share/man/man1/ucspi-proxy-http-xlate.1.gz gzip·compressed·data,·was·"ucspi-proxy-http-xlate.1",·last·modified:·Sun·Nov·13·05:42:22·2022,·max·compression,·from·Unix vs. gzip·compressed·data,·was·"ucspi-proxy-http-xlate.1",·last·modified:·Sat·Dec·16·12:06:16·2023,·max·compression,·from·Unix drwxr-xr-x···0·root·(0)·root·(0)0·2022-11-12·10:57:15.00·./usr/bin/ vs. drwxrwxr-x···0·root·(0)·root·(0)0·2022-11-12·10:57:15.00·./usr/bin/ The attached patches to debian/rules fix this by adding the -ffile-prefix-map argument to CFLAGS which avoids embedding build paths, passing -n to gzip to avoid embedding timestamps in the gzip headers of created manpages, and setting a consistent mode on several directories created by "make install". Preferably, many of these issues would likely be fixed by converting to dh and a recent debhelper-compat version... According to my local tests, with these patches applied ucspi-proxy should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining ucspi-proxy! live well, vagrant From ecb57971f4d5fc958cc8afa31db8932fb2fac62e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 15 Nov 2022 02:08:38 + Subject: [PATCH 1/3] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a6a8a21..747c054 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f CC =gcc -CFLAGS =-W -Wall -Wshadow -O2 -g +CFLAGS =-W -Wall -Wshadow -O2 -g -ffile-prefix-map=$(CURDIR)=. STRIP =strip BGINCS =/usr/include/bglibs -- 2.38.1 From 13c5e3b2c89431f80934d3ce4a35d2b18432bb8b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 15 Nov 2022 02:09:51 + Subject: [PATCH 2/3] debian/rules: Pass "-n" argument to gzip to avoid embedding timestamp in manpages. https://tests.reproducible-builds.org/debian/issues/timestamps_in_gzip_headers_issue.html --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 747c054..f57275f 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,7 @@ install: deb-checkdir deb-checkuid build-stamp rm -rf '$(DIR)' $(MAKE) install install_prefix='$(DIR)' $(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/ucspi-proxy* - gzip -9 '$(DIR)'/usr/share/man/man1/*.1 + gzip -9n '$(DIR)'/usr/share/man/man1/*.1 test -r changelog || ln -s ChangeLog changelog binary-indep: -- 2.38.1 From 1f3f8a61324623784e9ada73786b14872c770510 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 15 Nov 2022 02:12:55 + Subject: [PATCH 3/3] debian/rules: Set permissions on several directories before building package, to avoid differences due to build environment umask. https://tests.reproducible-builds.org/debian/issues/different_due_to_umask_issue.html --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index f57275f..e4dd446 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,7 @@ install: deb-checkdir deb-checkuid build-stamp $(MAKE) install install_prefix='$(DIR)' $(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/ucspi-proxy* gzip -9n '$(DIR)'/usr/share/man/man1/*.1 + chmod u=rwx,og=rx '$(DIR)' '$(DIR)/usr' '$(DIR)/usr/bin' '$(DIR)/usr/share' '$(DIR)/usr/share/man' test -r changelog || ln -s ChangeLog changelog binary-indep: -- 2.38.1 signature.asc Description: PGP signature
Bug#1024007: haskell98-report: reproducible builds: timestamp embedded in .ps files
Source: haskell98-report Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build time was embedded in several .ps files: https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/haskell98-report.html /usr/share/doc/haskell98-report/ffi.ps.gz %DVIPSSource:··TeX·output·2023.12.08:1504 vs. %DVIPSSource:··TeX·output·2022.11.06:1057 The attached patch to debian/rules fixes this by setting the FORCE_SOURCE_DATE environment variable, which ensures that texlive respects SOURCE_DATE_EPOCH to set the timestamp. According to my local tests, with this patch applied, haskell98-report should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining haskell98-report! live well, vagrant From c5f0a7284e26e38663fb9862d976fb10a9949fd1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 13 Nov 2022 18:18:44 + Subject: [PATCH] debian/rules: Set FORCE_SOURCE_DATE for reproducible builds. https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_ps_generated_by_dvips_issue.html --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index a1c1a5c..0744c4e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,8 @@ #!/usr/bin/make -f + +# Ensure texlive respects SOURCE_DATE_EPOCH for reproducible builds +export FORCE_SOURCE_DATE=1 + %: dh $@ -- 2.38.1 signature.asc Description: PGP signature
Bug#1023960: libcgicc: reproducible-builds: build path embedded in /usr/bin/cgicc-config
Source: libcgicc Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/cgicc-config: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libcgicc.html cxxflags="-Wall·-W·-pedantic·-g·-O2·-ffile-prefix-map=/build/1st/libcgicc-3.2.19=. ... vs. cxxflags="-Wall·-W·-pedantic·-g·-O2·-ffile-prefix-map=/build/2/libcgicc-3.2.19/2nd=. ... The attached patch to debian/rules fixes this by updating the dh_auto_install override to strip the recorded -ffile-prefix-map compiler flag from "cgicc-config", as this embeds the build path (it previously already also stripped the related -fdebug-prefix-map argument). According to my local tests, with this patch applied libcgicc should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining libcgicc! live well, vagrant From 1b023b3643959f914dd0d307dfb1c0a374fdb9fe Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 13 Nov 2022 08:01:54 + Subject: [PATCH] debian/rules: Strip -ffile-prefix-map from cgicc-config too. There was already support stripping -fdebug-prefix-map, extend to also support -ffile-prefix-map. --- debian/rules | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 43f37e7..d176345 100755 --- a/debian/rules +++ b/debian/rules @@ -25,8 +25,10 @@ override_dh_auto_install: dh_auto_install # work around doxygen bug - embeds copy of jquery unnecessarily rm -f $(CURDIR)/debian/tmp/usr/share/doc/libcgicc-doc/html/jquery.js - # Remove the debug-prefix-map compiler option, as it conflicts with mutli-arch - sed -i -e 's/ *-fdebug-prefix-map=[^ "]*//' $(CURDIR)/debian/tmp/usr/bin/cgicc-config + # Remove the debug-prefix-map and file-prefix-map compiler + # options, as they conflict with mutli-arch and breaks + # reproducible builds + sed -i -e 's/ *-fdebug-prefix-map=[^ "]*//' -e 's/ *-ffile-prefix-map=[^ "]*//' $(CURDIR)/debian/tmp/usr/bin/cgicc-config override_dh_installexamples: dh_installexamples -XMakefile -- 2.38.1 signature.asc Description: PGP signature
Bug#1023957: gerstensaft: reproducible-builds: buildid differences in /usr/bin/beer
Source: gerstensaft Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid for /usr/bin/beer varies when built from a different path: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gerstensaft.html The attached patch to src/Makefile fixes this by adding -ffile-prefix-map to CFLAGS. According to my local tests, with this patch applied, gerstensaft should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining gerstensaft! live well, vagrant From 9d2ed6cb070220ced710c6453dfae9563082e9ef Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 13 Nov 2022 07:46:46 + Subject: [PATCH] src/Makefile: Add -ffile-prefix-map to CFLAGS to avoid embedding the build path. https://reproducible-builds.org/docs/build-path/ --- src/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile b/src/Makefile index d81003e..ce6cc41 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,6 +23,7 @@ CC = gcc CFLAGS=-g -Wall \ -DG_DISABLE_DEPRECATED \ + -ffile-prefix-map=$(CURDIR)=. GTK_CFLAGS=$(shell pkg-config gtk+-2.0 --cflags) -- 2.38.1 signature.asc Description: PGP signature
Bug#1023956: fl-cow: reproducible-builds: build path embedded in libflcow.so
Source: fl-cow Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/fl-cow/libflcow.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/fl-cow.html /build/1st/fl-cow-0.6/fl-cow/fl-cow-config.h:1 vs. /build/2/fl-cow-0.6/2nd/fl-cow/fl-cow-config.h:1 The attached patch to debian/rules fixes this by passing the default buildflags, which include -ffile-prefix-map to avoid embedding the absolute build path in the binaries. Alternately or even preferably, updating to dh and a recent debhelper-compat version might fix this as well as other issues. According to my local tests, with this patch applied fl-cow should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining fl-cow! live well, vagrant From f0bff726ef7df0062d79fccf537f38b96856d94f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 13 Nov 2022 07:28:02 + Subject: [PATCH] debian/rules: Pass default CFLAGS to configure. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 831bf87..559606f 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ clean: configure-stamp: dh_testdir autoreconf -fi - ./configure --prefix=/usr --disable-static --libdir=/usr/lib/fl-cow + ./configure --prefix=/usr --disable-static --libdir=/usr/lib/fl-cow CFLAGS=$(dpkg-buildflags --get CFLAGS) touch configure-stamp configure: configure-stamp -- 2.38.1 signature.asc Description: PGP signature
Bug#1021509: xxkb: reproducible-builds: build path embedded in /usr/bin/xxkb
Source: xxkb Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/xxkb: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xxkb.html /build/1st/xxkb-1.11.1/xxkb.c:73 vs. /build/2/xxkb-1.11.1/2nd/xxkb.c:73 The attached patch to debian/rules fixes this by adding a dh_auto_build override that passes the default CFLAGS as CCOPTIONS. According to my local tests, with this patch applied, xxkb should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining xxkb! live well, vagrant From 0c91003ba8b5707f352faffd12b7cd6b2bae1122 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 19:48:15 + Subject: [PATCH] debian/rules: Add dh_auto_build override passing default CFLAGS as CCOPTIONS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index d76fbcc..8fb8ca3 100755 --- a/debian/rules +++ b/debian/rules @@ -14,5 +14,8 @@ override_dh_auto_install: mv debian/tmp/usr/share/man/man1/xxkb.1x \ debian/tmp/usr/share/man/man1/xxkb.1 +override_dh_auto_build: + dh_auto_build -- CCOPTIONS="$(CFLAGS)" + override_dh_installchangelogs: dh_installchangelogs CHANGES.koi8 -- 2.37.2 signature.asc Description: PGP signature
Bug#1021498: tcm: reproducible-builds: build path embedded in /usr/bin/tcm
Source: tcm Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/tcm: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tcm.html /build/1st/tcm-2.20+TSQD/src/ed/helper.c:31·(discriminator·2) vs. /build/2/tcm-2.20+TSQD/2nd/src/ed/helper.c:31·(discriminator·2) The attached patch to debian/rules fixes this by adding -ffile-prefix-map to CFLAGS. Alternately, using the default CFLAGS from dpkg-buildflags or switching to "dh" and a recent debhelper compat level might resolve this issue. According to my local tests, with this patch applied, tcm should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining tcm! live well, vagrant From 8b76667fe07f16eaf520949a19b9e2a96dcb61e9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 16:42:54 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 7d92a0c..85e1a8a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/dpkg/buildtools.mk CFLAGS = -Wall -g CFLAGS += -fcommon +# Avoid embedding build paths +CFLAGS += -ffile-prefix-map=$(CURDIR)=. ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 2.37.2 signature.asc Description: PGP signature
Bug#1021473: nitpic: reproducible-builds: buildid differs in /usr/bin/nitpic
Source: nitpic Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid varies when build from different build paths: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/nitpic.html The attached patch to debian/rules fixes this by passing the default CFLAGS to make via the CCOPTIONS variable. According to my local tests, with this patch applied, nitpic should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining nitpic! live well, vagrant From a0f279bbd9c86d8cde731500b4aa249132a74dd8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 02:16:50 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map to make via CCOPTIONS variable to avoid embedding build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 664269e..fa81626 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 -SD build: build-arch build-indep: build-arch: checkdir Makefile - $(MAKE) + $(MAKE) CCOPTIONS="-ffile-prefix-map=$(CURDIR)=." clean: checkdir Makefile $(MAKE) clean -- 2.37.2 signature.asc Description: PGP signature
Bug#1021472: xzoom: reproducible-builds: build path embedded in /usr/bin/xzoom
Source: xzoom Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/xzoom: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xzoom.html /build/1st/xzoom-0.3/xzoom.c:322 vs. /build/2/xzoom-0.3/2nd/xzoom.c:322 The attached patch to debian/rules fixes this by adding a dh_auto_build override that passes the default CFLAGS via the CCOPTIONS variable. According to my local tests, with this patch applied, xzoom should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining xzoom! live well, vagrant From dbbdbcaa8bdce175b780b4902f6eba2fb6ea38dd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 02:00:02 + Subject: [PATCH] debian/rules: Add dh_auto_build override passing default CFLAGS via CCOPTIONS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index a222eea..140a01d 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,6 @@ override_dh_auto_configure: override_dh_missing: dh_missing --fail-missing + +override_dh_auto_build: + dh_auto_build -- CCOPTIONS="$(CFLAGS)" -- 2.37.2 signature.asc Description: PGP signature
Bug#1021471: python-djvulibre: reproducible-builds: build path embedded in decode.cpython-310-x86_64-linux-gnu.so
Source: python-djvulibre
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in
/usr/lib/python3/dist-packages/djvu/decode.cpython-310-x86_64-linux-gnu.so:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/python-djvulibre.html
/build/1st/python-djvulibre-0.8.8/build/temp.linux-x86_64-3.10/src/decode.c:70219
vs.
/build/2/python-djvulibre-0.8.8/2nd/build/temp.linux-x86_64-3.10/src/decode.c:70219
The attached patch to setup.py fixes this by allowing the default CFLAGS to be
passed from debian/rules, which includes -ffile-prefix-map to avoid
embedding the build paths in the binaries.
According to my local tests, with this patch applied, python-djvulibre should
build
reproducibly on tests.reproducible-builds.org!
Thanks for maintaining python-djvulibre!
live well,
vagrant
From 3deaa46f919c4f16f6ef6f3ede93fd9e39169b5f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sun, 9 Oct 2022 01:52:57 +
Subject: [PATCH] setup.py: Allow debian/rules to pass the default CFLAGS.
---
setup.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/setup.py b/setup.py
index 9ed7cec..b4981cd 100644
--- a/setup.py
+++ b/setup.py
@@ -167,9 +167,6 @@ else:
# Python 3.X
req_cython_version = '0.20'
-# Work-around for <https://bugs.python.org/issue969718>:
-os.environ.pop('CFLAGS', None)
-
class build_ext(distutils.command.build_ext.build_ext):
def run(self):
--
2.37.2
signature.asc
Description: PGP signature
Bug#1021470: xsok: reproducible-builds: build path embedded in /usr/games/xsok
Source: xsok Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/games/xsok: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xsok.html /build/1st/xsok-1.02/src/Xaw-main.c:273 vs. /build/2/xsok-1.02/2nd/src/Xaw-main.c:273 The attached patch to debian/rules fixes this by passing to make the default CFLAGS using the upstream CCOPTIONS variable. According to my local tests, with this patch applied, xsok should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining xsok! live well, vagrant From 61246f44398cd2537268920502a906aa99f8233c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 01:21:33 + Subject: [PATCH] debian/rules: Pass default CFLAGS via CCOPTIONS variable. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 216e53d..fc9561e 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ build-indep: build build: build-stamp build-stamp: dh_testdir - $(MAKE) $(OPTIMIZE) \ + $(MAKE) CCOPTIONS="$(shell dpkg-buildflags --get CFLAGS)" $(OPTIMIZE) \ LOCAL_LIBRARIES='-lXpm -lXaw -lXt -lX11' \ XSOKLIBDIR=/usr/share/games/xsok \ XSOKSAVEDIR=/var/games/xsok -- 2.30.2 signature.asc Description: PGP signature
Bug#1021466: pacman: reproducible-builds: build path embedded in /usr/games/pacman
Source: pacman Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/games/pacman: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/pacman.html /build/1st/pacman-10/pac.cc:85 vs. /build/2/pacman-10/2nd/pac.cc:85 The attached patch fixes this adjusting the generated Makefile from debian/rules to include -ffile-prefix-map in the CXXFLAGS_DEFINES variable. Alternately, it might be worth using "dpkg-buildflags --get CXXFLAGS" instead of hard-coding -ffile-prefix-map, and will benefit from other useful flags as well. According to my local tests, with this patch applied, pacman should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining pacman! live well, vagrant From c2c6a41d218ae21765360832814e1d61d887f529 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 00:20:22 + Subject: [PATCH 1/2] debian/rules: Add -ffile-prefix-map to CXXEXTRA_DEFINES in generated Makefile to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 406e691..5092f98 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,8 @@ build-indep: build-stamp build-stamp: dh_testdir xmkmf -a + # Avoid embedding build path + sed -i -e "s,CXXEXTRA_DEFINES =,CXXEXTRA_DEFINES = -ffile-prefix-map=$(CURDIR)=.,g" Makefile $(MAKE) touch build-stamp -- 2.37.2 signature.asc Description: PGP signature
Bug#1021464: stfl: reproducible-builds: build path embedded in binaries
Source: stfl
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in various binaries:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/stfl.html
/usr/lib/x86_64-linux-gnu/perl5/5.34/auto/stfl/stfl.so
/build/1st/stfl-0.22/public.c:401
vs.
/build/2/stfl-0.22/2nd/public.c:401
The attached three patches to debian/rules fix this by adjusting the
make call to use dh_auto_make and passing CFLAGS via the CC variable,
adds -ffile-prefix-map to CFLAGS, and patches the generated
perl5/Makefile to add -ffile-prefix-map to CCFLAGS.
According to my local tests, with these patches applied, stfl should
build reproducibly on tests.reproducible-builds.org!
Thanks for maintaining stfl!
live well,
vagrant
From c3082dcef861f562cf07ce389566766a2275688a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sat, 8 Oct 2022 23:42:42 +
Subject: [PATCH 1/3] debian/rules: Use dh_auto_build and pass CFLAGS via CC
variable.
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 702e49f..d7967f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ build-indep: build-stamp
build-stamp:
dh_testdir
- $(MAKE) $(MAKE_FOUND_INTERPR)
+ dh_auto_build -- $(MAKE_FOUND_INTERPR) CC="$(CC) -pthread $(CFLAGS)"
# perl
test ! -f perl5/Makefile || $(MAKE) -C perl5 clean
cd perl5 && swig -perl5 stfl.i && perl Makefile.PL INSTALLDIRS=vendor
--
2.37.2
From 196634cef1ad5215457096d78ba4ff585fb58f48 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sat, 8 Oct 2022 23:43:20 +
Subject: [PATCH 2/3] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid
embedding build paths.
https://reproducible-builds.org/docs/build-path/
---
debian/rules | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/rules b/debian/rules
index d7967f9..a215bdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ MAKE_DESTDIR:= $(CURDIR)/debian/tmp
MAKE_FOUND_INTERPR := FOUND_PERL5=0 FOUND_SWIG=1 FOUND_SPL=0 FOUND_RUBY=0 FOUND_PYTHON=0
MAKE_INSTALL_TARGET := DESTDIR=$(MAKE_DESTDIR) prefix=/usr
CFLAGS += -fPIC
+CFLAGS += -ffile-prefix-map=$(CURDIR)=.
include /usr/share/dpkg/architecture.mk
PERL_VERSION := $(shell perl -MConfig -e 'print $$Config{version}')
--
2.37.2
From 37b01a1266e36d7202ed293af7efd85a916bce7a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sat, 8 Oct 2022 23:51:42 +
Subject: [PATCH 3/3] debian/rules: Add -ffile-prefix-map to CCFLAGS in
perl5/Makefile to avoid embedding build paths.
https://reproducible-builds.org/docs/build-path/
---
debian/rules | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/rules b/debian/rules
index a215bdc..0682f15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ build-stamp:
# perl
test ! -f perl5/Makefile || $(MAKE) -C perl5 clean
cd perl5 && swig -perl5 stfl.i && perl Makefile.PL INSTALLDIRS=vendor
+ # Avoid embedding build paths
+ sed -i -e 's,CCFLAGS =,CCFLAGS = -ffile-prefix-map=$(CURDIR)=.,g' perl5/Makefile
$(MAKE) -C perl5
# ruby
dh_ruby --build
--
2.37.2
signature.asc
Description: PGP signature
Bug#1021463: rdist: reproducible-builds: build path embedded in /usr/bin/rdist
Source: rdist Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/rdist: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/rdist.html /build/1st/rdist-6.1.5/src/rdist.c:105 vs. /build/2/rdist-6.1.5/2nd/src/rdist.c:105 The attached patch fixes this by passing the default CFLAGS via the CFLAGS_OS variable when calling make. According to my local tests, with this patch applied, rdist should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining rdist! live well, vagrant From 1ae2591af6070578468777e64d31435875b040d5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 8 Oct 2022 23:20:06 + Subject: [PATCH] debian/rules: Pass CFLAGS via the CFLAGS_OS variable to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3b32a29..32a9a9d 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ build-arch: build-stamp build-indep: build-stamp build-stamp: dh_testdir - DEFS_LOCAL=-D_PATH_OLDRDIST=\\\"/usr/bin/oldrdist\\\" LIB_SYS="$(LDFLAGS)" $(MAKE) + DEFS_LOCAL=-D_PATH_OLDRDIST=\\\"/usr/bin/oldrdist\\\" LIB_SYS="$(LDFLAGS)" $(MAKE) CFLAGS_OS="$(CFLAGS)" touch build-stamp clean: -- 2.37.2 signature.asc Description: PGP signature
Bug#1021461: icon: reproducible-builds: buildid differences in /usr/bin/icon*
Source: icon Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid varies when built from a different path for /usr/bin/icont and /usr/bin/iconx: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/icon.html The attached patch to debian/rules fixes this by adding -ffile-prefix-map to CFLAGS, and adjusting a call to sed to handle "/" in the expression. According to my local tests, with this patch applied, icon should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining icon! live well, vagrant From 0235dc52092db96208f3e0c051a10b0dbccf127d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 8 Oct 2022 23:12:15 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedded build paths. Adjust call to sed to handle "/" in the expression. While the build path doesn't directly show up in the binaries, the buildid may differs dependent on the build path. --- debian/rules | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 006ceb1..e5377bd 100755 --- a/debian/rules +++ b/debian/rules @@ -30,9 +30,12 @@ endif CFLAGS = -Wall -g $(CFLAGS_OPT) +# Avoid embedding build paths for reproducible builds +CFLAGS += -ffile-prefix-map=$(CURDIR)=. + configure: $(MAKE) X-Configure name=$(system) - sed "s/CFLAGS = .*/CFLAGS = $(CFLAGS)/" Makedefs > Makedefs.tmp + sed "s%CFLAGS = .*%CFLAGS = $(CFLAGS)%" Makedefs > Makedefs.tmp echo "ASFLAGS = -Wa,--noexecstack" >> Makedefs.tmp mv Makedefs.tmp Makedefs touch $@ -- 2.37.2 signature.asc Description: PGP signature
Bug#1021458: o3dgc: reproducible-builds: build path embedded in libo3dgc_common_lib.a
Source: o3dgc
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in
/usr/lib/x86_64-linux-gnu/libo3dgc_common_lib.a:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/o3dgc.html
/build/1st/o3dgc-0~20131011/src/o3dgc_common_lib/inc/o3dgcBinaryStream.h
vs.
/build/2/o3dgc-0~20131011/2nd/src/o3dgc_common_lib/inc/o3dgcBinaryStream.h
The attached patch to various CMakeLists.txt files fixes this by adding
-ffile-prefix-map to CMAKE_CXX_FLAGS.
Alternately, using the default CXXFLAGS from dpkg-buildflags would be
possible by removing debian/patches/fPIC.diff and possibly passing the
appropriate hardening build flags options.
According to my local tests, with this patch applied, o3dgc should build
reproducibly on tests.reproducible-builds.org!
Thanks for maintaining o3dgc!
live well,
vagrant
From 6f2829d68f4afe5590358db40da99b0f88ffa662 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sat, 8 Oct 2022 22:30:48 +
Subject: [PATCH] src/o3dgc*/CMakeLists.txt: Add -ffile-prefix-map to
CMAKE_CXX_FLAGS to avoid embedding build paths.
https://reproducible-builds.org/docs/build-path/
---
src/o3dgc_common_lib/CMakeLists.txt | 2 +-
src/o3dgc_decode_lib/CMakeLists.txt | 2 +-
src/o3dgc_encode_lib/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/o3dgc_common_lib/CMakeLists.txt b/src/o3dgc_common_lib/CMakeLists.txt
index 416195f..12abd85 100644
--- a/src/o3dgc_common_lib/CMakeLists.txt
+++ b/src/o3dgc_common_lib/CMakeLists.txt
@@ -3,6 +3,6 @@ include(${CMAKE_COMMON_INC})
set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?")
message("[o3dgc] \t LIB_TYPE " ${LIB_TYPE})
#set(CMAKE_CXX_FLAGS "-g -Wall")
-set(CMAKE_CXX_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
add_library(o3dgc_common_lib ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES})
diff --git a/src/o3dgc_decode_lib/CMakeLists.txt b/src/o3dgc_decode_lib/CMakeLists.txt
index 0209cd4..f1adb61 100644
--- a/src/o3dgc_decode_lib/CMakeLists.txt
+++ b/src/o3dgc_decode_lib/CMakeLists.txt
@@ -3,7 +3,7 @@ include(${CMAKE_COMMON_INC})
set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?")
#set(CMAKE_CXX_FLAGS "-g -Wall")
-set(CMAKE_CXX_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
add_library(o3dgc_dec_lib ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES})
include_directories("${${PROJECT_NAME}_SOURCE_DIR}/../o3dgc_common_lib/inc")
diff --git a/src/o3dgc_encode_lib/CMakeLists.txt b/src/o3dgc_encode_lib/CMakeLists.txt
index 5a72e1a..c926c6b 100644
--- a/src/o3dgc_encode_lib/CMakeLists.txt
+++ b/src/o3dgc_encode_lib/CMakeLists.txt
@@ -3,7 +3,7 @@ include(${CMAKE_COMMON_INC})
set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?")
#set(CMAKE_CXX_FLAGS "-g -Wall")
-set(CMAKE_CXX_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
add_library(o3dgc_enc_lib ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES})
include_directories("${${PROJECT_NAME}_SOURCE_DIR}/../o3dgc_common_lib/inc")
--
2.37.2
signature.asc
Description: PGP signature
Bug#1021457: olpc-powerd: reproducible-builds: build path embedded in debugging symbols
Source: olpc-powerd Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/debug/.dwz/x86_64-linux-gnu/olpc-powerd.debug: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/olpc-powerd.html /build/1st/olpc-powerd-23 vs. /build/2/olpc-powerd-23/2nd The attached patch to the upstream Makefile fixes this by appending to CFLAGS instead of overriding them, allowing the default CFLAGS to be passed. According to my local tests, with this patch applied, olpc-powerd should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining olpc-powerd! live well, vagrant From 28c1a60abd0c8dd1c41cfe0d30f755441c941cff Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 16:18:08 + Subject: [PATCH] Makefile: Append to CFLAGS. This allows passing the default flags from dpkg-buildflags. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5c0315a..bc1f3c7 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ OPT_FLAGS ?= -O2 -g PROGS = olpc-switchd pnmto565fb -CFLAGS = -Wall $(OPT_FLAGS) -DVERSION=$(VERSION) +CFLAGS += -Wall $(OPT_FLAGS) -DVERSION=$(VERSION) # -- 2.37.2 signature.asc Description: PGP signature
Bug#1021456: bwbasic: reproducible-builds: build path embedded in /usr/bin/bwbasic
Source: bwbasic Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/bwbasic: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/bwbasic.html /build/1st/bwbasic-2.20pl2/bwbasic.c:118 vs. /build/2/bwbasic-2.20pl2/2nd/bwbasic.c:118 The attached patches fix this by adjusting the upstream Makefile to use the default CFLAGS (by appending the arguments), and disables format string hardening which causes build failures (and was previously ignored, as CFLAGS was not used). According to my local tests, with this patch applied, bwbasic should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining bwbasic! live well, vagrant From 3ef0221a1b4ecc8842c613e406b9f4af6926d9c0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 15:48:14 + Subject: [PATCH 1/4] Makefile.in: Use CFLAGS from the environment and pass CFLAGS to CC calls. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9d12d0b..fea9b5f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ DEFS = @DEFS@ # Revised by JBV #CFLAGS = -O -CFLAGS = -g -ansi +CFLAGS += -g -ansi # Revised by JBV #LDFLAGS = -s @@ -58,11 +58,11 @@ DISTFILES= $(CFILES) $(HFILES) $(MISCFILES) all: bwbasic bwbasic.1 renum bwbasic: $(OFILES) - $(CC) $(OFILES) -lm -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(OFILES) -lm -o $@ $(LDFLAGS) # Added by JBV renum: - $(CC) renum.c -g -o renum + $(CC) $(CFLAGS) renum.c -g -o renum # Added by Vince Mulhollon bwbasic.1: bwbasic.doc -- 2.37.2 From 2ec1c3e99f1b03ec7aea4c74e193d307aa9c6ad5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 15:49:29 + Subject: [PATCH 2/4] debian/rules: Disable format hardening. This was effectively ignored before and causes build failures. --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 2f89281..bccd746 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,6 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-format + %: dh $@ --without autoreconf -- 2.37.2 signature.asc Description: PGP signature
Bug#1021454: dbview: reproducible-builds: build path embedded in /usr/bin/dbview
Source: dbview Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/dbview: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/dbview.html /build/1st/dbview-1.0.4/dbview.c:62 vs. /build/2/dbview-1.0.4/2nd/dbview.c:62 The attached patch to the upstream Makefile fixes this by adding -ffile-prefix-map to CFLAGS. According to my local tests, with this patch applied, dbview should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining dbview! live well, vagrant From 01ccb621098567fd523af9a892cd77384f870fe0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 8 Oct 2022 21:16:04 + Subject: [PATCH 3/3] Makefile: Add -ffile-prefix-map to CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ffa401f..3b7a265 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ MANO=man MANG=man CC= gcc -CFLAGS= -g -O6 -fomit-frame-pointer -Wall -pipe +CFLAGS= -g -O6 -fomit-frame-pointer -Wall -pipe -ffile-prefix-map=$(CURDIR)=. # CFLAGS= -g -fomit-frame-pointer -Wall -pipe # Look where your install program is -- 2.37.2 signature.asc Description: PGP signature
Bug#1021452: libdv: reproducible-builds: build path embedded in libdv.so.4.0.3
Source: libdv Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/x86_64-linux-gnu/libdv.so.4.0.3: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libdv.html /build/1st/libdv-1.0.0/libdv/vlc_x86_64.S:9 vs. /build/2/libdv-1.0.0/2nd/libdv/vlc_x86_64.S:9 The attached patch to debian/rules fixes this by adding --debug-prefix-map to CFLAGS. According to my local tests, with this patch applied, libdv should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining libdv! live well, vagrant From c2990be4998a537a2865e7eb33bc80bfeca3357b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 8 Oct 2022 20:43:19 + Subject: [PATCH] debian/rules: Add --debug-prefix-map to CFLAGS to avoid embedding build paths when building assembly files. https://tests.reproducible-builds.org/debian/issues/unstable/build_path_captured_in_assembly_objects_issue.html --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 7cd69b0..f682536 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic # package maintainers to append LDFLAGS +# Avoid embedding build path when compiling assembly files +export DEB_CFLAGS_MAINT_APPEND = --debug-prefix-map=$(CURDIR)=. + include /usr/share/dpkg/default.mk %: -- 2.37.2 signature.asc Description: PGP signature
Bug#1020806: perl-byacc: reproducible-builds: differing buildid in in /usr/bin/pbyacc
Source: perl-byacc Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The buildid differs in /usr/bin/pbyacc when built with a different build path: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/perl-byacc.html The attached patch fixes this in the upstream Makefile by adding -ffile-prefix-map to CFLAGS. According to my local tests, with this patch applied perl-byacc should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining perl-byacc! live well, vagrant From 1002dd61fdf333b0266ce59cd3053e6812905727 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 26 Sep 2022 23:55:37 + Subject: [PATCH] Makefile: Add -ffile-prefix-map to CFLAGS to avoid embedding build path. https://reproducible-builds.org/docs/build-path/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 077e9ea..1dd3c07 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ SIG_TYPE = void CPPFLAGS = $(RINDEX) -DPROGRAM=\"$(PROGRAM)\" -DSIG_TYPE=$(SIG_TYPE) -CFLAGS = -O2 -g $(CPPFLAGS) +CFLAGS = -O2 -g -ffile-prefix-map=$(CURDIR)=. $(CPPFLAGS) CC = gcc -Wall CPP = /lib/cpp -- 2.37.2 signature.asc Description: PGP signature
Bug#1020800: libapache-mod-evasive: reproducible-builds: Embedded build paths in mod_evasive20.so
Source: libapache-mod-evasive Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/apache2/modules/mod_evasive20.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libapache-mod-evasive.html /build/1st/libapache-mod-evasive-1.10.1/mod_evasive20.c:713 vs. /build/2/libapache-mod-evasive-1.10.1/2nd/mod_evasive20.c:713 The attached patch to debian/rules fixes this by adding -ffile-prefix-map to the call to apxs2. According to my local tests, with this patch applied libapache-mod-evasive should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining libapache-mod-evasive! live well, vagrant From 028d05262df50953740df4bb87f5704c78eae8af Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 26 Sep 2022 21:53:48 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to apxs2 call to avoid embedding the build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 086a195..1b898a3 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ build-indep: build-stamp build-stamp: dh_testdir - apxs2 -c mod_evasive20.c + apxs2 -Wc,-ffile-prefix-map=$(CURDIR)=. -c mod_evasive20.c touch build-stamp -- 2.37.2 signature.asc Description: PGP signature
Bug#1020798: netkit-rsh: reproducible-builds: Embedded build paths in binaries
Source: netkit-rsh Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/netkit-rsh.html /usr/sbin/in.rlogind /build/1st/netkit-rsh-0.17/rlogind/network.c vs. /build/2/netkit-rsh-0.17/2nd/rlogind/network.c The attached patch to debian/rules fixes this by adding -ffile-prefix-map to CFLAGS. Alternately, updating to use dh and a recent debhelper compat version might also fix this. According to my local tests, with this patch applied netkit-rsh should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining netkit-rsh! live well, vagrant From 6529f07eacdf749b1a5390933f8ac3a91093b664 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 26 Sep 2022 21:40:41 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding the build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8049402..42ca247 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export CFLAGS += -Ddebian -DFSUID_HACK -D_GNU_SOURCE +export CFLAGS += -Ddebian -DFSUID_HACK -D_GNU_SOURCE -ffile-prefix-map=$(CURDIR)=. %: dh $@ --buildsystem=cmake -- 2.37.2 signature.asc Description: PGP signature
Bug#1014791: qa.debian.org: udd: debian maintainer dashboard shows nothing when onlyrecent=on is checked
Package: qa.debian.org Severity: normal X-Debbugs-Cc: Vagrant Cascadian I use UDD all the time, huge thanks! I recently noticed a little checkbox on the Debian Maintainer Dashboard page which I use regularly, and it seemed to be exactly what I wanted today: "Packages recently touched: hide packages not uploaded during the last month" But when I check this box, it shows no packages at all, even though without it checked, it shows packages I updated in the last couple days: https://udd.debian.org/dmd/?email1=vagrant%40debian.org=on vs. https://udd.debian.org/dmd/?email1=vagrant%40debian.org onlyrecent=on sounds like a useful feature, so would love to use it! Thanks again for such a tremendously useful service! live well, vagrant signature.asc Description: PGP signature
Bug#1014789: rdiff-backup-fs: reproducible-builds: embedded build paths in /usr/bin/rdiff-backup-fs
Source: rdiff-backup-fs
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/bin/rdiff-backup-fs:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/rdiff-backup-fs.html
/build/1st/rdiff-backup-fs-1.0.0/rdiff-backup-fs.c:43
vs.
/build/2/rdiff-backup-fs-1.0.0/2nd/rdiff-backup-fs.c:43
The attached patches fix this by updating to using debhelper compat 13
which sets various compiler flags by default, patching configure.ac to
take EXTRA_CFLAGS, and passing EXTRA_CFLAGS to configure in
debian/rules.
With these patches applied, rdiff-backup-fs should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From cc979a98912da5099859c5337d2c7de5bb7aac9d Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 11 Jul 2022 23:13:08 +
Subject: [PATCH 1/3] Update to debhelper compat 13.
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index c6d57ea..b4fa00f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rdiff-backup-fs
Section: utils
Priority: extra
Maintainer: Debian QA Group
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libz-dev, libfuse-dev, pkg-config, dh-autoreconf
+Build-Depends: debhelper-compat (= 13), libz-dev, libfuse-dev, pkg-config
Standards-Version: 3.9.2
Homepage: http://code.google.com/p/rdiff-backup-fs/
diff --git a/debian/rules b/debian/rules
index 21dfdfb..955dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@
#export DH_VERBOSE=1
%:
- dh --with autoreconf $@
+ dh $@
--
2.36.1
From 20475bdd718c6baca6bd832dc92ef37821bec195 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 11 Jul 2022 23:13:49 +
Subject: [PATCH 2/3] configure.ac: Support passing EXTRA_CFLAGS when setting
LIBS and CFLAGS variables.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7f7482a..ae26bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,8 +46,8 @@ AC_TYPE_SIZE_T
dnl checking type of system to provide proper compile and linking flags
case ${host} in
-*-*-linux-*|*-*-k*bsd*-*) AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
- AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
+*-*-linux-*|*-*-k*bsd*-*) AC_SUBST(CFLAGS, ["$EXTRA_CFLAGS -Wall -g -O3 `pkg-config --cflags fuse`"])
+ AC_SUBST(LIBS, ["$LIBS $EXTRA_CFLAGS `pkg-config --cflags --libs fuse` -lz"]);;
*-*-bsd-*) AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
*-*-darwin*) AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
--
2.36.1
From 8f52af0fa9e957c8eff1797aaf57d8bb9233af47 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 11 Jul 2022 23:15:45 +
Subject: [PATCH 3/3] debian/rules: Set EXTRA_CFLAGS in dh_auto_configure
override.
This allows passing the default compiler flags, such as
-ffile-prefix-map which is used to avoid embedding the build path.
---
debian/rules | 3 +++
1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules
index 955dd78..608d0b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,6 @@
%:
dh $@
+
+override_dh_auto_configure:
+ EXTRA_CFLAGS="$(CFLAGS)" dh_auto_configure
--
2.36.1
signature.asc
Description: PGP signature
Bug#1014564: tvtime: reproducible-builds: embedded build paths in /usr/bin/tvtime
Source: tvtime
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/bin/tvtime:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tvtime.html
/build/1st/tvtime-1.0.11/src/speedy.c:1933
vs.
/build/2/tvtime-1.0.11/2nd/src/speedy.c:1933
The attached patch fixes this by switching to using debhelper compat 13
and debhelper's "dh" command, which passes compiler flags to avoid
embedding the build path (e.g. -ffile-prefix-map), and avoids embedding
differing buildids via rpath (even though rpath is later stripped).
With this patch applied, tvtime should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From 3d6ca922e5eb31ad71500437fc47828ac77bfa52 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Thu, 7 Jul 2022 23:18:38 +
Subject: [PATCH] Switch to "dh" and debhelper compat 13.
---
debian/control | 4 +--
debian/rules | 94 --
2 files changed, 8 insertions(+), 90 deletions(-)
diff --git a/debian/control b/debian/control
index 316a232..f2848a4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: video
Priority: optional
Maintainer: Debian QA Group
Build-Depends:
- debhelper-compat (= 12),
- autotools-dev,
+ debhelper-compat (= 13),
pkg-config,
zlib1g-dev,
libpng-dev,
@@ -18,7 +17,6 @@ Build-Depends:
libxxf86vm-dev,
libxml2-dev,
fontforge,
- chrpath,
libasound2-dev
Standards-Version: 3.9.3
Homepage: https://linuxtv.org/wiki/index.php/Tvtime
diff --git a/debian/rules b/debian/rules
index 013193d..7ef5a0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,66 +20,14 @@
# Based on the sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-include /usr/share/dpkg/architecture.mk
+override_dh_auto_build:
+ dh_auto_build -- FONT_CFLAGS='-DFONTDIR="\"/usr/share/fonts/truetype/freefont\""'
-CFLAGS += -Wall
-
-config.status:
- dh_testdir
- dh_autoreconf
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man\
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-fifogroup=video\
- --without-directfb\
- --without-sdl \
- --disable-silent-rules
-
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) FONT_CFLAGS='-DFONTDIR="\"/usr/share/fonts/truetype/freefont\""'
-
- touch build-stamp
-
-clean:
- dh_testdir
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_autoreconf_clean
- dh_clean
-
- rm -f po/stamp-po po/*.gmo
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tvtime.
- $(MAKE) install prefix=$(CURDIR)/debian/tvtime/usr \
- sysconfdir=$(CURDIR)/debian/tvtime/etc \
- localstatedir=$(CURDIR)/debian/tvtime/var
+override_dh_auto_install:
+ dh_auto_install
# Remove the freefont TTF.
rm -f $(CURDIR)/debian/tvtime/usr/share/tvtime/FreeMonoBold.ttf
# Remove the configuration file.
@@ -89,34 +37,6 @@ install: build
cp -f $(CURDIR)/docs/html/*.png $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
cp -f $(CURDIR)/docs/html/*.jpg $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
cp -f $(CURDIR)/docs/html/*.css $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
- # Fix E: tvtime: binary-or-shlib-defines-rpath usr/bin/tvtime /usr/lib/x86_64-linux-gnu
- chrpath -d $(CURDIR)/debian/tvtime/usr/bin/tvtime
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installman
- dh_lintian
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
+override_dh_compress:
dh_compress -Xdefault.tvtime.xml -Xexample.lirc
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
2.36.1
signature.asc
Description: PGP signature
Bug#1014561: clp: reproducible-builds: Embedded build path in example Makefile
Source: clp Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in usr/share/doc/coinor-libclp-doc/examples/Makefile.gz: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/clp.html CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/1st/clp-1.17.6=. ... vs. CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/2/clp-1.17.6/2nd=. ... The attached patch fixes this by replacing the build path with a placeholder string in debian/rules. With this patch applied clp should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining clp! live well, vagrant From ebabfddbbe32940959ff69e19bb816fb6067814d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Jul 2022 21:54:07 + Subject: [PATCH] debian/rules: Add dh_installexamples override to remove build path from example Makefile. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index ff730ed..8b50efa 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,7 @@ override_dh_auto_build: dh_auto_build make doxydoc $(RM) doxydoc/html/*.md5 doxydoc/html/*.dot doxydoc/html/*.map + +override_dh_installexamples: + dh_installexamples + sed -i -e "s,$(CURDIR),BUILDDIR,g" debian/coinor-libclp-doc/usr/share/doc/coinor-libclp-doc/examples/Makefile -- 2.36.1 signature.asc Description: PGP signature
Bug#1014560: ygl: reproducible-builds: embedded build paths in libYgl.so.*
Source: ygl Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in ./usr/lib/libYgl.so.4.2: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/ygl.html /build/1st/ygl-4.2e/ygl.c:525 vs. /build/2/ygl-4.2e/2nd/ygl.c:525 The attached patch fixes this by passing a variable to dh_auto_build in debian/rules with the -ffile-prefix-map compiler flag to avoid embedding the build path. With this patch applied, ygl should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 0bec442f2213e5bb27b8dfbbfb115df9dbf2a9d5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Jul 2022 21:31:18 + Subject: [PATCH] debian/rules: Pass variable to dh_auto_build to avoid embedding build path. Use the PROJECT_DEFINES variable to pass -ffile-prefix-map to avoid embedding the build path for reproducible builds. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index a2d7d11..4093d56 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,6 @@ override_dh_auto_configure: override_dh_installexamples: cd examples && $(MAKE) clean && rm -f Makefile dh_installexamples + +override_dh_auto_build: + dh_auto_build -- PROJECT_DEFINES="-ffile-prefix-map=$(CURDIR)=." -- 2.36.1 signature.asc Description: PGP signature
Bug#1014559: libloki: reproducible-builds: embedded build paths in libloki.so.*
Source: libloki Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/libloki.so.0.1.7: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libloki.html /build/1st/libloki-0.1.7/src/LevelMutex.cpp:88 vs. /build/2/libloki-0.1.7/2nd/src/LevelMutex.cpp:88 The attached patch fixes this by explicitly passing CXXFLAGS to dh_auto_build in debian/rules, which includes flags to avoid embedding the build path. With this patch applied, libloki should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 4290aeceda937a01d2b6e54ce8b94abd98c0aeee Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Jul 2022 20:45:03 + Subject: [PATCH] debian/rules: Explicitly pass CXXFLAGS to dh_auto_build. Makefile.common overrides CXXFLAGS from the environment, so explicitly passing it in order to get the default build flags. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e7990c6..d2f39c9 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ dh $@ override_dh_auto_build: - dh_auto_build -- OS=Linux build-static build-shared + dh_auto_build -- OS=Linux build-static build-shared CXXFLAGS="$(CXXFLAGS)" override_dh_auto_test: -dh_auto_test -- OS=Linux -- 2.36.1 signature.asc Description: PGP signature
Bug#1014428: xmacro: reproducible-builds: embedded build paths in /usr/bin/xmacro*
Source: xmacro Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries in /usr/bin: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xmacro.html /usr/bin/xmacroplay /build/1st/xmacro-0.3pre-2911/xmacroplay.cpp:472 vs. /build/2/xmacro-0.3pre-2911/2nd/xmacroplay.cpp:472 The attached patch fixes this by switching to using the debhelper's "dh" command, which passes compiler flags to avoid embedding the build path (e.g. -ffile-prefix-map). With this patch applied, xmacro should build reproducibly on tests.reproducible-builds.org! live well, vagrant From f28f53bb5658ada0bc921617dd9ae143a55c97d1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 5 Jul 2022 20:18:58 + Subject: [PATCH] debian/rules: Switch to "dh". --- debian/rules | 83 1 file changed, 5 insertions(+), 78 deletions(-) diff --git a/debian/rules b/debian/rules index 70c157f..751682a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,85 +1,12 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -CXXFLAGS=-g -O2 -export CXXFLAGS - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - dh_auto_build - #/usr/bin/docbook-to-man debian/xmacro-0.3pre.sgml > xmacro-0.3pre.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/xmacro-0.3pre. +override_dh_auto_install: + dh_auto_install install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 $(CURDIR)/debian/xmacro/usr/bin -build-arch: build - -build-indep: build - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installmenu - dh_installcron - dh_installman - dh_installinfo - dh_installchangelogs - dh_link - dh_strip - dh_compress +override_dh_fixperms: dh_fixperms chmod -x $(CURDIR)/debian/xmacro/usr/share/doc/xmacro/examples/* - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure -- 2.36.1 signature.asc Description: PGP signature
Bug#1014426: cldump: reproducible-builds: embedded build paths in /usr/bin/cldump
Source: cldump Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/cldump: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/cldump.html /build/1st/cldump-0.11~dfsg/src/cldump.c:180 vs. /build/2/cldump-0.11~dfsg/2nd/src/cldump.c:180 The attached patch fixes this by explicitly passing CFLAGS to dh_auto_build in debian/rules, which includes flags to avoid embedding the build path. With this patch applied, cldump should build reproducibly on tests.reproducible-builds.org! live well, vagrant From e65c0a4b1a6bb623feddd15e7ec0fda53dbd7422 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 5 Jul 2022 19:46:11 + Subject: [PATCH] debian/rules: Pass CFLAGS via dh_auto_build override. src/Makefile sets CFLAGS explicitly, ignoring CFLAGS from the environment. This means various default flags are otherwise ignored, e.g. -ffile-prefix-map which is used to avoid embedding build paths for reproducible builds. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 5b70f17..f12e8a3 100755 --- a/debian/rules +++ b/debian/rules @@ -6,3 +6,6 @@ %: dh $@ --sourcedirectory=src --buildsystem=makefile + +override_dh_auto_build: + dh_auto_build --sourcedirectory=src --buildsystem=makefile -- CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1013329: razor 2.85 is really 2.84
Source: razor
Version: 1:2.85-4.2
X-Debbugs-Cc: m...@msquadrat.de
Control: submitter -1 m...@msquadrat.de
On 2022-06-20, Malte S. Stretz wrote:
> TL;DR: It looks like the Debian 2.85 razor package you've been recently
> working on according to
> https://salsa.debian.org/debian/razor/-/commits/debian/latest is really 2.84
>
>
> I noticed this when I repackaged it to backport my IPv6 support from my
> GitHub PR at https://github.com/toddr/Razor2-Client-Agent/pull/13 for
> which you can find the quilt patch here
> https://salsa.debian.org/mss/razor/-/blob/ipv6/debian/patches/ipv6.patch
>
> Something was odd because the change applied differently to the Debian
> codebase than to the upstream one. I first assumed this was because
> upstream is already at version 2.86 but there aren't really any relevant
> changes in that version. But in commit
> 9e8186ac058eae55c92ab4ee9e982d24a978e66a the maintainer ran perltidy on
> the codebase which reformatted among others the Makefile.PL. But that
> change was applied already between 2.84 and 2.85.
>
> I compared the salsa and GitHub codebase with `git ls-tree -r HEAD | awk
> '{print $4}' | sort | xargs md5sum` and it is indeed almost the same for
> upstream tag v2.84 whereas for v2.85 a lot of changes are reported.
>
> I finally verified this by installing the package and checked that the
> 'use lib' line in razor-admin is still present in the Debian version
> whereas it is gone on CPAN in 2.85 (ie. CPAN matches the GitHub repo):
>
> *
> https://metacpan.org/release/TODDR/Razor2-Client-Agent-2.84/source/bin/razor-admin#L13
>
> *
> https://metacpan.org/release/TODDR/Razor2-Client-Agent-2.85/source/bin/razor-admin#L13
>
>
> So unless I miss something it looks like this package is actually quite
> messed up.
The current "upstream" version was uploaded to debian in 2008 currently
present in old-old-stable (e.g. two releases prior to the current stable
release):
https://tracker.debian.org/news/303771/accepted-razor-1285-1-source-amd64/
The best thing might be to actually update to the newest upstream
release, if there is indeed one newer than 2.85... and kind of ignore
that unfortunate problem...
... though there might be security issues that are not correctly tracked
that are fixed in the upstream 2.85, but not in the debian packages
because of the version discrepancy; that might be worth confirming and
possibly notifying the security team.
All that said, not sure I have the energy to tackle this kind of tangled
problem at the moment...
live well,
vagrant
signature.asc
Description: PGP signature
Bug#1010785: gdome2: reproducible-builds: embedded build paths libgdome.so.*
Control: found 1010785 0.8.1+debian-8
On 2022-05-09, Vagrant Cascadian wrote:
> The build path is embedded in /usr/lib/libgdome.so.0.8.1:
>
>
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gdome2.html
>
> /build/1st/gdome2-0.8.1+debian/libgdome/gdome.c:65
> vs.
> /build/2/gdome2-0.8.1+debian/2nd/libgdome/gdome.c:65
>
>
> The attached patch to debian/rules fixes this by passing
> -ffile-prefix-map in CFLAGS and ensuring CFLAGS is passed to configure.
>
> Alternately, updating the packaging to use dh/debhelper at a recent
> compat level would also likely fix this.
Turns out simply switching to dh/debhelper was not sufficient...
Probably adjusting debian/rules with something like:
override_dh_auto_configure:
CFLAGS="$(CFLAGS) -ffile-prefix-map=$(CURDIR)" dh_auto_configure
I'll try and provide an updated patch and confirm the fix at some
point... though if someone else does it first I won't complain! :)
live well,
vagrant
> From 65c23dfcbf5fd3a59d4a3141430247225e4d4413 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian
> Date: Mon, 9 May 2022 23:06:56 +
> Subject: [PATCH] debian/rules: add -ffile-prefix-map to CFLAGS and ensure
> CFLAGS are passed in the configure phase.
>
> ---
> debian/rules | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/debian/rules b/debian/rules
> index 5e25754..ae361d7 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -11,13 +11,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
> INSTALL_PROGRAM += -s
> endif
>
> +CFLAGS += -ffile-prefix-map=$(CURDIR)=.
> +
> configure: configure-stamp
> configure-stamp:
> dh_testdir
> cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
> libtoolize -c -f
> autoreconf -f -i
> - ./configure --prefix=/usr \
> + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
> --mandir=\$${prefix}/share/man \
> --infodir=\$${prefix}/share/info \
> --with-html-dir=\$${prefix}/share/doc/libgdome2-dev
> --
> 2.36.0
signature.asc
Description: PGP signature
Bug#1011503: libapache2-mod-auth-plain: reproducible-builds: embedded build paths in mod_auth_plain.so
Source: libapache2-mod-auth-plain Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/apache2/modules/mod_auth_plain.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libapache2-mod-auth-plain.html /build/1st/libapache2-mod-auth-plain-2.0.52/mod_auth_plain.c:300 vs. /build/2/libapache2-mod-auth-plain-2.0.52/2nd/mod_auth_plain.c:300 The attached patch fixes this by adjusting the Makefile to pass -ffile-prefix-map to apxs, which avoids embedding the build path in compiled files. With this patch applied, libapache2-mod-auth-plain should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 0bbea871a8c744f1355c759482efbc4eb9f927b5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 24 May 2022 01:58:43 + Subject: [PATCH] Makefile: Pass -ffile-prefix-map to apxs. This avoids embedding the build path in the binaries. https://reproducible-builds.org/docs/build-path/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a05afd4..343b1bb 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ all: $(TARGETS) # general rule to build %.la: %.c - $(APXS) -c $< $(LIBS) + $(APXS) -Wc,-ffile-prefix-map=$(CURDIR)=. -c $< $(LIBS) install: $(TARGETS) $(APXS) -i $(TARGETS) -- 2.36.1 signature.asc Description: PGP signature
Bug#1011501: libapache2-mod-authn-yubikey: reproducible-builds: embedded build paths in mod_authn_yubikey.so
Source: libapache2-mod-authn-yubikey Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/apache2/modules/mod_authn_yubikey.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libapache2-mod-authn-yubikey.html /build/1st/libapache2-mod-authn-yubikey-1.0/libykclient.c:181 vs. /build/2/libapache2-mod-authn-yubikey-1.0/2nd/libykclient.c:181 The attached patch fixes this by passing -ffile-prefix-map to axps2 in debian/rules, which avoids embedding the build path in compiled files. With this patch applied, libapache2-mod-authn-yubikey should build reproducibly on tests.reproducible-builds.org! live well, vagrant From a8ba18601d147f1b4e374e2b483561f95373b561 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 24 May 2022 00:55:12 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map to apxs2. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1e96143..cab1069 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,6 @@ override_dh_auto_build: apxs2 -DYK_PACKAGE=\\\"libapache2_mod_authn_yubikey\\\" \ - -DYK_PACKAGE_VERSION=\\\"0.1\\\" -I. -Wc -c -lcurl \ + -DYK_PACKAGE_VERSION=\\\"0.1\\\" -I. -Wc,-ffile-prefix-map=$(CURDIR)=. -Wc -c -lcurl \ mod_authn_yubikey.c libykclient.c libykclient.slo mod_authn_yubikey.slo -- 2.36.1 signature.asc Description: PGP signature
Bug#1011500: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
Source: tuxcmd-modules Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries in /usr/lib: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tuxcmd-modules.html /usr/lib/tuxcmd/libarchive_plugin.so /build/1st/tuxcmd-modules-0.6.70+ds/libarchive/strutils.c:27 vs. /build/2/tuxcmd-modules-0.6.70+ds/2nd/libarchive/strutils.c:27 The attached patch fixes this by adjusting various Makefiles to set -ffile-prefix-map in CFLAGS, which avoids embedding the build path in the compiled binaries. With this patch applied, tuxcmd-modules should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 0bd222e5cf0c9710c97c217fce4d0435cee989bc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 24 May 2022 00:39:56 + Subject: [PATCH] Support passing -ffile-prefix-map in various Makefiles. This avoids embedding the build path in the resulting binaries. https://reproducible-builds.org/docs/build-path/ --- Makefile| 2 ++ gvfs/Makefile | 2 ++ libarchive/Makefile | 3 +++ zip/Makefile| 2 ++ zip/Makefile.ziparch| 3 +++ zip/ZipArchive/Makefile | 3 +++ 6 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 61dade4..2d78375 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ SUBDIRS = zip libarchive gvfs +export BUILDPATH = $(CURDIR) + all install clean shared static:: target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/gvfs/Makefile b/gvfs/Makefile index 9c5d759..8bd0c08 100644 --- a/gvfs/Makefile +++ b/gvfs/Makefile @@ -9,6 +9,8 @@ CFLAGS =-I. -I/usr/include \ -Wall -fPIC -O2 -g \ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(BUILDPATH)=. # VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o VFS_COMMON_OBJECTS= diff --git a/libarchive/Makefile b/libarchive/Makefile index 8514968..db3c1b5 100644 --- a/libarchive/Makefile +++ b/libarchive/Makefile @@ -13,6 +13,9 @@ CFLAGS =-I. -I/usr/include -I$(DIR_COMMON) \ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \ -D__VERBOSE_DEBUGx +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(BUILDPATH)=. + VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o VFS_OBJECTS=libarchive.o diff --git a/zip/Makefile b/zip/Makefile index 1299323..5d32373 100644 --- a/zip/Makefile +++ b/zip/Makefile @@ -12,6 +12,8 @@ CFLAGS =-I. -I$(DIR_ZIPARCHIVE) -I/usr/include \ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \ -D__VERBOSE_DEBUGx +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(BUILDPATH)=. VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o diff --git a/zip/Makefile.ziparch b/zip/Makefile.ziparch index 2a66b94..ab8db23 100644 --- a/zip/Makefile.ziparch +++ b/zip/Makefile.ziparch @@ -19,6 +19,9 @@ CCC=cc CFLAGS = -D ZIP_ARCHIVE_LNX -fPIC -g -O2 #CFLAGS = +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(BUILDPATH)=. + ifdef INTERNAL_BZIP2 CFLAGS += -D ZIP_ARCHIVE_BZIP2_INTERNAL endif diff --git a/zip/ZipArchive/Makefile b/zip/ZipArchive/Makefile index a426b6d..627b036 100644 --- a/zip/ZipArchive/Makefile +++ b/zip/ZipArchive/Makefile @@ -23,6 +23,9 @@ ifdef INTERNAL_BZIP2 CFLAGS += -D ZIP_ARCHIVE_BZIP2_INTERNAL endif +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(BUILDPATH)=. + ZIPARCHLIB = libziparch.a ZIPPIELOCATION = ../Zippie/ -- 2.36.1 signature.asc Description: PGP signature
Bug#1011499: imagination: reproducible-builds: embedded build paths in various binaries
Source: imagination Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/imagination.html /usr/bin/imagination /build/1st/imagination-3.6/src/imgcellrendereranim.c:63 vs. /build/2/imagination-3.6/2nd/src/imgcellrendereranim.c:63 The attached patch fixes this by explicitly passing CFLAGS to a dh_auto_build override in debian/rules, which includes the -ffile-prefix-map argument used to avoid embedding build paths. With this patch applied, imagination should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 01273015daccd5f14d9cf37b06909702f83da0a1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 24 May 2022 00:17:51 + Subject: [PATCH] debian/rules: Explicitly pass CFLAGS via dh_auto_build override. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index e2eadfe..e6cdda4 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_gencontrol: dh_gencontrol -pimagination -- $(SUBSTVARS) dh_gencontrol -pimagination-common + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1011498: parprouted: reproducible-builds: embedded build paths in /usr/sbin/parprouted
Source: parprouted Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/sbin/parprouted: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/parprouted.html /build/1st/parprouted-0.70/parprouted.c:388 vs. /build/2/parprouted-0.70/2nd/parprouted.c:388 The attached patch fixes this by passing CFLAGS via EXTRA_CFLAGS in a dh_auto_build override in debian/rules. This allows passing the default build flags including -ffile-prefix-map, which avoids embedding the absolute path in compiled files. With these patches applied, parprouted should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 8f89bcf5ceb969296c3e80ca5dd5ed094557b2ae Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 23:36:01 + Subject: [PATCH] debian/rules: Pass CFLAGS via EXTRA_CFLAGS in dh_auto_build override. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index bf7a709..2173a20 100755 --- a/debian/rules +++ b/debian/rules @@ -21,3 +21,6 @@ include /usr/share/dpkg/buildflags.mk %: dh $@ + +override_dh_auto_build: + dh_auto_build -- EXTRA_CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1011496: nwall: reproducible-builds: embedded build paths in /usr/bin/nwall
Source: nwall Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/nwall: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/nwall.html /build/1st/nwall-1.32+debian/src/nwall.c:65 vs. /build/2/nwall-1.32+debian/2nd/src/nwall.c:65 The attached patch fixes this by adding -ffile-prefix-map to CFLAGS in debian/rules, which avoids embedding the absolute build path. Alternately, switching to use a newer debhelper compat level and the dh build system would likely also fix this, as it includes -ffile-prefix-map by default. With this patch applied, nwall should build reproducibly on tests.reproducible-builds.org! live well, vagrant From c5fa3d56c8c43cebc37ec635f05cf62a810c573f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 23:00:09 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index c88d7b5..69e5a1d 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ else CFLAGS += -O2 endif +# Avoid embedding the build path +CFLAGS += -ffile-prefix-map=$(CURDIR)=. + config.status: configure dh_testdir cp -f /usr/share/misc/config.sub config.sub -- 2.36.1 signature.asc Description: PGP signature
Bug#1011495: modglue: reproducible-builds: Embedded build path in example Makefile
Source: modglue Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/share/doc/libmodglue1-dev/examples/Makefile: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/modglue.html g++·-g·-O2·-ffile-prefix-map=/build/1st/modglue-1.17=.·-fstack-protector-strong ... vs. g++·-g·-O2·-ffile-prefix-map=/build/2/modglue-1.17/2nd=.·-fstack-protector-strong ... The attached patch fixes this by replacing the build path with a placeholder string in debian/rules. With this patch applied modglue should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining modglue! live well, vagrant From 90abd06e800aa89e41a213373950ccda809858f9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 22:52:57 + Subject: [PATCH] debian/rules: Replace build path in example Makefile with "BUILDPATH". --- debian/rules | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index e1ec72b..cfd744c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,3 +10,8 @@ override_dh_autoreconf: override_dh_auto_install: $(MAKE) install DESTDIR=$(CURDIR)/debian/libmodglue1v5 DEVDESTDIR=$(CURDIR)/debian/libmodglue1-dev rm `find $(CURDIR)/debian -name '*.la'` + +override_dh_installexamples: + # Replace build path with placeholder string + sed -i -e "s,$(CURDIR),BUILDPATH,g" examples/Makefile + dh_installexamples -- 2.36.1 signature.asc Description: PGP signature
Bug#1011493: freecdb: reproducible-builds: embedded build paths in various binaries
Source: freecdb Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries in /usr/bin: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/freecdb.html /usr/bin/cdbdump /build/1st/freecdb-0.76/cdbdump.c:45 vs. /build/2/freecdb-0.76/2nd/cdbdump.c:45 The attached patch fixes this by explicitly passing CFLAGS to a dh_auto_build override in debian/rules, which includes the -ffile-prefix-map argument used to avoid embedding build paths. With this patch applied, freecdb should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 614861c71f34eea174ed917d3a03b23f771008f3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 22:28:57 + Subject: [PATCH] debian/rules: Explicitly pass CFLAGS to dh_auto_build. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 2d33f6a..ae015cc 100755 --- a/debian/rules +++ b/debian/rules @@ -2,3 +2,6 @@ %: dh $@ + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1011491: getstream: reproducible-builds: embedded build paths in /usr/bin/getstream
Source: getstream Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/getstream: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/getstream.html /build/1st/getstream-20100616/getstream.c:30 vs. /build/2/getstream-20100616/2nd/getstream.c:30 The attached patches fix this by passing CFLAGS via EXTRA_CFLAGS in a dh_auto_build override in debian/rules, and adjusting the upstream Makefile to append EXTRA_CFLAGS to CFLAGS. This allows passing the default build flags including -ffile-prefix-map, which avoids embedding the absolute path in compiled files. With these patches applied, getstream should build reproducibly on tests.reproducible-builds.org! live well, vagrant From c0b0fc68cec2a532dcdfe134271623fceb3813c3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 22:16:24 + Subject: [PATCH 1/2] Makefile: Append EXTRA_CFLAGS to CFLAGS. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 501467f..53b05c0 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ else CFLAGS+=-O0 -g endif +CFLAGS += $(EXTRA_CFLAGS) + LDFLAGS=-lpthread MDEFS := $(shell sh Makefile.defs.sh >Makefile.defs) -- 2.36.1 From 20a63cf51a2cea9a9086fe4a3222a7e2f90aef37 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 22:16:46 + Subject: [PATCH 2/2] debian/rules: Pass CFLAGS via EXTRA_CFLAGS in dh_auto_build override. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index bf3f0e8..5883c49 100755 --- a/debian/rules +++ b/debian/rules @@ -9,3 +9,6 @@ include /usr/share/dpkg/buildtools.mk %: dh $@ + +override_dh_auto_build: + dh_auto_build -- EXTRA_CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1011490: gdigi: reproducible-builds: embedded build paths in /usr/bin/gdigi
Source: gdigi Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/gdigi: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gdigi.html /build/1st/gdigi-0.4.0+git20200615+1c2c89f/gdigi.c:43 vs. /build/2/gdigi-0.4.0+git20200615+1c2c89f/2nd/gdigi.c:43 The attached patch fixes this by passing CFLAGS via EXTRA_CFLAGS in a dh_auto_build override in debian/rules. This allows passing the default build flags including -ffile-prefix-map, which avoids embedding the absolute path in compiled files. With this patch applied, gdigi should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 41aa07e65328c9f522183e0e036c9143317cba34 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 22:05:11 + Subject: [PATCH] debian/rules: Pass CFLAGS as EXTRA_CFLAGS in dh_auto_build override. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index cbe925d..ae7a96f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,6 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_auto_build: + dh_auto_build -- EXTRA_CFLAGS="$(CFLAGS)" -- 2.36.1 signature.asc Description: PGP signature
Bug#1011489: wiipdf: reproducible-builds: embedded build paths in /usr/bin/wiipdf
Source: wiipdf Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/wiipdf: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/wiipdf.html /build/1st/wiipdf-1.4/wiipdf.c:114 vs. /build/2/wiipdf-1.4/2nd/wiipdf.c:114 The attached patch fixes this by calling dh_auto_build instead of $(MAKE) from debian/rules, which passes the default build flags including -ffile-prefix-map, which avoids embedding the absolute path in compiled files. Alternately, updating to dh and a newer debhelper-compat level would likely fix this as well, as it includes -ffile-prefix-map by default. With this patch applied, wiipdf should build reproducibly on tests.reproducible-builds.org! live well, vagrant From b5bb2fee67f79baaf5d2d949aa97b8e28dc1b45e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 21:53:21 + Subject: [PATCH] debian/rules: Use dh_auto_build instead of $(MAKE). --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d4b3d3f..6955032 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ build-stamp: dh_testdir # Add here commands to compile the package. - $(MAKE) + dh_auto_build touch $@ -- 2.36.1 signature.asc Description: PGP signature
Bug#1011488: stymulator: reproducible-builds: embedded build paths in various binaries
Source: stymulator Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/ym2wav and /usr/bin/ymplayer: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/stymulator.html /build/1st/stymulator-0.21a~dfsg/src/stsoundlib/YmUserInterface.cpp:40·(discriminator·1) vs. /build/2/stymulator-0.21a~dfsg/2nd/src/stsoundlib/YmUserInterface.cpp:40·(discriminator·1) The attached patch fixes this by setting -ffile-prefix-map in CXXFLAGS in debian/rules, which avoids embedding the absolute path in compiled files. Alternately, switching to use the default CXXFLAGS from dpkg-buildflags (possibly through using a newer debhelper compat version) also would include -ffile-prefix-map by default. With this patch applied, stymulator should build reproducibly on tests.reproducible-builds.org! live well, vagrant From f84eea4a324d31d3c3b6a16847e412984361d067 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 21:25:59 + Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CXXFLAGS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 06c429f..0702ecd 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,9 @@ else CXXFLAGS += -O2 endif +# Avoid embedding the build path +CXXFLAGS += -ffile-prefix-map=$(CURDIR)=. + build: build-stamp build-stamp: dh_testdir -- 2.36.1 signature.asc Description: PGP signature
Bug#1011486: tdfsb: reproducible-builds: embedded build paths in /usr/games/tdfsb
Source: tdfsb Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/games/tdfsb: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tdfsb.html /build/1st/tdfsb-0.0.10/tdfsb.c:2909 vs. /build/2/tdfsb-0.0.10/2nd/tdfsb.c:2909 The attached patch fixes this by adjusting compile.sh to include -ffile-prefix-map in CFLAGS to avoid embedding the absolute path in compiled files. Alternately, updating to a newer version of debhelper-compat and dh, and adjusting debian/patches/set_cflags.diff to only allow setting CFLAGS would allow using the default CFLAGS from dpkg-buildflags. With this patch applied, tdfsb should build reproducibly on tests.reproducible-builds.org! live well, vagrant From cbb0273f0e3bc4264610158b4894d7418a6d1674 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 20:46:06 + Subject: [PATCH 1/4] compile.sh: Add -ffile-prefix-map to CFLAGS. This avoids embedding the build path in the resulting binaries. https://reproducible-builds.org/docs/build-path/ --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index f957eb2..740b227 100755 --- a/compile.sh +++ b/compile.sh @@ -11,7 +11,7 @@ execfind () done; } -CFLAGS="-O2 -Wall -g" +CFLAGS="-O2 -Wall -g -ffile-prefix-map=$(pwd)=." SDL_CONFIG=$(execfind sdl-config sdl11-config sdl10-config sdl12-config \/boot\/develop\/tools/gnupro\/bin\/sdl-config); if ! "$SDL_CONFIG" --version > /dev/null; then -- 2.36.1 signature.asc Description: PGP signature
Bug#1011481: tamil-gtk2im: reproducible-builds: embedded build paths
Source: tamil-gtk2im Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tamil-gtk2im.html /usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0/immodules/anjal-uni.so /build/1st/tamil-gtk2im-2.2/anjal-uni.c:112 vs. /build/2/tamil-gtk2im-2.2/2nd/anjal-uni.c:112 The attached patch fixes this by passing -ffile-prefix-map to gcc in compile-gtk2im.sh, which avoids embedding the absolute build path. With this patch applied, tamil-gtk2im should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 1003f565988783e16a7f84e66d0e719dff956bba Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 20:35:37 + Subject: [PATCH] compile-gtk2im.sh: Pass -ffile-prefix-map to compiler. This avoids embedding the build path in the binaries. https://reproducible-builds.org/docs/build-path/ --- compile-gtk2im.sh | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/compile-gtk2im.sh b/compile-gtk2im.sh index 77900a2..13de96a 100755 --- a/compile-gtk2im.sh +++ b/compile-gtk2im.sh @@ -1,51 +1,51 @@ #!/bin/sh -libtool --mode=compile gcc -DHAVE_CONFIG_H \ +libtool --mode=compile gcc -ffile-prefix-map=$(pwd)=. -DHAVE_CONFIG_H \ `pkg-config --cflags gtk+-2.0` \ -g -O2 -Wall -D_GNU_SOURCE -c \ -o tamil99-tsc.lo tamil99-tsc.c -libtool --mode=link gcc -g -O2 -Wall -D_GNU_SOURCE \ +libtool --mode=link gcc -ffile-prefix-map=$(pwd)=. -g -O2 -Wall -D_GNU_SOURCE \ -o tamil99-tsc.la -rpath ~/.gtk-2.0/immodules \ -rpath ~/.gtk-2.0/immodules -avoid-version -module \ tamil99-tsc.lo `pkg-config --libs gtk+-2.0` -libtool --mode=compile gcc -DHAVE_CONFIG_H \ +libtool --mode=compile gcc -ffile-prefix-map=$(pwd)=. -DHAVE_CONFIG_H \ `pkg-config --cflags gtk+-2.0` \ -g -O2 -Wall -D_GNU_SOURCE -c \ -o tamil99-uni.lo tamil99-uni.c -libtool --mode=link gcc -g -O2 -Wall -D_GNU_SOURCE \ +libtool --mode=link gcc -ffile-prefix-map=$(pwd)=. -g -O2 -Wall -D_GNU_SOURCE \ -o tamil99-uni.la -rpath ~/.gtk-2.0/immodules \ -rpath ~/.gtk-2.0/immodules -avoid-version -module \ tamil99-uni.lo `pkg-config --libs gtk+-2.0` -libtool --mode=compile gcc -DHAVE_CONFIG_H \ +libtool --mode=compile gcc -ffile-prefix-map=$(pwd)=. -DHAVE_CONFIG_H \ `pkg-config --cflags gtk+-2.0` \ -g -O2 -Wall -D_GNU_SOURCE -c \ -o tavpim-tsc.lo tavpim-tsc.c -libtool --mode=link gcc -g -O2 -Wall -D_GNU_SOURCE \ +libtool --mode=link gcc -ffile-prefix-map=$(pwd)=. -g -O2 -Wall -D_GNU_SOURCE \ -o tavpim-tsc.la -rpath ~/.gtk-2.0/immodules \ -rpath ~/.gtk-2.0/immodules -avoid-version -module \ tavpim-tsc.lo `pkg-config --libs gtk+-2.0` -libtool --mode=compile gcc -DHAVE_CONFIG_H \ +libtool --mode=compile gcc -ffile-prefix-map=$(pwd)=. -DHAVE_CONFIG_H \ `pkg-config --cflags gtk+-2.0` \ -g -O2 -Wall -D_GNU_SOURCE -c \ -o tavpim-uni.lo tavpim-uni.c -libtool --mode=link gcc -g -O2 -Wall -D_GNU_SOURCE \ +libtool --mode=link gcc -ffile-prefix-map=$(pwd)=. -g -O2 -Wall -D_GNU_SOURCE \ -o tavpim-uni.la -rpath ~/.gtk-2.0/immodules \ -rpath ~/.gtk-2.0/immodules -avoid-version -module \ tavpim-uni.lo `pkg-config --libs gtk+-2.0` -libtool --mode=compile gcc -DHAVE_CONFIG_H \ +libtool --mode=compile gcc -ffile-prefix-map=$(pwd)=. -DHAVE_CONFIG_H \ `pkg-config --cflags gtk+-2.0` \ -g -O2 -Wall -D_GNU_SOURCE -c \ -o anjal-uni.lo anjal-uni.c -libtool --mode=link gcc -g -O2 -Wall -D_GNU_SOURCE \ +libtool --mode=link gcc -ffile-prefix-map=$(pwd)=. -g -O2 -Wall -D_GNU_SOURCE \ -o anjal-uni.la -rpath ~/.gtk-2.0/immodules \ -rpath ~/.gtk-2.0/immodules -avoid-version -module \ anjal-uni.lo `pkg-config --libs gtk+-2.0` -- 2.36.1 signature.asc Description: PGP signature
Bug#1011480: libxsettings-client: reproducible-builds: embedded build paths
Source: libxsettings-client Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/libXsettings-client.so.0.0.0: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libxsettings-client.html /build/1st/libxsettings-client-0.17/xsettings-client.c:340 vs. /build/2/libxsettings-client-0.17/2nd/xsettings-client.c:340 The attached patch fixes this by setting -ffile-prefix-map in CFLAGS in debian/rules, which avoids embedding the absolute build path. Alternately, switching to use a newer debhelper compat level and the dh build system would likely also fix this, as it includes -ffile-prefix-map by default. With this patch applied, libxsettings-client should build reproducibly on tests.reproducible-builds.org! live well, vagrant From d6c7a37cac9771a19cb4131d92970f5812e1cdce Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 20:18:03 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map via CFLAGS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 69c4f21..2ae7593 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,9 @@ else CFLAGS += -O2 endif +# Avoid embedding build path +CFLAGS += -ffile-prefix-map=$(CURDIR)=. + # shared library versions, option 1 version=1.0.0 major=1 -- 2.36.1 signature.asc Description: PGP signature
Bug#1011479: fstrcmp: reproducible-builds: embedded build paths
Source: fstrcmp Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in debug symbols: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/fstrcmp.html ./usr/lib/debug/usr/bin/fstrcmp 0» (line_strp)» (offset:·0x0):·/build/1st/fstrcmp-0.7.D001 vs. 0» (line_strp)» (offset:·0xf):·/build/2/fstrcmp-0.7.D001/2nd The attached patch fixes this by setting -ffile-prefix-map in CFLAGS in debian/rules, which avoids embedding the absolute build path. Alternately, switching to use a newer debhelper compat level and the dh build system would likely also fix this, as it includes -ffile-prefix-map by default. With this patch applied, fstrcmp should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 2427b3099e9ab739f9a9e6e1395fb978fd394e62 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 19:36:47 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map via CFLAGS. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 9c76c56..9ffe622 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ else CFLAGS += -O2 endif +# Avoid embedding the build path +CFLAGS += -ffile-prefix-map=$(CURDIR)=. + config.status: configure dh_testdir dh_autotools-dev_updateconfig -- 2.36.1 signature.asc Description: PGP signature
Bug#1011478: scsitools: reproducible-builds: embedded build paths in various binaries
Source: scsitools
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in various binaries:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/scsitools.html
/sbin/scsi-spin
/build/1st/scsitools-0.12/debian/scsi-spin.c:290
vs.
/build/2/scsitools-0.12/2nd/debian/scsi-spin.c:290
The attached patch fixes this by setting -ffile-prefix-map in CFLAGS,
and explicitly passing CFLAGS to make in debian/rules. The
-ffile-prefix-map compiler flag is used to avoid embedding the absolute
path in compiled files.
Alternately, switching to use the default CFLAGS from dpkg-buildflags
(possibly through using a newer debhelper compat version) also would
include -ffile-prefix-map by default.
With this patch applied, scsitools should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From 271eb71f9c87d7bab1080b5db52f3468f7acec52 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 23 May 2022 19:19:28 +
Subject: [PATCH] debian/rules: Pass -ffile-prefix-map via CFLAGS.
---
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 2adc025..32ba7b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Derived from debhelper/dh_make example, and Cristoph Lameter's file. -joy
#export DH_VERBOSE=1
-CFLAGS = -g -O2 -Wall -fsigned-char
+CFLAGS = -g -O2 -Wall -fsigned-char -ffile-prefix-map=$(CURDIR)=.
#architecture := $(shell dpkg-architecture -qDEB_HOST_ARCH)
p = scsitools
@@ -11,7 +11,7 @@ p = scsitools
dh $@
override_dh_auto_build:
- cd scsiinfo && $(MAKE) KERNEL_INCLUDES="-fsigned-char" LDFLAGS=
+ cd scsiinfo && $(MAKE) KERNEL_INCLUDES="-fsigned-char" LDFLAGS= CFLAGS="$(CFLAGS)"
cd scsidev && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
--mandir='${prefix}'/share/man && $(MAKE)
cd sraw && gcc $(CFLAGS) -o sraw srawread.c
--
2.36.1
signature.asc
Description: PGP signature
Bug#1011471: mgdiff: reproducible-builds: embedded build paths in /usr/bin/mgdiff
Source: mgdiff Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/mgdiff: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/mgdiff.html /build/1st/mgdiff-1.0/mgdiff.c:1057 vs. /build/2/mgdiff-1.0/2nd/mgdiff.c:1057 The attached patch fixes this by explicitly passing CFLAGS to make in debian/rules, which includes the -ffile-prefix-map argument to avoid embedding the absolute path in compiled files. With this patch applied, mgdiff should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 4aa0b48b924de1a73b5cbe541b4adfafe832e013 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 17:06:51 + Subject: [PATCH] debian/rules: Explicitly pass CFLAGS to make. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1df2c00..152626e 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ build-arch: dh_testdir xmkmf make depend XMULIBONLY="" - make XMULIBONLY="" + make XMULIBONLY="" CFLAGS="$(CFLAGS)" touch build clean: -- 2.36.1 signature.asc Description: PGP signature
Bug#1011470: libapache2-mod-authz-unixgroup: reproducible-builds: embedded build paths in mod_authz_unixgroup.so
Source: libapache2-mod-authz-unixgroup Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/apache2/modules/mod_authz_unixgroup.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libapache2-mod-authz-unixgroup.html /build/1st/libapache2-mod-authz-unixgroup-1.1.0/mod_authz_unixgroup.c:174 vs. /build/2/libapache2-mod-authz-unixgroup-1.1.0/2nd/mod_authz_unixgroup.c:174 The attached patch fixes this by passing -ffile-prefix-map to axps2 in debian/rules, which avoids embedding the build path in compiled files. With this patch applied, libapache2-mod-authz-unixgroup should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 62a59b080b5a4cd133e1c712630de73bdbb695eb Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 16:47:14 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map to apxs2. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2871a43..10368c9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f override_dh_auto_build: - apxs2 -c -Wc,-fno-strict-aliasing mod_authz_unixgroup.c + apxs2 -c -Wc,-fno-strict-aliasing -Wc,-ffile-prefix-map=$(CURDIR)=. mod_authz_unixgroup.c %: dh $@ --with=apache2 -- 2.36.1 signature.asc Description: PGP signature
Bug#1011469: transcalc: reproducible-builds: embedded build paths in /usr/bin/transcalc
Source: transcalc Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/transcalc: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/transcalc.html /build/1st/transcalc-0.14/src/transcalc.c:214 vs. /build/2/transcalc-0.14/2nd/src/transcalc.c:214 The attached patch fixes this by explicitly passing CFLAGS to dh_auto_build in debian/rules, which includes the -ffile-prefix-map argument to avoid embedding the absolute path in compiled files. With this patch applied, transcalc should build reproducibly on tests.reproducible-builds.org! live well, vagrant From e1037e5dba192180108fc12d38563118febaef48 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 May 2022 16:33:58 + Subject: [PATCH] debian/rules: Explicitly pass CFLAGS to dh_auto_build. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1cfd3a6..39dd180 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all dh $@ override_dh_auto_build: - dh_auto_build + dh_auto_build -- CFLAGS="$(CFLAGS)" [ -e docs/transcalc.1.d-r-orig ] || cp -p docs/transcalc.1 docs/transcalc.1.d-r-orig docbook-to-man docs/transcalc.sgml > docs/transcalc.1 -- 2.36.1 signature.asc Description: PGP signature
Bug#1011429: dds2tar: reproducible-builds: embedded build paths in /usr/bin/dds-dd
Source: dds2tar
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/bin/dds-dd:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/dds2tar.html
/build/1st/dds2tar-2.5.2/dds2tar.c:382
vs.
/build/2/dds2tar-2.5.2/2nd/dds2tar.c:382
The attached patch fixes this by adjusting the Makefile to add CFLAGS to
the CCFLAGS variable, which includes the -ffile-prefix-map argument to
avoid embedding the absolute path in compiled files.
With this patch applied, dds2tar should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From 0e9712a9542c383a7445599ebe1d14abe212349b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sun, 22 May 2022 17:58:40 +
Subject: [PATCH] Makefile: Add CFLAGS to CCFLAGS.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3ecfad4..2f662c7 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ CCOPT=$(HPDAT) $(HPDAT4) $(EXP_STUFF) $(MATCH) $(BUFFER) \
D=dds2tar-${V}
-CCFLAGS=-DVERSION=\"$V\"
+CCFLAGS=$(CFLAGS) -DVERSION=\"$V\"
TAR=tar
ARCHIVE=\
--
2.36.1
signature.asc
Description: PGP signature
Bug#1011428: cdbackup: reproducible-builds: embedded build paths in various binaries
Source: cdbackup Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/cdbackup and /usr/bin/cdrestore: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/cdbackup.html /build/1st/cdbackup-0.7.1/cdbackup.c:421 vs. /build/2/cdbackup-0.7.1/2nd/cdbackup.c:421 The attached patch fixes this by explicitly passing CFLAGS to dh_auto_build in debian/rules, which includes the -ffile-prefix-map argument to avoid embedding the absolute path in compiled files. With this patch applied, cdbackup should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 5cc4d882ffe7bd447c315e43ced64bbee1b9a4ac Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 22 May 2022 17:40:35 + Subject: [PATCH] debian/rules: Explicitly pass CFLAGS to dh_auto_build. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 123ed55..4618c51 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,9 @@ %: dh $@ +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(CFLAGS)" + # Use override_dh_* targets to customize this. # --- # Followings are the old debian/rules -- 2.36.1 signature.asc Description: PGP signature
Bug#1011405: autoclass: reproducible-builds: build path triggers differing buildid
Source: autoclass Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is triggers different buildid in /usr/bin/autoclass: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/autoclass.html ... Build·ID:·f5e1b2ff65fbb0f313e8226b27292971816a02ad vs. ... Build·ID:·22e32d5a1dcc2e0b76bf97d7607bc09be61dbbd1 The attached patch fixes this by passing -ffile-prefix-map to CFLAGS in debian/rules, and passing CFLAGS to make. Alternately (maybe even preferably), updating to "dh" build system and updating debhelper compat level might also fix the issue. With this patch applied, autoclass should build reproducibly on tests.reproducible-builds.org! live well, vagrant From c0fc985e2f2d58efef2e89bd5d90bdf8f66e137b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 22 May 2022 01:27:31 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map via CFLAGS to make. Without this argument, the build path gets embedded in the binaries. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 9cb0546..ccf2f2e 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ # Note: when changing the debhelper compatibility level, also update # the dependency in debian/control (e.g. "debhelper (>= 7)") -CFLAGS = -Wall -g +CFLAGS = -Wall -g -ffile-prefix-map=$(CURDIR)=. INSTALL = install INSTALL_FILE= $(INSTALL) -p-o root -g root -m 644 INSTALL_PROGRAM = $(INSTALL) -p-o root -g root -m 755 @@ -65,7 +65,7 @@ build-stamp: dh_testdir # Add here commands to compile the package. - (cd prog; $(MAKE) $(MAKEFLAGS)) + (cd prog; $(MAKE) $(MAKEFLAGS) CFLAGS="$(CFLAGS)") # assemble changelog in reverse chronological order -rm changelog -- 2.36.1 signature.asc Description: PGP signature
Bug#1011402: razor: reproducible-builds: embedded build paths in deHTMLxs.so
Source: razor
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in
./usr/lib/x86_64-linux-gnu/perl5/5.34/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/razor.html
/build/1st/razor-2.85/Razor2-Preproc-deHTMLxs/_deHTMLxs.c:56
vs.
/build/2/razor-2.85/2nd/Razor2-Preproc-deHTMLxs/_deHTMLxs.c:56
The attached patch fixes this by updating to use debhelper compat level
13 and switching to use "dh" in debian/rules. This passes the default
CFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map
argument to avoid embedding the absolute path in compiled files.
To make the switch, it was also easiest to also switch to "3.0 (quilt)"
at the same time, so this also closes #1007665.
With this patch applied, razor should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From b4521516222b4d2b26d947bdc7fa320eed960071 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Fri, 20 May 2022 06:02:16 +
Subject: [PATCH 02/13] Switch to debhelper compat 13, dh and source format
"3.0 (quilt)". (Closes: #1007665)
---
debian/compat| 1 -
debian/control | 2 +-
debian/rules | 67 ++--
debian/source/format | 1 +
4 files changed, 10 insertions(+), 61 deletions(-)
delete mode 100644 debian/compat
create mode 100644 debian/source/format
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index 107b676..a0ac766 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: razor
Section: mail
Priority: optional
Maintainer: Debian QA Group
-Build-Depends: debhelper (>= 7), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), liburi-perl, quilt (>= 0.40)
+Build-Depends: debhelper-compat (= 13), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), liburi-perl
Standards-Version: 3.8.1
Homepage: http://razor.sourceforge.net
Vcs-git: git://git.debian.org/git/users/derevko-guest/razor.git
diff --git a/debian/rules b/debian/rules
index f76f976..af29c29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,20 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
+%:
+ dh $@
-build: $(QUILT_STAMPFN) configure-stamp build-stamp
-build-stamp:
- dh_testdir
- perl Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
+override_dh_auto_build:
+ dh_auto_build
pod2text Changes > changelog
- touch build-stamp
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
+override_dh_auto_clean:
rm -f changelog
- dh_clean
+ dh_auto_clean -- realclean
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/razor
+override_dh_auto_install:
+ dh_auto_install
echo "# See razor-agent.conf (5)" > $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "# Change this to 5 for safer classification of MIME attachments. This will let more spam through" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "logic_method = 4" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
@@ -44,33 +23,3 @@ install: build
cp $(CURDIR)/debian/razor-client.1p $(CURDIR)/debian/razor/usr/share/man/man1
mv $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2/* $(CURDIR)/debian/razor/usr/share/perl5/Razor2/
rmdir $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
- dh_installchangelogs changelog
- dh_installlogrotate
- dh_installlogcheck
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-build-arch: build
-build-indep: build
-binary: binary-arch binary-indep
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
2.35.1
signature.asc
Description: PGP signature
Bug#1011257: coinor-osi: reproducible-builds: Embedded build path in example Makefile
Source: coinor-osi Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/share/doc/coinor-libosi-doc/examples/Makefile.gz: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/coinor-osi.html CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/1st/coinor-osi-0.108.6+repack1=.·-fstack-protector-strong ... vs. CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/2/coinor-osi-0.108.6+repack1/2nd=.·-fstack-protector-strong ... The attached patch fixes this by replacing the build path with a placeholder string in debian/rules. With this patch applied coinor-osi should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining coinor-osi! live well, vagrant From 75e8dab1279e54e282cfb51d9f1ef450155cae88 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 19 May 2022 00:17:25 + Subject: [PATCH] debian/rules: Add dh_installexamples override to remove the build path from the example Makefile. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 88e40ca..102c30e 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,7 @@ override_dh_auto_build: dh_auto_build -- make doxydoc $(RM) doxydoc/html/*.md5 doxydoc/html/*.dot doxydoc/html/*.map + +override_dh_installexamples: + sed -i -e "s,$(CURDIR),BUILDPATH,g" Osi/examples/Makefile + dh_installexamples -- 2.36.1 signature.asc Description: PGP signature
Bug#1011109: bitstormlite: reproducible-builds: embedded build paths in /usr/bin/bitstormlite
Source: bitstormlite
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/bin/bitstormlite:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/bitstormlite.html
/build/1st/bitstormlite-0.2q/src/bstring.h:37
vs.
/build/2/bitstormlite-0.2q/2nd/src/bstring.h:37
The attached patch fixes this by updating to debhelper compat 13, which
includes -ffile-prefix-map in the various build flags and avoids
embedding the build paths in the binaries.
With this patch applied, bitstormlite should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From fd6750aa0733200a9622b273b48a33d0ef53964a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Tue, 17 May 2022 01:54:27 +
Subject: [PATCH 2/5] Update to debhelper-compat 13.
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 9 -
3 files changed, 9 insertions(+), 3 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
index 702a8fb..f8abb4d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Debian QA Group
Homepage: http://sourceforge.net/projects/bbom/
-Build-Depends: debhelper (>= 8.0.0), pkg-config, libgtk2.0-dev, libcurl4-gnutls-dev, autotools-dev
+Build-Depends: debhelper-compat (= 13), pkg-config, libgtk2.0-dev, libcurl4-gnutls-dev
Standards-Version: 3.9.3
Package: bitstormlite
diff --git a/debian/rules b/debian/rules
index 9109369..eb91fdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,11 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
+
%:
- dh $@ --with autotools_dev
+ dh $@
+
+override_dh_autoreconf:
+
+override_dh_auto_configure:
+ ./configure --build=$(DEB_HOST_MULTIARCH) --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/$(DEB_HOST_MULTIARCH) --disable-maintainer-mode --disable-dependency-tracking
--
2.30.2
signature.asc
Description: PGP signature
Bug#1011104: convlit: reproducible-builds: embedded build paths in /usr/bin/clit
Source: convlit Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/clit: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/convlit.html /build/1st/convlit-1.8/clit18/clit.c:109 vs. /build/2/convlit-1.8/2nd/clit18/clit.c:109 The first patch fixes this by passing -ffile-prefix-map to CFLAGS in debian/rules, which avoids embedding the build paths in the binaries. The second patch fixes this by completing the transition to the dh build system, which includes -ffile-prefix-map in CFLAGS by default. With these patches applied, convlit should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 3aaf27ae4627bcc32dd6e7c877f2e16891808f20 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 16 May 2022 21:31:09 + Subject: [PATCH 1/2] debian/rules: Pass -ffile-prefix-map in CFLAGS to avoid embedding build paths. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 60c65ac..d18f93e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,10 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CFLAGS += -O2 endif + +# Avoid embedding the build path for reproducible builds +CFLAGS += -ffile-prefix-map=$(CURDIR)=. + export CFLAGS -- 2.35.1 From 55cac9ca7525b81f670c5ee7df8b6145370aa8cd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 16 May 2022 21:36:05 + Subject: [PATCH 2/2] debian/rules: Finish conversion to dh. --- debian/rules | 61 +++- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/debian/rules b/debian/rules index d18f93e..40ffb83 100755 --- a/debian/rules +++ b/debian/rules @@ -11,59 +11,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ -CFLAGS := -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O2 -endif +override_dh_auto_build: + dh_auto_build --sourcedir=$(CURDIR)/lib + dh_auto_build --sourcedir=$(CURDIR)/clit18 -# Avoid embedding the build path for reproducible builds -CFLAGS += -ffile-prefix-map=$(CURDIR)=. +override_dh_auto_clean: + dh_auto_clean --sourcedir=$(CURDIR)/clit18 + dh_auto_clean --sourcedir=$(CURDIR)/lib + dh_auto_clean -export CFLAGS - - -build: build-stamp -build-stamp: - dh_testdir - $(MAKE) -C $(CURDIR)/lib - $(MAKE) -C $(CURDIR)/clit18 - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) -C $(CURDIR)/clit18 clean - $(MAKE) -C $(CURDIR)/lib clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_install - -binary-indep: -# do nothing - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples +override_dh_installman: dh_installman debian/clit.1 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install -- 2.35.1 signature.asc Description: PGP signature
Bug#1011036: mailfront: reproducible-builds: build path triggers differing buildid
Source: mailfront Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is triggers different buildid in /usr/lib/mailfront/*.so: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/mailfront.html ./usr/lib/mailfront/backend-echo.so ...NT_GNU_BUILD_ID·(unique·build·ID·bitstring)»...Build·ID:·018da3a354a5af384c85c7ec0a93f96d596038bc vs. ...NT_GNU_BUILD_ID·(unique·build·ID·bitstring)»...Build·ID:·9e821d0b9661312dde9181fc7619275241606d73 The attached patch fixes this by passing -ffile-prefix-map to CFLAGS in debian/rules. Alternately, updating to "dh" build system and updating debhelper compat level might also fix the issue. There is another outstanding reproducibility issue(sort order of md5sum files), but applying this patch should significantly reduce the differences when tested on tests.reproducible-builds.org. live well, vagrant From d54ca93264cde955a9b60646a0b796936c0813cb Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 15 May 2022 20:05:44 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map via CFLAGS to avoid embedding build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0662d3f..b9257ab 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f CC =gcc -CFLAGS =-W -Wall -Wshadow -O2 -g +CFLAGS =-W -Wall -Wshadow -O2 -g -ffile-prefix-map=$(CURDIR)=. STRIP =strip ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -- 2.36.1 signature.asc Description: PGP signature
Bug#1011034: fusesmb: reproducible-builds: embedded build paths in various binaries
Source: fusesmb Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries such as /usr/bin/fusesmb and /usr/bin/fusesmb.cache: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/fusesmb.html /build/1st/fusesmb-0.8.7/fusesmb.c:1003 vs. /build/2/fusesmb-0.8.7/2nd/fusesmb.c:1003 The attached patch fixes this by passing -ffile-prefix-map to CFLAGS in debian/rules. Alternately, updating to "dh" build system and updating debhelper compat level might also fix the issue. With these patches applied, fusesmb should build reproducibly on tests.reproducible-builds.org! live well, vagrant From f9d4e1a9e5af42a96d2db9a4ff893920c789f290 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 15 May 2022 19:49:58 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map in CFLAGS to avoid embedding the build path. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a049f18..46de5fc 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g +CFLAGS = -Wall -g -ffile-prefix-map=$(CURDIR)=. ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 2.36.1 signature.asc Description: PGP signature
Bug#997434: xpaint: FTBFS: -q: invalid option -- '.'
Control: notfound 997434 2.9.1.4-4 On 2022-05-14, Vagrant Cascadian wrote: > Version: 2.9.1.4-4 Given that the fixed version and the originally reported version are the same... mark this as notfound in the original version. Hopefully that actually works. Seems like it was a transient toolchain issue. live well, vagrant signature.asc Description: PGP signature
Bug#1010948: xine-lib-1.2: reproducible-builds: embedded build path in libxine.pc
Source: xine-lib-1.2 Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/lib/x86_64-linux-gnu/pkgconfig/libxine.pc: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xine-lib-1.2.html objcflags=... -ffile-prefix-map=/build/1st/xine-lib-1.2-1.2.12=.·-fstack-protector-strong ... vs. objcflags=... -ffile-prefix-map=/build/2/xine-lib-1.2-1.2.12/2nd=.·-fstack-protector-strong ... The attached patch fixes this by replacing the build path with the placeholder string "BUILDPATH" in the libxine.pc file in a debian/rules dh_install override. With this patch applied, xine-lib-1.2 should build reproducibly on tests.reproducible-builds.org! live well, vagrant From b6e42a46178877dbb613c47d79faf47fd223b990 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 13 May 2022 20:03:04 + Subject: [PATCH] debian/rules: Remove the build path from libxine.pc in dh_install override. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 4a0ec9e..f6ba553 100755 --- a/debian/rules +++ b/debian/rules @@ -51,3 +51,7 @@ override_dh_installdocs: --link-doc=libxine2-bin dh_installdocs -plibxine2-doc --doc-main-package libxine2-doc dh_installdocs --remaining-packages + +override_dh_install: + dh_install + sed -i -e "s,$(CURDIR),BUILDPATH,g" debian/libxine2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libxine.pc -- 2.30.2 signature.asc Description: PGP signature
Bug#1010944: quelcom: reproducible-builds: embedded build paths in various binaries
Source: quelcom Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in various binaries in /usr/lib/quelcom: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/quelcom.html /usr/lib/quelcom/libqextra.so /build/1st/quelcom-0.4.0/lib/qexception.cc:7 vs. /build/2/quelcom-0.4.0/2nd/lib/qexception.cc:7 The attached patches fix this by modifying the upstream makefiles to append EXTRA_CXXLAGS to CFLAGS, converting debian/rules to dh, and passing EXTRA_CXXFLAGS in debian/rules in a dh_auto_build phase. This passes the default CXXFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map argument to avoid embedding the absolute path in compiled files. With these patches applied, quelcom should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 051bea5271ccb4de5a86d7dfc6e3337e8347e212 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 13 May 2022 18:02:46 + Subject: [PATCH 1/7] debian/rules: Convert to "dh". --- debian/rules | 67 ++-- 1 file changed, 12 insertions(+), 55 deletions(-) diff --git a/debian/rules b/debian/rules index 3c8c350..11c79ee 100755 --- a/debian/rules +++ b/debian/rules @@ -1,41 +1,16 @@ #!/usr/bin/make -f -# $Id: rules 784 2012-01-17 09:28:07Z aqua $ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -# To resolve shlib dependencies at runtime, we need to take the annoying step -# of wrapping the executables in a shell script that can add a private library -# path to $LD_LIBRARY_PATH, then invoke the real binary from /usr/lib/quelcom/. -# This seemed the least odious of the available options. - -build: build-stamp build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: - dh_testdir - # stripping is disabled during the build so that it can - # be done (or not) by dh_strip - $(MAKE) PREFIX=/usr STRIP=/bin/true - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) clean +dh_clean: + dh_clean # Clean up the HTML docs rm -rf doc/quelcom doc/html - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs +override_dh_auto_install: # binaries go to /usr/lib/quelcom for use by the wrapper - $(MAKE) \ + dh_auto_install -- \ PREFIX=$(CURDIR)/debian/quelcom/usr \ INFODIR=$(CURDIR)/debian/quelcom/usr/share/info \ BINDIR=$(CURDIR)/debian/quelcom/usr/lib/quelcom \ @@ -52,30 +27,12 @@ install: build # be given a more suitable name later on mv doc/quelcom doc/html -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog +override_dh_installdocs: dh_installdocs README doc/html doc/quelcom.txt - dh_installexamples - dh_install - dh_installinfo + +override_dh_installman: dh_installman debian/manpages/* - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - LD_LIBRARY_PATH="$(CURDIR)/debian/quelcom/usr/lib/quelcom" dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_shlibdeps: + dh_shlibdeps + LD_LIBRARY_PATH="$(CURDIR)/debian/quelcom/usr/lib/quelcom" dh_shlibdeps -- 2.30.2 From 61675b60ff40aaa1c73d66ace7c82c71de0ba70f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 13 May 2022 18:07:26 + Subject: [PATCH 2/7] Adjust makefiles to add EXTRA_CXXFLAGS to CXXFLAGS. --- bin/makefile | 2 +- lib/makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/makefile b/bin/makefile index 42fe86e..e857ea8 100644 --- a/bin/makefile +++ b/bin/makefile @@ -13,7 +13,7 @@ all: $(BINTARGETS) # if you don't want to include native language support (=get quelcom messages # in a different language than english) remove -DNLS and -DLOCALEDIR... below # -CXXFLAGS=-g -DNLS -Wall -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -I./../lib +CXXFLAGS=-g -DNLS -Wall -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -I./../lib $(EXTRA_CXXFLAGS) LDFLAGS=-g -lm -L./../lib diff --git a/lib/makefile b/lib/makefile index 1e87ecf..a6bd92c 100644 --- a/lib/makefile +++ b/lib/makefile @@ -7,7 +7,7 @@ all: $(LIBTARGETS) # if you don't want to include native language support (=get quelcom messages # in a different language than english) remove -DNLS below # -CXXFLAGS=-g -DNLS -Wall -fPIC +CXXFLAGS=-g -DNLS -Wall -fPIC $(EXTRA_CXXFLAGS) LDFLAGS=-g -lm MP3LIB=qmp3 qmp3frameheader qtag qreport -- 2.30.2 From
Bug#1010872: efax: reproducible-builds: differing buildid in /usr/bin/efax and /usr/bin/efix
Source: efax Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Both /usr/bin/efax and /usr/bin/efix embed different buildids based on the build path: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/efax.html Build·ID:·bbce73232e3a81a5db70703d12c5ce89ecf11d8d vs. Build·ID:·ec6d84e3221a010689b83ef8327769e2da58cd2d The attached patch fixes this by passing -ffile-prefix-map via CFLAGS in debian/rules to avoid embedding the absolute build paths in binaries. Alternately, this might be solved by switching to using "dh" in debian/rules, which should use the default values for CFLAGS from dpkg-buildflags. With these patches applied, efax should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 40dd43885c275b9e12d180fac692b47cdf4e8af9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 12 May 2022 01:36:10 + Subject: [PATCH] debian/rules: Set -ffile-prefix-map in CFLAGS. https://tests.reproducible-builds.org/debian/issues/unstable/gcc_captures_build_path_issue.html --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index a20babe..1351a73 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,8 @@ else CFLAGS += -O2 endif +# Avoid embedding build paths +CFLAGS += -ffile-prefix-map=$(CURDIR)=. build: build-stamp -- 2.36.1 signature.asc Description: PGP signature
Bug#1010871: dvbtune: reproducible-builds: embedded build paths in various binaries
Source: dvbtune Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/dvbtune and /usr/bin/xml2vdr: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/dvbtune.html /build/1st/dvbtune-0.5.ds/dvbtune.c:140 vs. /build/2/dvbtune-0.5.ds/2nd/dvbtune.c:140 The attached patches fix this by modifying the upstream Makefile to append EXTRA_CFLAGS to CFLAGS, and passing EXTRA_CFLAGS in debian/rules in the dh_auto_build phase. This passes the default CFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map argument to avoid embedding the absolute path in compiled files. With these patches applied, dvbtune should build reproducibly on tests.reproducible-builds.org! live well, vagrant From c041172edf70e46071bcff23ea35baa1688ea219 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 12 May 2022 00:38:57 + Subject: [PATCH 1/3] debian/patches: Allow passing additional CFLAGS via EXTRA_CFLAGS to Makefile. --- ...kefile-allow-passing-additional-cflags.patch | 17 + debian/patches/series | 1 + 2 files changed, 18 insertions(+) create mode 100644 debian/patches/makefile-allow-passing-additional-cflags.patch diff --git a/debian/patches/makefile-allow-passing-additional-cflags.patch b/debian/patches/makefile-allow-passing-additional-cflags.patch new file mode 100644 index 000..5f569d7 --- /dev/null +++ b/debian/patches/makefile-allow-passing-additional-cflags.patch @@ -0,0 +1,17 @@ +From: Vagrant Cascadian +Date: Thu, 12 May 2022 00:34:59 + +X-Dgit-Generated: 0.5.ds-4~20220512~0 b5ac71a0203370a76a210e7897ff0f70090741c4 +Subject: Makefile: Allow passing additional CFLAGS via EXTRA_CFLAGS. + + +--- + +--- dvbtune-0.5.ds.orig/Makefile dvbtune-0.5.ds/Makefile +@@ -1,5 +1,5 @@ + INCS=-I /usr/include/libxml2 +-CFLAGS= -g -Wall $(INCS) -DVERSION=\"$(VERSION)\" ++CFLAGS= -g -Wall $(INCS) -DVERSION=\"$(VERSION)\" $(EXTRA_CFLAGS) + CC=gcc + all: dvbtune + diff --git a/debian/patches/series b/debian/patches/series index b5bb219..ebd13ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 10_options.patch 30_stdint.patch fix_debugbuild.patch +makefile-allow-passing-additional-cflags.patch -- 2.30.2 From a89d2ffd48dfedaffaeeb96ce83520f59845a44e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 12 May 2022 00:35:32 + Subject: [PATCH 2/3] debian/rules: Pass CFLAGS as EXTRA_CFLAGS to dh_auto_build. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 3e0c521..c675009 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,8 @@ VERSION=0.5 override_dh_auto_build: dh_testdir - dh_auto_build -- VERSION=$(VERSION) - dh_auto_build -- VERSION=$(VERSION) xml2vdr + dh_auto_build -- VERSION=$(VERSION) EXTRA_CFLAGS="$(CFLAGS)" + dh_auto_build -- VERSION=$(VERSION) EXTRA_CFLAGS="$(CFLAGS)" xml2vdr #rm -rf $(BUILD_DIR)/scripts/CVS docbook-to-man debian/dvbtune.sgml > dvbtune.1 docbook-to-man debian/xml2vdr.sgml > xml2vdr.1 -- 2.30.2 signature.asc Description: PGP signature
Bug#1010870: pidgin-blinklight: reproducible-builds: embedded build paths in various binaries
Source: pidgin-blinklight
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/lib/purple-2/pidgin-blinklight.so and
/usr/lib/pidgin-blinklight/blinklight-fixperm:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/pidgin-blinklight.html
/build/1st/pidgin-blinklight-0.11.1/src/blinklight-fixperm.c:17
vs.
/build/2/pidgin-blinklight-0.11.1/2nd/src/blinklight-fixperm.c:17
The attached patch fixes this by updating to use debhelper compat level
13 and switching to use "dh" in debian/rules. This passes the default
CFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map
argument to avoid embedding the absolute path in compiled files.
As a bonus, it should also fix https://bugs.debian.org/999100
With this patch applied, pidgin-blinklight should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From f91a7064d8c34845db9495563a156c43e18ce3cc Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Wed, 11 May 2022 21:24:28 +
Subject: [PATCH 1/3] Convert to dh and debhelper-compat 13. (Closes: #999100)
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 99 +-
3 files changed, 10 insertions(+), 92 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index 0d76a65..78b995b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pidgin-blinklight
Section: net
Priority: optional
Maintainer: Debian QA Group
-Build-Depends: debhelper (>= 7), autotools-dev, pidgin-dev, pkg-config
+Build-Depends: debhelper-compat (= 13), pidgin-dev, pkg-config
Standards-Version: 3.8.3
Vcs-Darcs: http://darcs.nomeata.de/pidgin-blinklight.debian
Vcs-Browser: http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=pidgin-blinklight.debian;a=summary
diff --git a/debian/rules b/debian/rules
index 7aa7503..a094b85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,103 +1,22 @@
#! /usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- CFLAGS="$(CFLAGS)" CC="$(CC)" CXX="$(CXX)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib/pidgin-blinklight
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
-CC:=ccache $(CC)
-CXX:=ccache $(CXX)
-endif
-
-config.status: configure
- dh_testdir
- dh_autotools-dev_updateconfig
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure CC="$(CC)" CXX="$(CXX)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib/pidgin-blinklight
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
+override_dh_auto_clean:
+ dh_auto_clean
-rm -f po/*gmo po/stamp-po
- dh_autotools-dev_restoreconfig
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/pidgin-blinklight
+override_dh_auto_install:
+ dh_auto_install
rm -f $(CURDIR)/debian/pidgin-blinklight/usr/lib/purple-2/pidgin-blinklight.la
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
Bug#1010859: libnss-gw-name: reproducible-builds: embedded build paths in libnss_gw_name.so.*
Source: libnss-gw-name
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/lib/x86_64-linux-gnu/libnss_gw_name.so.2:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/libnss-gw-name.html
/build/1st/libnss-gw-name-0.3/libnss_gw_name.c:107
vs.
/build/2/libnss-gw-name-0.3/2nd/libnss_gw_name.c:107
The attached patch fixes this by updating to use debhelper compat level
13 and switching to use "dh" in debian/rules. This passes the default
CFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map
argument to avoid embedding the absolute path in compiled files.
With this patch applied, libnss-gw-name should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From ed3f536000aa1cd8c9d2028abf4a6cb0b679 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Wed, 11 May 2022 16:51:25 +
Subject: [PATCH 2/8] Update to debhelper-compat 13 and switch to "dh".
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 66 ++
3 files changed, 9 insertions(+), 60 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
index 63cb699..3b3a844 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: Debian QA Group
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper-compat (= 13),
pkg-config,
libnl-3-dev,
libnl-route-3-dev,
diff --git a/debian/rules b/debian/rules
index 14dad24..cc1b8f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,14 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+override_dh_auto_build:
+ dh_auto_build -- CFLAGS="$(CFLAGS)"
-CFLAGS = -Wall -g -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
+override_dh_auto_install:
+ dh_auto_install -- libprefix=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-build-arch: build-arch-stamp
-build-indep:
-build: build-arch-stamp
-
-build-arch-stamp:
- dh_testdir
- $(MAKE) CFLAGS="$(CFLAGS)"
- touch build-arch-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch*-stamp
- $(MAKE) clean
+override_dh_auto_clean:
+ dh_auto_clean
rm -f *.o *.so *.so.*
- dh_clean
-
-# Build architecture-independent files here.
-binary-indep: build-indep
-# We have nothing to do
-
-LIBNAME = libnss_gw_name.so.2
-
-# Build architecture-dependent files here.
-binary-arch: build-arch
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) install libprefix=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DESTDIR=$(CURDIR)/debian/libnss-gw-name
- dh_lintian
- dh_installchangelogs
- dh_installdocs
- dh_link
- dh_strip
- dh_makeshlibs
- dh_shlibdeps
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary
--
2.30.2
signature.asc
Description: PGP signature
Bug#1010830: gscanbus: reproducible-builds: embedded build paths in /usr/bin/gscanbus
Source: gscanbus Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/gscanbus: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gscanbus.html /build/1st/gscanbus-0.8/gscanbus.c:973 vs. /build/2/gscanbus-0.8/2nd/gscanbus.c:973 The attached patch fixes this by updating to use debhelper compat level 13, which passes the default CFLAGS from dpkg-buildflags The default CFLAGS include the -ffile-prefix-map argument which is used to avoid embedding the absolute path in compiled files. With this patch applied, gscanbus should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 2555241b30495dbfb432b040d0b4faa4edb16179 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 23:35:32 + Subject: [PATCH 3/5] Update to debhelper-compat 13. debian/control: Remove Build-Depends on dh-autoreconf. debian/rules: Do not pass --autoreconf argument to dh. --- debian/compat | 1 - debian/control | 3 +-- debian/rules | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011..000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control index b168ed5..c5d1b57 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: gscanbus Section: misc Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 7.0.50~), - dh-autoreconf, +Build-Depends: debhelper-compat (= 13), libraw1394-dev, libgtk2.0-dev Standards-Version: 3.9.1 diff --git a/debian/rules b/debian/rules index 87ce356..a4b20b8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,4 +3,4 @@ export LDFLAGS+=-Wl,--as-needed %: - dh $@ --with autoreconf + dh $@ -- 2.35.1 signature.asc Description: PGP signature
Bug#995462: bbrun: fails to build on RISC-V
Control: tags 995462 +moreinfo On 2021-10-01, Heinrich Schuchardt wrote: > Package: bbrun > Version: 1.6-8 > Severity: normal > > Building on RISC-V fails with: > cc1: error: ‘-fno-gnu89-inline’ is only supported in GNU99 or C99 mode > > Please, remove debian/patches/05_gcc5-gnu89.patch Hrm. bbrun 1.6-8 builds successfully on riscv64 with toolchains currently in sid, as well as the few additional commits in git. Are you still able to reproduce the failure? The patch for supporting gcc5 could maybe be dropped regardless if it really isn't needed anymore... live well, vagrant signature.asc Description: PGP signature
Bug#1010828: bbrun: reproducible-builds: embedded build paths in /usr/bin/bbrun
Source: bbrun Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/bbrun: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/bbrun.html /build/1st/bbrun-1.6/bbrun/bbrun.c:59 vs. /build/2/bbrun-1.6/2nd/bbrun/bbrun.c:59 The attached patches fix this by patching the Makefile to accept an EXTRA_CFLAGS variable, and then adjusting debian/rules to pass the default CFLAGS via the EXTRA_CFLAGS variable. The default CFLAGS include the -ffile-prefix-map argument which is used to avoid embedding the absolute path in compiled files. With these patches applied, bbrun should build reproducibly on tests.reproducible-builds.org! live well, vagrant From: Vagrant Cascadian Date: Tue, 10 May 2022 22:11:56 + X-Dgit-Generated: 1.6-9~20220510~0 4fb14836754865a2aaa98583c317a4cc51a84298 Subject: bbrun/Makefile: Allow passing EXTRA_CFLAGS. --- --- bbrun-1.6.orig/bbrun/Makefile +++ bbrun-1.6/bbrun/Makefile @@ -11,7 +11,7 @@ OBJS = bbrun.o \ all: bbrun .c.o: - $(CC) -g -c -O2 -std=gnu89 -Wall $< -o $*.o $(CFLAGS) + $(CC) -g -c -O2 -std=gnu89 -Wall $< -o $*.o $(CFLAGS) $(EXTRA_CFLAGS) bbrun: $(OBJS) $(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS) From 9afb47e8065156467fbcf4f9e5ced3c11121a6d9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 22:13:30 + Subject: [PATCH 2/4] debian/rules: Pass CFLAGS via EXTRA_CFLAGS variable in dh_auto_build. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 2c653ec..6dbcea3 100755 --- a/debian/rules +++ b/debian/rules @@ -5,3 +5,6 @@ override_dh_auto_install: dh_install + +override_dh_auto_build: + dh_auto_build -- EXTRA_CFLAGS="$(CFLAGS)" -- 2.30.2 signature.asc Description: PGP signature
Bug#1010825: lwatch: reproducible-builds: embedded build paths in /usr/bin/lwatch
Source: lwatch Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/lwatch: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/lwatch.html ... -ffile-prefix-map=/build/1st/lwatch-0.6.2=. ... vs. ... -ffile-prefix-map=/build/2/lwatch-0.6.2/2nd=. ... The attached patch to debian/rules fixes this by replacing the build path in src/config.h with the placeholder strong "BUILDPATH" from a dh_auto_configure override. With this patch applied, lwatch should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 371ab1b4af9447a2d51510c71c1285a664f974f8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 21:31:30 + Subject: [PATCH] debian/rules: Remove the buildpath from src/config.h in dh_auto_configure override. https://tests.reproducible-builds.org/debian/issues/unstable/records_build_flags_issue.html --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index a5c66ee..0f74fd1 100755 --- a/debian/rules +++ b/debian/rules @@ -19,3 +19,7 @@ endif override_dh_installdirs: dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/lwatch + +override_dh_auto_configure: + dh_auto_configure + sed -i -e "s,$(CURDIR),BUILDPATH,g" src/config.h -- 2.30.2 signature.asc Description: PGP signature
Bug#1010790: xgammon: reproducible-builds: embedded build paths in /usr/games/xgammon
Source: xgammon Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/games/xgammon: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xgammon.html /build/1st/xgammon-0.99.1128/src/xgammon.c:286 vs. /build/2/xgammon-0.99.1128/2nd/src/xgammon.c:286 The attached patch to debian/rules fixes this by passing CFLAGS to make. Alternately, updating the packaging to use dh/debhelper at a recent compat level would also likely fix this. With this patch applied, xgammon should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 60b8556299e2e12bbebbe38e463757f2635a72b8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 02:27:23 + Subject: [PATCH] debian/rules: Pass CFLAGS to make. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3ea1ac6..f63f8c8 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ build: build-stamp build-stamp: dh_testdir cd src && imake -I/usr/lib/X11/config - cd src && $(MAKE) + cd src && $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp clean: -- 2.36.0 signature.asc Description: PGP signature
Bug#1010789: xarclock: reproducible-builds: embedded build paths in /usr/bin/xarclock
Source: xarclock Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/xarclock: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xarclock.html /build/1st/xarclock-1.0/xarclock.c:151 vs. /build/2/xarclock-1.0/2nd/xarclock.c:151 The attached patch to debian/rules fixes this by passing CFLAGS to dh_auto_build. With this patch applied, xarclock should build reproducibly on tests.reproducible-builds.org! live well, vagrant From 5a7f01285d8bc22d9e7e758d00b71b8c564a383f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 01:23:39 + Subject: [PATCH 1/4] debian/rules: Pass CFLAGS to dh_auto_build. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 77c0408..9431470 100755 --- a/debian/rules +++ b/debian/rules @@ -7,4 +7,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_build: xmkmf - dh_auto_build + dh_auto_build -- CFLAGS="$(CFLAGS)" -- 2.35.1 signature.asc Description: PGP signature
Bug#1010787: sgml-base-doc: reproducible builds: Build date embedded in documentation
Source: sgml-base-doc Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build date is embedded in various documentation: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/sgml-base-doc.html /usr/share/doc/sgml-base-doc/sgml_layout.html/ch-Other.html 23·April·2022 vs. 26·May·2023 The attached patch fixes this in debian/rules by setting the DEBIANDOC_DATE environment variable based on SOURCE_DATE_EPOCH. Alternately, this variable could also be set to an empty value, which results in no date of any kind. With this patch applied, sgml-base-doc should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining sgml-base-doc! live well, vagrant From af442a242fb76dce0fa1cbe81ff3585574ba53ed Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 10 May 2022 00:08:56 + Subject: [PATCH] debian/rules: Set DEBIANDOC_DATE based on SOURCE_DATE_EPOCH. https://tests.reproducible-builds.org/debian/issues/unstable/debiandoc_sgml_timestamp_issue.html --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 0714fa7..d3778ac 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ PACKAGE = sgml-base-doc PKG_DOCS = sgml_layout.html sgml_layout.pdf sgml_layout.txt +# Ensure reproducible date +export DEBIANDOC_DATE = $(shell date --utc --date=@$(SOURCE_DATE_EPOCH) '+%Y-%m-%d') .SUFFIXES: .html .pdf .sgml .txt .sgml.html: -- 2.36.0 signature.asc Description: PGP signature
Bug#1010785: gdome2: reproducible-builds: embedded build paths libgdome.so.*
Source: gdome2
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/lib/libgdome.so.0.8.1:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/gdome2.html
/build/1st/gdome2-0.8.1+debian/libgdome/gdome.c:65
vs.
/build/2/gdome2-0.8.1+debian/2nd/libgdome/gdome.c:65
The attached patch to debian/rules fixes this by passing
-ffile-prefix-map in CFLAGS and ensuring CFLAGS is passed to configure.
Alternately, updating the packaging to use dh/debhelper at a recent
compat level would also likely fix this.
With this patch applied, gdome2 should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From 65c23dfcbf5fd3a59d4a3141430247225e4d4413 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 9 May 2022 23:06:56 +
Subject: [PATCH] debian/rules: add -ffile-prefix-map to CFLAGS and ensure
CFLAGS are passed in the configure phase.
---
debian/rules | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 5e25754..ae361d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+CFLAGS += -ffile-prefix-map=$(CURDIR)=.
+
configure: configure-stamp
configure-stamp:
dh_testdir
cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
libtoolize -c -f
autoreconf -f -i
- ./configure --prefix=/usr \
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--with-html-dir=\$${prefix}/share/doc/libgdome2-dev
--
2.36.0
signature.asc
Description: PGP signature
Bug#1010781: ragel: reproducible-builds: embedded build paths in /usr/bin/ragel
Source: ragel
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build path is embedded in /usr/bin/ragel:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/ragel.html
/build/1st/ragel-6.10/ragel/main.cpp:462
vs.
/build/2/ragel-6.10/2nd/ragel/main.cpp:462
The attached patch to debian/rules fixes this by also setting CXXFLAGS
and passing it to configure.
Alternately, updating the packaging to use dh/debhelper at a recent
compat level would also likely fix this, or passing
-ffile-prefix-map=$(CURDIR)=. in CFLAGS and CXXFLAGS.
With this patch applied, ragel should build reproducibly on
tests.reproducible-builds.org!
live well,
vagrant
From 55b5bcf491bca1cf98f73819da71a8830741b869 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 9 May 2022 23:26:49 +
Subject: [PATCH] debian/rules: Also pass CXXFLAGS to configure.
---
debian/rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index c695e62..d3b512f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
# for the m68k hack
@@ -9,7 +10,7 @@ export DEB_BUILD_ARCH
config.status: configure
dh_testdir
- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man
build: build-arch build-indep
build-arch: build-stamp
--
2.36.0
signature.asc
Description: PGP signature
Bug#1010486: metapixel: reproducible-builds: Embedded build path in /usr/bin/metapixel
Source: metapixel Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/metapixel and /usr/bin/metapixel-imagesize: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/metapixel.html /build/1st/metapixel-1.0.2/rwimg/readimage.c:115 vs. /build/2/metapixel-1.0.2/2nd/rwimg/readimage.c:115 The attached patch to debian/rules fixes this by passing the -ffile-prefix-map compiler flag via dh_auto_build. With this patch applied metapixel should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining metapixel! live well, vagrant From 66bf12a0ef3d945b04d04adb8904d2146d17ab67 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 15:13:03 + Subject: [PATCH] debian/rules: Pass -ffile-prefix-map to dh_auto_build. This avoids embedding the absolute build path in /usr/bin/metapixel* https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d58bd31..8975aef 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ MANDIR = $(PREFIX)/usr/share/man dh $@ override_dh_auto_build: - dh_auto_build -- MANPAGE_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl + dh_auto_build -- PROFILE="-ffile-prefix-map=$(CURDIR)=." MANPAGE_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl override_dh_auto_install: dh_auto_install -- PREFIX=$(PREFIX) BINDIR=$(BINDIR) MANDIR=$(MANDIR) -- 2.36.0 signature.asc Description: PGP signature
Bug#1010483: coinor-cgl: reproducible-builds: Embedded build path in example Makefile
Source: coinor-cgl Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/share/doc/coinor-libcgl-doc/examples/Makefile: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/coinor-cgl.html CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/1st/coinor-cgl-0.60.3+repack1=.·-fstack... vs. CXXFLAGS·=·-g·-O2·-ffile-prefix-map=/build/2/coinor-cgl-0.60.3+repack1/2nd=.·-fstack... The attached patch fixes this by replacing the build path with a placeholder string in debian/rules. With this patch applied coinor-cgl should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining coinor-cgl! live well, vagrant From ead6f2b5d0b1e0b03d0f607c6d91fa7ef7db8149 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 13:40:30 + Subject: [PATCH] debian/rules: Replace the build path in example Makefile with a placeholder string. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 3e66c59..d471945 100755 --- a/debian/rules +++ b/debian/rules @@ -18,3 +18,7 @@ override_dh_auto_configure: execute_after_dh_auto_build: make doxydoc $(RM) doxydoc/html/*.md5 doxydoc/html/*.dot doxydoc/html/*.map + +execute_before_dh_installexamples: + # Remove full build path from example Makefile + sed -i -e "s,prefix-map=$(CURDIR),prefix-map=BUILDPATH,g" Cgl/examples/Makefile -- 2.30.2 signature.asc Description: PGP signature
Bug#1010466: glob2: reproducible builds: Timestamps embedded in /usr/games/glob2
Source: glob2
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The build timestamp is embedded in /usr/games/glob2.
./usr/games/glob2
-02:00:33
vs.
+02:10:15
This is because scons does not pass the SOURCE_DATE_EPOCH environment
variable by default. The attached patch fixes this by explicitly setting
this in the SConstruct file.
With this patch applied, glob2 should build reproducibly on
tests.reproducible-builds.org!
Thanks for maintaining glob2!
live well,
vagrant
From c0f9d36907677eeef270fab53ea0ce24db8b0a2e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Mon, 2 May 2022 03:15:19 +
Subject: [PATCH] SConstruct: Explicitly add SOURCE_DATE_EPOCH to the
environment.
https://tests.reproducible-builds.org/debian/issues/scons_doesnt_pass_environment_to_build_tools_issue.html
---
SConstruct | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SConstruct b/SConstruct
index 37d03bb..1d17a80 100644
--- a/SConstruct
+++ b/SConstruct
@@ -241,6 +241,8 @@ def main():
except AttributeError:
env.Clone = env.Copy
+env.Append(ENV={'SOURCE_DATE_EPOCH': os.environ['SOURCE_DATE_EPOCH']})
+
if not env['CC']:
print("No compiler found in PATH. Please install gcc or another compiler.")
Exit(1)
--
2.36.0
signature.asc
Description: PGP signature
Bug#1010462: mtink: reproducible-builds: Embedded build path in /usr/bin/mtink
Source: mtink Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/mtink: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/mtink.html /build/1st/mtink-1.0.16/debian/mtink/usr/doc/mtink vs. /build/2/mtink-1.0.16/2nd/debian/mtink/usr/doc/mtink The attached patch fixes this by passing a relative path to Configure's prefix argument. With this patch applied mtink should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining mtink! live well, vagrant From 7d4e9738d539925748d69861c9d25b57101a3b0f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 May 2022 02:23:23 + Subject: [PATCH] debian/rules: Pass relative prefix to Configure avoid embedding the full build path in the binary. https://reproducible-builds.org/docs/build-path/ --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f5c1422..6dc1e47 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_auto_clean: debconf-updatepo override_dh_auto_configure: - ./Configure --no-strip --no-suid -p $(CURDIR)/debian/mtink/usr + ./Configure --no-strip --no-suid -p debian/mtink/usr override_dh_auto_build: $(DOCBOOK_MANPAGE_SOURCES) dh_auto_build -- 2.36.0 signature.asc Description: PGP signature
Bug#1010414: libcec: reproducible builds: Embeds kernel version in libcec.so.*
Source: libcec
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: kernel
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The running kernel of the build machine is embedded in libcec.so.*:
https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/libcec.html
./usr/lib/x86_64-linux-gnu/libcec.so.6.0.2
compiled·on·Linux-5.16.0-0.bpo.4-amd64·...·,·features:·P8_USB,·DRM,·P8_detect,·randr,·Exynos,·Linux,·AOCEC
vs.
compiled·on·Linux-5.10.0-13-amd64·...·,·features:·P8_USB,·DRM,·P8_detect,·randr,·Exynos,·Linux,·AOCEC
The attached patch updates the existing reproducible builds patch to use
CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM (which includes the running
kernel version).
With this patch applied, libcec should build reproducibly on
tests.reproducible-builds.org when it migrates to bookworm/testing!
To get it building reproducibly in unstable and experimental where
differing build paths are tested, it also needs to apply one of the
standard fixes mentioned here:
https://tests.reproducible-builds.org/debian/issues/cmake_rpath_contains_build_path_issue.html
I intend to fix both issues shortly.
Thanks for maintaining libcec!
live well,
vagrant
From 9f3a10d425e92281399a669effdb76e24d02b6ae Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Sat, 30 Apr 2022 23:55:26 +
Subject: [PATCH 2/2] debian/patches: Update reproducible build patch to use
Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM.
CMAKE_SYSTEM contains the running kernel version, which is likely to
be different between two builds.
https://tests.reproducible-builds.org/debian/issues/unstable/captures_kernel_version_via_CMAKE_SYSTEM_issue.html
---
debian/patches/03_reproducible_build.patch | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/patches/03_reproducible_build.patch b/debian/patches/03_reproducible_build.patch
index 8d995bb..3611c36 100644
--- a/debian/patches/03_reproducible_build.patch
+++ b/debian/patches/03_reproducible_build.patch
@@ -1,6 +1,7 @@
Description: Remove non-determinism from build process
.
Author: Balint Reczey
+Updated: Vagrant Cascadian
Forwarded: not-needed
--- a/src/libcec/CMakeLists.txt
+++ b/src/libcec/CMakeLists.txt
@@ -9,7 +10,7 @@ Forwarded: not-needed
# platform and device specific
-include(cmake/SetBuildInfo.cmake)
-+set(LIB_INFO "compiled on ${CMAKE_SYSTEM} ... ")
++set(LIB_INFO "compiled on ${CMAKE_SYSTEM_NAME} ... ")
include(cmake/CheckPlatformSupport.cmake)
## create project groups
--
2.30.2
signature.asc
Description: PGP signature
Bug#994976: xtermcontrol: please make the build reproducible
On 2021-09-24, Chris Lamb wrote: > Whilst working on the Reproducible Builds effort [0] we noticed that > xtermcontrol could not be built reproducibly. ... > --- a/debian/rules2021-09-24 09:20:53.800313098 +0100 > --- b/debian/rules2021-09-24 09:35:32.356026521 +0100 > @@ -5,9 +5,15 @@ > > export DEB_BUILD_MAINT_OPTIONS=hardening=+all > > +PACKAGE_YEAR = $(shell date --utc --date=@$(SOURCE_DATE_EPOCH) '+%Y') > +PACKAGE_DATE = $(shell date --utc --date=@$(SOURCE_DATE_EPOCH) +'%B %d, %Y') I think this should use %Y-%m-%d instead, as %B is a locale-dependent month name. > + > %: > dh $@ > > +override_dh_auto_build: > + dh_auto_build -- PACKAGE_YEAR="$(PACKAGE_YEAR)" > PACKAGE_DATE="$(PACKAGE_DATE)" > + > override_dh_auto_test: > ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) > xvfb-run xterm -e '( dh_auto_test ; echo $$? ) | tee > debian/xterm_dh_auto_test.log' This package appears to be part of the QA team, so could be uploaded by anyone... I'd consider uploading the fix, unless you'd like to do the honors? live well, vagrant signature.asc Description: PGP signature
Bug#1010379: snacc: reproducible builds: timestamp embedded in header files
Source: snacc Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Various header files embed the timestamp when it was generated in comments: https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/snacc.html /usr/include/snacc/c/asn-useful.h ·*This·.h·file·was·generated·by·snacc·on·Fri·May·19·17:42:30·2023 vs. ·*This·.h·file·was·generated·by·snacc·on·Sun·Apr·17·13:25:08·2022 The attached patch fixes this by removing the timestamps from the code that generates the header files. With this patch applied, snacc should become reproducible on tests.reproducible-builds.org! live well, vagrant From d44bf7e4857b23f94319aabf0bd3124a9b11ce58 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 29 Apr 2022 23:05:46 + Subject: [PATCH] reproducible builds: Remove timestamps from generated comments. https://reproducible-builds.org/docs/timestamps/ --- compiler/back-ends/c++-gen/gen-code.c | 4 ++-- compiler/back-ends/c-gen/gen-code.c | 4 ++-- compiler/back-ends/idl-gen/gen-code.c | 2 +- compiler/core/snacc.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/back-ends/c++-gen/gen-code.c b/compiler/back-ends/c++-gen/gen-code.c index d3632dd..8d15682 100644 --- a/compiler/back-ends/c++-gen/gen-code.c +++ b/compiler/back-ends/c++-gen/gen-code.c @@ -170,7 +170,7 @@ PrintHdrComment PARAMS ((hdr, m), fprintf (hdr, "//\n"); fprintf (hdr, "// %s - class definitions for ASN.1 module %s\n", m->cxxHdrFileName, m->modId->name); fprintf (hdr, "//\n"); -fprintf (hdr, "// This file was generated by snacc on %s", ctime ()); +fprintf (hdr, "// This file was generated by snacc"); fprintf (hdr, "// UBC snacc by Mike Sample\n"); fprintf (hdr, "// A couple of enhancements made by IBM European Networking Center\n"); /* 20.8.93 Thomas Meyer */ fprintf (hdr, "\n"); @@ -188,7 +188,7 @@ PrintSrcComment PARAMS ((src, m), fprintf (src, "//\n"); fprintf (src, "// %s - class member functions for ASN.1 module %s\n", m->cxxSrcFileName, m->modId->name); fprintf (src, "//\n"); -fprintf (src, "// This file was generated by snacc on %s", ctime ()); +fprintf (src, "// This file was generated by snacc"); fprintf (src, "// UBC snacc written by Mike Sample\n"); fprintf (src, "// A couple of enhancements made by IBM European Networking Center\n"); /* 20.8.93 Thomas Meyer */ fprintf (src, "\n"); diff --git a/compiler/back-ends/c-gen/gen-code.c b/compiler/back-ends/c-gen/gen-code.c index e5c94d9..a198676 100644 --- a/compiler/back-ends/c-gen/gen-code.c +++ b/compiler/back-ends/c-gen/gen-code.c @@ -182,7 +182,7 @@ PrintCSrcComment PARAMS ((src, m), fprintf (src, "/*\n"); fprintf (src, " *%s\n *\n", m->cSrcFileName); fprintf (src, " *\"%s\" ASN.1 module encode/decode/print/free C src.\n *\n", m->modId->name); -fprintf (src, " *This file was generated by snacc on %s *\n", ctime ()); +fprintf (src, " *This file was generated by snacc *\n"); fprintf (src, " *UBC snacc written by Mike Sample\n *\n"); fprintf (src, " *NOTE: This is a machine generated file - editing not recommended\n"); fprintf (src, " */\n\n\n"); @@ -231,7 +231,7 @@ PrintCHdrComment PARAMS ((f, m), fprintf (f, "/*\n"); fprintf (f, " *%s\n *\n", m->cHdrFileName); fprintf (f, " *\"%s\" ASN.1 module C type definitions and prototypes\n *\n", m->modId->name); -fprintf (f, " *This .h file was generated by snacc on %s *\n", ctime ()); +fprintf (f, " *This .h file was generated by snacc *\n"); fprintf (f, " *UBC snacc written compiler by Mike Sample\n *\n"); fprintf (f, " *NOTE: This is a machine generated file--editing not recommended\n"); fprintf (f, " */\n\n\n"); diff --git a/compiler/back-ends/idl-gen/gen-code.c b/compiler/back-ends/idl-gen/gen-code.c index 9e4c9c2..978e5a6 100644 --- a/compiler/back-ends/idl-gen/gen-code.c +++ b/compiler/back-ends/idl-gen/gen-code.c @@ -70,7 +70,7 @@ PrintComment PARAMS ((idl, m), fprintf (idl, "//\n"); fprintf (idl, "// %s -- IDL for ASN.1 module %s\n", m->idlFileName, m->modId->name); fprintf (idl, "//\n"); -fprintf (idl, "// This file was generated by snacc on %s", ctime ()); +fprintf (idl, "// This file was generated by snacc"); fprintf (idl, "// UBC sna
Bug#1010378: leds-alix: reproducible builds: source tarball embeds timestamps and umask
Source: leds-alix Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps umask X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org leds-alix-source embeds the timestamp and file permissions determined by umask in the leds-alix source tarball: https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/leds-alix.html /usr/src/leds-alix.tar.bz2 -rw-r--r--···0·root·(0)·root·(0)·3610·2022-04-15·23:37:31.00·modules/leds-alix/leds-alix.c vs. -rw-rw-r--···0·root·(0)·root·(0)·3610·2023-05-19·06:01:18.00·modules/leds-alix/leds-alix.c The attached patch fixes this by passing arguments to tar in debian/rules to ensure consistent timestamp, file permissions, sort order, user, group, uid and gid in the generated tarball. With this patch applied, leds-alix should become reproducible on tests.reproducible-builds.org! live well, vagrant From 7f79cf28e70fdc2c0832f10517f29f7a9be3b61e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 29 Apr 2022 21:35:18 + Subject: [PATCH 1/2] debian/rules: Generate tarball reproducibly. Pass arguments to tar to set sort order, timestamps, owner, group and mode. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1068a59..59012aa 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,7 @@ install: build dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian cp Makefile leds-alix.c $(DESTDIR) cp debian/*modules.in* debian/control debian/rules debian/changelog debian/copyright debian/README.Debian $(DESTDIR)/debian - cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + cd debian/$(psource)/usr/src && tar --sort=name --mtime="@$(SOURCE_DATE_EPOCH)" --owner=0 --group=0 --numeric-owner --mode=go=rX,u+rw,a-s --create modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules dh_install binary-indep: build install -- 2.30.2 signature.asc Description: PGP signature
Bug#995741: gcc-arm-none-eabi: reproducible builds: embeds path to various binaries
Source: gcc-arm-none-eabi Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: usrmerge shell X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The paths to various binaries are embedded which differs on a usrmerge vs. non-usrmerge system. https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/gcc-arm-none-eabi.html /usr/lib/gcc/arm-none-eabi/10.3.1/install-tools/fixincl /bin/sed vs. /usr/bin/sed /usr/lib/gcc/arm-none-eabi/10.3.1/install-tools/mkheaders for·shell·in·$CONFIG_SHELL·$SHELL·/bin/bash·/bin/sh·"";·do vs. for·shell·in·$CONFIG_SHELL·$SHELL·/bin/sh·/bin/sh·"";·do Patch attached which passes variables to configure to use the non-usrmerge locations, as usrmerge installations typically have compatibility symlinks, but not vice-versa. The patch also sets variables to ensure consistent values for bash, which can be triggered when /bin/sh points to bash. This patch alone does not fix all reproducibility issues (e.g. build paths, which are only tested on unstable and experimental), but does reduce the number of things that vary in the resulting build. Thanks for maintaining gcc-arm-none-eabi! live well, vagrant From 4ee144c5271da7ab35e866a8aa84ad4b74b22021 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 12 Oct 2021 02:21:23 + Subject: [PATCH 1/2] debian/rules: Pass variables to configure to make the package build reproducibly regardless of usrmerge. The variables SED, SHELL, BASH and CONFIG_SHELL should all point to their non-usrmerge locations. https://tests.reproducible-builds.org/debian/issues/paths_vary_due_to_usrmerge_issue.html --- debian/rules | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a3d2833a4..07d9a2571 100755 --- a/debian/rules +++ b/debian/rules @@ -65,7 +65,11 @@ CONFIGURE_GCC_FLAGS = \ --without-newlib \ $(MULTILIB_LIST) \ $(BUILDFLAGS) \ - $(TARGET_TOOLS) + $(TARGET_TOOLS) \ + SED=/bin/sed \ + SHELL=/bin/sh \ + BASH=/bin/bash \ + CONFIG_SHELL=/bin/bash \ %: dh $@ -D$(GCC_SOURCE_DIR) -B$(GCC_BUILD_DIR) --parallel --with autoreconf -- 2.30.2 signature.asc Description: PGP signature
Bug#995654: malaga: reproducible builds: Embedded timestamps in .dvi, .pdf and .ps files
On 2021-10-03, Vagrant Cascadian wrote: > The attached patch fixes this by setting FORCE_SOURCE_DATE=1 in > debian/rules, which texlive needs in order to respect SOURCE_DATE_EPOCH, > which is set during debian package builds to the timestamp in the latest > debian/changelog entry. > > https://reproducible-builds.org/docs/source-date-epoch/ > > With this patch applied, malaga should build reproducibly on > tests.reproducible-builds.org And the promised patch is now attached... live well, vagrant From 24c0e16021648a78ae007c61af22f495625ca029 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 3 Oct 2021 17:11:26 + Subject: [PATCH] debian/rules: Export FORCE_SOURCE_DATE=1 in order for texlive to respect SOURCE_DATE_EPOCH when generating .dvi, .pdf and .ps files. https://reproducible-builds.org/docs/source-date-epoch/ --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index bf19ee8..dcc7ec8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +# Ensure texlive respects SOURCE_DATE_EPOCH +export FORCE_SOURCE_DATE=1 + %: dh $@ --with autoreconf -- 2.33.0 signature.asc Description: PGP signature
