Fridrich Strba 2020-02-25 13:35:13 +00:00 committed by Git OBS Bridge
parent 5d6bd6f888
commit 501a398983
7 changed files with 430 additions and 518 deletions

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl3r2Q8ACgkQEMAcWi9g
WefsBg/8CwNTI+JvM9pVcD7I3QzHjZJ61JMkf/cmgTvuDbWHCIlWiXqXEd5NcizF
yuC1lg+8JotS+ZK5puOlZRzfX1W9sQ0ry6namKb6msj/czcgAQUVMIRC8ezjAlHe
4pyweTv1bBVnL5zyvQr/f4344i/hzwR0PBFeNu2dAXp7Hs1E4nMDNi8j0RrNUF3s
8WmIH+TxlNAJ0efc7T0NkQ3UbbOyuqDeAhAFlcFgZny/91JjAEJNs/ne1KXFZ2kK
cyTOf03TBmz4HjNtQBTE7S8r1ZKGU1PJumivPnUToKgdBUf3SWiF3m3ywYXhbOIs
OkME+Ru1Sx8M87fvqTf7qxgIaMk1DtTqqyG4K9bkhaDvnGTpqA+vSHK7rdnQVa1V
E8ubJNA1/k94gLd2x9l4iP9ofgeF7U+Z0/UV3sJ6/U9RDHvm5QYEbgnoufCNiI/F
59wUKSJbyCCVCH4t6w1PQg33hOHG+pqGDZS2L4Ji26UJzMb7cdftnn5BDOm8+pWX
An50t/4X2yhYC9HyiCUFKsZdew0Sb0LTtqwySpagrjiW6KhxVqUoN1YwSBrcseXW
DFsqQSPOYVMD9b05f5sog7gczI+2nusrshBWQD8rU0NPbuUladEJGP8MTlb2F4W5
MecDnTUgJqvlrVgNULWaxcxby2NGh8bzoDXfE/Eg+JTDenh2g54=
=Pnl6
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----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-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Feb 25 13:24:14 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Update to Tomcat 9.0.31. See changelog at
http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.30_(markt)
- Fixed CVEs:
* CVE-2019-17569 (bsc#1164825)
* CVE-2020-1935
* CVE-2020-1938 (bsc#1164692)
- Modified patch
* tomcat-9.0.30-java8compat.patch
-> tomcat-9.0.31-java8compat.patch
+ Adapt to changed context
-------------------------------------------------------------------
Wed Jan 29 16:49:29 UTC 2020 - Matei Albu <malbu@suse.com>

View File

@ -22,7 +22,7 @@
%define elspec 3.0
%define major_version 9
%define minor_version 0
%define micro_version 30
%define micro_version 31
%define packdname apache-tomcat-%{version}-src
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
%global basedir /srv/%{name}
@ -80,7 +80,7 @@ Patch3: %{name}-%{major_version}.%{minor_version}-javadoc.patch
# PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars
Patch4: tomcat-9.0-osgi-build.patch
# PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk of using Java 9+ apis
Patch5: tomcat-9.0.30-java8compat.patch
Patch5: tomcat-9.0.31-java8compat.patch
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr