From 033cbd11a837dbc7602799f15d691221653e1996 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:00 +0200 Subject: gnu: libksba: Graft to 1.6.2 [fixes CVE-2022-3515]. * gnu/packages/gnupg.scm (libksba/fixed): New variable. (libksba): Use it as grafted replacement. --- gnu/packages/gnupg.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f9f39d6116..ce9ef48796 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -224,6 +224,7 @@ provided.") (package (name "libksba") (version "1.6.0") + (replacement libksba/fixed) (source (origin (method url-fetch) @@ -253,6 +254,18 @@ specifications are building blocks of S/MIME and TLS.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libksba"))))) +(define libksba/fixed + (package + (inherit libksba) + (version "1.6.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://gnupg/libksba/libksba-" version ".tar.bz2")) + (sha256 + (base32 "0wf9j9hlzvgn0vz6zg3fvcmpdr62v8bz1kzsvzdbs4lqqp51rq7w")))))) + (define-public npth (package (name "npth") -- cgit 1.4.1 From 6e7102c5f740fc5abb8d2ceea847ba5acb8a19df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Oct 2022 02:00:00 +0200 Subject: gnu: pinentry-tty: Update to 1.2.1. * gnu/packages/gnupg.scm (pinentry-tty): Update to 1.2.1. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ce9ef48796..af4414fb9b 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -803,14 +803,14 @@ including tools for signing keys, keyring analysis, and party preparation. (define-public pinentry-tty (package (name "pinentry-tty") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/pinentry/pinentry-" version ".tar.bz2")) (sha256 (base32 - "0w34c4x5hkxaxnnkcrm1azlzwzxcziv5dkci3xcd0hz0ld2j01qh")))) + "0rs019acfj7sr4pvc847nk42v5mba9ixqmd98nwqy8w5b9g1hyj5")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-pinentry-tty"))) -- cgit 1.4.1 From bb453af580ef92b843d02ef3f2b0c6d9ecfc132a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Oct 2022 02:00:01 +0100 Subject: gnu: jetring: Update to 0.31. * gnu/packages/gnupg.scm (jetring): Update to 0.31. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/gnupg.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index af4414fb9b..210b1ab8b3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1167,7 +1167,7 @@ over.") (define-public jetring (package (name "jetring") - (version "0.30") + (version "0.31") (source (origin (method git-fetch) @@ -1181,14 +1181,13 @@ over.") (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-before 'install 'hardlink-gnupg (lambda* (#:key inputs #:allow-other-keys) (let ((gpg (search-input-file inputs "/bin/gpg"))) (substitute* (find-files "." "jetring-[[:alpha:]]+$") (("gpg -") (string-append gpg " -")) - (("\\\"gpg\\\"") (string-append "\"" gpg "\""))) - #t))) + (("\\\"gpg\\\"") (string-append "\"" gpg "\"")))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1199,9 +1198,8 @@ over.") (for-each (lambda (file) (install-file file (string-append man "/man1/"))) (find-files "." ".*\\.1$")) - (install-file "jetring.7" (string-append man "/man7/")) - #t)))) - #:tests? #f)) ; no test phase + (install-file "jetring.7" (string-append man "/man7/")))))) + #:tests? #f)) ; no tests (inputs (list gnupg perl)) (home-page "https://joeyh.name/code/jetring/") -- cgit 1.4.1 From 3d2de69c066518a95bb8bc07e306cd2c337ef12c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 06:38:38 +0100 Subject: gnu: gpgme: Add 1.18.0. * gnu/packages/gnupg.scm (gpgme-1.18, qgpgme-1.18): New variables. --- gnu/packages/gnupg.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 210b1ab8b3..064b775ab1 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -431,6 +431,19 @@ and every application benefits from this.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gpgme"))))) +;; TODO: Merge with gpgme in the next rebuild cycle. +(define-public gpgme-1.18 + (package + (inherit gpgme) + (version "1.18.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gpgme/gpgme-" + version ".tar.bz2")) + (sha256 + (base32 + "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n")))))) + (define-public qgpgme (package (inherit gpgme) @@ -459,6 +472,16 @@ QGpgME was originally developed as part of libkleo and incorporated into gpgpme starting with version 1.7.") (license license:gpl2+))) ;; Note: this differs from gpgme +;; TODO: Merge with qgpgme in the next rebuild cycle. +(define-public qgpgme-1.18 + (package + (inherit qgpgme) + (version (package-version gpgme-1.18)) + (source (package-source gpgme-1.18)) + (inputs + (modify-inputs (package-inputs qgpgme) + (replace "gpgme" gpgme-1.18))))) + (define-public guile-gcrypt (package (name "guile-gcrypt") -- cgit 1.4.1 From 8e416c979d136b67d558a803f4e32a6070711032 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 1 Dec 2022 15:10:23 +0100 Subject: gnu: guile-gcrypt: Update to 0.4.0. * gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.4.0. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 064b775ab1..13b603b64a 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -485,7 +485,7 @@ gpgpme starting with version 1.7.") (define-public guile-gcrypt (package (name "guile-gcrypt") - (version "0.3.0") + (version "0.4.0") (home-page "https://notabug.org/cwebber/guile-gcrypt") (source (origin (method git-fetch) @@ -494,7 +494,7 @@ gpgpme starting with version 1.7.") (commit (string-append "v" version)))) (sha256 (base32 - "0m29fg4pdfifnqqsa437zc5c1bhbfh62mc69ba25ak4x2cla41ll")) + "0m75h9q10yb27kzjsvhhq0yk3jaxiy9bpbfd9qg269hf9gabgfdx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From a4461df9b2bd4695f0987efe27b62926924e89f1 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sat, 24 Dec 2022 19:21:53 +0100 Subject: gnu: libksba: Update replacement to 1.6.3 [fixes CVE-2022-47629]. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnupg.scm (libksba/fixed): Update to 1.6.3. Signed-off-by: Ludovic Courtès --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 13b603b64a..ffd5d62a71 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -257,14 +257,14 @@ specifications are building blocks of S/MIME and TLS.") (define libksba/fixed (package (inherit libksba) - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libksba/libksba-" version ".tar.bz2")) (sha256 - (base32 "0wf9j9hlzvgn0vz6zg3fvcmpdr62v8bz1kzsvzdbs4lqqp51rq7w")))))) + (base32 "0p6y82j9y6n0l7scjgqhz3as9w13jiqjfx9n2jzynw89nf6wcwiz")))))) (define-public npth (package -- cgit 1.4.1