From fa009b665b0bca75524d46b9bd7865d870be5fe6367d90c94477a873fc6f3620 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Oct 2024 12:27:55 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=87 --- .gitattributes | 23 + .gitignore | 1 + _multibuild | 7 + jetty-alpn.changes | 19 + jetty-alpn.spec | 283 +++++++++++ jetty-http2.changes | 18 + jetty-http2.spec | 312 ++++++++++++ jetty-minimal.changes | 250 ++++++++++ jetty-minimal.spec | 519 ++++++++++++++++++++ jetty-unixsocket.changes | 141 ++++++ jetty-unixsocket.spec | 263 ++++++++++ jetty-websocket.changes | 203 ++++++++ jetty-websocket.spec | 330 +++++++++++++ jetty.project-jetty-9.4.56.v20240826.tar.gz | 3 + 14 files changed, 2372 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 jetty-alpn.changes create mode 100644 jetty-alpn.spec create mode 100644 jetty-http2.changes create mode 100644 jetty-http2.spec create mode 100644 jetty-minimal.changes create mode 100644 jetty-minimal.spec create mode 100644 jetty-unixsocket.changes create mode 100644 jetty-unixsocket.spec create mode 100644 jetty-websocket.changes create mode 100644 jetty-websocket.spec create mode 100644 jetty.project-jetty-9.4.56.v20240826.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..26929f9 --- /dev/null +++ b/_multibuild @@ -0,0 +1,7 @@ + + jetty-unixsocket + jetty-websocket + jetty-alpn + jetty-http2 + + diff --git a/jetty-alpn.changes b/jetty-alpn.changes new file mode 100644 index 0000000..9c7f04d --- /dev/null +++ b/jetty-alpn.changes @@ -0,0 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 15 21:27:27 UTC 2024 - Fridrich Strba + +- Upgrade to version 9.4.56.v20240826 + * Security fixes: + + CVE-2024-8184, bsc#1231651, ThreadLimitHandler.getRemote() + vulnerable to remote DoS attacks + * Changes: + + #12201 backport ThreadLimitHandler improvements from Jetty 12 + + #11938 - Updating URL refs from eclipse.org/jetty and + eclipse.dev/jetty to jetty.org (including XML dtd references) + + #10805 - Jetty response with an invalid HTTP2 packet if the + client set the hpack table size as 0 + +------------------------------------------------------------------- +Fri Oct 11 10:31:15 UTC 2024 - Fridrich Strba + +- Initial packaging of the alpn submodules of jetty + 9.4.54.v20240208 diff --git a/jetty-alpn.spec b/jetty-alpn.spec new file mode 100644 index 0000000..ef54a09 --- /dev/null +++ b/jetty-alpn.spec @@ -0,0 +1,283 @@ +# +# spec file for package jetty-alpn +# +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2000-2007, JPackage Project +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +%global base_name jetty +%global addver .v20240826 +%define src_name %{base_name}.project-%{base_name}-%{version}%{addver} +Name: %{base_name}-alpn +Version: 9.4.56 +Release: 0 +Summary: The alpn modules for Jetty +License: Apache-2.0 OR EPL-1.0 +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: java-devel >= 1.8 +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.conscrypt:conscrypt-openjdk-uber) +BuildRequires: mvn(org.eclipse.jetty.alpn:alpn-api) +BuildRequires: mvn(org.eclipse.jetty:jetty-io) >= %{version} +BuildRequires: mvn(org.eclipse.jetty:jetty-server) >= %{version} +BuildArch: noarch +# missing gcc13 to build conscrypt's dependencies +%if 0%{?sle_version} && 0%{?sle_version} < 150400 +ExclusiveArch: do-not-build +%endif + +%description + +%global desc \ +Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\ +do not need to configure and run a separate web server (like Apache) in order\ +to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully\ +featured web server for static and dynamic content. Unlike separate\ +server/container solutions, this means that your web server and web\ +application run in the same process, without interconnection overheads\ +and complications. Furthermore, as a pure java component, Jetty can be simply\ +included in your application for demonstration, distribution or deployment.\ +Jetty is available on all Java supported platforms. +%global extdesc %{desc}\ +\ +This package contains +%{extdesc} %{summary} + +%package client +Summary: The alpn modules for Jetty (client components) + +%description client +%{extdesc} %{summary} + +%package server +Summary: The alpn modules for Jetty (server components) + +%description server +%{extdesc} %{summary} + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +%{summary}. + +%prep +%setup -q -n %{src_name} + +find . -name "*.?ar" -exec rm {} \; +find . -name "*.class" -exec rm {} \; + +%pom_remove_dep :::import + +# Plugins irrelevant or harmful to building the package +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-eclipse-plugin +%pom_remove_plugin -r :license-maven-plugin +%pom_remove_plugin -r :maven-site-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin -r :maven-deploy-plugin +%pom_remove_plugin -r :jacoco-maven-plugin +%pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin -r :buildnumber-maven-plugin +%pom_remove_plugin -r :h2spec-maven-plugin + +# Unnecessary pom flattening can be skipped +%pom_remove_plugin -r :flatten-maven-plugin jetty-bom + +%pom_disable_module aggregates/jetty-all + +%pom_xpath_inject "pom:configuration/pom:instructions" \ +"sun.misc;resolution:=optional,com.sun.nio.file;resolution:=optional,*" + +%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 + +%pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common + +# provided by glassfish-jsp-api that has newer version +%pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api + +# txt artifact - not installable +%pom_remove_plugin ":jetty-version-maven-plugin" +%pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home + +# Disable building source release +%pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home + +# Unwanted JS in javadoc +sed -i '/^\s*\*.*