diff --git a/0001-fix-aqute-error.patch b/0001-fix-aqute-error.patch deleted file mode 100644 index 4273fcd6a39c79653c4265bd2d90141904ddc295..0000000000000000000000000000000000000000 --- a/0001-fix-aqute-error.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 07447b3728718a0eff6c34ea6b31dbf4aaa7ae91 Mon Sep 17 00:00:00 2001 -From: mgb01105731 -Date: Mon, 20 Jun 2022 16:29:51 +0800 -Subject: [PATCH] fix aqute error - ---- - build.properties.default | 10 ++++++++++ - build.xml | 11 +++++++++++ - webapps/docs/changelog.xml | 4 ---- - 3 files changed, 21 insertions(+), 4 deletions(-) - -diff --git a/build.properties.default b/build.properties.default -index 6a6d55d..4a27720 100644 ---- a/build.properties.default -+++ b/build.properties.default -@@ -308,6 +308,16 @@ bnd.home=${base.path}/bnd-${bnd.version} - bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar - bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar - -+# ----- OSGi annotations bundle, version 1.0.0 or later ----- -+# # ----- required to avoid Javadoc error when using bnd annotations ----- -+osgi-annotations.version=1.1.1 -+osgi-annotations.checksum.enabled=true -+osgi-annotations.checksum.algorithm=MD5|SHA-1 -+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d -+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version} -+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+ - # ----- JSign, version 4.1 or later ----- - jsign.version=4.1 - -diff --git a/build.xml b/build.xml -index d34f56b..7dfec47 100644 ---- a/build.xml -+++ b/build.xml -@@ -213,6 +213,7 @@ - - - -+ - - - -@@ -2271,6 +2272,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - - -+ - - - -@@ -3650,6 +3652,15 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml -index f328aa0..e4962de 100644 ---- a/webapps/docs/changelog.xml -+++ b/webapps/docs/changelog.xml -@@ -320,10 +320,6 @@ - - Update to bnd 6.2.0. (markt) - -- -- Remove OSGi annotations dependency as it is no longer required with bnd -- 6.2.0. (markt) -- - - Refactor the resource files for the Apache Tomcat installer for Windows - so that all the resource files are located in a single directory in the --- -2.19.1.6.gb485710b - diff --git a/9.0.65.tar.gz b/9.0.73.tar.gz similarity index 45% rename from 9.0.65.tar.gz rename to 9.0.73.tar.gz index 6faa875538f70402588f05c5e5f6890e1faed5d4..3f11499d518ce863f8b735fd16726d3b0049cd9c 100644 Binary files a/9.0.65.tar.gz and b/9.0.73.tar.gz differ diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 7d68c42b8747db8852f937b240e1e0b9705a7e82..dd74c3bf5c0cc4eacebee98b816457bf0850c0fa 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,7 @@ diff -up ./build.xml.orig ./build.xml --- build.xml.orig 2021-07-07 10:53:55.493742841 +0800 +++ build.xml 2021-07-07 11:09:43.107968515 +0800 -@@ -1030,7 +1030,7 @@ +@@ -1020,7 +1020,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +10,7 @@ diff -up ./build.xml.orig ./build.xml + + ++ + + + diff --git a/tomcat-9.0-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch index 66146090457c09583ad2ddd2f36b400fc7f7eeca..dd6a47df66c15d9513eefcb1bc2a1c3e3de03d17 100644 --- a/tomcat-9.0-catalina-policy.patch +++ b/tomcat-9.0-catalina-policy.patch @@ -1,6 +1,6 @@ ---- conf/catalina.policy.orig 2021-07-07 10:25:53.461393329 +0800 -+++ conf/catalina.policy 2021-07-07 10:27:47.688682404 +0800 -@@ -56,6 +56,16 @@ grant codeBase "file:${java.home}/lib/ex +--- conf/catalina.policy.orig 2022-11-04 16:17:41.227506990 +0800 ++++ conf/catalina.policy 2022-11-04 16:21:51.393351415 +0800 +@@ -56,6 +56,15 @@ grant codeBase "file:${java.home}/lib/ex // permission java.security.AllPermission; //}; @@ -13,11 +13,10 @@ +grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; -+ // ========== CATALINA CODE PERMISSIONS ======================================= -@@ -262,4 +272,4 @@ grant codeBase "file:${catalina.home}/we +@@ -261,4 +270,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" { diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch index 860c4cfc926c0e01f89c21b3d36aa82d55af9023..85b8b9be970225397824d70b05d0d141c83c0f18 100644 --- a/tomcat-9.0-tomcat-users-webapp.patch +++ b/tomcat-9.0-tomcat-users-webapp.patch @@ -1,6 +1,6 @@ --- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 +++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 -@@ -23,4 +23,14 @@ +@@ -53,4 +53,14 @@ --> diff --git a/tomcat-build.patch b/tomcat-build.patch index 97440f157c10ef4dff0115dc4b4944bf45a8eecb..49c63ff5a01f6527848f7ed721c551515002a557 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,18 +1,3 @@ -diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-07-13 12:59:09.555368724 -0400 -+++ ./build.xml 2020-07-13 13:06:51.246135917 -0400 -@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom - - - -+ -+ -+ -+ -+ - - - diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd --- ./res/bnd/build-defaults.bnd.orig 2020-07-13 13:47:01.229077747 -0400 +++ ./res/bnd/build-defaults.bnd 2020-07-13 13:47:12.923095618 -0400 diff --git a/tomcat.spec b/tomcat.spec index 403a56bf5b95ab9c8b654dbd3b8b29fc8f257157..c4c8cf00fa8054584a84b1b21aa9c1718c09db39 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -32,7 +32,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 65 +%global micro_version 73 %global packdname tomcat-%{version} %global servletspec 4.0 %global elspec 3.0 @@ -62,7 +62,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{js License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: https://github.com/apache/tomcat/archive/refs/tags/9.0.65.tar.gz +Source0: https://github.com/apache/tomcat/archive/refs/tags/%{version}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper @@ -82,8 +82,7 @@ Patch2: %{name}-build.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch4: rhbz-1857043.patch Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch -# fix aqute-bnd error when mock -Patch6: 0001-fix-aqute-error.patch +Patch6: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch BuildArch: noarch @@ -102,6 +101,7 @@ Requires: javapackages-tools Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} +Conflicts: tomcat-native >= 2 Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd @@ -186,19 +186,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release} The ROOT web application for Apache Tomcat. %prep -%setup -q -n %{packdname} +%autosetup -p0 -n %{packdname} # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 -%patch6 -p1 - # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices @@ -228,14 +220,9 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dwsdl4j-lib.jar="HACK" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ - -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ - -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ + -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy @@ -510,6 +497,9 @@ fi %{appdir}/ROOT %changelog +* Mon Apr 10 2023 Funda Wang - 1:9.0.73-1 +- New version 9.0.73 + * Tue Aug 30 2022 mgb01105731 - 1:9.0.65-1 - Update to 9.0.65