CVS commit: pkgsrc/net/ocamlnet

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jun 13 06:15:19 UTC 2026

Modified Files:
        pkgsrc/net/ocamlnet: Makefile distinfo
Added Files:
        pkgsrc/net/ocamlnet/patches: patch-src_nettls-gnutls_nettle.c

Log Message:
ocamlnet: fix build with nettle 4; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/ocamlnet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/ocamlnet/patches/patch-src_nettls-gnutls_nettle.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/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.114 pkgsrc/net/ocamlnet/Makefile:1.115
--- pkgsrc/net/ocamlnet/Makefile:1.114  Thu May 14 16:41:48 2026
+++ pkgsrc/net/ocamlnet/Makefile        Sat Jun 13 06:15:19 2026
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.114 2026/05/14 16:41:48 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.115 2026/06/13 06:15:19 adam Exp $
 
-DISTNAME=              ocamlnet-4.1.9
-PKGREVISION=           29
-CATEGORIES=            net
-MASTER_SITES=          http://download.camlcity.org/download/
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://projects.camlcity.org/projects/ocamlnet.html
-COMMENT=               Library focusing on application-level network protocols (OCaml)
-LICENSE=               zlib AND gnu-gpl-v2
+DISTNAME=      ocamlnet-4.1.9
+PKGREVISION=   30
+CATEGORIES=    net
+MASTER_SITES=  http://download.camlcity.org/download/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://projects.camlcity.org/projects/ocamlnet.html
+COMMENT=       Library focusing on application-level network protocols (OCaml)
+LICENSE=       zlib AND gnu-gpl-v2
 
 MAKE_JOBS_SAFE=        no
 
@@ -38,6 +37,6 @@ OCAML_FINDLIB_DIRS+=  rpc-xti
 
 .include "options.mk"
 
-.include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../archivers/ocaml-zip/buildlink3.mk"
+.include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.32 pkgsrc/net/ocamlnet/distinfo:1.33
--- pkgsrc/net/ocamlnet/distinfo:1.32   Tue May  3 09:40:28 2022
+++ pkgsrc/net/ocamlnet/distinfo        Sat Jun 13 06:15:19 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2022/05/03 09:40:28 jaapb Exp $
+$NetBSD: distinfo,v 1.33 2026/06/13 06:15:19 adam Exp $
 
 BLAKE2s (ocamlnet-4.1.9.tar.gz) = 861dd6efd600d3d9ab18437096309d060ab52af4edc95bc6aa742576324ac7f8
 SHA512 (ocamlnet-4.1.9.tar.gz) = a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 Size (ocamlnet-4.1.9.tar.gz) = 4628747 bytes
 SHA1 (patch-src_netsys_netsys__c.c) = 2fe5c7db2e76a894b8fde36f381caf46661fa73b
+SHA1 (patch-src_nettls-gnutls_nettle.c) = 317a913fe572150236c331a9e385562724105ab3

Added files:

Index: pkgsrc/net/ocamlnet/patches/patch-src_nettls-gnutls_nettle.c
diff -u /dev/null pkgsrc/net/ocamlnet/patches/patch-src_nettls-gnutls_nettle.c:1.1
--- /dev/null   Sat Jun 13 06:15:19 2026
+++ pkgsrc/net/ocamlnet/patches/patch-src_nettls-gnutls_nettle.c        Sat Jun 13 06:15:19 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_nettls-gnutls_nettle.c,v 1.1 2026/06/13 06:15:19 adam Exp $
+
+Fix for Nettle 4.0.
+
+--- src/nettls-gnutls/nettle.c.orig    2026-06-13 06:09:05.768759232 +0000
++++ src/nettls-gnutls/nettle.c
+@@ -292,7 +292,7 @@ static net_nettle_gcm_aes_ctx_t net_nettle_gcm_aes_ini
+ 
+ static net_nettle_gcm_aes_ctx_t net_nettle_gcm_aes_init(void) {
+ #ifdef HAVE_NETTLE_GCM_H
+-    return stat_alloc(sizeof(struct gcm_aes_ctx));
++    return stat_alloc(sizeof(struct gcm_aes256_ctx));
+ #else
+     return NULL;
+ #endif
+@@ -341,7 +341,7 @@ static void net_nettle_hash_digest(net_nettle_hash_t h
+                                    net_nettle_hash_ctx_t ctx,
+                                    unsigned int length,
+                                    uint8_t *dst) {
+-    hash->digest(ctx, length, dst);
++    hash->digest(ctx, dst);
+ }
+ 
+ #ifndef HAVE_FUN_nettle_get_hashes