CVS commit: pkgsrc/security/heimdal
"Adam Ciarcinski" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: adam
Date: Mon Aug 10 14:05:15 UTC 2026
Modified Files:
pkgsrc/security/heimdal: distinfo
Added Files:
pkgsrc/security/heimdal/patches: patch-lib_roken_write__pid.c
Log Message:
heimdal: fix building on NetBSD-current/12
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/security/heimdal/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/heimdal/patches/patch-lib_roken_write__pid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 2.6 KB)
Modified files:
Index: pkgsrc/security/heimdal/distinfo
diff -u pkgsrc/security/heimdal/distinfo:1.58 pkgsrc/security/heimdal/distinfo:1.59
--- pkgsrc/security/heimdal/distinfo:1.58 Wed Sep 18 14:50:12 2024
+++ pkgsrc/security/heimdal/distinfo Mon Aug 10 14:05:14 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2024/09/18 14:50:12 hauke Exp $
+$NetBSD: distinfo,v 1.59 2026/08/10 14:05:14 adam Exp $
BLAKE2s (heimdal-7.8.0.tar.gz) = 3f2654141605a1f54611c887ec8a7f55e45b00696983207d5779ad830e485cb8
SHA512 (heimdal-7.8.0.tar.gz) = 0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e
@@ -6,3 +6,4 @@ Size (heimdal-7.8.0.tar.gz) = 10024936 b
SHA1 (patch-lib_gssapi_krb5_arcfour.c) = 7d70da6a8dfffd7f71eae70f1a6fa6fc18d0df3c
SHA1 (patch-lib_krb5_store-int.c) = ba539b1cce3ac5a1e7e436dfcdcf632aa61e41e3
SHA1 (patch-lib_roken_version-script.map) = 4b9ae266222d732459ee44f4604b0276f54d892f
+SHA1 (patch-lib_roken_write__pid.c) = 2abd3fb3d10cb92b04401ade70a607cc90050472
Added files:
Index: pkgsrc/security/heimdal/patches/patch-lib_roken_write__pid.c
diff -u /dev/null pkgsrc/security/heimdal/patches/patch-lib_roken_write__pid.c:1.1
--- /dev/null Mon Aug 10 14:05:15 2026
+++ pkgsrc/security/heimdal/patches/patch-lib_roken_write__pid.c Mon Aug 10 14:05:14 2026
@@ -0,0 +1,46 @@
+$NetBSD: patch-lib_roken_write__pid.c,v 1.1 2026/08/10 14:05:14 adam Exp $
+
+Fix conflict with pidfile_path from NetBSD 12.
+
+--- lib/roken/write_pid.c.orig 2026-08-10 13:59:32.827558106 +0000
++++ lib/roken/write_pid.c
+@@ -80,14 +80,14 @@ pid_file_delete(char **filename)
+ }
+ }
+
+-static char *pidfile_path;
++static char *roken_pidfile_path;
+ static pid_t pidfile_pid;
+
+ static void
+ pidfile_cleanup(void)
+ {
+- if (pidfile_path != NULL && pidfile_pid == getpid())
+- pid_file_delete(&pidfile_path);
++ if (roken_pidfile_path != NULL && pidfile_pid == getpid())
++ pid_file_delete(&roken_pidfile_path);
+ }
+
+ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
+@@ -102,17 +102,17 @@ rk_pidfile(const char *bname)
+ pidfile(bname);
+ #endif
+
+- if (pidfile_path != NULL)
++ if (roken_pidfile_path != NULL)
+ return;
+ if (bname == NULL)
+ bname = getprogname();
+- pidfile_path = pid_file_write(bname);
++ roken_pidfile_path = pid_file_write(bname);
+ pidfile_pid = getpid();
+ #if defined(HAVE_ATEXIT)
+- if (pidfile_path != NULL)
++ if (roken_pidfile_path != NULL)
+ atexit(pidfile_cleanup);
+ #elif defined(HAVE_ON_EXIT)
+- if (pidfile_path != NULL)
++ if (roken_pidfile_path != NULL)
+ on_exit(pidfile_cleanup);
+ #endif
+ }