upgpkg: munge 0.5.14-2

upgpkg: munge-git 0.5.14.r16.gcdfdf73-1

5 files changed, 23 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e9107314b0c..376938a2352b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = munge-git
 	pkgdesc = An authentication service for creating and validating credentials. It is designed to be highly scalable for use in an HPC cluster environment.
-	pkgver = 0.5.13.r25.g5a2fddf
+	pkgver = 0.5.14.r16.gcdfdf73
 	pkgrel = 1
 	url = https://github.com/dun/munge/wiki
 	install = munge-git.install
@@ -15,7 +15,11 @@ pkgbase = munge-git
 	optdepends = bzip2: bzip2 compression support
 	provides = munge
 	conflicts = munge
+	source = munge.sysusers
+	source = munge.tmpfiles
 	source = munge-git::git+https://github.com/dun/munge.git
+	sha512sums = 0f24af038db5924d483e12f884830636c5611aa6b2486cfdec2c47fa80eb47cefaa550e9be88207fb00a98fe77902504e019b87f384381cd3b2987bfda143c1b
+	sha512sums = 33e3210634c1d5aa14597d70ec73c49aa83e9e0cea5c98a656099016876d2bf4dc8e1ec20426ee0baba9522be2e6a4422fa67a028ebf5e7c04f72f7daf0fd53f
 	sha512sums = SKIP
 
 pkgname = munge-git
diff --git a/PKGBUILD b/PKGBUILD
index 3da6ad53667d..01d717c2073d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gordian Edenhofer <gordian.edenhofer@gmail.com>
 
 pkgname=munge-git
-pkgver=0.5.13.r25.g5a2fddf
+pkgver=0.5.14.r16.gcdfdf73
 pkgrel=1
 pkgdesc="An authentication service for creating and validating credentials. It is designed to be highly scalable for use in an HPC cluster environment."
 arch=('i686' 'x86_64' 'armv7h')
@@ -14,8 +14,12 @@ makedepends=('git')
 provides=('munge')
 conflicts=('munge')
 install="${pkgname}.install"
-source=("${pkgname}"::"git+https://github.com/dun/munge.git")
-sha512sums=('SKIP')
+source=("munge.sysusers"
+	"munge.tmpfiles"
+	"${pkgname}"::"git+https://github.com/dun/munge.git")
+sha512sums=('0f24af038db5924d483e12f884830636c5611aa6b2486cfdec2c47fa80eb47cefaa550e9be88207fb00a98fe77902504e019b87f384381cd3b2987bfda143c1b'
+            '33e3210634c1d5aa14597d70ec73c49aa83e9e0cea5c98a656099016876d2bf4dc8e1ec20426ee0baba9522be2e6a4422fa67a028ebf5e7c04f72f7daf0fd53f'
+            'SKIP')
 
 pkgver() {
 	cd "${srcdir}/${pkgname}"
@@ -28,6 +32,7 @@ pkgver() {
 build() {
 	cd "${srcdir}/${pkgname}"
 
+	./bootstrap
 	./configure \
 		--prefix=/usr \
 		--sbindir=/usr/bin \
@@ -42,12 +47,15 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
+	install -D -m644 ../munge.sysusers "${pkgdir}/usr/lib/sysusers.d/munge.conf"
+	install -D -m644 ../munge.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/munge.conf"
+
 	# Remove obsolete init script (Arch Linux uses SystemD)
 	rm -f "${pkgdir}"/etc/init.d/munge
 	rmdir "${pkgdir}"/etc/init.d
 
 	# It is bad practice to put package-files in /run
-	# The dir /var/run/munge will be created in post_install, see .install
+	# The dir /var/run/munge will be created by systemd-tmpfiles
 	rmdir "${pkgdir}"/var/run/munge
 	rmdir "${pkgdir}"/var/run
 
diff --git a/munge-git.install b/munge-git.install
index d95af83951c6..8730eb0ed1b4 100644
--- a/munge-git.install
+++ b/munge-git.install
@@ -1,78 +1,13 @@
-_user="munge"
-
 post_install() {
-	# The installation process is described at https://github.com/dun/munge/wiki/Installation-Guide
-
-	# Create munge /var/run/munge dir and secure it
-	mkdir -p /var/run/munge
-	chmod 0755 /var/run/munge
-
-	getent group "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo "Adding ${_user} system group..."
-		groupadd -r ${_user} 1>/dev/null
-	fi
-
-	getent passwd "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo "Adding ${_user} system user..."
-		useradd -r -g ${_user} -d "/var/log/munge" -c "Munge Daemon" ${_user} 1>/dev/null
-	fi
-
-	echo "Locking Munge User Account..."
-	passwd -l munge &>/dev/null
-
-	# Create munge key
 	if [[ ! -e /etc/munge/munge.key && -c /dev/urandom ]]; then
 		echo "Creating random munge key at /etc/munge/munge.key"
 		dd if=/dev/urandom bs=1 count=1024 of=/etc/munge/munge.key
 		chmod 0400 /etc/munge/munge.key
 	else
 		if [[ -c /dev/urandom ]]; then
-			echo "No munge key is generated since /etc/munge/munge.key already exists."
+			echo "No munge key generated since /etc/munge/munge.key already exists."
 		else
 			echo "Did not create /etc/munge/munge.key since /dev/urandom can not be found."
 		fi
 	fi
-
-	# Set permissions
-	chown ${_user}:${_user} -R /etc/munge
-	chown ${_user}:${_user} -R /var/log/munge
-	chown ${_user}:${_user} -R /var/lib/munge
-	chown ${_user}:${_user} -R /var/run/munge
-}
-
-post_upgrade() {
-	# Set permissions
-	chown ${_user}:${_user} -R /etc/munge
-	chown ${_user}:${_user} -R /var/log/munge
-	chown ${_user}:${_user} -R /var/lib/munge
-	chown ${_user}:${_user} -R /var/run/munge
-
-	if [[ -e /etc/munge/munge.key ]]; then
-		chmod 0400 /etc/munge/munge.key
-	fi
-}
-
-pre_remove() {
-	echo "Stopping and disabling munge using SystemD..."
-	systemctl stop munge
-	systemctl disable munge.service
-}
-
-post_remove() {
-	# Removing obsolete directory
-	rm -rf /var/run/munge
-
-	# Notifying the user of kept dirs and change owner
-	[[ -d /etc/munge ]] && chown root:root -R /etc/munge && echo "Custom configuration-file(s) in /etc/munge/ were kept on your system."
-	[[ -d /var/log/munge ]] && chown root:root -R /var/log/munge && echo "Logfiles were preserved. They reside under /var/log/munge ."
-
-	echo "Removing ${_user} system user and group..."
-	if getent passwd ${_user} >/dev/null 2>&1; then
-		userdel ${_user} 2>/dev/null
-	fi
-	if getent group ${_user} >/dev/null 2>&1; then
-		groupdel ${_user}
-	fi
 }
diff --git a/munge.sysusers b/munge.sysusers
new file mode 100644
index 000000000000..f2dcb69b79f4
--- /dev/null
+++ b/munge.sysusers
@@ -0,0 +1 @@
+u munge - "munge daemon" /var/log/munge /bin/nologin
diff --git a/munge.tmpfiles b/munge.tmpfiles
new file mode 100644
index 000000000000..d7653016f63a
--- /dev/null
+++ b/munge.tmpfiles
@@ -0,0 +1,4 @@
+Z /etc/munge 0700 munge munge
+Z /var/log/munge 0700 munge munge
+Z /var/lib/munge 0711 munge munge
+d /run/munge 0755 munge munge -