pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/munge
Module Name: pkgsrc
Committed By: bacon
Date: Sat May 18 22:31:06 UTC 2024
Modified Files:
pkgsrc/security/munge: Makefile PLIST PLIST.Darwin PLIST.FreeBSD
PLIST.Linux buildlink3.mk distinfo
pkgsrc/security/munge/files: munge.sh
pkgsrc/security/munge/patches: patch-src_etc_Makefile.in
Added Files:
pkgsrc/security/munge/patches: patch-configure
patch-src_libmissing_strlcpy.c patch-src_libmissing_strlcpy.h
patch-src_munged_munged.c patch-src_munged_path.c
Log Message:
security/munge: Temporary hack to fix build on Darwin
Bundled libmissing contains strlcpy() and other functions that
are part of libc on Darwin, so the library is empty. macOS "ar"
requires at least one object file. Renamed strlcpy() to
__munge_strlcpy() so libmissing would contain something.
Working with upstream on a permanent fix.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/munge/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/munge/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/munge/PLIST.Darwin
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/munge/PLIST.FreeBSD
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/munge/PLIST.Linux
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/munge/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/munge/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/munge/files/munge.sh
cvs rdiff -u -r0 -r1.3 pkgsrc/security/munge/patches/patch-configure
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.c \
pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.h \
pkgsrc/security/munge/patches/patch-src_munged_munged.c \
pkgsrc/security/munge/patches/patch-src_munged_path.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/munge/Makefile
diff -u pkgsrc/security/munge/Makefile:1.29 pkgsrc/security/munge/Makefile:1.30
--- pkgsrc/security/munge/Makefile:1.29 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/Makefile Sat May 18 22:31:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/05/14 21:00:27 bacon Exp $
+# $NetBSD: Makefile,v 1.30 2024/05/18 22:31:05 bacon Exp $
DISTNAME= munge-0.5.16
CATEGORIES= security
@@ -15,6 +15,8 @@ USE_TOOLS+= perl pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+CONFIGURE_ARGS+= --disable-silent-rules
+
.include "../../mk/bsd.prefs.mk"
MUNGE_DIR?= ${PREFIX}/var/lib/munge
Index: pkgsrc/security/munge/PLIST
diff -u pkgsrc/security/munge/PLIST:1.8 pkgsrc/security/munge/PLIST:1.9
--- pkgsrc/security/munge/PLIST:1.8 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/PLIST Sat May 18 22:31:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2024/05/14 21:00:27 bacon Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/05/18 22:31:05 bacon Exp $
bin/munge
bin/remunge
bin/unmunge
Index: pkgsrc/security/munge/PLIST.Darwin
diff -u pkgsrc/security/munge/PLIST.Darwin:1.1 pkgsrc/security/munge/PLIST.Darwin:1.2
--- pkgsrc/security/munge/PLIST.Darwin:1.1 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/PLIST.Darwin Sat May 18 22:31:05 2024
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2024/05/14 21:00:27 bacon Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2024/05/18 22:31:05 bacon Exp $
share/munge/Launchd/org.pkgsrc.munged.plist
Index: pkgsrc/security/munge/PLIST.FreeBSD
diff -u pkgsrc/security/munge/PLIST.FreeBSD:1.7 pkgsrc/security/munge/PLIST.FreeBSD:1.8
--- pkgsrc/security/munge/PLIST.FreeBSD:1.7 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/PLIST.FreeBSD Sat May 18 22:31:05 2024
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.7 2024/05/14 21:00:27 bacon Exp $
+@comment $NetBSD: PLIST.FreeBSD,v 1.8 2024/05/18 22:31:05 bacon Exp $
share/examples/munge/default/munge
share/examples/munge/init.d/munge
Index: pkgsrc/security/munge/PLIST.Linux
diff -u pkgsrc/security/munge/PLIST.Linux:1.6 pkgsrc/security/munge/PLIST.Linux:1.7
--- pkgsrc/security/munge/PLIST.Linux:1.6 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/PLIST.Linux Sat May 18 22:31:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.6 2024/05/14 21:00:27 bacon Exp $
+@comment $NetBSD: PLIST.Linux,v 1.7 2024/05/18 22:31:05 bacon Exp $
lib/systemd/system/munge.service
share/examples/munge/logrotate.conf
share/examples/munge/systemd.sysconfig
Index: pkgsrc/security/munge/buildlink3.mk
diff -u pkgsrc/security/munge/buildlink3.mk:1.3 pkgsrc/security/munge/buildlink3.mk:1.4
--- pkgsrc/security/munge/buildlink3.mk:1.3 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/buildlink3.mk Sat May 18 22:31:05 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2024/05/14 21:00:27 bacon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2024/05/18 22:31:05 bacon Exp $
BUILDLINK_TREE+= munge
.if !defined(MUNGE_BUILDLINK3_MK)
MUNGE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.munge+= munge>=0.5.16
+BUILDLINK_API_DEPENDS.munge+= munge>=0.5.10
BUILDLINK_PKGSRCDIR.munge?= ../../security/munge
.endif # MUNGE_BUILDLINK3_MK
Index: pkgsrc/security/munge/distinfo
diff -u pkgsrc/security/munge/distinfo:1.9 pkgsrc/security/munge/distinfo:1.10
--- pkgsrc/security/munge/distinfo:1.9 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/distinfo Sat May 18 22:31:05 2024
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.9 2024/05/14 21:00:27 bacon Exp $
+$NetBSD: distinfo,v 1.10 2024/05/18 22:31:05 bacon Exp $
BLAKE2s (munge-0.5.16.tar.xz) = c1720fd24852ad31a8aa6d83a24c5935519d0d7a682abdf2fdb535673d6c5885
SHA512 (munge-0.5.16.tar.xz) = b808deede8e71c96719526182c5fc16250dc09d2129dc9d5cbcb54c5827723e1dbbd47b8c912373328f5f3b8971c75200abb2def5d35ebc896bff1984ab8c305
Size (munge-0.5.16.tar.xz) = 448120 bytes
+SHA1 (patch-_src_munged_path.c) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-configure) = 435da9c3f3400cecd3a370d74c1d662233984a10
SHA1 (patch-src_etc_Makefile.in) = fbf4e59810c97e4c70353ec435867bebf2bd39bd
+SHA1 (patch-src_libmissing_strlcpy.c) = 1eec6bd0c20d28f9bd3450d27fb76dd25e0c977d
+SHA1 (patch-src_libmissing_strlcpy.h) = a53d4994fb26722fd3cc6de553e522cf5bc96bb5
+SHA1 (patch-src_munged_munged.c) = aa0d4b09db38c1d160a9ecbc4826b4696e79882d
+SHA1 (patch-src_munged_path.c) = 00b020e1b8d53b832a5a6d9d85612c0a7aac5347
Index: pkgsrc/security/munge/files/munge.sh
diff -u pkgsrc/security/munge/files/munge.sh:1.2 pkgsrc/security/munge/files/munge.sh:1.3
--- pkgsrc/security/munge/files/munge.sh:1.2 Tue May 14 21:00:27 2024
+++ pkgsrc/security/munge/files/munge.sh Sat May 18 22:31:06 2024
@@ -1,5 +1,5 @@
#!@RCD_SCRIPTS_SHELL@
-# $NetBSD: munge.sh,v 1.2 2024/05/14 21:00:27 bacon Exp $
+# $NetBSD: munge.sh,v 1.3 2024/05/18 22:31:06 bacon Exp $
#
# PROVIDE: munge
# REQUIRE: DAEMON
Index: pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
diff -u pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.6 pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.7
--- pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.6 Tue May 14 21:00:28 2024
+++ pkgsrc/security/munge/patches/patch-src_etc_Makefile.in Sat May 18 22:31:06 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_etc_Makefile.in,v 1.6 2024/05/14 21:00:28 bacon Exp $
+$NetBSD: patch-src_etc_Makefile.in,v 1.7 2024/05/18 22:31:06 bacon Exp $
# Conform to pkgsrc
Added files:
Index: pkgsrc/security/munge/patches/patch-configure
diff -u /dev/null pkgsrc/security/munge/patches/patch-configure:1.3
--- /dev/null Sat May 18 22:31:06 2024
+++ pkgsrc/security/munge/patches/patch-configure Sat May 18 22:31:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.3 2024/05/18 22:31:06 bacon Exp $
+
+# Use local strlcpy() without collision
+
+--- configure.orig 2024-05-18 22:10:14.716509177 +0000
++++ configure
+@@ -16348,7 +16348,7 @@ else $as_nop
+ esac
+
+ fi
+-ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
++ac_fn_c_check_func "$LINENO" "__munge_strlcpy" "ac_cv_func_strlcpy"
+ if test "x$ac_cv_func_strlcpy" = xyes
+ then :
+ printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
Index: pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.c
diff -u /dev/null pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.c:1.1
--- /dev/null Sat May 18 22:31:06 2024
+++ pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.c Sat May 18 22:31:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libmissing_strlcpy.c,v 1.1 2024/05/18 22:31:06 bacon Exp $
+
+# Use local strlcpy() without collision
+
+--- src/libmissing/strlcpy.c.orig 2024-05-18 22:08:28.175772831 +0000
++++ src/libmissing/strlcpy.c
+@@ -29,7 +29,7 @@ static char *rcsid = "$OpenBSD: strlcpy.
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+ size_t
+-strlcpy(char *dst, const char *src, size_t siz)
++__munge_strlcpy(char *dst, const char *src, size_t siz)
+ {
+ register char *d = dst;
+ register const char *s = src;
Index: pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.h
diff -u /dev/null pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.h:1.1
--- /dev/null Sat May 18 22:31:06 2024
+++ pkgsrc/security/munge/patches/patch-src_libmissing_strlcpy.h Sat May 18 22:31:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libmissing_strlcpy.h,v 1.1 2024/05/18 22:31:06 bacon Exp $
+
+# Use local strlcpy() without collision
+
+--- src/libmissing/strlcpy.h.orig 2024-05-18 22:09:11.468056157 +0000
++++ src/libmissing/strlcpy.h
+@@ -3,7 +3,7 @@
+ #endif /* HAVE_CONFIG_H */
+
+ #if !HAVE_STRLCPY
+-size_t strlcpy(char *dst, const char *src, size_t siz);
++size_t __munge_strlcpy(char *dst, const char *src, size_t siz);
+ /*
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
Index: pkgsrc/security/munge/patches/patch-src_munged_munged.c
diff -u /dev/null pkgsrc/security/munge/patches/patch-src_munged_munged.c:1.1
--- /dev/null Sat May 18 22:31:06 2024
+++ pkgsrc/security/munge/patches/patch-src_munged_munged.c Sat May 18 22:31:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_munged_munged.c,v 1.1 2024/05/18 22:31:06 bacon Exp $
+
+# Use local strlcpy() without collision
+
+--- src/munged/munged.c.orig 2024-05-18 22:06:54.452854855 +0000
++++ src/munged/munged.c
+@@ -653,7 +653,7 @@ sock_create (conf_t conf)
+ }
+ memset (&addr, 0, sizeof (addr));
+ addr.sun_family = AF_UNIX;
+- n = strlcpy (addr.sun_path, conf->socket_name, sizeof (addr.sun_path));
++ n = __munge_strlcpy (addr.sun_path, conf->socket_name, sizeof (addr.sun_path));
+ if (n >= sizeof (addr.sun_path)) {
+ log_err (EMUNGE_SNAFU, LOG_ERR,
+ "Exceeded maximum length of %lu bytes for socket pathname",
Index: pkgsrc/security/munge/patches/patch-src_munged_path.c
diff -u /dev/null pkgsrc/security/munge/patches/patch-src_munged_path.c:1.1
--- /dev/null Sat May 18 22:31:06 2024
+++ pkgsrc/security/munge/patches/patch-src_munged_path.c Sat May 18 22:31:06 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_munged_path.c,v 1.1 2024/05/18 22:31:06 bacon Exp $
+
+# Use local strlcpy() without collision
+
+--- src/munged/path.c.orig 2024-05-18 21:58:24.907978477 +0000
++++ src/munged/path.c
+@@ -81,7 +81,7 @@ path_canonicalize (const char *src, char
+ return (-1);
+ }
+ if ((dst != NULL) && (dstlen > 0)) {
+- n = strlcpy (dst, buf, dstlen);
++ n = __munge_strlcpy (dst, buf, dstlen);
+ }
+ return (n);
+ }
+@@ -97,7 +97,7 @@ path_dirname (const char *src, char *dst
+ errno = EINVAL;
+ return (-1);
+ }
+- if (strlcpy (dst, src, dstlen) >= dstlen) {
++ if (__munge_strlcpy (dst, src, dstlen) >= dstlen) {
+ errno = ENAMETOOLONG;
+ return (-1);
+ }
Home |
Main Index |
Thread Index |
Old Index