diff --git a/jetty-9.4.43.v20210629.tar.gz b/jetty-9.4.54.v20240208.tar.gz similarity index 70% rename from jetty-9.4.43.v20210629.tar.gz rename to jetty-9.4.54.v20240208.tar.gz index 2a7c80ba182eadc45fc19dc6d8442bdcb8cb9550..335a73bafd73d2298f2900168ebf0907addb91fe 100644 Binary files a/jetty-9.4.43.v20210629.tar.gz and b/jetty-9.4.54.v20240208.tar.gz differ diff --git a/jetty.spec b/jetty.spec index 6ab0e99bab51933de7629ccf7fe08ffbc66a3443..bc05198c5a39ed0395c161c2fda06c0df8c35a8b 100644 --- a/jetty.spec +++ b/jetty.spec @@ -44,7 +44,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20210629 +%global addver .v20240208 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -53,7 +53,7 @@ %bcond_without jp_minimal Name: jetty -Version: 9.4.43 +Version: 9.4.54 Release: %{anolis_release}%{?dist} Summary: Java Webserver and Servlet Container @@ -67,9 +67,6 @@ Source5: %{name}.service # MIT license text taken from Utf8Appendable.java Source6: LICENSE-MIT -Patch1: 0001-Distro-jetty.home.patch -Patch2: 0002-Port-to-servlet-api-4-5.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -595,9 +592,6 @@ License: (ASL 2.0 or EPL-1.0) and MIT %prep %setup -q -n %{name}.project-%{name}-%{version}%{addver} -%patch1 -p1 -%patch2 -p1 - find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; @@ -785,7 +779,7 @@ sed -i '/ - 9.4.54-1 +- fix: CVE-2024-22201 + * Wed Jan 10 2024 mgb01105731 - 9.4.43-1 - update to version 9.4.43