Don-t-free-soptions-while-it-is-still-needed.patch

@@ -1,27 +0,0 @@
-From c5270bde4dab84f18c347e82376ef00733865247 Mon Sep 17 00:00:00 2001
-From: Rob Crittenden <rcritten@redhat.com>
-Date: Jul 01 2020 15:58:11 +0000
-Subject: Don't free soptions while it is still needed
-
-
-Introduced in fbcf03dd44007a9b231e9396cc418a00e1a4b49a trying
-to avoid leaking soptions and aoptions.
-
-https://pagure.io/certmonger/issue/163
-Signed-off-by: Rob Crittenden <rcritten@redhat.com>
-
----
-
-diff --git a/src/dogtag.c b/src/dogtag.c
-index 91c9c58..faf81f9 100644
---- a/src/dogtag.c
-+++ b/src/dogtag.c
-@@ -579,7 +579,6 @@ main(int argc, const char **argv)
- 				pin = NULL;
- 			}
- 		}
--		free(soptions);
- 		/* Add client creds. */
- 		if (uid != NULL) {
- 			uid = cm_submit_u_url_encode(uid);
-

certmonger.spec

@@ -1,24 +1,16 @@
-%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
-%if "%{vendor}" == "openEuler"
-%define vendor openeuler
-%endif
-
 Name:                   certmonger
-Version:                0.79.11
+Version:                0.79.8
-Release:                5
+Release:                3
 Summary:                Certificate status monitor and PKI enrollment client
 License:                GPLv3+
 URL:                    http://pagure.io/certmonger/
 Source0:                https://pagure.io/certmonger/archive/certmonger-%{version}/certmonger-certmonger-%{version}.tar.gz
-
-Patch0001:              Don-t-free-soptions-while-it-is-still-needed.patch
-
 BuildRequires:          autoconf automake gettext-devel gcc openldap-devel krb5-devel
 BuildRequires:          libidn2-devel dbus-devel nspr-devel nss-devel openssl-devel
 BuildRequires:          libuuid-devel libtalloc-devel libtevent-devel libcurl-devel
 BuildRequires:          libxml2-devel xmlrpc-c-devel systemd-units diffutils expect
 BuildRequires:          nss-tools openssl /usr/bin/dbus-launch /usr/bin/dos2unix
-BuildRequires:          /usr/bin/unix2dos /usr/bin/which python3-dbus popt-devel
+BuildRequires:          /usr/bin/unix2dos /usr/bin/which python2-dbus popt-devel
 Requires:               dbus
 Requires(post):         %{_bindir}/dbus-send systemd-units
 Requires(preun):        systemd-units dbus sed
@@ -31,12 +23,13 @@ system enrolled with a certificate authority (CA) and keeping it enrolled.
 
 %package help
 Summary:             Documentation for help using certmonger
+provides:            certmonger = %{version}-%{release}
 
 %description help
 This package provides docs for user of certmonger.
 
 %prep
-%autosetup -n certmonger-certmonger-%{version} -p1
+%autosetup -n certmonger-certmonger-%{version} -p1 -S git
 
 %build
 autoreconf -i -f
@@ -63,12 +56,12 @@ if test $1 -eq 1 ; then
 fi
 %triggerin -- certmonger < 0.58
 if test $1 -gt 1 ; then
-    objpath=`dbus-send --system --reply-timeout=10000 --dest=org.%{vendor}hosted.certmonger \
+    objpath=`dbus-send --system --reply-timeout=10000 --dest=org.openeulerhosted.certmonger \
-    --print-reply=o /org/%{vendor}hosted/certmonger org.%{vendor}hosted.certmonger.find_ca_by_nickname \
+    --print-reply=o /org/openeulerhosted/certmonger org.openeulerhosted.certmonger.find_ca_by_nickname \
                   string:dogtag-ipa-renew-agent 2> /dev/null | sed -r 's,^ +,,g' || true`
     if test -n "$objpath" ; then
-        dbus-send --system --dest=org.%{vendor}hosted.certmonger --print-reply /org/%{vendor}hosted/certmonger \
+        dbus-send --system --dest=org.openeulerhosted.certmonger --print-reply /org/openeulerhosted/certmonger \
-                                  org.%{vendor}hosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
+                                  org.openeulerhosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
     fi
     for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do
         if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then
@@ -113,20 +106,5 @@ fi
 %{_mandir}/man*/*
 
 %changelog
-* Fri Nov 18 2022 yaoxin <yaoxin30@h-partners.com> - 0.79.11-5
-- Replace openeuler with vendor
-
-* Sat Sep 11 2021 wutao <wutao61@huawei.com> - 0.79.11-4
-- delete help package provides certmonger to solve conflicts
-
-* Mon May 31 2021 baizhonggui <baizhonggui@huawei.com> - 0.79.11-3
-- %prep no longer patch with git
-
-* Tue Oct 27 2020 leiju <leiju4@huawei.com> - 0.79.11-2
-- Modify BuildRequires from python2-dbus to python3-dbus
-
-* Thu Aug 06 2020 lingsheng <lingsheng@huawei.com> - 0.79.11-1
-- Update to 0.79.11
-
 * Thu May 14 2020 Jeffery.Gao <gaojianxing@huawei.com> - 0.79.8-3
 - Package init