Your message dated Thu, 18 Feb 2016 12:19:16 +0000
with message-id <[email protected]>
and subject line Bug#803501: fixed in fdroidserver 0.6.0-1
has caused the Debian Bug report #803501,
regarding fdroidserver: 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.)
--
803501: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803501
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: fdroidserver
Version: 0.4.0-2
Severity: wishlist
Tags: patch upstream
User: [email protected]
Usertags: timestamps
X-Debbugs-Cc: [email protected]
Hi!
While working on the "reproducible builds" effort [1], we have noticed
that fdroidserver could not be built reproducibly.
Some documentation files and tarballs contain timestamps.
The attached patch adds support for SOURCE_DATE_EPOCH [2] to docs/gendocs.sh
and normalizes tarball permissions.
Regards,
Reiner
[1]: https://wiki.debian.org/ReproducibleBuilds
[2]: https://reproducible-builds.org/specs/source-date-epoch/
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 0000000..c5773b8
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,82 @@
+Author: Reiner Herrmann <[email protected]>
+Description: Reproducibly build documentation
+Forwarded: https://gitlab.com/fdroid/fdroidserver/merge_requests/84/
+
+Index: fdroidserver-0.4.0/docs/gendocs.sh
+===================================================================
+--- fdroidserver-0.4.0.orig/docs/gendocs.sh
++++ fdroidserver-0.4.0/docs/gendocs.sh
+@@ -40,13 +40,14 @@ scriptversion=2014-10-09.23
+
+ prog=`basename "$0"`
+ srcdir=`pwd`
++timestamp=${SOURCE_DATE_EPOCH:-$(date +%s)}
+
+ scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
+ templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template";
+
+ : ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
+ : ${MAKEINFO="makeinfo"}
+-: ${TEXI2DVI="texi2dvi -t @finalout"}
++: ${TEXI2DVI="TEX=\"tex -output-comment=''\" texi2dvi -t @finalout"}
+ : ${DOCBOOK2HTML="docbook2html"}
+ : ${DOCBOOK2PDF="docbook2pdf"}
+ : ${DOCBOOK2TXT="docbook2txt"}
+@@ -272,10 +273,11 @@ echo "Making output for $srcfile"
+ echo " in `pwd`"
+ mkdir -p "$outdir/"
+
++taropts="--mtime=@$timestamp --mode=go=rX,u+rw,a-s"
+ cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\""
+ echo "Generating info... ($cmd)"
+ eval "$cmd"
+-tar --create $PACKAGE.info* | gzip --no-name -f -9 --to-stdout > "$outdir/$PACKAGE.info.tar.gz"
++tar $taropts --create $PACKAGE.info* | gzip --no-name -f -9 --to-stdout > "$outdir/$PACKAGE.info.tar.gz"
+ ls -l "$outdir/$PACKAGE.info.tar.gz"
+ info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
+ # do not mv the info files, there's no point in having them available
+@@ -319,7 +321,7 @@ html_split()
+ (
+ cd ${split_html_dir} || exit 1
+ ln -sf ${PACKAGE}.html index.html
+- tar --create -- *.html | gzip --no-name -f -9 --to-stdout > "$abs_outdir/${PACKAGE}.html_$1.tar.gz"
++ tar $taropts --create -- *.html | gzip --no-name -f -9 --to-stdout > "$abs_outdir/${PACKAGE}.html_$1.tar.gz"
+ )
+ eval html_$1_tgz_size=`calcsize "$outdir/${PACKAGE}.html_$1.tar.gz"`
+ rm -f "$outdir"/html_$1/*.html
+@@ -349,7 +351,7 @@ if test -z "$use_texi2html"; then
+ copy_images $split_html_dir/ $split_html_dir/*.html
+ (
+ cd $split_html_dir || exit 1
+- tar --create -- * | gzip --no-name -f -9 --to-stdout > "$abs_outdir/$PACKAGE.html_$split.tar.gz"
++ tar $taropts --create -- * | gzip --no-name -f -9 --to-stdout > "$abs_outdir/$PACKAGE.html_$split.tar.gz"
+ )
+ eval \
+ html_${split}_tgz_size=`calcsize "$outdir/$PACKAGE.html_$split.tar.gz"`
+@@ -379,7 +381,7 @@ d=`dirname $srcfile`
+ (
+ cd "$d"
+ srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` || true
+- tar --create --dereference $srcfiles | gzip --no-name -f -9 --to-stdout > "$abs_outdir/$PACKAGE.texi.tar.gz"
++ tar $taropts --create --dereference $srcfiles | gzip --no-name -f -9 --to-stdout > "$abs_outdir/$PACKAGE.texi.tar.gz"
+ ls -l "$abs_outdir/$PACKAGE.texi.tar.gz"
+ )
+ texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"`
+@@ -401,7 +403,7 @@ if test -n "$docbook"; then
+ eval "$cmd"
+ (
+ cd ${split_html_db_dir} || exit 1
+- tar --create -- *.html | gzip --no-name -f -9 --to-stdout > "$abs_outdir/${PACKAGE}.html_node_db.tar.gz"
++ tar $taropts --create -- *.html | gzip --no-name -f -9 --to-stdout > "$abs_outdir/${PACKAGE}.html_node_db.tar.gz"
+ )
+ html_node_db_tgz_size=`calcsize "$outdir/${PACKAGE}.html_node_db.tar.gz"`
+ rm -f "$outdir"/html_node_db/*.html
+@@ -431,7 +433,7 @@ else
+ CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d"
+ fi
+
+-curdate=`$SETLANG date '+%B %d, %Y'`
++curdate=`$SETLANG date -u '+%B %d, %Y' -d "@$timestamp"`
+ sed \
+ -e "s!%%TITLE%%!$MANUAL_TITLE!g" \
+ -e "s!%%EMAIL%%!$EMAIL!g" \
diff --git a/debian/patches/series b/debian/patches/series
index bbb5589..5d5060b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
hard-code-path-to-openjdk-7.patch
fix-docs-syntax-error.patch
+reproducible-build.patch
signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
Source: fdroidserver
Source-Version: 0.6.0-1
We believe that the bug you reported is fixed in the latest version of
fdroidserver, 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.
Hans-Christoph Steiner <[email protected]> (supplier of updated fdroidserver 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: Thu, 18 Feb 2016 12:09:42 +0100
Source: fdroidserver
Binary: fdroidserver
Architecture: source all
Version: 0.6.0-1
Distribution: unstable
Urgency: medium
Maintainer: Hans-Christoph Steiner <[email protected]>
Changed-By: Hans-Christoph Steiner <[email protected]>
Description:
fdroidserver - F-Droid build server and repository tools for Android
Closes: 803501
Changes:
fdroidserver (0.6.0-1) unstable; urgency=medium
.
* New upstream release (Closes: #803501)
Checksums-Sha1:
89fdd889fa71313dc54e4e8f9868c38e138caa56 1739 fdroidserver_0.6.0-1.dsc
b5ec63a2192ed344540c9396e6fde03760c9a3d4 240583 fdroidserver_0.6.0.orig.tar.gz
f51adfe756d2061fa1483880d4e22b10369cbaf7 113756
fdroidserver_0.6.0-1.debian.tar.xz
addc26fd977f47a62ba2b731ae066361cd8a2516 252280 fdroidserver_0.6.0-1_all.deb
Checksums-Sha256:
b2c333af45ad546a12c04e850fef6e07d746a5e0b30ebcea8d479979cbcd80ff 1739
fdroidserver_0.6.0-1.dsc
c561f968424a3f1904623b89760fa923ce8c9641ec27afb54deda512df9c24ba 240583
fdroidserver_0.6.0.orig.tar.gz
48cdc0da7e77ee9c88d160da8aa4639164b740557090ecec569037b722bba2ef 113756
fdroidserver_0.6.0-1.debian.tar.xz
613a8a0ca7ef503c70a671a9d4f13983a6a60be25c8dea7abfc4e9912330bd4b 252280
fdroidserver_0.6.0-1_all.deb
Files:
6e04824112450274f2caaecbfca20390 1739 devel extra fdroidserver_0.6.0-1.dsc
e4c1963fbbcb50d72f78f8cb0bd1d23e 240583 devel extra
fdroidserver_0.6.0.orig.tar.gz
5ecf4506b2079467ee100489041946d0 113756 devel extra
fdroidserver_0.6.0-1.debian.tar.xz
f9633f4014125fe21d8107e51e9a7e46 252280 devel extra
fdroidserver_0.6.0-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: GPG for Android - https://guardianproject.info/code/gnupg/
iQEcBAEBCAAGBQJWxbEmAAoJED4XeBe6G5v6PlEH/jL3vl6v3PSpIfndt40dHjv0
vV53DQMePmXFkQptMgqISuCWyUGJACm79nGFz8ify8LzuKtfs0YvViSKlfuMYsQ0
KrjFqIBXEgxLblvMiEYtQ9mb52/l61gKMsjvPr9EXwbX0/PFl3JKD58FZpWIF5lD
mO8fTYVsLiispm4DlfskTOzKsIJ/J/YmCPm5z7L5gBjFEhkpW/S5Hb6FT+yEWdov
+nMuoq+HixwjhXIKvVY388mK7Im1ltwqeWk0q20WGrlGmHek9P2nRiCyeFSHZuJu
HBS0IPPg1mebwt2CfSX/CyRWgn1M/qjYC4V3XVxjv+hYdGnxT+29B5RHG9hZk1s=
=YLqk
-----END PGP SIGNATURE-----
--- End Message ---
