Resolves: #2168636 Remove tomcat from epel9 because tomcat is being added to RHEL 9.2

Update to 9.0.70
Add some conditional logic that applies changes only to epel8 so that I can merge this with epel9
2023-05-31 19:38:10 +08:00 · 2023-01-13 21:44:27 +08:00 · 2022-09-02 14:24:57 -04:00 · 2022-09-02 12:36:57 -04:00 · 2022-09-02 09:03:14 -04:00 · 2022-09-01 16:10:12 -04:00
29 changed files with 1 additions and 1905 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +0,0 @@
-apache-tomcat-*-src.tar.gz
-results_tomcat
-tomcat*.src.rpm
-apache-tomcat-*-src/
--- a/.packit.yaml
+++ b/.packit.yaml
@ -1,38 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-create_sync_note: false
-
-upstream_project_url: https://github.com/apache/tomcat.git
-
-issue_repository: https://src.fedoraproject.org/rpms/tomcat
-
-jobs:
-# https://packit.dev/docs/configuration/downstream/pull_from_upstream
-# Make sure there is Fedora mapping for the 'tomcat' project in https://release-monitoring.org/projects/search/?pattern=tomcat
-# Make sure Monitoring status on the left side at https://src.fedoraproject.org/rpms/tomcat is set to Monitoring
- job: pull_from_upstream
-  trigger: release
-  dist_git_branches:
-    - fedora-branched
-
-# https://packit.dev/docs/configuration/downstream/koji_build
- job: koji_build
-  trigger: commit
-  dist_git_branches:
-    - fedora-all
-    
- job: koji_build
-  trigger: commit
-  scratch: true
-  allowed_pr_authors: ['all_admins', 'all_committers']
-  allowed_committers: ['all_admins', 'all_committers']
-  dist_git_branches:
-    - fedora-all
-
-# https://packit.dev/docs/configuration/downstream/bodhi_update
- job: bodhi_update
-  trigger: commit
-  allowed_builders: ['packit', 'all_admins']
-  dist_git_branches:
-    - fedora-branched # rawhide updates are created automatically
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/dead.package
+++ b/dead.package
@ -0,0 +1 @@
+Resolves: #2168636 Remove tomcat from epel9 because tomcat is being added to RHEL 9.2
--- a/gating.yaml
+++ b/gating.yaml
@ -1,20 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-rawhide
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional}
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
-  - !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}
--- a/module-start-up-parameters.conf
+++ b/module-start-up-parameters.conf
@ -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
-
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f42
-execute:
-  how: tmt
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@ -1,5 +0,0 @@
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/tomcat
-execute:
-    how: tmt
--- a/rhbz-1857043.patch
+++ b/rhbz-1857043.patch
@ -1,215 +0,0 @@
--- 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 @@
-       filesDir="${tomcat.classes}"
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Servlet Implementation JAR File -->
-     <jarIt jarfile="${servlet-api.jar}"
-@@ -1130,48 +1130,48 @@
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- EL Implementation JAR File -->
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- JSP Implementation JAR File -->
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- WebSocket API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.websocket-api"
-       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- WebSocket Client API JAR File -->
-     <jarIt jarfile="${websocket-client-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.websocket-client-api"
-       manifest="${tomcat.manifests}/websocket-client-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- JASPIC API JAR File -->
-     <jarIt jarfile="${jaspic-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jaspic-api"
-       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat-juli JAR File -->
-     <jarIt jarfile="${tomcat-juli.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-juli"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -1183,68 +1183,68 @@
-     <jarIt jarfile="${tomcat-util.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat API JAR File -->
-     <jarIt jarfile="${tomcat-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-api"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat Util Scan JAR File -->
-     <jarIt jarfile="${tomcat-util-scan.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util-scan"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <jarIt jarfile="${tomcat-jni.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-jni"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Protocol handlers - Coyote -->
-     <jarIt jarfile="${tomcat-coyote.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-coyote"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- OpenSSL FFM - Coyote -->
-     <jarIt jarfile="${tomcat-coyote-ffm.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-coyote-ffm"
-       manifest="${tomcat.manifests}/tomcat-coyote-ffm.jar.manifest"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- WebSocket implementation JAR File -->
-     <jarIt jarfile="${tomcat-websocket.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-websocket"
-       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina GroupCom/Tribes JAR File -->
-     <jarIt jarfile="${catalina-tribes.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-tribes"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Main JAR File -->
-     <jarIt jarfile="${catalina.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Cluster/HA JAR File -->
-     <jarIt jarfile="${catalina-ha.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ha"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Server-Side Includes (SSI) -->
-     <jarIt jarfile="${catalina-ssi.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ssi"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Ant Tasks JAR File -->
-     <jarIt jarfile="${catalina-ant.jar}"
-@@ -1255,27 +1255,27 @@
-     <jarIt jarfile="${catalina-storeconfig.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-storeconfig"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Jasper EL Implementation JAR File -->
-     <jarIt jarfile="${jasper-el.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper-el"
-       meta-inf="${tomcat.manifests}/jasper-el.jar"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Jasper Implementation JAR File -->
-     <jarIt jarfile="${jasper.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper"
-       meta-inf="${tomcat.manifests}/jasper.jar"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
-     <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
-      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1748,7 +1748,7 @@
-            filesId="files.tomcat-embed-core"
-            notice="${tomcat.manifests}/servlet-api.jar.notice"
-            license="${tomcat.manifests}/servlet-api.jar.license"
-           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
-            graalFiles="res/graal/tomcat-embed-core/native-image"
-@@ -1756,7 +1756,7 @@
-     <jarIt jarfile="${tomcat-embed-el.jar}"
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-el"
-           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
-            graalFiles="res/graal/tomcat-embed-el/native-image"
-@@ -1765,7 +1765,7 @@
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-jasper"
-            meta-inf="${tomcat.manifests}/jasper.jar"
-           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
-            graalFiles="res/graal/tomcat-embed-jasper/native-image"
-@@ -1774,7 +1774,7 @@
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-websocket"
-            meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
-           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
-            graalFiles="res/graal/tomcat-embed-websocket/native-image"
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (apache-tomcat-10.1.46-src.tar.gz) = 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682
--- a/tomcat-10.1-JDTCompiler.patch
+++ b/tomcat-10.1-JDTCompiler.patch
@ -1,30 +0,0 @@
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig	2024-12-05 18:01:16.000000000 +0200
-+++ java/org/apache/jasper/compiler/JDTCompiler.java	2025-01-07 16:30:34.996302312 +0200
-@@ -302,9 +302,9 @@ public class JDTCompiler extends org.apa
-             } else if (opt.equals("17")) {
-                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
-             } else if (opt.equals("18")) {
-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_18);
-+                settings.put(CompilerOptions.OPTION_Source, "18");
-             } else if (opt.equals("19")) {
-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_19);
-+                settings.put(CompilerOptions.OPTION_Source, "19");
-             } else if (opt.equals("20")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 11.
-@@ -392,11 +392,11 @@ public class JDTCompiler extends org.apa
-                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
-                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_17);
-             } else if (opt.equals("18")) {
-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_18);
-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_18);
-+                settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
-+                settings.put(CompilerOptions.OPTION_Compliance, "18");
-             } else if (opt.equals("19")) {
-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_19);
-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_19);
-+                settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
-+                settings.put(CompilerOptions.OPTION_Compliance, "19");
-             } else if (opt.equals("20")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 11.
--- a/tomcat-10.1-bnd-annotation.patch
+++ b/tomcat-10.1-bnd-annotation.patch
@ -1,10 +0,0 @@
--- build.xml.orig	2023-01-29 17:38:29.477052402 +0800
-+++ build.xml	2023-01-29 17:42:03.369583841 +0800
-@@ -216,6 +216,7 @@
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-     <pathelement location="${bnd.jar}"/>
-+    <pathelement location="${bnd-annotation.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jaxrpc-lib.jar}"/>
-     <pathelement location="${wsdl4j-lib.jar}"/>
--- a/tomcat-10.1-bootstrap-MANIFEST.MF.patch
+++ b/tomcat-10.1-bootstrap-MANIFEST.MF.patch
@ -1,9 +0,0 @@
--- res/META-INF/bootstrap.jar.manifest.orig	2010-04-06 10:11:09.000000000 -0600
-+++ res/META-INF/bootstrap.jar.manifest	2010-04-06 10:45:56.000000000 -0600
-@@ -1,6 +1,5 @@
- Manifest-Version: 1.0
- Main-Class: org.apache.catalina.startup.Bootstrap
-Class-Path: commons-daemon.jar
- Specification-Title: Apache Tomcat Bootstrap
- Specification-Version: @VERSION_MAJOR_MINOR@
- Specification-Vendor: Apache Software Foundation
--- a/tomcat-10.1-catalina-policy.patch
+++ b/tomcat-10.1-catalina-policy.patch
@ -1,16 +0,0 @@
--- conf/catalina.policy.orig	2024-05-22 16:12:23.809886452 +0300
-+++ conf/catalina.policy	2024-05-22 16:14:38.913939654 +0300
-@@ -55,6 +55,14 @@
-         permission java.security.AllPermission;
- };
-
-+// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
-+
-+// Allowing everything in /usr/share/java allows too many unknowns to be permitted
-+// Specifying the individual jars that tomcat needs to function with the security manager
-+// is the safest way forward.
-+grant codeBase "file:/usr/share/java/ecj/ecj.jar" {
-+	permission java.security.AllPermission;
-+};
-
- // ========== CATALINA CODE PERMISSIONS =======================================
--- a/tomcat-10.1-digest.script
+++ b/tomcat-10.1-digest.script
@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-fi
-
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
-set_javacmd
-
-# CLASSPATH munging
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
-fi
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-export CLASSPATH
-
-# Configuration
-MAIN_CLASS="org.apache.catalina.startup.Tool"
-BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run -server org.apache.catalina.realm.RealmBase "$@"
--- a/tomcat-10.1-tomcat-users-webapp.patch
+++ b/tomcat-10.1-tomcat-users-webapp.patch
@ -1,17 +0,0 @@
--- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
-+++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
-@@ -53,4 +53,14 @@
-   <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
-   <user username="role1" password="<must-be-changed>" roles="role1"/>
- -->
-+
-+<!-- <role rolename="admin"/> -->
-+<!-- <role rolename="admin-gui"/> -->
-+<!-- <role rolename="admin-script"/> -->
-+<!-- <role rolename="manager"/> -->
-+<!-- <role rolename="manager-gui"/> -->
-+<!-- <role rolename="manager-script"/> -->
-+<!-- <role rolename="manager-jmx"/> -->
-+<!-- <role rolename="manager-status"/> -->
-+<!-- <user name="admin" password="<must-be-changed>" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
- </tomcat-users>
--- a/tomcat-10.1-tool-wrapper.script
+++ b/tomcat-10.1-tool-wrapper.script
@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-fi
-
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
-set_javacmd
-
-# CLASSPATH munging
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
-fi
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-export CLASSPATH
-
-# Configuration
-MAIN_CLASS="org.apache.catalina.startup.Tool"
-BASE_OPTIONS=""
-BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
--- a/tomcat-10.1.conf
+++ b/tomcat-10.1.conf
@ -1,42 +0,0 @@
-# System-wide configuration file for tomcat services
-# This will be loaded by systemd as an environment file,
-# so please keep the syntax. For shell expansion support
-# place your custom files as /etc/tomcat/conf.d/*.conf
-#
-# There are 2 "classes" of startup behavior in this package.
-# The old one, the default service named tomcat.service.
-# The new named instances are called tomcat@instance.service.
-#
-# Use this file to change default values for all services.
-# Change the service specific ones to affect only one service.
-# For tomcat.service it's /etc/sysconfig/tomcat, for
-# tomcat@instance it's /etc/sysconfig/tomcat@instance.
-
-# This variable is used to figure out if config is loaded or not.
-TOMCAT_CFG_LOADED="1"
-
-# In new-style instances, if CATALINA_BASE isn't specified, it will
-# be constructed by joining TOMCATS_BASE and NAME.
-TOMCATS_BASE="/var/lib/tomcats/"
-
-# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/jre"
-
-# Where your tomcat installation lives
-CATALINA_HOME="@@@TCHOME@@@"
-
-# System-wide tmp
-CATALINA_TMPDIR="/var/cache/tomcat/temp"
-
-# You can change your tomcat locale here
-#LANG="en_US"
-
-# Run tomcat under the Java Security Manager
-SECURITY_MANAGER="false"
-
-# If you wish to further customize your tomcat environment,
-# put your own definitions here
-# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
-
-# You can also pass parameters to Java here by defining JAVA_OPTS variable
-# (e.g. JAVA_OPTS="-Xminf0.1 -Xmaxf0.3")
--- a/tomcat-10.1.logrotate
+++ b/tomcat-10.1.logrotate
@ -1,11 +0,0 @@
-# This is an example config only and is disabled by default
-# If you wish to use it, you'll need to update /etc/tomcat/logging.properties
-# to prevent catalina*.log from being rotated by Tomcat
-@@@TCLOG@@@/catalina*.log {
-    copytruncate
-    weekly
-    rotate 52
-    compress
-    missingok
-    create 0644 tomcat tomcat
-}
--- a/tomcat-10.1.service
+++ b/tomcat-10.1.service
@ -1,20 +0,0 @@
-# Systemd unit file for default tomcat
-# 
-# To create clones of this service:
-# DO NOTHING, use tomcat@.service instead.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME="
-EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target
--- a/tomcat-10.1.sysconfig
+++ b/tomcat-10.1.sysconfig
@ -1,11 +0,0 @@
-# Service-specific configuration file for tomcat. This will be sourced by
-# systemd for the default service (tomcat.service)
-# If you want to customize named instance, make a similar file
-# and name it tomcat@instancename.
-
-# You will not need to set this, usually. For default service it equals
-# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME}
-#CATALINA_BASE="@@@TCHOME@@@"
-
-# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you
-# can override.
--- a/tomcat-10.1.wrapper
+++ b/tomcat-10.1.wrapper
@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "version" ]; then
-  . /usr/libexec/tomcat/preamble
-  exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
-    org.apache.catalina.util.ServerInfo
-fi
-
-SRV="tomcat"
-if [ -n "$2" ]; then
-  SRV="tomcat@$2"
-fi
-
-if [ "$1" = "start" ]; then
-  systemctl start ${SRV}.service
-elif [ "$1" = "stop" ]; then
-  systemctl stop ${SRV}.service
-elif [ "$1" = "version" ]; then
-  ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
-    org.apache.catalina.util.ServerInfo
-else
-  echo "Usage: $0 {start|stop|version} [server-id]"
-  exit 1
-fi
--- a/tomcat-build.patch
+++ b/tomcat-build.patch
@ -1,19 +0,0 @@
-diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
--- res/bnd/build-defaults.bnd.orig     2023-10-16 11:23:04.752754202 +0800
-+++ res/bnd/build-defaults.bnd  2023-10-16 11:23:29.931876910 +0800
-@@ -13,7 +13,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
-Bundle-Version: ${version_cleanup;${version}}
-+Bundle-Version: ${version}
- Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
-
- Specification-Title: Apache Tomcat
-@@ -36,4 +36,4 @@ X-Compile-Target-JDK: ${compile.release}
-
- -removeheaders: DSTAMP,TODAY,TSTAMP
-
-module.name: org.apache.${replace;${Bundle-Name};-;.}
-\ No newline at end of file
-+module.name: org.apache.${replace;${Bundle-Name};-;.}
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-#!/bin/bash
-
-if [ -r /usr/share/java-utils/java-functions ]; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't read Java functions library, aborting"
-  exit 1
-fi
-
-_save_function() {
-    local ORIG_FUNC=$(declare -f $1)
-    local NEWNAME_FUNC="$2${ORIG_FUNC#$1}"
-    eval "$NEWNAME_FUNC"
-}
-
-_save_function run run_java
-
-run() {
-	run_java $@
-}
-
--- a/tomcat-named.service
+++ b/tomcat-named.service
@ -1,24 +0,0 @@
-# Systemd unit file for tomcat instances.
-# 
-# To create clones of this service:
-# 0. systemctl enable tomcat@name.service
-# 1. create catalina.base directory structure in
-#    /var/lib/tomcats/name
-# 2. profit.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=%i"
-EnvironmentFile=-/etc/sysconfig/tomcat@%i
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target
--- a/52
+++ b/52
@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/functions
-
-# Get the tomcat config (use this for environment specific settings)
-
-if [ -z "${TOMCAT_CFG_LOADED}" ]; then
-  if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-  fi
-  . $TOMCAT_CFG
-fi
-
-if [ -d "${TOMCAT_CONFD=/etc/tomcat/conf.d}" ]; then
-  for file in ${TOMCAT_CONFD}/*.conf ; do
-    if [ -f "$file" ] ; then
-      . "$file"
-    fi
-  done
-fi
-
-if [ -z "$CATALINA_BASE" ]; then
-  if [ -n "$NAME" ]; then
-    if [ -z "$TOMCATS_BASE" ]; then
-      TOMCATS_BASE="/var/lib/tomcats/"
-    fi
-    CATALINA_BASE="${TOMCATS_BASE}${NAME}"
-  else
-    CATALINA_BASE="${CATALINA_HOME}"
-  fi
-fi
-VERBOSE=1
-set_javacmd
-cd ${CATALINA_HOME}
-# CLASSPATH munging
-if [ ! -z "$CLASSPATH" ] ; then
-  CLASSPATH="$CLASSPATH":
-fi
-
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}$(build-classpath jcert jnet jsse 2>/dev/null):"
-fi
-CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
-
-if [ -z "$LOGGING_PROPERTIES" ] ; then
-  LOGGING_PROPERTIES="${CATALINA_BASE}/conf/logging.properties"
-  if [ ! -f "${LOGGING_PROPERTIES}" ] ; then
-    LOGGING_PROPERTIES="${CATALINA_HOME}/conf/logging.properties"
-  fi
-fi
--- a/25
+++ b/25
@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/preamble
-
-MAIN_CLASS=org.apache.catalina.startup.Bootstrap
-
-FLAGS="$JAVA_OPTS"
-OPTIONS="-Dcatalina.base=$CATALINA_BASE \
-Dcatalina.home=$CATALINA_HOME \
-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-Djava.io.tmpdir=$CATALINA_TMPDIR \
-Djava.util.logging.config.file=${LOGGING_PROPERTIES} \
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-
-if [ "$1" = "start" ] ; then
-  FLAGS="${FLAGS} $CATALINA_OPTS"
-  if [ "${SECURITY_MANAGER}" = "true" ] ; then
-    OPTIONS="${OPTIONS} \
-    -Djava.security.manager \
-    -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
-  fi
-  run start
-elif [ "$1" = "stop" ] ; then
-  run stop
-fi
--- a/tomcat.spec
+++ b/tomcat.spec
Author	SHA1	Message	Date
Hui Wang	616cc662dc	Resolves: #2168636 Remove tomcat from epel9 because tomcat is being added to RHEL 9.2	2023-05-31 19:38:10 +08:00
Hui Wang	98bac20b8c	Update to 9.0.70	2023-01-13 21:44:27 +08:00
Coty Sutherland	69cd4bb9ac	Add some conditional logic that applies changes only to epel8 so that I can merge this with epel9	2022-09-02 14:24:57 -04:00
Coty Sutherland	8ecfecfdca	Remove some classes that are not provided by the bnd version shipped in el8 This reintroduces two upstream bugs dealing with metadata; see https://bz.apache.org/bugzilla/show_bug.cgi?id=64849 & https://bz.apache.org/bugzilla/show_bug.cgi?id=64751	2022-09-02 12:36:57 -04:00
Coty Sutherland	0c7d03abb2	Add slf4j back to the classpath for aqute-bnd	2022-09-02 09:03:14 -04:00
Coty Sutherland	ebb9b3da20	Third times the charm...	2022-09-01 16:10:12 -04:00
Coty Sutherland	220f81ddb3	Forgot the actual package requires	2022-09-01 15:58:38 -04:00
Coty Sutherland	e15c374184	Adding what I think is the missing package for epel8	2022-09-01 15:56:15 -04:00
Coty Sutherland	d2be8a4737	Fix typo	2022-09-01 15:21:31 -04:00
Coty Sutherland	15ab3c3342	java_arches doesn't seem to exist in epel-8 so wrapping it in a conditional	2022-09-01 15:18:59 -04:00
Coty Sutherland	3d2c0b3c1d	Cleaning up some unused deps and system properties	2022-09-01 14:38:09 -04:00
				`@ -0,0 +1 @@`
				`Resolves: #2168636 Remove tomcat from epel9 because tomcat is being added to RHEL 9.2`
				`@ -1 +0,0 @@`
				`SHA512 (apache-tomcat-10.1.46-src.tar.gz) = 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682`