Accepting request 391265 from Java:packages

- Version update to 8.0.33: * Another bugfix release for 8.0 series, full details: http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.33_(markt) - Rebase tomcat-8.0-tomcat-users-webapp.patch - Rebase tomcat-7.0.53-JDTCompiler-java.patch to tomcat-8.0.33-JDTCompiler-java.patch OBS-URL: https://build.opensuse.org/request/show/391265 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=29
2016-04-28 14:55:54 +00:00 · 2016-04-28 14:55:54 +00:00 · bb215cf92d
commit bb215cf92d
parent bb76456f3b 219e9d1981
8 changed files with 50 additions and 31 deletions
--- a/apache-tomcat-8.0.32-src.tar.gz
+++ b/apache-tomcat-8.0.32-src.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560
-size 4957920
--- a/apache-tomcat-8.0.32-src.tar.gz.asc
+++ b/apache-tomcat-8.0.32-src.tar.gz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJWsQbNAAoJEBDAHFovYFnnZRoP/1kS4JhRn1QLHI00h1VKRITF
-18xGGlXKBYJTYlynhEULxlFk5xV4ExSsaZFz3wHoMpKH5UwwBuwv9FF6sbdwuRhN
-xBkVhM5LhV0/eL1Qk7OqyrbWms3FmzC0mq9MTweHM1HCCeZ8/n6Aiz+ykGD/U22i
-7fX3tQVZLC9QFVmpLFWjT4BkAV+5eUqJWSbKCP8jiQ5t76zRzG31tjpF8sPsXZ53
-FfIDpC5Sho1Mk2/Ak10QMtN0ArQ2Y64mpZvi4Lqh5+b24tA2HT8VdAuhke3hmgll
-wozMy8ci7atuAg2vcYq6VXj0dnUgf1GTUU28YoQbkVHegCPXy/VMnL6O38ednF/X
-ZiL0Gbk5sCVPnPMb6UN3IEKP+ukG3tucpDQY/MMXkb5I3WyBQvc/Kwx0nG8aOmUY
-DzeGtSKQhW+08GsHMeoc9eYHukedWWxL8O2x6ozgSKNhyjq84rJI0ndgk0niemVu
-mLofmzbIrnnUY+R6dDoR2TqUyZVmkw1uFE7Pb165kSuJJauP5kRGrKOCNfbsjl1H
-OHK7+2PZ1SrrEAWEAAg5LmEtbkq9HJeInKEjDXaW9ASS5VqZpOIPo4JgjBv3NR2J
-xdDmCa0Zy7nVPtwOsi8s02fJCP0BBFh8hb4hcdkG+aR9UYsCdfx2L+mxwusdS8dI
-5Mkeg1+WUp9XnYkCu+8G
-=M/JH
-----END PGP SIGNATURE-----
--- a/apache-tomcat-8.0.33-src.tar.gz
+++ b/apache-tomcat-8.0.33-src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f
+size 4969308
--- a/apache-tomcat-8.0.33-src.tar.gz.asc
+++ b/apache-tomcat-8.0.33-src.tar.gz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJW7Ga8AAoJEBDAHFovYFnnm20QAIly1zfOhDlREHW/VFJ5cp4S
+YrCiqT9Rm7AMrvGXezKYllx5o0t9Y8ni4y/YIsezTR0M/RaH6Q4b4yRr2oychrHj
+VCOHnGANbWK4b7GMlvaEijosWL3RZwOuQhdJMvjSlo9Y0FYMRmJl1nmhBp6lbsFQ
+jJyv0tB1xpqqS/MeqvRinvwDskGfJkOlWRoMqHa9Ydicqf2FwUAV9c3dVb15qsjN
+xG8v3VusjY5DzRDiE/rynGRZ/+KzmQQarXz3l1VFAXuvkXg6oNONy9BH65jupgpx
+m7+hKqnwQswy4Cb+zIuNBTEKRL13ziQC1JKEV/YceUxki//HGNV40uq0b13rToZc
+d6TjO1S3a+3rX6iyyfNx1jQagqM9H4DzKfMXi3xT79SF3OR1K78VNPFAR+HLf/28
+gxT8PEmfUYdaZ+j1Y5KLL+rmtZFF6HFc1aSKK9RjKSsXm7ENCkmTGR6jZ8RSheu/
+U9TQqW1LexMPJQAtDinIYQd7Y+HLb3U4jCxbxgmrAZ8iKWvtRo0aokNDDuRqH2Z5
+I86lF1pvI8cKfJxJPrSOnVfUhgrARs4/YT5zVDLydf8fY8yDTEUSzdU8CHRPWEpx
+AuXKOjd3SBoa9iZ3FaxNfLcD71G5Pp8jUCKes5l636yev7jFWQSeBSaHhCuKuSEK
+E8MCmDjYjRY1/fnyY0Me
+=UkDV
+-----END PGP SIGNATURE-----
--- a/tomcat-8.0-tomcat-users-webapp.patch
+++ b/tomcat-8.0-tomcat-users-webapp.patch
@ -1,8 +1,8 @@
 --- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
 +++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
