GNU logs - #44447, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#44447] gnu: pwsafe: Reset timestamps in zip archives
Resent-From: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Nov 2020 16:22:01 +0000
Resent-Message-ID: <handler.44447.B.160450687825589 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 44447 <at> debbugs.gnu.org
User-agent: mu4e 1.4.13; emacs 27.1
From: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Date: Wed, 04 Nov 2020 17:20:57 +0100
Message-ID: <87k0v1w0t2.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
References: <87k0v1w0t2.fsf.ref@HIDDEN>
Content-Length: 9173
Received-SPF: pass client-ip=77.238.178.201;
 envelope-from=tim.gesthuizen@HIDDEN;
 helo=sonic303-20.consmr.mail.ir2.yahoo.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.6 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)

--=-=-=
Content-Type: text/plain

Hi,
I had a look at the old discussion and made a second attempt at fixing
the timestamps in the zip files. I wrote a version in C that does the
this back then but was unsuitable for usage in Guix.
Ludo created a draft for directly reading the zip files and zeroing the
time stamps in Scheme as a response.
But he also mentioned that Debians strip-nondeterminism probobaly
already does what we want.
So I took the this route for solving our problems.
strip-nondeterminism is written in Perl. I don't have any experience
with Perl, so probably my package definitions need some cleanup.
In addition, the tests for strip-nondeterminism fail. Yet using it makes
the build of pwsafe deterministic.
The strip-nondeterminism executable will also fail to run without
changes to the environment when run from a profile.
I am also not sure whether debian.scm is the right file for it.

So the patches below are probably more of a draft and it would be really
nice if someone with Perl experience could tweak them.
As there is a very similar problem with jar files in ant-build-system it
might be benefitial to port this approach to it, but I am not sure about
that.

Tim.


--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline; filename=0001-gnu-Add-perl-sub-override.patch
Content-Transfer-Encoding: quoted-printable

From a2b4a41aef84e168366952b5f3b99d4f4ff463d6 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Date: Wed, 4 Nov 2020 16:09:00 +0100
Subject: [PATCH 1/3] gnu: Add perl-sub-override

* gnu/packages/perl.scm (perl-sub-override): New variable.
---
 gnu/packages/perl.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index ad84d63785..936a605d43 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -28,6 +28,7 @@
 ;;; Copyright =C2=A9 2020 Paul Garlick <pgarlick@HIDDEN=
m>
 ;;; Copyright =C2=A9 2020 Nicolas Goaziou <mail@HIDDEN>
 ;;; Copyright =C2=A9 2020 Malte Frank Gerdes <malte.f.gerdes@HIDDEN>
+;;; Copyright =C2=A9 2020 Tim Gesthuizen <tim.gesthuizen@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9209,6 +9210,26 @@ specification is omitted in the name, then the curre=
nt package is used.  The
 return value is the sub.")
     (license (package-license perl))))
