CVS commit: pkgsrc/x11/modular-xorg-server

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 24 10:12:27 UTC 2026

Modified Files:
        pkgsrc/x11/modular-xorg-server: distinfo
Added Files:
        pkgsrc/x11/modular-xorg-server/patches: patch-os_xsha1.c

Log Message:
modular-xorg-server: handle nettle 4 API change


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-server/patches/patch-os_xsha1.c

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

Modified files:

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.133 pkgsrc/x11/modular-xorg-server/distinfo:1.134
--- pkgsrc/x11/modular-xorg-server/distinfo:1.133       Wed Jun 18 20:48:11 2025
+++ pkgsrc/x11/modular-xorg-server/distinfo     Sun May 24 10:12:27 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2025/06/18 20:48:11 wiz Exp $
+$NetBSD: distinfo,v 1.134 2026/05/24 10:12:27 tnn Exp $
 
 BLAKE2s (xorg-server-21.1.18.tar.xz) = bb95936718e7c554fd77e033a00f9b6a3c55a17793d0fd627d5c222a99d4e710
 SHA512 (xorg-server-21.1.18.tar.xz) = 839ce759fc0e5405599c4cff0acf381f278d22b465b9fb9e335b5fd1c63f6d546788e4e869854026eb4b1e1a77a83b60d6fef472cf8534d45630f31b587a50dd
@@ -19,3 +19,4 @@ SHA1 (patch-hw_xfree86_os-support_solari
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 SHA1 (patch-os_backtrace.c) = 8cf93febb737dd850706d140b467b73f61ecd3ad
+SHA1 (patch-os_xsha1.c) = 2d33d8797056f3e77f6afa19f68bfe9a5dd3a315

Added files:

Index: pkgsrc/x11/modular-xorg-server/patches/patch-os_xsha1.c
diff -u /dev/null pkgsrc/x11/modular-xorg-server/patches/patch-os_xsha1.c:1.1
--- /dev/null   Sun May 24 10:12:27 2026
+++ pkgsrc/x11/modular-xorg-server/patches/patch-os_xsha1.c     Sun May 24 10:12:27 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-os_xsha1.c,v 1.1 2026/05/24 10:12:27 tnn Exp $
+
+- handle nettle 4 API change
+
+--- os/xsha1.c.orig    2026-05-24 09:00:16.266998201 +0000
++++ os/xsha1.c
+@@ -152,7 +152,7 @@ x_sha1_final(void *ctx, unsigned char re
+ 
+ #elif defined(HAVE_SHA1_IN_LIBNETTLE)   /* Use libnettle for SHA1 */
+ 
+-#include <nettle/sha.h>
++#include <nettle/sha1.h>
+ 
+ void *
+ x_sha1_init(void)
+@@ -175,7 +175,7 @@ x_sha1_update(void *ctx, void *data, int
+ int
+ x_sha1_final(void *ctx, unsigned char result[20])
+ {
+-    sha1_digest(ctx, 20, result);
++    sha1_digest(ctx, result);
+     free(ctx);
+     return 1;
+ }