Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2014-05-26 14:44:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2013-12-13 12:01:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2014-05-26 14:44:28.000000000 +0200 @@ -1,0 +2,42 @@ +Sat May 24 09:58:55 UTC 2014 - tchva...@suse.com + +- Version bump to 7.0.54: + * bugfix update + * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html + +------------------------------------------------------------------- +Thu May 15 14:59:25 UTC 2014 - da...@darins.net + +- Update to 7.0.53 + * bugfix release + * Update the Eclipse JDT compiler to enable full Java 8 support in JSPs. + * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html +- Patch for Bug 56373 + * See https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 + * tomcat-7.0.53-JDTCompiler-java.patch +- Rename tomcat-7.0.2-property-build.windows.patch to + tomcat-7.0.52-property-build.windows.patch + +------------------------------------------------------------------- +Thu May 15 14:41:40 UTC 2014 - da...@darins.net + +- remove saxon build requirement for sles +- disable bytecode check for sles + +------------------------------------------------------------------- +Mon Apr 14 17:59:07 UTC 2014 - da...@darins.net + +- remove unknown option from fillup_only macro +- wrap systemd %pre[un]/%post[un] in conditional +- specify required ant version + +------------------------------------------------------------------- +Tue Apr 8 17:27:09 UTC 2014 - witte...@googlemail.com + +- Update to 7.0.52 + * bugfix release + * Fix CVE-2014-0050, a DoS vulnerability related to multi-part processing +- Update to 7.0.50 + * bugfix release + +------------------------------------------------------------------- Old: ---- apache-tomcat-7.0.47-src.tar.gz apache-tomcat-7.0.47-src.tar.gz.asc tomcat-7.0.2-property-build.windows.patch New: ---- apache-tomcat-7.0.54-src.tar.gz apache-tomcat-7.0.54-src.tar.gz.asc tomcat-7.0.52-property-build.windows.patch tomcat-7.0.53-JDTCompiler-java.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.QyjX2y/_old 2014-05-26 14:44:29.000000000 +0200 +++ /var/tmp/diff_new_pack.QyjX2y/_new 2014-05-26 14:44:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -26,7 +26,7 @@ %define major_version 7 %define minor_version 0 -%define micro_version 47 +%define micro_version 54 %define packdname apache-tomcat-%{version}-src %define tcuid 91 @@ -80,12 +80,20 @@ #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-7.0.2-property-build.windows.patch +Patch2: tomcat-7.0.52-property-build.windows.patch +# PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 +Patch3: tomcat-7.0.53-JDTCompiler-java.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: ant +BuildRequires: ant >= 1.8.1 +%if 0%{?suse_version} == 1110 +BuildRequires: ant-antlr +BuildRequires: ant-nodeps +BuildRequires: ant-trax +#BuildRequires: saxon +%endif BuildRequires: ecj >= 4.2.1 BuildRequires: fdupes BuildRequires: findutils @@ -268,6 +276,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 %build #bnc847505: build all commons-dbcp-tomcat jars before tomcat @@ -358,6 +367,10 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %install +%if 0%{?suse_version} == 1110 +export NO_BRP_CHECK_BYTECODE_VERSION=true +%endif + # build initial path structure %{__install} -d -m 0755 %{buildroot}%{_bindir} %{__install} -d -m 0755 %{buildroot}%{_sbindir} @@ -581,7 +594,7 @@ %if %{with_systemd} %service_add_post %{name}.service %else -%{fillup_only -f %{name}} +%{fillup_only %{name}} %endif %preun @@ -602,6 +615,8 @@ %restart_on_update %{name} %endif +# start - systemd services +%if %{with_systemd} %pre jsvc %service_add_pre %{name}-jsvc.service @@ -614,6 +629,9 @@ %postun jsvc %service_del_postun %{name}-jsvc.service +%endif +# end - systemd services + %post el-2_2-api %{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 %{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 ++++++ apache-tomcat-7.0.47-src.tar.gz -> apache-tomcat-7.0.54-src.tar.gz ++++++ ++++ 51356 lines of diff (skipped) ++++++ tomcat-7.0.2-property-build.windows.patch -> tomcat-7.0.52-property-build.windows.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-7.0.2-property-build.windows.patch 2012-06-18 17:34:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-7.0.52-property-build.windows.patch 2014-05-26 14:44:27.000000000 +0200 @@ -1,18 +1,17 @@ -Index: apache-tomcat-7.0.27-src/build.properties.default -=================================================================== ---- apache-tomcat-7.0.27-src.orig/build.properties.default 2012-03-31 16:46:49.000000000 +0200 -+++ apache-tomcat-7.0.27-src/build.properties.default 2012-06-13 13:56:38.272947593 +0200 -@@ -197,3 +197,5 @@ - dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz - dojo-js.jar=${dojo-js.home}/dojo/dojo.js - +diff -Naur apache-tomcat-7.0.52-src.orig/build.properties.default apache-tomcat-7.0.52-src/build.properties.default +--- apache-tomcat-7.0.52-src.orig/build.properties.default 2014-02-13 08:40:56.000000000 +0100 ++++ apache-tomcat-7.0.52-src/build.properties.default 2014-03-14 23:21:06.654533928 +0100 +@@ -217,3 +217,6 @@ + cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar + cobertura.lib=${cobertura.home}/lib + cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.0.3-bin.tar.gz ++ +# ----- Build on Windows ---- +build.windows=false -Index: apache-tomcat-7.0.27-src/build.xml -=================================================================== ---- apache-tomcat-7.0.27-src.orig/build.xml 2012-03-31 16:46:49.000000000 +0200 -+++ apache-tomcat-7.0.27-src/build.xml 2012-06-13 13:56:38.274947593 +0200 -@@ -2341,7 +2341,7 @@ +diff -Naur apache-tomcat-7.0.52-src.orig/build.xml apache-tomcat-7.0.52-src/build.xml +--- apache-tomcat-7.0.52-src.orig/build.xml 2014-02-13 08:40:56.000000000 +0100 ++++ apache-tomcat-7.0.52-src/build.xml 2014-03-14 23:17:02.778479339 +0100 +@@ -2702,7 +2702,7 @@ </target> <target name="download-dist" ++++++ tomcat-7.0.53-JDTCompiler-java.patch ++++++ Index: java/org/apache/jasper/compiler/JDTCompiler.java =================================================================== --- java/org/apache/jasper/compiler/JDTCompiler.java (revision 1585931) +++ java/org/apache/jasper/compiler/JDTCompiler.java (working copy) @@ -335,7 +335,7 @@ CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, @@ -379,9 +379,9 @@ CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_TargetPlatform, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 } else { log.warn("Unknown target VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_TargetPlatform, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
