From 89333866fc8bddd51117058d0c4c577e1d00af7a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 09:51:20 +0000 Subject: [PATCH] import CS certmonger-0.79.17-2.el9 --- ...-when-trying-to-create-a-duplicate-e.patch | 54 +++++++++++++++++++ ...LL-check-to-duplicate-string-compare.patch | 28 ++++++++++ SPECS/certmonger.spec | 8 ++- 3 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 SOURCES/0001-getcert-return-2-when-trying-to-create-a-duplicate-e.patch create mode 100644 SOURCES/0002-getcert-add-NULL-check-to-duplicate-string-compare.patch diff --git a/SOURCES/0001-getcert-return-2-when-trying-to-create-a-duplicate-e.patch b/SOURCES/0001-getcert-return-2-when-trying-to-create-a-duplicate-e.patch new file mode 100644 index 0000000..e349fcf --- /dev/null +++ b/SOURCES/0001-getcert-return-2-when-trying-to-create-a-duplicate-e.patch @@ -0,0 +1,54 @@ +From 4ef80a8365e746d514110520c76d23433d1a378b Mon Sep 17 00:00:00 2001 +From: Rob Crittenden +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 +--- + 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 + diff --git a/SOURCES/0002-getcert-add-NULL-check-to-duplicate-string-compare.patch b/SOURCES/0002-getcert-add-NULL-check-to-duplicate-string-compare.patch new file mode 100644 index 0000000..217358d --- /dev/null +++ b/SOURCES/0002-getcert-add-NULL-check-to-duplicate-string-compare.patch @@ -0,0 +1,28 @@ +From d9a773f709b42b6fe7d8816da656e5bee2afd641 Mon Sep 17 00:00:00 2001 +From: Rob Crittenden +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 +--- + 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 + diff --git a/SPECS/certmonger.spec b/SPECS/certmonger.spec index addd5a2..ece99c9 100644 --- a/SPECS/certmonger.spec +++ b/SPECS/certmonger.spec @@ -28,14 +28,15 @@ Name: certmonger Version: 0.79.17 -Release: 1%{?dist} +Release: 2%{?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 @@ -266,6 +267,9 @@ exit 0 %endif %changelog +* Thu Feb 01 2024 Rob Crittenden - 0.79.17-2 +- getcert should return unique error on duplicates (RHEL-22302) + * Tue Dec 6 2022 Rob Crittenden - 0.79.17-1 - Update to upstream 0.79.17