rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 235273 from Java:packages

Browse Source 
- Version bump to 7.0.54:
  * bugfix update
  * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

- 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

- remove saxon build requirement for sles
- disable bytecode check for sles 

- remove unknown option from fillup_only macro
- wrap systemd %pre[un]/%post[un] in conditional
- specify required ant version

- 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

OBS-URL: https://build.opensuse.org/request/show/235273
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2014-05-26 12:44:25 +00:00 committed by Git OBS Bridge
commit 37d351c402
9 changed files with 132 additions and 48 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.54-src.tar.gz Normal file
View File

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

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

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

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}"/>

25
tomcat-7.0.53-JDTCompiler-java.patch Normal file
View File

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

42
tomcat.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
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
- 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 - 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
- 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

28
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 54
%define packdname apache-tomcat-%{version}-src
%define tcuid 91
@ -80,12 +80,20 @@ 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
# 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