diff --git a/0002-keep-deprecated-constructors.patch b/0002-keep-deprecated-constructors.patch new file mode 100644 index 0000000000000000000000000000000000000000..ec6e106c233aa47a8a38ef5b5805f9144ed75457 --- /dev/null +++ b/0002-keep-deprecated-constructors.patch @@ -0,0 +1,39 @@ +From 937a7bf0fd7ddbcbb7d186d1fcd1ab20090e8f43 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Tue, 8 Oct 2024 14:05:48 +0800 +Subject: [PATCH] keep deprecated constructors + +--- + .../src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java | 2 +- + .../src/main/java/org/dogtagpki/tomcat/JSSImplementation.java | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java b/core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java +index 026f3be..4998ad6 100644 +--- a/core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java ++++ b/core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java +@@ -438,7 +438,7 @@ public class TomcatJSS implements SSLSocketListener { + + manager = CryptoManager.getInstance(); + +- passwordStore = (IPasswordStore) Class.forName(passwordClass).getDeclaredConstructor().newInstance(); ++ passwordStore = (IPasswordStore) Class.forName(passwordClass).newInstance(); + passwordStore.init(passwordFile); + + login(); +diff --git a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSImplementation.java b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSImplementation.java +index 3a6d8df..80cf388 100644 +--- a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSImplementation.java ++++ b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSImplementation.java +@@ -41,7 +41,7 @@ public class JSSImplementation extends SSLImplementation { + @Override + public SSLSupport getSSLSupport(SSLSession session) { + logger.debug("JSSImplementation.getSSLSupport()"); +- return new JSSESupport(session, null); ++ return new JSSESupport(session); + } + + @Override +-- +2.46.0 + diff --git a/tomcatjss-8.2.0.tar.gz b/tomcatjss-8.2.0.tar.gz deleted file mode 100644 index b7de07821fd77c4d7c134245e1c0d6ecacdbe798..0000000000000000000000000000000000000000 Binary files a/tomcatjss-8.2.0.tar.gz and /dev/null differ diff --git a/tomcatjss-8.4.1.tar.gz b/tomcatjss-8.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..97311c1b7079f2e0ff6bcd6211e23556079e0e7f Binary files /dev/null and b/tomcatjss-8.4.1.tar.gz differ diff --git a/tomcatjss.spec b/tomcatjss.spec index 6c64cc11f71fe24c7575e2be8cf9d0e02c5bf3ab..79c1fba2c8a65c7fbbcb9b88a882851621e979dd 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -3,9 +3,9 @@ Summary: Apache Tomcat of JSS Connector URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch -Version: 8.2.0 +Version: 8.4.1 Release: 1 -Source: https://github.com/dogtagpki/tomcatjss/archive/refs/tags/tomcatjss-8.2.0.tar.gz +Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/%{name}-%{version}.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 >= 5.2.0 tomcat >= 1:9.0.7 @@ -13,6 +13,7 @@ Conflicts: pki-base < 10.10.0 %define _sharedstatedir /var/lib Patch0: 0001-add-abstract-method-for-class-JSSUtil.patch +Patch1: 0002-keep-deprecated-constructors.patch %description Apache Tomcat of JSS Connector. @@ -50,6 +51,9 @@ export JAVA_HOME=/usr/lib/jvm/${home_path} %{_javadir}/* %changelog +* Tue Oct 08 2024 Ge Wang - 8.4.1-1 +- Upgrade to 8.4.1 + * Fri Mar 31 2023 lilong - 8.2.0-1 - Upgrade to 8.2.0