Browse code
Updating apache-tomcat to 8.5.33 release
Change-Id: If0121ea040da8ef27276331b2ceebb9f7d636ccb
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5609
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Tapas Kundu authored on 2018/09/08 03:55:42Showing 3 changed files
- SPECS/apache-ant/apache-ant.spec
- SPECS/apache-tomcat/apache-tomcat-use-jks-as-inmem-keystore.patch
- SPECS/apache-tomcat/apache-tomcat.spec
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Apache Ant |
| 2 | 2 |
Name: apache-ant |
| 3 |
-Version: 1.9.6 |
|
| 4 |
-Release: 10%{?dist}
|
|
| 3 |
+Version: 1.10.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://ant.apache.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -9,7 +9,7 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
BuildArch: noarch |
| 11 | 11 |
Source0: http://apache.mirrors.lucidnetworks.net//ant/source/%{name}-%{version}-src.tar.gz
|
| 12 |
-%define sha1 apache-ant=de7c2287bca23fc32007b28e56c28f330cf7be26 |
|
| 12 |
+%define sha1 apache-ant=86958f1b11b74dcc31ce0514a25af5307903d52a |
|
| 13 | 13 |
Source1: http://hamcrest.googlecode.com/files/hamcrest-1.3.tar.gz |
| 14 | 14 |
%define sha1 hamcrest=f0ab4d66186b894a06d89d103c5225cf53697db3 |
| 15 | 15 |
Source2: http://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz |
| ... | ... |
@@ -110,6 +110,8 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/* |
| 110 | 110 |
%{_bindir}/runant.pl
|
| 111 | 111 |
|
| 112 | 112 |
%changelog |
| 113 |
+* Fri Sep 07 2018 Tapas Kundu <tkundu@vmware.com> 1.10.1-1 |
|
| 114 |
+- Upgraded to 1.10.1 release |
|
| 113 | 115 |
* Fri Jun 22 2018 Keerthana K <keerthanak@vmware.com> 1.9.6-10 |
| 114 | 116 |
- Fix for Zip Slip Vulnerability. |
| 115 | 117 |
* Wed Jun 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.9.6-9 |
| ... | ... |
@@ -1,8 +1,8 @@ |
| 1 |
-+++ b/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java.new |
|
| 2 |
-@@ -241,13 +241,7 @@ public class JSSEUtil extends SSLUtilBase {
|
|
| 3 |
- Key k = ks.getKey(keyAlias, keyPassArray); |
|
| 4 |
- if (k != null && "PKCS#8".equalsIgnoreCase(k.getFormat())) {
|
|
| 1 |
+--- a/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java 2018-09-04 06:40:32.721928699 +0530 |
|
| 2 |
+@@ -247,14 +247,8 @@ public class JSSEUtil extends SSLUtilBas |
|
| 3 |
+ if (k != null && !"DKS".equalsIgnoreCase(certificate.getCertificateKeystoreType()) && |
|
| 4 |
+ "PKCS#8".equalsIgnoreCase(k.getFormat())) {
|
|
| 5 | 5 |
// Switch to in-memory key store |
| 6 | 6 |
- String provider = certificate.getCertificateKeystoreProvider(); |
| 7 | 7 |
- if (provider == null) {
|
| ... | ... |
@@ -11,8 +11,9 @@ |
| 11 | 11 |
- ksUsed = KeyStore.getInstance(certificate.getCertificateKeystoreType(), |
| 12 | 12 |
- provider); |
| 13 | 13 |
- } |
| 14 |
+- ksUsed.load(null, null); |
|
| 14 | 15 |
+ ksUsed = KeyStore.getInstance("JKS");
|
| 15 |
- ksUsed.load(null, null); |
|
| 16 |
++ ksUsed.load(null, null); |
|
| 16 | 17 |
ksUsed.setKeyEntry(keyAlias, k, keyPassArray, ks.getCertificateChain(keyAlias)); |
| 17 | 18 |
} |
| 18 |
- |
|
| 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.32 |
|
| 3 |
+Version: 8.5.33 |
|
| 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}-%{version}-src.tar.gz
|
|
| 12 |
-%define sha1 apache-tomcat=92ed11618ce9a750363ff79062daf94bdbe72ee1 |
|
| 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 |
|
| 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=1e1f7fe54192d3bfaafc26084555458ac50e4cd8 |
|
| 15 |
+%define sha1 base=e49b167305a917469bc5e76df8cea141a5acfcb5 |
|
| 16 | 16 |
Patch0: apache-tomcat-use-jks-as-inmem-keystore.patch |
| 17 | 17 |
BuildRequires: openjre |
| 18 | 18 |
BuildRequires: openjdk |
| ... | ... |
@@ -40,6 +40,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " |
| 40 | 40 |
%patch0 -p1 |
| 41 | 41 |
|
| 42 | 42 |
%build |
| 43 |
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
|
|
| 43 | 44 |
ant -Dbase.path="../base-for-%{name}-%{version}" deploy dist-prepare dist-source
|
| 44 | 45 |
|
| 45 | 46 |
%install |
| ... | ... |
@@ -83,7 +84,16 @@ rm -rf %{buildroot}/*
|
| 83 | 83 |
%dir %{_logsdir}
|
| 84 | 84 |
%dir %{_tempdir}
|
| 85 | 85 |
%{_bindir}/*
|
| 86 |
-%{_confdir}/*
|
|
| 86 |
+%config(noreplace) %{_confdir}/catalina.policy
|
|
| 87 |
+%config(noreplace) %{_confdir}/catalina.properties
|
|
| 88 |
+%config(noreplace) %{_confdir}/context.xml
|
|
| 89 |
+%config(noreplace) %{_confdir}/jaspic-providers.xml
|
|
| 90 |
+%config(noreplace) %{_confdir}/jaspic-providers.xsd
|
|
| 91 |
+%config(noreplace) %{_confdir}/logging.properties
|
|
| 92 |
+%config(noreplace) %{_confdir}/server.xml
|
|
| 93 |
+%config(noreplace) %{_confdir}/tomcat-users.xml
|
|
| 94 |
+%config(noreplace) %{_confdir}/tomcat-users.xsd
|
|
| 95 |
+%config(noreplace) %{_confdir}/web.xml
|
|
| 87 | 96 |
%{_libdir}/*
|
| 88 | 97 |
%{_webappsdir}/*
|
| 89 | 98 |
%{_datadir}/java/tomcat/*.jar
|
| ... | ... |
@@ -92,6 +102,8 @@ rm -rf %{buildroot}/*
|
| 92 | 92 |
%{_logsdir}/catalina.out
|
| 93 | 93 |
|
| 94 | 94 |
%changelog |
| 95 |
+* Fri Sep 07 2018 Tapas Kundu <tkundu@vmware.com> 8.5.33-1 |
|
| 96 |
+- Updated to 8.5.33 release. |
|
| 95 | 97 |
* Tue Sep 04 2018 Tapas Kundu <tkundu@vmware.com> 8.5.32-1 |
| 96 | 98 |
- Upgraded to 8.5.32 |
| 97 | 99 |
* Mon Jun 25 2018 Srinidhi Rao <srinidhir@vmware.com> 8.5.31-2 |