=20
+(define-public perl-sub-override
+  (package
+    (name "perl-sub-override")
+    (version "0.09")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://cpan.metacpan.org/authors/id/O/OV/OVID/Sub-Override-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"))))
+    (native-inputs `(("perl-test-fatal" ,perl-test-fatal)))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Sub-Override")
+    (synopsis "Override a sub")
+    (description "Sub::Override aids in overriding subroutines.")
+    (license (package-license perl))))
+
 (define-public perl-sub-quote
   (package
     (name "perl-sub-quote")
--=20
2.29.1


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
 filename=0002-gnu-Add-strip-nondeterminism.patch

From 3c22713d1234e6014d5959e31b621151defab5de Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Date: Wed, 4 Nov 2020 16:09:42 +0100
Subject: [PATCH 2/3] gnu: Add strip-nondeterminism

* gnu/packages/debian.scm (strip-nondeterminism): New variable.
---
 gnu/packages/debian.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 52e7ec223a..e710de066f 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -25,13 +25,15 @@
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system perl)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages wget)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages perl-compression))
 
 (define-public debian-archive-keyring
   (package
@@ -275,3 +277,32 @@ debian/copyright for more information.")))))
 selectively mirror Debian and Ubuntu GNU/Linux distributions or any
 other apt sources typically provided by open source developers.")
       (license license:gpl2))))
+
+(define-public strip-nondeterminism
+  (package
+    (name "strip-nondeterminism")
+    (version "1.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://salsa.debian.org/reproducible-builds/strip-nondeterminism")
+         (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0hk8kdkdjpmsl93l09ihlcl8kxibk429a30w81ir085arwqpakzx"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-archive-zip" ,perl-archive-zip)
+       ("perl-sub-override" ,perl-sub-override)))
+    (arguments `(#:tests? #f))
+    (home-page "https://salsa.debian.org/reproducible-builds/strip-nondeterminism")
+    (synopsis "Strips non deterministic parts off of zip and jar archives")
+    (description "File::StripNondeterminism is a Perl module for stripping
+bits of nondeterministic information, such as timestamps and file system
+order, from files such as gzipped files, ZIP archives, and Jar files.  It can
+be used as a post-processing step to make a build reproducible, when the build
+process itself cannot be made deterministic.")
+    (license license:gpl3+)))
-- 
2.29.1


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
 filename=0003-gnu-pwsafe-Reset-timestamps-in-in-zip-archives.patch

From 95ce6fe3180f78c38b85853ad9689d191ed25e0c Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Date: Wed, 4 Nov 2020 16:10:20 +0100
Subject: [PATCH 3/3] gnu: pwsafe: Reset timestamps in in zip archives

* gnu/packages/password-utils.scm (pwsafe):
  [native-inputs] Add strip-nondeterminism.
  [arguments]: Add a new phase resetting timestamps in zip archives and adapt
  modules for it.
---
 gnu/packages/password-utils.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index c1bd212f09..85c2248a20 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -64,6 +64,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages cryptsetup)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages debian)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages file)
   #:use-module (gnu packages freedesktop)
@@ -227,6 +228,7 @@ algorithms AES or Twofish.")
      `(("gettext" ,gettext-minimal)
        ("gtest" ,googletest)
        ("perl" ,perl)
+       ("strip-nondeterminism" ,strip-nondeterminism)
        ("zip" ,zip)))
     (inputs `(("curl" ,curl)
               ("file" ,file)
@@ -237,7 +239,10 @@ algorithms AES or Twofish.")
               ("qrencode" ,qrencode)
               ("wxwidgets" ,wxwidgets)
               ("xerces-c" ,xerces-c)))
