Update to upstream 0.79.20

Resolves: RHEL-12493

.gitignore

@@ -132,3 +132,4 @@ certmonger-0.28.tar.gz
 /certmonger-0.79.13.tar.gz
 /certmonger-0.79.14.tar.gz
 /certmonger-0.79.17.tar.gz
+/certmonger-0.79.20.tar.gz

0001-getcert-return-2-when-trying-to-create-a-duplicate-e.patch

@@ -1,54 +0,0 @@
-From 4ef80a8365e746d514110520c76d23433d1a378b Mon Sep 17 00:00:00 2001
-From: Rob Crittenden <rcritten@redhat.com>
-Date: Mon, 22 Jan 2024 09:44:30 -0500
-Subject: [PATCH 1/2] getcert: return 2 when trying to create a duplicate entry
-
-This affects the add-ca, request and start-tracking commands.
-
-Returning a unique return code will make scripting easier.
-
-Fixes: https://www.pagure.io/certmonger/issue/269
-
-Signed-off-by: Rob Crittenden <rcritten@redhat.com>
----
- src/getcert.1.in | 9 +++++++++
- src/getcert.c    | 3 +++
- 2 files changed, 12 insertions(+)
-
-diff --git a/src/getcert.1.in b/src/getcert.1.in
-index 4adfc925..754a8836 100644
---- a/src/getcert.1.in
-+++ b/src/getcert.1.in
-@@ -43,6 +43,15 @@ All commands can take either the \fB\-s\fR or \fB\-S\fR arguments, which instruc
- bus, if no value is set.  By default, \fIgetcert\fR consults the @CM_DBUS_NAME@
- service attached to the system bus.
- 
-+.SH "EXIT STATUS"
-+The exit status is 0 on success, nonzero on error.
-+
-+0 Success
-+
-+1 Error
-+
-+2 Duplicate entry
-+
- .SH BUGS
- Please file tickets for any that you find at https://fedorahosted.org/certmonger/
- 
-diff --git a/src/getcert.c b/src/getcert.c
-index 77fa5367..81b4bc8d 100644
---- a/src/getcert.c
-+++ b/src/getcert.c
-@@ -497,6 +497,9 @@ send_req(DBusMessage *req, int verbose)
- 			printf(_("No response received from %s service.\n"),
- 			       CM_DBUS_NAME);
- 		}
-+		if (strcmp(err.name, "org.fedorahosted.certmonger.duplicate") == 0) {
-+			exit(2);
-+		}
- 		exit(1);
- 	}
- 	dbus_message_unref(req);
--- 
-2.42.0
-

0002-getcert-add-NULL-check-to-duplicate-string-compare.patch

@@ -1,28 +0,0 @@
-From d9a773f709b42b6fe7d8816da656e5bee2afd641 Mon Sep 17 00:00:00 2001
-From: Rob Crittenden <rcritten@redhat.com>
-Date: Tue, 30 Jan 2024 09:06:53 -0500
-Subject: [PATCH 2/2] getcert: add NULL check to duplicate string compare
-
-Fixes: https://www.pagure.io/certmonger/issue/269
-
-Signed-off-by: Rob Crittenden <rcritten@redhat.com>
----
- src/getcert.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/getcert.c b/src/getcert.c
-index 81b4bc8d..f5575bce 100644
---- a/src/getcert.c
-+++ b/src/getcert.c
-@@ -497,7 +497,7 @@ send_req(DBusMessage *req, int verbose)
- 			printf(_("No response received from %s service.\n"),
- 			       CM_DBUS_NAME);
- 		}
--		if (strcmp(err.name, "org.fedorahosted.certmonger.duplicate") == 0) {
-+		if ((err.name != NULL) && strcmp(err.name, "org.fedorahosted.certmonger.duplicate") == 0) {
- 			exit(2);
- 		}
- 		exit(1);
--- 
-2.42.0
-

certmonger.spec

@@ -27,16 +27,14 @@
 %bcond_with xmlrpc
 
 Name:		certmonger
-Version:	0.79.17
+Version:	0.79.20
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Certificate status monitor and PKI enrollment client
 
 License:	GPLv3+
 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-getcert-return-2-when-trying-to-create-a-duplicate-e.patch
-Patch0002:	0002-getcert-add-NULL-check-to-duplicate-string-compare.patch
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -267,6 +265,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 10 2024 Rob Crittenden <rcritten@redhat.com> - 0.79.20-1
+- Update to upstream 0.79.20
+
 * Thu Feb 01 2024 Rob Crittenden <rcritten@redhat.com> - 0.79.17-2
 - getcert should return unique error on duplicates (RHEL-22302)
 

sources

@@ -1 +1 @@
-SHA512 (certmonger-0.79.17.tar.gz) = ed631cbfc0a757143af912549cecf65346994107f27651022ada8c70f0ed1bac7ee053a99b9a13290b844999710a3207aa0e7718428f3a3b6e5dd0d5db3a88a9
+SHA512 (certmonger-0.79.20.tar.gz) = 76685185172bbf2c766c477c399ce0b14c9fd2d81637b44b8da80ae045ebf6c650ae3d525a87dccd755a6c92d4a5916bb62f8ea1d8520c47ae64770be6a5d2be