From 653c19b6e16cf02bdd2f5e328de9a15998c8df8b1727907d8445f37a00b041fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Dec 2020 18:15:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=25 --- jetty-9.4.30.v20200611.tar.gz | 3 --- jetty-9.4.35.v20201120.tar.gz | 3 +++ jetty-minimal.changes | 6 ++++++ jetty-minimal.spec | 7 ++----- jetty-websocket.changes | 6 ++++++ jetty-websocket.spec | 7 ++----- 6 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 jetty-9.4.30.v20200611.tar.gz create mode 100644 jetty-9.4.35.v20201120.tar.gz diff --git a/jetty-9.4.30.v20200611.tar.gz b/jetty-9.4.30.v20200611.tar.gz deleted file mode 100644 index 811fcf3..0000000 --- a/jetty-9.4.30.v20200611.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fac8bb95f8e8de245b284d359607b414893992ebb4e2b6e3ee40161297ea2111 -size 19323085 diff --git a/jetty-9.4.35.v20201120.tar.gz b/jetty-9.4.35.v20201120.tar.gz new file mode 100644 index 0000000..b295c54 --- /dev/null +++ b/jetty-9.4.35.v20201120.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5bbfde30e900aca628e33f78aaa40497ecf32c4033e307ce2f4fda9036220ee +size 19172757 diff --git a/jetty-minimal.changes b/jetty-minimal.changes index eef6cf7..75ffaff 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 7 18:12:50 UTC 2020 - Fridrich Strba + +- Upgrade to upstream version 9.4.35.v20201120 + * Fixes bsc#1179727, CVE-2020-27218 + ------------------------------------------------------------------- Thu Nov 19 13:05:09 UTC 2020 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index 756d6e8..ab1720b 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20200611 +%global addver .v20201120 Name: %{base_name}-minimal -Version: 9.4.30 +Version: 9.4.35 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 @@ -213,9 +213,6 @@ find . -name "*.class" -exec rm {} \; %pom_disable_module aggregates/jetty-all -# Use proper groupId for apache ant -%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml - %pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi %pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper diff --git a/jetty-websocket.changes b/jetty-websocket.changes index e1f0070..d87bf85 100644 --- a/jetty-websocket.changes +++ b/jetty-websocket.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 7 18:12:50 UTC 2020 - Fridrich Strba + +- Upgrade to upstream version 9.4.35.v20201120 + * Fixes bsc#1179727, CVE-2020-27218 + ------------------------------------------------------------------- Thu Nov 19 13:05:09 UTC 2020 - Fridrich Strba diff --git a/jetty-websocket.spec b/jetty-websocket.spec index 7f14c9a..2d0c46f 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20200611 +%global addver .v20201120 Name: %{base_name}-websocket -Version: 9.4.30 +Version: 9.4.35 Release: 0 Summary: The websocket modules for Jetty License: Apache-2.0 OR EPL-1.0 @@ -137,9 +137,6 @@ find . -name "*.class" -exec rm {} \; %pom_disable_module aggregates/jetty-all -# Use proper groupId for apache ant -%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml - %pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi %pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper