Update to upstream 0.79.18
This commit is contained in:
parent
4f0b5235f0
commit
92c94147f2
1
.gitignore
vendored
1
.gitignore
vendored
@ -134,3 +134,4 @@ certmonger-0.28.tar.gz
|
||||
/certmonger-0.79.15.tar.gz
|
||||
/certmonger-0.79.16.tar.gz
|
||||
/certmonger-0.79.17.tar.gz
|
||||
/certmonger-0.79.18.tar.gz
|
||||
|
@ -1,137 +0,0 @@
|
||||
From d7deb47302c497742025863fb00cf1e62faa823a Mon Sep 17 00:00:00 2001
|
||||
From: Rob Crittenden <rcritten@redhat.com>
|
||||
Date: Tue, 6 Dec 2022 11:11:38 -0500
|
||||
Subject: [PATCH] Rename DBus service and conf files to match canonical name
|
||||
|
||||
See also https://gitlab.freedesktop.org/dbus/dbus/-/issues/168
|
||||
|
||||
BZ 2151243
|
||||
|
||||
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
dbus/Makefile.am | 4 +--
|
||||
dbus/certmonger.conf.in | 28 ---------------------
|
||||
dbus/certmonger.service.in | 3 ---
|
||||
dbus/org.fedorahosted.certmonger.conf.in | 28 +++++++++++++++++++++
|
||||
dbus/org.fedorahosted.certmonger.service.in | 3 +++
|
||||
7 files changed, 36 insertions(+), 36 deletions(-)
|
||||
delete mode 100644 dbus/certmonger.conf.in
|
||||
delete mode 100644 dbus/certmonger.service.in
|
||||
create mode 100644 dbus/org.fedorahosted.certmonger.conf.in
|
||||
create mode 100644 dbus/org.fedorahosted.certmonger.service.in
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9b7209b7..3ede40e8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -884,4 +884,4 @@ else
|
||||
fi
|
||||
|
||||
AC_CONFIG_COMMANDS(src_introspect_sh,[chmod +x src/introspect.sh])
|
||||
-AC_OUTPUT(Makefile src/Makefile dbus/Makefile systemd/Makefile sysvinit/Makefile sysvinit/certmonger tests/Makefile tests/tools/Makefile dbus/certmonger.conf dbus/certmonger.service src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmonger-dogtag-ipa-renew-agent-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf systemd/certmonger.service systemd/certmonger.conf systemd/org.fedorahosted.certmonger.service src/getcert-refresh.1 src/getcert-refresh-ca.1 src/local-getcert.1 src/certmonger-local-submit.8 src/getcert-status.1 src/certmonger-dogtag-submit.8 src/certmonger-scep-submit.8 src/getcert-add-ca.1 src/getcert-add-scep-ca.1 src/getcert-modify-ca.1 src/getcert-remove-ca.1 src/getcert-rekey.1)
|
||||
+AC_OUTPUT(Makefile src/Makefile dbus/Makefile systemd/Makefile sysvinit/Makefile sysvinit/certmonger tests/Makefile tests/tools/Makefile dbus/org.fedorahosted.certmonger.conf dbus/org.fedorahosted.certmonger.service src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmonger-dogtag-ipa-renew-agent-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf systemd/certmonger.service systemd/certmonger.conf systemd/org.fedorahosted.certmonger.service src/getcert-refresh.1 src/getcert-refresh-ca.1 src/local-getcert.1 src/certmonger-local-submit.8 src/getcert-status.1 src/certmonger-dogtag-submit.8 src/certmonger-scep-submit.8 src/getcert-add-ca.1 src/getcert-add-scep-ca.1 src/getcert-modify-ca.1 src/getcert-remove-ca.1 src/getcert-rekey.1)
|
||||
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
|
||||
index 036a1ef2..9fd84ac9 100644
|
||||
--- a/dbus/Makefile.am
|
||||
+++ b/dbus/Makefile.am
|
||||
@@ -1,8 +1,8 @@
|
||||
if SESSIONBUS
|
||||
servicedir = @SESSIONBUSSERVICESDIR@
|
||||
-service_DATA = certmonger.service
|
||||
+service_DATA = org.fedorahosted.certmonger.service
|
||||
endif
|
||||
if SYSTEMBUS
|
||||
systemdbusdir = $(sysconfdir)/dbus-1/system.d
|
||||
-systemdbus_DATA = certmonger.conf
|
||||
+systemdbus_DATA = org.fedorahosted.certmonger.conf
|
||||
endif
|
||||
diff --git a/dbus/certmonger.conf.in b/dbus/certmonger.conf.in
|
||||
deleted file mode 100644
|
||||
index 37f1a8e1..00000000
|
||||
--- a/dbus/certmonger.conf.in
|
||||
+++ /dev/null
|
||||
@@ -1,28 +0,0 @@
|
||||
-<!DOCTYPE busconfig PUBLIC
|
||||
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
|
||||
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
-<busconfig>
|
||||
-
|
||||
- <!-- Only root can own and communicate with the service -->
|
||||
-
|
||||
- <policy context="default">
|
||||
- <deny own="@CM_DBUS_NAME@"/>
|
||||
- <deny send_destination="@CM_DBUS_NAME@"/>
|
||||
- </policy>
|
||||
-
|
||||
- <policy user="root">
|
||||
- <allow own="@CM_DBUS_NAME@"/>
|
||||
-
|
||||
- <allow send_destination="@CM_DBUS_NAME@"
|
||||
- send_interface="@CM_DBUS_NAME@"/>
|
||||
- <allow send_destination="@CM_DBUS_NAME@"
|
||||
- send_interface="@CM_DBUS_NAME@.ca"/>
|
||||
- <allow send_destination="@CM_DBUS_NAME@"
|
||||
- send_interface="@CM_DBUS_NAME@.request"/>
|
||||
- <allow send_destination="@CM_DBUS_NAME@"
|
||||
- send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
- <allow send_destination="@CM_DBUS_NAME@"
|
||||
- send_interface="org.freedesktop.DBus.Properties"/>
|
||||
- </policy>
|
||||
-
|
||||
-</busconfig>
|
||||
diff --git a/dbus/certmonger.service.in b/dbus/certmonger.service.in
|
||||
deleted file mode 100644
|
||||
index 74a8c55e..00000000
|
||||
--- a/dbus/certmonger.service.in
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-[D-BUS Service]
|
||||
-Name=@CM_DBUS_NAME@
|
||||
-Exec=@mylibexecdir@/certmonger-session
|
||||
diff --git a/dbus/org.fedorahosted.certmonger.conf.in b/dbus/org.fedorahosted.certmonger.conf.in
|
||||
new file mode 100644
|
||||
index 00000000..37f1a8e1
|
||||
--- /dev/null
|
||||
+++ b/dbus/org.fedorahosted.certmonger.conf.in
|
||||
@@ -0,0 +1,28 @@
|
||||
+<!DOCTYPE busconfig PUBLIC
|
||||
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
|
||||
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
+<busconfig>
|
||||
+
|
||||
+ <!-- Only root can own and communicate with the service -->
|
||||
+
|
||||
+ <policy context="default">
|
||||
+ <deny own="@CM_DBUS_NAME@"/>
|
||||
+ <deny send_destination="@CM_DBUS_NAME@"/>
|
||||
+ </policy>
|
||||
+
|
||||
+ <policy user="root">
|
||||
+ <allow own="@CM_DBUS_NAME@"/>
|
||||
+
|
||||
+ <allow send_destination="@CM_DBUS_NAME@"
|
||||
+ send_interface="@CM_DBUS_NAME@"/>
|
||||
+ <allow send_destination="@CM_DBUS_NAME@"
|
||||
+ send_interface="@CM_DBUS_NAME@.ca"/>
|
||||
+ <allow send_destination="@CM_DBUS_NAME@"
|
||||
+ send_interface="@CM_DBUS_NAME@.request"/>
|
||||
+ <allow send_destination="@CM_DBUS_NAME@"
|
||||
+ send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
+ <allow send_destination="@CM_DBUS_NAME@"
|
||||
+ send_interface="org.freedesktop.DBus.Properties"/>
|
||||
+ </policy>
|
||||
+
|
||||
+</busconfig>
|
||||
diff --git a/dbus/org.fedorahosted.certmonger.service.in b/dbus/org.fedorahosted.certmonger.service.in
|
||||
new file mode 100644
|
||||
index 00000000..74a8c55e
|
||||
--- /dev/null
|
||||
+++ b/dbus/org.fedorahosted.certmonger.service.in
|
||||
@@ -0,0 +1,3 @@
|
||||
+[D-BUS Service]
|
||||
+Name=@CM_DBUS_NAME@
|
||||
+Exec=@mylibexecdir@/certmonger-session
|
||||
--
|
||||
2.38.1
|
||||
|
@ -27,8 +27,8 @@
|
||||
%bcond_with xmlrpc
|
||||
|
||||
Name: certmonger
|
||||
Version: 0.79.17
|
||||
Release: 4%{?dist}
|
||||
Version: 0.79.18
|
||||
Release: 1%{?dist}
|
||||
Summary: Certificate status monitor and PKI enrollment client
|
||||
|
||||
License: GPL-3.0-or-later
|
||||
@ -36,8 +36,6 @@ URL: http://pagure.io/certmonger/
|
||||
Source0: http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz
|
||||
#Source1: http://releases.pagure.org/certmonger/certmonger-%%{version}.tar.gz.sig
|
||||
|
||||
Patch0001: 0001-Rename-DBus-service-and-conf-files-to-match-canonica.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gettext-devel
|
||||
@ -266,6 +264,9 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Apr 05 2023 Rob Crittenden <rcritten@redhat.com> - 0.79.18-1
|
||||
- Update to upstream 0.79.18
|
||||
|
||||
* Thu Feb 23 2023 Rob Crittenden <rcritten@redhat.com> - 0.79.17-4
|
||||
- migrated to SPDX license
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (certmonger-0.79.17.tar.gz) = ed631cbfc0a757143af912549cecf65346994107f27651022ada8c70f0ed1bac7ee053a99b9a13290b844999710a3207aa0e7718428f3a3b6e5dd0d5db3a88a9
|
||||
SHA512 (certmonger-0.79.18.tar.gz) = fff98b0e95f9e7394a8a4b7831f6249f2d0f518a178b9b65c4ff7a3c7fd98f9e3e634019a6a58e76454edaa8773b38bf2058c53cf51c8bf996b16388d5a5288a
|
||||
|
Loading…
Reference in New Issue
Block a user