f4ca0bfbd9
- Update to version 0.110 - Enable aarch64 OBS-URL: https://build.opensuse.org/request/show/258749 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=29
89 lines
2.6 KiB
Diff
89 lines
2.6 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(-)
|
|
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -74,7 +74,7 @@ install_sysvinit:
|
|
|
|
install :
|
|
$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign/
|
|
- $(INSTALL) -d -m 770 $(INSTALLROOT)/var/run/pesign/
|
|
+ $(INSTALL) -d -m 770 $(INSTALLROOT)/run/pesign/
|
|
$(INSTALL) -d -m 755 $(INSTALLROOT)$(PREFIX)/bin/
|
|
$(INSTALL) -m 755 pesign $(INSTALLROOT)$(PREFIX)/bin/
|
|
$(INSTALL) -m 755 client $(INSTALLROOT)$(PREFIX)/bin/pesign-client
|
|
--- a/src/daemon.h
|
|
+++ b/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 */
|
|
--- a/src/macros.pesign
|
|
+++ b/src/macros.pesign
|
|
@@ -36,7 +36,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} \
|
|
--- a/src/pesign.sysvinit
|
|
+++ b/src/pesign.sysvinit
|
|
@@ -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
|
|
@@ -19,7 +19,7 @@
|
|
|
|
[ -f /usr/bin/pesign ] || exit 1
|
|
|
|
-PESIGN_PIDFILE=/var/run/pesign.pid
|
|
+PESIGN_PIDFILE=/run/pesign.pid
|
|
RETVAL=0
|
|
|
|
start(){
|
|
@@ -28,15 +28,15 @@ start(){
|
|
RETVAL=$?
|
|
echo
|
|
touch /var/lock/subsys/pesign
|
|
- setfacl -m u:kojibuilder:x /var/run/pesign
|
|
- setfacl -m u:kojibuilder:rw /var/run/pesign/socket
|
|
- setfacl -m g:kojibuilder:x /var/run/pesign
|
|
- setfacl -m g:kojibuilder:rw /var/run/pesign/socket
|
|
+ setfacl -m u:kojibuilder:x /run/pesign
|
|
+ setfacl -m u:kojibuilder:rw /run/pesign/socket
|
|
+ setfacl -m g:kojibuilder:x /run/pesign
|
|
+ setfacl -m g:kojibuilder:rw /run/pesign/socket
|
|
}
|
|
|
|
stop(){
|
|
echo -n "Stopping pesign: "
|
|
- killproc -p /var/run/pesign.pid pesignd
|
|
+ killproc -p /run/pesign.pid pesignd
|
|
RETVAL=$?
|
|
echo
|
|
rm -f /var/lock/subsys/pesign
|
|
--- a/src/tmpfiles.conf
|
|
+++ b/src/tmpfiles.conf
|
|
@@ -1 +1 @@
|
|
-D /var/run/pesign 0770 pesign pesign -
|
|
+D /run/pesign 0770 pesign pesign -
|