Browse code
apache-tomcat: Upgrade to version 8.5.35
Change-Id: Ia7dc1fdb2a5cb97f5e4e6be13c90c4cb870e4d63
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6345
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dweepadvani authored on 2018/12/11 01:41:45Showing 2 changed files
- SPECS/apache-tomcat/apache-tomcat-use-jks-as-inmem-keystore.patch
- SPECS/apache-tomcat/apache-tomcat.spec
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-+++ b/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java 2018-09-04 06:41:46.281931886 +0530 |
|
| 2 |
-@@ -247,14 +247,8 @@ public class JSSEUtil extends SSLUtilBas |
|
| 1 |
+--- a/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java |
|
| 2 |
+@@ -266,13 +266,7 @@ public class JSSEUtil extends SSLUtilBas |
|
| 3 | 3 |
if (k != null && !"DKS".equalsIgnoreCase(certificate.getCertificateKeystoreType()) && |
| 4 | 4 |
"PKCS#8".equalsIgnoreCase(k.getFormat())) {
|
| 5 | 5 |
// Switch to in-memory key store |
| ... | ... |
@@ -11,9 +11,7 @@ |
| 11 | 11 |
- ksUsed = KeyStore.getInstance(certificate.getCertificateKeystoreType(), |
| 12 | 12 |
- provider); |
| 13 | 13 |
- } |
| 14 |
-- ksUsed.load(null, null); |
|
| 15 | 14 |
+ ksUsed = KeyStore.getInstance("JKS");
|
| 16 |
-+ ksUsed.load(null, null); |
|
| 15 |
+ ksUsed.load(null, null); |
|
| 17 | 16 |
ksUsed.setKeyEntry(keyAlias, k, keyPassArray, ks.getCertificateChain(keyAlias)); |
| 18 | 17 |
} |
| 19 |
- // Non-PKCS#8 key stores will use the original key store |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: Apache Tomcat |
| 2 | 2 |
Name: apache-tomcat |
| 3 |
-Version: 8.5.33 |
|
| 3 |
+Version: 8.5.35 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://tomcat.apache.org |
| ... | ... |
@@ -8,11 +8,11 @@ Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
BuildArch: noarch |
| 11 |
-Source0: http://mirrors.koehn.com/apache/tomcat/tomcat-8/v%{version}/src/%{name}-src-%{version}-src.tar.gz
|
|
| 12 |
-%define sha1 apache-tomcat-src=1c9f34ec4c1659eb8c11ebbaf95b6f8d85ff37ae |
|
| 11 |
+Source0: https://archive.apache.org/dist/tomcat/tomcat-8/v%{version}/src/%{name}-%{version}-src.tar.gz
|
|
| 12 |
+%define sha1 apache-tomcat=c1c68f8cfeb816be2f9210903cbdd9eb4759a52f |
|
| 13 | 13 |
# base-for-apache-tomcat is a cached -Dbase.path folder |
| 14 | 14 |
Source1: base-for-%{name}-%{version}.tar.gz
|
| 15 |
-%define sha1 base=e49b167305a917469bc5e76df8cea141a5acfcb5 |
|
| 15 |
+%define sha1 base=68897a45e160a2b09ac5132a34ff6d5e30771365 |
|
| 16 | 16 |
Patch0: apache-tomcat-use-jks-as-inmem-keystore.patch |
| 17 | 17 |
BuildRequires: openjre |
| 18 | 18 |
BuildRequires: openjdk |
| ... | ... |
@@ -102,6 +102,8 @@ rm -rf %{buildroot}/*
|
| 102 | 102 |
%{_logsdir}/catalina.out
|
| 103 | 103 |
|
| 104 | 104 |
%changelog |
| 105 |
+* Mon Dec 10 2018 Dweep Advani <dadvani@vmware.com> 8.5.35-1 |
|
| 106 |
+- Updated to 8.5.35 release. |
|
| 105 | 107 |
* Fri Sep 07 2018 Tapas Kundu <tkundu@vmware.com> 8.5.33-1 |
| 106 | 108 |
- Updated to 8.5.33 release. |
| 107 | 109 |
* Tue Sep 04 2018 Tapas Kundu <tkundu@vmware.com> 8.5.32-1 |