Tue May 14 21:00:28 2024 UTC (33d)
security/munge: Update to 0.5.16

Major package improvements:

- Install init scripts for Linux, macOS, and NetBSD
- Create runtime directories with proper ownership and permissions
- Support use under non-priveleged pkgsrc trees
- Run daemon as munge rather than root, as recommended by upstream
- Catch up from several releases behind

Changes: https://github.com/dun/munge/releases


(bacon)
diff -r1.28 -r1.29 pkgsrc/security/munge/Makefile
diff -r1.7 -r1.8 pkgsrc/security/munge/PLIST
diff -r0 -r1.1 pkgsrc/security/munge/PLIST.Darwin
diff -r0 -r1.7 pkgsrc/security/munge/PLIST.FreeBSD
diff -r0 -r1.6 pkgsrc/security/munge/PLIST.Linux
diff -r1.2 -r1.3 pkgsrc/security/munge/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/security/munge/distinfo
diff -r1.1 -r1.2 pkgsrc/security/munge/files/munge.sh
diff -r0 -r1.1 pkgsrc/security/munge/files/org.pkgsrc.munged.plist
diff -r1.5 -r1.6 pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
cvs diff -r1.28 -r1.29 pkgsrc/security/munge/Makefile (expand / switch to unified diff)

--- pkgsrc/security/munge/Makefile 2023/10/24 22:10:52 1.28
+++ pkgsrc/security/munge/Makefile 2024/05/14 21:00:27 1.29
@@ -1,42 +1,71 @@ @@ -1,42 +1,71 @@
1# $NetBSD: Makefile,v 1.28 2023/10/24 22:10:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2024/05/14 21:00:27 bacon Exp $
2 2
3DISTNAME= munge-0.5.13 3DISTNAME= munge-0.5.16
4PKGREVISION= 8 
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_GITHUB:=dun/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=dun/}
7GITHUB_RELEASE= ${DISTNAME} 6GITHUB_RELEASE= ${DISTNAME}
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= bacon@NetBSD.org
11HOMEPAGE= https://dun.github.io/munge/ 10HOMEPAGE= https://dun.github.io/munge/
12COMMENT= Authentication service for creating and validating credentials 11COMMENT= Authentication service for creating and validating credentials
13LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
14 13
15USE_TOOLS+= perl pkg-config 14USE_TOOLS+= perl pkg-config
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18CONFIGURE_ARGS+= --localstatedir=${VARBASE} 
19INSTALLATION_DIRS+= lib/pkgconfig 
20 17
21OWN_DIRS= ${VARBASE}/lib/munge 18.include "../../mk/bsd.prefs.mk"
22OWN_DIRS+= ${VARBASE}/log/munge 19
23OWN_DIRS+= ${VARBASE}/run/munge 20MUNGE_DIR?= ${PREFIX}/var/lib/munge
24OWN_DIRS+= etc/munge 21MUNGE_LOG_DIR?= ${PREFIX}/var/log/munge
25 22MUNGE_RUN_DIR?= ${PREFIX}/var/run/munge
26BUILD_DEFS+= VARBASE 23MUNGE_ETC_DIR?= ${PREFIX}/etc/munge
27 24MUNGE_USER= munge
28RCD_SCRIPTS+= munge 25MUNGE_GROUP= ${MUNGE_USER}
29 26
30SUBST_CLASSES+= init 27PKG_GROUPS+= ${MUNGE_GROUP}
31SUBST_STAGE.init= post-build 28PKG_USERS+= ${MUNGE_USER}:${MUNGE_GROUP}
32SUBST_FILES.init= ${WRKSRC}/src/etc/munge.init 29PKG_GECOS.munge= Munge user
33SUBST_FILES.init+= ${WRKSRC}/src/etc/munge.sysconfig 30PKG_HOME.munge= ${MUNGE_DIR}
34SUBST_SED.init= -e 's|USER="munge"|USER="daemon"|g' 31
35SUBST_SED.init+= -e 's|GROUP="munge"|GROUP="daemon"|g' 32OWN_DIRS_PERMS+= ${MUNGE_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
 33OWN_DIRS_PERMS+= ${MUNGE_LOG_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
 34OWN_DIRS_PERMS+= ${MUNGE_RUN_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0755
 35OWN_DIRS_PERMS+= ${MUNGE_ETC_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
 36
 37RCD_SCRIPTS= munge
 38PKG_RCD_SCRIPTS= yes
 39
 40.if ${OPSYS} == Linux
 41EGDIR= ${PREFIX}/share/examples/munge
 42PKG_SYSCONFSUBDIR= sysconfig
 43CONF_FILES= ${EGDIR}/systemd.sysconfig ${PKG_SYSCONFDIR}/munge
 44CONF_FILES+= ${EGDIR}/logrotate.conf ${PREFIX}/etc/logrotate.d/munge
 45
 46INSTALLATION_DIRS+= ${EGDIR} etc/logrotate.d
 47CONFIGURE_ARGS+= --with-sysconfigdir=${PKG_SYSCONFDIR}
 48AUTO_MKDIRS= yes
 49
 50post-install:
 51 ${MV} ${DESTDIR}${PREFIX}/etc/logrotate.d/munge \
 52 ${DESTDIR}${PREFIX}/share/examples/munge/logrotate.conf
 53 ${MV} ${DESTDIR}${PREFIX}/etc/sysconfig/munge \
 54 ${DESTDIR}${PREFIX}/share/examples/munge/systemd.sysconfig
 55.endif
 56
 57.if ${OPSYS} == Darwin
 58# Should not be necessary with AUTO_MKDIRS enabled, but it is
 59INSTALLATION_DIRS+= share/munge/Launchd
 60post-install:
 61 # ${MKDIR} ${DESTDIR}${PREFIX}/share/munge/Launchd
 62 ${INSTALL_DATA} ${FILESDIR}/*.plist \
 63 ${DESTDIR}${PREFIX}/share/munge/Launchd
 64.endif
36 65
37.include "../../archivers/bzip2/buildlink3.mk" 66.include "../../archivers/bzip2/buildlink3.mk"
38.include "../../devel/zlib/buildlink3.mk" 67.include "../../devel/zlib/buildlink3.mk"
39.include "../../security/libgcrypt/buildlink3.mk" 68.include "../../security/libgcrypt/buildlink3.mk"
40.include "../../security/openssl/buildlink3.mk" 69.include "../../security/openssl/buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 70.include "../../mk/pthread.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/security/munge/PLIST (expand / switch to unified diff)

--- pkgsrc/security/munge/PLIST 2022/04/23 22:50:50 1.7
+++ pkgsrc/security/munge/PLIST 2024/05/14 21:00:27 1.8
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1@comment $NetBSD: PLIST,v 1.7 2022/04/23 22:50:50 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.8 2024/05/14 21:00:27 bacon Exp $
2bin/munge 2bin/munge
3bin/remunge 3bin/remunge
4bin/unmunge 4bin/unmunge
5include/munge.h 5include/munge.h
6lib/libmunge.la 6lib/libmunge.la
7lib/pkgconfig/munge.pc 7lib/pkgconfig/munge.pc
8lib/systemd/system/munge.service 
9lib/tmpfiles.d/munge.conf 
10man/man1/munge.1 8man/man1/munge.1
11man/man1/remunge.1 9man/man1/remunge.1
12man/man1/unmunge.1 10man/man1/unmunge.1
13man/man3/munge.3 11man/man3/munge.3
14man/man3/munge_ctx.3 12man/man3/munge_ctx.3
15man/man3/munge_ctx_copy.3 13man/man3/munge_ctx_copy.3
16man/man3/munge_ctx_create.3 14man/man3/munge_ctx_create.3
17man/man3/munge_ctx_destroy.3 15man/man3/munge_ctx_destroy.3
18man/man3/munge_ctx_get.3 16man/man3/munge_ctx_get.3
19man/man3/munge_ctx_set.3 17man/man3/munge_ctx_set.3
20man/man3/munge_ctx_strerror.3 18man/man3/munge_ctx_strerror.3
21man/man3/munge_decode.3 19man/man3/munge_decode.3
22man/man3/munge_encode.3 20man/man3/munge_encode.3
23man/man3/munge_enum.3 21man/man3/munge_enum.3
24man/man3/munge_enum_int_to_str.3 22man/man3/munge_enum_int_to_str.3
25man/man3/munge_enum_is_valid.3 23man/man3/munge_enum_is_valid.3
26man/man3/munge_enum_str_to_int.3 24man/man3/munge_enum_str_to_int.3
27man/man3/munge_strerror.3 25man/man3/munge_strerror.3
28man/man7/munge.7 26man/man7/munge.7
29man/man8/munged.8 27man/man8/munged.8
 28man/man8/mungekey.8
30sbin/munged 29sbin/munged
31share/examples/munge/default/munge 30sbin/mungekey
32share/examples/munge/init.d/munge 31@pkgdir etc/logrotate.d
33@pkgdir var/run/munge 32@pkgdir var/run/munge
34@pkgdir var/log/munge 33@pkgdir var/log/munge
35@pkgdir var/lib/munge 34@pkgdir var/lib/munge
 35@pkgdir etc/munge
File Added: pkgsrc/security/munge/PLIST.Darwin
@comment $NetBSD: PLIST.Darwin,v 1.1 2024/05/14 21:00:27 bacon Exp $
share/munge/Launchd/org.pkgsrc.munged.plist
File Added: pkgsrc/security/munge/PLIST.FreeBSD
@comment $NetBSD: PLIST.FreeBSD,v 1.7 2024/05/14 21:00:27 bacon Exp $
share/examples/munge/default/munge
share/examples/munge/init.d/munge
File Added: pkgsrc/security/munge/PLIST.Linux
@comment $NetBSD: PLIST.Linux,v 1.6 2024/05/14 21:00:27 bacon Exp $
lib/systemd/system/munge.service
share/examples/munge/logrotate.conf
share/examples/munge/systemd.sysconfig
cvs diff -r1.2 -r1.3 pkgsrc/security/munge/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/munge/buildlink3.mk 2022/06/28 11:35:38 1.2
+++ pkgsrc/security/munge/buildlink3.mk 2024/05/14 21:00:27 1.3
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.2 2022/06/28 11:35:38 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2024/05/14 21:00:27 bacon Exp $
2 2
3BUILDLINK_TREE+= munge 3BUILDLINK_TREE+= munge
4 4
5.if !defined(MUNGE_BUILDLINK3_MK) 5.if !defined(MUNGE_BUILDLINK3_MK)
6MUNGE_BUILDLINK3_MK:= 6MUNGE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.munge+= munge>=0.5.10 8BUILDLINK_API_DEPENDS.munge+= munge>=0.5.16
9BUILDLINK_ABI_DEPENDS.munge?= munge>=0.5.13nb7 
10BUILDLINK_PKGSRCDIR.munge?= ../../security/munge 9BUILDLINK_PKGSRCDIR.munge?= ../../security/munge
11 10
12.endif # MUNGE_BUILDLINK3_MK 11.endif # MUNGE_BUILDLINK3_MK
13 12
14BUILDLINK_TREE+= -munge 13BUILDLINK_TREE+= -munge
cvs diff -r1.8 -r1.9 pkgsrc/security/munge/distinfo (expand / switch to unified diff)

--- pkgsrc/security/munge/distinfo 2021/10/26 11:17:20 1.8
+++ pkgsrc/security/munge/distinfo 2024/05/14 21:00:27 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2021/10/26 11:17:20 nia Exp $ 1$NetBSD: distinfo,v 1.9 2024/05/14 21:00:27 bacon Exp $
2 2
3BLAKE2s (munge-0.5.13.tar.xz) = f7c4764af928a8c4600db32986169af2dacfe3f280095c25c19a44c99927225b 3BLAKE2s (munge-0.5.16.tar.xz) = c1720fd24852ad31a8aa6d83a24c5935519d0d7a682abdf2fdb535673d6c5885
4SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002 4SHA512 (munge-0.5.16.tar.xz) = b808deede8e71c96719526182c5fc16250dc09d2129dc9d5cbcb54c5827723e1dbbd47b8c912373328f5f3b8971c75200abb2def5d35ebc896bff1984ab8c305
5Size (munge-0.5.13.tar.xz) = 389952 bytes 5Size (munge-0.5.16.tar.xz) = 448120 bytes
6SHA1 (patch-src_etc_Makefile.in) = 2133f8cf5e718d786bf2ec86c2f7fd3e2a4cdfee 6SHA1 (patch-src_etc_Makefile.in) = fbf4e59810c97e4c70353ec435867bebf2bd39bd
cvs diff -r1.1 -r1.2 pkgsrc/security/munge/files/munge.sh (expand / switch to unified diff)

--- pkgsrc/security/munge/files/munge.sh 2014/09/11 16:11:46 1.1
+++ pkgsrc/security/munge/files/munge.sh 2024/05/14 21:00:27 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# $NetBSD: munge.sh,v 1.1 2014/09/11 16:11:46 asau Exp $ 2# $NetBSD: munge.sh,v 1.2 2024/05/14 21:00:27 bacon Exp $
3# 3#
4# PROVIDE: munge 4# PROVIDE: munge
5# REQUIRE: DAEMON 5# REQUIRE: DAEMON
6# KEYWORD: shutdown 6# KEYWORD: shutdown
7 7
8. /etc/rc.subr 8. /etc/rc.subr
9 9
10name="munge" 10name="munge"
11rcvar=${name} 11rcvar=${name}
12command="@PREFIX@/sbin/munged" 12command="@PREFIX@/sbin/munged"
 13munge_user="munge"
 14munge_group="munge"
13 15
14load_rc_config $name 16load_rc_config $name
15run_rc_command "$1" 17run_rc_command "$1"
File Added: pkgsrc/security/munge/files/org.pkgsrc.munged.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
    <dict>
	<key>Label</key>
	<string>org.pkgsrc.munge</string>
	<key>Program</key>
	<string>/opt/pkg/sbin/munged</string>
	<key>RunAtLoad</key>
	<true/>
	<key>KeepAlive</key>
	<true/>
    </dict>
</plist>
cvs diff -r1.5 -r1.6 pkgsrc/security/munge/patches/patch-src_etc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/munge/patches/patch-src_etc_Makefile.in 2018/03/24 18:05:58 1.5
+++ pkgsrc/security/munge/patches/patch-src_etc_Makefile.in 2024/05/14 21:00:28 1.6
@@ -1,45 +1,29 @@ @@ -1,45 +1,29 @@
1$NetBSD: patch-src_etc_Makefile.in,v 1.5 2018/03/24 18:05:58 bacon Exp $ 1$NetBSD: patch-src_etc_Makefile.in,v 1.6 2024/05/14 21:00:28 bacon Exp $
2 2
3Install configuration into example directory. 3# Conform to pkgsrc
4 4
5--- src/etc/Makefile.in.orig 2017-09-26 21:57:53.000000000 +0000 5--- src/etc/Makefile.in.orig 2024-01-26 00:52:18.921858783 +0000
6+++ src/etc/Makefile.in 6+++ src/etc/Makefile.in
7@@ -298,6 +298,7 @@ sbindir = @sbindir@ 7@@ -291,6 +291,7 @@ sbindir = @sbindir@
8 sharedstatedir = @sharedstatedir@ 8 sharedstatedir = @sharedstatedir@
9 srcdir = @srcdir@ 9 srcdir = @srcdir@
10 sysconfdir = @sysconfdir@ 10 sysconfdir = @sysconfdir@
11+sysconfexampledir = $(prefix)/share/examples/munge 11+sysconfexampledir = $(prefix)/share/examples
12 target_alias = @target_alias@ 12 sysconfigdir = @sysconfigdir@
13 top_build_prefix = @top_build_prefix@ 13 systemdunitdir = @systemdunitdir@
14 top_builddir = @top_builddir@ 14 sysvinitddir = @sysvinitddir@
15@@ -581,15 +582,15 @@ munge.tmpfiles.conf: munge.tmpfiles.conf 15@@ -602,12 +603,12 @@ install-data-hook: install-dirs install-
 16 uninstall-local: uninstall-dirs uninstall-logrotate uninstall-pkgconfig uninstall-systemd uninstall-sysvinit
16  17
17 install-data-local: 18 install-dirs:
18 test -d "/etc/rc.d/init.d" \ 19- $(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfdir)/munge'
19- && INITDIR="$(sysconfdir)/rc.d/init.d" \ 20+ $(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfexampledir = $(prefix)/share/examples)/munge'
20- || INITDIR="$(sysconfdir)/init.d"; \ 21 $(MKDIR_P) -m 0711 '$(DESTDIR)$(localstatedir)/lib/munge'
21+ && INITDIR="$(sysconfexampledir)/rc.d/init.d" \ 22 $(MKDIR_P) -m 0700 '$(DESTDIR)$(localstatedir)/log/munge'
22+ || INITDIR="$(sysconfexampledir)/init.d"; \ 23
23 $(INSTALL) -m 0755 -d "$(DESTDIR)$${INITDIR}"; \ 24 uninstall-dirs:
24 $(INSTALL) -m 0755 \ 25- rmdir '$(DESTDIR)$(sysconfdir)/munge' 2>/dev/null || :
25 "$(builddir)/munge.init" "$(DESTDIR)$${INITDIR}/munge" 26+ rmdir '$(DESTDIR)$(sysconfexampledir = $(prefix)/share/examples)/munge' 2>/dev/null || :
26 : 27 rmdir '$(DESTDIR)$(localstatedir)/lib/munge' 2>/dev/null || :
27 test -d "/etc/sysconfig" \ 28 rmdir '$(DESTDIR)$(localstatedir)/log/munge' 2>/dev/null || :
28- && CONFDIR="$(sysconfdir)/sysconfig" \ 29 rmdir '$(DESTDIR)$(runstatedir)/munge' 2>/dev/null || :
29- || CONFDIR="$(sysconfdir)/default"; \ 
30+ && CONFDIR="$(sysconfexampledir)/sysconfig" \ 
31+ || CONFDIR="$(sysconfexampledir)/default"; \ 
32 $(INSTALL) -m 0755 -d "$(DESTDIR)$${CONFDIR}"; \ 
33 $(INSTALL) -m 0644 \ 
34 "$(builddir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge" 
35@@ -610,8 +611,8 @@ install-data-local: 
36 "$(builddir)/munge.tmpfiles.conf" \ 
37 "$(DESTDIR)$${TMPFILESDIR}/munge.conf" 
38 : 
39- $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)" 
40- $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfdir)/munge" 
41+ $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)" 
42+ $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfexampledir)/munge" 
43 $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)" 
44 $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)/lib" 
45 $(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib/munge"