0001-add-abstract-method-for-class-JSSUtil.patch

@@ -1,70 +0,0 @@
-From 2921cf92d8968fef21d3459523f0c469ac64089a Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Wed, 25 May 2022 16:47:46 +0800
-Subject: [PATCH] add abstract method for class JSSUtil
-
----
- .../main/java/org/dogtagpki/tomcat/JSSUtil.java  | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
-index 8370370..9c3326d 100644
---- a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
-+++ b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
-@@ -19,6 +19,8 @@
- 
- package org.dogtagpki.tomcat;
- 
-+import java.security.NoSuchAlgorithmException;
-+
- import java.util.Arrays;
- import java.util.Collections;
- import java.util.HashSet;
-@@ -28,6 +30,7 @@ import java.util.Set;
- import javax.net.ssl.KeyManager;
- import javax.net.ssl.KeyManagerFactory;
- import javax.net.ssl.SSLEngine;
-+import javax.net.ssl.SSLSessionContext;
- import javax.net.ssl.TrustManager;
- import javax.net.ssl.TrustManagerFactory;
- 
-@@ -48,6 +51,7 @@ public class JSSUtil extends SSLUtilBase {
-     private Set<String> protocols;
-     private Set<String> ciphers;
- 
-+
-     public JSSUtil(SSLHostConfigCertificate cert) {
-         super(cert);
- 
-@@ -95,13 +99,11 @@ public class JSSUtil extends SSLUtilBase {
-         return new TrustManager[] { new JSSNativeTrustManager() };
-     }
- 
--    @Override
-     public SSLContext createSSLContextInternal(List<String> negotiableProtocols) throws Exception {
-         logger.debug("JSSUtil createSSLContextInternal(...) keyAlias=" + keyAlias);
-         return new JSSContext(keyAlias);
-     }
- 
--    @Override
-     public boolean isTls13RenegAuthAvailable() {
-         logger.debug("JSSUtil: isTls13RenegAuthAvailable()");
-         return true;
-@@ -127,4 +129,14 @@ public class JSSUtil extends SSLUtilBase {
- 
-         return ciphers;
-     }
-+
-+    @Override
-+    public void configureSessionContext(SSLSessionContext sslSessionContext) {
-+	logger.debug("JSSUtil: configureSessionContext");
-+    }
-+
-+    @Override
-+    public SSLContext createSSLContext(List<String> negotiableProtocols) throws NoSuchAlgorithmException {
-+        return new JSSContext(keyAlias);
-+    }
- }
--- 
-2.27.0
-

tomcatjss.spec

@@ -1,66 +0,0 @@
-Name:             tomcatjss
-Summary:          Apache Tomcat of JSS Connector
-URL:              http://www.dogtagpki.org/wiki/TomcatJSS
-License:          LGPLv2+
-BuildArch:        noarch
-Version:          8.1.0
-Release:          2
-Source:           https://github.com/dogtagpki/tomcatjss/archive/refs/tags/v8.1.0.tar.gz
-BuildRequires:    ant apache-commons-lang3 java-latest-openjdk-devel slf4j
-BuildRequires:    slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7
-Requires:         apache-commons-lang3 java-latest-openjdk-headless jpackage-utils >= 0:1.7.5-15 slf4j slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7
-Conflicts:        pki-base < 10.6.5
-%define           _sharedstatedir    /var/lib
-
-Patch0:           0001-add-abstract-method-for-class-JSSUtil.patch
-
-%description
-Apache Tomcat of JSS Connector.
-
-%prep
-%autosetup -n tomcatjss-%{version} -p 1
-
-%build
-openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
-home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}`
-export JAVA_HOME=/usr/lib/jvm/${home_path}
-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    --version=%{version} \
-    --jni-dir=%{_jnidir} \
-    dist
-
-%install
-openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
-home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}`
-export JAVA_HOME=/usr/lib/jvm/${home_path}
-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    --version=%{version} \
-    --java-dir=%{_javadir} \
-    --doc-dir=%{_docdir} \
-    --install-dir=%{buildroot} \
-    install
-
-%files
-%defattr(-,root,root)
-%doc README LICENSE
-%{_javadir}/*
-
-%changelog
-* Mon Nov 21 2022 wulei <wulei80@h-partners.com> - 8.1.0-2
-- Rectify the tomcatjss compilation failure caused by the openjdk-latest upgrade
-
-* Mon Oct 17 2022 wangkai <wangkai385@h-partners.com> - 8.1.0-1
-- Upgrade to version 8.1.0
-
-* Wed Feb 09 2022 caodongxia <caodongxia@huawei.com> - 7.4.1-5
-- Remove conflicts tomcat-native
-
-* Tue Dec 07 2021 wangkai <wangkai385@huawei.com> - 7.4.1-4
-- Remove conflicts tomcat-native
-
-* Sun Apr 26 2020 wutao <wutao61@huawei.com> - 7.4.1-3
-- Package init

tomcatjss.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: dogtagpki/tomcatjss
-tag_prefix: "^v"
-seperator: "."