2820983477
Update to 113 OBS-URL: https://build.opensuse.org/request/show/702580 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=46
95 lines
3.3 KiB
Diff
95 lines
3.3 KiB
Diff
---
|
|
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-113/src/Makefile
|
|
===================================================================
|
|
--- pesign-113.orig/src/Makefile
|
|
+++ pesign-113/src/Makefile
|
|
@@ -73,7 +73,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-113/src/daemon.h
|
|
===================================================================
|
|
--- pesign-113.orig/src/daemon.h
|
|
+++ pesign-113/src/daemon.h
|
|
@@ -49,8 +49,8 @@ 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"
|
|
|
|
static inline uint32_t UNUSED
|
|
pesignd_string_size(char *buffer)
|
|
Index: pesign-113/src/macros.pesign
|
|
===================================================================
|
|
--- pesign-113.orig/src/macros.pesign
|
|
+++ pesign-113/src/macros.pesign
|
|
@@ -52,7 +52,7 @@
|
|
getfacl /var/run/pesign 1>&2 \
|
|
getfacl /var/run/pesign/socket 1>&2 \
|
|
exit 1 \
|
|
- elif [ -S /var/run/pesign/socket ]; then \
|
|
+ elif [ -S /run/pesign/socket ]; then \
|
|
%{_pesign_client} -t %{__pesign_client_token} \\\
|
|
-c %{__pesign_client_cert} \\\
|
|
%{-i} %{-o} %{-e} %{-s} %{-C} \
|
|
Index: pesign-113/src/tmpfiles.conf
|
|
===================================================================
|
|
--- pesign-113.orig/src/tmpfiles.conf
|
|
+++ pesign-113/src/tmpfiles.conf
|
|
@@ -1 +1 @@
|
|
-D /var/run/pesign 0770 pesign pesign -
|
|
+D /run/pesign 0770 pesign pesign -
|
|
Index: pesign-113/src/pesign.sysvinit.in
|
|
===================================================================
|
|
--- pesign-113.orig/src/pesign.sysvinit.in
|
|
+++ pesign-113/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-113/src/pesign.service.in
|
|
===================================================================
|
|
--- pesign-113.orig/src/pesign.service.in
|
|
+++ pesign-113/src/pesign.service.in
|
|
@@ -4,6 +4,6 @@ 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
|
|
Index: pesign-113/src/pesign-authorize
|
|
===================================================================
|
|
--- pesign-113.orig/src/pesign-authorize
|
|
+++ pesign-113/src/pesign-authorize
|
|
@@ -47,7 +47,7 @@ update_subdir() {
|
|
done
|
|
}
|
|
|
|
-for x in /var/run/pesign/ /etc/pki/pesign*/ ; do
|
|
+for x in /run/pesign/ /etc/pki/pesign*/ ; do
|
|
if [ -d "${x}" ]; then
|
|
update_subdir "${x}"
|
|
else
|