From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nils Gillmann Subject: [PATCH] fvwm reproducible Date: Sun, 23 Sep 2018 18:03:20 +0000 Message-ID: <20180923180320.eazv2mna75m25u27@abyayala> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ws7cqke5wg5oxe5c" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g48iO-0005ia-Cs for guix-devel@gnu.org; Sun, 23 Sep 2018 14:02:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g48iK-0000kD-EY for guix-devel@gnu.org; Sun, 23 Sep 2018 14:02:40 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:42530 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 1g48iK-0000eS-2L for guix-devel@gnu.org; Sun, 23 Sep 2018 14:02:36 -0400 Received: by conspiracy.of.n0.pm (OpenSMTPD) with ESMTPSA id f63067a5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 23 Sep 2018 18:02:25 +0000 (UTC) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --ws7cqke5wg5oxe5c Content-Type: multipart/mixed; boundary="f2mkv7wm6h3gipkb" Content-Disposition: inline --f2mkv7wm6h3gipkb Content-Type: text/plain; charset=utf-8 Content-Disposition: inline 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. --f2mkv7wm6h3gipkb 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 --f2mkv7wm6h3gipkb 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 --f2mkv7wm6h3gipkb-- --ws7cqke5wg5oxe5c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlun1WgACgkQ4i+bv+40 hYhtLQ//YQp1FLlfw89VFJnyQ1CQsmanmsVF+PwWTbxqR4SKF9rtOVEh+Sr1x93z tSKGtA5tiiZ7nk7q95Faqss1hYsARXOelI9dwE18G1GjMNB8hXwDv/3dyYBC3bbR A6ACjnrOERz/8B7cbVl/tpWto4sEReG54ugL3QSfXv/E9O+hAksvalZmNSxuEiMK EDYRyFn/aNCT3RdJ42SvKMM3TtwOK2Key5SIbZHCxjsI0W8dbq8l0bBM/nHol33F oRBzsCYh/gkXBJGtzdHACTuRBpaeSo2X4R/HA+fLGBRi91nE+cX+IVopHRXkBVYi e+a42Vt/TzDF+EpxR9ozxvLQ9iTxwlvO3GeJ3/YrMysSFH5fRAAFTSr9DS717a4G EaTfHRvmV8/BoRyPYS9UqJn3yIy2gPPNHy0VTdP2DRP7r0i1AyXyl9X+XknEx0/B RkkXBO/gp6OUpY2yF3t1Dd64NtFXysB5xlv+VhcFIZ1AuhgvpGqlCNcU516xctsy YiNglkT9oTccN3TSYut5fzOoegSJV/5QFSmurH0n0KEaO2D6CtQwuXGRoUDVuhBP X9e4IfecWqX/Iosz1UFPeSUh5hOjVtbL5ypvCzRrsaC9EcELxtRHHt64Zwf4MS2t z0MiU8iBeRQFO/I8iz3Bb/p2Lg6GXF2xGBk3clN9S15WNTtY1ic= =CZxV -----END PGP SIGNATURE----- --ws7cqke5wg5oxe5c--