CVS commit: pkgsrc/net/wget

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jun 10 07:18:46 UTC 2026

Modified Files:
        pkgsrc/net/wget: Makefile distinfo
Added Files:
        pkgsrc/net/wget/patches: patch-src_http-ntlm.c

Log Message:
wget: fix build with nettle-4


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 pkgsrc/net/wget/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/net/wget/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/wget/patches/patch-src_http-ntlm.c

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

Modified files:

Index: pkgsrc/net/wget/Makefile
diff -u pkgsrc/net/wget/Makefile:1.184 pkgsrc/net/wget/Makefile:1.185
--- pkgsrc/net/wget/Makefile:1.184      Thu May 14 16:41:52 2026
+++ pkgsrc/net/wget/Makefile    Wed Jun 10 07:18:45 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.184 2026/05/14 16:41:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.185 2026/06/10 07:18:45 markd Exp $
 
 DISTNAME=      wget-1.25.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GNU:=wget/}
 EXTRACT_SUFX=  .tar.lz

Index: pkgsrc/net/wget/distinfo
diff -u pkgsrc/net/wget/distinfo:1.73 pkgsrc/net/wget/distinfo:1.74
--- pkgsrc/net/wget/distinfo:1.73       Tue Oct  7 11:18:32 2025
+++ pkgsrc/net/wget/distinfo    Wed Jun 10 07:18:45 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.73 2025/10/07 11:18:32 wiz Exp $
+$NetBSD: distinfo,v 1.74 2026/06/10 07:18:45 markd Exp $
 
 BLAKE2s (wget-1.25.0.tar.lz) = 054e76c6b3b56fc3bb2c36fe75c8405792a1c748e55863172dcfb3e8216bc92c
 SHA512 (wget-1.25.0.tar.lz) = 79403f594636e5d703817ceec59e5155940cd4734746ef793ef3bdabd100d0014a44c5e24f705656cf1e0762d87003fa1dc3e1b5605fae392bc9d7f121d90bae
 Size (wget-1.25.0.tar.lz) = 2582072 bytes
 SHA1 (patch-lib_utimens.h) = 8c1c1d5eb684570fe87a42d94fe11f6e332739e1
+SHA1 (patch-src_http-ntlm.c) = c28fb690f53e947ca9a53afb72749f4e1304062c

Added files:

Index: pkgsrc/net/wget/patches/patch-src_http-ntlm.c
diff -u /dev/null pkgsrc/net/wget/patches/patch-src_http-ntlm.c:1.1
--- /dev/null   Wed Jun 10 07:18:46 2026
+++ pkgsrc/net/wget/patches/patch-src_http-ntlm.c       Wed Jun 10 07:18:46 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_http-ntlm.c,v 1.1 2026/06/10 07:18:46 markd Exp $
+
+Build with nettle-4
+
+--- src/http-ntlm.c.orig       2024-03-11 22:59:02.000000000 +0000
++++ src/http-ntlm.c
+@@ -48,6 +48,7 @@ as that of the covered work.  */
+ #ifdef HAVE_NETTLE
+ # include <nettle/md4.h>
+ # include <nettle/des.h>
++# include <nettle/version.h>
+ #else
+ # include <openssl/des.h>
+ # include <openssl/md4.h>
+@@ -322,7 +323,11 @@ mkhash(const char *password,
+ #ifdef HAVE_NETTLE
+     nettle_md4_init(&MD4);
+     nettle_md4_update(&MD4, (unsigned) (2 * len), pw4);
++#if NETTLE_VERSION_MAJOR > 3
++    nettle_md4_digest(&MD4, ntbuffer);
++#else 
+     nettle_md4_digest(&MD4, MD4_DIGEST_SIZE, ntbuffer);
++#endif 
+ #else
+     /* create NT hashed password */
+     MD4_Init(&MD4);