From 458c8940cfa4319be77e0f16009d882020cd917d496c55ae6bd47d6f61d1b08c Mon Sep 17 00:00:00 2001 From: Darin Perusich Date: Mon, 14 Apr 2014 12:54:43 +0000 Subject: [PATCH 1/4] Accepting request 229411 from home:balta3:branches:Java:packages Update to tomcat 7.0.52. This contains a security bugfix for CVE-2014-0050. OBS-URL: https://build.opensuse.org/request/show/229411 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=42 --- apache-tomcat-7.0.47-src.tar.gz | 3 --- apache-tomcat-7.0.47-src.tar.gz.asc | 17 ---------------- apache-tomcat-7.0.52-src.tar.gz | 3 +++ apache-tomcat-7.0.52-src.tar.gz.asc | 17 ++++++++++++++++ tomcat-7.0.2-property-build.windows.patch | 23 ---------------------- tomcat-7.0.52-property-build.windows.patch | 22 +++++++++++++++++++++ tomcat.changes | 9 +++++++++ tomcat.spec | 6 +++--- 8 files changed, 54 insertions(+), 46 deletions(-) delete mode 100644 apache-tomcat-7.0.47-src.tar.gz delete mode 100644 apache-tomcat-7.0.47-src.tar.gz.asc create mode 100644 apache-tomcat-7.0.52-src.tar.gz create mode 100644 apache-tomcat-7.0.52-src.tar.gz.asc delete mode 100644 tomcat-7.0.2-property-build.windows.patch create mode 100644 tomcat-7.0.52-property-build.windows.patch diff --git a/apache-tomcat-7.0.47-src.tar.gz b/apache-tomcat-7.0.47-src.tar.gz deleted file mode 100644 index 14cc8c9..0000000 --- a/apache-tomcat-7.0.47-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99 -size 4568824 diff --git a/apache-tomcat-7.0.47-src.tar.gz.asc b/apache-tomcat-7.0.47-src.tar.gz.asc deleted file mode 100644 index ca78700..0000000 --- a/apache-tomcat-7.0.47-src.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (MingW32) - -iQIcBAABCgAGBQJSYQ88AAoJECCLCrHWMBHHYcQP/RwMofLVtWTfFi5jRpfyx9Sr -v2VT9XXZ9tIUIj1gEbncG2vy3agV9GuIPd8Hs4ONmte5UC0+hKEgLNaEDXL9I51e -VOKCVSZxdav+8Sa5IKVzzCwwUSRwqY5lr4/uHWW94U8kBPwvC7M1x+IABxV745Cp -0FJu9nMRKbKOLIi7gv5whb50An0/UAe5xPhpRVu6u+I/Gn9HqAIkLvqo7iPnEANS -DXale2pYe9t3YFnjk96svdZP7bKGbtb8WoNe4n+ONbJqFK8oUw04ExR9zhAks+MZ -/5yuwXPlpb7vCBavzb1WX5kbQ2ERGbx5XbAHMvAPfgskAYkxuTZvzsVV+V3NCOUb -C2eR8Q6Kt+WzTDoGACfJWUIhcgb7vg8r9zpsOg+RZ7stjw7XC5Z/VS4brgDjz6Ew -1zlTP7180CO3pnjJyFjYPumj3nqYEENycttSjtPgEhPkp/A6n04U/3COdIMHIRDF -pZWFwotOgyndn+a528NIJhukyXgEHOUYf7NMo33Cmf4xlMOhwHchDNTbF2o4Bs+H -OD6SbFaJwker7jiGCDf5jikLPz850ul0d14uyPAINoqWkT/+1f0LCWV//IcKXDjs -8JA8YCA+hoEMUn8VpMywSPFHIX37i95g4iKaijQsbfFAUWe9m6L+VjTW7wa9EYvj -B3tdkoaRjzzjrgvM580e -=HaR4 ------END PGP SIGNATURE----- diff --git a/apache-tomcat-7.0.52-src.tar.gz b/apache-tomcat-7.0.52-src.tar.gz new file mode 100644 index 0000000..20fcb7d --- /dev/null +++ b/apache-tomcat-7.0.52-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024 +size 4613085 diff --git a/apache-tomcat-7.0.52-src.tar.gz.asc b/apache-tomcat-7.0.52-src.tar.gz.asc new file mode 100644 index 0000000..2c73b77 --- /dev/null +++ b/apache-tomcat-7.0.52-src.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJS/HdSAAoJECCLCrHWMBHH+zAP/0Kq4TT4VpsTtmh6tNJN6aqP +H/DPOkoTEgzECf8fXFXdqVq/n2HRiqFNyKyqC3mYEyajrcTvPQjdfkzo92IBCLp7 +ectRxjo9iGOi0zKz9/7+JkBPR0dTZOx+mgrJ8gTYP6sD5dtjkNRENP86e1OXZjvx +p80MYIJZl6YG+Lv/zcQ587dao7seL5n+SB8GuN/YVIKgIIvV7Q873RlE5XUMTp+J +JimXGCpBqpi8Tpk/BIci5xPomgP3vYbCxYarv2osI48P7z4+AetDMHYiEW/aFx1N +CS7TPjaGi1UyRiTsQebHD5OKPRNnOQ9MyjeYOT2SizwccSou4Fldf0SAYTK3Rs0L +ahvT0Ue6xUDYSDJPGDGdiajMNfnKY+3guJyMGBarxllbp0GG2Vsczg8s5XsZUY/E +CA04s9EVdT7llS9wG0+reHdyJDyDO4K4Lxk1Hzt16A4YMgpage7yo9LKDNe6PI/V +C/bXE78w8fHrUjvutpzZcde4Y5Av8voM2FGwI6zS6binaNqHDeYVoTR2GQHCmEte +ToPgtHh/8RyVrmKnTs9qhNfTa8towqlPb1MeDtypLZzjg2bUsKVFgpAolhKws4ym +1IOReAiL5nKEHv8h0AEdY41uSrFUB9Onn1Gghm1CcvbmNuaacT2IUumn7mNWpNEE +dNhVi6S/rtD2WgvORUjQ +=Q/r9 +-----END PGP SIGNATURE----- diff --git a/tomcat-7.0.2-property-build.windows.patch b/tomcat-7.0.2-property-build.windows.patch deleted file mode 100644 index 5b5f892..0000000 --- a/tomcat-7.0.2-property-build.windows.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - -+# ----- 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 @@ - - - -+ description="Download additional components for a distribution" if="${build.windows}"> - - - diff --git a/tomcat-7.0.52-property-build.windows.patch b/tomcat-7.0.52-property-build.windows.patch new file mode 100644 index 0000000..de023c0 --- /dev/null +++ b/tomcat-7.0.52-property-build.windows.patch @@ -0,0 +1,22 @@ +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 +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 @@ + + + ++ description="Download additional components for a distribution" if="${build.windows}"> + + + diff --git a/tomcat.changes b/tomcat.changes index 6ccaf2c..8ce04bb 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 8 17:27:09 UTC 2014 - wittemar@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 + ------------------------------------------------------------------- Thu Dec 12 10:14:47 UTC 2013 - mvyskocil@suse.com diff --git a/tomcat.spec b/tomcat.spec index 6f44746..fd18219 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -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 52 %define packdname apache-tomcat-%{version}-src %define tcuid 91 @@ -80,7 +80,7 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF. #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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From 59782c48d10560ba1c2405549c1f00074c56b088955ec3f8ed23333af16e4d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 20 May 2014 11:53:20 +0000 Subject: [PATCH 2/4] Accepting request 234205 from home:deadpoint:branches:Java:packages Update to 7.0.53 and various SLE_11 fixes OBS-URL: https://build.opensuse.org/request/show/234205 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=43 --- apache-tomcat-7.0.52-src.tar.gz | 3 --- apache-tomcat-7.0.52-src.tar.gz.asc | 17 ----------------- apache-tomcat-7.0.53-src.tar.gz | 3 +++ apache-tomcat-7.0.53-src.tar.gz.asc | 17 +++++++++++++++++ tomcat-7.0.53-JDTCompiler-java.patch | 25 +++++++++++++++++++++++++ tomcat.changes | 23 +++++++++++++++++++++++ tomcat.spec | 24 +++++++++++++++++++++--- 7 files changed, 89 insertions(+), 23 deletions(-) delete mode 100644 apache-tomcat-7.0.52-src.tar.gz delete mode 100644 apache-tomcat-7.0.52-src.tar.gz.asc create mode 100644 apache-tomcat-7.0.53-src.tar.gz create mode 100644 apache-tomcat-7.0.53-src.tar.gz.asc create mode 100644 tomcat-7.0.53-JDTCompiler-java.patch diff --git a/apache-tomcat-7.0.52-src.tar.gz b/apache-tomcat-7.0.52-src.tar.gz deleted file mode 100644 index 20fcb7d..0000000 --- a/apache-tomcat-7.0.52-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024 -size 4613085 diff --git a/apache-tomcat-7.0.52-src.tar.gz.asc b/apache-tomcat-7.0.52-src.tar.gz.asc deleted file mode 100644 index 2c73b77..0000000 --- a/apache-tomcat-7.0.52-src.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (MingW32) - -iQIcBAABCgAGBQJS/HdSAAoJECCLCrHWMBHH+zAP/0Kq4TT4VpsTtmh6tNJN6aqP -H/DPOkoTEgzECf8fXFXdqVq/n2HRiqFNyKyqC3mYEyajrcTvPQjdfkzo92IBCLp7 -ectRxjo9iGOi0zKz9/7+JkBPR0dTZOx+mgrJ8gTYP6sD5dtjkNRENP86e1OXZjvx -p80MYIJZl6YG+Lv/zcQ587dao7seL5n+SB8GuN/YVIKgIIvV7Q873RlE5XUMTp+J -JimXGCpBqpi8Tpk/BIci5xPomgP3vYbCxYarv2osI48P7z4+AetDMHYiEW/aFx1N -CS7TPjaGi1UyRiTsQebHD5OKPRNnOQ9MyjeYOT2SizwccSou4Fldf0SAYTK3Rs0L -ahvT0Ue6xUDYSDJPGDGdiajMNfnKY+3guJyMGBarxllbp0GG2Vsczg8s5XsZUY/E -CA04s9EVdT7llS9wG0+reHdyJDyDO4K4Lxk1Hzt16A4YMgpage7yo9LKDNe6PI/V -C/bXE78w8fHrUjvutpzZcde4Y5Av8voM2FGwI6zS6binaNqHDeYVoTR2GQHCmEte -ToPgtHh/8RyVrmKnTs9qhNfTa8towqlPb1MeDtypLZzjg2bUsKVFgpAolhKws4ym -1IOReAiL5nKEHv8h0AEdY41uSrFUB9Onn1Gghm1CcvbmNuaacT2IUumn7mNWpNEE -dNhVi6S/rtD2WgvORUjQ -=Q/r9 ------END PGP SIGNATURE----- diff --git a/apache-tomcat-7.0.53-src.tar.gz b/apache-tomcat-7.0.53-src.tar.gz new file mode 100644 index 0000000..802d5ae --- /dev/null +++ b/apache-tomcat-7.0.53-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37fe4abd90133f5f61148b84e431b54e792f01cff7071ca1575ea96a7793c28 +size 4628931 diff --git a/apache-tomcat-7.0.53-src.tar.gz.asc b/apache-tomcat-7.0.53-src.tar.gz.asc new file mode 100644 index 0000000..7a0d0a9 --- /dev/null +++ b/apache-tomcat-7.0.53-src.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJTMPnqAAoJECCLCrHWMBHHlQYP/izWvkZRwD7Xb4SC7oLBvq4p +P9u/LivwcbnHhpkryJHMnczAlni+CalwtGee2aaSiBa4a2eqczUyQiedt0IKA6hy +fmyoUg628yPYDzn6umUuNXwFl9bAetpJw62RlkaquUwGXgZ2TQK58XJNzJnzy5RL +D40SVfR84WuMDrG1EyjgpgLJNLDUjo5DB2wqcDRhKfhRpgIIthN6giWjWpv9uaoV +bpNibXVaIbqYl09Qz9bpeEPUQIFWYsCX5W6T/iiWYKB2viFD9djjHTHRd4YtXS3K +/XP+nqS+nAPMaI3ZqTxqlxnHxwW07CVCYXekhMyrjEQ9IvAGzgvGrX01cB4j9GSz +KTDMYuDWX2qcoN1qk0XZhIMA0AD3s03awWR0USy3GVuQVWthueLj9izB9tJncXOu +WVVGow/cMf3VJU/cBWYEmOkAwZJGjaDqhCkSUKaqZwaNHCrDi1uvEVE/eYIJcHdL +/nRf8ixZIF6j8cN8bPpqc+g/AKk3Kct/27n48n4heoNi/wePySKZ6lbDQwBEIUzr +3c2LjoWO2BH2bpFLylbeGOK9u0mlLym0ebmps/OznQ3vPJzeyUpE2J/hBwt+ccBV +qJP+MawiANq8K+XDhHMG2RUXFis53N5H141pnrfgWskVKFVpvNhj1NG1DFuQYcXm +CR3QtM21rAmYcVi4gLSq +=E64P +-----END PGP SIGNATURE----- diff --git a/tomcat-7.0.53-JDTCompiler-java.patch b/tomcat-7.0.53-JDTCompiler-java.patch new file mode 100644 index 0000000..eae9d2c --- /dev/null +++ b/tomcat-7.0.53-JDTCompiler-java.patch @@ -0,0 +1,25 @@ +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, diff --git a/tomcat.changes b/tomcat.changes index 8ce04bb..68392b5 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu May 15 14:59:25 UTC 2014 - darin@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 + +------------------------------------------------------------------- +Thu May 15 14:41:40 UTC 2014 - darin@darins.net + +- remove saxon build requirement for sles +- disable bytecode check for sles + +------------------------------------------------------------------- +Mon Apr 14 17:59:07 UTC 2014 - darin@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 - wittemar@googlemail.com diff --git a/tomcat.spec b/tomcat.spec index fd18219..3c635b1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -26,7 +26,7 @@ %define major_version 7 %define minor_version 0 -%define micro_version 52 +%define micro_version 53 %define packdname apache-tomcat-%{version}-src %define tcuid 91 @@ -81,11 +81,19 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF. Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch #PATCH-FIX-OPENSUSE: skip few windows specific parts of build 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 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 %build #bnc847505: build all commons-dbcp-tomcat jars before tomcat @@ -358,6 +367,10 @@ touch META-INF/MANIFEST.MF 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 @@ ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh %if %{with_systemd} %service_add_post %{name}.service %else -%{fillup_only -f %{name}} +%{fillup_only %{name}} %endif %preun @@ -602,6 +615,8 @@ fi %restart_on_update %{name} %endif +# start - systemd services +%if %{with_systemd} %pre jsvc %service_add_pre %{name}-jsvc.service @@ -614,6 +629,9 @@ fi %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 From f4eb59d8ff900ff7d5b916c3ffd6829ba623728e444e092a91065552fe26565a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 24 May 2014 09:39:28 +0000 Subject: [PATCH 3/4] * 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=44 --- tomcat.changes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.changes b/tomcat.changes index 68392b5..d0e9c18 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -6,7 +6,10 @@ Thu May 15 14:59:25 UTC 2014 - darin@darins.net * 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 + * 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 - darin@darins.net From c03a07e8846a4bc471d2fa5c71e9e672e76782a865bbc3f1975ee2eac8d187e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 24 May 2014 09:59:26 +0000 Subject: [PATCH 4/4] - Version bump to 7.0.54: * bugfix update * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=45 --- apache-tomcat-7.0.53-src.tar.gz | 3 --- apache-tomcat-7.0.53-src.tar.gz.asc | 17 ----------------- apache-tomcat-7.0.54-src.tar.gz | 3 +++ apache-tomcat-7.0.54-src.tar.gz.asc | 17 +++++++++++++++++ tomcat.changes | 7 +++++++ tomcat.spec | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 apache-tomcat-7.0.53-src.tar.gz delete mode 100644 apache-tomcat-7.0.53-src.tar.gz.asc create mode 100644 apache-tomcat-7.0.54-src.tar.gz create mode 100644 apache-tomcat-7.0.54-src.tar.gz.asc diff --git a/apache-tomcat-7.0.53-src.tar.gz b/apache-tomcat-7.0.53-src.tar.gz deleted file mode 100644 index 802d5ae..0000000 --- a/apache-tomcat-7.0.53-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d37fe4abd90133f5f61148b84e431b54e792f01cff7071ca1575ea96a7793c28 -size 4628931 diff --git a/apache-tomcat-7.0.53-src.tar.gz.asc b/apache-tomcat-7.0.53-src.tar.gz.asc deleted file mode 100644 index 7a0d0a9..0000000 --- a/apache-tomcat-7.0.53-src.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (MingW32) - -iQIcBAABCgAGBQJTMPnqAAoJECCLCrHWMBHHlQYP/izWvkZRwD7Xb4SC7oLBvq4p -P9u/LivwcbnHhpkryJHMnczAlni+CalwtGee2aaSiBa4a2eqczUyQiedt0IKA6hy -fmyoUg628yPYDzn6umUuNXwFl9bAetpJw62RlkaquUwGXgZ2TQK58XJNzJnzy5RL -D40SVfR84WuMDrG1EyjgpgLJNLDUjo5DB2wqcDRhKfhRpgIIthN6giWjWpv9uaoV -bpNibXVaIbqYl09Qz9bpeEPUQIFWYsCX5W6T/iiWYKB2viFD9djjHTHRd4YtXS3K -/XP+nqS+nAPMaI3ZqTxqlxnHxwW07CVCYXekhMyrjEQ9IvAGzgvGrX01cB4j9GSz -KTDMYuDWX2qcoN1qk0XZhIMA0AD3s03awWR0USy3GVuQVWthueLj9izB9tJncXOu -WVVGow/cMf3VJU/cBWYEmOkAwZJGjaDqhCkSUKaqZwaNHCrDi1uvEVE/eYIJcHdL -/nRf8ixZIF6j8cN8bPpqc+g/AKk3Kct/27n48n4heoNi/wePySKZ6lbDQwBEIUzr -3c2LjoWO2BH2bpFLylbeGOK9u0mlLym0ebmps/OznQ3vPJzeyUpE2J/hBwt+ccBV -qJP+MawiANq8K+XDhHMG2RUXFis53N5H141pnrfgWskVKFVpvNhj1NG1DFuQYcXm -CR3QtM21rAmYcVi4gLSq -=E64P ------END PGP SIGNATURE----- diff --git a/apache-tomcat-7.0.54-src.tar.gz b/apache-tomcat-7.0.54-src.tar.gz new file mode 100644 index 0000000..e05078f --- /dev/null +++ b/apache-tomcat-7.0.54-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3dcdd1ee9c8f0bf84839048e6bbd928d1cccb2c93edf31a5c9eed1dfe2fb960 +size 4641885 diff --git a/apache-tomcat-7.0.54-src.tar.gz.asc b/apache-tomcat-7.0.54-src.tar.gz.asc new file mode 100644 index 0000000..5a3b1b9 --- /dev/null +++ b/apache-tomcat-7.0.54-src.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJTemA7AAoJECCLCrHWMBHHlEsP/1Ge2IkkjfmX7jAZ0Le+SxB/ +ujbs34sTGDA1EwbaCInxxQ95yV+z5NbSEiJNN/8v3SSugghwSy5luR8jRKkgfFuq +ACvg0AC4vErFXJoL0GeyyJgB89vvPyFlRUMBujvoRIRuXHVNVdAL3iOpMZWskJAE +Wt9Kq3jbFL1ytHcAFwZjhchzEnmFkR8iIV5lHDGeAf1u2n5YsLjBzGBDdWWeJZ1n +Qo6JuH2MnMoyR8+AwBxLjerOzbx76XvAefyaW+ZetZGwacdZ20PWEzlzHSD3HLj/ +c2JqRZJ7aT9UOkI1TpmIaWI6ouSIe9mDgDVDSQz3VE5JgZx1ebik71nmh2DRihTt +WbH88vLdYSeB4MiL8Hl8e0ddvcoK5JFdvUAv6ZE87WXo6wwxN1LH5bO0PULLgxGC +b2uDGeGbsDyV3HJzCDY5Pdkgs/S448fpxfFOjn209EW8kSVNJ4lVfPoYvigtlVX1 +ux5GeI84rEWZ6wn0h4k/Zi01gn++VMCbi0w34junww+jk1qkPArWnpk4Kio2CdcV +TfOsCYtoAiwMs547i7OJr5pNu50lA19KdvXLjwYl64G/ai2cL5MSANd3SNS4RRz6 +3LHl2oOZ8Y7BZb0q+zdLSuPoEigod3TZ2d6MAXIO8U7Dt7aOrgho7xi/m9wMJmyU +cav1RRwDbuVtivzweNPc +=xJmh +-----END PGP SIGNATURE----- diff --git a/tomcat.changes b/tomcat.changes index d0e9c18..6b6532d 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 24 09:58:55 UTC 2014 - tchvatal@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 - darin@darins.net diff --git a/tomcat.spec b/tomcat.spec index 3c635b1..1a75753 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -26,7 +26,7 @@ %define major_version 7 %define minor_version 0 -%define micro_version 53 +%define micro_version 54 %define packdname apache-tomcat-%{version}-src %define tcuid 91