diff --git a/apache-tomcat-9.0.20-src.tar.gz b/apache-tomcat-9.0.20-src.tar.gz deleted file mode 100644 index 2f62dab..0000000 --- a/apache-tomcat-9.0.20-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ebe58dff96a08315c17a947dc32485948b09e23149013a9f4494d0f549ef069 -size 5702073 diff --git a/apache-tomcat-9.0.20-src.tar.gz.asc b/apache-tomcat-9.0.20-src.tar.gz.asc deleted file mode 100644 index 146b66e..0000000 --- a/apache-tomcat-9.0.20-src.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlzMwXgACgkQEMAcWi9g -Weft9BAAq5V8Gqf0C1DJam0EGCCEGy2qSqOwUPWFMdqa7W2wTU/EvbQCbm0lr/Zl -usPZ7YuT+vjpYaYySXeZEzZrDbXGAk8qCMYiliE7mtxtqvfSlicf/w5Ffg8fYLoB -p4QTa04Vhek27xrU/bK5F3MLD0WSjFvvwNiJMT1pPf1DxZ7t/JrBPkEKhP6vCEDi -WibgJu/KMc/zfDwJBBFrPb1b/uLp42C/Pu7WCJRbPhLr2eOQyo+ikqCDYa0Hjclx -KFk9xsQ7ggZYR/VHJgD+M3Q+1txZ67xh0/R9ZOJecpV6C6+IGjdNddaYTdMqJMJu -k+jCGhWXyvHyn41eH/p/+lHWpODmIHkHPFoFB2KZHc/N5ezgPmR4rqjRZD7s+nxQ -T3Hova9VlH3MS+8Mc8Uf92WZTZkSNgsYCCxgtprXFkaYxyySsrjWPjyhhcpJswlA -Cmk9N3fNEw3c5qawVqJ2CQG28UajGX47y8W4SID7CeyWm0WGW4/+RV4pvafMtj7U -UpjWxMGbA8OM71XCkQvm19qqYIh8ISGhA7IYzwQKPCTlHt4uZFAQBhcbE3MbnWeV -mOBFCMqvarVSvWQTBWlIoe2ETz+rS9RNnEb/uRF73Fun73PXuP1E7qwRLGJ/lqwG -Am9JUXzd2GTnS7u/MN4jNkRh9I0Va4u+a8/UkoLLYgepODW0lnU= -=NSi/ ------END PGP SIGNATURE----- diff --git a/apache-tomcat-9.0.27-src.tar.gz b/apache-tomcat-9.0.27-src.tar.gz new file mode 100644 index 0000000..a277922 --- /dev/null +++ b/apache-tomcat-9.0.27-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a78d96d388a0d143a9f9f002db18659d478f44bed19b59ec6f6d4e09033c7f1 +size 5761278 diff --git a/apache-tomcat-9.0.27-src.tar.gz.asc b/apache-tomcat-9.0.27-src.tar.gz.asc new file mode 100644 index 0000000..63860dc --- /dev/null +++ b/apache-tomcat-9.0.27-src.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl2bDO8ACgkQEMAcWi9g +Wecy8hAAkeYA9buTHPdlkkcVa3pg8ROg06QB56iI2318FjObFUqbKLfehM+Kluft +1W24fp2QC+JWU3dwX1A8zANr0qtBJ4GEzbdZr7f7MivBvc8Eqlo5pL45McTgMoyI +KjlYgFF5U/hFkMNMk5J5h+q9NjnojgFJsy18fPnfry7BfS2aC+qegBvnFm5svmoO +K9y7nGxv8TFZs2Q0H2yExgiezrjsBCZllGDqyK/9kIFp1nbWr4eMcdU5a6lHOtP2 +LI/z4+dSfPN1ktyymPP2sq851C1XlRl5R8J4YRWOqGzPIYkAUKOcDxGRel5Uw4wd +F4RQbb+oZ0S8YXN9mks/u0Shv2Dtq5cuSGEyrsRyT4+ZL/EwkwWaoCoVAG17bARC ++J1aGHJAtJYA7lyJB0q3BLZRP7YENJv0kfxk4YWDABYvbXN0vMlFvhihc4byvO9J +XqHo4C5unBbU7jcSP+/GJhuujMTxOqiG9NUwOMrLHNsUjsQTYNMyFzzm5OA9I0eZ +JT+qWMm4Cu/v9a+6pfMv5tNWRhhLjeCfO7jcp2k+E+3YX3jghPy+RWOH1bT2ccZA +Os0WbdmRtSW9lkQlqYaXE7uAgXE/yZmDLfngVEcJnJjhZCLKskx3XqNI6uR0t7c0 +9lOU1GBAH94ztZjAOkCIwjH3Roi5vsuGcAmYFyusIS7QSTXQfso= +=s4BA +-----END PGP SIGNATURE----- diff --git a/el-api-OSGi-MANIFEST.MF b/el-api-OSGi-MANIFEST.MF deleted file mode 100644 index 5882901..0000000 --- a/el-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Export-Package: javax.el;version="2.2.0" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 2.2.0 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: javax.el -DynamicImport-Package: org.apache.el -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jasper-OSGi-MANIFEST.MF b/jasper-OSGi-MANIFEST.MF deleted file mode 100644 index 7ad9a5c..0000000 --- a/jasper-OSGi-MANIFEST.MF +++ /dev/null @@ -1,39 +0,0 @@ -Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c - ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version - ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas - per.runtime;version="7.0.21",org.apache.jasper.security;version="7.0. - 19",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp - lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v - ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja - sper.xmlparser;version="7.0.21" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 7.0.21 -Bundle-Localization: plugin -Bundle-Name: %bundleName -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.jasper -Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h - ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0 - ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re - sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2 - .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax. - xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache. - commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti - on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a - pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util; - resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml. - sax.helpers,org.apache.tomcat;version="7.0.21",org.apache.juli.loggin - g;version="7.0.21",javax.el;version="2.2.0",org.eclipse.jdt.internal. - compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int - ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow - ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp - iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in - ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e - clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil - er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte - rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt. - core.compiler -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jasper-el-OSGi-MANIFEST.MF b/jasper-el-OSGi-MANIFEST.MF deleted file mode 100644 index bad19b2..0000000 --- a/jasper-el-OSGi-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Export-Package: org.apache.el;version="7.0.21" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 7.0.21 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Import-Package: javax.el;version="2.2" -Bundle-SymbolicName: org.apache.el -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF deleted file mode 100644 index 97288d3..0000000 --- a/jsp-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Bundle-Vendor: %bundleProvider -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 -Bundle-Name: %bundleName -Bundle-SymbolicName: javax.servlet.jsp -Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v - ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp - .tagext; version=2.2 -Bundle-Version: 2.2.0.v200806031607 -Bundle-ManifestVersion: 2 -Import-Package: javax.servlet; version=3.0,javax.servlet.http; version - =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0" diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF deleted file mode 100644 index 5838552..0000000 --- a/servlet-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4 -Bundle-SymbolicName: javax.servlet -Bundle-ManifestVersion: 2 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-Version: 3.0.0 -Bundle-Vendor: %bundleProvider -Export-Package: javax.servlet;version="3.0", - javax.servlet;version="2.6", - javax.servlet.http;version="3.0", - javax.servlet.http;version="2.6", - javax.servlet.annotation;version="2.6", - javax.servlet.descriptor;version="3.0", - javax.servlet.descriptor;version="2.6", - javax.servlet.resources;version="3.0", - javax.servlet.resources;version="2.6" diff --git a/tomcat-9.0-disable-osgi-build.patch b/tomcat-9.0-disable-osgi-build.patch index 3239a35..8694f5c 100644 --- a/tomcat-9.0-disable-osgi-build.patch +++ b/tomcat-9.0-disable-osgi-build.patch @@ -2,39 +2,13 @@ Index: apache-tomcat-9.0.12-src/build.xml =================================================================== --- apache-tomcat-9.0.12-src.orig/build.xml +++ apache-tomcat-9.0.12-src/build.xml -@@ -740,7 +740,7 @@ - - - -+ depends="setup-bnd,build-prepare" if="add.osgi.jar.metadata"> - - - - -- -+ - - - -@@ -3200,7 +3200,7 @@ Read the Building page on the Apache Tom - - - -- -+ - +@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom -@@ -3240,7 +3240,7 @@ Read the Building page on the Apache Tom - - - -- -+ - - - + ++ ++ ++ + + + diff --git a/tomcat-9.0-javadoc.patch b/tomcat-9.0-javadoc.patch index b2e7b96..a2c1e1c 100644 --- a/tomcat-9.0-javadoc.patch +++ b/tomcat-9.0-javadoc.patch @@ -1,13 +1,7 @@ -Index: apache-tomcat-9.0.17-src/build.xml -=================================================================== ---- apache-tomcat-9.0.17-src.orig/build.xml -+++ apache-tomcat-9.0.17-src/build.xml -@@ -1811,10 +1811,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -+ source="${compile.source}" - additionalparam="-breakiterator -notimestamp" +--- apache-tomcat-9.0.27-src/build.xml 2019-10-07 12:01:06.000000000 +0200 ++++ apache-tomcat-9.0.27-src/build.xml 2019-11-16 00:52:57.833495494 +0100 +@@ -1859,7 +1859,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -15,13 +9,47 @@ Index: apache-tomcat-9.0.17-src/build.xml -@@ -1830,11 +1831,12 @@ Apache Tomcat ${version} native binaries - bottom="Copyright © 2000-${year} Apache Software Foundation. All Rights Reserved." - encoding="UTF-8" +@@ -1881,7 +1881,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1902,7 +1902,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1923,7 +1923,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1944,7 +1944,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1962,9 +1962,10 @@ docencoding="UTF-8" -+ source="${compile.source}" charset="UTF-8" additionalparam="-breakiterator -notimestamp" ++ source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -29,12 +57,8 @@ Index: apache-tomcat-9.0.17-src/build.xml -@@ -1851,10 +1853,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -+ source="${compile.source}" - additionalparam="-breakiterator -notimestamp" +@@ -1984,7 +1985,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -42,39 +66,11 @@ Index: apache-tomcat-9.0.17-src/build.xml -@@ -1871,10 +1874,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -+ source="${compile.source}" - additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1890,10 +1894,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -- additionalparam="-breakiterator -notimestamp ${java9.add.modules}" -+ source="${compile.source}" -+ additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1902,9 +1907,6 @@ Apache Tomcat ${version} native binaries - +@@ -1995,8 +1996,6 @@ -- -- + +- - diff --git a/tomcat-api-OSGi-MANIFEST.MF b/tomcat-api-OSGi-MANIFEST.MF deleted file mode 100644 index 0ad82a6..0000000 --- a/tomcat-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Export-Package: org.apache.tomcat;version="7.0.21" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 7.0.21 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.tomcat -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/tomcat-juli-OSGi-MANIFEST.MF b/tomcat-juli-OSGi-MANIFEST.MF deleted file mode 100644 index 75ff5d2..0000000 --- a/tomcat-juli-OSGi-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi - ng;version="7.0.21" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 7.0.21 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.juli -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/tomcat.spec b/tomcat.spec index 9c7d652..f5a2d0c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 9 %define minor_version 0 -%define micro_version 20 +%define micro_version 27 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -57,15 +57,8 @@ Source4: %{name}-%{major_version}.%{minor_version}.wrapper Source5: %{name}-%{major_version}.%{minor_version}.logrotate Source6: %{name}-%{major_version}.%{minor_version}-digest.script Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script -Source8: servlet-api-OSGi-MANIFEST.MF -Source9: jsp-api-OSGi-MANIFEST.MF Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties Source11: %{name}-%{major_version}.%{minor_version}.service -Source12: el-api-OSGi-MANIFEST.MF -Source13: jasper-el-OSGi-MANIFEST.MF -Source14: jasper-OSGi-MANIFEST.MF -Source15: tomcat-api-OSGi-MANIFEST.MF -Source16: tomcat-juli-OSGi-MANIFEST.MF Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service Source21: tomcat-functions Source30: tomcat-preamble @@ -95,6 +88,8 @@ BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp >= 2.0 BuildRequires: apache-commons-pool2 +BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils @@ -260,7 +255,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 -%patch2 -p1 +#%patch2 -p1 %patch3 %patch4 -p1 %patch5 -p1 @@ -284,6 +279,7 @@ mkdir -p HACKDIR touch HACKDIR/build.xml ant -Dbase.path="." \ + -Dadd.osgi.jar.metadata="true" \ -Djava.7.home="%{java_home}" \ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ @@ -298,6 +294,11 @@ ant -Dbase.path="." \ -Djaxrpc-lib.jar="$(build-classpath geronimo-jaxrpc-1.1-api)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \ + -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)" \ + -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dcommons-pool.home="$(build-classpath commons-pool2)" \ -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \ -Dno.build.dbcp=true \ @@ -317,15 +318,6 @@ jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.wa popd popd -# inject OSGi manifests -jar ufm output/build/lib/servlet-api.jar %{SOURCE8} -jar ufm output/build/lib/jsp-api.jar %{SOURCE9} -jar ufm output/build/lib/el-api.jar %{SOURCE12} -jar ufm output/build/lib/jasper-el.jar %{SOURCE13} -jar ufm output/build/lib/jasper.jar %{SOURCE14} -jar ufm output/build/lib/tomcat-api.jar %{SOURCE15} -jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16} - pushd %{_builddir}/tomcat-serverxml-tool javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt