From d2bf896155851fee524b045a790b949ea6863c76 Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Fri, 6 Nov 2020 20:16:20 +0100 Subject: gnu: eid-mw: Build reproducibly. * gnu/packages/security-token.scm (eid-mw)[arguments]: Add a "make-reproducible" phase to set build date to the epoch. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/security-token.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/security-token.scm') 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 @@ (define-public eid-mw (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.") -- cgit v1.2.3 From e6e31a59eb3d400bc264b0f70a1631cf5a8ae9c9 Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Fri, 6 Nov 2020 20:16:43 +0100 Subject: gnu: eid-mw: Update to 5.0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw): Update to 5.0.8. [arguments]: Add a ‘remove-failing-test’ phase. [inputs]: Add autoconf-archive and libassuan. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/security-token.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 162868ad7a..09222b571a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018, 2019 Chris Marusich ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2020 Raphaël Mélotte ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages security-token) #: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 @@ (define-public ccid (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 @@ (define-public eid-mw (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 @@ (define-public eid-mw (substitute* "scripts/mac/create-vers.sh" (("NOW=.*") "NOW=1970-01-01\n")) - #t))))) + #t)) + ;; Remove failing test that was removed upstream after version 5.0.8. + ;; 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.") -- cgit v1.2.3 From c746acf3a13983730cf640a901c97c893461aea4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:46:18 +0100 Subject: gnu: eid-mw: Don't try to bootstrap twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw)[arguments]: Replace the build system's ‘bootstrap’ phase instead of creating another one. --- gnu/packages/security-token.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 09222b571a..45610c4801 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -136,7 +136,7 @@ (define-public eid-mw (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'bootstrap + (replace 'bootstrap (lambda _ ;; configure.ac relies on ‘git --describe’ to get the version. ;; Patch it to just return the real version number directly. -- cgit v1.2.3