CVS commit: pkgsrc/security/gnupg2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Sep 28 16:57:08 UTC 2026

Modified Files:
        pkgsrc/security/gnupg2: Makefile distinfo
Added Files:
        pkgsrc/security/gnupg2/patches: patch-g10_import.c

Log Message:
gnupg2: update to 2.5.24nb1.

Same as before, with an additional upstream patch to fix the
regression.


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 pkgsrc/security/gnupg2/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/security/gnupg2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnupg2/patches/patch-g10_import.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.182 pkgsrc/security/gnupg2/Makefile:1.183
--- pkgsrc/security/gnupg2/Makefile:1.182       Sun Sep 27 20:50:56 2026
+++ pkgsrc/security/gnupg2/Makefile     Mon Sep 28 16:57:08 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.182 2026/09/27 20:50:56 wiz Exp $
+# $NetBSD: Makefile,v 1.183 2026/09/28 16:57:08 wiz Exp $
 
-DISTNAME=      gnupg-2.5.22
+DISTNAME=      gnupg-2.5.24
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GNUPG:=gnupg/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/gnupg2/distinfo
diff -u pkgsrc/security/gnupg2/distinfo:1.102 pkgsrc/security/gnupg2/distinfo:1.103
--- pkgsrc/security/gnupg2/distinfo:1.102       Sun Sep 27 20:50:56 2026
+++ pkgsrc/security/gnupg2/distinfo     Mon Sep 28 16:57:08 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.102 2026/09/27 20:50:56 wiz Exp $
+$NetBSD: distinfo,v 1.103 2026/09/28 16:57:08 wiz Exp $
 
-BLAKE2s (gnupg-2.5.22.tar.bz2) = c642f2c49daecf09a6acb4a3faaceca65427f68f7a741a5d558bf369f796ba5a
-SHA512 (gnupg-2.5.22.tar.bz2) = 5ff5834e42009f5741d84dcf25473adb5704ca796e1bd8d1a8ea3216b854864f08504f5ff5279026bab24b5baa255e9bd18e70bc1d4fc8fe293351760ab71231
-Size (gnupg-2.5.22.tar.bz2) = 8363854 bytes
+BLAKE2s (gnupg-2.5.24.tar.bz2) = d1a1c34665c3c4891e12119405a08468c6e51f6087816cdf85535afec22d3804
+SHA512 (gnupg-2.5.24.tar.bz2) = c60b0c105ef710defec5b23d6c1382ae8adabc3207917fb484960b1c37ae7b542da2ece5eafaa5d53fa13485647b52c2d371fe099e5600aba4c84e7d83ceb1df
+Size (gnupg-2.5.24.tar.bz2) = 8431157 bytes
 SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
+SHA1 (patch-g10_import.c) = ca7760ca48214311df8a186cf8328b49dd7a7717

Added files:

Index: pkgsrc/security/gnupg2/patches/patch-g10_import.c
diff -u /dev/null pkgsrc/security/gnupg2/patches/patch-g10_import.c:1.1
--- /dev/null   Mon Sep 28 16:57:08 2026
+++ pkgsrc/security/gnupg2/patches/patch-g10_import.c   Mon Sep 28 16:57:08 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-g10_import.c,v 1.1 2026/09/28 16:57:08 wiz Exp $
+
+Fix ECDH key problem, from upstream.
+
+--- g10/import.c.orig  2026-09-22 09:20:47.000000000 +0000
++++ g10/import.c
+@@ -2732,11 +2732,11 @@ build_mode1003_sexp (PKT_public_key *pk, gcry_sexp_t *
+       else if (openpgp_oid_is_cv25519 (pk->pkey[0]))
+         err = gcry_sexp_build
+           (&skey,NULL,"(private-key(ecc(curve %s)(flags djb-tweak)(q%m)(d%m)))",
+-           curvename, pk->pkey[2], pk->pkey[3]);
++           curvename, pk->pkey[1], pk->pkey[3]);
+       else
+         err = gcry_sexp_build
+           (&skey,NULL,"(private-key(ecc(curve %s)(q%m)(d%m)))",
+-           curvename, pk->pkey[2], pk->pkey[3]);
++           curvename, pk->pkey[1], pk->pkey[3]);
+       break;
+ 
+     case PUBKEY_ALGO_X25519: