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 - malbu@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 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------
+Mon Oct 23 09:42:48 UTC 2017 - malbu@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 - ecsos@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 <