pool/tomcat
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229411 from home:balta3:branches:Java:packages

Browse Source 
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
This commit is contained in:
Darin Perusich 2014-04-14 12:54:43 +00:00 committed by Git OBS Bridge
parent d54518711c
commit 458c8940cf
8 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache-tomcat-7.0.47-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99
size 4568824

17
apache-tomcat-7.0.47-src.tar.gz.asc
View File

@ -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-----

3
apache-tomcat-7.0.52-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024
size 4613085

17
apache-tomcat-7.0.52-src.tar.gz.asc Normal file
View File

@ -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-----

23
tomcat-7.0.2-property-build.windows.patch
View File

@ -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 @@
</target>
<target name="download-dist"
- description="Download additional components for a distribution" >
+ description="Download additional components for a distribution" if="${build.windows}">
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>

22
tomcat-7.0.52-property-build.windows.patch Normal file
View File

@ -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 @@
</target>
<target name="download-dist"
- description="Download additional components for a distribution" >
+ description="Download additional components for a distribution" if="${build.windows}">
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>

9
tomcat.changes
View File

@ -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

6
tomcat.spec
View File

@ -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