From 7142f8d195be2ea3b7de7f451bee0fb2915bdcfa Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 14 Sep 2020 14:48:40 -0400 Subject: [PATCH] Rebase to Dogtag PKI 10.9.4 Signed-off-by: Alexander Scheel --- .gitignore | 1 + 0001-Make-JDK-dependency-dynamic.patch | 61 ------- 0002-Add-server-dependency-on-jaxb-api.patch | 25 --- ...-Implementation-dependency-for-JDK11.patch | 153 ----------------- ...arta-Activation-dependency-for-JDK11.patch | 160 ------------------ dogtag-pki.spec | 33 +++- sources | 2 +- 7 files changed, 29 insertions(+), 406 deletions(-) delete mode 100644 0001-Make-JDK-dependency-dynamic.patch delete mode 100644 0002-Add-server-dependency-on-jaxb-api.patch delete mode 100644 0003-Add-JAXB-Implementation-dependency-for-JDK11.patch delete mode 100644 0004-Add-Jakarta-Activation-dependency-for-JDK11.patch diff --git a/.gitignore b/.gitignore index c4ab42c..be6f1f5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /pki-10.9.0-b2.tar.gz /pki-10.9.1.tar.gz /pki-10.9.2.tar.gz +/pki-10.9.4.tar.gz diff --git a/0001-Make-JDK-dependency-dynamic.patch b/0001-Make-JDK-dependency-dynamic.patch deleted file mode 100644 index cc2d029..0000000 --- a/0001-Make-JDK-dependency-dynamic.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 2ba8973d4d874bb135d52bb9288e31687903ccd3 Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Thu, 20 Aug 2020 11:31:10 -0400 -Subject: [PATCH 1/4] Make JDK dependency dynamic - -Signed-off-by: Alexander Scheel ---- - pki.spec | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/pki.spec b/pki.spec -index 186a6dfbf..fbaefbc9c 100644 ---- a/pki.spec -+++ b/pki.spec -@@ -52,6 +52,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver - ################################################################################ - - %define java_home /usr/lib/jvm/jre-openjdk -+%define java_devel java-devel -+%define java_headless java-headless - - %if 0%{?fedora} && 0%{?fedora} >= 33 - %define min_java_version 1:11 -@@ -157,7 +159,7 @@ BuildRequires: make - BuildRequires: cmake >= 3.0.2 - BuildRequires: gcc-c++ - BuildRequires: zip --BuildRequires: java-devel >= %{min_java_version} -+BuildRequires: %java_devel >= %{min_java_version} - BuildRequires: javapackages-tools - BuildRequires: redhat-rpm-config - BuildRequires: ldapjdk >= 4.22.0 -@@ -331,7 +333,7 @@ PKI consists of the following components: - - Summary: PKI Symmetric Key Package - --Requires: java-headless >= %{min_java_version} -+Requires: %java_headless >= %{min_java_version} - Requires: jpackage-utils >= 0:1.7.5-10 - Requires: jss >= 4.7.0 - Requires: nss >= 3.38.0 -@@ -399,7 +401,7 @@ This package contains PKI client library for Python 3. - Summary: PKI Base Java Package - BuildArch: noarch - --Requires: java-headless >= %{min_java_version} -+Requires: %java_headless >= %{min_java_version} - Requires: apache-commons-cli - Requires: apache-commons-codec - Requires: apache-commons-io -@@ -492,6 +494,7 @@ Requires: tomcat >= 1:9.0.7 - %endif - - Requires: velocity -+Requires: sudo - Requires: systemd - Requires(post): systemd-units - Requires(preun): systemd-units --- -2.26.2 - diff --git a/0002-Add-server-dependency-on-jaxb-api.patch b/0002-Add-server-dependency-on-jaxb-api.patch deleted file mode 100644 index a598d2e..0000000 --- a/0002-Add-server-dependency-on-jaxb-api.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 55e82e4a31b93e0cf3e3e98533145f5f52c716fd Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Thu, 6 Aug 2020 18:31:13 -0400 -Subject: [PATCH 2/4] Add server dependency on jaxb-api - -Signed-off-by: Alexander Scheel ---- - base/server/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt -index 8f83aed91..64e66c9fc 100644 ---- a/base/server/CMakeLists.txt -+++ b/base/server/CMakeLists.txt -@@ -97,6 +97,7 @@ add_custom_command( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_BASE_JAR} common/lib/jackson-jaxrs-base.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_JSON_PROVIDER_JAR} common/lib/jackson-jaxrs-json-provider.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} common/lib/jackson-module-jaxb-annotations.jar -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_API_JAR} common/lib/jaxb-api.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} common/lib/jss4.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} common/lib/ldapjdk.jar - COMMAND ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/pki-cmsutil.jar --- -2.26.2 - diff --git a/0003-Add-JAXB-Implementation-dependency-for-JDK11.patch b/0003-Add-JAXB-Implementation-dependency-for-JDK11.patch deleted file mode 100644 index 30e0497..0000000 --- a/0003-Add-JAXB-Implementation-dependency-for-JDK11.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 5971bd813096e4fa994547a691a3b5bf7b3427dd Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Wed, 19 Aug 2020 15:24:59 -0400 -Subject: [PATCH 3/4] Add JAXB Implementation dependency for JDK11+ - -Signed-off-by: Alexander Scheel ---- - .classpath | 1 + - base/CMakeLists.txt | 8 ++++++++ - base/common/CMakeLists.txt | 3 ++- - base/server/CMakeLists.txt | 1 + - base/server/share/conf/pki.policy | 4 ++++ - pki.spec | 1 + - pom.xml | 6 ++++++ - scripts/compose_pki_test_package | 1 + - tests/dogtag/dev_java_tests/run_junit_tests.sh | 1 + - 9 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/.classpath b/.classpath -index 04168f05a..ae7f001a0 100644 ---- a/.classpath -+++ b/.classpath -@@ -34,6 +34,7 @@ - - - -+ - - - -diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt -index 5f94170ac..2fef383ec 100644 ---- a/base/CMakeLists.txt -+++ b/base/CMakeLists.txt -@@ -174,6 +174,14 @@ find_file(JAXB_API_JAR - /usr/share/java - ) - -+find_file(JAXB_IMPL_JAR -+ NAMES -+ jaxb-impl.jar -+ PATHS -+ /usr/share/java/jaxb -+ /usr/share/java -+) -+ - find_file(JSS_JAR - NAMES - jss4.jar -diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt -index 4c21bb4aa..4fb3e30b5 100644 ---- a/base/common/CMakeLists.txt -+++ b/base/common/CMakeLists.txt -@@ -29,6 +29,7 @@ add_custom_command( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_JSON_PROVIDER_JAR} lib/jackson-jaxrs-json-provider.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} lib/jackson-module-jaxb-annotations.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_API_JAR} lib/jaxb-api.jar -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_IMPL_JAR} lib/jaxb-impl.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} lib/jss4.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} lib/ldapjdk.jar - COMMAND ln -sf /usr/share/java/pki/pki-certsrv.jar ${CMAKE_CURRENT_BINARY_DIR}/lib/pki-certsrv.jar -@@ -147,7 +148,7 @@ install( - - install( - DIRECTORY -- DESTINATION -+ DESTINATION - ${SYSTEMD_ETC_INSTALL_DIR}/pki-tomcatd.target.wants - ) - -diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt -index 64e66c9fc..7053ac208 100644 ---- a/base/server/CMakeLists.txt -+++ b/base/server/CMakeLists.txt -@@ -98,6 +98,7 @@ add_custom_command( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_JSON_PROVIDER_JAR} common/lib/jackson-jaxrs-json-provider.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} common/lib/jackson-module-jaxb-annotations.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_API_JAR} common/lib/jaxb-api.jar -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_IMPL_JAR} common/lib/jaxb-impl.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} common/lib/jss4.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} common/lib/ldapjdk.jar - COMMAND ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/pki-cmsutil.jar -diff --git a/base/server/share/conf/pki.policy b/base/server/share/conf/pki.policy -index 9d66f9d51..2fbcaef90 100644 ---- a/base/server/share/conf/pki.policy -+++ b/base/server/share/conf/pki.policy -@@ -48,6 +48,10 @@ grant codeBase "file:/usr/share/java/jaxb-api.jar" { - permission java.security.AllPermission; - }; - -+grant codeBase "file:/usr/share/java/jaxb/jaxb-impl.jar" { -+ permission java.security.AllPermission; -+}; -+ - grant codeBase "file:/usr/share/java/jaxme/jaxmeapi.jar" { - permission java.security.AllPermission; - }; -diff --git a/pki.spec b/pki.spec -index fbaefbc9c..8d931a8a7 100644 ---- a/pki.spec -+++ b/pki.spec -@@ -423,6 +423,7 @@ Requires: resteasy >= 3.0.26 - Requires: resteasy-atom-provider >= 3.0.17-1 - Requires: resteasy-client >= 3.0.17-1 - Requires: resteasy-jaxb-provider >= 3.0.17-1 -+Requires: jaxb-impl - Requires: resteasy-core >= 3.0.17-1 - Requires: resteasy-jackson2-provider >= 3.0.17-1 - %endif -diff --git a/pom.xml b/pom.xml -index 731d41cbe..35644e20e 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -80,6 +80,12 @@ - runtime - - -+ -+ com.sun.xml.bind -+ jaxb-impl -+ 2.3.3 -+ -+ - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec -diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package -index 1642cd8d9..f6de770e1 100755 ---- a/scripts/compose_pki_test_package -+++ b/scripts/compose_pki_test_package -@@ -118,6 +118,7 @@ CLASSPATH=$CLASSPATH:/usr/share/java/idm-console-mcc.jar - CLASSPATH=$CLASSPATH:/usr/share/java/idm-console-nmclf.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jaxb-api.jar -+CLASSPATH=$CLASSPATH:/usr/share/java/jaxb/jaxb-impl.jar - CLASSPATH=$CLASSPATH:/usr/share/java/ldapjdk.jar - CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-lang.jar - CLASSPATH=$CLASSPATH:/usr/share/java/istack-commons-runtime.jar -diff --git a/tests/dogtag/dev_java_tests/run_junit_tests.sh b/tests/dogtag/dev_java_tests/run_junit_tests.sh -index 4544c1496..317958ccc 100644 ---- a/tests/dogtag/dev_java_tests/run_junit_tests.sh -+++ b/tests/dogtag/dev_java_tests/run_junit_tests.sh -@@ -54,6 +54,7 @@ run_dev_junit_tests() { - CLASSPATH=$CLASSPATH:/usr/share/java/idm-console-nmclf.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jaxb-api.jar -+ CLASSPATH=$CLASSPATH:/usr/share/java/jaxb/jaxb-impl.jar - CLASSPATH=$CLASSPATH:/usr/share/java/ldapjdk.jar - CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-lang.jar - CLASSPATH=$CLASSPATH:/usr/share/java/istack-commons-runtime.jar --- -2.26.2 - diff --git a/0004-Add-Jakarta-Activation-dependency-for-JDK11.patch b/0004-Add-Jakarta-Activation-dependency-for-JDK11.patch deleted file mode 100644 index 977a087..0000000 --- a/0004-Add-Jakarta-Activation-dependency-for-JDK11.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 17af4157bb51efe829314d3bdd9efedd14667d26 Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Thu, 20 Aug 2020 08:47:58 -0400 -Subject: [PATCH 4/4] Add Jakarta Activation dependency for JDK11+ - -Signed-off-by: Alexander Scheel ---- - .classpath | 1 + - base/CMakeLists.txt | 14 ++++++++++++++ - base/common/CMakeLists.txt | 1 + - base/server/CMakeLists.txt | 1 + - base/server/share/conf/pki.policy | 4 ++++ - pki.spec | 6 +++++- - pom.xml | 6 ++++++ - scripts/compose_pki_test_package | 1 + - tests/dogtag/dev_java_tests/run_junit_tests.sh | 2 +- - 9 files changed, 34 insertions(+), 2 deletions(-) - -diff --git a/.classpath b/.classpath -index ae7f001a0..078d3a403 100644 ---- a/.classpath -+++ b/.classpath -@@ -35,6 +35,7 @@ - - - -+ - - - -diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt -index 2fef383ec..8a19f9c71 100644 ---- a/base/CMakeLists.txt -+++ b/base/CMakeLists.txt -@@ -182,6 +182,20 @@ find_file(JAXB_IMPL_JAR - /usr/share/java - ) - -+find_file(JAKARTA_ACTIVATION_JAR -+ NAMES -+ jakarta.activation.jar -+ jakarta-activation.jar -+ jaxb.activation.jar -+ jaxb-activation.jar -+ PATHS -+ /usr/share/java/jakarta-activation -+ /usr/share/java/jakarta -+ /usr/share/java/jaxb-activation -+ /usr/share/java/jaxb -+ /usr/share/java -+) -+ - find_file(JSS_JAR - NAMES - jss4.jar -diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt -index 4fb3e30b5..4e9d44255 100644 ---- a/base/common/CMakeLists.txt -+++ b/base/common/CMakeLists.txt -@@ -30,6 +30,7 @@ add_custom_command( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} lib/jackson-module-jaxb-annotations.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_API_JAR} lib/jaxb-api.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_IMPL_JAR} lib/jaxb-impl.jar -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAKARTA_ACTIVATION_JAR} lib/jakarta.activation.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} lib/jss4.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} lib/ldapjdk.jar - COMMAND ln -sf /usr/share/java/pki/pki-certsrv.jar ${CMAKE_CURRENT_BINARY_DIR}/lib/pki-certsrv.jar -diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt -index 7053ac208..04f537436 100644 ---- a/base/server/CMakeLists.txt -+++ b/base/server/CMakeLists.txt -@@ -99,6 +99,7 @@ add_custom_command( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} common/lib/jackson-module-jaxb-annotations.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_API_JAR} common/lib/jaxb-api.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXB_IMPL_JAR} common/lib/jaxb-impl.jar -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAKARTA_ACTIVATION_JAR} common/lib/jakarta.activation.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} common/lib/jss4.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} common/lib/ldapjdk.jar - COMMAND ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/pki-cmsutil.jar -diff --git a/base/server/share/conf/pki.policy b/base/server/share/conf/pki.policy -index 2fbcaef90..460fff0bb 100644 ---- a/base/server/share/conf/pki.policy -+++ b/base/server/share/conf/pki.policy -@@ -52,6 +52,10 @@ grant codeBase "file:/usr/share/java/jaxb/jaxb-impl.jar" { - permission java.security.AllPermission; - }; - -+grant codeBase "file:/usr/share/java/jakarta-activation/jakarta.activation.jar" { -+ permission java.security.AllPermission; -+}; -+ - grant codeBase "file:/usr/share/java/jaxme/jaxmeapi.jar" { - permission java.security.AllPermission; - }; -diff --git a/pki.spec b/pki.spec -index 8d931a8a7..e29b6d12f 100644 ---- a/pki.spec -+++ b/pki.spec -@@ -423,11 +423,15 @@ Requires: resteasy >= 3.0.26 - Requires: resteasy-atom-provider >= 3.0.17-1 - Requires: resteasy-client >= 3.0.17-1 - Requires: resteasy-jaxb-provider >= 3.0.17-1 --Requires: jaxb-impl - Requires: resteasy-core >= 3.0.17-1 - Requires: resteasy-jackson2-provider >= 3.0.17-1 - %endif - -+%if 0%{?fedora} && 0%{?fedora} >= 33 -+Requires: jaxb-impl >= 2.3.3 -+Requires: jakarta-activation >= 1.2.2 -+%endif -+ - Requires: xalan-j2 - Requires: xerces-j2 - Requires: xml-commons-apis -diff --git a/pom.xml b/pom.xml -index 35644e20e..34af3c121 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -86,6 +86,12 @@ - 2.3.3 - - -+ -+ jakarta.activation -+ jakarta.activation-api -+ 1.2.2 -+ -+ - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec -diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package -index f6de770e1..b8c39c682 100755 ---- a/scripts/compose_pki_test_package -+++ b/scripts/compose_pki_test_package -@@ -119,6 +119,7 @@ CLASSPATH=$CLASSPATH:/usr/share/java/idm-console-nmclf.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jaxb-api.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jaxb/jaxb-impl.jar -+CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-activation/jakarta.activation.jar - CLASSPATH=$CLASSPATH:/usr/share/java/ldapjdk.jar - CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-lang.jar - CLASSPATH=$CLASSPATH:/usr/share/java/istack-commons-runtime.jar -diff --git a/tests/dogtag/dev_java_tests/run_junit_tests.sh b/tests/dogtag/dev_java_tests/run_junit_tests.sh -index 317958ccc..76efd757b 100644 ---- a/tests/dogtag/dev_java_tests/run_junit_tests.sh -+++ b/tests/dogtag/dev_java_tests/run_junit_tests.sh -@@ -54,7 +54,7 @@ run_dev_junit_tests() { - CLASSPATH=$CLASSPATH:/usr/share/java/idm-console-nmclf.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar - CLASSPATH=$CLASSPATH:/usr/share/java/jaxb-api.jar -- CLASSPATH=$CLASSPATH:/usr/share/java/jaxb/jaxb-impl.jar -+ CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-activation/jakarta.activation.jar - CLASSPATH=$CLASSPATH:/usr/share/java/ldapjdk.jar - CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-lang.jar - CLASSPATH=$CLASSPATH:/usr/share/java/istack-commons-runtime.jar --- -2.26.2 - diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 03d3229..2e54cef 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -12,7 +12,7 @@ License: GPLv2 and LGPLv2 # For development (unsupported) releases, use x.y.z-0.n.unstable with alpha/beta phase. # For official (supported) releases, use x.y.z-r where r >=1 without alpha/beta phase. -Version: 10.9.2 +Version: 10.9.4 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 @@ -31,11 +31,6 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver # > pki-VERSION-RELEASE.patch # Patch: pki-VERSION-RELEASE.patch -Patch1: 0001-Make-JDK-dependency-dynamic.patch -Patch2: 0002-Add-server-dependency-on-jaxb-api.patch -Patch3: 0003-Add-JAXB-Implementation-dependency-for-JDK11.patch -Patch4: 0004-Add-Jakarta-Activation-dependency-for-JDK11.patch - ################################################################################ # NSS @@ -822,6 +817,13 @@ This package contains PKI test suite. %build ################################################################################ +# get Java . version number +java_version=`%{java_home}/bin/java -XshowSettings:properties -version 2>&1 | sed -n 's/ *java.version *= *\([0-9]\+\.[0-9]\+\).*/\1/p'` + +# if == 1, get version number +# otherwise get version number +java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'` + # get Tomcat . version number tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'` @@ -831,11 +833,17 @@ else app_server=tomcat-$tomcat_version fi +%if 0%{?rhel} +%{__mkdir_p} build +cd build +%endif + %cmake \ --no-warn-unused-cli \ -DVERSION=%{version}-%{release} \ -DVAR_INSTALL_DIR:PATH=/var \ -DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \ + -DJAVA_VERSION=%{java_version} \ -DJAVA_HOME=%java_home \ -DPKI_JAVA_PATH=%java \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ @@ -853,9 +861,15 @@ fi -DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \ -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \ -DTHEME=%{?with_theme:%{vendor_id}} \ +%if 0%{?rhel} + .. +%else -B %{_vpath_builddir} +%endif +%if 0%{?fedora} cd %{_vpath_builddir} +%endif # Do not use _smp_mflags to preserve build order %{__make} \ @@ -870,7 +884,11 @@ cd %{_vpath_builddir} %install ################################################################################ +%if 0%{?rhel} +cd build +%else cd %{_vpath_builddir} +%endif %{__make} \ VERBOSE=%{?_verbose} \ @@ -1335,6 +1353,9 @@ fi ################################################################################ %changelog +* Fri Sep 11 2020 Dogtag PKI Team - 10.9.4-1 +- Rebase to stable upstream v10.9.4 release + * Tue Aug 18 2020 Dogtag PKI Team - 10.9.2-1 - Second attempt at JDK11 Support diff --git a/sources b/sources index 9e59d80..59ad840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-10.9.2.tar.gz) = 5c58af62d3a5113daee66cb538e41b0e1ec1c8303cf9a53e5f088e1a0228bd8f839d7708abae25051a449bd00ebd8246f2015e63c04a32bb9674b40c6c36c902 +SHA512 (pki-10.9.4.tar.gz) = a2e572b1e2625cfbd432ccc11f6aefb77801f4e9f6a49e00c8fcf98fedd09e9ec806c5caa42a1bd48f8d6eff4c794e28a3dca86ee5720e348415c8bd3e9e4882