Accepting request 789762 from home:mateialbu:branches:Java:packages

- Update to Tomcat 9.0.33. See changelog at
  http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.33_(markt)
- Notable fix: corrected a regression in the improvements to HTTP 
  header parsing (bsc#1167438)
- Rebased patches:
  * tomcat-9.0-javadoc.patch
  * tomcat-9.0-osgi-build.patch
  * tomcat-9.0.31-java8compat.patch

OBS-URL: https://build.opensuse.org/request/show/789762
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=197

apache-tomcat-9.0.31-src.tar.gz

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

apache-tomcat-9.0.31-src.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl47GtQACgkQEMAcWi9g
-Wef+Kw/7BpH09+833RrzoTqc46HkfM9/FEMJWMwcAFVhZMeRcafCL1aFSwUt75jB
-Ua3fErCpJAdXjSoKvINFuPPkXmgTw0HHBSqE8WZKd8Ar+ZUMzhW/cuy+5HUa4J2f
-bIsz+eoqm/SCYKC1724XwXqiD/aCTvI0dYBTq1i3um0C1ZH02EW9idxTNIbeaSa0
-zZ95CK42m1ofodwH+pdkSVSHJ838ei4L3/ggAd+T0Xg35MaZJc5wy/hE279uZDcV
-WBjAxF/JF8IRl3+5rumf9/xFAumphOJyTZlr4Zhi0NdVmt6Ktz+0SNkobgVRMjcv
-izm/vXxK/wkpVVPkCw+Kk9gvsZL13b9TPEf37uTtDaavN9o3ENSQxuhLOZsRooUx
-ZpwQBXC+P6zXp8N+HopHPsQpVPpxMGr5Mo8lBYov6QgmYwmbvBmCfjQcvk7X5h8r
-MnDkdaqcQ8l4bSiF8h4Sm1lM88DXE+LW8UAW7/ANLfW00ATLZldzdPohHBOSxp0b
-/VCnhZHw7UNPHNAdWvNgkRY3nHUiuFkJTsqWO06l1ARCLfuRb5bv+MBcKMPGROpI
-fMTgJYBkAOpPq4gZd65aV9BkAPmFd6LZCRfwLEK75NUfeQWCrwMq68OFv5DKEClK
-TzPRafdII7oN9ODG6KZfcwoVb1wJclMvHiMMJ5JP02nnGFiEPMk=
-=29Ie
------END PGP SIGNATURE-----

apache-tomcat-9.0.33-src.tar.gz

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

apache-tomcat-9.0.33-src.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl5osqIACgkQEMAcWi9g
+WedOQw/8Df5iDTellH4OkB1TD6YXJ2638BZItvCT6Zx61XKGsXU0qDfDByTQvMVo
+EG+wHghWWQ2EGSRTptMimbscKDbF9wu7QmY2a3sD8Z/HSYp2Ov+PCxECklzXBiP0
+HsMQlOkCccnhemvrTHEzU4+rYYFbAaZB2A8UPEvzffEMepE6S/oKu0I6X/APcAmP
+kzpWV59RJH+lpV3gLMo9D51L+KzHDOLE2FztBcaBSGfR5b2fxn4g5f4Sv/iW78ZS
+vGJObV7t9O3ewpdgfsGyYaoe1BRm1EmMHf/0Fh7DJHXxOjAHVkjeS2fZsvabTwYK
+R/pIzOR0Q/jsTE2hulBmKTCjha5ygcYBJ16GLGot9a9KNps1CJ10jsooakYk3z+D
+H9JJSDU/H+tcLgIE5MSoJyvkoM1wYH5us7BjbpaRVoOBmhv0ejnlBzoq8YLDlC1S
+ThYtsBvS8FohcoeKJIK6IiuvvUu0c0yqmLCOooO58MwYBi5wdbNQvMvn3P/kwY/2
+1sGQPr632sUb47CvP2qJFFkVyLhX8dhDSfNO1rLLoqIlD5xX+Fpu8Vo9njbLZrYu
+YSQl94I+u9McQQcOBOFvZnzT53Pbol0k0joXXT1sSdeFgwJT7Og3WgQYDBNC9cuZ
+P51tiL6xzDxmeZko3xB62DtHli3QL7dKOit1l80RJKcgwpRixiY=
+=f+IL
+-----END PGP SIGNATURE-----

tomcat-9.0-javadoc.patch

@@ -1,6 +1,8 @@
---- apache-tomcat-9.0.27-src/build.xml	2019-10-07 12:01:06.000000000 +0200
+Index: apache-tomcat-9.0.33-src/build.xml
-+++ apache-tomcat-9.0.27-src/build.xml	2019-11-16 00:52:57.833495494 +0100
+===================================================================
-@@ -1859,7 +1859,7 @@
+--- apache-tomcat-9.0.33-src.orig/build.xml
++++ apache-tomcat-9.0.33-src/build.xml
+@@ -1891,7 +1891,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -9,7 +11,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1881,7 +1881,7 @@
+@@ -1913,7 +1913,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -18,7 +20,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1902,7 +1902,7 @@
+@@ -1934,7 +1934,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -27,7 +29,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1923,7 +1923,7 @@
+@@ -1955,7 +1955,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -36,7 +38,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1944,7 +1944,7 @@
+@@ -1976,7 +1976,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -45,7 +47,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1962,9 +1962,10 @@
+@@ -1994,9 +1994,10 @@ Apache Tomcat ${version} native binaries
        docencoding="UTF-8"
        charset="UTF-8"
        additionalparam="-breakiterator -notimestamp"
@@ -57,7 +59,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1984,7 +1985,7 @@
+@@ -2016,7 +2017,7 @@ Apache Tomcat ${version} native binaries
        source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
@@ -66,7 +68,7 @@
        <classpath>
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
-@@ -1995,8 +1996,6 @@
+@@ -2027,8 +2028,6 @@ Apache Tomcat ${version} native binaries
        <link href="../elapi"/>
        <link href="../websocketapi"/>
        <link href="../jaspicapi"/>

tomcat-9.0-osgi-build.patch

@@ -1,8 +1,8 @@
-Index: apache-tomcat-9.0.12-src/build.xml
+Index: apache-tomcat-9.0.33-src/build.xml
 ===================================================================
---- apache-tomcat-9.0.12-src.orig/build.xml
+--- apache-tomcat-9.0.33-src.orig/build.xml
-+++ apache-tomcat-9.0.12-src/build.xml
++++ apache-tomcat-9.0.33-src/build.xml
-@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom
+@@ -3316,6 +3316,9 @@ Read the Building page on the Apache Tom
      <path id="bndlib.classpath">
        <fileset file="${bnd.jar}" />
        <fileset file="${bndlib.jar}" />

tomcat.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Mar 30 11:13:09 UTC 2020 - Matei Albu <malbu@suse.com>
+
+- Update to Tomcat 9.0.33. See changelog at
+  http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.33_(markt)
+- Notable fix: corrected a regression in the improvements to HTTP 
+  header parsing (bsc#1167438)
+- Rebased patches:
+  * tomcat-9.0-javadoc.patch
+  * tomcat-9.0-osgi-build.patch
+  * tomcat-9.0.31-java8compat.patch
+
 -------------------------------------------------------------------
 Fri Feb 28 10:15:08 UTC 2020 - Matei Albu <malbu@suse.com>
 

tomcat.spec

@@ -22,7 +22,7 @@
 %define elspec 3.0
 %define major_version 9
 %define minor_version 0
-%define micro_version 31
+%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}