From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5uT6-0003rI-Re for guix-patches@gnu.org; Fri, 28 Sep 2018 11:14:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5uSz-0002sr-4q for guix-patches@gnu.org; Fri, 28 Sep 2018 11:14:10 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5uSw-0002mq-Rp for guix-patches@gnu.org; Fri, 28 Sep 2018 11:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g5uSw-0001Ok-Ic for guix-patches@gnu.org; Fri, 28 Sep 2018 11:14:02 -0400 Subject: [bug#32861] [Fwd: [PATCH] fvwm reproducible] Resent-Message-ID: Date: Fri, 28 Sep 2018 15:14:19 +0000 From: Nils Gillmann Message-ID: <20180928151419.fd5hxc7sv4nqwo23@abyayala> References: <20180928150019.zzlsb5gieyu2pywg@abyayala> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="dynlf5pqqo6d5nvi" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180928150019.zzlsb5gieyu2pywg@abyayala> 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: 32861@debbugs.gnu.org --dynlf5pqqo6d5nvi Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Nils Gillmann transcribed 6.0K bytes: > Hi, > > I can send the patches again if they get swallowed by > this forwarding. It is probably better to send them > to guix-patches then guix-devel these days it seems. Patches attached in this email. > > ----- Forwarded message ----- > > > Hi, > > > > appended is a patch I use on my side to build fvwm reproducible. > > It is an adjusted version taken from Xenocara (OpenBSD's X11 tree) > > recently commited. Upstream did like the idea but I guess from > > their reply that they focus on fvwm3 instead: > > https://github.com/fvwmorg/fvwm/issues/67 > > > > Take it or leave it as it is, I don't have the time right now > > for QA. Patch attached alone + guix tree applying patch. > > > > *DISCLAIMER* > > I have build this package in my trees, so I know the patch itself > > works. Due to some issue with correctly building guix in my old > > checkout of it, I can not verify quickly if the guix tree patch I > > created builds. Important date upcoming, feel free to fix and add > > yourself as Co-Author if it doesn't apply. > > > > > > Happy hacking. > > > From 6980b10ff3870ee87d836858583154b952f7c229 Mon Sep 17 00:00:00 2001 > > From: Nils Gillmann > > Date: Sun, 23 Sep 2018 17:57:55 +0000 > > Subject: [PATCH] gnu: fvwm: Add patch to build it reproducible. > > > > * gnu/packages/fvwm.scm (fvwm)[source]: Add patch. > > * gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch: New file. > > * gnu/local.mk (dist_patch_DATA): Register patch. > > > > Signed-off-by: Nils Gillmann > > --- > > gnu/local.mk | 1 + > > gnu/packages/fvwm.scm | 4 ++- > > ...-2.6.8-remove-all-compile-timestamps.patch | 35 +++++++++++++++++++ > > 3 files changed, 39 insertions(+), 1 deletion(-) > > create mode 100644 gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch > > > > diff --git a/gnu/local.mk b/gnu/local.mk > > index fe2b573dd..18002080a 100644 > > --- a/gnu/local.mk > > +++ b/gnu/local.mk > > @@ -693,6 +693,7 @@ dist_patch_DATA = \ > > %D%/packages/patches/freeimage-unbundle.patch \ > > %D%/packages/patches/freetype-CVE-2018-6942.patch \ > > %D%/packages/patches/fuse-overlapping-headers.patch \ > > + %D%/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch \ > > %D%/packages/patches/gawk-shell.patch \ > > %D%/packages/patches/gcc-arm-bug-71399.patch \ > > %D%/packages/patches/gcc-arm-link-spec-fix.patch \ > > diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm > > index 386edba59..c2a5010c8 100644 > > --- a/gnu/packages/fvwm.scm > > +++ b/gnu/packages/fvwm.scm > > @@ -1,7 +1,7 @@ > > ;;; GNU Guix --- Functional package management for GNU > > ;;; Copyright © 2015 Sou Bunnbu > > ;;; Copyright © 2016 Efraim Flashner > > -;;; Copyright © 2017 Nils Gillmann > > +;;; Copyright © 2017, 2018 Nils Gillmann > > ;;; > > ;;; This file is part of GNU Guix. > > ;;; > > @@ -41,6 +41,8 @@ > > (uri (string-append > > "https://github.com/fvwmorg/fvwm/releases/download/" > > version "/" name "-" version ".tar.gz")) > > + (patches > > + (search-patch "fvwm-2.6.8-remove-all-compile-timestamps")) > > (sha256 > > (base32 > > "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv")))) > > diff --git a/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch b/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch > > new file mode 100644 > > index 000000000..a1f3189db > > --- /dev/null > > +++ b/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch > > @@ -0,0 +1,35 @@ > > +From 90e0ab0a5d5eae066f670723cd4c20f113e664be Mon Sep 17 00:00:00 2001 > > +From: Nils Gillmann > > +Date: Mon, 17 Sep 2018 23:23:46 +0000 > > +Subject: [PATCH] Remove compile time __DATE__ and __TIME__ variables from the > > + source. > > + > > +Commentary: it looks like upstream rejected the request for inclusion in > > +https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes. > > +Irritating, but we have tried. > > +This patch has been taken from a similar (but not applying as-is) patch > > +by robert@openbsd for openbsd's Xenocara FVWM version. > > + > > +Signed-off-by: Nils Gillmann > > +--- > > + fvwm/fvwm.c | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/fvwm/fvwm.c b/fvwm/fvwm.c > > +index f5317f2..3e0f183 100644 > > +--- a/fvwm/fvwm.c > > ++++ b/fvwm/fvwm.c > > +@@ -1286,8 +1286,8 @@ static void setVersionInfo(void) > > + int support_len; > > + > > + /* Set version information string */ > > +- sprintf(version_str, "fvwm %s%s compiled on %s at %s", > > +- VERSION, VERSIONINFO, __DATE__, __TIME__); > > ++ sprintf(version_str, "fvwm %s%s\n", > > ++ VERSION, VERSIONINFO); > > + Fvwm_VersionInfo = safestrdup(version_str); > > + > > + sprintf(license_str, > > +-- > > +2.19.0 > > + > > -- > > 2.19.0 > > > > > From 90e0ab0a5d5eae066f670723cd4c20f113e664be Mon Sep 17 00:00:00 2001 > > From: Nils Gillmann > > Date: Mon, 17 Sep 2018 23:23:46 +0000 > > Subject: [PATCH] Remove compile time __DATE__ and __TIME__ variables from the > > source. > > > > Commentary: it looks like upstream rejected the request for inclusion in > > https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes. > > Irritating, but we have tried. > > This patch has been taken from a similar (but not applying as-is) patch > > by robert@openbsd for openbsd's Xenocara FVWM version. > > > > Signed-off-by: Nils Gillmann > > --- > > fvwm/fvwm.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/fvwm/fvwm.c b/fvwm/fvwm.c > > index f5317f2..3e0f183 100644 > > --- a/fvwm/fvwm.c > > +++ b/fvwm/fvwm.c > > @@ -1286,8 +1286,8 @@ static void setVersionInfo(void) > > int support_len; > > > > /* Set version information string */ > > - sprintf(version_str, "fvwm %s%s compiled on %s at %s", > > - VERSION, VERSIONINFO, __DATE__, __TIME__); > > + sprintf(version_str, "fvwm %s%s\n", > > + VERSION, VERSIONINFO); > > Fvwm_VersionInfo = safestrdup(version_str); > > > > sprintf(license_str, > > -- > > 2.19.0 > > > > > > > ----- End forwarded message ----- > > > --dynlf5pqqo6d5nvi Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="fvwm-2.6.8-remove-all-compile-timestamps.patch" Content-Transfer-Encoding: quoted-printable =46rom 90e0ab0a5d5eae066f670723cd4c20f113e664be Mon Sep 17 00:00:00 2001 =46rom: Nils Gillmann Date: Mon, 17 Sep 2018 23:23:46 +0000 Subject: [PATCH] Remove compile time __DATE__ and __TIME__ variables from t= he source. Commentary: it looks like upstream rejected the request for inclusion in https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes. Irritating, but we have tried. This patch has been taken from a similar (but not applying as-is) patch by robert@openbsd for openbsd's Xenocara FVWM version. Signed-off-by: Nils Gillmann --- fvwm/fvwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fvwm/fvwm.c b/fvwm/fvwm.c index f5317f2..3e0f183 100644 --- a/fvwm/fvwm.c +++ b/fvwm/fvwm.c @@ -1286,8 +1286,8 @@ static void setVersionInfo(void) int support_len; =20 /* Set version information string */ - sprintf(version_str, "fvwm %s%s compiled on %s at %s", - VERSION, VERSIONINFO, __DATE__, __TIME__); + sprintf(version_str, "fvwm %s%s\n", + VERSION, VERSIONINFO); Fvwm_VersionInfo =3D safestrdup(version_str); =20 sprintf(license_str, --=20 2.19.0 --dynlf5pqqo6d5nvi Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-fvwm-Add-patch-to-build-it-reproducible.patch" Content-Transfer-Encoding: quoted-printable =46rom 6980b10ff3870ee87d836858583154b952f7c229 Mon Sep 17 00:00:00 2001 =46rom: Nils Gillmann Date: Sun, 23 Sep 2018 17:57:55 +0000 Subject: [PATCH] gnu: fvwm: Add patch to build it reproducible. * gnu/packages/fvwm.scm (fvwm)[source]: Add patch. * gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch: New = file. * gnu/local.mk (dist_patch_DATA): Register patch. Signed-off-by: Nils Gillmann --- gnu/local.mk | 1 + gnu/packages/fvwm.scm | 4 ++- ...-2.6.8-remove-all-compile-timestamps.patch | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/fvwm-2.6.8-remove-all-compile-time= stamps.patch diff --git a/gnu/local.mk b/gnu/local.mk index fe2b573dd..18002080a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -693,6 +693,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freetype-CVE-2018-6942.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm index 386edba59..c2a5010c8 100644 --- a/gnu/packages/fvwm.scm +++ b/gnu/packages/fvwm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Sou Bunnbu ;;; Copyright =C2=A9 2016 Efraim Flashner -;;; Copyright =C2=A9 2017 Nils Gillmann +;;; Copyright =C2=A9 2017, 2018 Nils Gillmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +41,8 @@ (uri (string-append "https://github.com/fvwmorg/fvwm/releases/download/" version "/" name "-" version ".tar.gz")) + (patches + (search-patch "fvwm-2.6.8-remove-all-compile-timestamps")) (sha256 (base32 "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv")))) diff --git a/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.= patch b/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch new file mode 100644 index 000000000..a1f3189db --- /dev/null +++ b/gnu/packages/patches/fvwm-2.6.8-remove-all-compile-timestamps.patch @@ -0,0 +1,35 @@ +From 90e0ab0a5d5eae066f670723cd4c20f113e664be Mon Sep 17 00:00:00 2001 +From: Nils Gillmann +Date: Mon, 17 Sep 2018 23:23:46 +0000 +Subject: [PATCH] Remove compile time __DATE__ and __TIME__ variables from = the + source. + +Commentary: it looks like upstream rejected the request for inclusion in +https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes. +Irritating, but we have tried. +This patch has been taken from a similar (but not applying as-is) patch +by robert@openbsd for openbsd's Xenocara FVWM version. + +Signed-off-by: Nils Gillmann +--- + fvwm/fvwm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fvwm/fvwm.c b/fvwm/fvwm.c +index f5317f2..3e0f183 100644 +--- a/fvwm/fvwm.c ++++ b/fvwm/fvwm.c +@@ -1286,8 +1286,8 @@ static void setVersionInfo(void) + int support_len; +=20 + /* Set version information string */ +- sprintf(version_str, "fvwm %s%s compiled on %s at %s", +- VERSION, VERSIONINFO, __DATE__, __TIME__); ++ sprintf(version_str, "fvwm %s%s\n", ++ VERSION, VERSIONINFO); + Fvwm_VersionInfo =3D safestrdup(version_str); +=20 + sprintf(license_str, +--=20 +2.19.0 + --=20 2.19.0 --dynlf5pqqo6d5nvi--