From 1e8dfab36bf6b28f9d02e99c9f60174e7edc2fefb3b5420ba59bee6b9b3a8ce1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Mar 2021 10:38:58 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=27 --- jetty-9.4.35.v20201120.tar.gz | 3 --- jetty-9.4.37.v20210219.tar.gz | 3 +++ jetty-minimal.spec | 9 +++------ jetty-websocket.spec | 9 +++------ 4 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 jetty-9.4.35.v20201120.tar.gz create mode 100644 jetty-9.4.37.v20210219.tar.gz diff --git a/jetty-9.4.35.v20201120.tar.gz b/jetty-9.4.35.v20201120.tar.gz deleted file mode 100644 index b295c54..0000000 --- a/jetty-9.4.35.v20201120.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5bbfde30e900aca628e33f78aaa40497ecf32c4033e307ce2f4fda9036220ee -size 19172757 diff --git a/jetty-9.4.37.v20210219.tar.gz b/jetty-9.4.37.v20210219.tar.gz new file mode 100644 index 0000000..bab0c78 --- /dev/null +++ b/jetty-9.4.37.v20210219.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0db59aceac7ea5037f938d4132a05841ed75fa3df69268cf322e04b72b3c7ca7 +size 19221765 diff --git a/jetty-minimal.spec b/jetty-minimal.spec index ab1720b..0bd3bd7 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -1,7 +1,7 @@ # # spec file for package jetty-minimal # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20201120 +%global addver .v20210219 Name: %{base_name}-minimal -Version: 9.4.35 +Version: 9.4.37 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 @@ -194,11 +194,8 @@ find . -name "*.class" -exec rm {} \; # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin -%pom_remove_plugin -r :findbugs-maven-plugin %pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin -r :clirr-maven-plugin %pom_remove_plugin -r :maven-eclipse-plugin -%pom_remove_plugin -r :maven-pmd-plugin %pom_remove_plugin -r :license-maven-plugin %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-source-plugin diff --git a/jetty-websocket.spec b/jetty-websocket.spec index 2d0c46f..a9f77fc 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -1,7 +1,7 @@ # # spec file for package jetty-websocket # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20201120 +%global addver .v20210219 Name: %{base_name}-websocket -Version: 9.4.35 +Version: 9.4.37 Release: 0 Summary: The websocket modules for Jetty License: Apache-2.0 OR EPL-1.0 @@ -118,11 +118,8 @@ find . -name "*.class" -exec rm {} \; # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin -%pom_remove_plugin -r :findbugs-maven-plugin %pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin -r :clirr-maven-plugin %pom_remove_plugin -r :maven-eclipse-plugin -%pom_remove_plugin -r :maven-pmd-plugin %pom_remove_plugin -r :license-maven-plugin %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-source-plugin From da486d16a5c6da9f57725a106eef2475a4c86409126fac83ac4d6258810e3e9b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Mar 2021 10:46:41 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=28 --- jetty-9.4.37.v20210219.tar.gz | 3 --- jetty-9.4.38.v20210224.tar.gz | 3 +++ jetty-minimal.spec | 4 ++-- jetty-websocket.spec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 jetty-9.4.37.v20210219.tar.gz create mode 100644 jetty-9.4.38.v20210224.tar.gz diff --git a/jetty-9.4.37.v20210219.tar.gz b/jetty-9.4.37.v20210219.tar.gz deleted file mode 100644 index bab0c78..0000000 --- a/jetty-9.4.37.v20210219.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0db59aceac7ea5037f938d4132a05841ed75fa3df69268cf322e04b72b3c7ca7 -size 19221765 diff --git a/jetty-9.4.38.v20210224.tar.gz b/jetty-9.4.38.v20210224.tar.gz new file mode 100644 index 0000000..9dda101 --- /dev/null +++ b/jetty-9.4.38.v20210224.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d07ce0653b8010c77c2be15620ddc99bb02eedff4b6c61951de1079b50d17c3 +size 19224312 diff --git a/jetty-minimal.spec b/jetty-minimal.spec index 0bd3bd7..7794cbe 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20210219 +%global addver .v20210224 Name: %{base_name}-minimal -Version: 9.4.37 +Version: 9.4.38 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 diff --git a/jetty-websocket.spec b/jetty-websocket.spec index a9f77fc..ece098d 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20210219 +%global addver .v20210224 Name: %{base_name}-websocket -Version: 9.4.37 +Version: 9.4.38 Release: 0 Summary: The websocket modules for Jetty License: Apache-2.0 OR EPL-1.0 From 02625aecddde5b035c3413f4e768a37034af6ea4a54af277bc3dcfd927c78b95 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Mar 2021 11:13:39 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=29 --- jetty-minimal.changes | 6 ++++++ jetty-websocket.changes | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 75ffaff..d71a00d 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 12 11:11:07 UTC 2021 - Fridrich Strba + +- Upgrade to upstream version 9.4.38.v20210224 + * Fixes bsc#1182898, CVE-2020-27223 + ------------------------------------------------------------------- Mon Dec 7 18:12:50 UTC 2020 - Fridrich Strba diff --git a/jetty-websocket.changes b/jetty-websocket.changes index d87bf85..e1eba59 100644 --- a/jetty-websocket.changes +++ b/jetty-websocket.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 12 11:11:07 UTC 2021 - Fridrich Strba + +- Upgrade to upstream version 9.4.38.v20210224 + * Fixes bsc#1182898, CVE-2020-27223 + ------------------------------------------------------------------- Mon Dec 7 18:12:50 UTC 2020 - Fridrich Strba