From e500f868ac38fbe22c4fb5b332d4504844b863c1 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Fri, 26 Nov 2021 09:44:16 +0200
Subject: [PATCH] FreeIPA 4.9.8 upstream release

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
---
 .gitignore   |  2 ++
 freeipa.spec | 10 +++++-----
 sources      |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e83f87..32a0945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@
 /freeipa-4.9.6.tar.gz.asc
 /freeipa-4.9.7.tar.gz
 /freeipa-4.9.7.tar.gz.asc
+/freeipa-4.9.8.tar.gz
+/freeipa-4.9.8.tar.gz.asc
diff --git a/freeipa.spec b/freeipa.spec
index aea453b..6fbbdfe 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -183,7 +183,7 @@
 
 # Work-around fact that RPM SPEC parser does not accept
 # "Version: @VERSION@" in freeipa.spec.in used for Autoconf string replacement
-%define IPA_VERSION 4.9.7
+%define IPA_VERSION 4.9.8
 # Release candidate version -- uncomment with one percent for RC versions
 #%%global rc_version %%nil
 %define AT_SIGN @
@@ -196,7 +196,7 @@
 
 Name:           %{package_name}
 Version:        %{IPA_VERSION}
-Release:        4%{?rc_version:.%rc_version}%{?dist}
+Release:        1%{?rc_version:.%rc_version}%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 License:        GPLv3+
@@ -220,9 +220,6 @@ Patch1001:      1001-Change-branding-to-IPA-and-Identity-Management.patch
 %endif
 %endif
 # RHEL spec file only: END
-Patch0001:      0001-Make-Dogtag-return-XML-for-ipa-cert-find.patch
-Patch0002:      freeipa-harden-pac.patch
-Patch0003:      freeipa-harden-pac-2.patch
 
 # For the timestamp trick in patch application
 BuildRequires:  diffstat
@@ -1706,6 +1703,9 @@ fi
 %endif
 
 %changelog
+* Fri Nov 26 2021 Alexander Bokovoy <abokovoy@redhat.com> - 4.9.8-1
+- Upstream release FreeIPA 4.9.8
+
 * Thu Nov 11 2021 Alexander Bokovoy <abokovoy@redhat.com> - 4.9.7-4
 - Hardening for CVE-2020-25717 part 2
 - Handle S4U for users from trusted domains
diff --git a/sources b/sources
index 4a82f24..72b619f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (freeipa-4.9.7.tar.gz) = ab12bc8e8ab9eed9b729594b91a8f20a5d8d6d650966f32c42456de76b2a8b4e6c2b7df560d0f9188e1d409c19bda2fdef1febfb69b5c6c6a26146c3056c21b3
-SHA512 (freeipa-4.9.7.tar.gz.asc) = 8d97d834ee208db6692af423ae461f18e6b060ea796f528582b04a055b6fc6611a60bc39bea5996cd968620fe3763547c8ebc45bce8ef69f56909fbdb5ec0e90
+SHA512 (freeipa-4.9.8.tar.gz) = 2fc27c5eb6f3fd0ed8cdba7668f72da3c5a84ec089159bd1dfde44b1d4abefb1280a18d559979b2167ba942facbf33e6d80fa32ee1af2b6881ecdf9162b6b32e
+SHA512 (freeipa-4.9.8.tar.gz.asc) = 40a72f993c599c78d21ba6c1352eef1b48f91d31805d351fef0f18b978c42624788f6ed72b1c4c0fc11e7525c8072e99e197987f3315761905c4c9dc52abbbc0