From 99bad34f3f288d98a662329c7defb5293417dbd7 Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw@redhat.com>
Date: Fri, 30 Nov 2018 15:56:35 -0500
Subject: [PATCH] Rebased to PKI 10.6.8

---
 .gitignore      |  1 +
 dogtag-pki.spec | 30 ++++++++++++++++--------------
 sources         |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3af8cd..c0ad13e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /pki-10.6.5.tar.gz
 /pki-10.6.6.tar.gz
 /pki-10.6.7.tar.gz
+/pki-10.6.8.tar.gz
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 4dec726..c280781 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -7,15 +7,7 @@ URL:              http://www.dogtagpki.org/
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no arch exclusion
-%else
-# Exclude 's390' and 's390x' architectures since
-# 'esc' does not exist on these two platforms
-ExcludeArch:      s390 s390x
-%endif
-
-Version:          10.6.7
+Version:          10.6.8
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 # global           _phase -a1
 
@@ -194,6 +186,7 @@ BuildRequires:    apache-commons-codec
 BuildRequires:    apache-commons-io
 BuildRequires:    apache-commons-lang
 BuildRequires:    jakarta-commons-httpclient
+BuildRequires:    glassfish-jaxb-api
 BuildRequires:    slf4j
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # no slf4j-jdk14
@@ -248,11 +241,11 @@ BuildRequires:    resteasy-atom-provider >= 3.0.17-1
 BuildRequires:    resteasy-client >= 3.0.17-1
 BuildRequires:    resteasy-jaxb-provider >= 3.0.17-1
 BuildRequires:    resteasy-core >= 3.0.17-1
-BuildRequires:    resteasy-jackson-provider >= 3.0.17-1
+BuildRequires:    resteasy-jackson2-provider >= 3.0.17-1
 %endif
 
 %if 0%{?with_python2}
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
 # no pylint
 %else
 BuildRequires:    pylint
@@ -267,7 +260,7 @@ BuildRequires:    python2-pyflakes >= 1.2.3
 %endif  # with_python2
 
 %if 0%{?with_python3}
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
 # no pylint
 %else
 BuildRequires:    python3-pylint
@@ -542,6 +535,7 @@ Requires:         apache-commons-io
 Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         jakarta-commons-httpclient
+Requires:         glassfish-jaxb-api
 Requires:         slf4j
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # no slf4j-jdk14
@@ -573,7 +567,7 @@ Requires:         resteasy-atom-provider >= 3.0.17-1
 Requires:         resteasy-client >= 3.0.17-1
 Requires:         resteasy-jaxb-provider >= 3.0.17-1
 Requires:         resteasy-core >= 3.0.17-1
-Requires:         resteasy-jackson-provider >= 3.0.17-1
+Requires:         resteasy-jackson2-provider >= 3.0.17-1
 %endif
 
 Requires:         xalan-j2
@@ -686,6 +680,9 @@ Requires:         tomcatjss >= 7.2.1-4
 Requires:         tomcatjss >= 7.3.6
 %endif
 
+# https://pagure.io/freeipa/issue/7742
+Conflicts:        freeipa-server < 4.7.1
+
 %description -n   pki-server
 The PKI Server Package contains libraries and utilities needed by the
 following PKI subsystems:
@@ -965,6 +962,7 @@ cd build
 %if 0%{?with_python3_default}
     -DWITH_PYTHON3_DEFAULT:BOOL=ON \
 %endif
+    -DPYTHON_EXECUTABLE=%{__python3} \
     -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \
 %if ! %{with server} && ! %{with ca} && ! %{with kra} && ! %{with ocsp} && ! %{with tks} && ! %{with tps}
     -DWITH_SERVER:BOOL=OFF \
@@ -1090,7 +1088,7 @@ fi
     rm -f %{buildroot}%{_datadir}/pki/server/lib/slf4j-jdk14.jar
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
 # no pylint
 %else
 
@@ -1569,6 +1567,7 @@ fi
 
 %doc themes/%{brand}/common-ui/LICENSE
 %dir %{_datadir}/pki
+%{_datadir}/pki/CS_SERVER_VERSION
 %{_datadir}/pki/common-ui/
 %{_datadir}/pki/server/webapps/pki/ca
 %{_datadir}/pki/server/webapps/pki/css
@@ -1591,6 +1590,9 @@ fi
 
 ################################################################################
 %changelog
+* Fri Nov 30 2018 Dogtag PKI Team <pki-team@redhat.com> - 10.6.8-1
+- Rebased to PKI 10.6.8
+
 * Mon Aug 13 2018 Dogtag PKI Team <pki-team@redhat.com> - 10.6.7-1
 - Rebased to PKI 10.6.7
 
diff --git a/sources b/sources
index f61a50c..e8b3d53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.7.tar.gz) = 06174ade48cf458469e7bda106aabb0d0c580b7e6e14a6fbf1c068a92fb2b9c53653d2d67c5401292ad398a5413bf3febe2d09b5d3a463a1f17416fc7a906510
+SHA512 (pki-10.6.8.tar.gz) = 112f5290857477736a810f14058fbc27d9add3299da359a8818b1068f388e1a1ca6662a13ac745778cc66777d073caa23a2a46215155f77f30d3771a654b215d