Make Dogtag return XML for ipa cert-find

Backport upstream patch from https://pagure.io/freeipa/issue/8980

Resolves: #2014658

0001-Make-Dogtag-return-XML-for-ipa-cert-find.patch

@@ -0,0 +1,33 @@
+From d43b513927d6dd0a12464dd24287ce40ccaf33e4 Mon Sep 17 00:00:00 2001
+From: Chris Kelley <ckelley@redhat.com>
+Date: Fri, 10 Sep 2021 16:47:22 +0100
+Subject: [PATCH] Make Dogtag return XML for ipa cert-find
+
+Using JSON by default within Dogtag appears to cause ipa cert-find to
+return JSON, when the request was made with XML. We can request that XML
+is returned as before by specifying so in the request header.
+
+Fixes: https://pagure.io/freeipa/issue/8980
+Signed-off-by: Chris Kelley <ckelley@redhat.com>
+Reviewed-By: Francois Cami <fcami@redhat.com>
+---
+ ipaserver/plugins/dogtag.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
+index be2e4bb4e..b4feddfac 100644
+--- a/ipaserver/plugins/dogtag.py
++++ b/ipaserver/plugins/dogtag.py
+@@ -1832,7 +1832,8 @@ class ra(rabase.rabase, RestClient):
+             method='POST',
+             headers={'Accept-Encoding': 'gzip, deflate',
+                      'User-Agent': 'IPA',
+-                     'Content-Type': 'application/xml'},
++                     'Content-Type': 'application/xml',
++                     'Accept': 'application/xml'},
+             body=payload
+         )
+ 
+-- 
+2.31.1
+

freeipa.spec

@@ -195,7 +195,7 @@
 
 Name:           %{package_name}
 Version:        %{IPA_VERSION}
-Release:        1%{?rc_version:.%rc_version}%{?dist}.1
+Release:        2%{?rc_version:.%rc_version}%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 License:        GPLv3+
@@ -219,6 +219,7 @@ 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
 
 # For the timestamp trick in patch application
 BuildRequires:  diffstat
@@ -1701,6 +1702,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 15 2021 Rob Crittenden <rcritten@redhat.com> - 4.9.7-2
+- Make Dogtag return XML for ipa cert-find (#2014658)
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 4.9.7-1.1
 - Rebuilt with OpenSSL 3.0.0