GNU bug report logs - #44490
[PATCH 0/2] Update eid-mw and make it reproducible

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44490 in the body.
You can then email your comments to 44490 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Raphaël Mélotte <raphael.melotte <at> mind.be>
To: guix-patches <at> gnu.org
Cc: Raphaël Mélotte <raphael.melotte <at> mind.be>
Subject: [PATCH 0/2] Update eid-mw and make it reproducible
Date: Fri,  6 Nov 2020 20:12:26 +0100

Hello,

This patch series updates eid-mw to 5.0.8, and also removes a timestamp in the
build to make it reproducible.

I didn't know if small contributions also warrant a copyright line, so in
doubt I added one but I can remove it if necessary.

Raphaël Mélotte (2):
  gnu: eid-mw: Build reproducibly.
  gnu: eid-mw: Update to 5.0.8.

 gnu/packages/security-token.scm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

-- 
2.28.0

Message #8 received at 44490 <at> debbugs.gnu.org (full text, mbox):

From: Raphaël Mélotte <raphael.melotte <at> mind.be>
To: 44490 <at> debbugs.gnu.org
Cc: Raphaël Mélotte <raphael.melotte <at> mind.be>
Subject: [PATCH 1/2] gnu: eid-mw: Build reproducibly.
Date: Fri,  6 Nov 2020 20:16:20 +0100

* gnu/packages/security-token.scm (eid-mw)[arguments]: Add phase
"make-reproducible".

Signed-off-by: Raphaël Mélotte <raphael.melotte <at> mind.be>
---
 gnu/packages/security-token.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index cf6bf18373..162868ad7a 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -139,7 +139,13 @@ readers and is needed to communicate with such devices through the
              (substitute* "scripts/build-aux/genver.sh"
                (("/bin/sh") (which "sh"))
                (("^(GITDESC=).*" _ match) (string-append match ,version "\n")))
-             (invoke "sh" "./bootstrap.sh"))))))
+             (invoke "sh" "./bootstrap.sh")))
+         (add-after 'unpack 'make-reproducible
+           (lambda _
+             (substitute* "scripts/mac/create-vers.sh"
+               (("NOW=.*")
+                "NOW=1970-01-01\n"))
+             #t)))))
     (synopsis "Belgian eID Middleware")
     (description "The Belgian eID Middleware is required to authenticate with
 online services using the Belgian electronic identity card.")
-- 
2.28.0

Message #11 received at 44490 <at> debbugs.gnu.org (full text, mbox):

From: Raphaël Mélotte <raphael.melotte <at> mind.be>
To: 44490 <at> debbugs.gnu.org
Cc: Raphaël Mélotte <raphael.melotte <at> mind.be>
Subject: [PATCH 2/2] gnu: eid-mw: Update to 5.0.8.
Date: Fri,  6 Nov 2020 20:16:43 +0100

* gnu/packages/security-token.scm (eid-mw): Update to 5.0.8.
[arguments]: add remove-failing-test.
[inputs]: add autoconf-archive and libassuan.

Also add a copyright line.

Signed-off-by: Raphaël Mélotte <raphael.melotte <at> mind.be>
---
 gnu/packages/security-token.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 162868ad7a..fd7ff4fcc6 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte <at> mind.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,6 +44,7 @@
   #:use-module (gnu packages dns)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
@@ -102,7 +104,7 @@ readers and is needed to communicate with such devices through the
 (define-public eid-mw
   (package
     (name "eid-mw")
-    (version "4.4.27")
+    (version "5.0.8")
     (source
      (origin
        (method git-fetch)
@@ -111,13 +113,15 @@ readers and is needed to communicate with such devices through the
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"))))
+        (base32 "1ckini00iz9w96n9hpkx6w2ivpfkd4yyxyhnmsl9n0k8x4j6jg5a"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
+       ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
+       ("libassuan" ,libassuan)
        ("pkg-config" ,pkg-config)
        ("perl" ,perl)))
     (inputs
@@ -145,7 +149,16 @@ readers and is needed to communicate with such devices through the
              (substitute* "scripts/mac/create-vers.sh"
                (("NOW=.*")
                 "NOW=1970-01-01\n"))
-             #t)))))
+             #t))
+         ;; remove failing test that was removed upstream after the release.
+         ;; See: https://github.com/Fedict/eid-mw/commit/3d1187b1b61118b9ae97607903d3d2fc0bad7518
+         (add-before 'check 'remove-failing-test
+           (lambda _
+             (substitute* "tests/unit/Makefile.am"
+               (("sign_state ordering cardcom_common")
+                "sign_state ordering #cardcom_common"))
+             #t))
+         )))
     (synopsis "Belgian eID Middleware")
     (description "The Belgian eID Middleware is required to authenticate with
 online services using the Belgian electronic identity card.")
-- 
2.28.0

Message #14 received at 44490 <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Raphaël Mélotte <raphael.melotte <at> mind.be>
Cc: 44490 <at> debbugs.gnu.org
Subject: Re: [bug#44490] [PATCH 0/2] Update eid-mw and make it reproducible
Date: Fri, 06 Nov 2020 22:57:13 +0100

Raphaël,

On 2020-11-06 20:12, Raphaël Mélotte wrote:
> This patch series updates eid-mw to 5.0.8, and also removes a timestamp 
> in the
> build to make it reproducible.

Thank you!  Both patches LGTM, I'll dig up my ID card and test them too.

> I didn't know if small contributions also warrant a copyright line, so 
> in
> doubt I added one but I can remove it if necessary.

I think this does.  It doesn't need to be mentioned in the commit 
message though.

> mind.be

Cool.

Kind regards,

T G-R

Sent from a Web browser. Excuse or enjoy my brevity.

Message #19 received at 44490-done <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Raphaël Mélotte <raphael.melotte <at> mind.be>,
 44490-done <at> debbugs.gnu.org
Subject: Re: [bug#44490] [PATCH 0/2] Update eid-mw and make it reproducible
Date: Wed, 11 Nov 2020 17:49:47 +0100

[Message part 1 (text/plain, inline)]

Tobias Geerinckx-Rice via Guix-patches via 写道：
> Thank you!  Both patches LGTM, I'll dig up my ID card and test 
> them too.

Done and pushed as e6e31a59eb3d400bc264b0f70a1631cf5a8ae9c9 with 
minor tweaks to the commit messages.  Mainly because we don't sign 
off on our own patches.

Thanks!

T G-R

[signature.asc (application/pgp-signature, inline)]

Previous Next

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