Your message dated Tue, 05 Apr 2016 23:34:51 +0000
with message-id <[email protected]>
and subject line Bug#819595: fixed in xscreensaver 5.34-2
has caused the Debian Bug report #819595,
regarding xscreensaver: please make the build reproducible
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
819595: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819595
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: xscreensaver
Version: 5.34-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: fileordering
Dear Maintainer,
While working on the "reproducible builds" effort [1], we have noticed
that xscreensaver could not be built reproducibly.
The file hacks/Makefile.in uses wildcards to obtain parameters for a script,
leading to unstable input file order and potentially different resulting
binaries.
I have attached a patch to use a fixed, sorted order for these files.
This makes the build reproducible for me in my local test environment.
Regards,
Sascha
[1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/patches/81_deterministic_file_order.patch b/debian/patches/81_deterministic_file_order.patch
new file mode 100644
index 0000000..3383986
--- /dev/null
+++ b/debian/patches/81_deterministic_file_order.patch
@@ -0,0 +1,13 @@
+--- a/hacks/Makefile.in
++++ b/hacks/Makefile.in
+@@ -854,8 +854,8 @@
+
+ m6502.h:
+ @echo "building m6502.h from $(srcdir)/images/m6502/*.asm"; \
+- UTILS_SRC="$(UTILS_SRC)" \
+- $(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
++ find $(srcdir)/images/m6502/ -name '*.asm' | LC_ALL=C sort | \
++ UTILS_SRC="$(UTILS_SRC)" xargs $(srcdir)/m6502.sh m6502.h
+
+ m6502.o: m6502.h
+ m6502: m6502.o asm6502.o $(HACK_OBJS) $(ATV)
diff --git a/debian/patches/series b/debian/patches/series
index e446a27..7c98703 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@
57_grabDesktopImages_default_off.patch
80_Makefile_in-clean-fix.patch
+81_deterministic_file_order.patch
--- End Message ---
--- Begin Message ---
Source: xscreensaver
Source-Version: 5.34-2
We believe that the bug you reported is fixed in the latest version of
xscreensaver, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Tormod Volden <[email protected]> (supplier of updated xscreensaver
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 05 Apr 2016 22:53:13 +0200
Source: xscreensaver
Binary: xscreensaver xscreensaver-data xscreensaver-data-extra xscreensaver-gl
xscreensaver-gl-extra xscreensaver-screensaver-webcollage
xscreensaver-screensaver-bsod
Architecture: source amd64
Version: 5.34-2
Distribution: unstable
Urgency: medium
Maintainer: Tormod Volden <[email protected]>
Changed-By: Tormod Volden <[email protected]>
Description:
xscreensaver - Screensaver daemon and frontend for X11
xscreensaver-data - Screen saver modules for screensaver frontends
xscreensaver-data-extra - Extra screen saver modules for screensaver frontends
xscreensaver-gl - GL(Mesa) screen saver modules for screensaver frontends
xscreensaver-gl-extra - Extra GL(Mesa) screen saver modules for screensaver
frontends
xscreensaver-screensaver-bsod - BSOD screen saver module from XScreenSaver
xscreensaver-screensaver-webcollage - Webcollage screen saver module from
XScreenSaver
Closes: 819595 819703
Changes:
xscreensaver (5.34-2) unstable; urgency=medium
.
* Fix sort order in hacks/Makefile (for reproducible builds)
(Closes: #819595)
* Disable Easter egg about "outdated" version
(Closes: #819703)
Checksums-Sha1:
3e0b09dedd3ac52ca6c0925198b89b47590cdd31 2738 xscreensaver_5.34-2.dsc
9d92fc91deab8cd85f18506e3e5db0dea9c3100d 80024 xscreensaver_5.34-2.diff.gz
9f18686ff1f681806ddee3cc88bea12ac75fd2ff 1412832
xscreensaver-data-dbgsym_5.34-2_amd64.deb
10dc9fdf3827ed144b0a2ac63e819158dfb0d2d6 6332312
xscreensaver-data-extra-dbgsym_5.34-2_amd64.deb
7d0a3afe0a52ebdcaebac4642891aafcd2ce796f 1035028
xscreensaver-data-extra_5.34-2_amd64.deb
667ae740527fbe33788b8a0dd12e7d3553874b7f 312688
xscreensaver-data_5.34-2_amd64.deb
f421c8db672fe36353874b7a9d08eef29dbca6b7 444322
xscreensaver-dbgsym_5.34-2_amd64.deb
9f1294d286a0bc3b134c2c779019b05c3610d83e 6932468
xscreensaver-gl-dbgsym_5.34-2_amd64.deb
96d27b3b7b38267e9986571813308bb4e9e68a6d 5355664
xscreensaver-gl-extra-dbgsym_5.34-2_amd64.deb
e0551d0a05177ae32eae7749ecb2448c629a03ae 1874314
xscreensaver-gl-extra_5.34-2_amd64.deb
d1751371af5e8766c8716c47be1873b2b4af3caf 1197098
xscreensaver-gl_5.34-2_amd64.deb
cb9726a91b1d4c9c385c3837d6e4a20a6cf42276 162324
xscreensaver-screensaver-bsod-dbgsym_5.34-2_amd64.deb
05ea563903a713c4ce012a926326c66f336f6a56 165626
xscreensaver-screensaver-bsod_5.34-2_amd64.deb
605acd79ff57083ce76454c2c4ec8a8b60cd1584 14336
xscreensaver-screensaver-webcollage-dbgsym_5.34-2_amd64.deb
3ee3b0ca382f6b4725dd12f199ca02fa561f77ab 63268
xscreensaver-screensaver-webcollage_5.34-2_amd64.deb
1fd07d79814d74bccb99db3628117b5081d238e1 561296 xscreensaver_5.34-2_amd64.deb
Checksums-Sha256:
bb60e9f18c856655eb5a15423a07f6ef46df6dc7ecd2da155b1cdb67ed772474 2738
xscreensaver_5.34-2.dsc
03b8483c764ee8687c2fceb31f9d7d7c9987fd14de584974fbeda0883d4a2f85 80024
xscreensaver_5.34-2.diff.gz
67c84400b41bbdfde9f8b5da97ed0cc7d162e47f5f6d88913912cada07aebb13 1412832
xscreensaver-data-dbgsym_5.34-2_amd64.deb
ee370bd696bd23bc8eb0a8bfed0e50235df03731a70ba9fea1dfbf7a0d7fe826 6332312
xscreensaver-data-extra-dbgsym_5.34-2_amd64.deb
9884b22f49757e2618c3183d89679d2844c12eddb7ede21ed0ea60ed1a4b4d4a 1035028
xscreensaver-data-extra_5.34-2_amd64.deb
6f517d51d843f612ebaa7abf52d96cf0f1959f815e7ee835ba063f9a3329969e 312688
xscreensaver-data_5.34-2_amd64.deb
87f100b3540d2d366712e4a2366b13083963ff4b9bfb2a3a462b0fa928fd6f56 444322
xscreensaver-dbgsym_5.34-2_amd64.deb
046365a61ad324bc4de70420ba8a590c748d07a413e3d4a23d25df4177babbc7 6932468
xscreensaver-gl-dbgsym_5.34-2_amd64.deb
e50fa3a43a2cd307f89e4786224c7bef315fd8efa6ae314b6183e0db36b4c9cc 5355664
xscreensaver-gl-extra-dbgsym_5.34-2_amd64.deb
431e8f6f0d9dd65726c3a4350e5a4a29a4bbe379641bf37b1591a375870381ea 1874314
xscreensaver-gl-extra_5.34-2_amd64.deb
12c2cc580156e0fb2a7bf8508697d6987cfc422ed6cd86e85b54adc8fbd978a9 1197098
xscreensaver-gl_5.34-2_amd64.deb
8a63f2c42f419d3a70030f8585398d4c716af82b2706d93d46e06937cb0ebdd2 162324
xscreensaver-screensaver-bsod-dbgsym_5.34-2_amd64.deb
d90ca72c0b6a29d5b8eee8fc4e6cf9df29dfc2f6c5f7f5f72ffc1714132a044e 165626
xscreensaver-screensaver-bsod_5.34-2_amd64.deb
a2926be366beee956fe13ce359cf721f119241e6055e69f676dd6e50f65b6fb5 14336
xscreensaver-screensaver-webcollage-dbgsym_5.34-2_amd64.deb
28b879d04afb649ce39bf185922e270981e1020703d961a1780168fb717ab32f 63268
xscreensaver-screensaver-webcollage_5.34-2_amd64.deb
594fa0cd454ea91adb3487de319c19d2557660eaed9284b76d47b64b21e1c107 561296
xscreensaver_5.34-2_amd64.deb
Files:
5f9e0012a6e86c5c90f31a455aaca2c7 2738 x11 optional xscreensaver_5.34-2.dsc
21827462d16a17d92242f4a3df4d3212 80024 x11 optional xscreensaver_5.34-2.diff.gz
186f32c4e88007fc0f927ca9744cebdf 1412832 debug extra
xscreensaver-data-dbgsym_5.34-2_amd64.deb
b8dab82d4525db5cea1acf6d34305001 6332312 debug extra
xscreensaver-data-extra-dbgsym_5.34-2_amd64.deb
837216888c44c8ab2bfa2613c9d1d443 1035028 x11 optional
xscreensaver-data-extra_5.34-2_amd64.deb
a6e3ff97e29a55b0bb62b110f2758a6c 312688 x11 optional
xscreensaver-data_5.34-2_amd64.deb
629542ffa8d57830226b0468d3098489 444322 debug extra
xscreensaver-dbgsym_5.34-2_amd64.deb
5fd68cce3f306d4f31dbadbe0bd00470 6932468 debug extra
xscreensaver-gl-dbgsym_5.34-2_amd64.deb
3ddb60a1886328439f7fcc0aa6c096e8 5355664 debug extra
xscreensaver-gl-extra-dbgsym_5.34-2_amd64.deb
597706ee7973400aa0a9a80df6511ff1 1874314 x11 optional
xscreensaver-gl-extra_5.34-2_amd64.deb
732723c755a66ed38fb5ce796dd0e743 1197098 x11 optional
xscreensaver-gl_5.34-2_amd64.deb
e26edab4bdba862f9e32865455204a27 162324 debug extra
xscreensaver-screensaver-bsod-dbgsym_5.34-2_amd64.deb
34cdd3e9e0af42d8757e03ee339501cb 165626 x11 optional
xscreensaver-screensaver-bsod_5.34-2_amd64.deb
2cc25ad5550e6374ed72d0268ac167ea 14336 debug extra
xscreensaver-screensaver-webcollage-dbgsym_5.34-2_amd64.deb
5c7cfaf6cd01a91f4914b4d5dbf06a50 63268 x11 optional
xscreensaver-screensaver-webcollage_5.34-2_amd64.deb
93dd48b0401ff02804cd22997c36b219 561296 x11 optional
xscreensaver_5.34-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJXBEYQAAoJEGvmY8daNcl17ucP/jE9rZ8n/WVv6CiP7yDBrcYt
IgbLxw7BcOb3FaonqFEFA/xbXqJHrrgehBN1i736deBWN/xdDM6cRVjqGkdJLtPJ
Fx+/AyS3DPHL/o1CWO7I5ambubz5Ocz+5b/89bhA3YsjKEv1npuFDk1WIw8nEGqq
igxW1cdHlJ86FhMPoeTrxnpU/1LyjTRtv3tHKoldlO9/KcNrN+rUd7Hus8Qh9pao
AriVYG+wvvGSeiIGTTDCrjXupfUurUQYz5rkQrU/AnqTsMRGTfpN7Bn7ApBT4O2G
jWzcqfy7QmVXUKM7x+Rdasq5wLDhlY5BqWszHS60EW71Ebp7nU1FsSQz3MK2Ymjs
DJmMiWIsA9b2MwbOj1ma8NVVH4iKf3Qp4TOL6pN+AKX2YEQMWk3LaTde+/nzhWy2
5VNzEDnYWIWZmnEzZQRt8oXsmRyqN259HAS04oSxoqjz9u+UA2zSJyXKa3/WFE4b
RB1q1f7W5/4Kg9X2BYXTcaP2t94omHLoWgYLyCWLY9rhZX1VekpbGi7msvJTnMIl
GwFaM3UHQ4efghceI9uBZR4UBSCmOSzLpY2k3RZXHX9ZfbiyT9s1uPbiGWpp1tGp
K267l8MEZ0yGGyQUWXT7nos+2YBn7EPIL1f8z5yGrBozGQYSj2FlN/Y8F/1QZdam
qqnAWuQKGpI5StnBN7Yk
=YOEp
-----END PGP SIGNATURE-----
--- End Message ---