From 06bd63ed038588a2a892f6fd3c27f7d3ef397f9f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 08:55:48 -0400 Subject: [PATCH] import pki-servlet-engine-9.0.50-1.el9 --- .gitignore | 2 +- .pki-servlet-engine.metadata | 2 +- SOURCES/exclude-OSGi-metadata.patch | 26 ++++++++++++------------ SOURCES/tomcat-9.0-catalina-policy.patch | 11 +++++----- SPECS/pki-servlet-engine.spec | 11 ++++++---- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 9540027..5b097a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tomcat-9.0.43.redhat-00011-src.zip +SOURCES/tomcat-9.0.50.redhat-00006-src.zip diff --git a/.pki-servlet-engine.metadata b/.pki-servlet-engine.metadata index 1f3143f..0d66dba 100644 --- a/.pki-servlet-engine.metadata +++ b/.pki-servlet-engine.metadata @@ -1 +1 @@ -824fdd9f3c1b74cefe8aa237644bdbb634c16676 SOURCES/tomcat-9.0.43.redhat-00011-src.zip +d3342fad0113532635b6d2ec733e189abeadaf0d SOURCES/tomcat-9.0.50.redhat-00006-src.zip diff --git a/SOURCES/exclude-OSGi-metadata.patch b/SOURCES/exclude-OSGi-metadata.patch index 5c04cee..d6da18d 100644 --- a/SOURCES/exclude-OSGi-metadata.patch +++ b/SOURCES/exclude-OSGi-metadata.patch @@ -1,16 +1,16 @@ diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2021-07-08 15:58:39.817466224 -0400 -+++ ./build.xml 2021-07-08 21:10:00.185752235 -0400 -@@ -1022,7 +1022,7 @@ +--- ./build.xml.orig 2021-12-09 13:29:38.000000000 -0500 ++++ ./build.xml 2022-03-04 08:56:31.987572758 -0500 +@@ -1032,7 +1032,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" - addOSGi="true" /> + addOSGi="false" /> - + + addOSGi="false" /> - + diff --git a/SOURCES/tomcat-9.0-catalina-policy.patch b/SOURCES/tomcat-9.0-catalina-policy.patch index 9d7018b..2dd8058 100644 --- a/SOURCES/tomcat-9.0-catalina-policy.patch +++ b/SOURCES/tomcat-9.0-catalina-policy.patch @@ -1,8 +1,9 @@ ---- conf/catalina.policy.orig 2021-06-08 09:27:09.295927384 -0400 -+++ conf/catalina.policy 2021-06-08 09:26:32.056019150 -0400 -@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex - permission java.security.AllPermission; - }; +diff -up ./conf/catalina.policy.orig ./conf/catalina.policy +--- ./conf/catalina.policy.orig 2022-03-04 08:49:08.246538215 -0500 ++++ ./conf/catalina.policy 2022-03-04 08:50:31.842356329 -0500 +@@ -56,6 +56,36 @@ grant codeBase "file:${java.home}/lib/ex + // permission java.security.AllPermission; + //}; +// This permission is required when using javac to compile JSPs on Java 9 +// onwards diff --git a/SPECS/pki-servlet-engine.spec b/SPECS/pki-servlet-engine.spec index 3af705e..13777aa 100644 --- a/SPECS/pki-servlet-engine.spec +++ b/SPECS/pki-servlet-engine.spec @@ -30,8 +30,8 @@ %global major_version 9 %global minor_version 0 -%global micro_version 43 -%global redhat_version 00011 +%global micro_version 50 +%global redhat_version 00006 %global packdname apache-tomcat-%{version}.redhat-%{redhat_version}-src # Specification versions @@ -58,7 +58,7 @@ Name: pki-servlet-engine Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons License: ASL 2.0 @@ -111,7 +111,7 @@ Requires: pki-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} # Add bundled so that everyone knows this is Tomcat. Provides: bundled(tomcat) = %{version}.redhat-%{redhat_version} -Obsoletes: pki-servlet-container +Obsoletes: pki-servlet-container <= 9.0.7 %description Tomcat is the servlet engine that is used in the official Reference @@ -385,6 +385,9 @@ fi %{_javadir}/tomcat-servlet-%{servletspec}*.jar %changelog +* Thu Feb 24 2022 Chris Kelley - 1:9.0.50-1 +- Update to JWS 5.6.1 + * Mon Aug 09 2021 Mohan Boddu - 1:9.0.43-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688