From d0287702174015e75ce222436db772b41015f82d Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 8 Sep 2018 08:55:06 -0300
Subject: [PATCH] munge: fix service and license=.

---
 srcpkgs/munge/INSTALL.msg     |  2 +-
 srcpkgs/munge/files/munge/run |  7 +------
 srcpkgs/munge/template        | 10 +++++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/munge/INSTALL.msg b/srcpkgs/munge/INSTALL.msg
index b6bb17fd90e..2c1d487403f 100644
--- a/srcpkgs/munge/INSTALL.msg
+++ b/srcpkgs/munge/INSTALL.msg
@@ -11,4 +11,4 @@ Don't forget to generate the Secret Key:
    C. Enter the hash of a password:
       $ echo -n "foo" | sha1sum | cut -d' ' -f1 >/etc/munge/munge.key
 
-The Key-File must owned by munge with the permission 700
+The Key-File must owned by munge with the permission 600
diff --git a/srcpkgs/munge/files/munge/run b/srcpkgs/munge/files/munge/run
index 467b5f8ff87..9c773ca0057 100644
--- a/srcpkgs/munge/files/munge/run
+++ b/srcpkgs/munge/files/munge/run
@@ -1,11 +1,6 @@
 #!/bin/sh
-
-if [ ! -d /var/lib/munge ]; then
-    mkdir -m0711 -p /var/lib/munge
-fi
-chown munge:munge /var/lib/munge
 if [ ! -d /var/run/munge ]; then
     mkdir -m0755 -p /var/run/munge
 fi
 chown munge:munge /var/run/munge
-exec chpst -u munge:munge munged -F 2>&1
+exec chpst -u munge:munge munged 2>&1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index 4b6d8e27945..4caafa5908e 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,7 +1,7 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.13
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
@@ -11,10 +11,13 @@ makedepends="bzip2-devel libressl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://dun.github.io/munge/"
 distfiles="https://github.com/dun/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
 checksum=99753dfd06a4f063c36f3fb0eb1964f394feb649937d94c4734d85b7964144da
+make_dirs="/etc/munge 0755 munge munge
+ /var/log/munge 0755 munge munge
+ /var/lib/munge 0711 munge munge"
 
 system_accounts="munge"
 munge_homedir="/var/run/munge"
@@ -42,8 +45,9 @@ munge-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
+
 munge-libs_package() {
-	short_descr+=" - runtime libraries"
+	short_desc+=" - runtime libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}