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

Accepting request 234205 from home:deadpoint:branches:Java:packages

Browse Source 
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
This commit is contained in:
Tomáš Chvátal 2014-05-20 11:53:20 +00:00 committed by Git OBS Bridge
parent 458c8940cf
commit 59782c48d1
7 changed files with 89 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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,

23
tomcat.changes
View File

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

24
tomcat.spec
View File

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