From 3e33aa95f425aa07caca4ac5845df2c4f598ed3d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 11 Feb 2025 14:24:48 +0200 Subject: [PATCH 01/15] Revert "Fix bogus date in changelog" This reverts commit 351e1a546c21145a3c3ded3f0dddf7b837c2d02a. --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 2d36335..dcd924e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -523,7 +523,7 @@ exit 0 %{appdir}/ROOT %changelog -* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 +* Tue Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 - Update to version 10.1.34 * Mon Dec 09 2024 Packit - 1:9.0.98-1 From ef3af9decf32a54d59628403e57bc2ad3e6ae0a2 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 11 Feb 2025 14:24:48 +0200 Subject: [PATCH 02/15] Revert "Fix changelog version of Tomcat 10" This reverts commit 20bfa9f9729de17fd0333c26b8ae7c313a1c8042. --- tomcat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index dcd924e..61f2ad7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -523,8 +523,8 @@ exit 0 %{appdir}/ROOT %changelog -* Tue Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 -- Update to version 10.1.34 +* Tue Jan 07 2025 Dimitris Soumis - 1:10.1.28-1 +- Update to version 10.1.28 * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 From e8547de4fceb45497718e84f7f307d1435fddeec Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 11 Feb 2025 14:24:48 +0200 Subject: [PATCH 03/15] Revert "Update to 10.1.34" This reverts commit 723739222226745128b36c0b6c6b58c2db97839d. --- .packit.yaml | 2 +- java-9-start-up-parameters.conf | 7 + module-start-up-parameters.conf | 8 - rhbz-1857043.patch | 28 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 30 ---- tomcat-10.1-catalina-policy.patch | 16 -- tomcat-9.0-JDTCompiler.patch | 24 +++ ...n.patch => tomcat-9.0-bnd-annotation.patch | 0 ... => tomcat-9.0-bootstrap-MANIFEST.MF.patch | 0 tomcat-9.0-catalina-policy.patch | 25 +++ ...-digest.script => tomcat-9.0-digest.script | 0 tomcat-9.0-log4j.properties | 11 ++ ...ch => tomcat-9.0-tomcat-users-webapp.patch | 0 ...r.script => tomcat-9.0-tool-wrapper.script | 0 tomcat-10.1.conf => tomcat-9.0.conf | 15 +- tomcat-10.1.logrotate => tomcat-9.0.logrotate | 0 tomcat-10.1.service => tomcat-9.0.service | 0 tomcat-10.1.sysconfig => tomcat-9.0.sysconfig | 0 tomcat-10.1.wrapper => tomcat-9.0.wrapper | 0 tomcat-functions | 21 +++ tomcat.spec | 143 ++++++++++-------- 22 files changed, 196 insertions(+), 136 deletions(-) create mode 100644 java-9-start-up-parameters.conf delete mode 100644 module-start-up-parameters.conf delete mode 100644 tomcat-10.1-JDTCompiler.patch delete mode 100644 tomcat-10.1-catalina-policy.patch create mode 100644 tomcat-9.0-JDTCompiler.patch rename tomcat-10.1-bnd-annotation.patch => tomcat-9.0-bnd-annotation.patch (100%) rename tomcat-10.1-bootstrap-MANIFEST.MF.patch => tomcat-9.0-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-9.0-catalina-policy.patch rename tomcat-10.1-digest.script => tomcat-9.0-digest.script (100%) create mode 100644 tomcat-9.0-log4j.properties rename tomcat-10.1-tomcat-users-webapp.patch => tomcat-9.0-tomcat-users-webapp.patch (100%) rename tomcat-10.1-tool-wrapper.script => tomcat-9.0-tool-wrapper.script (100%) rename tomcat-10.1.conf => tomcat-9.0.conf (73%) rename tomcat-10.1.logrotate => tomcat-9.0.logrotate (100%) rename tomcat-10.1.service => tomcat-9.0.service (100%) rename tomcat-10.1.sysconfig => tomcat-9.0.sysconfig (100%) rename tomcat-10.1.wrapper => tomcat-9.0.wrapper (100%) diff --git a/.packit.yaml b/.packit.yaml index 2986867..0bb10aa 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,7 +14,7 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-branched + - fedora-all # https://packit.dev/docs/configuration/downstream/koji_build - job: koji_build diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf new file mode 100644 index 0000000..341e077 --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,7 @@ +# Add the JAVA 9 specific start-up parameters required by Tomcat +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JDK_JAVA_OPTIONS diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf deleted file mode 100644 index 7f8652a..0000000 --- a/module-start-up-parameters.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Add the module start-up parameters required by Tomcat -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -export JAVA_OPTS - diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 4028ee1..d6185aa 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,6 +1,6 @@ ---- build.xml.orig 2024-08-02 18:14:43.000000000 +0300 -+++ build.xml 2024-08-19 13:56:38.991730088 +0300 -@@ -1121,7 +1121,7 @@ +--- build.xml.orig 2024-08-03 00:24:59.000000000 +0300 ++++ build.xml 2024-08-06 13:42:04.710875124 +0300 +@@ -1110,7 +1110,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -9,7 +9,7 @@ -+ addOSGi="false" /> - - - + addOSGi="false" /> @@ -65,7 +57,7 @@ = 1.10.2 -BuildRequires: ecj >= 4.20 +BuildRequires: ant +BuildRequires: ecj >= 1:4.10 BuildRequires: findutils -BuildRequires: java-devel >= 17 +BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -137,7 +136,7 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-api < %{jspspec} +Obsoletes: %{name}-jsp-2.2-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -149,8 +148,7 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj >= 4.20 -Recommends: tomcat-jakartaee-migration +Requires: ecj >= 1:4.10 Requires(preun): coreutils %description lib @@ -159,7 +157,9 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} -Obsoletes: %{name}-servlet-api < %{servletspec} +Provides: servlet6 +Provides: servlet3 +Obsoletes: %{name}-servlet-3.1-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -167,7 +167,7 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-api < %{elspec} +Obsoletes: %{name}-el-2.2-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -190,7 +190,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 -%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -198,14 +197,16 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Configure maven files %mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api" +%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el" %mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api %build -# we don't care about the tarballs and we're going to replace jars +export OPT_JAR_LIST="xalan-j2-serializer" +# we don't care about the tarballs and we're going to replace +# tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK @@ -225,13 +226,12 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ deploy # remove some jars that we'll replace with symlinks later -%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar output/build/lib/jakartaee-migration.jar +%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar # Remove the example webapps per Apache Tomcat Security Considerations -# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html +# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html %{__rm} -rf output/build/webapps/examples @@ -239,6 +239,7 @@ touch HACK # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} @@ -271,33 +272,33 @@ popd > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0755 %{SOURCE3} \ +%{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE7} \ +%{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE8} \ +%{__install} -m 0644 %{SOURCE21} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE9} \ +%{__install} -m 0755 %{SOURCE30} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE10} \ +%{__install} -m 0755 %{SOURCE31} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE32} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ +%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ # Substitute libnames in catalina-tasks.xml sed -i \ @@ -318,7 +319,6 @@ popd pushd output/build %{_bindir}/build-jar-repository lib ecj 2>&1 - %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -327,7 +327,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar cp ../../%{name}/bin/tomcat-juli.jar . popd @@ -396,7 +395,6 @@ popd %mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar -%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar %mvn_artifact res/maven/tomcat.pom %mvn_install @@ -416,13 +414,43 @@ exit 0 # install but don't activate %systemd_post %{name}.service +%post jsp-%{jspspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 + +%post servlet-%{servletspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 + +%post el-%{elspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ + %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 + %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir}/* %{tempdir}/* %systemd_preun %{name}.service %postun -%systemd_postun_with_restart %{name}.service +%systemd_postun_with_restart %{name}.service + +%postun jsp-%{jspspec}-api +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove jsp \ + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar +fi + +%postun servlet-%{servletspec}-api +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove servlet \ + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar +fi + +%postun el-%{elspec}-api +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove elspec \ + %{_javadir}/%{name}-el-%{elspec}-api.jar +fi %files %defattr(0664,root,tomcat,0755) @@ -456,7 +484,7 @@ exit 0 %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0755,root,tomcat) %dir %{confdir}/conf.d %{confdir}/conf.d/README -%{confdir}/conf.d/module-start-up-parameters.conf +%{confdir}/conf.d/java-9-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -523,16 +551,13 @@ exit 0 %{appdir}/ROOT %changelog -* Tue Jan 07 2025 Dimitris Soumis - 1:10.1.28-1 -- Update to version 10.1.28 - * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 - Resolves: rhbz#2331168 * Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 - Update to version 9.0.97 -- Resolves: rhbz#2327090 +- Resolves: rhbz#2327090 * Tue Oct 08 2024 Packit - 1:9.0.96-1 - Update to version 9.0.96 From 1d589708d520ef6e4da64bc7b7bef814a92dd2b2 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 12:51:07 +0000 Subject: [PATCH 04/15] Update to 9.0.99 upstream release - Resolves: rhbz#2344641 Upstream tag: 9.0.99 Upstream commit: 71451078 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 18f1e2f..f13e7ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.98-src.tar.gz) = eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc +SHA512 (apache-tomcat-9.0.99-src.tar.gz) = 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 diff --git a/tomcat.spec b/tomcat.spec index 0ae6d33..d4f1046 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 98 +%global micro_version 99 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Mon Feb 10 2025 Packit - 1:9.0.99-1 +- Update to version 9.0.99 +- Resolves: rhbz#2344641 + * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 - Resolves: rhbz#2331168 From 6674f439580f7a89e0a6be49407950a3b163aea9 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 17 Feb 2025 10:57:12 +0000 Subject: [PATCH 05/15] Update to 9.0.100 upstream release - Resolves: rhbz#2346089 Upstream tag: 9.0.100 Upstream commit: ef8388bc Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f13e7ab..001035f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.99-src.tar.gz) = 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 +SHA512 (apache-tomcat-9.0.100-src.tar.gz) = 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 diff --git a/tomcat.spec b/tomcat.spec index d4f1046..202264e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 99 +%global micro_version 100 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Mon Feb 17 2025 Packit - 1:9.0.100-1 +- Update to version 9.0.100 +- Resolves: rhbz#2346089 + * Mon Feb 10 2025 Packit - 1:9.0.99-1 - Update to version 9.0.99 - Resolves: rhbz#2344641 From 5bf8ad835712f9bf7bd7c3e49d108b336ce45a29 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 6 Mar 2025 11:35:17 +0000 Subject: [PATCH 06/15] Update to 9.0.102 upstream release - Resolves: rhbz#2350305 Upstream tag: 9.0.102 Upstream commit: 2a833768 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 001035f..08f22de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.100-src.tar.gz) = 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 +SHA512 (apache-tomcat-9.0.102-src.tar.gz) = 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 diff --git a/tomcat.spec b/tomcat.spec index 202264e..8571f54 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 100 +%global micro_version 102 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Thu Mar 06 2025 Packit - 1:9.0.102-1 +- Update to version 9.0.102 +- Resolves: rhbz#2350305 + * Mon Feb 17 2025 Packit - 1:9.0.100-1 - Update to version 9.0.100 - Resolves: rhbz#2346089 From d5bbd39fc83b375c447dd2ef185519794c288538 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:37:55 +0300 Subject: [PATCH 07/15] Fix gating rules --- gating.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gating.yaml b/gating.yaml index b81b8c4..19d2681 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,13 +1,16 @@ --- !Policy product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable + - fedora-rawhide +decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file From 261531a6af149e1185cb32e72a1f0d30a57e1b81 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:46:54 +0300 Subject: [PATCH 08/15] Fix gating rules --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 19d2681..da1c0b0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,6 +5,7 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule { test_case_name: fedora-ci.koji-build./plans/smoke.functional } --- !Policy product_versions: - fedora-* @@ -12,5 +13,4 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} \ No newline at end of file From afc97855176082cbf19ec16b53df45ce21894003 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 9 Apr 2025 21:08:08 +0000 Subject: [PATCH 09/15] Update to 9.0.104 upstream release - Resolves: rhbz#2358742 Upstream tag: 9.0.104 Upstream commit: f8cfae0a Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 08f22de..eb94083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.102-src.tar.gz) = 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 +SHA512 (apache-tomcat-9.0.104-src.tar.gz) = d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c diff --git a/tomcat.spec b/tomcat.spec index 8571f54..7368dac 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 102 +%global micro_version 104 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Wed Apr 09 2025 Packit - 1:9.0.104-1 +- Update to version 9.0.104 +- Resolves: rhbz#2358742 + * Thu Mar 06 2025 Packit - 1:9.0.102-1 - Update to version 9.0.102 - Resolves: rhbz#2350305 From 1453f5be0d5bf35599d46ded6329993c19a9aa3e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 21 May 2025 15:26:09 +0300 Subject: [PATCH 10/15] Update to 9.0.105 upstream release --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index eb94083..77b067a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.104-src.tar.gz) = d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c +SHA512 (apache-tomcat-9.0.105.tar.gz) = 904f10378ee2c7c68529edfefcba50c77eb677aa4586cfac0603e44703b0278f71f683b0295774f3cdcb027229d146490ef2c8868d8c2b5a631cf3db61ff9956 diff --git a/tomcat.spec b/tomcat.spec index 7368dac..4c81f4c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 104 +%global micro_version 105 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,9 @@ fi %{appdir}/ROOT %changelog +* Wed May 21 2025 Dimitris Soumis - 1:9.0.105-1 +- Update to version 9.0.105 + * Wed Apr 09 2025 Packit - 1:9.0.104-1 - Update to version 9.0.104 - Resolves: rhbz#2358742 From 45ce5f3bf2253765a90bf7103f04df57dbff18dc Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 21 May 2025 15:53:59 +0300 Subject: [PATCH 11/15] Fix sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 77b067a..c0053bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.105.tar.gz) = 904f10378ee2c7c68529edfefcba50c77eb677aa4586cfac0603e44703b0278f71f683b0295774f3cdcb027229d146490ef2c8868d8c2b5a631cf3db61ff9956 +SHA512 (apache-tomcat-9.0.105-src.tar.gz) = e5836ca6ea8b02349f5e422b7b7db9ff36880e764bc9515d8818fd39954b1893941ee1e86e3588d6ae8e44782c46fcfd9ea3f3e57d7d9e83781bdad90241e84e From 13192d880ae44eed1527074327deee3c54be7728 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 10 Jun 2025 08:30:43 +0000 Subject: [PATCH 12/15] Update to 9.0.106 upstream release - Resolves: rhbz#2371376 Upstream tag: 9.0.106 Upstream commit: 05ccf0c3 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c0053bc..6f59ec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.105-src.tar.gz) = e5836ca6ea8b02349f5e422b7b7db9ff36880e764bc9515d8818fd39954b1893941ee1e86e3588d6ae8e44782c46fcfd9ea3f3e57d7d9e83781bdad90241e84e +SHA512 (apache-tomcat-9.0.106-src.tar.gz) = 1b95f7899a488bd3435ab45999e371a9d8cdd42e4e575ae14b4fcb0387034d150d96c8d62d036b95fad187c810015eda43db50a46919296812653c0a153e8cee diff --git a/tomcat.spec b/tomcat.spec index 4c81f4c..374ee12 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 105 +%global micro_version 106 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Tue Jun 10 2025 Packit - 1:9.0.106-1 +- Update to version 9.0.106 +- Resolves: rhbz#2371376 + * Wed May 21 2025 Dimitris Soumis - 1:9.0.105-1 - Update to version 9.0.105 From e23740e14f6d8974d57f162b7f4b181a392d9cd7 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 4 Jul 2025 22:02:57 +0000 Subject: [PATCH 13/15] Update to 9.0.107 upstream release - Resolves: rhbz#2376445 Upstream tag: 9.0.107 Upstream commit: 43d5ad02 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6f59ec4..d0c98dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.106-src.tar.gz) = 1b95f7899a488bd3435ab45999e371a9d8cdd42e4e575ae14b4fcb0387034d150d96c8d62d036b95fad187c810015eda43db50a46919296812653c0a153e8cee +SHA512 (apache-tomcat-9.0.107-src.tar.gz) = 4db3eb936aaea9e0679504bb73c07e982d646a7e7a574f9be1f465f79dd1f229dff22055a049a7dc2ad59619752dae79505ab92f44a317df966fa3b039e459c3 diff --git a/tomcat.spec b/tomcat.spec index 374ee12..5f15b37 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 106 +%global micro_version 107 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Fri Jul 04 2025 Packit - 1:9.0.107-1 +- Update to version 9.0.107 +- Resolves: rhbz#2376445 + * Tue Jun 10 2025 Packit - 1:9.0.106-1 - Update to version 9.0.106 - Resolves: rhbz#2371376 From 9b595a5a960dda4caaa402466e809630542c3e66 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 6 Aug 2025 16:14:15 +0000 Subject: [PATCH 14/15] Update to 9.0.108 upstream release - Resolves: rhbz#2385832 Upstream tag: 9.0.108 Upstream commit: c63765c9 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d0c98dd..e6c0358 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.107-src.tar.gz) = 4db3eb936aaea9e0679504bb73c07e982d646a7e7a574f9be1f465f79dd1f229dff22055a049a7dc2ad59619752dae79505ab92f44a317df966fa3b039e459c3 +SHA512 (apache-tomcat-9.0.108-src.tar.gz) = df88cf29a79ac39ae569fa06b465a7bc162cf750645d2e0e1ac12f24b5c0569298c9cd854a253062d05e2eceee977e815f55722f3dfc959e96eebac5785ef84b diff --git a/tomcat.spec b/tomcat.spec index 5f15b37..3a42b9d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 107 +%global micro_version 108 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Wed Aug 06 2025 Packit - 1:9.0.108-1 +- Update to version 9.0.108 +- Resolves: rhbz#2385832 + * Fri Jul 04 2025 Packit - 1:9.0.107-1 - Update to version 9.0.107 - Resolves: rhbz#2376445 From fd720c37ab82ee711cf032f7a3267ef9cbcf9020 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 10 Sep 2025 16:46:58 +0300 Subject: [PATCH 15/15] Update to 9.0.109 upstream release --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e6c0358..631183d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.108-src.tar.gz) = df88cf29a79ac39ae569fa06b465a7bc162cf750645d2e0e1ac12f24b5c0569298c9cd854a253062d05e2eceee977e815f55722f3dfc959e96eebac5785ef84b +SHA512 (apache-tomcat-9.0.109-src.tar.gz) = 5ff1fdc882ffd3e3bd05be17b6dc45f914fb2b6553f2438ef30f929f2255cde49b1bac3e39f1a1b1440664b5477e64bde6c408a477e7eab097aa8cee01b82850 diff --git a/tomcat.spec b/tomcat.spec index 3a42b9d..f57ea7a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 108 +%global micro_version 109 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,9 @@ fi %{appdir}/ROOT %changelog +* Wed Sep 10 2025 Dimitris Soumis - 1:9.0.109-1 +- Update to version 9.0.109 + * Wed Aug 06 2025 Packit - 1:9.0.108-1 - Update to version 9.0.108 - Resolves: rhbz#2385832