-    (arguments '(#:configure-flags (list "-DNO_GTEST=YES")
+    (arguments `(#:configure-flags (list "-DNO_GTEST=YES")
+                 #:modules ((guix build cmake-build-system)
+                            (guix build utils)
+                            (ice-9 ftw))
                  #:phases (modify-phases %standard-phases
                             (add-after 'unpack 'add-gtest
                               (lambda* (#:key inputs #:allow-other-keys)
@@ -247,7 +252,18 @@ algorithms AES or Twofish.")
                                   (display "find_package(GTest)
 add_subdirectory(src/test)\n" cmake-port)
                                   (close cmake-port)
-                                  #t))))))
+                                  #t)))
+                            (add-after 'build 'patch-zips
+                              (lambda* (#:key inputs #:allow-other-keys)
+                                (ftw (getcwd)
+                                     (lambda (filename statinfo flag)
+                                       (when (and (eq? flag 'regular)
+                                                  (string-suffix? ".zip" filename))
+                                         (chmod filename #o644)
+                                         (invoke "strip-nondeterminism"
+                                                 "-v" filename))
+                                       #t))
+                                #t)))))
     (synopsis "Password safe with automatic input and key generation")
     (description "pwsafe is a password manager originally designed by Bruce
 Schneier.  It offers a simple UI to manage passwords for different services.
-- 
2.29.1


--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Tim Gesthuizen <tim.gesthuizen@HIDDEN>
Subject: bug#44447: Acknowledgement (gnu: pwsafe: Reset timestamps in zip
 archives)
Message-ID: <handler.44447.B.160450687825589.ack <at> debbugs.gnu.org>
References: <87k0v1w0t2.fsf@HIDDEN>
X-Gnu-PR-Message: ack 44447
X-Gnu-PR-Package: guix-patches
Reply-To: 44447 <at> debbugs.gnu.org
Date: Wed, 04 Nov 2020 16:22:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 44447 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
44447: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44447
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 10 Jun 2021 11:39:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jun 10 07:39:53 2021
Received: from localhost ([127.0.0.1]:35600 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1lrJ2P-0001hp-7Y
	for submit <at> debbugs.gnu.org; Thu, 10 Jun 2021 07:39:53 -0400
Received: from mail-wr1-f47.google.com ([209.85.221.47]:36579)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zimon.toutoune@HIDDEN>) id 1lrJ2N-0001hP-P4
 for control <at> debbugs.gnu.org; Thu, 10 Jun 2021 07:39:52 -0400
Received: by mail-wr1-f47.google.com with SMTP id e11so1944285wrg.3
 for <control <at> debbugs.gnu.org>; Thu, 10 Jun 2021 04:39:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=date:message-id:to:from:subject;
 bh=TtRRTS8ymqXEFGJ9VVKkDx4ne4rv5XGApYmVklxukaM=;
 b=b0/oMlQijs1whEvwk9mRD2YIqP9vCvZcHSIfgzddAByLRJRvVcyuLDfVjzXYwXr6Ak
 wBWiAFVMSQax1jpw5r+LZxiy6fV815k8NsDqKwG+WmzsxTZC4qw8l9O6jnw7MWD4W+P9
 lxxi7K7NXVtl9OvwjDS40bosshYwgyUl3yDBZtNOujfSKSk8jYbpHfjvKlH9xlTsS/jF
 oPifWeeW5a6NS/Vgn4L57mhK/MIES9EYEXH76LVja7mQbpAwbtiigvwzn/07UU33g0hd
 s2Dezh3fH2F25jDNDrHfd8eQ3vyVUwxkJS5zHidbuzxUiWZGVXk4CzVFx2ZAJw5MEXXO
 cQBw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:date:message-id:to:from:subject;
 bh=TtRRTS8ymqXEFGJ9VVKkDx4ne4rv5XGApYmVklxukaM=;
 b=cOx7lIX/odDoNWpKEMU/JgoNM06aZVS6+5VAtq0gDD081aaTDd3mN7gaZuHTletHp3
 HOcOY0pCizAdivfyOV9KrqIutj3YWgKNnP8w6EeYuoeIM6Ez9rDpo0lABlPt0hybaL/g
 pGE5vqMp6wKfcuMknXHqN6WVVh/mHgiVC5IjYgUwlu9f4A1AM7oxD92X2oZ8Wd8hPf4T
 gL0765v1ylzQ2IB85aQel3WQowFmCDRGcZHnhACI6Zq+ZmMWkEtsfNYauPpSbeSX8P5N
 UhbCL33bhdV8WozknPDXRsHBeE3guCfp0GUnoEzybnItU29pB9zci2JbpErbV0919OYb
 689w==
X-Gm-Message-State: AOAM533K5+Fp87G+tJAzaR48EhhjUyKr42dc5wT8z2z6yXLmb3u5byf6
 LCtM+NScboi7DhTxRRho4DUlBO+9Adk=
X-Google-Smtp-Source: ABdhPJw9Tk65lF9xR8g1SSMwc3T9o0KS/NCkqQKltR24UOokD7+EPn2piSUoad9BP4oSJa9S8Pl+1A==
X-Received: by 2002:adf:c393:: with SMTP id p19mr5023601wrf.92.1623325186206; 
 Thu, 10 Jun 2021 04:39:46 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
 by smtp.gmail.com with ESMTPSA id u7sm3805487wrt.18.2021.06.10.04.39.45
 for <control <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 10 Jun 2021 04:39:45 -0700 (PDT)
Date: Thu, 10 Jun 2021 13:35:09 +0200
Message-Id: <86y2bihs0i.fsf@HIDDEN>
To: control <at> debbugs.gnu.org
From: zimoun <zimon.toutoune@HIDDEN>
Subject: control message for bug #44447
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

tags 44447 + patch
quit

Last modified: Thu, 10 Jun 2021 11:45:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.