munge: Update to 0.5.15

[Jason W. Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Jan 25 18:56:03 2024 -0600
Changeset:	49b11f87f78192a45dfd5a5e92bfcabe90ad8248

Modified Files:
	munge/Makefile
	munge/PLIST.SunOS
	munge/distinfo
	munge/patches/patch-src_etc_Makefile.in

Log Message:
munge: Update to 0.5.15

Also move state and log dirs from VARBASE to PREFIX, so that
munge can be installed and run without root access

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49b11f87f78192a45dfd5a5e92bfcabe90ad8248

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

diffstat:
 munge/Makefile                          | 11 ++++-------
 munge/PLIST.SunOS                       |  1 +
 munge/distinfo                          |  8 ++++----
 munge/patches/patch-src_etc_Makefile.in | 13 ++++++-------
 4 files changed, 15 insertions(+), 18 deletions(-)

diffs:
diff --git a/munge/Makefile b/munge/Makefile
index bdf5fc4c60..241deb102e 100644
--- a/munge/Makefile
+++ b/munge/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.23 2020/01/18 21:50:41 jperkin Exp $
 
-DISTNAME=	munge-0.5.14
+DISTNAME=	munge-0.5.15
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dun/}
 GITHUB_RELEASE=	${DISTNAME}
@@ -14,16 +14,13 @@ 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=	${PREFIX}/var/lib/munge
+OWN_DIRS+=	${PREFIX}/var/log/munge
+OWN_DIRS+=	${PREFIX}/var/run/munge
 OWN_DIRS+=	etc/munge
 
-BUILD_DEFS+=	VARBASE
-
 RCD_SCRIPTS+=	munge
 
 SUBST_CLASSES+=		init
diff --git a/munge/PLIST.SunOS b/munge/PLIST.SunOS
index 660fd932a3..060813be83 100644
--- a/munge/PLIST.SunOS
+++ b/munge/PLIST.SunOS
@@ -1,2 +1,3 @@
+@comment $NetBSD$
 etc/init.d/munge
 etc/sysconfig/munge
diff --git a/munge/distinfo b/munge/distinfo
index f3bf933b12..cfc1c24383 100644
--- a/munge/distinfo
+++ b/munge/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-RMD160 (munge-0.5.14.tar.xz) = 787fcc12744476616849e4c05351407f308bbe51
-SHA512 (munge-0.5.14.tar.xz) = 742c9f2c1cf9f5b070f91fc6b9e74c5f2712c385bce6820c400e884fb6d78f86dea7ebe8e3918d056bf72e746a6af5481a1a8d9f0834a28836da90a42b4eb166
-Size (munge-0.5.14.tar.xz) = 439776 bytes
-SHA1 (patch-src_etc_Makefile.in) = e4fafc069a162371a6f0f76db94e4590c22f52c7
+BLAKE2s (munge-0.5.15.tar.xz) = c726fcd7a7f457cb8136657721776b0001b661cff175ca9cb9b6f36063957450
+SHA512 (munge-0.5.15.tar.xz) = 266af1cf2df30f6bd7338527bd69736c0cf91e7390e7bbeea9a225af4829d456907be77a1e77ecef4716f2fff634d144d4b3d5cc3d0afc12f5c2d1acfd6974e1
+Size (munge-0.5.15.tar.xz) = 459468 bytes
+SHA1 (patch-src_etc_Makefile.in) = fbf4e59810c97e4c70353ec435867bebf2bd39bd
diff --git a/munge/patches/patch-src_etc_Makefile.in b/munge/patches/patch-src_etc_Makefile.in
index dc54b8ec29..365b8d5057 100644
--- a/munge/patches/patch-src_etc_Makefile.in
+++ b/munge/patches/patch-src_etc_Makefile.in
@@ -1,10 +1,10 @@
 $NetBSD$
 
-# pkgsrc hierarchy
+# Conform to pkgsrc
 
---- src/etc/Makefile.in.orig	2020-02-01 00:21:19.726062417 +0000
+--- src/etc/Makefile.in.orig	2024-01-26 00:52:18.921858783 +0000
 +++ src/etc/Makefile.in
-@@ -286,6 +286,7 @@ sbindir = @sbindir@
+@@ -291,6 +291,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -12,19 +12,18 @@ $NetBSD$
  sysconfigdir = @sysconfigdir@
  systemdunitdir = @systemdunitdir@
  sysvinitddir = @sysvinitddir@
-@@ -598,13 +599,13 @@ install-data-hook: install-dirs install-
+@@ -602,12 +603,12 @@ install-data-hook: install-dirs install-
  uninstall-local: uninstall-dirs uninstall-logrotate uninstall-pkgconfig uninstall-systemd uninstall-sysvinit
  
  install-dirs:
 -	$(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfdir)/munge'
-+	$(MKDIR_P) -m 0700 '$(DESTDIR)$(sysconfexampledir)/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'
- 	$(MKDIR_P) -m 0755 '$(DESTDIR)$(runstatedir)/munge'
  
  uninstall-dirs:
 -	rmdir '$(DESTDIR)$(sysconfdir)/munge' 2>/dev/null || :
-+	rmdir '$(DESTDIR)$(sysconfexampledir)/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 || :