Compare commits

..

17 commits

Author SHA1 Message Date
Jiri Vanek
120903cd51 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-29 21:38:20 +02:00
Fedora Release Engineering
eeff239ce7 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 18:00:43 +00:00
Zbigniew Jędrzejewski-Szmek
52be2db170 Add sysusers.d config file to allow rpm to create users/groups automatically 2025-02-11 14:12:33 +01:00
Fedora Release Engineering
b16b4fcea6 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 07:52:09 +00:00
Miroslav Suchý
6ed256ad9e convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-02 09:03:21 +02:00
Fedora Release Engineering
52ebd94563 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 11:00:15 +00:00
Software Management Team
21901f6386 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:47 +02:00
Jiri Vanek
e66f59db8c Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 16:27:46 +01:00
Fedora Release Engineering
7f12a5b9c5 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 23:19:17 +00:00
Fedora Release Engineering
2e833dc37f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-20 23:39:24 +00:00
Fedora Release Engineering
570ec50e7e Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 08:03:22 +00:00
Fedora Release Engineering
61fbe8005a Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 13:44:59 +00:00
Fedora Release Engineering
6b573d9d91 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 15:14:51 +00:00
Jiri
477f992ae2 Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 15:50:00 +02:00
Jiri
ef48c67be5 Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-05 21:44:01 +01:00
Fedora Release Engineering
943e076dc0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 13:48:49 +00:00
Fedora Release Engineering
8ab3992906 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 09:06:13 +00:00

View file

@ -50,11 +50,12 @@
Name: jetty
Version: 9.4.40
Release: 1%{?dist}
Release: 17%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
License: ASL 2.0 or EPL-1.0
# Automatically converted from old format: ASL 2.0 or EPL-1.0 - review is highly recommended.
License: Apache-2.0 OR EPL-1.0
URL: http://www.eclipse.org/jetty/
Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz
Source1: jetty.sh
@ -66,7 +67,7 @@ Source6: LICENSE-MIT
Patch1: 0001-Distro-jetty.home.patch
Patch2: 0002-Port-to-servlet-api-4-5.patch
BuildRequires: maven-local
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
@ -74,7 +75,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
%if %{without jp_minimal}
BuildRequires: maven-local
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(com.github.jnr:jnr-unixsocket)
BuildRequires: mvn(javax.annotation:javax.annotation-api)
BuildRequires: mvn(javax.enterprise:cdi-api)
@ -135,6 +136,7 @@ Requires: jboss-websocket-1.0-api
%endif
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
# jp_minimal doesn't have main package
%if %{without jp_minimal}
@ -190,7 +192,6 @@ Requires: %{name}-http2-hpack = %{version}-%{release}
Requires: %{name}-http2-http-client-transport = %{version}-%{release}
Requires: %{name}-http2-server = %{version}-%{release}
Requires(pre): shadow-utils
%{?systemd_ordering}
@ -333,7 +334,8 @@ Obsoletes: %{name}-httpservice < 9.4.18-1
%package util
Summary: util module for Jetty
# Utf8Appendable.java is additionally under MIT license
License: (ASL 2.0 or EPL-1.0) and MIT
# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended.
License: (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT
%description util
%{extdesc} %{summary}.
@ -578,7 +580,8 @@ Summary: jstl module for Jetty
%package javadoc
Summary: Javadoc for %{name}
# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
License: (ASL 2.0 or EPL-1.0) and MIT
# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended.
License: (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT
%description javadoc
%{summary}.
@ -586,8 +589,8 @@ License: (ASL 2.0 or EPL-1.0) and MIT
%prep
%setup -q -n %{name}.project-%{name}-%{version}%{addver}
%patch1 -p1
%patch2 -p1
%patch -P1 -p1
%patch -P2 -p1
find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
@ -736,6 +739,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
%endif
# Create a sysusers.d config file
cat >jetty.sysusers.conf <<EOF
u jetty %jtuid 'Jetty web server' %homedir -
EOF
%build
%mvn_package :jetty-home __noinstall
%mvn_package :jetty-distribution __noinstall
@ -863,19 +871,7 @@ cp -p %{SOURCE1} %{buildroot}%{homedir}/bin/jetty.sh
# NOTE: %if %{without jp_minimal} still in effect
%pre
# Add the "jetty" user and group
getent group %username >/dev/null || groupadd -f -g %jtuid -r %username
if ! getent passwd %username >/dev/null ; then
if ! getent passwd %jtuid >/dev/null ; then
useradd -r -u %jtuid -g %username -d %homedir -s /sbin/nologin \
-c "Jetty web server" %username
else
useradd -r -g %username -d %homedir -s /sbin/nologin \
-c "Jetty web server" %username
fi
fi
exit 0
install -m0644 -D jetty.sysusers.conf %{buildroot}%{_sysusersdir}/jetty.conf
%post
%systemd_post jetty.service
@ -923,6 +919,7 @@ exit 0
%ghost %dir %attr(755, jetty, jetty) %{rundir}
%{appdir}
%{_unitdir}/%{name}.service
%{_sysusersdir}/jetty.conf
%files project -f .mfiles-project
%doc README.md VERSION.txt
@ -969,6 +966,54 @@ exit 0
%license LICENSE NOTICE.txt LICENSE-MIT
%changelog
* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 9.4.40-17
- Rebuilt for java-25-openjdk as preffered jdk
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.4.40-15
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 9.4.40-13
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 9.4.40-11
- Rebuilt for java-21-openjdk as system jdk
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-5
- Rebuilt for Drop i686 JDKs
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-4
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Apr 21 2021 Alexander Kurtakov <akurtako@redhat.com> 9.4.40-1
- Update to Jetty 9.4.40 (fixes multiple CVEs)