Package: gnupg2 Version: 2.1.11-7 Severity: wishlist Tags: patch User: reproducible-builds@lists.alioth.debian.org Usertags: hostname X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org
Hi, the attached patch fixes (in my local rebuild.sh test environment) the non-determinism in /usr/share/win32/gpgv.exe caused by varying build hostname. Please have a look and let me know if you think it should be implemented differently. For the record, the hostname is captured in gpgv.exe since upstream commit 049b3d9, whose message explains what the change is, but does not make its rationale clear. Thank you for maintaining GnuPG in Debian! Cheers, -- intrigeri
commit 073b11eb65f5cd7beb5cbf1e1b5e957c0ae37333 Author: intrigeri <intrig...@debian.org> Date: Sat Jun 4 11:46:50 2016 +0000 0007-Don-t-include-BUILD_HOSTNAME-nor-BUILD_TIMESTAMP-in-.patch: new patch (don't include BUILD_HOSTNAME nor BUILD_TIMESTAMP in W32INFO_FILEVERSION, for build reproducibility). diff --git a/debian/patches/0007-Don-t-include-BUILD_HOSTNAME-nor-BUILD_TIMESTAMP-in-.patch b/debian/patches/0007-Don-t-include-BUILD_HOSTNAME-nor-BUILD_TIMESTAMP-in-.patch new file mode 100644 index 0000000..d304f03 --- /dev/null +++ b/debian/patches/0007-Don-t-include-BUILD_HOSTNAME-nor-BUILD_TIMESTAMP-in-.patch @@ -0,0 +1,23 @@ +From: intrigeri <intrig...@debian.org> +Date: Sat, 4 Jun 2016 11:45:46 +0000 +Subject: Don't include BUILD_HOSTNAME nor BUILD_TIMESTAMP in + W32INFO_FILEVERSION, for build reproducibility. + +--- + common/w32info-rc.h.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in +index d7909dd..0c9d761 100644 +--- a/common/w32info-rc.h.in ++++ b/common/w32info-rc.h.in +@@ -22,8 +22,7 @@ either version 3 of the License, or (at your option) any later version.\0" + #define W32INFO_VI_FILEVERSION @BUILD_FILEVERSION@ + #define W32INFO_VI_PRODUCTVERSION @BUILD_FILEVERSION@ + +-#define W32INFO_FILEVERSION "@VERSION@ (@BUILD_REVISION@) \ +-built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0" ++#define W32INFO_FILEVERSION "@VERSION@ (@BUILD_REVISION@)\0" + + #define W32INFO_PRODUCTNAME "GNU Privacy Guard (GnuPG)\0" + #define W32INFO_PRODUCTVERSION "@VERSION@\0" diff --git a/debian/patches/series b/debian/patches/series index 540d51d..f6f9089 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch 0005-common-Change-simple_query-to-ignore-status-messages.patch 0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch +0007-Don-t-include-BUILD_HOSTNAME-nor-BUILD_TIMESTAMP-in-.patch
_______________________________________________ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds