From f542da1b6c9a74ae7cba4df5e487f653ce06f0d6b1c5f5b37d5d44288be9f7c2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 23 Jun 2021 07:33:58 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=36 --- jetty-minimal.changes | 4 ++-- jetty-websocket.changes | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 07c60ff..360eb0d 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -8,9 +8,9 @@ Wed Jun 9 14:07:47 UTC 2021 - Fridrich Strba Fri May 14 17:01:58 UTC 2021 - Ferdinand Thiessen - Update to version 9.4.40.v20210413 - * Fix: bsc#1184367 CVE-2021-28165 - jetty server high CPU when + * Fix: bsc#1184367, CVE-2021-28165 - jetty server high CPU when client send data length > 17408 - * Fix: bsc#1184368 CVE-2021-28164 - Normalize ambiguous URIs + * Fix: bsc#1184368, CVE-2021-28164 - Normalize ambiguous URIs * Fix: bsc#1184366, CVE-2021-28163 - Exclude webapps directory from deployment scan diff --git a/jetty-websocket.changes b/jetty-websocket.changes index 901a5e9..50e457b 100644 --- a/jetty-websocket.changes +++ b/jetty-websocket.changes @@ -8,9 +8,9 @@ Wed Jun 9 14:07:47 UTC 2021 - Fridrich Strba Fri May 14 16:57:01 UTC 2021 - Ferdinand Thiessen - Update to version 9.4.40.v20210413 - * Fix: bsc#1184367 CVE-2021-28165 - jetty server high CPU when + * Fix: bsc#1184367, CVE-2021-28165 - jetty server high CPU when client send data length > 17408 - * Fix: bsc#1184368 CVE-2021-28164 - Normalize ambiguous URIs + * Fix: bsc#1184368, CVE-2021-28164 - Normalize ambiguous URIs * Fix: bsc#1184366, CVE-2021-28163 - Exclude webapps directory from deployment scan * Improve handling of unconsumed content From 797e770b0c464e3ee9c751f941afbf7d0d2a8157cd9dd693a5c402c78837d99f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Jun 2021 07:47:33 +0000 Subject: [PATCH 2/2] Accepting request 902837 from home:urbic:branches:Java:packages - Package modules: ant, cdi, deploy, fcgi, http-spi, quickstart, rewrite, start, unixsocket OBS-URL: https://build.opensuse.org/request/show/902837 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=37 --- jetty-minimal.changes | 6 ++ jetty-minimal.spec | 230 +++++++++++++++++++++++++++++++----------- jetty-websocket.spec | 2 +- 3 files changed, 176 insertions(+), 62 deletions(-) diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 360eb0d..1860c56 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 28 12:45:55 UTC 2021 - Anton Shvetz + +- Package modules: ant, cdi, deploy, fcgi, http-spi, quickstart, + rewrite, start, unixsocket + ------------------------------------------------------------------- Wed Jun 9 14:07:47 UTC 2021 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index c568333..1fc2254 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package jetty-minimal # # Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2007, JPackage Project @@ -25,14 +25,18 @@ Version: 9.4.42 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 +Group: Productivity/Networking/Web/Servers URL: https://www.eclipse.org/jetty/ Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: mvn(com.github.jnr:jnr-unixsocket) BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.transaction:javax.transaction-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.tomcat:tomcat-jasper) BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) @@ -62,127 +66,211 @@ This package contains %package -n %{base_name}-annotations Summary: The annotations module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-annotations %{extdesc} %{summary}. +%package -n %{base_name}-ant +Summary: The ant module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-ant +%{extdesc} %{summary}. + +%package -n %{base_name}-cdi +Summary: The cdi module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-cdi +%{extdesc} %{summary}. + %package -n %{base_name}-client Summary: The client module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-client %{extdesc} %{summary}. %package -n %{base_name}-continuation Summary: The continuation module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-continuation %{extdesc} %{summary}. +%package -n %{base_name}-deploy +Summary: The deploy module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-deploy +%{extdesc} %{summary}. + +%package -n %{base_name}-fcgi +Summary: The fcgi module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-fcgi +%{extdesc} %{summary}. + %package -n %{base_name}-http Summary: The http module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-http %{extdesc} %{summary}. %package -n %{base_name}-http-spi Summary: The http-spi module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-http-spi %{extdesc} %{summary}. %package -n %{base_name}-io Summary: The io module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-io %{extdesc} %{summary}. %package -n %{base_name}-jaas Summary: The jaas module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-jaas %{extdesc} %{summary}. +%package -n %{base_name}-jmx +Summary: The jmx module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-jmx +%{extdesc} %{summary}. + %package -n %{base_name}-jndi Summary: The jndi module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-jndi %{extdesc} %{summary}. %package -n %{base_name}-jsp Summary: The jsp module for Jetty +Group: Productivity/Networking/Web/Servers Requires: glassfish-el %description -n %{base_name}-jsp %{extdesc} %{summary}. -%package -n %{base_name}-security -Summary: The security module for Jetty - -%description -n %{base_name}-security -%{extdesc} %{summary}. - %package -n %{base_name}-openid Summary: The openid module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-openid %{extdesc} %{summary}. -%package -n %{base_name}-server -Summary: The server module for Jetty - -%description -n %{base_name}-server -%{extdesc} %{summary}. - -%package -n %{base_name}-servlet -Summary: The servlet module for Jetty - -%description -n %{base_name}-servlet -%{extdesc} %{summary}. - -%package -n %{base_name}-util -Summary: The util module for Jetty - -%description -n %{base_name}-util -%{extdesc} %{summary}. - -%package -n %{base_name}-util-ajax -Summary: The util-ajax module for Jetty - -%description -n %{base_name}-util-ajax -%{extdesc} %{summary}. - -%package -n %{base_name}-webapp -Summary: The webapp module for Jetty - -%description -n %{base_name}-webapp -%{extdesc} %{summary}. - -%package -n %{base_name}-jmx -Summary: The jmx module for Jetty - -%description -n %{base_name}-jmx -%{extdesc} %{summary}. - -%package -n %{base_name}-xml -Summary: The xml module for Jetty - -%description -n %{base_name}-xml -%{extdesc} %{summary}. - %package -n %{base_name}-plus Summary: The plus module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-plus %{extdesc} %{summary}. %package -n %{base_name}-proxy Summary: The proxy module for Jetty +Group: Productivity/Networking/Web/Servers %description -n %{base_name}-proxy %{extdesc} %{summary}. +%package -n %{base_name}-quickstart +Summary: The quickstart module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-quickstart +%{extdesc} %{summary}. + +%package -n %{base_name}-rewrite +Summary: The rewrite module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-rewrite +%{extdesc} %{summary}. + +%package -n %{base_name}-security +Summary: The security module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-security +%{extdesc} %{summary}. + +%package -n %{base_name}-server +Summary: The server module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-server +%{extdesc} %{summary}. + +%package -n %{base_name}-servlet +Summary: The servlet module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-servlet +%{extdesc} %{summary}. + +%package -n %{base_name}-servlets +Summary: The servlets module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-servlets +%{extdesc} %{summary}. + +%package -n %{base_name}-start +Summary: The start module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-start +%{extdesc} %{summary}. + +%package -n %{base_name}-unixsocket +Summary: The unixsocket module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-unixsocket +%{extdesc} %{summary}. + +%package -n %{base_name}-util +Summary: The util module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-util +%{extdesc} %{summary}. + +%package -n %{base_name}-util-ajax +Summary: The util-ajax module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-util-ajax +%{extdesc} %{summary}. + +%package -n %{base_name}-webapp +Summary: The webapp module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-webapp +%{extdesc} %{summary}. + +%package -n %{base_name}-xml +Summary: The xml module for Jetty +Group: Productivity/Networking/Web/Servers + +%description -n %{base_name}-xml +%{extdesc} %{summary}. + %package javadoc Summary: Javadoc for %{name} +Group: Productivity/Networking/Web/Servers %description javadoc %{summary}. @@ -294,28 +382,19 @@ sed -i '/%{buildroot}%{_sysconfdir}/ant.d/%{base_name} +ln -s %{_javadir}/%{base_name}/%{base_name}-ant.jar %{buildroot}%{_datadir}/ant/lib/ + %files -n %{base_name}-annotations -f .mfiles-jetty-annotations +%files -n %{base_name}-ant -f .mfiles-jetty-ant +%config %{_sysconfdir}/ant.d/%{base_name} +%{_datadir}/ant/lib/%{base_name}-ant.jar + +%files -n %{base_name}-cdi -f .mfiles-jetty-cdi + %files -n %{base_name}-client -f .mfiles-jetty-client %files -n %{base_name}-continuation -f .mfiles-jetty-continuation +%files -n %{base_name}-deploy -f .mfiles-jetty-deploy + +%files -n %{base_name}-fcgi -f .mfiles-fcgi-server -f .mfiles-fcgi-client + +%files -n %{base_name}-http-spi -f .mfiles-jetty-http-spi + %files -n %{base_name}-jaas -f .mfiles-jetty-jaas %files -n %{base_name}-jndi -f .mfiles-jetty-jndi @@ -379,6 +477,8 @@ sed -i '/