From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnmUs-0007Jf-Kf for guix-patches@gnu.org; Thu, 09 Aug 2018 11:05:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnmUp-0001NM-22 for guix-patches@gnu.org; Thu, 09 Aug 2018 11:05:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnmUo-0001ND-US for guix-patches@gnu.org; Thu, 09 Aug 2018 11:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fnmUo-0007zc-Lu for guix-patches@gnu.org; Thu, 09 Aug 2018 11:05:02 -0400 Subject: [bug#32410] [PATCH] libgcrypt: Make it reproducible Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnmUO-00077I-HD for guix-patches@gnu.org; Thu, 09 Aug 2018 11:04:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnmUL-00016u-41 for guix-patches@gnu.org; Thu, 09 Aug 2018 11:04:36 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:43226 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnmUK-00016A-K5 for guix-patches@gnu.org; Thu, 09 Aug 2018 11:04:33 -0400 Received: from alma-ubu (p57B52973.dip0.t-ipconnect.de [87.181.41.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id D71FF3FC9E for ; Thu, 9 Aug 2018 17:04:30 +0200 (CEST) Date: Thu, 9 Aug 2018 17:04:29 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180809170429.52a33b8f@alma-ubu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/7hur2AAZAyONh8JgiEOKAqf"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32410@debbugs.gnu.org --Sig_/7hur2AAZAyONh8JgiEOKAqf Content-Type: multipart/mixed; boundary="MP_/1fR2d1a.qebec5IR0Zoh9Z+" --MP_/1fR2d1a.qebec5IR0Zoh9Z+ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This is a fix for core-updates. The libgcrypt package contains a yat2m command that adds a timestamp into the generated man-page. The (more or less) same C-file exits also in the packages gnupg and libgpg-error. There it already considers SOURCE_DATE_EPOCH. I diffed from gnupg and removed unrelated things. I will also report upstream. Bj=C3=B6rn --MP_/1fR2d1a.qebec5IR0Zoh9Z+ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-libgcrypt-Make-build-reproducible.patch =46rom 908c760f89ae5b47edbb0124339eab5801196f62 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D Date: Thu, 9 Aug 2018 16:45:45 +0200 Subject: [PATCH] gnu: libgcrypt: Make build reproducible. * gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (libgcrypt)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 4 ++- .../libgcrypt-make-yat2m-reproducible.patch | 32 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.= patch diff --git a/gnu/local.mk b/gnu/local.mk index 9eb636037..d242f355b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -858,6 +858,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 54b44996e..942f975e5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -101,7 +101,9 @@ Daemon and possibly more in the future.") version ".tar.bz2")) (sha256 (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))) + "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")) + (patches + (search-patches "libgcrypt-make-yat2m-reproducible.patch")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b= /gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch new file mode 100644 index 000000000..3056f0baa --- /dev/null +++ b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch @@ -0,0 +1,32 @@ +Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making +the build reproducible. + +This was already fixed upstream in GnuPG: +https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb + +and in libgpg-error: +https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64 + + +--- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100 ++++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200 +@@ -1475,6 +1484,7 @@ + main (int argc, char **argv) + { + int last_argc =3D -1; ++ const char *s; +=20 + opt_source =3D "GNU"; + opt_release =3D ""; +@@ -1608,6 +1618,11 @@ + if (argc > 1) + die ("usage: " PGM " [OPTION] [FILE] (try --help for more information= )\n"); +=20 ++ /* Take care of supplied timestamp for reproducible builds. See ++ * https://reproducible-builds.org/specs/source-date-epoch/ */ ++ if (!opt_date && (s =3D getenv ("SOURCE_DATE_EPOCH")) && *s) ++ opt_date =3D s; ++ + /* Start processing. */ + if (argc && strcmp (*argv, "-")) + { --=20 2.18.0 --MP_/1fR2d1a.qebec5IR0Zoh9Z+-- --Sig_/7hur2AAZAyONh8JgiEOKAqf Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAltsV/4ACgkQvyhstlk+X/0wnQCgqgfThPMvnDbzbxjySFDzAq/V Af8An2zUZuPBVcv8/+vP0aHdm5kJcOqa =/bA1 -----END PGP SIGNATURE----- --Sig_/7hur2AAZAyONh8JgiEOKAqf--