Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2017-12-06 08:58:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Wed Dec 6 08:58:41 2017 rev:40 rq:548123 version:9.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2017-09-20 17:11:29.235721825 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2017-12-06 08:58:43.452688408 +0100 @@ -1,0 +2,52 @@ +Fri Dec 1 21:46:18 UTC 2017 - ma...@suse.com + +- Update to Tomcat 9.0.2: + * Major update for tomcat8 from tomcat9 + * For full changelog please read upstream changes at: + + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html + * Rename all tomcat-8.0-* files to tomcat-9.0-* +- Changed patches: + * Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch + * Deleted: tomcat-8.0-sle.catalina.policy.patch + * Deleted: tomcat-8.0-tomcat-users-webapp.patch + * Deleted: tomcat-8.0.33-JDTCompiler-java.patch + * Deleted: tomcat-8.0.44-javadoc.patch + * Deleted: tomcat-8.0.9-property-build.windows.patch + * Added: tomcat-9.0-JDTCompiler-java.patch + * Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch + * Added: tomcat-9.0-javadoc.patch + * Added: tomcat-9.0-sle.catalina.policy.patch + * Added: tomcat-9.0-tomcat-users-webapp.patch +- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api + to reflect the new Servlet API version. +- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf +- Added "tomcat-" prefix to lib symlinks under + /usr/share/java to avoid file conflicts with servletapi5 + and geronimo-specs +- Fixed wrong %ghost file paths for alternatives symlinks + +------------------------------------------------------------------- +Thu Nov 23 13:50:29 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Mon Oct 23 09:42:48 UTC 2017 - ma...@suse.com + +- Build with JDK 8 to fix runtime errors when running with JDK 7 + and 8 +- Fix tomcat-digest classpath error (bsc#977410) +- Fix packaged /etc/alternatives symlinks for api libs that caused + rpm -V to report link mismatch (bsc#1019016) + +------------------------------------------------------------------- +Mon Oct 23 06:07:05 UTC 2017 - ec...@opensuse.org + +- update to 8.0.47 + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html + * Fixed CVE: + - CVE-2017-12617 +- rebase tomcat-8.0-sle.catalina.policy.patch + +------------------------------------------------------------------- Old: ---- apache-tomcat-8.0.44-src.tar.gz apache-tomcat-8.0.44-src.tar.gz.asc tomcat-8.0-bootstrap-MANIFEST.MF.patch tomcat-8.0-digest.script tomcat-8.0-jsvc.service tomcat-8.0-log4j.properties tomcat-8.0-sle.catalina.policy.patch tomcat-8.0-tomcat-users-webapp.patch tomcat-8.0-tool-wrapper.script tomcat-8.0.33-JDTCompiler-java.patch tomcat-8.0.44-javadoc.patch tomcat-8.0.9-property-build.windows.patch tomcat-8.0.conf tomcat-8.0.init tomcat-8.0.logrotate tomcat-8.0.service tomcat-8.0.sysconfig tomcat-8.0.wrapper New: ---- apache-tomcat-9.0.2-src.tar.gz apache-tomcat-9.0.2-src.tar.gz.asc tomcat-9.0-JDTCompiler-java.patch tomcat-9.0-bootstrap-MANIFEST.MF.patch tomcat-9.0-digest.script tomcat-9.0-javadoc.patch tomcat-9.0-jsvc.service tomcat-9.0-log4j.properties tomcat-9.0-sle.catalina.policy.patch tomcat-9.0-tomcat-users-webapp.patch tomcat-9.0-tool-wrapper.script tomcat-9.0.conf tomcat-9.0.init tomcat-9.0.logrotate tomcat-9.0.service tomcat-9.0.sysconfig tomcat-9.0.wrapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.K9DptH/_old 2017-12-06 08:58:44.380654441 +0100 +++ /var/tmp/diff_new_pack.K9DptH/_new 2017-12-06 08:58:44.380654441 +0100 @@ -17,12 +17,17 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define jspspec 2.3 -%define servletspec 3.1 +%define servletspec 4.0 %define elspec 3.0 -%define major_version 8 +%define major_version 9 %define minor_version 0 -%define micro_version 44 +%define micro_version 2 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -38,7 +43,7 @@ Name: tomcat Version: %{major_version}.%{minor_version}.%{micro_version} Release: 0 -Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 3.1/JSP 2.3/EL 3.0 API +Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API License: Apache-2.0 Group: Productivity/Networking/Web/Servers Url: http://tomcat.apache.org @@ -72,13 +77,13 @@ #PATCH-FIX-UPSTREAM: from jpackage.org package Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch #PATCH-FIX-OPENSUSE: skip few windows specific parts of build -Patch2: tomcat-8.0.9-property-build.windows.patch +#Patch2: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 -Patch3: tomcat-8.0.33-JDTCompiler-java.patch +Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 -Patch4: tomcat-8.0-sle.catalina.policy.patch +Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch # PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files -Patch5: tomcat-8.0.44-javadoc.patch +Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections @@ -93,7 +98,7 @@ BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.7.0 +BuildRequires: java-devel = 1.8.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -213,7 +218,7 @@ %description lib Libraries required to successfully run the Tomcat Web container -%package servlet-3_1-api +%package servlet-4_0-api Summary: Apache Tomcat Servlet API implementation classes Group: Productivity/Networking/Web/Servers Requires(post): update-alternatives @@ -224,8 +229,9 @@ Provides: servlet7 Obsoletes: servlet < %{servletspec} Obsoletes: tomcat-servlet-3_0-api +Obsoletes: tomcat-servlet-3_1-api -%description servlet-3_1-api +%description servlet-4_0-api Apache Tomcat Servlet API implementation classes version 3.1 %package webapps @@ -244,10 +250,9 @@ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f %patch0 %patch1 -%patch2 -p1 +%patch2 %patch3 %patch4 -%patch5 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl @@ -354,7 +359,7 @@ install -d -m 0775 %{buildroot}%{workdir} install -d -m 0755 %{buildroot}%{_unitdir} install -d -m 0755 %{buildroot}%{_libexecdir}/%{name} -install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates +install -d -m 0755 %{buildroot}%{_fillupdir} # move things into place # First copy supporting libs to tomcat lib @@ -385,7 +390,7 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ - > %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} + > %{buildroot}%{_fillupdir}/sysconfig.%{name} install -m 0644 %{SOURCE4} \ %{buildroot}%{_sbindir}/%{name} install -m 0644 %{SOURCE11} \ @@ -540,10 +545,6 @@ cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom %add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar -cp -a tomcat-embed-logging-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom -%add_maven_depmap JPP.%{name}-tomcat-embed-logging-juli.pom %{name}/tomcat-embed-logging-juli.jar - -cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom %add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom @@ -566,14 +567,10 @@ # Install update-alternatives content mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar -ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar -ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar -ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar -touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar -ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar +ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar +ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/%{name}-el_1_0_api.jar +ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar +ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar mkdir -p %{buildroot}%{_tmpfilesdir} cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF @@ -611,8 +608,8 @@ %service_del_postun %{name}-jsvc.service %post el-3_0-api -update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 -update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 +update-alternatives --install %{_javadir}/%{name}-el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 +update-alternatives --install %{_javadir}/%{name}-el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 %preun el-3_0-api if [ $1 -eq 0 ] ; then @@ -621,7 +618,7 @@ fi %post jsp-2_3-api -update-alternatives --install %{_javadir}/jsp.jar jsp \ +update-alternatives --install %{_javadir}/%{name}-jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 %postun jsp-2_3-api @@ -630,11 +627,11 @@ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar fi -%post servlet-3_1-api -update-alternatives --install %{_javadir}/servlet.jar servlet \ +%post servlet-4_0-api +update-alternatives --install %{_javadir}/%{name}-servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 -%postun servlet-3_1-api +%postun servlet-4_0-api if [ $1 -eq 0 ] ; then update-alternatives --remove servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar @@ -687,6 +684,7 @@ %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml %dir %{homedir} %{_tmpfilesdir}/%{name}.conf %{bindir}/bootstrap.jar @@ -697,7 +695,7 @@ %{homedir}/work %{homedir}/logs %{homedir}/conf -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %files admin-webapps %{appdir}/host-manager @@ -716,10 +714,10 @@ %else %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml %endif -%{_javadir}/el_1_0_api.jar -%{_javadir}/el_api.jar -%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar -%ghost %{_sysconfdir}/alternatives/el_api.jar +%{_javadir}/%{name}-el_1_0_api.jar +%{_javadir}/%{name}-el_api.jar +%ghost %{_sysconfdir}/alternatives/el_1_0_api +%ghost %{_sysconfdir}/alternatives/el_api %files javadoc %doc %{_javadocdir}/%{name} @@ -727,8 +725,8 @@ %files jsp-2_3-api %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{_javadir}/%{name}-jsp-api.jar -%{_javadir}/jsp.jar -%ghost %{_sysconfdir}/alternatives/jsp.jar +%{_javadir}/%{name}-jsp.jar +%ghost %{_sysconfdir}/alternatives/jsp %{_mavenpomdir}/JPP-%{name}-jsp-api.pom %if %{defined _maven_repository} %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api @@ -770,14 +768,13 @@ %{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom %{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom %{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom -%files servlet-3_1-api +%files servlet-4_0-api %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet-api.jar -%{_javadir}/servlet.jar -%ghost %{_sysconfdir}/alternatives/servlet.jar +%{_javadir}/%{name}-servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet %if %{defined _maven_repository} %{_mavendepmapfragdir}/%{name}-tomcat-servlet-api %else ++++++ apache-tomcat-8.0.44-src.tar.gz -> apache-tomcat-9.0.2-src.tar.gz ++++++ ++++ 250426 lines of diff (skipped) ++++++ tomcat-8.0.33-JDTCompiler-java.patch -> tomcat-9.0-JDTCompiler-java.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-8.0.33-JDTCompiler-java.patch 2016-04-28 16:59:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-9.0-JDTCompiler-java.patch 2017-12-06 08:58:43.180698364 +0100 @@ -1,6 +1,11 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2016-04-22 11:13:13.194743602 +0200 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-04-22 11:17:02.457841335 +0200 -@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa +Index: java/org/apache/jasper/compiler/JDTCompiler.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- java/org/apache/jasper/compiler/JDTCompiler.java (date 1506521372000) ++++ java/org/apache/jasper/compiler/JDTCompiler.java (revision ) +@@ -312,10 +312,10 @@ CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_Source, @@ -13,7 +18,7 @@ } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa +@@ -359,14 +359,14 @@ CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_TargetPlatform, ++++++ tomcat-8.0-bootstrap-MANIFEST.MF.patch -> tomcat-9.0-bootstrap-MANIFEST.MF.patch ++++++ ++++++ tomcat-8.0-digest.script -> tomcat-9.0-digest.script ++++++ ++++++ tomcat-8.0.44-javadoc.patch -> tomcat-9.0-javadoc.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-8.0.44-javadoc.patch 2017-09-20 17:11:28.523822039 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-9.0-javadoc.patch 2017-12-06 08:58:43.260695436 +0100 @@ -1,42 +1,72 @@ ---- apache-tomcat-8.0.44-src/build.xml 2017-05-10 19:27:41.000000000 +0200 -+++ apache-tomcat-8.0.44-src/build.xml 2017-09-19 11:04:39.650918739 +0200 -@@ -1952,6 +1952,7 @@ +Index: build.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- build.xml (date 1511643656000) ++++ build.xml (revision ) +@@ -1772,10 +1772,11 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + source="${compile.source}" additionalparam="-breakiterator -notimestamp" maxmemory="512m" - failonerror="true"> -@@ -1972,6 +1973,7 @@ + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path refid="tomcat.webservices.classpath"/> +@@ -1793,10 +1794,11 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + source="${compile.source}" additionalparam="-breakiterator -notimestamp" maxmemory="512m" - failonerror="true"> -@@ -1992,6 +1994,7 @@ + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path refid="tomcat.webservices.classpath"/> +@@ -1814,10 +1816,11 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + source="${compile.source}" additionalparam="-breakiterator -notimestamp" maxmemory="512m" - failonerror="true"> -@@ -2012,6 +2015,7 @@ + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path refid="tomcat.webservices.classpath"/> +@@ -1835,10 +1838,11 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + source="${compile.source}" additionalparam="-breakiterator -notimestamp" maxmemory="512m" - failonerror="true"> -@@ -2031,6 +2035,7 @@ + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path refid="tomcat.webservices.classpath"/> +@@ -1855,10 +1859,11 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + source="${compile.source}" - additionalparam="-breakiterator -notimestamp" + additionalparam="-breakiterator -notimestamp ${java9.add.modules}" maxmemory="512m" - failonerror="true"> + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path refid="tomcat.webservices.classpath"/> ++++++ tomcat-8.0-jsvc.service -> tomcat-9.0-jsvc.service ++++++ ++++++ tomcat-8.0-log4j.properties -> tomcat-9.0-log4j.properties ++++++ ++++++ tomcat-8.0-sle.catalina.policy.patch -> tomcat-9.0-sle.catalina.policy.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-8.0-sle.catalina.policy.patch 2017-05-10 20:53:05.141103694 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-9.0-sle.catalina.policy.patch 2017-12-06 08:58:43.312693533 +0100 @@ -5,22 +5,6 @@ =================================================================== --- conf/catalina.policy (revision Local version) +++ conf/catalina.policy (revision Shelved version) -@@ -100,6 +100,7 @@ - // ${file.separator}classes${file.separator}logging.properties", "read"; - }; - -+ - // These permissions apply to the server startup code - grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { - permission java.security.AllPermission; -@@ -112,7 +113,6 @@ - permission java.security.AllPermission; - }; - -- - // If using a per instance lib directory, i.e. ${catalina.base}/lib, - // then the following permission will need to be uncommented - // grant codeBase "file:${catalina.base}/lib/-" { @@ -167,6 +167,9 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; @@ -31,10 +15,10 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission -@@ -216,6 +219,15 @@ - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; +@@ -230,6 +233,15 @@ }; + +// Additional basic permissions for web applications. +grant codeBase "file:/usr/share/java/tomcat-servlet-api.jar" { + permission java.security.AllPermission; @@ -47,11 +31,3 @@ // You can assign additional permissions to particular web applications by // adding additional "grant" entries here, based on the code base for that // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -@@ -247,7 +259,6 @@ - // grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { - // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; - // }; -- - // To grant permissions for web applications using packed WAR files, use the - // Tomcat specific WAR url scheme. - // ++++++ tomcat-8.0-tomcat-users-webapp.patch -> tomcat-9.0-tomcat-users-webapp.patch ++++++ ++++++ tomcat-8.0-tool-wrapper.script -> tomcat-9.0-tool-wrapper.script ++++++ ++++++ tomcat-8.0.conf -> tomcat-9.0.conf ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-8.0.conf 2016-04-12 19:34:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-9.0.conf 2017-12-06 08:58:43.352692068 +0100 @@ -20,7 +20,7 @@ TOMCATS_BASE="/var/lib/tomcats/" # Where your java installation lives -JAVA_HOME="/usr/lib/jvm/jre" +#JAVA_HOME="/usr/libi64/jvm/jre" # Where your tomcat installation lives CATALINA_HOME="@@@TCHOME@@@" ++++++ tomcat-8.0.init -> tomcat-9.0.init ++++++ ++++++ tomcat-8.0.logrotate -> tomcat-9.0.logrotate ++++++ ++++++ tomcat-8.0-jsvc.service -> tomcat-9.0.service ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-8.0-jsvc.service 2016-04-12 19:34:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-9.0.service 2017-12-06 08:58:43.400690311 +0100 @@ -1,21 +1,23 @@ -# Systemd unit file for tomcat +# Systemd unit file for default tomcat # # To create clones of this service: -# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined -# before tomcat-sysd is called. -# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat -# to override tomcat defaults +# DO NOTHING, use tomcat@.service instead. [Unit] -Description=Apache Tomcat Web Application Container JSVC wrapper +Description=Apache Tomcat Web Application Container After=syslog.target network.target [Service] Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf -Environment="NAME=" "USE_JSVC=true" +Environment="NAME=" +EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/lib/tomcat/server start ExecStop=/usr/lib/tomcat/server stop +SuccessExitStatus=143 +User=tomcat +Group=tomcat + [Install] WantedBy=multi-user.target ++++++ tomcat-8.0.sysconfig -> tomcat-9.0.sysconfig ++++++ ++++++ tomcat-8.0.wrapper -> tomcat-9.0.wrapper ++++++
