CVS commit: pkgsrc/security/nettle

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb  6 13:51:49 UTC 2026

Modified Files:
        pkgsrc/security/nettle: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/security/nettle/patches: patch-Makefile.in

Log Message:
nettle: downgrade, gnutls is not ready for nettle 4


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/nettle/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/nettle/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/nettle/buildlink3.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/nettle/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/nettle/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/security/nettle/Makefile
diff -u pkgsrc/security/nettle/Makefile:1.35 pkgsrc/security/nettle/Makefile:1.36
--- pkgsrc/security/nettle/Makefile:1.35        Fri Feb  6 10:02:02 2026
+++ pkgsrc/security/nettle/Makefile     Fri Feb  6 13:51:48 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2026/02/06 10:02:02 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/02/06 13:51:48 wiz Exp $
 
-DISTNAME=      nettle-4.0
+DISTNAME=      nettle-3.10.2
 CATEGORIES=    security
 MASTER_SITES=  http://www.lysator.liu.se/~nisse/archive/
 MASTER_SITES+= ftp://ftp.lysator.liu.se/pub/security/lsh/
@@ -10,7 +10,7 @@ HOMEPAGE=     https://www.lysator.liu.se/~ni
 COMMENT=       Cryptographic library
 LICENSE=       gnu-lgpl-v2.1
 
-USE_CC_FEATURES=       c99 # and alignas/alignof from C11
+USE_CC_FEATURES=       c99
 USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gm4 gmake

Index: pkgsrc/security/nettle/PLIST
diff -u pkgsrc/security/nettle/PLIST:1.15 pkgsrc/security/nettle/PLIST:1.16
--- pkgsrc/security/nettle/PLIST:1.15   Fri Feb  6 10:02:02 2026
+++ pkgsrc/security/nettle/PLIST        Fri Feb  6 13:51:48 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2026/02/06 10:02:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2026/02/06 13:51:48 wiz Exp $
 bin/nettle-hash
 bin/nettle-lfib-stream
 bin/nettle-pbkdf2
@@ -27,6 +27,7 @@ include/nettle/curve25519.h
 include/nettle/curve448.h
 include/nettle/des.h
 include/nettle/drbg-ctr.h
+include/nettle/dsa-compat.h
 include/nettle/dsa.h
 include/nettle/eax.h
 include/nettle/ecc-curve.h
@@ -42,6 +43,7 @@ include/nettle/knuth-lfib.h
 include/nettle/macros.h
 include/nettle/md2.h
 include/nettle/md4.h
+include/nettle/md5-compat.h
 include/nettle/md5.h
 include/nettle/memops.h
 include/nettle/memxor.h
@@ -50,6 +52,7 @@ include/nettle/nettle-types.h
 include/nettle/nist-keywrap.h
 include/nettle/ocb.h
 include/nettle/pbkdf2.h
+include/nettle/pgp.h
 include/nettle/pkcs1.h
 include/nettle/poly1305.h
 include/nettle/pss-mgf1.h
@@ -60,12 +63,12 @@ include/nettle/rsa.h
 include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
+include/nettle/sha.h
 include/nettle/sha1.h
 include/nettle/sha2.h
 include/nettle/sha3.h
 include/nettle/siv-cmac.h
 include/nettle/siv-gcm.h
-include/nettle/slh-dsa.h
 include/nettle/sm3.h
 include/nettle/sm4.h
 include/nettle/streebog.h

Index: pkgsrc/security/nettle/buildlink3.mk
diff -u pkgsrc/security/nettle/buildlink3.mk:1.10 pkgsrc/security/nettle/buildlink3.mk:1.11
--- pkgsrc/security/nettle/buildlink3.mk:1.10   Fri Feb  6 10:04:11 2026
+++ pkgsrc/security/nettle/buildlink3.mk        Fri Feb  6 13:51:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2026/02/06 10:04:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2026/02/06 13:51:48 wiz Exp $
 
 BUILDLINK_TREE+=       nettle
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        nettle
 NETTLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nettle+= nettle>=2.4
-BUILDLINK_ABI_DEPENDS.nettle+= nettle>=4.0
+BUILDLINK_ABI_DEPENDS.nettle+= nettle>=3.6
 BUILDLINK_PKGSRCDIR.nettle?=   ../../security/nettle
 
 BUILDLINK_API_DEPENDS.gmp+=    gmp>=6.0

Index: pkgsrc/security/nettle/distinfo
diff -u pkgsrc/security/nettle/distinfo:1.32 pkgsrc/security/nettle/distinfo:1.33
--- pkgsrc/security/nettle/distinfo:1.32        Fri Feb  6 10:02:02 2026
+++ pkgsrc/security/nettle/distinfo     Fri Feb  6 13:51:48 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2026/02/06 10:02:02 wiz Exp $
+$NetBSD: distinfo,v 1.33 2026/02/06 13:51:48 wiz Exp $
 
-BLAKE2s (nettle-4.0.tar.gz) = ffef23783302e27718f7d9a279f936cfa826a8d8a06bca8c16a3cd56ed2fb8e3
-SHA512 (nettle-4.0.tar.gz) = 833303d94f5a67094011ad4dd931fffdb9adf679b4df241a544a08194a66e6e449398b704ba5b29d52c1c3b5ada6f6dc18b24d1adb3382a68470a11645bf13cd
-Size (nettle-4.0.tar.gz) = 2630735 bytes
-SHA1 (patch-Makefile.in) = 50b24e265e35b58228c897e8ea8381ea8ff6efc4
+BLAKE2s (nettle-3.10.2.tar.gz) = 872351d6d0f953d09e7af33e382583504ff62fb8db3661f9c8edf494576cab00
+SHA512 (nettle-3.10.2.tar.gz) = bf37ddd7dca8e78488da2a5286dcf16761d527d620572b42f2ad27bb8ee8c12999d92b0272e06f53766e7155a3f4a1ab7ad9c4b1c3caec47c031878b6b1772fb
+Size (nettle-3.10.2.tar.gz) = 2644644 bytes
+SHA1 (patch-Makefile.in) = ea2eed4a6f04d3cd83c1f6267230f9766eb48480
 SHA1 (patch-config.make.in) = 708fb3cac9c44825e0d231541cbecade2239c850
 SHA1 (patch-configure) = c05cec552acae0340fa017e433a2cc436a4e86a2
 SHA1 (patch-testsuite_Makefile.in) = 23cc958d5b4bc5c3822848ce0e4be5e7f13d2ffc

Index: pkgsrc/security/nettle/patches/patch-Makefile.in
diff -u pkgsrc/security/nettle/patches/patch-Makefile.in:1.12 pkgsrc/security/nettle/patches/patch-Makefile.in:1.13
--- pkgsrc/security/nettle/patches/patch-Makefile.in:1.12       Fri Feb  6 10:02:02 2026
+++ pkgsrc/security/nettle/patches/patch-Makefile.in    Fri Feb  6 13:51:49 2026
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.12 2026/02/06 10:02:02 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.13 2026/02/06 13:51:49 wiz Exp $
 
 Use LIBTOOL.
 
---- Makefile.in.orig   2026-02-05 19:18:44.000000000 +0000
+--- Makefile.in.orig   2023-05-14 15:03:43.000000000 +0000
 +++ Makefile.in
-@@ -27,7 +27,7 @@ EXTRA_CFLAGS = $(CCPIC)
- PRE_CPPFLAGS = -I. -I$(srcdir)
+@@ -26,7 +26,7 @@ include config.make
+ PRE_CPPFLAGS = -I.
  EXTRA_CFLAGS = $(CCPIC)
  
 -LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
 +LIBTARGETS = @IF_STATIC@ libnettle.la @IF_HOGWEED@ libhogweed.la
  SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
  
- gnulib_FILES = lib/getopt-core.h lib/getopt-ext.h \
-@@ -302,24 +302,24 @@ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
+ getopt_SOURCES = getopt.c getopt1.c
+@@ -285,24 +285,24 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ
  hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
               $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT)
  
@@ -48,7 +48,7 @@ Use LIBTOOL.
        && $(DEP_PROCESS)
  
  # Rules building shared libraries.
-@@ -510,7 +510,7 @@ install-static: $(LIBTARGETS)
+@@ -493,7 +493,7 @@ install-here: install-doc install-header
  install-static: $(LIBTARGETS)
        $(MKDIR_P) $(DESTDIR)$(libdir)
        for f in $(LIBTARGETS); do \