pesign/pesign-run.patch

---
 src/Makefile        |    2 +-
 src/daemon.h        |    4 ++--
 src/macros.pesign   |    2 +-
 src/pesign.sysvinit |   14 +++++++-------
 src/tmpfiles.conf   |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

Index: pesign-0.112/src/Makefile
===================================================================
--- pesign-0.112.orig/src/Makefile
+++ pesign-0.112/src/Makefile
@@ -68,7 +68,7 @@ install_sysvinit: pesign.sysvinit
 install :
 	$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign/
 	$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign-rh-test/
-	$(INSTALL) -d -m 770 $(INSTALLROOT)/var/run/pesign/
+	$(INSTALL) -d -m 770 $(INSTALLROOT)/run/pesign/
 	$(INSTALL) -d -m 755 $(INSTALLROOT)$(bindir)
 	$(INSTALL) -m 755 authvar $(INSTALLROOT)$(bindir)
 	$(INSTALL) -m 755 pesign $(INSTALLROOT)$(bindir)
Index: pesign-0.112/src/daemon.h
===================================================================
--- pesign-0.112.orig/src/daemon.h
+++ pesign-0.112/src/daemon.h
@@ -49,7 +49,7 @@ typedef enum {
 } pesignd_cmd;
 
 #define PESIGND_VERSION 0x2a9edaf0
-#define SOCKPATH	"/var/run/pesign/socket"
-#define PIDFILE		"/var/run/pesign.pid"
+#define SOCKPATH	"/run/pesign/socket"
+#define PIDFILE		"/run/pesign.pid"
 
 #endif /* DAEMON_H */
Index: pesign-0.112/src/macros.pesign
===================================================================
--- pesign-0.112.orig/src/macros.pesign
+++ pesign-0.112/src/macros.pesign
@@ -40,7 +40,7 @@
       %{_pesign} -R ${sattrs}.sig -I ${sattrs} %{-i}			\\\
                  --certdir ${nss} -c signer %{-o}			\
       rm -rf ${sattrs} ${sattrs}.sig ${nss}				\
-    elif [ -S /var/run/pesign/socket ]; then				\
+    elif [ -S /run/pesign/socket ]; then				\
       %{_pesign_client} -t "OpenSC Card (Fedora Signer)"		\\\
                         -c "/CN=Fedora Secure Boot Signer"		\\\
                         %{-i} %{-o} %{-e} %{-s} %{-C}			\
Index: pesign-0.112/src/tmpfiles.conf
===================================================================
--- pesign-0.112.orig/src/tmpfiles.conf
+++ pesign-0.112/src/tmpfiles.conf
@@ -1 +1 @@
-D /var/run/pesign 0770 pesign pesign -
+D /run/pesign 0770 pesign pesign -
Index: pesign-0.112/src/pesign.sysvinit.in
===================================================================
--- pesign-0.112.orig/src/pesign.sysvinit.in
+++ pesign-0.112/src/pesign.sysvinit.in
@@ -4,7 +4,7 @@
 #
 # chkconfig: - 50 50
 # processname: /usr/bin/pesign
-# pidfile: /var/run/pesign.pid
+# pidfile: /run/pesign.pid
 ### BEGIN INIT INFO 
 # Provides:          pesign
 # Should-Start:      $remote_fs
Index: pesign-0.112/src/pesign.service.in
===================================================================
--- pesign-0.112.orig/src/pesign.service.in
+++ pesign-0.112/src/pesign.service.in
@@ -4,7 +4,7 @@ Description=Pesign signing daemon
 [Service]
 PrivateTmp=true
 Type=forking
-PIDFile=/var/run/pesign.pid
+PIDFile=/run/pesign.pid
 ExecStart=/usr/bin/pesign --daemonize
 ExecStartPost=@@LIBEXECDIR@@/pesign/pesign-authorize-users
 ExecStartPost=@@LIBEXECDIR@@/pesign/pesign-authorize-groups
Index: pesign-0.112/src/pesign-authorize-groups
===================================================================
--- pesign-0.112.orig/src/pesign-authorize-groups
+++ pesign-0.112/src/pesign-authorize-groups
@@ -12,10 +12,10 @@ set -e
 
 if [ -r /etc/pesign/groups ]; then
     for group in $(cat /etc/pesign/groups); do
-	if [ -d /var/run/pesign ]; then
-	    setfacl -m g:${group}:rx /var/run/pesign
-	    if [ -e /var/run/pesign/socket ]; then
-		setfacl -m g:${group}:rw /var/run/pesign/socket
+	if [ -d /run/pesign ]; then
+	    setfacl -m g:${group}:rx /run/pesign
+	    if [ -e /run/pesign/socket ]; then
+		setfacl -m g:${group}:rw /run/pesign/socket
 	    fi
 	fi
 	for x in /etc/pki/pesign* ; do
Index: pesign-0.112/src/pesign-authorize-users
===================================================================
--- pesign-0.112.orig/src/pesign-authorize-users
+++ pesign-0.112/src/pesign-authorize-users
@@ -12,10 +12,10 @@ set -e
 
 if [ -r /etc/pesign/users ]; then
     for username in $(cat /etc/pesign/users); do
-	if [ -d /var/run/pesign ]; then
-	    setfacl -m g:${username}:rx /var/run/pesign
-	    if [ -e /var/run/pesign/socket ]; then
-		setfacl -m g:${username}:rw /var/run/pesign/socket
+	if [ -d /run/pesign ]; then
+	    setfacl -m g:${username}:rx /run/pesign
+	    if [ -e /run/pesign/socket ]; then
+		setfacl -m g:${username}:rw /run/pesign/socket
 	    fi
 	fi
 	for x in /etc/pki/pesign* ; do