Sync changes to SLFO-1.2 branch

certmonger-c99-01.patch

@@ -1,25 +0,0 @@
-From b7fc1ae316db0d1c8f86e68d3fcb9b79f8d028d4 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Dec 22 2023 09:55:21 +0000
-Subject: Adjust parameter type for util_EVP_PKEY_id
-
-
-The function pointer needs to match the prototype for i2d_PublicKey
-and i2d_PrivateKey, otherwise a compilation error may result.
-
----
-
-diff --git a/src/util-o.c b/src/util-o.c
-index c05872c..7feecb9 100644
---- a/src/util-o.c
-+++ b/src/util-o.c
-@@ -551,7 +551,7 @@ util_NETSCAPE_SPKI_set_sig_alg(NETSCAPE_SPKI *spki, const X509_ALGOR *sig_alg)
- 
- static EVP_PKEY *
- util_EVP_PKEY_dup(EVP_PKEY *pkey,
--		  int (*i2d)(EVP_PKEY *, unsigned char **),
-+		  int (*i2d)(const EVP_PKEY *, unsigned char **),
- 		  EVP_PKEY *(*d2i)(int, EVP_PKEY **, const unsigned char **, long))
- {
- 	EVP_PKEY *k;
-

certmonger-c99-02.patch

@@ -1,26 +0,0 @@
-From a144529ce829ae6bed8607743c065c529ee5bf87 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Dec 22 2023 09:54:38 +0000
-Subject: Fix type error in cm_tdbusm_get_vn
-
-
-This fixes an out-of-bounds stack write on 32-bit architectures
-because dbus_message_iter_get_basic tries to write 64-bit integer
-into a 32-bit pointer variable.
-
----
-
-diff --git a/src/tdbusm.c b/src/tdbusm.c
-index 5e33411..8f2383d 100644
---- a/src/tdbusm.c
-+++ b/src/tdbusm.c
-@@ -223,7 +223,7 @@ cm_tdbusm_get_vn(DBusMessage *msg, void *parent, long *n)
- {
- 	DBusError err;
- 	DBusMessageIter iter, sub_iter;
--	int64_t *i64;
-+	int64_t i64;
- 
- 	dbus_error_init(&err);
- 
-

certmonger.changes

@@ -1,23 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 11 17:22:28 UTC 2024 - David Mulder <david.mulder@suse.com>
-
-- Add cm_dont_restart_external.patch (a SUSE specific patch) which
-  prevents the restart of the cert request for an external ca
-  (bsc#1221406).
-
--------------------------------------------------------------------
-Fri May 31 19:08:09 UTC 2024 - Martin Jambor <mjambor@suse.com>
-
-- Add certmonger-c99-01.patch and certmonger-c99-02.patch in order to
-  make the package buildable with GCC 14.  Patches originally by
-  Florian Weimer and from
-  https://pagure.io/certmonger/pull-request/265  [boo#1221683]
-
--------------------------------------------------------------------
-Mon Mar 18 13:52:53 UTC 2024 - David Mulder <dmulder@suse.com>
-
-- HMAC build requires changes (these requires are missing in SLE).
-
 -------------------------------------------------------------------
 Wed Dec 13 08:48:02 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
 

certmonger.spec

@@ -26,9 +26,6 @@ License:        GPL-3.0-or-later
 URL:            https://pagure.io/certmonger/
 Source0:        https://pagure.io/certmonger/archive/%{version}/certmonger-%{version}.tar.gz
 Patch0001:      0001-Update-tests-to-be-compatible-with-OpenSSL-3.2.patch
-Patch0002:      certmonger-c99-01.patch
-Patch0003:      certmonger-c99-02.patch
-Patch0004:      cm_dont_restart_external.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -42,10 +39,10 @@ BuildRequires:  gcc
 BuildRequires:  gettext-devel
 BuildRequires:  krb5-devel
 BuildRequires:  libcurl-devel
-BuildRequires:  libfreebl3
+BuildRequires:  libfreebl3-hmac
 BuildRequires:  libidn2-devel
 BuildRequires:  libjansson-devel >= 2.12
-BuildRequires:  libsoftokn3
+BuildRequires:  libsoftokn3-hmac
 BuildRequires:  libtalloc-devel
 BuildRequires:  libtevent-devel
 BuildRequires:  libuuid-devel
@@ -70,8 +67,8 @@ BuildRequires:  xmlrpc-c-devel
 
 Requires:       dbus-1
 Requires(post): dbus-1
-Requires(preun): dbus-1
-Requires(preun): sed
+Requires(preun):dbus-1
+Requires(preun):sed
 
 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}

cm_dont_restart_external.patch

@@ -1,26 +0,0 @@
---- certmonger-0.79.13-150400.3.3.1.x86_64/src/iterate.c	2020-10-20 21:39:55.000000000 +0200
-+++ certmonger-0.79.13-150400.3.3.1.x86_64/src/iterate.c	2024-05-08 10:48:22.851568239 +0200
-@@ -2389,15 +2389,19 @@ 
- 				case cm_ca_phase_renew_reqs:
- 				case cm_ca_phase_capabilities:
- 					if (emit_ca_changes != NULL) {
--						cm_restart_entries_by_ca(context,
--									 ca->cm_nickname);
-+						if(ca->cm_ca_type != cm_ca_external) {
-+							cm_restart_entries_by_ca(context,
-+									 	ca->cm_nickname);
-+						}
- 					}
- 					ca->cm_ca_state[state->cm_phase] = CM_CA_NEED_TO_ANALYZE;
- 					break;
- 				case cm_ca_phase_encryption_certs:
- 					if (emit_ca_changes != NULL) {
--						cm_restart_entries_by_ca(context,
--									 ca->cm_nickname);
-+						if(ca->cm_ca_type != cm_ca_external) {
-+							cm_restart_entries_by_ca(context,
-+										 ca->cm_nickname);
-+						}
- 					}
- 					ca->cm_ca_state[state->cm_phase] = CM_CA_NEED_TO_ANALYZE;
- 					break;