import pki-servlet-engine-9.0.50-1.el9
This commit is contained in:
parent
a0d936d2dd
commit
350a122f19
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/tomcat-9.0.43.redhat-00011-src.zip
|
SOURCES/tomcat-9.0.50.redhat-00006-src.zip
|
||||||
|
@ -1 +1 @@
|
|||||||
824fdd9f3c1b74cefe8aa237644bdbb634c16676 SOURCES/tomcat-9.0.43.redhat-00011-src.zip
|
d3342fad0113532635b6d2ec733e189abeadaf0d SOURCES/tomcat-9.0.50.redhat-00006-src.zip
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
diff -up ./build.xml.orig ./build.xml
|
diff -up ./build.xml.orig ./build.xml
|
||||||
--- ./build.xml.orig 2021-07-08 15:58:39.817466224 -0400
|
--- ./build.xml.orig 2021-12-09 13:29:38.000000000 -0500
|
||||||
+++ ./build.xml 2021-07-08 21:10:00.185752235 -0400
|
+++ ./build.xml 2022-03-04 08:56:31.987572758 -0500
|
||||||
@@ -1022,7 +1022,7 @@
|
@@ -1032,7 +1032,7 @@
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.annotations-api"
|
filesId="files.annotations-api"
|
||||||
manifest="${tomcat.manifests}/annotations-api.jar.manifest"
|
manifest="${tomcat.manifests}/annotations-api.jar.manifest"
|
||||||
- addOSGi="true" />
|
- addOSGi="true" />
|
||||||
+ addOSGi="false" />
|
+ addOSGi="false" />
|
||||||
|
|
||||||
<!-- Servlet 4.0 Implementation JAR File -->
|
<!-- Servlet Implementation JAR File -->
|
||||||
<jarIt jarfile="${servlet-api.jar}"
|
<jarIt jarfile="${servlet-api.jar}"
|
||||||
@@ -1031,41 +1031,41 @@
|
@@ -1041,41 +1041,41 @@
|
||||||
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
||||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||||
license="${tomcat.manifests}/servlet-api.jar.license"
|
license="${tomcat.manifests}/servlet-api.jar.license"
|
||||||
@ -41,7 +41,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
- addOSGi="true" />
|
- addOSGi="true" />
|
||||||
+ addOSGi="false" />
|
+ addOSGi="false" />
|
||||||
|
|
||||||
<!-- JASPIC 1.1 API JAR File -->
|
<!-- JASPIC API JAR File -->
|
||||||
<jarIt jarfile="${jaspic-api.jar}"
|
<jarIt jarfile="${jaspic-api.jar}"
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.jaspic-api"
|
filesId="files.jaspic-api"
|
||||||
@ -58,7 +58,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
|
|
||||||
<!-- Bootstrap JAR File -->
|
<!-- Bootstrap JAR File -->
|
||||||
<jarIt jarfile="${bootstrap.jar}"
|
<jarIt jarfile="${bootstrap.jar}"
|
||||||
@@ -1077,61 +1077,61 @@
|
@@ -1087,61 +1087,61 @@
|
||||||
<jarIt jarfile="${tomcat-util.jar}"
|
<jarIt jarfile="${tomcat-util.jar}"
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.tomcat-util"
|
filesId="files.tomcat-util"
|
||||||
@ -130,7 +130,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
|
|
||||||
<!-- Catalina Ant Tasks JAR File -->
|
<!-- Catalina Ant Tasks JAR File -->
|
||||||
<jarIt jarfile="${catalina-ant.jar}"
|
<jarIt jarfile="${catalina-ant.jar}"
|
||||||
@@ -1142,27 +1142,27 @@
|
@@ -1152,27 +1152,27 @@
|
||||||
<jarIt jarfile="${catalina-storeconfig.jar}"
|
<jarIt jarfile="${catalina-storeconfig.jar}"
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.catalina-storeconfig"
|
filesId="files.catalina-storeconfig"
|
||||||
@ -162,7 +162,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
|
|
||||||
<!-- i18n JARs -->
|
<!-- i18n JARs -->
|
||||||
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
|
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
|
||||||
@@ -1624,7 +1624,7 @@
|
@@ -1635,7 +1635,7 @@
|
||||||
filesId="files.tomcat-embed-core"
|
filesId="files.tomcat-embed-core"
|
||||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||||
license="${tomcat.manifests}/servlet-api.jar.license"
|
license="${tomcat.manifests}/servlet-api.jar.license"
|
||||||
@ -171,7 +171,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
addGraal="true"
|
addGraal="true"
|
||||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
|
graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
|
||||||
graalFiles="res/graal/tomcat-embed-core/native-image"
|
graalFiles="res/graal/tomcat-embed-core/native-image"
|
||||||
@@ -1632,7 +1632,7 @@
|
@@ -1643,7 +1643,7 @@
|
||||||
<jarIt jarfile="${tomcat-embed-el.jar}"
|
<jarIt jarfile="${tomcat-embed-el.jar}"
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.tomcat-embed-el"
|
filesId="files.tomcat-embed-el"
|
||||||
@ -180,7 +180,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
addGraal="true"
|
addGraal="true"
|
||||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
|
graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
|
||||||
graalFiles="res/graal/tomcat-embed-el/native-image"
|
graalFiles="res/graal/tomcat-embed-el/native-image"
|
||||||
@@ -1641,7 +1641,7 @@
|
@@ -1652,7 +1652,7 @@
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.tomcat-embed-jasper"
|
filesId="files.tomcat-embed-jasper"
|
||||||
meta-inf="${tomcat.manifests}/jasper.jar"
|
meta-inf="${tomcat.manifests}/jasper.jar"
|
||||||
@ -189,7 +189,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
addGraal="true"
|
addGraal="true"
|
||||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
|
graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
|
||||||
graalFiles="res/graal/tomcat-embed-jasper/native-image"
|
graalFiles="res/graal/tomcat-embed-jasper/native-image"
|
||||||
@@ -1650,7 +1650,7 @@
|
@@ -1661,7 +1661,7 @@
|
||||||
filesDir="${tomcat.classes}"
|
filesDir="${tomcat.classes}"
|
||||||
filesId="files.tomcat-embed-websocket"
|
filesId="files.tomcat-embed-websocket"
|
||||||
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
|
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
|
||||||
@ -198,7 +198,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||||||
addGraal="true"
|
addGraal="true"
|
||||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
|
graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
|
||||||
graalFiles="res/graal/tomcat-embed-websocket/native-image"
|
graalFiles="res/graal/tomcat-embed-websocket/native-image"
|
||||||
@@ -3595,6 +3595,7 @@ Read the Building page on the Apache Tom
|
@@ -3716,6 +3716,7 @@ Read the Building page on the Apache Tom
|
||||||
<!-- Add bnd tasks to project -->
|
<!-- Add bnd tasks to project -->
|
||||||
<path id="bnd.classpath">
|
<path id="bnd.classpath">
|
||||||
<fileset file="${bnd.jar}" />
|
<fileset file="${bnd.jar}" />
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
--- conf/catalina.policy.orig 2021-06-08 09:27:09.295927384 -0400
|
diff -up ./conf/catalina.policy.orig ./conf/catalina.policy
|
||||||
+++ conf/catalina.policy 2021-06-08 09:26:32.056019150 -0400
|
--- ./conf/catalina.policy.orig 2022-03-04 08:49:08.246538215 -0500
|
||||||
@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex
|
+++ ./conf/catalina.policy 2022-03-04 08:50:31.842356329 -0500
|
||||||
permission java.security.AllPermission;
|
@@ -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
|
+// This permission is required when using javac to compile JSPs on Java 9
|
||||||
+// onwards
|
+// onwards
|
||||||
|
@ -30,8 +30,8 @@
|
|||||||
|
|
||||||
%global major_version 9
|
%global major_version 9
|
||||||
%global minor_version 0
|
%global minor_version 0
|
||||||
%global micro_version 43
|
%global micro_version 50
|
||||||
%global redhat_version 00011
|
%global redhat_version 00006
|
||||||
%global packdname apache-tomcat-%{version}.redhat-%{redhat_version}-src
|
%global packdname apache-tomcat-%{version}.redhat-%{redhat_version}-src
|
||||||
|
|
||||||
# Specification versions
|
# Specification versions
|
||||||
@ -58,7 +58,7 @@
|
|||||||
Name: pki-servlet-engine
|
Name: pki-servlet-engine
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
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
|
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: ASL 2.0
|
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.
|
# Add bundled so that everyone knows this is Tomcat.
|
||||||
Provides: bundled(tomcat) = %{version}.redhat-%{redhat_version}
|
Provides: bundled(tomcat) = %{version}.redhat-%{redhat_version}
|
||||||
|
|
||||||
Obsoletes: pki-servlet-container
|
Obsoletes: pki-servlet-container <= 9.0.7
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Tomcat is the servlet engine that is used in the official Reference
|
Tomcat is the servlet engine that is used in the official Reference
|
||||||
@ -385,6 +385,9 @@ fi
|
|||||||
%{_javadir}/tomcat-servlet-%{servletspec}*.jar
|
%{_javadir}/tomcat-servlet-%{servletspec}*.jar
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 24 2022 Chris Kelley <ckelley@redhat.com> - 1:9.0.50-1
|
||||||
|
- Update to JWS 5.6.1
|
||||||
|
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:9.0.43-4
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:9.0.43-4
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
Related: rhbz#1991688
|
Related: rhbz#1991688
|
||||||
|
Loading…
Reference in New Issue
Block a user