munge: diropts fixed

packages/sys-auth/munge/files/systemd/munge.service

@@ -6,12 +6,11 @@ Description=An authentication service for creating and validating credentials
 After=syslog.target auditd.service network.target
 
 [Service]
-Type=forking
 User=munge
 # Start up will fail if /etc/munge/munge.key does not exist
 # A fresh key can be generated with /usr/sbin/create-munge-key
 ExecStartPre=/usr/bin/test -r /etc/munge/munge.key
-ExecStart=/usr/sbin/munged 
+ExecStart=/usr/sbin/munged -fF
 ExecReload=/bin/kill -HUP $MAINPID
 PIDFile=/var/run/munge/munged.pid
 

packages/sys-auth/munge/munge-0.5.10.exheres-0

@@ -33,8 +33,10 @@ src_configure() {
 }
 
 munge_remove() {
-    dir="${IMAGE}/$1"
-    [ -e "${dir}" ] && edo rm -rf "${dir}"
+    for d in "$@"; do
+        dir="${IMAGE}/$d"
+        [ -e "${dir}" ] && edo rm -rf "${dir}"
+    done
 }
 
 pkg_setup() {
@@ -44,20 +46,16 @@ pkg_setup() {
 src_install() {
     emake DESTDIR="${IMAGE}" install
 
-    keepdir /run/munge
-    keepdir /var/log/munge
-    munge_remove /var/run
-    munge_remove /etc/init.d
-    munge_remove /etc/default
-    munge_remove /etc/sysconfig
+    munge_remove /var/run /etc/init.d /etc/default /etc/sysconfig
 
-    keepdir /var/lib/munge
-
-    diropts -o munge -g munge -m700
-    dodir /etc/munge
+    diropts -o munge -g munge -m 700
+    keepdir /run/munge /var/lib/munge /etc/munge
     insinto /etc/munge
     doins "${FILES}"/munged.conf
 
+    diropts -o munge -g syslog -m 750
+    keepdir /var/log/munge
+
     if option systemd
     then
         install_systemd_files