@@ -23,4 +23,14 @@
-   <user username="both" password="tomcat" roles="tomcat,role1"/>
-   <user username="role1" password="tomcat" roles="role1"/>
+   <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
+   <user username="role1" password="<must-be-changed>" roles="role1"/>
 -->
 +
 +<!-- <role rolename="admin"/> -->
--- a/tomcat-8.0.33-JDTCompiler-java.patch
+++ b/tomcat-8.0.33-JDTCompiler-java.patch
@ -1,17 +1,19 @@
-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 @@
+--- java/org/apache/jasper/compiler/JDTCompiler.java.orig	2016-04-22 11:13:13.194743602 +0200
+++ java/org/apache/jasper/compiler/JDTCompiler.java	2016-04-22 11:17:02.457841335 +0200
+@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa
                              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 if(opt.equals("1.9")) {
+                 settings.put(CompilerOptions.OPTION_Source,
+-                             CompilerOptions.VERSION_1_9);
+                             "1.9"); // CompilerOptions.VERSION_1_9
             } else {
                 log.warn("Unknown source VM " + opt + " ignored.");
                 settings.put(CompilerOptions.OPTION_Source,
-@@ -379,9 +379,9 @@
+@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa
                         CompilerOptions.VERSION_1_7);
             } else if(opt.equals("1.8")) {
                 settings.put(CompilerOptions.OPTION_TargetPlatform,
@ -20,6 +22,13 @@ Index: java/org/apache/jasper/compiler/JDTCompiler.java
                 settings.put(CompilerOptions.OPTION_Compliance,
 -                        CompilerOptions.VERSION_1_8);
 +                        "1.8"); // CompilerOptions.VERSION_1_8
+             } else if(opt.equals("1.9")) {
+                 settings.put(CompilerOptions.OPTION_TargetPlatform,
+-                             CompilerOptions.VERSION_1_9);
+                             "1.9"); // CompilerOptions.VERSION_1_9
+                 settings.put(CompilerOptions.OPTION_Compliance,
+-                        CompilerOptions.VERSION_1_9);
+                        "1.9"); // CompilerOptions.VERSION_1_9
             } else {
                 log.warn("Unknown target VM " + opt + " ignored.");
                 settings.put(CompilerOptions.OPTION_TargetPlatform,
--- a/tomcat.changes
+++ b/tomcat.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 21 21:22:56 UTC 2016 - jcnengel@gmail.com
+
+- Version update to 8.0.33:
+  * Another bugfix release for 8.0 series, full details:
+    http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.33_(markt)
+- Rebase tomcat-8.0-tomcat-users-webapp.patch
+- Rebase tomcat-7.0.53-JDTCompiler-java.patch
+  to tomcat-8.0.33-JDTCompiler-java.patch
+
 -------------------------------------------------------------------
 Thu Apr  7 13:01:07 UTC 2016 - tchvatal@suse.com

--- a/tomcat.spec
+++ b/tomcat.spec
@ -22,7 +22,7 @@
 %define elspec 3.0
 %define major_version 8
 %define minor_version 0
-%define micro_version 32
+%define micro_version 33
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %global basedir /srv/%{name}
@ -75,7 +75,7 @@ Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pa
 #PATCH-FIX-OPENSUSE: skip few windows specific parts of build
 Patch2:         tomcat-8.0.9-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
+Patch3:         tomcat-8.0.33-JDTCompiler-java.patch
 # PATCH-FIX-SLE: Change security manager default policies bnc#891264
 Patch4:         tomcat-7.0-sle.catalina.policy.patch
 BuildRequires:  ant >= 1.8.1