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: Tue May 14 21:00:28 UTC 2024
Modified Files:
pkgsrc/security/munge: Makefile PLIST buildlink3.mk distinfo
pkgsrc/security/munge/files: munge.sh
pkgsrc/security/munge/patches: patch-src_etc_Makefile.in
Added Files:
pkgsrc/security/munge: PLIST.Darwin PLIST.FreeBSD PLIST.Linux
pkgsrc/security/munge/files: org.pkgsrc.munged.plist
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/munge/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/munge/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/munge/PLIST.Darwin
cvs rdiff -u -r0 -r1.7 pkgsrc/security/munge/PLIST.FreeBSD
cvs rdiff -u -r0 -r1.6 pkgsrc/security/munge/PLIST.Linux
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/munge/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/munge/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/munge/files/munge.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/security/munge/files/org.pkgsrc.munged.plist
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
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.28 pkgsrc/security/munge/Makefile:1.29
--- pkgsrc/security/munge/Makefile:1.28 Tue Oct 24 22:10:52 2023
+++ pkgsrc/security/munge/Makefile Tue May 14 21:00:27 2024
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2023/10/24 22:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2024/05/14 21:00:27 bacon Exp $
-DISTNAME= munge-0.5.13
-PKGREVISION= 8
+DISTNAME= munge-0.5.16
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=dun/}
GITHUB_RELEASE= ${DISTNAME}
EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= bacon%NetBSD.org@localhost
HOMEPAGE= https://dun.github.io/munge/
COMMENT= Authentication service for creating and validating credentials
LICENSE= gnu-gpl-v3
@@ -15,24 +14,54 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= perl pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-INSTALLATION_DIRS+= lib/pkgconfig
-OWN_DIRS= ${VARBASE}/lib/munge
-OWN_DIRS+= ${VARBASE}/log/munge
-OWN_DIRS+= ${VARBASE}/run/munge
-OWN_DIRS+= etc/munge
-
-BUILD_DEFS+= VARBASE
-
-RCD_SCRIPTS+= munge
-
-SUBST_CLASSES+= init
-SUBST_STAGE.init= post-build
-SUBST_FILES.init= ${WRKSRC}/src/etc/munge.init
-SUBST_FILES.init+= ${WRKSRC}/src/etc/munge.sysconfig
-SUBST_SED.init= -e 's|USER="munge"|USER="daemon"|g'
-SUBST_SED.init+= -e 's|GROUP="munge"|GROUP="daemon"|g'
+.include "../../mk/bsd.prefs.mk"
+
+MUNGE_DIR?= ${PREFIX}/var/lib/munge
+MUNGE_LOG_DIR?= ${PREFIX}/var/log/munge
+MUNGE_RUN_DIR?= ${PREFIX}/var/run/munge
+MUNGE_ETC_DIR?= ${PREFIX}/etc/munge
+MUNGE_USER= munge
+MUNGE_GROUP= ${MUNGE_USER}
+
+PKG_GROUPS+= ${MUNGE_GROUP}
+PKG_USERS+= ${MUNGE_USER}:${MUNGE_GROUP}
+PKG_GECOS.munge= Munge user
+PKG_HOME.munge= ${MUNGE_DIR}
+
+OWN_DIRS_PERMS+= ${MUNGE_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
+OWN_DIRS_PERMS+= ${MUNGE_LOG_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
+OWN_DIRS_PERMS+= ${MUNGE_RUN_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0755
+OWN_DIRS_PERMS+= ${MUNGE_ETC_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
+
+RCD_SCRIPTS= munge
+PKG_RCD_SCRIPTS= yes
+
+.if ${OPSYS} == Linux
+EGDIR= ${PREFIX}/share/examples/munge
+PKG_SYSCONFSUBDIR= sysconfig
+CONF_FILES= ${EGDIR}/systemd.sysconfig ${PKG_SYSCONFDIR}/munge
+CONF_FILES+= ${EGDIR}/logrotate.conf ${PREFIX}/etc/logrotate.d/munge
+
+INSTALLATION_DIRS+= ${EGDIR} etc/logrotate.d
+CONFIGURE_ARGS+= --with-sysconfigdir=${PKG_SYSCONFDIR}
+AUTO_MKDIRS= yes
+
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/etc/logrotate.d/munge \
+ ${DESTDIR}${PREFIX}/share/examples/munge/logrotate.conf
+ ${MV} ${DESTDIR}${PREFIX}/etc/sysconfig/munge \
+ ${DESTDIR}${PREFIX}/share/examples/munge/systemd.sysconfig
+.endif
+
+.if ${OPSYS} == Darwin
+# Should not be necessary with AUTO_MKDIRS enabled, but it is
+INSTALLATION_DIRS+= share/munge/Launchd
+post-install:
+ # ${MKDIR} ${DESTDIR}${PREFIX}/share/munge/Launchd
+ ${INSTALL_DATA} ${FILESDIR}/*.plist \
+ ${DESTDIR}${PREFIX}/share/munge/Launchd
+.endif
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/security/munge/PLIST
diff -u pkgsrc/security/munge/PLIST:1.7 pkgsrc/security/munge/PLIST:1.8
--- pkgsrc/security/munge/PLIST:1.7 Sat Apr 23 22:50:50 2022
+++ pkgsrc/security/munge/PLIST Tue May 14 21:00:27 2024
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2022/04/23 22:50:50 tnn Exp $
+@comment $NetBSD: PLIST,v 1.8 2024/05/14 21:00:27 bacon Exp $
bin/munge
bin/remunge
bin/unmunge
include/munge.h
lib/libmunge.la
lib/pkgconfig/munge.pc
-lib/systemd/system/munge.service
-lib/tmpfiles.d/munge.conf
man/man1/munge.1
man/man1/remunge.1
man/man1/unmunge.1
@@ -27,9 +25,11 @@ man/man3/munge_enum_str_to_int.3
man/man3/munge_strerror.3
man/man7/munge.7
man/man8/munged.8
+man/man8/mungekey.8
sbin/munged
-share/examples/munge/default/munge
-share/examples/munge/init.d/munge
+sbin/mungekey
+@pkgdir etc/logrotate.d
@pkgdir var/run/munge
@pkgdir var/log/munge
@pkgdir var/lib/munge
+@pkgdir etc/munge
Index: pkgsrc/security/munge/buildlink3.mk
diff -u pkgsrc/security/munge/buildlink3.mk:1.2 pkgsrc/security/munge/buildlink3.mk:1.3
--- pkgsrc/security/munge/buildlink3.mk:1.2 Tue Jun 28 11:35:38 2022
+++ pkgsrc/security/munge/buildlink3.mk Tue May 14 21:00:27 2024
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/06/28 11:35:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/05/14 21:00:27 bacon Exp $
BUILDLINK_TREE+= munge
.if !defined(MUNGE_BUILDLINK3_MK)
MUNGE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.munge+= munge>=0.5.10
-BUILDLINK_ABI_DEPENDS.munge?= munge>=0.5.13nb7
+BUILDLINK_API_DEPENDS.munge+= munge>=0.5.16
BUILDLINK_PKGSRCDIR.munge?= ../../security/munge
.endif # MUNGE_BUILDLINK3_MK
Index: pkgsrc/security/munge/distinfo
diff -u pkgsrc/security/munge/distinfo:1.8 pkgsrc/security/munge/distinfo:1.9
--- pkgsrc/security/munge/distinfo:1.8 Tue Oct 26 11:17:20 2021
+++ pkgsrc/security/munge/distinfo Tue May 14 21:00:27 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:17:20 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/05/14 21:00:27 bacon Exp $
-BLAKE2s (munge-0.5.13.tar.xz) = f7c4764af928a8c4600db32986169af2dacfe3f280095c25c19a44c99927225b
-SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
-Size (munge-0.5.13.tar.xz) = 389952 bytes
-SHA1 (patch-src_etc_Makefile.in) = 2133f8cf5e718d786bf2ec86c2f7fd3e2a4cdfee
+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_etc_Makefile.in) = fbf4e59810c97e4c70353ec435867bebf2bd39bd
Index: pkgsrc/security/munge/files/munge.sh
diff -u pkgsrc/security/munge/files/munge.sh:1.1 pkgsrc/security/munge/files/munge.sh:1.2
--- pkgsrc/security/munge/files/munge.sh:1.1 Thu Sep 11 16:11:46 2014
+++ pkgsrc/security/munge/files/munge.sh Tue May 14 21:00:27 2024
@@ -1,5 +1,5 @@
#!@RCD_SCRIPTS_SHELL@
-# $NetBSD: munge.sh,v 1.1 2014/09/11 16:11:46 asau Exp $
+# $NetBSD: munge.sh,v 1.2 2024/05/14 21:00:27 bacon Exp $
#
# PROVIDE: munge
# REQUIRE: DAEMON
@@ -10,6 +10,8 @@
name="munge"
rcvar=${name}
command="@PREFIX@/sbin/munged"
+munge_user="munge"
+munge_group="munge"
load_rc_config $name
run_rc_command "$1"
Index: pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
diff -u pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.5 pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.6
--- pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.5 Sat Mar 24 18:05:58 2018
+++ pkgsrc/security/munge/patches/patch-src_etc_Makefile.in Tue May 14 21:00:28 2024
@@ -1,45 +1,29 @@
-$NetBSD: patch-src_etc_Makefile.in,v 1.5 2018/03/24 18:05:58 bacon Exp $
+$NetBSD: patch-src_etc_Makefile.in,v 1.6 2024/05/14 21:00:28 bacon Exp $
-Install configuration into example directory.
+# Conform to pkgsrc
---- src/etc/Makefile.in.orig 2017-09-26 21:57:53.000000000 +0000
+--- src/etc/Makefile.in.orig 2024-01-26 00:52:18.921858783 +0000
+++ src/etc/Makefile.in
-@@ -298,6 +298,7 @@ sbindir = @sbindir@
+@@ -291,6 +291,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
-+sysconfexampledir = $(prefix)/share/examples/munge
- target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
-@@ -581,15 +582,15 @@ munge.tmpfiles.conf: munge.tmpfiles.conf
++sysconfexampledir = $(prefix)/share/examples
+ sysconfigdir = @sysconfigdir@
+ systemdunitdir = @systemdunitdir@
+ sysvinitddir = @sysvinitddir@
+@@ -602,12 +603,12 @@ install-data-hook: install-dirs install-
+ uninstall-local: uninstall-dirs uninstall-logrotate uninstall-pkgconfig uninstall-systemd uninstall-sysvinit
- install-data-local:
- test -d "/etc/rc.d/init.d" \
-- && INITDIR="$(sysconfdir)/rc.d/init.d" \
-- || INITDIR="$(sysconfdir)/init.d"; \
-+ && INITDIR="$(sysconfexampledir)/rc.d/init.d" \
-+ || INITDIR="$(sysconfexampledir)/init.d"; \
- $(INSTALL) -m 0755 -d "$(DESTDIR)$${INITDIR}"; \
- $(INSTALL) -m 0755 \
- "$(builddir)/munge.init" "$(DESTDIR)$${INITDIR}/munge"
- :
- test -d "/etc/sysconfig" \
-- && CONFDIR="$(sysconfdir)/sysconfig" \
-- || CONFDIR="$(sysconfdir)/default"; \
-+ && CONFDIR="$(sysconfexampledir)/sysconfig" \
-+ || CONFDIR="$(sysconfexampledir)/default"; \
- $(INSTALL) -m 0755 -d "$(DESTDIR)$${CONFDIR}"; \
- $(INSTALL) -m 0644 \
- "$(builddir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge"
-@@ -610,8 +611,8 @@ install-data-local:
- "$(builddir)/munge.tmpfiles.conf" \
- "$(DESTDIR)$${TMPFILESDIR}/munge.conf"
- :
-- $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)"
-- $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfdir)/munge"
-+ $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)"
-+ $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfexampledir)/munge"
- $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)"
- $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)/lib"
- $(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib/munge"
+ install-dirs:
+- $(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfdir)/munge'
++ $(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfexampledir = $(prefix)/share/examples)/munge'
+ $(MKDIR_P) -m 0711 '$(DESTDIR)$(localstatedir)/lib/munge'
+ $(MKDIR_P) -m 0700 '$(DESTDIR)$(localstatedir)/log/munge'
+
+ uninstall-dirs:
+- rmdir '$(DESTDIR)$(sysconfdir)/munge' 2>/dev/null || :
++ rmdir '$(DESTDIR)$(sysconfexampledir = $(prefix)/share/examples)/munge' 2>/dev/null || :
+ rmdir '$(DESTDIR)$(localstatedir)/lib/munge' 2>/dev/null || :
+ rmdir '$(DESTDIR)$(localstatedir)/log/munge' 2>/dev/null || :
+ rmdir '$(DESTDIR)$(runstatedir)/munge' 2>/dev/null || :
Added files:
Index: pkgsrc/security/munge/PLIST.Darwin
diff -u /dev/null pkgsrc/security/munge/PLIST.Darwin:1.1
--- /dev/null Tue May 14 21:00:28 2024
+++ pkgsrc/security/munge/PLIST.Darwin Tue May 14 21:00:27 2024
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2024/05/14 21:00:27 bacon Exp $
+share/munge/Launchd/org.pkgsrc.munged.plist
Index: pkgsrc/security/munge/PLIST.FreeBSD
diff -u /dev/null pkgsrc/security/munge/PLIST.FreeBSD:1.7
--- /dev/null Tue May 14 21:00:28 2024
+++ pkgsrc/security/munge/PLIST.FreeBSD Tue May 14 21:00:27 2024
@@ -0,0 +1,3 @@
+@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
Index: pkgsrc/security/munge/PLIST.Linux
diff -u /dev/null pkgsrc/security/munge/PLIST.Linux:1.6
--- /dev/null Tue May 14 21:00:28 2024
+++ pkgsrc/security/munge/PLIST.Linux Tue May 14 21:00:27 2024
@@ -0,0 +1,4 @@
+@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
Index: pkgsrc/security/munge/files/org.pkgsrc.munged.plist
diff -u /dev/null pkgsrc/security/munge/files/org.pkgsrc.munged.plist:1.1
--- /dev/null Tue May 14 21:00:28 2024
+++ pkgsrc/security/munge/files/org.pkgsrc.munged.plist Tue May 14 21:00:27 2024
@@ -0,0 +1,14 @@
+<?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>
Home |
Main Index |
Thread Index |
Old Index