Bug#1020662: log4cpp: reproducible-builds: Embedded build path in log4cpp-config
tags 1020662 + pending patch thanks I've just uploaded log4cpp 1.1.3-3.1 to DELAYED/10: log4cpp (1.1.3-3.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to avoid embedding the build path in the log4cpp-config file. (Closes: #1020662) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for log4cpp-1.1.3 log4cpp-1.1.3 changelog |8 rules |5 + 2 files changed, 13 insertions(+) diff -Nru log4cpp-1.1.3/debian/changelog log4cpp-1.1.3/debian/changelog --- log4cpp-1.1.3/debian/changelog 2020-07-05 14:11:37.0 +0100 +++ log4cpp-1.1.3/debian/changelog 2023-01-10 16:28:21.0 + @@ -1,3 +1,11 @@ +log4cpp (1.1.3-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to avoid embeddedng the build path in +the log4cpp-config file. (Closes: #1020662) + + -- Chris Lamb Tue, 10 Jan 2023 16:28:21 + + log4cpp (1.1.3-3) unstable; urgency=medium * Prepare for glibc 2.31. diff -Nru log4cpp-1.1.3/debian/rules log4cpp-1.1.3/debian/rules --- log4cpp-1.1.3/debian/rules 2018-05-12 23:09:09.0 +0100 +++ log4cpp-1.1.3/debian/rules 2023-01-10 16:28:21.0 + @@ -7,3 +7,8 @@ override_dh_acc: - dh_acc $@ + +override_dh_auto_install: + dh_auto_install + # Remove the build path from passed arguments for reproducible builds + sed -i -e "s,$(CURDIR),BUILDPATH,g" debian/tmp/usr/bin/log4cpp-config
Bug#963600: critcl: please make the teapot.txt files reproducible
Hi, > critcl: please make the teapot.txt files reproducible My previous patch no longer makes this package reproducible; there is an additional variation within: /usr/lib/tcltk/x86_64-linux-gnu/critcl_callback1/linux-x86_64/callback.so I suspect this is due to the compilation of this file not using CFLAGS (etc.), but exporting them from debian/rules does not seem to make a difference (and the build.tcl script is somewhat opaque). Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1028310: hamster-time-tracker: please make the build reproducible
Source: hamster-time-tracker Version: 3.0.2-3 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: environment X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that hamster-time-tracker could not be built reproducibly. This is because it varied depending on whether it was built with a 32- or 64-bit kernel. This resulted in a different value for defs.LIB_DIR. However, I don't believe this definition is actually used (it seems to be just one of many pre-populated fields from a generic build system), so the attached proof-of-concept patch simply removes the line from defs.py.in. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/Reproducible-build.patch 1970-01-01 01:00:00.0 +0100 --- b/debian/patches/Reproducible-build.patch 2023-01-09 12:45:39.028003054 + @@ -0,0 +1,12 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2023-01-09 + +--- hamster-time-tracker-3.0.2.orig/src/hamster/defs.py.in hamster-time-tracker-3.0.2/src/hamster/defs.py.in +@@ -1,5 +1,4 @@ + DATA_DIR = "@DATADIR@" +-LIB_DIR = "@LIBDIR@" + VERSION = "@VERSION@" + PACKAGE = "@PACKAGE@" + PYTHONDIR = "@PYTHONDIR@" --- a/debian/patches/series 2023-01-09 12:39:24.698324294 + --- b/debian/patches/series 2023-01-09 12:45:38.060047401 + @@ -1 +1,2 @@ Use-jquery-and-jquery-ui-from-local-system.patch +Reproducible-build.patch
Bug#1028051: unifrac-tools: please make the build reproducible
Source: unifrac-tools Version: 1.2-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that unifrac-tools could not be built reproducibly. This is because upstream's Makefile does not use the contents of CFLAGS from dpkg-buildflags so it misses the reproducibility-related compiler flags (and likely others). Proof of concept patch attached. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2023-01-06 10:46:40.635033129 + --- b/debian/rules 2023-01-06 10:55:34.858553266 + @@ -4,7 +4,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all export PYBUILD_NAME=unifrac -export DEB_BUILD_MAINT_OPTIONS=hardening=+all +export CPPFLAGS := $(CFLAGS) $(CPPFLAGS) + %: dh $@ --no-parallel
Bug#1027992: towncrier: Remove temporary files created during build
Hi Ben,
> +twisted_trial_cruft = ${MAIN_PYTHON_PACKAGE}.test.*
> +export PYBUILD_AFTER_TEST = rm -r "{build_dir}"/${twisted_trial_cruft}
Ah, that's much cleaner. Thank you.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1027992: towncrier: please make the build reproducible
Source: towncrier Version: 21.9.0-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: randomness X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that towncrier could not be built reproducibly. This is because the testsuite generates a bunch of Python modules with nondeterminstic contents, which then get installed into the binary package. Patch attached that cleans these up after running the tests. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2023-01-05 17:19:29.738137407 + --- b/debian/rules 2023-01-05 17:26:37.048270769 + @@ -39,3 +39,6 @@ # mode: makefile # End: # vim: fileencoding=utf-8 filetype=make : + +execute_after_dh_auto_test: + rm -rf .pybuild/*/build/towncrier.test.*
Bug#1027988: click: please make the build reproducible
Source: click Version: 0.5.0-9 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that click could not be built reproducibly. This is because a config.py file included the value of abs_top_builddir. Maybe the value is not actually used after installation as it seems to be related to compiling things using GCC (although it might be needed for the autopkgtests?). Patch attached that sets it to where click actually gets installed to. At the very least, the build directory perforce does not exist anymore at package installation time, so this is "no worse", so to speak. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2023-01-04 16:43:11.122429535 + --- b/debian/rules 2023-01-05 15:44:20.157606980 + @@ -55,6 +55,8 @@ rm debian/tmp/usr/lib/*/libclick-0.4.la dh_install DH_AUTOSCRIPTDIR=debhelper debhelper/dh_click --name=click-desktop + sed -i -e 's@\(abs_top_builddir = \).*@\1 "/usr/lib/python3/dist-packages/click_package"@g' \ + debian/python3-click-package/usr/lib/python3/dist-packages/click_package/tests/config.py override_dh_missing: dh_missing --fail-missing
Bug#1026982: [PATCH] disambiguate "package" output message
tags 1026982 + pending thanks Fixed in Git, although I made it helpful on other distros as well: https://salsa.debian.org/reproducible-builds/diffoscope/commit/85bf76f0deb398a89512a4675cfc3be8d4511902 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1026976: Upcoming test suite regression due to changes in file/libmagic
Hi Christoph, Thanks again for the "new version of file in experimental" bugs; very much appreciated. > - a /usr/bin/python3 script executable (binary data) > + Zip archive, with extra data prepended > > Now that looks a bit delicate ... if you think this is something that > should be handled in file/libmagic, let me know. Naturally, as one of the maintainers of strip-nondeterminism, I am inclined to believe that this is a minor regression in file. :) However, this "extra data prepended" doesn't fit well under the rubric of "data". Yes, this "#!/usr/bin/python3\n" shebang is definitely "data" of a kind, but a shebang isn't really data in that way given the special-treatment afforded to it by UNIX systems. Even if this noun was replaced by the more general "bytes", the magic nature of the shebang would still remain… as would the desire to discriminate between pyzip files and other ZIP files with prepended data. Could another — different — string be emitted in the case that these prepended bytes are a shebang? We could potentially look for the file starting with #! and for that to take precedence over this new case. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1026877: opari2: please make the build reproducible
Hi Samuel, > I'm wondering, though, how it is that the salsa reprotest CI didn't > catch it: > > https://salsa.debian.org/debian/opari2/-/jobs/3675809 That's a good question and I don't actually know the answer. :( Indeed, I'm not actually that familiar with reprotest myself, so I'm likely not the best person to ask. Could you quickly try the reproducible-bui...@lists.alioth.debian.org mailing list? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1026877: opari2: please make the build reproducible
Source: opari2 Version: 2.0.7-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that opari2 could not be built reproducibly. Patch attached that exports CFLAGS from dpkg-buildflags(1), ensuring that -fdebug-prefix-map (and similar) to the underlying build system. Patch attached. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-12-23 05:22:27.671938667 + --- b/debian/rules 2022-12-23 05:30:34.856752502 + @@ -17,7 +17,7 @@ dh_autoreconf autoreconf -- -f -i . build-frontend override_dh_auto_configure: - ac_scorep_platform=linux dh_auto_configure -- --enable-shared + ac_scorep_platform=linux dh_auto_configure -- --enable-shared $(shell dpkg-buildflags --export=configure) override_dh_installdocs: dh_installdocs
Bug#1026876: jamin: please make the build reproducible
Source: jamin Version: 0.98.9~git20170111~199091~repack1-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that jamin could not be built reproducibly. Patch attached that exports CFLAGS from dpkg-buildflags(1), ensuring that -fdebug-prefix-map (and similar) to the underlying build system. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-12-23 05:22:36.635962278 + --- b/debian/rules 2022-12-23 05:28:12.940594471 + @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + export CFLAGS += -fcommon -g %:
Bug#1026520: reprotest: FTBFS: AttributeError: module 're' has no attribute 'sre_parse'
reassign 1026520 python-rstr merge 1026569 1026520 affects 1026520 diffoscope thanks Lucas Nussbaum wrote: > During a rebuild of all packages in sid, your package failed to build > on amd64. Quite so. However, I think the problem is elsewhere: >> File "/usr/lib/python3/dist-packages/rstr/xeger.py", line 63, in xeger >> parsed = re.sre_parse.parse(pattern) >> >> AttributeError: module 're' has no attribute 'sre_parse' I believe this is #1026569 in python-rstr.
Bug#1025801: sphinx: please make the build reproducible
forwarded 1025801 https://github.com/sphinx-doc/sphinx/pull/11037 thanks Dmitry Shachnev wrote: > Can you please forward your patch upstream to [1]? > > [1]: https://github.com/sphinx-doc/sphinx/pulls Done. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1026381: python-django-health-check: please make the build reproducible
Source: python-django-health-check Version: 3.17.0-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: randomness X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that python-django-health-check could not be built reproducibly. This is at root because you ship a .coverage file, but also because the rm(1) call doesn't actually delete it: rm -f debian/*/usr/lib/python3/dist-packages/.coverage A patch is attached that adjusts this to: rm -f debian/*/usr/lib/python3*/dist-packages/.coverage [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-12-19 09:59:12.419691292 + --- b/debian/rules 2022-12-19 10:00:06.647874759 + @@ -13,4 +13,4 @@ execute_after_dh_python3: # Get rid of extra .coverage file - rm -f debian/*/usr/lib/python3/dist-packages/.coverage + rm -f debian/*/usr/lib/python3*/dist-packages/.coverage
Bug#1025801: sphinx: please make the build reproducible
Source: sphinx Version: 5.3.0-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that sphinx could not be built reproducibly. This is because a default argument for a method uses the path in which that method is implemented (ie. it uses Python's __file__) and then that (non-deterministic) default argument is included in Sphinx's documentation. Patch attached that uses the typical; "fn(arg1=None) // if arg1 is None: arg1=defaultval" pattern to avoid this. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/reproducible_build.diff1970-01-01 01:00:00.0 +0100 --- b/debian/patches/reproducible_build.diff2022-12-09 10:51:24.160260646 + @@ -0,0 +1,24 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2022-12-09 + +--- sphinx-5.3.0.orig/sphinx/locale/__init__.py sphinx-5.3.0/sphinx/locale/__init__.py +@@ -163,13 +163,16 @@ _LOCALE_DIR = path.abspath(path.dirname( + + + def init_console( +-locale_dir: str = _LOCALE_DIR, ++locale_dir: Optional[str] = None, + catalog: str = 'sphinx', + ) -> Tuple[NullTranslations, bool]: + """Initialize locale for console. + + .. versionadded:: 1.8 + """ ++if locale_dir is None: ++locale_dir = _LOCALE_DIR ++ + try: + # encoding is ignored + language, _ = locale.getlocale(locale.LC_MESSAGES) --- a/debian/patches/series 2022-12-09 10:05:26.391272450 + --- b/debian/patches/series 2022-12-09 10:51:22.984253932 + @@ -9,3 +9,4 @@ intersphinx_local.diff support_old_search_indexes.diff highlight_search_terms.diff +reproducible_build.diff
Bug#1020651: xmlrpc-epi: reproducible-builds: Embedded build path in libxmlrpc-epi.so.*
tags 865688 + pending patch
tags 1020651 + pending patch
thanks
I've just uploaded xmlrpc-epi 0.54.2-1.3 to DELAYED/10:
xmlrpc-epi (0.54.2-1.3) unstable; urgency=medium
.
* Non-maintainer upload.
* Apply a patch from Helmut Grohne to make the xmlrpc-epi build in a
cross-architecture situation. (Closes: #865688)
* Move to dpkg-buildflags(1) in order to make the build reproducible.
(Closes: #1020651)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for xmlrpc-epi_0.54.2-1.2 xmlrpc-epi_0.54.2-1.3
changelog | 10 ++
rules | 18 +++---
2 files changed, 17 insertions(+), 11 deletions(-)
diff -u xmlrpc-epi-0.54.2/debian/changelog xmlrpc-epi-0.54.2/debian/changelog
--- xmlrpc-epi-0.54.2/debian/changelog
+++ xmlrpc-epi-0.54.2/debian/changelog
@@ -1,3 +1,13 @@
+xmlrpc-epi (0.54.2-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply a patch from Helmut Grohne to make the xmlrpc-epi build in a
+cross-architecture situation. (Closes: #865688)
+ * Move to dpkg-buildflags(1) in order to make the build reproducible.
+(Closes: #1020651)
+
+ -- Chris Lamb Thu, 08 Dec 2022 17:34:51 +
+
xmlrpc-epi (0.54.2-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u xmlrpc-epi-0.54.2/debian/rules xmlrpc-epi-0.54.2/debian/rules
--- xmlrpc-epi-0.54.2/debian/rules
+++ xmlrpc-epi-0.54.2/debian/rules
@@ -6,24 +6,20 @@
# 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.
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+export DEB_BUILD_MAINT_OPTIONS = hardening=-format
-CFLAGS = -Wall -g
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
config.status:
dh_testdir
dh_autoreconf
- ./configure --build=$(DEB_BUILD_GNU_TYPE)
--includedir=/usr/include/xmlrpc-epi \
+ dh_auto_configure -- --includedir=/usr/include/xmlrpc-epi \
--prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
$(DEB_CONFIGURE_EXTRA_FLAGS)
+ $(DEB_CONFIGURE_EXTRA_FLAGS)
build: build-arch build-indep
build-arch: build-stamp
Bug#1020809: aespipe: reproducible-builds: build path embedded in /usr/bin/aespipe
tags 661079 + pending patch tags 1020809 + pending patch thanks I've just uploaded aespipe 2.4d-1.1 to DELAYED/10: aespipe (2.4d-1.1) unstable; urgency=medium . * Non-maintainer upload. * Move to dpkg-buildflags(1) in debian/rules: - Ensure that the stack is not executable. (Closes: #661079) - Make the build reproducible by setting -fdebug-prefix-map. (Closes: #1020809) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for aespipe-2.4d aespipe-2.4d changelog | 10 ++ rules | 22 ++ 2 files changed, 16 insertions(+), 16 deletions(-) diff -Nru aespipe-2.4d/debian/changelog aespipe-2.4d/debian/changelog --- aespipe-2.4d/debian/changelog 2016-11-28 11:39:38.0 + +++ aespipe-2.4d/debian/changelog 2022-12-08 17:14:21.0 + @@ -1,3 +1,13 @@ +aespipe (2.4d-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Move to dpkg-buildflags(1) in debian/rules: +- Ensure that the stack is not executable. (Closes: #661079) +- Make the build reproducible by setting -fdebug-prefix-map. + (Closes: #1020809) + + -- Chris Lamb Thu, 08 Dec 2022 17:14:21 + + aespipe (2.4d-1) unstable; urgency=medium * New upstream release diff -Nru aespipe-2.4d/debian/rules aespipe-2.4d/debian/rules --- aespipe-2.4d/debian/rules 2016-11-10 23:50:56.0 + +++ aespipe-2.4d/debian/rules 2022-12-08 17:14:21.0 + @@ -1,22 +1,15 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -CFLAGS = -Wall -g +export DEB_BUILD_MAINT_OPTIONS=hardening=-pie reproducible=-fixfilepath,+fixdebugpath + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else -# needed because of gcc-4.0 problems (#325131) -ifneq (,$(filter $(DEB_HOST_ARCH),arm hppa)) - CFLAGS += -O1 -else - CFLAGS += -O2 -endif -endif - ifeq ($(DEB_HOST_ARCH),amd64) DEBIAN_OPTIMIZE := amd64 endif @@ -25,16 +18,13 @@ DEBIAN_OPTIMIZE := x86 endif -CFLAGS += -no-pie -LDFLAGS += -no-pie - config.status: configure dh_testdir ln -sf /usr/share/misc/config.sub . ln -sf /usr/share/misc/config.guess . - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ + ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \
Bug#1025415: cctools: please make the build reproducible
Source: cctools
Version: 9.9-2
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
cctools could not be built reproducibly.
This is because the various Python components are built with a
"./configure --prefix" value that is based on build user's home
directory which then gets embedded into various files. Although the
current debian/rules file does specify a value for --prefix in its
override_dh_auto_configure, this is overridden later in
override_dh_auto_install when the Python components are built.
A patch is attached that also the prefix to same value (ie. /usr).
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/rules 2022-12-04 09:49:50.271004976 +
--- b/debian/rules 2022-12-04 10:24:29.485205110 +
@@ -37,7 +37,7 @@
if [ -n "$(non_default_python3_versions)" ]; then \
for pyver in $(non_default_python3_versions); do \
CFLAGS="$(CF) -I /usr/include/python$${pyver} -DNDEBUG
-Wno-unused-result" \
- bash ./configure --with-globus-path /usr
--with-krb5-path /usr --with-readline-path /usr \
+ bash ./configure --prefix /usr --with-globus-path /usr
--with-krb5-path /usr --with-readline-path /usr \
--with-mpi-path /usr --with-fuse-path /usr
--with-zlib-path /usr \
--with-python3-path /usr/bin/python$${pyver}
--with-python2-path no ; \
make -B -C work_queue/src/bindings/python3 clean
install CCTOOLS_INSTALL_DIR=$(CURDIR)/debian/tmp ; \
Bug#941296: tuxcmd-modules FTCBFS: uses build architecture build tools
Vagrant Cascadian wrote: > Hrm. Seems like the original version without the cross-building patches are > what > actually landed in sid today... Bah, okay. Re-uploading without DELAYED now. Thanks. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1011500: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
Hi Vagrant, > 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.orig.tar.gz to ssh.upload.debian.org for ssh-upload. Successfully uploaded tuxcmd-modules_0.6.70+ds-5.1.debian.tar.xz to ssh.upload.debian.org for ssh-upload. Successfully uploaded tuxcmd-modules-dbgsym_0.6.70+ds-5.1_amd64.deb to ssh.upload.debian.org for ssh-upload. Successfully uploaded tuxcmd-modules_0.6.70+ds-5.1_amd64.buildinfo to ssh.upload.debian.org for ssh-upload. Successfully uploaded tuxcmd-modules_0.6.70+ds-5.1_amd64.deb 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. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1024352: pykafka: please make the build reproducible
Source: pykafka
Version: 2.7.0-2.1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpaths
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
pykafka could not be built reproducibly.
This is because it ships coverage.xml and .coverage files in the
binary package which contain non-deterministic contents. These
files were also not included if the testsuite was not run, too.
Patch attached that deletes these files after running the tests.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/rules 2022-11-18 07:54:00.259645896 +
--- b/debian/rules 2022-11-18 08:00:24.842832228 +
@@ -5,7 +5,7 @@
export PYBUILD_NAME=pykafka
export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir}/
-export PYBUILD_AFTER_TEST=rm -rf {build_dir}/tests
+export PYBUILD_AFTER_TEST=rm -rf {build_dir}/tests {build_dir}/coverage.xml
{build_dir}/.coverage
export PYBUILD_DISABLE_python2=1
export PYBUILD_TEST_ARGS_python3=tests \
--ignore=tests/pykafka/rdkafka/test_rd_kafka_consumer.py \
Bug#941296: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
tags 1011500 + pending patch
thanks
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.
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)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for tuxcmd-modules-0.6.70+ds tuxcmd-modules-0.6.70+ds
changelog| 10 +++
patches/crossbuild.patch | 130 +++
patches/reproducible-build.patch | 68
patches/series |2
4 files changed, 210 insertions(+)
diff -Nru tuxcmd-modules-0.6.70+ds/debian/changelog
tuxcmd-modules-0.6.70+ds/debian/changelog
--- tuxcmd-modules-0.6.70+ds/debian/changelog 2013-05-10 21:00:35.0
+0100
+++ tuxcmd-modules-0.6.70+ds/debian/changelog 2022-11-17 17:15:30.0
+
@@ -1,3 +1,13 @@
+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)
+
+ -- Chris Lamb Thu, 17 Nov 2022 17:15:30 +
+
tuxcmd-modules (0.6.70+ds-5) unstable; urgency=low
* QA upload.
diff -Nru tuxcmd-modules-0.6.70+ds/debian/patches/crossbuild.patch
tuxcmd-modules-0.6.70+ds/debian/patches/crossbuild.patch
--- tuxcmd-modules-0.6.70+ds/debian/patches/crossbuild.patch1970-01-01
01:00:00.0 +0100
+++ tuxcmd-modules-0.6.70+ds/debian/patches/crossbuild.patch2022-11-17
17:15:30.0 +
@@ -0,0 +1,130 @@
+--- tuxcmd-modules-0.6.70+ds.orig/gvfs/Makefile
tuxcmd-modules-0.6.70+ds/gvfs/Makefile
+@@ -5,6 +5,7 @@ INSTALL_DATA = ${INSTALL} -m 644
+
+ # compiler options
+ CC = gcc
++PKG_CONFIG ?= pkg-config
+ CFLAGS =-I. -I/usr/include \
+ -Wall -fPIC -O2 -g \
+ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_GNU_SOURCE
+@@ -20,13 +21,13 @@ VFS_OBJECTS=gvfs.o
+
+ .SUFFIXES: .c
+ .c.o:
+- $(CC) $(CFLAGS) `pkg-config glib-2.0 gio-2.0 --cflags` -c $<
++ $(CC) $(CFLAGS) `$(PKG_CONFIG) glib-2.0 gio-2.0 --cflags` -c $<
+
+
+ all shared static: libgvfs_plugin.so
+
+ libgvfs_plugin.so: $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
+- $(CC) -shared -o libgvfs_plugin.so $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
$(CFLAGS) `pkg-config glib-2.0 gio-2.0 --libs`
++ $(CC) -shared -o libgvfs_plugin.so $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
$(CFLAGS) `$(PKG_CONFIG) glib-2.0 gio-2.0 --libs`
+
+ strutils.o: strutils.c strutils.h
+ treepathutils.o: treepathutils.c treepathutils.h
+--- tuxcmd-modules-0.6.70+ds.orig/libarchive/Makefile
tuxcmd-modules-0.6.70+ds/libarchive/Makefile
+@@ -7,7 +7,8 @@ DIR_LIBARCHIVE=./libarchive-2.5.5
+
+ # compiler options
+ CC = gcc
+-CPP = g++
++CXX = g++
++PKG_CONFIG ?= pkg-config
+ CFLAGS =-I. -I/usr/include -I$(DIR_COMMON) \
+ -Wall -fPIC -O2 -g \
+ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_GNU_SOURCE \
+@@ -23,20 +24,20 @@ VFS_OBJECTS=libarchive.o
+
+ .SUFFIXES: .c .cpp
+ .c.o:
+- $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
++ $(CC) $(CFLAGS) `$(PKG_CONFIG) glib-2.0 --cflags` -c $<
+ .cpp.o:
+- $(CPP) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
++ $(CXX) $(CFLAGS) `$(PKG_CONFIG) glib-2.0 --cflags` -c $<
+
+
+ all: static
+
+
+ shared: $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
+- $(CC) -shared -o libarchive_plugin.so $(VFS_COMMON_OBJECTS)
$(VFS_OBJECTS) $(CFLAGS) `pkg-config glib-2.0 --libs` -larchive -lz -lbz2
++ $(CC) -shared -o libarchive_plugin.so $(VFS_COMMON_OBJECTS)
$(VFS_OBJECTS) $(CFLAGS) `$(PKG_CONFIG) glib-2.0 --libs` -larchive -lz -lbz2
+
+ static: CFLAGS += -I$(DIR_LIBARCHIVE)/libarchive
+ static: lib_libarchive_compile $(VFS_COMMON_OBJECTS) $(VFS_OBJECTS)
+- $(CC) -shared -o libarchive_plugin.so $(VFS_COMMON_OBJECTS)
$(VFS_OBJECTS) $(DIR_LIBARCHIVE)/.libs/libarchive.a $(CFLAGS) `pkg-config
glib-2.0 --libs` -lz -lbz2
++ $(CC) -shared -o libarchive_plugin.so $(VFS_COMMON_OBJECTS)
$(VFS_OBJECTS) $(DIR_LIBARCHIVE)/.libs/libarchive.a $(CFLAGS) `$(PKG_CONFIG)
glib-2.0 --libs` -lz -lbz2
+
+ lib_libarchive_compile:
+ @which uudecode > /dev/null || exit 1;
+--- tuxcmd-modules-0.6.70+ds.orig/zip/Makefile
tuxcmd-modules-0.6.70+ds/zip/Makefile
+@@ -6,7 +6,8 @@ DIR_ZIPARCHIVE = ./ZipArchive/
+
+ # compil
Bug#1020805: png23d: reproducible-builds: Embedded build paths in binaries
tags 1020805 + pending patch thanks I've just uploaded png23d 1.10-1.3 to DELAYED/10: png23d (1.10-1.3) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. (Closes: #1020805) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for png23d-1.10 png23d-1.10 changelog|8 patches/reproducible_build.patch | 11 +++ patches/series |1 + 3 files changed, 20 insertions(+) diff -Nru png23d-1.10/debian/changelog png23d-1.10/debian/changelog --- png23d-1.10/debian/changelog2016-01-28 11:46:16.0 + +++ png23d-1.10/debian/changelog2022-11-17 17:52:41.0 + @@ -1,3 +1,11 @@ +png23d (1.10-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. +(Closes: #1020805) + + -- Chris Lamb Thu, 17 Nov 2022 17:52:41 + + png23d (1.10-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru png23d-1.10/debian/patches/reproducible_build.patch png23d-1.10/debian/patches/reproducible_build.patch --- png23d-1.10/debian/patches/reproducible_build.patch 1970-01-01 01:00:00.0 +0100 +++ png23d-1.10/debian/patches/reproducible_build.patch 2022-11-17 17:52:41.0 + @@ -0,0 +1,11 @@ +--- png23d-1.10.orig/Makefile png23d-1.10/Makefile +@@ -22,7 +22,7 @@ endif + OPTFLAGS=-O2 + #OPTFLAGS=-O0 + +-CFLAGS+=$(WARNFLAGS) -MMD -DVERSION=$(VERSION) $(OPTFLAGS) -g ++CFLAGS+=$(WARNFLAGS) -MMD -DVERSION=$(VERSION) $(OPTFLAGS) -g -ffile-prefix-map=$(CURDIR)=. + + LDFLAGS+=-lpng + diff -Nru png23d-1.10/debian/patches/series png23d-1.10/debian/patches/series --- png23d-1.10/debian/patches/series 2016-01-28 11:46:16.0 + +++ png23d-1.10/debian/patches/series 2022-11-17 17:52:41.0 + @@ -1,2 +1,3 @@ ftbfs ld_as-needed.patch +reproducible_build.patch
Bug#1020751: waili: reproducible-builds: Embedded build paths in binaries
tags 1020751 + pending patch thanks I've just uploaded waili 19990723-22.2 to DELAYED/10: waili (19990723-22.2) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. (Closes: #1020751) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for waili-19990723 waili-19990723 changelog|8 patches/reproducible_build.patch | 11 +++ patches/series |1 + 3 files changed, 20 insertions(+) diff -Nru waili-19990723/debian/changelog waili-19990723/debian/changelog --- waili-19990723/debian/changelog 2014-10-09 11:11:19.0 +0100 +++ waili-19990723/debian/changelog 2022-11-17 17:41:37.0 + @@ -1,3 +1,11 @@ +waili (19990723-22.2) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. +(Closes: #1020751) + + -- Chris Lamb Thu, 17 Nov 2022 17:41:37 + + waili (19990723-22.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru waili-19990723/debian/patches/reproducible_build.patch waili-19990723/debian/patches/reproducible_build.patch --- waili-19990723/debian/patches/reproducible_build.patch 1970-01-01 01:00:00.0 +0100 +++ waili-19990723/debian/patches/reproducible_build.patch 2022-11-17 17:41:37.0 + @@ -0,0 +1,11 @@ +--- waili-19990723.orig/config/Rules.Linux.g++ waili-19990723/config/Rules.Linux.g++ +@@ -37,7 +37,7 @@ OPTFLAGS = -O3 -fomit-frame-pointer + + #changed for Debian: much cleaner; and you can move the directory around + CFLAGS = -Wall $(TIFFINC) $(TIFFDEF) $(OPTFLAGS) $(DEBUGFLAGS) +-CPPFLAGS = -I$(TOPDIR)/include $(TIFFINC) $(TIFFDEF) ++CPPFLAGS = -I../include $(TIFFINC) $(TIFFDEF) + + + #changed for debian: if -lwaili is specified, libtool fails to work diff -Nru waili-19990723/debian/patches/series waili-19990723/debian/patches/series --- waili-19990723/debian/patches/series2014-01-13 14:18:01.0 + +++ waili-19990723/debian/patches/series2022-11-17 17:41:37.0 + @@ -21,3 +21,4 @@ #lll dpkg-buildflags.patch +reproducible_build.patch
Bug#1020804: paxctl: reproducible-builds: Embedded build paths in /sbin/paxctl
tags 1020804 + pending patch thanks I've just uploaded paxctl 0.9-1.1 to DELAYED/10: paxctl (0.9-1.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. (Closes: #1020804) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for paxctl-0.9 paxctl-0.9 changelog |8 rules |3 +++ 2 files changed, 11 insertions(+) diff -Nru paxctl-0.9/debian/changelog paxctl-0.9/debian/changelog --- paxctl-0.9/debian/changelog 2014-09-06 14:16:48.0 +0100 +++ paxctl-0.9/debian/changelog 2022-11-17 17:38:19.0 + @@ -1,3 +1,11 @@ +paxctl (0.9-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. +(Closes: #1020804) + + -- Chris Lamb Thu, 17 Nov 2022 17:38:19 + + paxctl (0.9-1) unstable; urgency=low * New upstream release. diff -Nru paxctl-0.9/debian/rules paxctl-0.9/debian/rules --- paxctl-0.9/debian/rules 2014-09-06 14:16:48.0 +0100 +++ paxctl-0.9/debian/rules 2022-11-17 17:38:19.0 + @@ -6,3 +6,6 @@ %: dh $@ + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(CFLAGS)"
Bug#1021374: zephyr: please make the build reproducible
tags 828867 + pending patch
tags 1021374 + pending patch
thanks
I've just uploaded zephyr 3.1.2-1.1 to DELAYED/10:
zephyr (3.1.2-1.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Apply patches by Vagrant Cascadian and Reiner Herrmann to make the build
reproducible. (Closes: #828867, #1021374)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for zephyr-3.1.2 zephyr-3.1.2
changelog|8
patches/reproducible-build.patch | 17 +
patches/series |1 +
rules|2 +-
4 files changed, 27 insertions(+), 1 deletion(-)
diff -Nru zephyr-3.1.2/debian/changelog zephyr-3.1.2/debian/changelog
--- zephyr-3.1.2/debian/changelog 2013-10-28 14:57:21.0 +
+++ zephyr-3.1.2/debian/changelog 2022-11-17 17:29:45.0 +
@@ -1,3 +1,11 @@
+zephyr (3.1.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patches by Vagrant Cascadian and Reiner Herrmann to make the build
+reproducible. (Closes: #828867, #1021374)
+
+ -- Chris Lamb Thu, 17 Nov 2022 17:29:45 +
+
zephyr (3.1.2-1) unstable; urgency=low
* New upstream version.
diff -Nru zephyr-3.1.2/debian/patches/reproducible-build.patch
zephyr-3.1.2/debian/patches/reproducible-build.patch
--- zephyr-3.1.2/debian/patches/reproducible-build.patch1970-01-01
01:00:00.0 +0100
+++ zephyr-3.1.2/debian/patches/reproducible-build.patch2022-11-17
17:29:45.0 +
@@ -0,0 +1,17 @@
+Author: Reiner Herrmann
+Description: Strip non-deterministic information from the version string
+
+--- a/new_vers.sh
b/new_vers.sh
+@@ -2,10 +2,7 @@
+ #
+ top_srcdir=${1:-`pwd`}
+
+-u=${USER-the_zephyr_builder}
+-h=`hostname`
+-t=`date`
+ v=`sh ${top_srcdir}/get_vers.sh ${top_srcdir}`
+
+ umask 002
+-/bin/echo "#define ZEPHYR_VERSION_STRING \"${v} (${t}) ${u}@${h}\"" >
h/zephyr_version.h
++/bin/echo "#define ZEPHYR_VERSION_STRING \"${v}\"" > h/zephyr_version.h
diff -Nru zephyr-3.1.2/debian/patches/series zephyr-3.1.2/debian/patches/series
--- zephyr-3.1.2/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ zephyr-3.1.2/debian/patches/series 2022-11-17 17:29:45.0 +
@@ -0,0 +1 @@
+reproducible-build.patch
diff -Nru zephyr-3.1.2/debian/rules zephyr-3.1.2/debian/rules
--- zephyr-3.1.2/debian/rules 2013-07-08 16:46:41.0 +0100
+++ zephyr-3.1.2/debian/rules 2022-11-17 17:29:45.0 +
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
VARIETALS=krb5
-CFLAGS=-g -O
+CFLAGS=-g -O -ffile-prefix-map=$(CURDIR)=.
PACKAGES:=-plibzephyr4 -pzephyr-clients -pzephyr-server -plibzephyr-dev
$(foreach i,$(VARIETALS),-plibzephyr4-$(i) -pzephyr-server-$(i))
Bug#1011500: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
tags 1011500 + pending patch tags 941296 + pending patch thanks I've just uploaded tuxcmd-modules 0.6.70+ds-5.1 to DELAYED/10: 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) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for tuxcmd-modules-0.6.70+ds tuxcmd-modules-0.6.70+ds changelog| 10 + patches/reproducible-build.patch | 68 +++ patches/series |1 3 files changed, 79 insertions(+) diff -Nru tuxcmd-modules-0.6.70+ds/debian/changelog tuxcmd-modules-0.6.70+ds/debian/changelog --- tuxcmd-modules-0.6.70+ds/debian/changelog 2013-05-10 21:00:35.0 +0100 +++ tuxcmd-modules-0.6.70+ds/debian/changelog 2022-11-17 17:15:30.0 + @@ -1,3 +1,13 @@ +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) + + -- Chris Lamb Thu, 17 Nov 2022 17:15:30 + + tuxcmd-modules (0.6.70+ds-5) unstable; urgency=low * QA upload. diff -Nru tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch --- tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0 +0100 +++ tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch 2022-11-17 17:15:30.0 + @@ -0,0 +1,68 @@ +--- tuxcmd-modules-0.6.70+ds.orig/Makefile tuxcmd-modules-0.6.70+ds/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 \ +--- tuxcmd-modules-0.6.70+ds.orig/gvfs/Makefile tuxcmd-modules-0.6.70+ds/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= +--- tuxcmd-modules-0.6.70+ds.orig/libarchive/Makefile tuxcmd-modules-0.6.70+ds/libarchive/Makefile +@@ -13,6 +13,9 @@ CFLAGS =-I. -I/usr/include -I$(DIR_COMMO + -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 +--- tuxcmd-modules-0.6.70+ds.orig/zip/Makefile tuxcmd-modules-0.6.70+ds/zip/Makefile +@@ -12,6 +12,8 @@ CFLAGS =-I. -I$(DIR_ZIPARCHIVE) -I/usr/i + -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 + +--- tuxcmd-modules-0.6.70+ds.orig/zip/Makefile.ziparch tuxcmd-modules-0.6.70+ds/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 +--- tuxcmd-modules-0.6.70+ds.orig/zip/ZipArchive/Makefile tuxcmd-modules-0.6.70+ds/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/ diff -Nru tuxcmd-modules-0.6.70+ds/debian/patches/series tuxcmd-modules-0.6.70+ds/debian/patches/series --- tuxcmd-modules-0.6.70+ds/debian/patches/series 2013-05-10 21:00:35.0 +0100 +++ tuxcmd-modules-0.6.70+ds/debian/patches/series 2022-11-17 17:15:30.0 + @@ -2,3 +2,4 @@ Fix-FTBFS-because-removal-of-ARCHIVE_LIBRARY_VERSION.patch glib-single-include.patch fix-FTBFS-with-gcc-4.7.patch +reproducible-build.patch
Bug#1024131: python-fissix: please make the build reproducible
Source: python-fissix Version: 21.6.6-1 User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that python-fissix could not be built reproducibly. This is because the .deb contains empty directories that embed the build path: $ dpkg -c python3-fissix_21.6.6-1_all.deb | grep home drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/python-fissix-21.6.6/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/python-fissix-21.6.6/debian/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/python-fissix-21.6.6/debian/python3-fissix/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/python-fissix-21.6.6/debian/python3-fissix/usr/ drwxr-xr-x root/root 0 2022-02-11 14:09 ./home/lamby/temp/cdt.20221115090857.icp392MtQg.repro.python-fissix/build-a/python-fissix-21.6.6/debian/python3-fissix/usr/bin/ I've isolated the issue to dh_auto_install, but can't immediately see from the logs why this is happening. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1023589: libnvme: please make the build reproducible
Source: libnvme
Version: 1.2-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
libnvme could not be built reproducibly.
This is because it embedded the current build month within the
generated manual pages. A patch is attached that re-exports
SOURCE_DATE_EPOCH as KBUILD_BUILD_TIMESTAMP. This works because the
doc/kernel-doc script already supports parsing this variable.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/rules 2022-11-07 08:18:03.676512405 +
--- b/debian/rules 2022-11-07 08:24:16.075316512 +
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export KBUILD_BUILD_TIMESTAMP = "@$(SOURCE_DATE_EPOCH)"
+
%:
dh ${@} --buildsystem=meson --with python3
Bug#926470: RFP: annocheck -- analyse an application's compilation
Hi Pietro, > I've been building annocheck manually and i'd like to package it for > debian. > > Should I package only annocheck or the GCC plugin too? If it helps, I'm mostly interested in the command-line utility rather than the GCC plugin. (Perhaps that can be added later or even on-demand?) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1022209: diffoscope: highlight text-only differences in HTML files
tags 1022209 + pending thanks Fixed in Git, pending upload: https://salsa.debian.org/reproducible-builds/diffoscope/commit/d647eb7554e3bd51ab8fbe18fc84f885fce4f789 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022146: diffoscope: detect ordering-only differences in XML files
tags 1022146 + pending thanks Fixed in Git, pending upload: https://salsa.debian.org/reproducible-builds/diffoscope/commit/dbf5350fdacf5790ceab4f784ab8fc2f41cfa24c Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022145: diffoscope: detect ordering-only differences in text files
tags 1022145 + pending thanks Fixed in Git, pending upload: https://salsa.debian.org/reproducible-builds/diffoscope/commit/727b3c9ea54b89465d2308997aa8b4bd25bff07f Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022777: tpm2-pytss: please make the build reproducible
forwarded 1022777 https://github.com/tpm2-software/tpm2-pytss/pull/376 thanks I've forwarded this upstream here: https://github.com/tpm2-software/tpm2-pytss/pull/376 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022209: diffoscope: highlight text-only differences in HTML files
forwarded 1022209 https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/318 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/318 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022210: diffoscope: highlight whitespace-only differences in text data
forwarded 1022210 https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/319 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/319 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#989626: diffoscope: when comparing fonts with .ttx files, convert the font to .ttx first
forwarded 989626 https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/315 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/315 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022146: diffoscope: detect ordering-only differences in XML files
forwarded 1022146 https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/317 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/317 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022145: diffoscope: detect ordering-only differences in text files
forwarded 1022145 https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/316 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/316 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1022777: tpm2-pytss: please make the build reproducible
Source: tpm2-pytss
Version: 1.2.0-2
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
tpm2-pytss could not be built reproducibly.
This is because it embedded the current "build" year by calling out
to datetime.datetime.utcnow() when building the documentation.
Patch attached that seeds this value from SOURCE_DATE_EPOCH if it
exists in the surrounding environment.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1969-12-31 16:00:00.0
-0800
--- b/debian/patches/reproducible-build.patch 2022-10-25 10:32:58.818873778
-0700
@@ -0,0 +1,26 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-10-25
+
+--- tpm2-pytss-1.2.0.orig/docs/conf.py
tpm2-pytss-1.2.0/docs/conf.py
+@@ -12,6 +12,7 @@
+ #
+ import os
+ import sys
++import time
+ import datetime
+ import subprocess
+
+@@ -57,7 +58,10 @@ import tpm2_pytss
+
+ project = "tpm2-pytss"
+ author = "tpm2-software"
+-copyright = f"2019 - {datetime.datetime.today().year}, {author}"
++build_date = datetime.datetime.utcfromtimestamp(
++int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))
++)
++copyright = f"2019 - {build_date.year}, {author}"
+
+ # The short X.Y version
+ version = get_version(root="..", relative_to=__file__)
--- a/debian/patches/series 2022-10-25 10:25:20.122542133 -0700
--- b/debian/patches/series 2022-10-25 10:32:57.862874412 -0700
@@ -1 +1,2 @@
debian-hacks/docs-Use-internal-ressources-for-intersphinx.patch
+reproducible-build.patch
Bug#777403: leave: please make the build reproducible
tags 777403 + pending patch
tags 967002 + pending patch
tags 999259 + pending patch
thanks
I've just uploaded leave 1.12-2.2 to DELAYED/10:
leave (1.12-2.2) unstable; urgency=medium
.
* Non-maintainer upload.
* Pass -n to gzip(1) to make the manual page and changelog reproducible, as
well as pass CFLAGS to the C compiler to ensure that, for instance,
-ffile-prefix-map is used. (Closes: #777403)
* Apply a patch by Helmut Grohne to correctly cross-build the leave binary.
(Closes: #967002)
* Add the missing required debian/rules targets, build-arch and build-indep.
(Closes: #999259)
* Remove a "debian/changelog~" editor backup file.
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for leave_1.12-2.1 leave_1.12-2.2
debian/changelog~ | 88
leave-1.12/debian/changelog | 14 +++
leave-1.12/debian/rules | 17
3 files changed, 23 insertions(+), 96 deletions(-)
diff -u leave-1.12/debian/changelog leave-1.12/debian/changelog
--- leave-1.12/debian/changelog
+++ leave-1.12/debian/changelog
@@ -1,3 +1,17 @@
+leave (1.12-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Pass -n to gzip(1) to make the manual page and changelog reproducible, as
+well as pass CFLAGS to the C compiler to ensure that, for instance,
+-ffile-prefix-map is used. (Closes: #777403)
+ * Apply a patch by Helmut Grohne to correctly cross-build the leave binary.
+(Closes: #967002)
+ * Add the missing required debian/rules targets, build-arch and build-indep.
+(Closes: #999259)
+ * Remove a "debian/changelog~" editor backup file.
+
+ -- Chris Lamb Thu, 06 Oct 2022 10:59:51 -0700
+
leave (1.12-2.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- leave-1.12/debian/changelog~
+++ leave-1.12.orig/debian/changelog~
@@ -1,88 +0,0 @@
-leave (1.12-2) unstable; urgency=low
-
- * Exited with 0 instead of 1 for binary-indep, just for people who obsess
-with pointless details, closes: #395734.
-
- -- Josip Rodin Sat, 28 Oct 2006 00:10:22 +0200
-
-leave (1.12-1) unstable; urgency=low
-
- * New upstream version.
- * Added an unportable glibc-only variable to get the program name,
-because the unportable NetBSD-only variable didn't work.
-
- -- Josip Rodin Fri, 15 Aug 2003 21:10:23 +0200
-
-leave (1.10-1) unstable; urgency=low
-
- * New upstream version, closes: #143720.
-Abolished our patches for handling 24-hour time formats, and used
-the upstream's. The behaviour is unchanged, AFAICT.
- * Updated for Policy 3.5.6. debian/rules in shell,
-removed the use of both debhelper and pmake -> no Build-Depends :)
-
- -- Josip Rodin Mon, 26 Aug 2002 14:40:30 +0200
-
-leave (1.8-2) unstable; urgency=low
-
- * Fixed those long standing bugs in the handling of 24h-clock
-arguments, by making leave not convert times to 12h clock, but check
-whether the time is between 1 and 12, and then interpret it according
-to a 12-hour clock. Let's hope it all works.
-Thanks to Sergio Gelato , who provided
-the patch both for the code and for the manual page.
-(closes #25150 #26000 #31250 #31872)
- * Updated for Policy 3.x. Removed the full text of the BSD license from
-the copyright file and referenced the /usr/share/common-licenses/BSD
-file.
-
- -- Josip Rodin Mon, 18 Oct 1999 23:13:16 +0200
-
-leave (1.8-1) unstable; urgency=low
-
- * New maintainer, new upstream source (with exactly two (2) new lines
-of code), new debian/* files.
-
- -- Josip Rodin Wed, 19 May 1999 18:13:22 +0200
-
-leave (1.6-2) unstable; urgency=low
-
- * debian/control (Maintainer): new address.
- * debian/copyright: ditto.
- * debian/control (Standards-Version): updated to 2.5.0.0.
- * debian/rules: replace $(package) with a string literal and other minor
-clean ups.
-
- -- James Troup Tue, 10 Nov 1998 15:46:23 +
-
-leave (1.6-1) unstable; urgency=low
-
- * New upstream version.
- * debian/rules: Use BSD make not GNU make to build.
- * debian/rules: Build with -g.
- * debian/rules: Call dpkg-gencontrol with -isp.
- * debian/rules: remove leave.cat1 on clean.
- * debian/rules: no more {,} usage.
- * debian/rules: chmod go=rX not g-ws.
- * debian/control: Standards-Version 2.3.0.1.
- * debian/control: section is really utils not misc.
- * debian/copyright: removed over-keen "famous" from description.
-
- -- James Troup Mon, 8 Dec 1997 21:03:01 +
-
-leave (1.4-3) unstable; urgency=low
-
- * Rebuilt libc6.
-
- -- James Troup Wed, 25 Jan 1997 18:30:06 +
-
-leave (1.4-2) unstable; urgency=low
-
- * New Maintainer.
- * Updated package to standards version 2.1.1.2.
-
- -- James Troup Wed, 22 Jan 1997 00:30:17 +
-
-Local variables:
-mode: debian-changelog
-End:
diff -u l
Bug#829754: bibclean: please make the build reproducible
tags 829754 + pending patch
tags 929036 + pending patch
thanks
I've just uploaded bibclean 2.11.4.1-4.1 to DELAYED/10:
bibclean (2.11.4.1-4.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Export CFLAGS from dpkg-buildflags(1) and FORCE_SOURCE_DATE to make the
build reproducible. Based on a patch by Vagrant Cascadian.
(Closes: #829754)
* Apply a patch by Helmut Grohne to add support for using a C compiler
suitable for cross-building. (Closes: #929036)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for bibclean-2.11.4.1 bibclean-2.11.4.1
changelog | 11 +++
rules | 15 ---
2 files changed, 15 insertions(+), 11 deletions(-)
diff -Nru bibclean-2.11.4.1/debian/changelog bibclean-2.11.4.1/debian/changelog
--- bibclean-2.11.4.1/debian/changelog 2011-12-07 05:26:23.0 -0800
+++ bibclean-2.11.4.1/debian/changelog 2022-10-06 10:42:07.0 -0700
@@ -1,3 +1,14 @@
+bibclean (2.11.4.1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Export CFLAGS from dpkg-buildflags(1) and FORCE_SOURCE_DATE to make the
+build reproducible. Based on a patch by Vagrant Cascadian.
+(Closes: #829754)
+ * Apply a patch by Helmut Grohne to add support for using a C compiler
+suitable for cross-building. (Closes: #929036)
+
+ -- Chris Lamb Thu, 06 Oct 2022 10:42:07 -0700
+
bibclean (2.11.4.1-4) unstable; urgency=low
* build targets changed to recommendation from lintian
diff -Nru bibclean-2.11.4.1/debian/rules bibclean-2.11.4.1/debian/rules
--- bibclean-2.11.4.1/debian/rules 2011-12-07 05:17:38.0 -0800
+++ bibclean-2.11.4.1/debian/rules 2022-10-06 10:42:07.0 -0700
@@ -4,17 +4,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# 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)
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+export CC
+export FORCE_SOURCE_DATE=1
# This target makes sure that timestamps of files are in the
# right order after dpkg-deb has unpacked the package. It prevents
@@ -29,7 +23,6 @@
config.status: autogen-check
CFLAGS="$(CFLAGS)" ./configure \
--with-pager=/usr/bin/pager --with-fhs-rcfiles \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man
build: build-arch build-indep
Bug#1020814: dradio: reproducible-builds: build path embedded in /usr/bin/dradio
tags 1020814 + pending patch thanks I've just uploaded dradio 3.8-2.1 to DELAYED/10: dradio (3.8-2.1) unstable; urgency=medium . * Non-maintainer upload. * Pass dpkg-buildflags(1) to upstream's build system to ensure that reproducibility-related CFLAGS are used; this was based on a patch by Vagrant Cascadian. This required the disabling of -Werror=format-security via DEB_BUILD_MAINT_OPTIONS due to suspicious calls to snprintf(3). (Closes: #1020814) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for dradio-3.8 dradio-3.8 changelog | 11 +++ rules |6 ++ 2 files changed, 17 insertions(+) diff -Nru dradio-3.8/debian/changelog dradio-3.8/debian/changelog --- dradio-3.8/debian/changelog 2011-10-07 22:06:27.0 -0700 +++ dradio-3.8/debian/changelog 2022-10-06 10:32:46.0 -0700 @@ -1,3 +1,14 @@ +dradio (3.8-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Pass dpkg-buildflags(1) to upstream's build system to ensure that +reproducibility-related CFLAGS are used; this was based on a patch by +Vagrant Cascadian. This required the disabling of -Werror=format-security +via DEB_BUILD_MAINT_OPTIONS due to suspicious calls to snprintf(3). +(Closes: #1020814) + + -- Chris Lamb Thu, 06 Oct 2022 10:32:46 -0700 + dradio (3.8-2) unstable; urgency=low * d/control: diff -Nru dradio-3.8/debian/rules dradio-3.8/debian/rules --- dradio-3.8/debian/rules 2011-10-07 22:06:27.0 -0700 +++ dradio-3.8/debian/rules 2022-10-06 10:32:46.0 -0700 @@ -1,4 +1,10 @@ #!/usr/bin/make -f +# Disable -Werror=format-security due to upstream calls to snprintf(3) +export DEB_BUILD_MAINT_OPTIONS=hardening=-format + %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)"
Bug#829721: remote-tty: please make the build reproducible
tags 829721 + pending patch tags 977280 + pending patch thanks I've just uploaded remote-tty 4.0-13.1 to DELAYED/10: remote-tty (4.0-13.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. (Closes: #829721) * Apply a patch by Helmut Grohne to correctly pass cross-building to upstream's build system. (Closes: #977280) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for remote-tty_4.0-13 remote-tty_4.0-13.1 changelog | 10 ++ rules |2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff -u remote-tty-4.0/debian/changelog remote-tty-4.0/debian/changelog --- remote-tty-4.0/debian/changelog +++ remote-tty-4.0/debian/changelog @@ -1,3 +1,13 @@ +remote-tty (4.0-13.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. +(Closes: #829721) + * Apply a patch by Helmut Grohne to correctly pass cross-building to +upstream's build system. (Closes: #977280) + + -- Chris Lamb Thu, 06 Oct 2022 10:19:32 -0700 + remote-tty (4.0-13) unstable; urgency=low * Fold in Ubuntu changes for tmpfs /var/run (closes: #587107) diff -u remote-tty-4.0/debian/rules remote-tty-4.0/debian/rules --- remote-tty-4.0/debian/rules +++ remote-tty-4.0/debian/rules @@ -17,7 +17,7 @@ build-indep: build-stamp build-stamp: dh_testdir - $(MAKE) + dh_auto_build touch build-stamp clean:
Bug#1007421: ascii2binary: reproducible-builds: build path embedded in /usr/bin/ascii2binary
tags 1020812 + pending patch tags 998758 + pending patch tags 1007421 + pending patch thanks I've just uploaded ascii2binary 2.14-1.1 to DELAYED/10: ascii2binary (2.14-1.1) unstable; urgency=medium . * Non-maintainer upload. * Use dpkg-buildflags(1) to ensure reproducibility-related CFLAGS are passed to the upstream build system. This change was based on a patch by Vagrant Cascadian. (Closes: #1020812) * Switch to dpkg-source 3.0 (quilt) format. (Closes: #998758, #1007421) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for ascii2binary-2.14 ascii2binary-2.14 changelog | 10 ++ rules |3 +++ source/format |1 + 3 files changed, 14 insertions(+) diff -Nru ascii2binary-2.14/debian/changelog ascii2binary-2.14/debian/changelog --- ascii2binary-2.14/debian/changelog 2022-10-06 10:11:52.0 -0700 +++ ascii2binary-2.14/debian/changelog 2022-10-06 10:08:45.0 -0700 @@ -1,3 +1,13 @@ +ascii2binary (2.14-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use dpkg-buildflags(1) to ensure reproducibility-related CFLAGS are +passed to the upstream build system. This change was based on a patch by +Vagrant Cascadian. (Closes: #1020812) + * Switch to dpkg-source 3.0 (quilt) format. (Closes: #998758, #1007421) + + -- Chris Lamb Thu, 06 Oct 2022 10:08:45 -0700 + ascii2binary (2.14-1) unstable; urgency=low * New upstream release (Closes: #598600, #625025). diff -Nru ascii2binary-2.14/debian/rules ascii2binary-2.14/debian/rules --- ascii2binary-2.14/debian/rules 2022-10-06 10:11:52.0 -0700 +++ ascii2binary-2.14/debian/rules 2022-10-06 10:08:45.0 -0700 @@ -6,3 +6,6 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" diff -Nru ascii2binary-2.14/debian/source/format ascii2binary-2.14/debian/source/format --- ascii2binary-2.14/debian/source/format 1969-12-31 16:00:00.0 -0800 +++ ascii2binary-2.14/debian/source/format 2022-10-06 10:08:45.0 -0700 @@ -0,0 +1 @@ +3.0 (quilt)
Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
Hey, Thanks for your blessing. However, I'll leave it in DELAYED/10 just in case I discover something over the next week or so. :) Chris > Thanks! I didn't get around to this. I probably won't get around to uploading > it myself either, so feel free to skip the delayed queue, or else it'll get in > in 10 days. > > On Thu, Oct 06, 2022 at 09:16:23AM -0700, Chris Lamb wrote: >> tags 1020875 + pending patch >> tags 939775 + pending patch >> thanks >> >> I've uploaded z80asm 1.8-1.1 to DELAYED/10: >> >> z80asm (1.8-1.1) unstable; urgency=medium >> . >> * Non-maintainer upload. >> * Apply a patch by Vagrant Cascadian to make the build reproducible. The >> build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) >> * Apply patch from Helmut Grohne to make as z80asm cross build >> correctly. It >> was failing because it ran its own testsuite despite the value of >> DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part >> of >> the "build" target and offers no specific test target. (Closes: >> #939775) >> >> The full debdiff is attached. >> >> >> Regards, >> >> -- >> ,''`. >> : :' : Chris Lamb >> `. `'` la...@debian.org / chris-lamb.co.uk >>`- > >> diffstat for z80asm_1.8-1 z80asm_1.8-1.1 >> >> Makefile|1 - >> z80asm-1.8/debian/changelog | 12 >> z80asm-1.8/debian/rules |8 >> 3 files changed, 20 insertions(+), 1 deletion(-) >> >> diff -u z80asm-1.8/debian/changelog z80asm-1.8/debian/changelog >> --- z80asm-1.8/debian/changelog >> +++ z80asm-1.8/debian/changelog >> @@ -1,3 +1,15 @@ >> +z80asm (1.8-1.1) unstable; urgency=medium >> + >> + * Non-maintainer upload. >> + * Apply a patch by Vagrant Cascadian to make the build reproducible. The >> +build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) >> + * Apply patch from Helmut Grohne to make as z80asm cross build correctly. >> It >> +was failing because it ran its own testsuite despite the value of >> +DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of >> +the "build" target and offers no specific test target. (Closes: #939775) >> + >> + -- Chris Lamb Thu, 06 Oct 2022 09:09:08 -0700 >> + >> z80asm (1.8-1) unstable; urgency=low >> >>* New upstream release. Fixes defw bug. (Closes: #519098) >> diff -u z80asm-1.8/debian/rules z80asm-1.8/debian/rules >> --- z80asm-1.8/debian/rules >> +++ z80asm-1.8/debian/rules >> @@ -1,3 +1,11 @@ >> #!/usr/bin/make -f >> %: >> dh $@ >> + >> +override_dh_auto_build: >> +dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" >> + >> +override_dh_auto_test: >> +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) >> +$(MAKE) -C tests >> +endif >> --- z80asm-1.8.orig/Makefile >> +++ z80asm-1.8/Makefile >> @@ -25,7 +25,6 @@ >> >> z80asm: z80asm.o expressions.o Makefile gnulib/getopt.o gnulib/getopt1.o >> $(CC) $(LDFLAGS) $(filter %.o,$^) -o $@ >> -$(MAKE) -C tests || rm $@ >> >> %.o:%.c z80asm.h gnulib/getopt.h Makefile >> $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"$(shell cat VERSION)\"
Bug#1020665: libimage-imlib2-perl: reproducible-builds: Embedded build path in Imlib2.so
tags 1020665 + pending patch thanks I've just uploaded libimage-imlib2-perl 2.03-1.1 to DELAYED/10: libimage-imlib2-perl (2.03-1.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to avoid embedding the build path in Imlib2.so. (Closes: #1020665) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for libimage-imlib2-perl-2.03 libimage-imlib2-perl-2.03 changelog |8 patches/reproducible_build.diff | 21 + patches/series |1 + 3 files changed, 30 insertions(+) diff -Nru libimage-imlib2-perl-2.03/debian/changelog libimage-imlib2-perl-2.03/debian/changelog --- libimage-imlib2-perl-2.03/debian/changelog 2011-10-15 16:36:13.0 -0700 +++ libimage-imlib2-perl-2.03/debian/changelog 2022-10-06 09:56:50.0 -0700 @@ -1,3 +1,11 @@ +libimage-imlib2-perl (2.03-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to avoid embedding the build path +in Imlib2.so. (Closes: #1020665) + + -- Chris Lamb Thu, 06 Oct 2022 09:56:50 -0700 + libimage-imlib2-perl (2.03-1) unstable; urgency=low * New upstream release diff -Nru libimage-imlib2-perl-2.03/debian/patches/reproducible_build.diff libimage-imlib2-perl-2.03/debian/patches/reproducible_build.diff --- libimage-imlib2-perl-2.03/debian/patches/reproducible_build.diff 1969-12-31 16:00:00.0 -0800 +++ libimage-imlib2-perl-2.03/debian/patches/reproducible_build.diff 2022-10-06 09:56:50.0 -0700 @@ -0,0 +1,21 @@ +Description: Pass -ffile-prefix-map via $cflags to avoid embedding build path. +Author: Vagrant Cascadian + +--- libimage-imlib2-perl-2.03.orig/Build.PL libimage-imlib2-perl-2.03/Build.PL +@@ -1,5 +1,6 @@ + use Module::Build; + use strict; ++use Cwd; + + # We need to find imlib2-config + my $CONFIG = "imlib2-config"; +@@ -20,7 +21,7 @@ point to the imlib2-config program that + } + + my $libs = `$CONFIG --libs`; +-my $cflags = "-DX_DISPLAY_MISSING " . `$CONFIG --cflags`; ++my $cflags = "-DX_DISPLAY_MISSING " . `$CONFIG --cflags` . "-ffile-prefix-map=" . getcwd() . "=." ; + + my $build = Module::Build->new( + c_source => './lib/Image', diff -Nru libimage-imlib2-perl-2.03/debian/patches/series libimage-imlib2-perl-2.03/debian/patches/series --- libimage-imlib2-perl-2.03/debian/patches/series 2011-10-15 16:36:13.0 -0700 +++ libimage-imlib2-perl-2.03/debian/patches/series 2022-10-06 09:56:50.0 -0700 @@ -1 +1,2 @@ add_more_error_reporting.diff +reproducible_build.diff
Bug#1020748: xcolmix: reproducible-builds: Embedded build path in /usr/bin/xcolmix
tags 1020748 + pending patch tags 999219 + pending patch tags 988018 + pending patch thanks I've just uploaded xcolmix 1.07-10.1 to DELAYED/10: xcolmix (1.07-10.1) unstable; urgency=medium . * Non-maintainer upload. * Add missing required debian/rules targets build-arch and/or build-indep. (Closes: #999219) * Apply a patch by Helmut Grohne to correctly pass cross-building tools to Make. (Closes: #988018) * Make the build reproducible by adapting debian/rules to use CFLAGS from dpkg-buildflags(1), appending -ffile-prefix-map. (Closes: #1020748) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for xcolmix-1.07 xcolmix-1.07 changelog | 12 rules |5 - 2 files changed, 16 insertions(+), 1 deletion(-) diff -Nru xcolmix-1.07/debian/changelog xcolmix-1.07/debian/changelog --- xcolmix-1.07/debian/changelog 2010-05-27 17:47:37.0 -0700 +++ xcolmix-1.07/debian/changelog 2022-10-06 09:41:37.0 -0700 @@ -1,3 +1,15 @@ +xcolmix (1.07-10.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing required debian/rules targets build-arch and/or build-indep. +(Closes: #999219) + * Apply a patch by Helmut Grohne to correctly pass cross-building tools to +Make. (Closes: #988018) + * Make the build reproducible by adapting debian/rules to use CFLAGS from +dpkg-buildflags(1), appending -ffile-prefix-map. (Closes: #1020748) + + -- Chris Lamb Thu, 06 Oct 2022 09:41:37 -0700 + xcolmix (1.07-10) unstable; urgency=low * Rebuild against libforms2. diff -Nru xcolmix-1.07/debian/rules xcolmix-1.07/debian/rules --- xcolmix-1.07/debian/rules 2010-05-27 17:45:10.0 -0700 +++ xcolmix-1.07/debian/rules 2022-10-06 09:41:37.0 -0700 @@ -7,10 +7,13 @@ package=xcolmix +build-arch: build +build-indep: build + build: $(checkdir) - (cd src; make final STDLFLAGS="-L /usr/X11R6/lib" STDCFLAGS="-c -O2 -Wall $(XFINCDIR) -g") + dh_auto_build --sourcedirectory=src -- final STDLFLAGS="-L /usr/X11R6/lib" STDCFLAGS="$(XFINCDIR) $(shell dpkg-buildflags --get CFLAGS)" touch build clean:
Bug#777413: mailto: please make the build reproducible
tags 777413 + pending patch
thanks
I've just uploaded mailto 1.3.2-3.1 to DELAYED/10:
mailto (1.3.2-3.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Implement the required build-arch and build-indep targets in debian/rules.
(Closes: #998978)
* Make the build reproducible by adding "-n" to the gzip(1) invocation.
(Closes: #777413)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for mailto_1.3.2-3 mailto_1.3.2-3.1
changelog | 10 ++
rules |5 -
2 files changed, 14 insertions(+), 1 deletion(-)
diff -u mailto-1.3.2/debian/changelog mailto-1.3.2/debian/changelog
--- mailto-1.3.2/debian/changelog
+++ mailto-1.3.2/debian/changelog
@@ -1,3 +1,13 @@
+mailto (1.3.2-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Implement the required build-arch and build-indep targets in debian/rules.
+(Closes: #998978)
+ * Make the build reproducible by adding "-n" to the gzip(1) invocation.
+(Closes: #777413)
+
+ -- Chris Lamb Thu, 06 Oct 2022 09:26:08 -0700
+
mailto (1.3.2-3) unstable; urgency=low
* Disable included version of getline() since it is unused and produce
diff -u mailto-1.3.2/debian/rules mailto-1.3.2/debian/rules
--- mailto-1.3.2/debian/rules
+++ mailto-1.3.2/debian/rules
@@ -37,6 +37,9 @@
installdoc= install -g root -o root -m 644
installscript = install -g root -o root -m 755
+build-arch: build
+build-indep: build
+
build:
$(MAKE) CFLAGS="$(CFLAGS)"
touch stamp-build
@@ -66,7 +69,7 @@
#
$(installdoc) debian/changes
debian/tmp/usr/share/doc/$(package)/changelog
$(installdoc) debian/{readme,usage}.txt
debian/tmp/usr/share/doc/$(package)
- gzip -9f
debian/tmp/usr/share/doc/$(package)/{changelog{,.Debian},{readme,usage}.txt}
+ gzip -9fn
debian/tmp/usr/share/doc/$(package)/{changelog{,.Debian},{readme,usage}.txt}
#
$(installdir) debian/tmp/etc
$(installdoc) debian/mailto.conf debian/tmp/etc
Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
tags 1020875 + pending patch tags 939775 + pending patch thanks I've uploaded z80asm 1.8-1.1 to DELAYED/10: z80asm (1.8-1.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. The build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) * Apply patch from Helmut Grohne to make as z80asm cross build correctly. It was failing because it ran its own testsuite despite the value of DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of the "build" target and offers no specific test target. (Closes: #939775) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for z80asm_1.8-1 z80asm_1.8-1.1 Makefile|1 - z80asm-1.8/debian/changelog | 12 z80asm-1.8/debian/rules |8 3 files changed, 20 insertions(+), 1 deletion(-) diff -u z80asm-1.8/debian/changelog z80asm-1.8/debian/changelog --- z80asm-1.8/debian/changelog +++ z80asm-1.8/debian/changelog @@ -1,3 +1,15 @@ +z80asm (1.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. The +build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) + * Apply patch from Helmut Grohne to make as z80asm cross build correctly. It +was failing because it ran its own testsuite despite the value of +DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of +the "build" target and offers no specific test target. (Closes: #939775) + + -- Chris Lamb Thu, 06 Oct 2022 09:09:08 -0700 + z80asm (1.8-1) unstable; urgency=low * New upstream release. Fixes defw bug. (Closes: #519098) diff -u z80asm-1.8/debian/rules z80asm-1.8/debian/rules --- z80asm-1.8/debian/rules +++ z80asm-1.8/debian/rules @@ -1,3 +1,11 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) -C tests +endif --- z80asm-1.8.orig/Makefile +++ z80asm-1.8/Makefile @@ -25,7 +25,6 @@ z80asm: z80asm.o expressions.o Makefile gnulib/getopt.o gnulib/getopt1.o $(CC) $(LDFLAGS) $(filter %.o,$^) -o $@ - $(MAKE) -C tests || rm $@ %.o:%.c z80asm.h gnulib/getopt.h Makefile $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"$(shell cat VERSION)\"
Bug#1009799: puppet: reproducible builds: domain name embedded in puppet.conf.5 man page
Vagrant Cascadian wrote: > This patch appears to apply to puppet from experimental too, although I > was unable to get that to build to confirm the fix. See also bug #1021198, which is a parallel bug in the "puppet-agent" source package. Regards, -- o ⬋ ⬊ Chris Lamb o o reproducible-builds.org ⬊ ⬋ o
Bug#1021198: puppet-agent: please make the build reproducible
Source: puppet-agent
Version: 7.16.0-3
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: environment
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
puppet-agent could not be built reproducibly.
This is because the domain name of the system is embedded in the
manual page.
A patch is attached, which is based on the parallel (if not identical)
patch attached to bug #1009799 in the "puppet" source package that was
authored by Vagrant Cascadian.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/lib/puppet/defaults.rb2022-10-03 07:24:21.733301222 -0700
--- b/lib/puppet/defaults.rb2022-10-03 07:35:15.654024548 -0700
@@ -1613,7 +1613,7 @@
:desc => "Whether the server will search for SRV records in DNS
for the current domain.",
},
:srv_domain => {
- :default=> lambda { Puppet::Settings.domain_fact },
+ :default=> lambda { ENV.has_key?('SOURCE_DATE_EPOCH') ? '(node\'s
fully qualified domain name)' : Puppet::Settings.domain_fact },
:desc => "The domain which will be queried to find the SRV records
of servers to use.",
},
:http_extra_headers => {
Bug#1021085: mksh: ignored test making the build unreproducible
Source: mksh Version: 59c-18 Severity: wishlist User: reproducible-bui...@lists.alioth.debian.org Usertags: randomness X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort we noticed that mksh could not be built reproducibly anymore. This is because the test summary is printed in README.Debian, and if any of the tests are "ignored" this is recorded as well. However, if the number of ignored tests is different between two specimen builds, then the package is rendered unreproducible. For example: Regression test results: -| FAIL ../../check.t:heredoc-tmpfile-8 (ignored) -| Total failed: 1 (1 ignored) -| Total passed: 576 +| Total failed: 0 +| Total passed: 577 To be clear, that mksh includes test info is not necessarily a bug, and nor is it necessarily a bug in mksh that some test is failing in some weird environment. But the combination of the two is unfortunately causing a reproducibility regression and I thought you may have more context. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1014475: firmware-atheros: Please update QCA6390 firmware
Modestas Vainius wrote: > * amss.bin, m3.bin - from > https://github.com/kvalo/ath11k-firmware/tree/master/QCA6390/hw2.0/1.0.1/WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1/ > * board-2.bin - from > https://github.com/kvalo/ath11k-firmware/blob/master/QCA6390/hw2.0/board-2.bin > > md5sum: > > 682f7ca2e0b3ea16644c3585772a2cba amss.bin > fafd08643ce688612c1af3590e309f3e board-2.bin > fd4aa4a58f33854a751ec7d14d77ce91 m3.bin I just manually updated my firmware files locally as I was experiencing some wifi stability issues and thought that it might fix them. However, I still experience some issues of a kind that require me to reconnect to my access point every so often. I don't have a reliable testcase, I'm afraid, but it particularly occurs when transferring large amounts of data such as via scp(1) or whilst videoconferencing. Am writing this message only so that folks have realistic expectations about what updating their firmware might do. In other words, whilst updating the firmware package is a good thing, "my" (or "your") bug is likely elsewhere. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1020630: diffoscope: cbfstool is finally available in Debian
tags 1020630 + pending thanks > since this Thursday src:coreboot is finally (*) in unstable and thus cbfstool > is finally there too (via binary:coreboot-utils) Seems like it's straightforward to integrate, and even the tests pass for me locally. Thanks. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#873138: Installed-Build-Depends lack architecture qualification
Helmut Grohne wrote: > In order to get some confidence in this patch, I've performed some tests > and compared .buildinfo files using dpkg with/without this patch. I > chose hostname as a very simple example and libxml2 as an example that > involves dependencies on virtual packages, dependencies on Multi-Arch: > foreign packages, :any-annotated dependencies on Multi-Arch: allowed > packages as well as normal dependencies on Multi-Arch: same packages. For my part, I've tested a few native builds with Helmut's patch applied and do not detect any changes in the generated .buildinfo file (except, of course, for the Build-Date field). Hope this helps. Thanks, Helmut. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#613997: gnome-games: Backtrace
forwarded 613997 https://gitlab.gnome.org/GNOME/quadrapassel/-/issues/44 thanks Jeremy Bicha wrote: > Wow, you're replying today to a bug that hasn't been touched in a decade? Oh sure — I mean, it seems like the same bug at least. :) > Are you able to report this issue upstream? > https://gitlab.gnome.org/GNOME/quadrapassel/-/issues Indeed. In fact, it looks like someone beat me to it, but I've added the details there (including that this was with 1:40.2-1). Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#613997: gnome-games: Backtrace
Tobias Hansen wrote:
> I also get a segfault regardless of the locale. Gfx driver is intel.
> However, when running with gdb the program doesn't crash. This is the output:
> [..]
I also get a segfault regardless of locale, and I can reproduce the
crash under gdb (see below). I therefore wonder whether this bug should
have a higher severity?
Thread 1 "quadrapassel" received signal SIGSEGV, Segmentation fault.
0x55567d87 in quadrapassel_key_press_event_cb (event=,
widget=, self=0x55856310) at
src/quadrapassel.p/quadrapassel.c:2611
Download failed: Invalid argument. Continuing without source file
./obj-x86_64-linux-gnu/src/quadrapassel.p/quadrapassel.c.
2611src/quadrapassel.p/quadrapassel.c: No such file or directory.
(gdb) bt
#0 0x55567d87 in quadrapassel_key_press_event_cb (event=, widget=, self=0x55856310) at
src/quadrapassel.p/quadrapassel.c:2611
#1 _quadrapassel_key_press_event_cb_gtk_widget_key_press_event
(_sender=, event=, self=0x55856310) at
src/quadrapassel.p/quadrapassel.c:561
#2 0x773e9057 in ?? () from /lib/x86_64-linux-gnu/libgtk-3.so.0
#3 0x77a6a500 in g_closure_invoke () from
/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#4 0x77a7db36 in ?? () from /lib/x86_64-linux-gnu/libgobject-2.0.so.0
#5 0x77a83eed in g_signal_emit_valist () from
/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#6 0x77a8487f in g_signal_emit () from
/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#7 0x77393554 in ?? () from /lib/x86_64-linux-gnu/libgtk-3.so.0
#8 0x772496ff in ?? () from /lib/x86_64-linux-gnu/libgtk-3.so.0
#9 0x7724b066 in gtk_main_do_event () from
/lib/x86_64-linux-gnu/libgtk-3.so.0
#10 0x76b335a5 in ?? () from /lib/x86_64-linux-gnu/libgdk-3.so.0
#11 0x76b675b2 in ?? () from /lib/x86_64-linux-gnu/libgdk-3.so.0
#12 0x77972729 in g_main_context_dispatch () from
/lib/x86_64-linux-gnu/libglib-2.0.so.0
#13 0x779729b8 in ?? () from /lib/x86_64-linux-gnu/libglib-2.0.so.0
#14 0x77972a4c in g_main_context_iteration () from
/lib/x86_64-linux-gnu/libglib-2.0.so.0
#15 0x77d38d5d in g_application_run () from
/lib/x86_64-linux-gnu/libgio-2.0.so.0
#16 0xb509 in quadrapassel_main (args_length1=,
args=) at src/quadrapassel.p/quadrapassel.c:3243
#17 main (argc=, argv=) at
src/quadrapassel.p/quadrapassel.c:3253
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1019698: cdebootstrap: aid reproducible boostrapping by providing a --cleanup-logs option
Holger Levsen wrote: > This bug is about the first step. It would be really nice if cdebootstrap > had an option called --cleanup-logs which would delete those logs. Would it be sensible to suggest that, instead of an explicit command-line flag, that debootstrap would do this cleanup if SOURCE_DATE_EPOCH is present? If it helps, the idea of using the presence (or non-presence) of SOURCE_DATE_EPOCH to slightly adjust the behaviour of a program is already being used as a flag in other places. (If it helps, the parallel bug for debootstrap is #1019697.) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1019697: debootstrap: aid reproducible boostrapping by providing a --cleanup-logs option
Holger Levsen wrote: > This bug is about the first step. It would be really nice if debootstrap > had an option called --cleanup-logs which would delete those logs. Would it be sensible to suggest that, instead of an explicit command-line flag, that debootstrap would do this cleanup if SOURCE_DATE_EPOCH is present? If it helps, the idea of using the presence (or non-presence) of SOURCE_DATE_EPOCH to slightly adjust the behaviour of a program is already being used as a flag in other places. (If it helps, the parallel bug for cdebootstrap is #1019698.) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#972494: libgrokj2k: please make the documentation reproducible
Aaron Boxer wrote: > Hello, > > This bug was fixed long ago, the current unstable version 10.0.0.1 no > longer has this issue. What must happen for this to be closed ? You can find instructions on how to close bugs on this page: https://www.debian.org/Bugs/Developer#closing Specifically: Bug reports should be closed by sending email to nnn-d...@bugs.debian.org. The message body needs to contain an explanation of how the bug was fixed. With the emails received from the bug tracking system, all you need to do to close the bug is to make a Reply in your mail reader program and edit the To field to say nnn-d...@bugs.debian.org instead of n...@bugs.debian.org (nnn-close is provided as an alias for nnn-done). As it was fixed in a particular version, do look at the next line: Where applicable, please supply a Version line in the pseudo-header of your message when closing a bug, so that the bug tracking system knows which releases of the package contain the fix. ... although this should be the Debian package version number (ie. something ending in "-1") rather than the raw upstream version. Hope this helps. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#972494: libgrokj2k: please make the documentation reproducible
Aaron Boxer wrote: > Attachments: > * pgp-encrypted > * encrypted.asc Please could you resend your reply without encryption? Many thanks. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1019382: gnome-online-accounts: please make the build reproducible
Source: gnome-online-accounts Version: 3.45.2-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpaths X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that gnome-online-accounts could not be built reproducibly. This is because it uses @filename@ when generating .h files instead of @basename@. Patch attached. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0 +0100 --- b/debian/patches/reproducible-build.patch 2022-09-08 09:58:17.430979484 +0100 @@ -0,0 +1,72 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2022-09-08 + +--- gnome-online-accounts-3.45.2.orig/src/goa/goaenumtypes.c.template gnome-online-accounts-3.45.2/src/goa/goaenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +--- gnome-online-accounts-3.45.2.orig/src/goa/goaenumtypes.h.template gnome-online-accounts-3.45.2/src/goa/goaenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +--- gnome-online-accounts-3.45.2.orig/src/goabackend/goabackendenumtypes.c.template gnome-online-accounts-3.45.2/src/goabackend/goabackendenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +--- gnome-online-accounts-3.45.2.orig/src/goabackend/goabackendenumtypes.h.template gnome-online-accounts-3.45.2/src/goabackend/goabackendenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +--- gnome-online-accounts-3.45.2.orig/src/goaidentity/goaidentityenumtypes.c.in gnome-online-accounts-3.45.2/src/goaidentity/goaidentityenumtypes.c.in +@@ -5,8 +5,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +--- gnome-online-accounts-3.45.2.orig/src/goaidentity/goaidentityenumtypes.h.in gnome-online-accounts-3.45.2/src/goaidentity/goaidentityenumtypes.h.in +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ --- a/debian/patches/series 2022-09-08 09:38:17.682223220 +0100 --- b/debian/patches/series 2022-09-08 09:58:15.454973116 +0100 @@ -0,0 +1 @@ +reproducible-build.patch
Bug#1015487: libfiu: ftbfs with LTO (link time optimization) enabled
Dear Alberto, >>> From this it seems the issue is with the stack trace collection. If LTO >>> is doing some inlining for example (which wouldn't surprise me) then it >>> could cause the test to fail. > > That's exactly what's happening: "-flto=auto -O2" was causing one of the > functions of the stack to be inlined, and causing the tests to fail. Thanks! Patch applied, and uploaded in Debian package version 1.1-3! :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1017945: geeqie: please make the build reproducible
Source: geeqie Version: 1:2.0.1-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that geeqie could not be built reproducibly. This is because it ships a Doxygen .tag file that contains the absolute build path. Patch attached that prevents this file from being shipped in the binary package, similar to some other files. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-08-22 08:59:15.361422245 -0700 --- b/debian/rules 2022-08-22 10:36:59.238342779 -0700 @@ -12,6 +12,7 @@ $(CURDIR)/debian/tmp/usr/share/doc/geeqie-common/README.md \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/COPYING \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie-common/AUTHORS \ + $(CURDIR)/debian/tmp/usr/share/doc/geeqie/html/lua-api/Geeqie.tag \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/ChangeLog \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/ChangeLog.html
Bug#1017920: sysfsutils: please make the build reproducible
Source: sysfsutils Version: 2.1.1-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that sysfsutils could not be built reproducibly. This is because the call to date(1) was missing the -u/--utc flag, so that the manpage date based on the value of SOURCE_DATE_EPOCH would vary depending on the host system's timezone setting. Patch attached that appends -u to the pod2man call. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-08-22 07:40:30.822003445 -0700 --- b/debian/rules 2022-08-22 07:41:10.313858857 -0700 @@ -11,7 +11,7 @@ --section=5 \ --center=sysfsutils \ --name=$(basename $(notdir $<)) \ - --date=$(shell date -d @$(SOURCE_DATE_EPOCH) -I) \ + --date=$(shell date -u -d @$(SOURCE_DATE_EPOCH) -I) \ --release=$(DEB_VERSION) \ $< >$@
Bug#1017556: src:redis: fails to migrate to testing for too long: autopkgtest regressions
Paul Gevers wrote: > If you believe your package is unable to migrate to testing due to > issues beyond your control, don't hesitate to contact the Release Team. I think I've fixed the two underlying issues have been fixed: * python-fakeredis was fixed in #1014101 * python-redis was fixed in #1014102 Perhaps jobs just need to be resubmitted? I see that the version numbers on: https://qa.debian.org/excuses.php?package=redis ... refer to the unfixed versions; for example, python-fakeredis (version 1.6.1-1) was fixed in 1.7.1-1. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1017556: src:redis: fails to migrate to testing for too long: autopkgtest regressions
Hi Paul,
> I have prepared a new version of python-fakeredis which builds and
> passes its autopkgtest in unstable:
> https://salsa.debian.org/python-team/packages/python-fakeredis/-/merge_requests/1
> https://salsa.debian.org/python-team/packages/python-fakeredis/-/merge_requests/2
> https://salsa.debian.org/python-team/packages/python-fakeredis/-/merge_requests/3
Uploading now. :)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1015487: libfiu: ftbfs with LTO (link time optimization) enabled
Hey Alberto, Just briefly reaching out to you just in case this slipped your mind during your time away from the internet. Hopefully, it's quite an easy fix. Best wishes, Chris > On 20 July 2022 00:18:29 GMT-06:00, Chris Lamb wrote: >>Hi Alberto, >> >>Any ideas why libfiu fails to build with -flto=auto -ffat-lto-objects >>(etc.) enabled? > > Just FYI I have extremely limited connectivity until the end of the > month, so I'm afraid I won't have a chance to look before then :( > > >>> cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE >>> -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. >>> -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat >>> -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic >>> -Wall tests/strdup.c -lfiu -o tests/strdup.bin >>> LD_LIBRARY_PATH=../libfiu/ >>> LD_PRELOAD=./libs/fiu_run_preload.so:./libs/fiu_posix_preload.so >>> ./test-enable_stack >>> test-enable_stack: test-enable_stack.c:39: main: Assertion `func2() == >>> 1' failed. > > From this it seems the issue is with the stack trace collection. If LTO > is doing some inlining for example (which wouldn't surprise me) then it > could cause the test to fail. > > I'll look in more detail at the beginning of August.
Bug#1017475: sphinx-panels: please make the build reproducible
forwarded 1017475 https://github.com/executablebooks/sphinx-panels/pull/82 thanks I've forwarded this upstream here: https://github.com/executablebooks/sphinx-panels/pull/82 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1014041: yt-dlp: please make the build reproducible
forwarded 1014041 https://github.com/psi-im/psi/pull/699 thanks I've forwarded this upstream here: https://github.com/psi-im/psi/pull/699 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1017475: sphinx-panels: please make the build reproducible
> thanks! would you consider sending this upstream > https://github.com/executablebooks/sphinx-panels ? thanks! Of course; will do so shortly. -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1017475: sphinx-panels: please make the build reproducible
Source: sphinx-panels
Version: 0.6.0-2
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: randomness
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
sphinx-panels could not be built reproducibly.
This is because it uses Python's uuid.uuid4 to generate unique
identifiers, but those numbers are random/nondeterminstic by design.
I've attached a patch that will seed these random numbers from
SOURCE_DATE_EPOCH if it exists, otherwise it will revert back to
random numbers.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diff --git a/sphinx_panels/tabs.py b/sphinx_panels/tabs.py
index ac2a546..725a5f4 100644
--- a/sphinx_panels/tabs.py
+++ b/sphinx_panels/tabs.py
@@ -1,4 +1,8 @@
-from uuid import uuid4
+import os
+import random
+import time
+import uuid
+
from typing import Optional
from docutils import nodes
@@ -10,6 +14,9 @@ from sphinx.util.nodes import NodeMatcher
LOGGER = getLogger(__name__)
+rnd = random.Random()
+rnd.seed(os.environ.get("SOURCE_DATE_EPOCH", time.time()))
+
def setup_tabs(app):
app.add_directive("tabbed", TabbedDirective)
@@ -122,7 +129,7 @@ class TabbedHtmlTransform(SphinxPostTransform):
formats = ("html",)
def get_unique_key(self):
-return str(uuid4())
+return uuid.UUID(int=rnd.getrandbits(128), version=4).hex
def run(self):
matcher = NodeMatcher(nodes.container, type="tabbed")
Bug#1017473: psi: please make the build reproducible
Source: psi
Version: 1.5+dfsg1-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
psi could not be built reproducibly.
This is because that it embeds a build date that varies depending on
the current timezone. Patch attached that ensures that UTC is used.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/02_reproducible-build.patch1969-12-31
16:00:00.0 -0800
--- b/debian/patches/02_reproducible-build.patch2022-08-16
09:18:55.526039355 -0700
@@ -0,0 +1,17 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-08-16
+
+--- psi-1.5+dfsg1.orig/src/CMakeLists.txt
psi-1.5+dfsg1/src/CMakeLists.txt
+@@ -179,8 +179,8 @@ else()
+ include_directories(${Iris_INCLUDE_DIR})
+ endif()
+
+-string(TIMESTAMP PSI_COMPILATION_DATE "%Y-%m-%d")
+-string(TIMESTAMP PSI_COMPILATION_TIME "%H:%M:%S")
++string(TIMESTAMP PSI_COMPILATION_DATE "%Y-%m-%d" UTC)
++string(TIMESTAMP PSI_COMPILATION_TIME "%H:%M:%S" UTC)
+
+ if(ENABLE_WEBKIT)
+ if(NOT USE_WEBENGINE)
--- a/debian/patches/series 2022-08-16 08:48:12.156883531 -0700
--- b/debian/patches/series 2022-08-16 09:18:53.694037532 -0700
@@ -1 +1,2 @@
01_install-hicolor-icons.patch
+02_reproducible-build.patch
Bug#1016584: node-canvas-confetti: please make the build reproducible
Source: node-canvas-confetti
Version: 1.5.1+~1.4.3-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
node-canvas-confetti could not be built reproducibly.
This is because embedded the build time into the file. Whilst I could
have patched this to use SOURCE_DATE_EPOCH, it seems more sensible to
simply drop the timestamp; it's in a comment anyway and "built on" using
the value of SOURCE_DATE_EPOCH may even be misleading.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1969-12-31 16:00:00.0
-0800
--- b/debian/patches/reproducible-build.patch 2022-08-03 08:00:30.310187371
-0700
@@ -0,0 +1,24 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-08-03
+
+--- node-canvas-confetti-1.5.1+~1.4.3.orig/build/build.js
node-canvas-confetti-1.5.1+~1.4.3/build/build.js
+@@ -26,7 +26,7 @@ function writeFile(file, content) {
+ }
+
+ function buildCommonJs(content) {
+- return `// ${name} v${version} built on ${buildDate}
++ return `// ${name} v${version}
+ !(function (window, module) {
+ // source content
+ ${content}
+@@ -38,7 +38,7 @@ ${content}
+ }
+
+ function buildModule(content) {
+- return `// ${name} v${version} built on ${buildDate}
++ return `// ${name} v${version}
+ var module = {};
+
+ // source content
--- a/debian/patches/series 2022-08-03 07:57:12.233950517 -0700
--- b/debian/patches/series 2022-08-03 08:00:27.686184206 -0700
@@ -1 +1,2 @@
replace-old-ava-by-jest.patch
+reproducible-build.patch
Bug#1016583: multipath-tools: please make the build reproducible
Source: multipath-tools Version: 0.9.0-3 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that multipath-tools could not be built reproducibly. Whilst the package is very careful to export KBUILD_BUILD_TIMESTAMP based on the value of SOURCE_DATE_EPOCH, the issue is that the Makefile under libdmmp/ overrides that. Patch attached. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/0012-Reproducible-build.patch 1969-12-31 16:00:00.0 -0800 --- b/debian/patches/0012-Reproducible-build.patch 2022-08-03 07:52:00.661589713 -0700 @@ -0,0 +1,15 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2022-08-03 + +--- multipath-tools-0.9.0.orig/libdmmp/Makefile multipath-tools-0.9.0/libdmmp/Makefile +@@ -75,7 +75,7 @@ docs/man/dmmp_strerror.3:$(HEADERS) + TEMPFILE=$(shell mktemp); \ + cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \ + LC_ALL=C \ +- KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^` \ ++ KBUILD_BUILD_TIMESTAMP=`echo $$KBUILD_BUILD_TIMESTAMP | grep . || git log -n1 --pretty=%cd --date=iso -- $^` \ + perl docs/kernel-doc -man $$TEMPFILE | \ + perl docs/split-man.pl docs/man; \ + rm -f $$TEMPFILE --- a/debian/patches/series 2022-08-03 07:48:33.457362430 -0700 --- b/debian/patches/series 2022-08-03 07:51:56.085584559 -0700 @@ -7,3 +7,4 @@ 0009-kpartx-rules-use-Debian-specific-partx-path.patch 0010-multipath.rules-do-not-assume-usrmerged-paths.patch 0011-Fix-bashism-in-kpartx_id-script.patch +0012-Reproducible-build.patch
Bug#1016090: python-django breaks lots of autopkgtests
Raphael Hertzog wrote: > As such, as much as I hate it, I think than only (a) is realistic. Yeah. :/ Okay, I'll upload 3.3.14 shortly. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1016090: python-django breaks lots of autopkgtests
Raphael Hertzog wrote: > I'm surprised that we uploaded an non-LTS release to unstable. > > Chris, why did you do that? Hmpf, this is deeply unfortunate. I was working under the incorrect belief that the 4.0.x series was now the LTS branch. A number of things encouraged this interpretation, including that the 4.0.x and 4.1.x were the release streams that were receiving security and targeted bugfix releases, and this was happening as a relatively consistent pair. (As in, not the 3.x stream.) Regardless of that though, I think we have two options: a) Revert back to the 3.2.14 LTS version in Debian unstable. b) Wait for the 4.x stream to become designated LTS. I believe this should happen with version 4.2, due for release in about 6 or 7 months: https://www.djangoproject.com/download/ Best wishes, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1016487: rust-rustls: please make the build reproducible
Source: rust-rustls Version: 0.20.6-6 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: randomness X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that rust-rustls could not be built reproducibly. This is because, whilst the package does attempt to clean up the offending sslkeylogfile.txt file, this file is actually generated under the rustls/ directory. Patch attached. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/rules 2022-08-01 09:43:13.283451411 -0700 --- b/debian/rules 2022-08-01 09:46:54.628158679 -0700 @@ -10,7 +10,7 @@ # cleanup after test execute_after_dh_auto_test: - rm -rf sslkeylogfile.txt + rm -rf rustls/sslkeylogfile.txt # mangle system-shared code to use system-shared test-ca and fuzz data execute_after_dh_auto_install:
Bug#1016486: wayfire: please make the build reproducible
Source: wayfire Version: 0.7.4-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that wayfire could not be built reproducibly. This is because it embedded an absolute build path into a config.h file. A patch is attached that fixes this value to a known/fixed value — the absolute build path won't exist at runtime anyway, so this is at least "no worse". [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/reproducible-build.patch 1969-12-31 16:00:00.0 -0800 --- b/debian/patches/reproducible-build.patch 2022-08-01 09:32:24.630250887 -0700 @@ -0,0 +1,15 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2022-08-01 + +--- wayfire-0.7.4.orig/config.h.in wayfire-0.7.4/config.h.in +@@ -3,7 +3,7 @@ + + #define INSTALL_PREFIX "@INSTALL_PREFIX@" + #define PLUGIN_PATH "@PLUGIN_PATH@" +-#define WF_SRC_DIR "@WF_SRC_DIR@" ++#define WF_SRC_DIR "/nonexistent" + #define PLUGIN_XML_DIR "@PLUGIN_XML_DIR@" + #define SYSCONFDIR "@SYSCONFDIR@" + #define WF_DEFAULT_CONFIG_BACKEND "@DEFAULT_CONFIG_BACKEND@" --- a/debian/patches/series 1969-12-31 16:00:00.0 -0800 --- b/debian/patches/series 2022-08-01 09:32:23.738249510 -0700 @@ -0,0 +1 @@ +reproducible-build.patch
Bug#1016186: gappa: please make the build reproducible
Source: gappa
Version: 1.4.0-4
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
gappa could not be built reproducibly.
This is because it ships the Sphinx doctree data which contains
nondeterministic data, some of which is based on the absolute build
path. A patch is attached that uses "--with sphinxdoc" which means
these get cleaned up (as well as other "good" things).
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/rules 2022-07-28 11:41:11.864847173 -0700
--- b/debian/rules 2022-07-28 11:51:27.283666718 -0700
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with sphinxdoc
override_dh_auto_configure:
touch stamp-config_h.in
Bug#1015487: libfiu: ftbfs with LTO (link time optimization) enabled
Dear Alberto,
> From this it seems the issue is with the stack trace collection. If LTO
> is doing some inlining for example (which wouldn't surprise me) then it
> could cause the test to fail.
>
> I'll look in more detail at the beginning of August.
No problem; there is no rush. Enjoy your time away! :)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1015487: libfiu: ftbfs with LTO (link time optimization) enabled
by_name > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/mmap.c -lfiu -o tests/mmap.bin > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/open.c -lfiu -o tests/open.bin > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/open64.c -lfiu -o tests/open64.bin > cc -I../libfiu/ -L../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE -fPIC > -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. -flto=auto > -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall test-ferror.c -lfiu > -lpthread -o test-ferror > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/pread.c -lfiu -o tests/pread.bin > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/pread64.c -lfiu -o tests/pread64.bin > cc -I../../libfiu/ -L../../libfiu/ -D_XOPEN_SOURCE=600 -D_GNU_SOURCE > -fPIC -DFIU_ENABLE=1 -g -O2 -ffile-prefix-map=/<>=. > -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat > -Werror=format-security -std=c99 -pedantic -Wall -std=c99 -pedantic > -Wall tests/strdup.c -lfiu -o tests/strdup.bin > LD_LIBRARY_PATH=../libfiu/ > LD_PRELOAD=./libs/fiu_run_preload.so:./libs/fiu_posix_preload.so > ./test-enable_stack > test-enable_stack: test-enable_stack.c:39: main: Assertion `func2() == > 1' failed. > Aborted > make[3]: *** [Makefile:74: c-run-test-enable_stack] Error 134 > make[3]: *** Waiting for unfinished jobs > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/fopen.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/fprintf.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/fread.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/kill.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/malloc.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/mmap.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/open.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/open64.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/pread.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/pread64.bin > LD_LIBRARY_PATH=../../libfiu/ > LD_PRELOAD="../../preload/run/fiu_run_preload.so > ../../preload/posix/fiu_posix_preload.so" ./tests/strdup.bin > rm tests/fprintf.bin tests/malloc.bin tests/kill.bin tests/open.bin > tests/fread.bin tests/strdup.bin tests/open64.bin tests/mmap.bin > tests/fopen.bin tests/pread64.bin tests/pread.bin > make[4]: Leaving directory '/<>/tests/generated' > make[4]: Leaving directory '/<>/tests/utils' > rm test-enable_stack_by_name test-ferror test-enable_stack > make[3]: Leaving directory '/<>/tests' > make[2]: *** [Makefile:58: test] Error 2 > make[2]: Leaving directory '/<>' > dh_auto_test: error: make -j8 test V=1 LC_ALL=C returned exit code 2 > make[1]: *** [debian/rules:33: override_dh_auto_test] Error 25 > make[1]: Leaving directory '/<>' > make: *** [debian/rules:13: binary] Error 2 > dpkg-buildpackage: error: debian/rules binary subprocess returned exit > status 2 -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1015246: zeal: please make the build reproducible
Source: zeal
Version: 1:0.6.1+git20220714+6fee23-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
zeal could not be built reproducibly.
This is because it adds a "development release" date to an XML file:
│ │ │ │ ├── ./usr/share/metainfo/org.zealdocs.zeal.appdata.xml
│ │ │ │ │ @@ -23,15 +23,15 @@
│ │ │ │ │https://i.imgur.com/qBkZduS.png
│ │ │ │ │
│ │ │ │ │
│ │ │ │ │
│ │ │ │ │ zeal.desktop
│ │ │ │ │
│ │ │ │ │
│ │ │ │ │ -
│ │ │ │ │ +
Patch attached that simply drops this line.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2022-07-18 11:47:48.221289879
+0100
@@ -0,0 +1,18 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-07-18
+
+--- zeal-0.6.1+git20220714+6fee23.orig/CMakeLists.txt
zeal-0.6.1+git20220714+6fee23/CMakeLists.txt
+@@ -44,11 +44,6 @@ endif()
+
+ set(ZEAL_VERSION_FULL "${Zeal_VERSION}${ZEAL_VERSION_SUFFIX}")
+
+-# For development builds insert an extra release in the AppStream metadata.
+-if(NOT RELEASE_VERSION)
+-string(TIMESTAMP ZEAL_APPSTREAM_DEV_RELEASE "\n")
+-endif()
+-
+ # A custom target to print the full version.
+ # Usage: cmake --build build --target zeal_version
+ add_custom_target(zeal_version
--- a/debian/patches/series 2022-07-18 11:36:13.167186089 +0100
--- b/debian/patches/series 2022-07-18 11:47:47.389286997 +0100
@@ -1,2 +1,3 @@
disable-check-for-update.patch
#system-cpp-httplib.patch # only needed with the next upstream release
+reproducible-build.patch
Bug#1015245: libshumate: please make the build reproducible
Source: libshumate
Version: 1.0.0~alpha.1-2
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
libshumate could not be built reproducibly.
This is because the generated enumerations file embeds the full build
path via @filename@:
-/* enumerations from
"/build/1st/libshumate-1.0.0~alpha.1/obj-x86_64-linux-gnu/../shumate/shumate-file-cache.h"
*/
+/* enumerations from
"/build/2/libshumate-1.0.0~alpha.1/2nd/obj-x86_64-linux-gnu/../shumate/shumate-file-cache.h"
*/
Patch attached that uses @basename@.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2022-07-18 11:40:28.347866061
+0100
@@ -0,0 +1,26 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-07-18
+
+--- libshumate-1.0.0~alpha.1.orig/shumate/shumate-enum-types.c.in
libshumate-1.0.0~alpha.1/shumate/shumate-enum-types.c.in
+@@ -3,7 +3,7 @@
+ /*** END file-header ***/
+
+ /*** BEGIN file-production ***/
+-/* enumerations from "@filename@" */
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+
+ /*** BEGIN value-header ***/
+--- libshumate-1.0.0~alpha.1.orig/shumate/shumate-enum-types.h.in
libshumate-1.0.0~alpha.1/shumate/shumate-enum-types.h.in
+@@ -9,7 +9,7 @@ G_BEGIN_DECLS
+
+ /*** BEGIN file-production ***/
+
+-/* enumerations from "@filename@" */
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+
+ /*** BEGIN value-header ***/
--- a/debian/patches/series 1970-01-01 01:00:00.0 +0100
--- b/debian/patches/series 2022-07-18 11:40:27.299862984 +0100
@@ -0,0 +1 @@
+reproducible-build.patch
Bug#1014541: python-django: CVE-2022-34265
Package: python-django Version: 1:1.10.7-2+deb9u17 X-Debbugs-CC: t...@security.debian.org Severity: grave Tags: security Hi, The following vulnerability was published for python-django. CVE-2022-34265 [0]: | An issue was discovered in Django 3.2 before 3.2.14 and 4.0 before | 4.0.6. The Trunc() and Extract() database functions are subject to SQL | injection if untrusted data is used as a kind/lookup_name value. | Applications that constrain the lookup name and kind choice to a known | safe list are unaffected. This affects: * stretch (1:1.10.7-2+deb9u17) * buster (1:1.11.29-1~deb10u1) * bookworm (2:3.2.13-1) sid was already fixed in 2:4.0.6-1 and jessie is unaffected as Trunc(...) and Extract(...) support was added later. Let me know if you'd like me to prepare updates for any of stretch, buster & bookworm. [0] https://security-tracker.debian.org/tracker/CVE-2022-34265 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1014041: yt-dlp: please make the build reproducible
forwarded 1014041 https://github.com/yt-dlp/yt-dlp/pull/4220 thanks I've forwarded this upstream here: https://github.com/yt-dlp/yt-dlp/pull/4220 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1014041: yt-dlp: please make the build reproducible
Source: yt-dlp
Version: 2022.06.22.1-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
yt-dlp could not be built reproducibly.
This is because it does not iterate over a Python set() data structure
in a deterministic order.
Patch attached.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0005-Reproducible-build.patch 1970-01-01
01:00:00.0 +0100
--- b/debian/patches/0005-Reproducible-build.patch 2022-06-29
07:52:36.980838793 +0100
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-06-29
+
+--- yt-dlp-2022.06.22.1.orig/devscripts/make_lazy_extractors.py
yt-dlp-2022.06.22.1/devscripts/make_lazy_extractors.py
+@@ -91,7 +91,7 @@ def sort_ies(ies, ignored_bases):
+ for c in classes[:]:
+ bases = set(c.__bases__) - {object, *ignored_bases}
+ restart = False
+-for b in bases:
++for b in sorted(bases, key=lambda x: x.__name__):
+ if b not in classes and b not in returned_classes:
+ assert b.__name__ != 'GenericIE', 'Cannot inherit from
GenericIE'
+ classes.insert(0, b)
--- a/debian/patches/series 2022-06-29 07:44:38.576411063 +0100
--- b/debian/patches/series 2022-06-29 07:51:47.433039603 +0100
@@ -2,3 +2,4 @@
0002-Disable-upstream-s-autoupdate-mechanism.patch
0003-Remove-use-of-git.patch
0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch
+0005-Reproducible-build.patch
Bug#1013615: hiredis: FTBFS: 2 TESTS FAILED ***
>> #54 Does not return a reply when the command times out: [0;31mFAILED[0;0m I suspect that the root cause here is that Redis 7.x is now in unstable (vs. 6.x). // Chris
Bug#1013348: test_elf.py fails with binutils in unstable
tags 1013348 + pending thanks > the test_elf.py test fails with binutils from the trunk: Thanks for the report. I've fixed this earlier today with this commit: https://salsa.debian.org/reproducible-builds/diffoscope/commit/280ff40115af104685932b96e83ccb79f78afabb It fixes it in our Salsa CI pipeline, and I'll upload it tomorrow. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1013257: libxsmm: please make the build (partly) reproducible
Source: libxsmm
Version: 1.17-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
libxsmm could not be built reproducibly.
This is because it ships a build.txt with an absolute build path and
uses the current date in some headers files. These are fixed in the
attached patch.
However, the ABSDIR (also in build.txt) is embedded in in the libxsmm.a
library in an ELF text header.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0003-Reproducible-build.patch 1970-01-01
01:00:00.0 +0100
--- b/debian/patches/0003-Reproducible-build.patch 2022-06-20
09:01:20.106293806 +0100
@@ -0,0 +1,39 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-06-20
+
+--- libxsmm-1.17.orig/scripts/libxsmm_config.py
libxsmm-1.17/scripts/libxsmm_config.py
+@@ -10,9 +10,11 @@
+ # Hans Pabst (Intel Corp.)
+
###
+ from string import Template
+-from datetime import date
++import datetime
+ import libxsmm_utilities
+ import fnmatch
++import os
++import time
+ import sys
+
+
+@@ -87,6 +89,10 @@ if __name__ == "__main__":
+ maxn = libxsmm_utilities.max_mnk(mnklist, avgdim, 1)
+ maxk = libxsmm_utilities.max_mnk(mnklist, avgdim, 2)
+
++build_date = datetime.datetime.utcfromtimestamp(
++int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))
++)
++
+ substitute = {
+ "VERSION": realversion,
+ "BRANCH": branch,
+@@ -94,7 +100,7 @@ if __name__ == "__main__":
+ "MINOR": minor,
+ "UPDATE": update,
+ "PATCH": patch,
+-"DATE": date.today().strftime("%Y%m%d"),
++"DATE": build_date.strftime("%Y%m%d"),
+ "CACHELINE": cacheline,
+ "PREFETCH": [-1, prefetch][0 <= prefetch],
+ "MAX_MNK": maxmnk,
--- a/debian/patches/series 2022-06-20 08:24:21.976388516 +0100
--- b/debian/patches/series 2022-06-20 08:46:51.618995900 +0100
@@ -1,2 +1,3 @@
0001-Makefile-rebuild-fix.patch
0002-Makefile-fix-pkgconfigdir.patch
+0003-Reproducible-build.patch
--- a/debian/rules 2022-06-20 08:24:21.976388516 +0100
--- b/debian/rules 2022-06-20 08:49:26.476766896 +0100
@@ -16,6 +16,8 @@
# Do not include docs in /usr/share/libxsmm
rm -f debian/*/usr/share/libxsmm/*.md
rm -f debian/*/usr/share/libxsmm/*.pdf
+ # Do not include build.txt
+ rm -f ./debian/*/usr/share/libxsmm/build.txt
execute_after_dh_installdocs:
# Do not install broken symlinks
--- a/scripts/libxsmm_config.py 2022-06-20 08:24:21.984388483 +0100
--- b/scripts/libxsmm_config.py 2022-06-20 09:01:29.846352447 +0100
@@ -10,9 +10,11 @@
# Hans Pabst (Intel Corp.)
###
from string import Template
-from datetime import date
+import datetime
import libxsmm_utilities
import fnmatch
+import os
+import time
import sys
@@ -87,6 +89,10 @@
maxn = libxsmm_utilities.max_mnk(mnklist, avgdim, 1)
maxk = libxsmm_utilities.max_mnk(mnklist, avgdim, 2)
+build_date = datetime.datetime.utcfromtimestamp(
+int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))
+)
+
substitute = {
"VERSION": realversion,
"BRANCH": branch,
@@ -94,7 +100,7 @@
"MINOR": minor,
"UPDATE": update,
"PATCH": patch,
-"DATE": date.today().strftime("%Y%m%d"),
+"DATE": build_date.strftime("%Y%m%d"),
"CACHELINE": cacheline,
"PREFETCH": [-1, prefetch][0 <= prefetch],
"MAX_MNK": maxmnk,
Bug#1013172: redis: Failed at step EXEC spawning /usr/bin/redis-server: Permission denied
tags 1013172 + pending thanks Hi Christian, > The reason is not the symlink but the library path /usr/lib, as this > happened on a system not converted to usrmerge. Ah, but of course! I would not have reached that diagnosis quickly (if it all), so that's some good insight. How did you think of that? Am uploading a fix now as part of redis 5:7.0.2-2. Once this lands, can you run "systemctl revert redis-server.service" and confirm that the stock/default .service file works for you? Thanks in advance... Best wishes, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1013172: redis: Failed at step EXEC spawning /usr/bin/redis-server: Permission denied
Hi Christian,
> The cause seems to be the following systemd hardening options (when
> commented out redis starts successfully):
>
> NoExecPaths=/
> ExecPaths=/usr/bin/redis-server /usr/lib
>
> Probably cause is that /usr/bin/redis-server is a symlink to
> /usr/bin/redis-check-rdb.
Hm! That is an interesting hypothesis, but I can't seem to reproduce
this problem locally. I'm using systemd 251.2-5, you?
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1012658: redis: cjson not usable in current sid release
Hey Fabian, > 7.0.1-2 unfortunately doesn't work at all for me. Ah, this is actually due to the new hardening features. I've fixed this here: https://salsa.debian.org/lamby/pkg-redis/commit/80470e3dc0ae56db9c9512c38a175783bcfc ... and have uploaded 5:7.0.1-3 to Debian experimental. Can you test it? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1012836: mapproxy: please make the build reproducible
Source: mapproxy
Version: 1.15.1-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
mapproxy could not be built reproducibly.
This is because the default value for the "last_change" field in the
gpkg sqlite file contains the current date:
last_change DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now'))
Patch attached that uses SOURCE_DATE_EPOCH instead if it's available.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2022-06-15 08:17:12.678035546
+0100
@@ -0,0 +1,48 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-06-15
+
+--- mapproxy-1.15.1.orig/mapproxy/cache/geopackage.py
mapproxy-1.15.1/mapproxy/cache/geopackage.py
+@@ -14,12 +14,14 @@
+ # limitations under the License.
+
+
++import datetime
+ import hashlib
+ import logging
+ import os
+ import re
+ import sqlite3
+ import threading
++import time
+
+ from mapproxy.cache.base import TileCacheBase, tile_buffer, REMOVE_ON_UNLOCK
+ from mapproxy.compat import BytesIO, PY2, itertools
+@@ -305,6 +307,10 @@ AUTHORITY["EPSG","9122"]],AUTHORITY["EPS
+ log.info("srs_id already exists.".format(wkt_entry[0]))
+ db.commit()
+
++last_change = datetime.datetime.utcfromtimestamp(
++int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))
++)
++
+ # Ensure that tile table exists here, don't overwrite a valid entry.
+ try:
+ db.execute("""
+@@ -313,6 +319,7 @@ AUTHORITY["EPSG","9122"]],AUTHORITY["EPS
+ data_type,
+ identifier,
+ description,
++last_change,
+ min_x,
+ max_x,
+ min_y,
+@@ -323,6 +330,7 @@ AUTHORITY["EPSG","9122"]],AUTHORITY["EPS
+ "tiles",
+ self.table_name,
+ "Created with Mapproxy.",
++ last_change,
+ self.tile_grid.bbox[0],
+ self.tile_grid.bbox[2],
+ self.tile_grid.bbox[1],
--- a/debian/patches/series 2022-06-15 08:07:44.807660859 +0100
--- b/debian/patches/series 2022-06-15 08:17:10.749995438 +0100
@@ -1 +1,2 @@
disable-tag_date.patch
+reproducible-build.patch
Bug#1012658: redis: cjson not usable in current sid release
> thanks for your support. No problem. Can you try 7.0.1-2 in experimental? :) I'm planning on putting this version in Debian sid/unstable soon anyway. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1012658: redis: cjson not usable in current sid release
Chris Lamb wrote:
> I'm almost certain that this is related to the fix for #1005787 which
> is not present in that "old" version.
Ah, my mistake: I think it's due to the Debian packaging reverting to
using the bundled version of Lua over the Debian-provided one. (This
is needed due to it having additional security features needed to
address CVE-2022-24735 and CVE-2022-24736.)
This means it is not finding the Debian version of
liblua5.1-cjson.so.0 or liblua5.1-bitop.so.0 under /lib. It works with
the Lua modules that we don't try and use the Debian version of, for
example:
$ redis-cli EVAL "cmsgpack.pack({})" 0
(nil)
I suspect there is some kind of require/import path that needs to be
adjusted for the bundled Lua (which is preconfigured to point under
/lib for Debian's shipped Lua). Or, we might have to revert entirely to
using the bundled cjson and bitop modules. :(
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org chris-lamb.co.uk
`-
Bug#1012790: sphinxcontrib-mermaid: please make the build reproducible
forwarded 1012790 https://github.com/mgaitan/sphinxcontrib-mermaid/pull/86 thanks FYI I've forwarded this upstream here: https://github.com/mgaitan/sphinxcontrib-mermaid/pull/86 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#1012792: yaru-theme: please make the build reproducible
Source: yaru-theme
Version: 22.04.4+dfsg-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: filesystem
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
yaru-theme could not be built reproducibly.
The .theme files generated by the generate-index-theme.py scripts
varied depending on the underlying filesystem ordering. Patch attached
that uses sorted(...) so that the contents are determinstic.
(The .resource files remain nondeterminstic locally for me, however.)
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2022-06-14 07:41:10.064298706
+0100
@@ -0,0 +1,18 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2022-06-14
+
+--- yaru-theme-22.04.4+dfsg.orig/icons/src/generate-index-theme.py
yaru-theme-22.04.4+dfsg/icons/src/generate-index-theme.py
+@@ -86,9 +86,9 @@ if __name__ == '__main__':
+ directory.split('/')[-1] not in args.exclude_context):
+ directories.add(directory)
+
+-theme['Icon Theme']['Directories'] = ','.join(directories)
++theme['Icon Theme']['Directories'] = ','.join(sorted(directories))
+
+-for dir in directories:
++for dir in sorted(directories):
+ [sizes, context] = dir.split('/')
+ data = {
+ 'Context': CONTEXT_MAPPING.get(context, context.title()),
--- a/debian/patches/series 1970-01-01 01:00:00.0 +0100
--- b/debian/patches/series 2022-06-14 07:41:09.184298298 +0100
@@ -0,0 +1 @@
+reproducible-build.patch
