CVS commit: pkgsrc/security/gnutls

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Nov 11 02:03:54 UTC 2024

Modified Files:
        pkgsrc/security/gnutls: Makefile distinfo
Added Files:
        pkgsrc/security/gnutls/patches: patch-lib_algorithms_groups.c

Log Message:
gnutls: fix builds with older GCCs, e.g., 7.5 on NetBSD 9.x


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/security/gnutls/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/gnutls/patches/patch-lib_algorithms_groups.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/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.258 pkgsrc/security/gnutls/Makefile:1.259
--- pkgsrc/security/gnutls/Makefile:1.258       Sat Nov  9 14:51:21 2024
+++ pkgsrc/security/gnutls/Makefile     Mon Nov 11 02:03:54 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.258 2024/11/09 14:51:21 wiz Exp $
+# $NetBSD: Makefile,v 1.259 2024/11/11 02:03:54 gutteridge Exp $
 
 DISTNAME=      gnutls-3.8.8
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/security/gnutls/distinfo
diff -u pkgsrc/security/gnutls/distinfo:1.165 pkgsrc/security/gnutls/distinfo:1.166
--- pkgsrc/security/gnutls/distinfo:1.165       Wed Nov  6 14:51:41 2024
+++ pkgsrc/security/gnutls/distinfo     Mon Nov 11 02:03:54 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.165 2024/11/06 14:51:41 adam Exp $
+$NetBSD: distinfo,v 1.166 2024/11/11 02:03:54 gutteridge Exp $
 
 BLAKE2s (gnutls-3.8.8.tar.xz) = 7601a4d3ca0f1372f9525be85fe81f3f4b2a84485a9216105b9b9385024769d6
 SHA512 (gnutls-3.8.8.tar.xz) = 4f617c63e8e8392e400d72c9e39989fcd782268b4a4c4e36bbfb0444a4b5bcb0f53054f04a6dce99ab89c0f38f57430c95aaaec6eb9209b8e9329140abf230c3
 Size (gnutls-3.8.8.tar.xz) = 6696460 bytes
 SHA1 (patch-configure) = 866d8a365b8338348230e47518788f494279b139
+SHA1 (patch-lib_algorithms_groups.c) = d26d8b46f70059c42c19247bbffeb5bd2b8c8a01

Added files:

Index: pkgsrc/security/gnutls/patches/patch-lib_algorithms_groups.c
diff -u /dev/null pkgsrc/security/gnutls/patches/patch-lib_algorithms_groups.c:1.1
--- /dev/null   Mon Nov 11 02:03:54 2024
+++ pkgsrc/security/gnutls/patches/patch-lib_algorithms_groups.c        Mon Nov 11 02:03:54 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_algorithms_groups.c,v 1.1 2024/11/11 02:03:54 gutteridge Exp $
+
+Fix builds with older GCCs like 7.5 on NetBSD 9.x that can't handle this.
+
+--- lib/algorithms/groups.c.orig       2024-10-30 04:41:21.000000000 +0000
++++ lib/algorithms/groups.c
+@@ -90,7 +90,13 @@ static const gnutls_group_entry_st suppo
+               .tls_id = 25,
+               .pk = GNUTLS_PK_ECDSA,
+       },
+-      group_x25519,
++      {
++              .name = "X25519",
++              .id = GNUTLS_GROUP_X25519,
++              .curve = GNUTLS_ECC_CURVE_X25519,
++              .tls_id = 29,
++              .pk = GNUTLS_PK_ECDH_X25519,
++      },
+ #ifdef ENABLE_GOST
+       /* draft-smyshlyaev-tls12-gost-suites-06, Section 6 */
+       {