packages/tomcatjss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!29 Fix build fail for tomcat upgrade

Browse Source 
From: @wk333 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-11-14 03:26:57 +00:00 committed by Gitee
commit 744293e5ee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Add-abstract-method-for-class-JSSUtil.patch
View File

@ -1,62 +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
---
tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java b/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java
index cad3163..2f6faa3 100644
--- a/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java
+++ b/tomcat-8.5/src/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.List;
@@ -30,6 +32,7 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSessionContext;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -101,13 +104,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;
@@ -133,4 +134,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.33.0

6
tomcatjss.spec
View File

@ -4,9 +4,8 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch
Version: 7.6.1
Release: 1
Release: 2
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
Patch0: Add-abstract-method-for-class-JSSUtil.patch
BuildRequires: ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j
BuildRequires: slf4j-jdk14 jss >= 4.8.0 tomcat >= 1:9.0.7
Requires: apache-commons-lang java-headless jpackage-utils >= 0:1.7.5-15 slf4j jss >= 4.8.0 tomcat >= 1:9.0.7
@ -37,6 +36,9 @@ ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir}
%{_javadir}/*
%changelog
* Wed Nov 13 2024 wangkai <13474090681@163.com> - 7.6.1-2
- Fix build fail for tomcat upgrade
* Tue Feb 27 2024 yaoxin <yao_xin001@hoperun.com> - 7.6.1-1
- Upgrade to 7.6.1 for fix build error caused by jss update to 4.9.3