From unknown Fri Aug 15 18:48:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32861] [Fwd: [PATCH] fvwm reproducible] Resent-From: Nils Gillmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Sep 2018 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32861@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15381468614134 (code B ref -1); Fri, 28 Sep 2018 15:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Sep 2018 15:01:01 +0000 Received: from localhost ([127.0.0.1]:57758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uGH-00014W-6Q for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:01:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uGD-00014H-Mr for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5uG6-000451-U1 for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g5uG6-00044k-1t for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5uG4-0006Eb-Hj for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5uFz-00042E-JR for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:44 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:48750 helo=conspiracy.of.n0.pm) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g5uFw-0003J4-2W for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:38 -0400 Received: by conspiracy.of.n0.pm (OpenSMTPD) with ESMTPSA id 213996ef (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Fri, 28 Sep 2018 14:59:24 +0000 (UTC) Date: Fri, 28 Sep 2018 15:00:19 +0000 From: Nils Gillmann Message-ID: <20180928150019.zzlsb5gieyu2pywg@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) 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. ----- 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 ----- From unknown Fri Aug 15 18:48:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32861] [Fwd: [PATCH] fvwm reproducible] Resent-From: Nils Gillmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Sep 2018 15:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32861@debbugs.gnu.org Received: via spool by 32861-submit@debbugs.gnu.org id=B32861.15381476135327 (code B ref 32861); Fri, 28 Sep 2018 15:14:02 +0000 Received: (at 32861) by debbugs.gnu.org; 28 Sep 2018 15:13:33 +0000 Received: from localhost ([127.0.0.1]:57765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uST-0001Nr-6W for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:13:33 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:55572 helo=conspiracy.of.n0.pm) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uSQ-0001Nc-VF for 32861@debbugs.gnu.org; Fri, 28 Sep 2018 11:13:31 -0400 Received: by conspiracy.of.n0.pm (OpenSMTPD) with ESMTPSA id 8835e784 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <32861@debbugs.gnu.org>; Fri, 28 Sep 2018 15:13:23 +0000 (UTC) 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> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --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-- From unknown Fri Aug 15 18:48:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32861] [Fwd: [PATCH] fvwm reproducible] Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Sep 2018 21:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nils Gillmann Cc: 32861@debbugs.gnu.org Received: via spool by 32861-submit@debbugs.gnu.org id=B32861.153816950324369 (code B ref 32861); Fri, 28 Sep 2018 21:19:01 +0000 Received: (at 32861) by debbugs.gnu.org; 28 Sep 2018 21:18:23 +0000 Received: from localhost ([127.0.0.1]:58111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g609X-0006Kz-Hs for submit@debbugs.gnu.org; Fri, 28 Sep 2018 17:18:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g609V-0006Kk-NS for 32861@debbugs.gnu.org; Fri, 28 Sep 2018 17:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g609P-0007ro-Om for 32861@debbugs.gnu.org; Fri, 28 Sep 2018 17:18:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g609N-0007qu-Sc; Fri, 28 Sep 2018 17:18:14 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49002 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1g609N-0007h5-Ke; Fri, 28 Sep 2018 17:18:13 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180928150019.zzlsb5gieyu2pywg@abyayala> <20180928151419.fd5hxc7sv4nqwo23@abyayala> Date: Fri, 28 Sep 2018 23:18:12 +0200 In-Reply-To: <20180928151419.fd5hxc7sv4nqwo23@abyayala> (Nils Gillmann's message of "Fri, 28 Sep 2018 15:14:19 +0000") Message-ID: <87y3blz5gr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Nils, Nils Gillmann skribis: > +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 fro= m the > + source. I=E2=80=99ve just tried =E2=80=9Cguix build fvwm --no-grafts --check=E2=80= =9D, which suggests everything is fine. Indeed, our GCC packages include SOURCE_DATE_EPOCH patches, which take care of __DATE__ and __TIME__. Can you confirm that fvwm is bit-reproducible for you without this patch? Thank you, Ludo=E2=80=99. From unknown Fri Aug 15 18:48:30 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nils Gillmann Subject: bug#32861: closed (Re: [bug#32861] [Fwd: [PATCH] fvwm reproducible]) Message-ID: References: <20180928215454.l3xdlbysjoyezgis@abyayala> <20180928150019.zzlsb5gieyu2pywg@abyayala> X-Gnu-PR-Message: they-closed 32861 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 32861@debbugs.gnu.org Date: Fri, 28 Sep 2018 21:55:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1538171702-27887-1" This is a multi-part message in MIME format... ------------=_1538171702-27887-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32861: [Fwd: [PATCH] fvwm reproducible] which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32861@debbugs.gnu.org. --=20 32861: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32861 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1538171702-27887-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32861-done) by debbugs.gnu.org; 28 Sep 2018 21:54:15 +0000 Received: from localhost ([127.0.0.1]:58143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g60iF-0007Ek-I0 for submit@debbugs.gnu.org; Fri, 28 Sep 2018 17:54:15 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:59558 helo=conspiracy.of.n0.pm) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g60iE-0007EW-4K for 32861-done@debbugs.gnu.org; Fri, 28 Sep 2018 17:54:14 -0400 Received: by conspiracy.of.n0.pm (OpenSMTPD) with ESMTPSA id bc116dc5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 28 Sep 2018 21:53:58 +0000 (UTC) Date: Fri, 28 Sep 2018 21:54:54 +0000 From: Nils Gillmann To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#32861] [Fwd: [PATCH] fvwm reproducible] Message-ID: <20180928215454.l3xdlbysjoyezgis@abyayala> References: <20180928150019.zzlsb5gieyu2pywg@abyayala> <20180928151419.fd5hxc7sv4nqwo23@abyayala> <87y3blz5gr.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87y3blz5gr.fsf@gnu.org> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32861-done Cc: 32861-done@debbugs.gnu.org, Nils Gillmann X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ludovic Courtès transcribed 629 bytes: > Hi Nils, > > Nils Gillmann skribis: > > > +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. > > I’ve just tried “guix build fvwm --no-grafts --check”, which suggests > everything is fine. > > Indeed, our GCC packages include SOURCE_DATE_EPOCH patches, which take > care of __DATE__ and __TIME__. So with this GCC 'SOURCE_DATE_EPOCH' all __DATE__ and __TIME__ should be treated as per SOURCE_DATE_EPOCH specification. I did forget this I think. /gnu/store/jdlznqp43zyavbmm9kj5hcsrqrcxj6sr-fvwm-2.6.8/bin/fvwm -V fvwm 2.6.8 compiled on Jan 1 1970 at 00:00:01 Where I assumed the patch was needed, it is not. > Can you confirm that fvwm is bit-reproducible for you without this > patch? Yes, it is. > Thank you, > Ludo’. ------------=_1538171702-27887-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Sep 2018 15:01:01 +0000 Received: from localhost ([127.0.0.1]:57758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uGH-00014W-6Q for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:01:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g5uGD-00014H-Mr for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5uG6-000451-U1 for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g5uG6-00044k-1t for submit@debbugs.gnu.org; Fri, 28 Sep 2018 11:00:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5uG4-0006Eb-Hj for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5uFz-00042E-JR for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:44 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:48750 helo=conspiracy.of.n0.pm) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g5uFw-0003J4-2W for guix-patches@gnu.org; Fri, 28 Sep 2018 11:00:38 -0400 Received: by conspiracy.of.n0.pm (OpenSMTPD) with ESMTPSA id 213996ef (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Fri, 28 Sep 2018 14:59:24 +0000 (UTC) Date: Fri, 28 Sep 2018 15:00:19 +0000 From: Nils Gillmann To: guix-patches@gnu.org Subject: [Fwd: [PATCH] fvwm reproducible] Message-ID: <20180928150019.zzlsb5gieyu2pywg@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) 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. ----- 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 ----- ------------=_1538171702-27887-1--