rpms/ipa
7
0
Fork 0
Code Issues Pull Requests Releases Activity

ipa-4.12.2-5

Browse Source 
- Resolves: RHEL-61636 Uninstall ACME separately during PKI uninstallation

Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2024-10-29 15:13:11 +01:00
parent 80f94e10a4
commit 26cff073ee
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0025-Small-fixup-to-determine-which-ACME-uninstaller-to-u.patch Normal file
View File

@ -0,0 +1,34 @@
From 9a2de23eb5e00efa72189c4a86d9db1fab52c2ca Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 24 Oct 2024 11:49:17 -0400
Subject: [PATCH] Small fixup to determine which ACME uninstaller to use
The conditional was <= 11.5.0 which it should have been
< 11.6.0 to allow for small updates to the 11.5.0 branch.
Fixes: https://pagure.io/freeipa/issue/9673
Fixes: https://pagure.io/freeipa/issue/9674
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
---
ipaserver/install/dogtaginstance.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
index 4b0f4d274b0c33140ed6f939f1a3fd8b75930ff9..58421a1d8859e5dd1357e07fd605e84e49048951 100644
--- a/ipaserver/install/dogtaginstance.py
+++ b/ipaserver/install/dogtaginstance.py
@@ -311,7 +311,7 @@ class DogtagInstance(service.Service):
return
elif (
pki.util.Version("11.0.0") <= pki_version
- <= pki.util.Version("11.5.0")
+ < pki.util.Version("11.6.0")
):
args = ['pki-server', 'acme-remove']
else:
--
2.47.0

6
freeipa.spec
View File

@ -205,7 +205,7 @@
Name: %{package_name} Name: %{package_name}
Version: %{IPA_VERSION} Version: %{IPA_VERSION}
Release: 4%{?rc_version:.%rc_version}%{?dist} Release: 5%{?rc_version:.%rc_version}%{?dist}
Summary: The Identity, Policy and Audit system Summary: The Identity, Policy and Audit system
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -260,6 +260,7 @@ Patch0021: 0021-ipa-migrate-man-page-fix-typos-and-errors.patch
Patch0022: 0022-ipatests-Test-for-ipa-hbac-rule-duplication.patch Patch0022: 0022-ipatests-Test-for-ipa-hbac-rule-duplication.patch
Patch0023: 0023-ipatests-refactor-password-file-handling-in-TestHSMI.patch Patch0023: 0023-ipatests-refactor-password-file-handling-in-TestHSMI.patch
Patch0024: 0024-ipatests-2FA-test-cases.patch Patch0024: 0024-ipatests-2FA-test-cases.patch
Patch0025: 0025-Small-fixup-to-determine-which-ACME-uninstaller-to-u.patch
Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch
%endif %endif
%endif %endif
@ -1882,6 +1883,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Oct 29 2024 Florence Blanc-Renaud <flo@redhat.com> - 4.12.2-5
- Resolves: RHEL-61636 Uninstall ACME separately during PKI uninstallation
* Mon Oct 21 2024 Florence Blanc-Renaud <flo@redhat.com> - 4.12.2-4 * Mon Oct 21 2024 Florence Blanc-Renaud <flo@redhat.com> - 4.12.2-4
- Related: RHEL-59777 Rebase Samba to the latest 4.21.x release - Related: RHEL-59777 Rebase Samba to the latest 4.21.x release
- Resolves: RHEL-59659 ipa dns-zone --allow-query '!198.18.2.0/24;any;' fails with Unrecognized IPAddress flags - Resolves: RHEL-59659 ipa dns-zone --allow-query '!198.18.2.0/24;any;' fails with Unrecognized IPAddress flags