rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 9.0.50

Browse Source
This commit is contained in:
Hui Wang 2021-07-07 14:16:09 +08:00
parent de863ffa66
commit fde9af6905
4 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rhbz-1857043.patch
View File

@ -1,16 +1,16 @@
diff -up ./build.xml.orig ./build.xml diff -up ./build.xml.orig ./build.xml
--- ./build.xml.orig 2020-07-24 10:24:08.313796968 -0400 --- build.xml.orig 2021-07-07 10:53:55.493742841 +0800
+++ ./build.xml 2020-07-24 10:24:38.027427445 -0400 +++ build.xml 2021-07-07 11:09:43.107968515 +0800
@@ -757,7 +757,7 @@ @@ -1030,7 +1030,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}"
@@ -766,41 +766,41 @@ @@ -1039,41 +1039,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}"
@@ -812,61 +812,61 @@ @@ -1085,61 +1085,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}"
@@ -877,27 +877,27 @@ @@ -1150,27 +1150,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"
@@ -1375,7 +1375,7 @@ @@ -1644,7 +1644,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"
@@ -1383,7 +1383,7 @@ @@ -1652,7 +1652,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"
@@ -1392,7 +1392,7 @@ @@ -1661,7 +1661,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"
@@ -1401,7 +1401,7 @@ @@ -1670,7 +1670,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"

23
tomcat-9.0-JDTCompiler.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apache/jasper/compiler/JDTCompiler.java
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2021-07-07 11:31:21.583507995 +0800
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2021-07-07 11:35:13.009251246 +0800
@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apa
} else if(opt.equals("15")) {
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
} else if(opt.equals("16")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
+ settings.put(CompilerOptions.OPTION_Source, "16");
} else if(opt.equals("17")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -372,8 +372,8 @@ public class JDTCompiler extends org.apa
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
} else if(opt.equals("16")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
+ settings.put(CompilerOptions.OPTION_Compliance, "16");
} else if(opt.equals("17")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.

20
tomcat-9.0-catalina-policy.patch
View File

@ -1,8 +1,8 @@
--- conf/catalina.policy.orig 2020-04-22 14:51:13.734893403 -0400 --- conf/catalina.policy.orig 2021-07-07 10:25:53.461393329 +0800
+++ conf/catalina.policy 2020-04-22 15:14:57.609677967 -0400 +++ conf/catalina.policy 2021-07-07 10:27:47.688682404 +0800
@@ -51,6 +51,17 @@ grant codeBase "file:${java.home}/lib/ex @@ -56,6 +56,16 @@ grant codeBase "file:${java.home}/lib/ex
}; // permission java.security.AllPermission;
//};
+// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= +// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
+ +
@ -14,7 +14,13 @@
+ permission java.security.AllPermission; + permission java.security.AllPermission;
+}; +};
+ +
+
// ========== CATALINA CODE PERMISSIONS ======================================= // ========== CATALINA CODE PERMISSIONS =======================================
@@ -262,4 +272,4 @@ grant codeBase "file:${catalina.home}/we
//
// The permissions granted to a specific JAR
// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
-// };
\ No newline at end of file
+// };

9
tomcat.spec
View File

@ -31,7 +31,7 @@
%global jspspec 2.3 %global jspspec 2.3
%global major_version 9 %global major_version 9
%global minor_version 0 %global minor_version 0
%global micro_version 45 %global micro_version 50
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 4.0 %global servletspec 4.0
%global elspec 3.0 %global elspec 3.0
@ -56,7 +56,7 @@
Name: tomcat Name: tomcat
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
License: ASL 2.0 License: ASL 2.0
@ -79,6 +79,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
Patch2: %{name}-build.patch Patch2: %{name}-build.patch
Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
Patch4: rhbz-1857043.patch Patch4: rhbz-1857043.patch
Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch
BuildArch: noarch BuildArch: noarch
@ -188,6 +189,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch2 -p0 %patch2 -p0
%patch3 -p0 %patch3 -p0
%patch4 -p0 %patch4 -p0
%patch5 -p0
# Remove webservices naming resources as it's generally unused # Remove webservices naming resources as it's generally unused
%{__rm} -rf java/org/apache/naming/factory/webservices %{__rm} -rf java/org/apache/naming/factory/webservices
@ -494,6 +496,9 @@ fi
%{appdir}/ROOT %{appdir}/ROOT
%changelog %changelog
* Tue Jul 06 2021 Hui Wang <huwang@redhat.com> 1:9.0.50-1
- Update to 9.0.50
* Sat Jun 05 2021 Coty Sutherland <csutherl@redhat.com> 1:9.0.45-4 * Sat Jun 05 2021 Coty Sutherland <csutherl@redhat.com> 1:9.0.45-4
- Add back logrotate config file per devel list request - Add back logrotate config file per devel list request
- Add mvn virtual provides back for the servlet, el, and jsp spec impls - Add mvn virtual provides back for the servlet, el, and jsp spec impls