Your message dated Mon, 15 Jan 2018 13:20:34 +0000
with message-id <[email protected]>
and subject line Bug#820668: fixed in sawfish 1:1.11.90-1.1
has caused the Debian Bug report #820668,
regarding sawfish: please make the build reproducible
(fileordering,timestamps,username,hostname)
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.)
--
820668: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820668
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: sawfish
Version: 1.11-2
Severity: wishlist
Tags: patch upstream
User: [email protected]
Usertags: fileordering timestamps username hostname
X-Debbugs-Cc: [email protected]
Dear Maintainer,
While working on the “reproducible builds” effort [1], we have noticed
that 'sawfish' could not be built reproducibly.
The attached patch fixes the order in which files are included in the
theme tgz files, strips hostname and username from the config.h file,
and honours SOURCE_DATE_EPOCH when creating the config.h file. Once
applied, sawfish can be built reproducibly in our current experimental
framework.
Regards,
Alexis Bienvenüe.
[1]: https://wiki.debian.org/ReproducibleBuilds
diff -Nru sawfish-1.11/debian/changelog sawfish-1.11/debian/changelog
--- sawfish-1.11/debian/changelog 2016-03-19 18:05:17.000000000 +0100
+++ sawfish-1.11/debian/changelog 2016-04-11 10:30:04.000000000 +0200
@@ -1,3 +1,10 @@
+sawfish (1:1.11-2.0~reproducible1) unstable; urgency=medium
+
+ * Removes timestamps, and fix files order, to make the build
+ reproducible.
+
+ -- Alexis Bienvenüe <[email protected]> Mon, 11 Apr 2016 10:30:04 +0200
+
sawfish (1:1.11-2) unstable; urgency=low
* Upload to unstable.
diff -Nru sawfish-1.11/debian/patches/honours_SOURCE_DATE_EPOCH_for_build_h sawfish-1.11/debian/patches/honours_SOURCE_DATE_EPOCH_for_build_h
--- sawfish-1.11/debian/patches/honours_SOURCE_DATE_EPOCH_for_build_h 1970-01-01 01:00:00.000000000 +0100
+++ sawfish-1.11/debian/patches/honours_SOURCE_DATE_EPOCH_for_build_h 2016-04-11 10:27:07.000000000 +0200
@@ -0,0 +1,32 @@
+Description: Honours SOURCE_DATE_EPOCH for build.h
+ Honours SOURCE_DATE_EPOCH when building build.h, to get reproducible build.
+ See https://reproducible-builds.org/specs/source-date-epoch/
+Author: Alexis Bienvenüe <[email protected]>
+
+--- sawfish-1.11.orig/build-info
++++ sawfish-1.11/build-info
+@@ -20,8 +20,11 @@ localedir="$5"
+ sys_name="$HOSTNAME.$LOCALDOMAIN"
+ user_name="$LOGNAME"
+
+-build_date="`date +'%a %b %e %Y'`"
+-build_time="`date +'%T %Z'`"
++SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
++DATE_FMT="%Y-%m-%d"
++build_date=$(date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u "+$DATE_FMT")
++DATE_FMT="%T %Z"
++build_time=$(date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u "+$DATE_FMT")
+
+ cat >src/build.h <<EOF
+ /* build.h -- Definitions relating to the current build
+@@ -36,8 +39,8 @@ cat >src/build.h <<EOF
+ #define SAWFISH_EXECDIR "$sawfishexecdir"
+ #define SAWFISH_LOCALEDIR "$localedir"
+
+-#define BUILD_HOST "$sys_name"
+-#define BUILD_USER "$user_name"
++#define BUILD_HOST "unknown"
++#define BUILD_USER "unknown"
+
+ #define BUILD_DATE "$build_date"
+ #define BUILD_TIME "$build_time"
diff -Nru sawfish-1.11/debian/patches/make-build-reproducible sawfish-1.11/debian/patches/make-build-reproducible
--- sawfish-1.11/debian/patches/make-build-reproducible 2016-02-08 22:44:20.000000000 +0100
+++ sawfish-1.11/debian/patches/make-build-reproducible 2016-04-11 10:28:57.000000000 +0200
@@ -1,16 +1,16 @@
Description: Remove time stamp
Author: Jose M Calhariz <[email protected]>
-Index: sawfish.git/themes/Makefile.in
+Index: sawfish-1.11/themes/Makefile.in
===================================================================
---- sawfish.git.orig/themes/Makefile.in 2016-02-07 14:01:21.138285458 +0000
-+++ sawfish.git/themes/Makefile.in 2016-02-08 20:39:18.072356084 +0000
+--- sawfish-1.11.orig/themes/Makefile.in
++++ sawfish-1.11/themes/Makefile.in
@@ -48,7 +48,7 @@ install : all installdirs
rm -rf $(DESTDIR)$(themedir)/$$d; \
for f in $(srcdir)/$$d/*; do \
if [ $$f != $(srcdir)/$$d/CVS ]; then \
- ( cd $(srcdir) && tar czf $$d.tar.gz $$d/* ) ; \
-+ ( cd $(srcdir) && GZIP=-9n tar czf $$d.tar.gz $$d/* ) ; \
++ ( cd $(srcdir) && GZIP=-9n tar czf $$d.tar.gz `LC_ALL=C ls $$d/*` ) ; \
$(INSTALL_DATA) $$d.tar.gz $(DESTDIR)$(themedir)/$$d.tar.gz; \
fi \
done \
diff -Nru sawfish-1.11/debian/patches/series sawfish-1.11/debian/patches/series
--- sawfish-1.11/debian/patches/series 2016-03-05 01:46:54.000000000 +0100
+++ sawfish-1.11/debian/patches/series 2016-04-11 10:25:57.000000000 +0200
@@ -4,3 +4,4 @@
limit-max-dimensions.patch
make-build-reproducible
fix-desktop-entry-lacks-keywords-entry
+honours_SOURCE_DATE_EPOCH_for_build_h
--- End Message ---
--- Begin Message ---
Source: sawfish
Source-Version: 1:1.11.90-1.1
We believe that the bug you reported is fixed in the latest version of
sawfish, 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.
Laurent Bigonville <[email protected]> (supplier of updated sawfish 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: Mon, 15 Jan 2018 13:27:25 +0100
Source: sawfish
Binary: sawfish sawfish-data sawfish-lisp-source
Architecture: source all amd64
Version: 1:1.11.90-1.1
Distribution: unstable
Urgency: medium
Maintainer: Jose M Calhariz <[email protected]>
Changed-By: Laurent Bigonville <[email protected]>
Description:
sawfish - window manager for X11
sawfish-data - sawfish architecture independent data
sawfish-lisp-source - sawfish lisp files
Closes: 820668 856089 857673 864624
Changes:
sawfish (1:1.11.90-1.1) unstable; urgency=medium
.
* Non-maintainer upload.
* debian/control: Drop build-dependency against libesd0-dev (Closes:
#856089)
* debian/control: Drop build-dependency against libaudiofile-dev (Closes:
#857673)
* debian/patches/make-build-reproducible: Fix files order in tarballs
(Closes: #820668)
* Fix FTCBFS: cross.patch (Closes: #864624)
Checksums-Sha1:
5a9e110540478aa7894e91002f6bd8add9ab966d 1994 sawfish_1.11.90-1.1.dsc
4c8688984c34a8647bb75b4fd31c2313667a897f 38648
sawfish_1.11.90-1.1.debian.tar.xz
250f9c7ffa34526d908f99c1701f192951dd4381 2288460
sawfish-data_1.11.90-1.1_all.deb
7c24ca53f50f2b11df3b2d85f82839c85b5c9e3e 391748
sawfish-dbgsym_1.11.90-1.1_amd64.deb
20208d3839597e56418a4d85eb5934515ffbc258 400544
sawfish-lisp-source_1.11.90-1.1_all.deb
8e9a7a593c951870288f8e8fc7af60438544385b 11209
sawfish_1.11.90-1.1_amd64.buildinfo
9c3b8112367932709ff68b5a0fb17bf108930309 493640 sawfish_1.11.90-1.1_amd64.deb
Checksums-Sha256:
aa33f150875257a5df6aee5ab070bd2149a98866515656d6ca353e692e35f13c 1994
sawfish_1.11.90-1.1.dsc
f0f381172c6f5f4db033c72bb809ce5f8e6f32f96c466c8934bb4991a750b0fe 38648
sawfish_1.11.90-1.1.debian.tar.xz
2ff5b58b758f847a0cba9cbcb616473c800f8231789a8f5a55ac94338c597aa7 2288460
sawfish-data_1.11.90-1.1_all.deb
245900b133e4f88de0b03b2215a1b490d537148dc5375d77496c06923899c542 391748
sawfish-dbgsym_1.11.90-1.1_amd64.deb
d237f1aed0c6f76d8e536fb1ea765b2cc5564e17a76f4f227662edb5d1875031 400544
sawfish-lisp-source_1.11.90-1.1_all.deb
5cbc140c3c8f5a4c83a3e6252129abdf8c45be42927df24e8189b6005cf45a0c 11209
sawfish_1.11.90-1.1_amd64.buildinfo
273040b155bcf59bc9256f65a6202a01ef31b1d6f18e6a1a969cd9c912c65789 493640
sawfish_1.11.90-1.1_amd64.deb
Files:
96f6fbfdb7f4e0d576b6844933b74967 1994 x11 optional sawfish_1.11.90-1.1.dsc
af1b9a281ab17830178117a4bf1de628 38648 x11 optional
sawfish_1.11.90-1.1.debian.tar.xz
bd7ba676142d25e1604181fbb510b899 2288460 x11 optional
sawfish-data_1.11.90-1.1_all.deb
61120f7d8565da91612e089e861d53a2 391748 debug optional
sawfish-dbgsym_1.11.90-1.1_amd64.deb
ae61f1063443a8391818022c0d42f106 400544 lisp optional
sawfish-lisp-source_1.11.90-1.1_all.deb
09b39b23ddc2ca8ece2aab03d7d4d038 11209 x11 optional
sawfish_1.11.90-1.1_amd64.buildinfo
20e0133283a930aff56512bbb412bfbd 493640 x11 optional
sawfish_1.11.90-1.1_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQFFBAEBCAAvFiEEmRrdqQAhuF2x31DwH8WJHrqwQ9UFAlpcnvsRHGJpZ29uQGRl
Ymlhbi5vcmcACgkQH8WJHrqwQ9WhtwgAi3APR0osKeHVbpubIxSWzKmfNalLSp6c
WyjjJ7tN+WJTiklRrEFvkrbfiuqtROCepBZkJ041p35E8RkabpRvmL0pW7GXBiJB
obQ+m1LYnObk/VI9DQIY4zLh70X2Di3ERSEFSJkp1RhAowNdykv3LTwaGxuv1uZJ
/WAlmrmfFHSa+x4nH6ieusrvrbVCT40W/bcyqBSeoxpZauKpxi3UyMd5om4ZDabK
8MO1ndmCiddbzCKESKKLw+0BJ3GT2vbXrEoQEj+gCWveCG8eCJ6SvVTAXBK9xukv
yIIYvtHNqQjLX20MNojBiZfFOAxIYQGtWZPC4jQl+UfdiCmLshgr5w==
=AFQZ
-----END PGP SIGNATURE-----
--- End Message ---
