From 36d2f9ab538b3e00cdd6051b52411338191c2c5f2408b0043ce59bcec5bedd36 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Dec 2018 16:57:43 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=138 --- tomcat.changes | 5 +++++ tomcat.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 4d9ab36..d7faa68 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 13 16:56:51 UTC 2018 - Fridrich Strba + +- Build against the apache-commons-dbcp2 package + ------------------------------------------------------------------- Wed Dec 5 08:05:30 UTC 2018 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index 4b865db..c661bff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -89,7 +89,7 @@ BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon -BuildRequires: apache-commons-dbcp >= 2.0 +BuildRequires: apache-commons-dbcp2 BuildRequires: apache-commons-pool2 BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes @@ -112,7 +112,7 @@ BuildRequires: wsdl4j BuildRequires: zip Requires: %{name}-lib = %{version}-%{release} Requires: apache-commons-daemon -Requires: apache-commons-dbcp +Requires: apache-commons-dbcp2 Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: log4j From fec8ac3b0129b6e7c66b4dc31b3e58226e6d90e3cc8ce18328cbf10f3ce588b5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 15 Dec 2018 13:53:15 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=139 --- tomcat.changes | 5 ----- tomcat.spec | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index d7faa68..4d9ab36 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Dec 13 16:56:51 UTC 2018 - Fridrich Strba - -- Build against the apache-commons-dbcp2 package - ------------------------------------------------------------------- Wed Dec 5 08:05:30 UTC 2018 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index c661bff..4b865db 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -89,7 +89,7 @@ BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon -BuildRequires: apache-commons-dbcp2 +BuildRequires: apache-commons-dbcp >= 2.0 BuildRequires: apache-commons-pool2 BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes @@ -112,7 +112,7 @@ BuildRequires: wsdl4j BuildRequires: zip Requires: %{name}-lib = %{version}-%{release} Requires: apache-commons-daemon -Requires: apache-commons-dbcp2 +Requires: apache-commons-dbcp Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: log4j From f45eab76d98cef339b0173fcc59ef1f78645934b0b1006af5d4c628c1cdb8af5 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Wed, 9 Jan 2019 09:10:53 +0000 Subject: [PATCH 3/4] Accepting request 661953 from home:ecsos:branches:Java:packages - Update to Tomcat 9.0.14. See changelog at http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.14_(markt) OBS-URL: https://build.opensuse.org/request/show/661953 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=140 --- apache-tomcat-9.0.13-src.tar.gz | 3 --- apache-tomcat-9.0.13-src.tar.gz.asc | 16 ---------------- apache-tomcat-9.0.14-src.tar.gz | 3 +++ apache-tomcat-9.0.14-src.tar.gz.asc | 16 ++++++++++++++++ tomcat.changes | 6 ++++++ tomcat.spec | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 apache-tomcat-9.0.13-src.tar.gz delete mode 100644 apache-tomcat-9.0.13-src.tar.gz.asc create mode 100644 apache-tomcat-9.0.14-src.tar.gz create mode 100644 apache-tomcat-9.0.14-src.tar.gz.asc diff --git a/apache-tomcat-9.0.13-src.tar.gz b/apache-tomcat-9.0.13-src.tar.gz deleted file mode 100644 index 769cde5..0000000 --- a/apache-tomcat-9.0.13-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d0f994ff0f21d4a761433cc7b9c13701c30099383fa94a9b48edf1a6c7af07e -size 5244999 diff --git a/apache-tomcat-9.0.13-src.tar.gz.asc b/apache-tomcat-9.0.13-src.tar.gz.asc deleted file mode 100644 index 24123f1..0000000 --- a/apache-tomcat-9.0.13-src.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlvcYAYACgkQEMAcWi9g -WeezqRAAsc0CroOSuuP6Do0i4x2X5nKStAAgsuAJSzg4oSDkncyxW/+X/6pg45kc -1aFseu1d89dlQK2/U+sqUd4rg045/xdtTa3eEkPq3E5c6kKsaHXzJcIazt8uaVvC -uN1wA9X6K63HFdhYhfNPaUcRN2Od3mcKITrcFd25JOl0+6pvujuPZQXOIUBycogC -de/BVgUisheKdRotXoMmw1yOqcFmWG/UVlRmVsP3YT9VEUqcTT4dHRlUopUeGKtT -2dM7o8HLyqG6gGMbsLb3xf4AnjmsrVMciUfle0AQtr8dmgoPLpMSwL7DukhBCP2G -mlmtiID8nXXvbtK3XqwYFNfAPHoemYQtEq4Am81uCAZM7g7JX2jwa699OvV5ud1o -Y1CUNd9glOsCXms7zBtOGwt5U7cPDPapQNh5jVj6kKvPK29Wu1PvDIbJPPEIV2JY -AMIJpCm5yQETEfG2hrn3rzqoQFyJclVeKH+zeDDRdMO8DJbLY/go/CVTnH+WMYCF -1QflpZ2BokQzg/dV7PylRBM88jHumVtPK652ygrMWY4qFeDWO5TkXI67YWnpJoj+ -epdl4gjfmvfa8BBx2rIgy+WmcWPMy9dnW0DOlvtsp0HItCNLqk3K2p028fl7NOM9 -ERYk6thxhJlx/lANMl9BqHdud0YUtYuCoHpbxjZkROXimZE2tmA= -=rwCf ------END PGP SIGNATURE----- diff --git a/apache-tomcat-9.0.14-src.tar.gz b/apache-tomcat-9.0.14-src.tar.gz new file mode 100644 index 0000000..8a91613 --- /dev/null +++ b/apache-tomcat-9.0.14-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c91d8cc379ad37a16d838fb3049e97d2db92df0f46f10b67ff3010c6b33b651c +size 5472704 diff --git a/apache-tomcat-9.0.14-src.tar.gz.asc b/apache-tomcat-9.0.14-src.tar.gz.asc new file mode 100644 index 0000000..8e8be81 --- /dev/null +++ b/apache-tomcat-9.0.14-src.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlwJkkgACgkQEMAcWi9g +WechQA/+JcbtAqQC+Dz88Xgzi8RWrsLK8geM+d3PXzE26VZgOlJpRjLMvBM5aGo2 +EJmxXiuaPW8FSoUHUZhcwkx2vVfZR4EIwKoEnBOBqWBXXoQmBM5fq2HazQdeHjKh +3qtzOH54jA72FPJZK/AcKAK0mdB3TwYRclrIAS3OtrW52M/Fbx2JI3SRVhayE53W +Hp/s3+EWf7EGbUsMzhddcqq7auXFHIZIxCJMRI3CjAY5+/6zURMVXwO6Hb0tvzyG +K6wwkkFdb+nDCDsW0PIeRqzv19YSjFXlN7Excb7d2/Beq8v2WLSpQvMyKoKQ34WM +t+60EJC5uxl125GGvxV89up4X//eRqAKNB533b+LWa0X5vqIBe6piqSx7B6oSrve +qHrHzy0eJAX7gIzUaHKG2yUrJk0PKA9J66+QOu0JiCoHNNvy5LVazilPfhekl/2O +xSjLluNn1jZVXpu29jHK5HTffPj/L9L+rw/8mdeFGJ+LHjlTMyNRMULItSAKI4nS +CYvIQrBMxO/1TaiEouKLIR6eS+/X1VfVI2n0uxicsR4sU692BUOUvEbuKZR8n8ur +2afEt951eZAXyjBoA/BWqftNF76LgOMcu97GCnI2Y7PUe9T6r5bR2JVNnL7LlIRA +yaSLBznjXafkMCidPXL4aj7GJejWOr5hXMV9yrET7UEc5XYo3uo= +=Gb8r +-----END PGP SIGNATURE----- diff --git a/tomcat.changes b/tomcat.changes index 4d9ab36..d82f2c4 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 29 10:08:17 UTC 2018 - ecsos@opensuse.org + +- Update to Tomcat 9.0.14. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.14_(markt) + ------------------------------------------------------------------- Wed Dec 5 08:05:30 UTC 2018 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index 4b865db..9674003 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 9 %define minor_version 0 -%define micro_version 13 +%define micro_version 14 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} From 12818627366f3b0f7a54b00bc8f013ecce75cfc701ba41566f0394105b0390f1 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Fri, 11 Jan 2019 16:11:31 +0000 Subject: [PATCH 4/4] Accepting request 664712 from home:mateialbu:branches:Java:packages - Fix tomcat-digest classpath error (bsc#1120745) OBS-URL: https://build.opensuse.org/request/show/664712 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=141 --- tomcat-9.0-digest.script | 2 +- tomcat.changes | 5 +++++ tomcat.spec | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tomcat-9.0-digest.script b/tomcat-9.0-digest.script index e4dcbf7..fae10b3 100644 --- a/tomcat-9.0-digest.script +++ b/tomcat-9.0-digest.script @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" -BASE_JARS="commons-daemon tomcat/catalina servlet" +BASE_JARS="commons-daemon tomcat/catalina tomcat/servlet" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat.changes b/tomcat.changes index d82f2c4..d475366 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 11 15:46:43 UTC 2019 - malbu@suse.com + +- Fix tomcat-digest classpath error (bsc#1120745) + ------------------------------------------------------------------- Sat Dec 29 10:08:17 UTC 2018 - ecsos@opensuse.org diff --git a/tomcat.spec b/tomcat.spec index 9674003..9f64f89 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -45,7 +45,7 @@ Release: 0 Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API License: Apache-2.0 Group: Productivity/Networking/Web/Servers -URL: http://tomcat.apache.org +Url: http://tomcat.apache.org Source0: https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init