upgpkg: munge 0.5.14-2

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

5 files changed, 23 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1f6ac9c07f1..4d8b840154e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = munge
 	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.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/dun/munge/wiki
 	install = munge.install
 	arch = i686
@@ -12,7 +12,11 @@ pkgbase = munge
 	depends = openssl
 	optdepends = zlib: zlib compression support
 	optdepends = bzip2: bzip2 compression support
+	source = munge.sysusers
+	source = munge.tmpfiles
 	source = https://github.com/dun/munge/archive/munge-0.5.14.tar.gz
+	sha512sums = 0f24af038db5924d483e12f884830636c5611aa6b2486cfdec2c47fa80eb47cefaa550e9be88207fb00a98fe77902504e019b87f384381cd3b2987bfda143c1b
+	sha512sums = 33e3210634c1d5aa14597d70ec73c49aa83e9e0cea5c98a656099016876d2bf4dc8e1ec20426ee0baba9522be2e6a4422fa67a028ebf5e7c04f72f7daf0fd53f
 	sha512sums = ea89428889e261b58db14d0ab37a32decda3a8c77fe81edd9ec347bfafe748133f3a8bbba2e2e625b829261060599a7a30a42310fbbd0ad71c0ef6e18dcd5940
 
 pkgname = munge
diff --git a/PKGBUILD b/PKGBUILD
index 004483301886..ac02042d7e44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=munge
 pkgver=0.5.14
-pkgrel=1
+pkgrel=2
 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')
 url="https://github.com/dun/munge/wiki"
@@ -12,8 +12,12 @@ depends=('openssl')
 optdepends=("zlib: zlib compression support"
 	"bzip2: bzip2 compression support")
 install="${pkgname}.install"
-source=("https://github.com/dun/munge/archive/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('ea89428889e261b58db14d0ab37a32decda3a8c77fe81edd9ec347bfafe748133f3a8bbba2e2e625b829261060599a7a30a42310fbbd0ad71c0ef6e18dcd5940')
+source=("munge.sysusers"
+	"munge.tmpfiles"
+	"https://github.com/dun/munge/archive/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('0f24af038db5924d483e12f884830636c5611aa6b2486cfdec2c47fa80eb47cefaa550e9be88207fb00a98fe77902504e019b87f384381cd3b2987bfda143c1b'
+            '33e3210634c1d5aa14597d70ec73c49aa83e9e0cea5c98a656099016876d2bf4dc8e1ec20426ee0baba9522be2e6a4422fa67a028ebf5e7c04f72f7daf0fd53f'
+            'ea89428889e261b58db14d0ab37a32decda3a8c77fe81edd9ec347bfafe748133f3a8bbba2e2e625b829261060599a7a30a42310fbbd0ad71c0ef6e18dcd5940')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
@@ -33,8 +37,11 @@ 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"
+
 	# 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.install b/munge.install
index f1def7963619..8730eb0ed1b4 100644
--- a/munge.install
+++ b/munge.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 ..."
+		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 -