commit 5472e1c6996790f8f4bd29815cc4ee28c3abd357 Author: CentOS Sources Date: Tue Mar 28 13:21:31 2023 +0000 import tomcat-9.0.62-5.el8 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a924a0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/apache-tomcat-9.0.62-src.tar.gz diff --git a/.tomcat.metadata b/.tomcat.metadata new file mode 100644 index 0000000..518df04 --- /dev/null +++ b/.tomcat.metadata @@ -0,0 +1 @@ +c7256fcf1c253b5f291cc4754ca26ad6e9e8b268 SOURCES/apache-tomcat-9.0.62-src.tar.gz diff --git a/SOURCES/fix-malformed-dtd.patch b/SOURCES/fix-malformed-dtd.patch new file mode 100644 index 0000000..f5f7546 --- /dev/null +++ b/SOURCES/fix-malformed-dtd.patch @@ -0,0 +1,8 @@ +diff -up ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +--- ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig 2023-02-07 14:11:25.294179017 -0500 ++++ ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd 2023-02-07 14:11:28.629196705 -0500 +@@ -1,4 +1,3 @@ +- + + +diff --git a/java/org/apache/el/ExpressionFactoryImpl.java b/java/org/apache/el/ExpressionFactoryImpl.java +index a6faeb6..5afbda7 100644 +--- a/java/org/apache/el/ExpressionFactoryImpl.java ++++ b/java/org/apache/el/ExpressionFactoryImpl.java +@@ -33,7 +33,7 @@ import org.apache.el.util.MessageFactory; + * + * @author Jacob Hookom [jacob@hookom.net] + */ +-@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class) ++//@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class) + public class ExpressionFactoryImpl extends ExpressionFactory { + + @Override +diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java +index 56c805a..bd6eb0d 100644 +--- a/java/org/apache/juli/logging/LogFactory.java ++++ b/java/org/apache/juli/logging/LogFactory.java +@@ -21,7 +21,7 @@ import java.nio.file.FileSystems; + import java.util.ServiceLoader; + import java.util.logging.LogManager; + +-import aQute.bnd.annotation.spi.ServiceConsumer; ++//import aQute.bnd.annotation.spi.ServiceConsumer; + + /** + * This is a modified LogFactory that uses a simple {@link ServiceLoader} based +@@ -63,7 +63,7 @@ import aQute.bnd.annotation.spi.ServiceConsumer; + * @author Costin Manolache + * @author Richard A. Sitze + */ +-@ServiceConsumer(value=org.apache.juli.logging.Log.class) ++//@ServiceConsumer(value=org.apache.juli.logging.Log.class) + public class LogFactory { + + private static final LogFactory singleton = new LogFactory(); +diff --git a/java/org/apache/tomcat/websocket/WsContainerProvider.java b/java/org/apache/tomcat/websocket/WsContainerProvider.java +index 3cb8873..7bc50f6 100644 +--- a/java/org/apache/tomcat/websocket/WsContainerProvider.java ++++ b/java/org/apache/tomcat/websocket/WsContainerProvider.java +@@ -19,7 +19,7 @@ package org.apache.tomcat.websocket; + import javax.websocket.ContainerProvider; + import javax.websocket.WebSocketContainer; + +-@aQute.bnd.annotation.spi.ServiceProvider(value=ContainerProvider.class) ++//@aQute.bnd.annotation.spi.ServiceProvider(value=ContainerProvider.class) + public class WsContainerProvider extends ContainerProvider { + + @Override +diff --git a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java +index 5c385ed..2e4e82e 100644 +--- a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java ++++ b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java +@@ -26,7 +26,7 @@ import javax.websocket.HandshakeResponse; + import javax.websocket.server.HandshakeRequest; + import javax.websocket.server.ServerEndpointConfig; + +-@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class) ++//@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class) + public class DefaultServerEndpointConfigurator + extends ServerEndpointConfig.Configurator { + diff --git a/SOURCES/rhbz-1857043.patch b/SOURCES/rhbz-1857043.patch new file mode 100644 index 0000000..dd74c3b --- /dev/null +++ b/SOURCES/rhbz-1857043.patch @@ -0,0 +1,200 @@ +diff -up ./build.xml.orig ./build.xml +--- build.xml.orig 2021-07-07 10:53:55.493742841 +0800 ++++ build.xml 2021-07-07 11:09:43.107968515 +0800 +@@ -1020,7 +1020,7 @@ + filesDir="${tomcat.classes}" + filesId="files.annotations-api" + manifest="${tomcat.manifests}/annotations-api.jar.manifest" +- addOSGi="true" /> ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + ++ addOSGi="false" /> + + + + +# 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 "$@" diff --git a/SOURCES/tomcat-9.0-memory-leak.patch b/SOURCES/tomcat-9.0-memory-leak.patch new file mode 100644 index 0000000..00e6e56 --- /dev/null +++ b/SOURCES/tomcat-9.0-memory-leak.patch @@ -0,0 +1,345 @@ +diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java +index 8746b6b..dc878c6 100644 +--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java ++++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java +@@ -1820,41 +1820,13 @@ public abstract class WebappClassLoaderBase extends URLClassLoader + // shutting down the executor + boolean usingExecutor = false; + try { +- +- // Runnable wrapped by Thread +- // "target" in Sun/Oracle JDK +- // "runnable" in IBM JDK +- // "action" in Apache Harmony +- Object target = null; +- for (String fieldName : new String[] { "target", "runnable", "action" }) { +- try { +- Field targetField = thread.getClass().getDeclaredField(fieldName); +- targetField.setAccessible(true); +- target = targetField.get(thread); +- break; +- } catch (NoSuchFieldException nfe) { +- continue; +- } +- } +- +- // "java.util.concurrent" code is in public domain, +- // so all implementations are similar including our +- // internal fork. +- if (target != null && target.getClass().getCanonicalName() != null && +- (target.getClass().getCanonicalName().equals( +- "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") || +- target.getClass().getCanonicalName().equals( +- "java.util.concurrent.ThreadPoolExecutor.Worker"))) { +- Field executorField = target.getClass().getDeclaredField("this$0"); +- executorField.setAccessible(true); +- Object executor = executorField.get(target); +- if (executor instanceof ThreadPoolExecutor) { +- ((ThreadPoolExecutor) executor).shutdownNow(); +- usingExecutor = true; +- } else if (executor instanceof java.util.concurrent.ThreadPoolExecutor) { +- ((java.util.concurrent.ThreadPoolExecutor) executor).shutdownNow(); +- usingExecutor = true; +- } ++ Object executor = JreCompat.getInstance().getExecutor(thread); ++ if (executor instanceof ThreadPoolExecutor) { ++ ((ThreadPoolExecutor) executor).shutdownNow(); ++ usingExecutor = true; ++ } else if (executor instanceof java.util.concurrent.ThreadPoolExecutor) { ++ ((java.util.concurrent.ThreadPoolExecutor) executor).shutdownNow(); ++ usingExecutor = true; + } + } catch (NoSuchFieldException | IllegalAccessException | RuntimeException e) { + // InaccessibleObjectException is only available in Java 9+, +@@ -2306,6 +2278,12 @@ public abstract class WebappClassLoaderBase extends URLClassLoader + + + private void clearReferencesObjectStreamClassCaches() { ++ if (JreCompat.isJre19Available()) { ++ // The memory leak this fixes has been fixed in Java 19 onwards, ++ // 17.0.4 onwards and 11.0.16 onwards ++ // See https://bugs.openjdk.java.net/browse/JDK-8277072 ++ return; ++ } + try { + Class clazz = Class.forName("java.io.ObjectStreamClass$Caches"); + clearCache(clazz, "localDescs"); +@@ -2333,14 +2311,19 @@ public abstract class WebappClassLoaderBase extends URLClassLoader + throws ReflectiveOperationException, SecurityException, ClassCastException { + Field f = target.getDeclaredField(mapName); + f.setAccessible(true); +- Map map = (Map) f.get(null); +- Iterator keys = map.keySet().iterator(); +- while (keys.hasNext()) { +- Object key = keys.next(); +- if (key instanceof Reference) { +- Object clazz = ((Reference) key).get(); +- if (loadedByThisOrChild(clazz)) { +- keys.remove(); ++ Object map = f.get(null); ++ // Avoid trying to clear references if Tomcat is running on a JRE that ++ // includes the fix for this memory leak ++ // See https://bugs.openjdk.java.net/browse/JDK-8277072 ++ if (map instanceof Map) { ++ Iterator keys = ((Map) map).keySet().iterator(); ++ while (keys.hasNext()) { ++ Object key = keys.next(); ++ if (key instanceof Reference) { ++ Object clazz = ((Reference) key).get(); ++ if (loadedByThisOrChild(clazz)) { ++ keys.remove(); ++ } + } + } + } +diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java b/java/org/apache/tomcat/util/compat/JreCompat.java +index 62df145..e5df728 100644 +--- a/java/org/apache/tomcat/util/compat/JreCompat.java ++++ b/java/org/apache/tomcat/util/compat/JreCompat.java +@@ -19,6 +19,7 @@ package org.apache.tomcat.util.compat; + import java.io.File; + import java.io.IOException; + import java.lang.reflect.AccessibleObject; ++import java.lang.reflect.Field; + import java.lang.reflect.InvocationTargetException; + import java.lang.reflect.Method; + import java.net.SocketAddress; +@@ -45,6 +46,7 @@ public class JreCompat { + + private static final JreCompat instance; + private static final boolean graalAvailable; ++ private static final boolean jre19Available; + private static final boolean jre16Available; + private static final boolean jre11Available; + private static final boolean jre9Available; +@@ -67,18 +69,26 @@ public class JreCompat { + + // This is Tomcat 9 with a minimum Java version of Java 8. + // Look for the highest supported JVM first +- if (Jre16Compat.isSupported()) { ++ if (Jre19Compat.isSupported()) { ++ instance = new Jre19Compat(); ++ jre9Available = true; ++ jre16Available = true; ++ jre19Available = true; ++ } else if (Jre16Compat.isSupported()) { + instance = new Jre16Compat(); + jre9Available = true; + jre16Available = true; ++ jre19Available = false; + } else if (Jre9Compat.isSupported()) { + instance = new Jre9Compat(); + jre9Available = true; + jre16Available = false; ++ jre19Available = false; + } else { + instance = new JreCompat(); + jre9Available = false; + jre16Available = false; ++ jre19Available = false; + } + jre11Available = instance.jarFileRuntimeMajorVersion() >= 11; + +@@ -124,6 +134,9 @@ public class JreCompat { + return jre16Available; + } + ++ public static boolean isJre19Available() { ++ return jre19Available; ++ } + + // Java 8 implementation of Java 9 methods + +@@ -303,6 +316,8 @@ public class JreCompat { + } + + ++ // Java 8 implementations of Java 16 methods ++ + /** + * Return Unix domain socket address for given path. + * @param path The path +@@ -329,4 +344,63 @@ public class JreCompat { + public SocketChannel openUnixDomainSocketChannel() { + throw new UnsupportedOperationException(sm.getString("jreCompat.noUnixDomainSocket")); + } ++ ++ ++ // Java 8 implementations of Java 19 methods ++ ++ /** ++ * Obtains the executor, if any, used to create the provided thread. ++ * ++ * @param thread The thread to examine ++ * ++ * @return The executor, if any, that created the provided thread ++ * ++ * @throws NoSuchFieldException ++ * If a field used via reflection to obtain the executor cannot ++ * be found ++ * @throws SecurityException ++ * If a security exception occurs while trying to identify the ++ * executor ++ * @throws IllegalArgumentException ++ * If the instance object does not match the class of the field ++ * when obtaining a field value via reflection ++ * @throws IllegalAccessException ++ * If a field is not accessible due to access restrictions ++ */ ++ public Object getExecutor(Thread thread) ++ throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { ++ ++ Object result = null; ++ ++ // Runnable wrapped by Thread ++ // "target" in Sun/Oracle JDK ++ // "runnable" in IBM JDK ++ // "action" in Apache Harmony ++ Object target = null; ++ for (String fieldName : new String[] { "target", "runnable", "action" }) { ++ try { ++ Field targetField = thread.getClass().getDeclaredField(fieldName); ++ targetField.setAccessible(true); ++ target = targetField.get(thread); ++ break; ++ } catch (NoSuchFieldException nfe) { ++ continue; ++ } ++ } ++ ++ // "java.util.concurrent" code is in public domain, ++ // so all implementations are similar including our ++ // internal fork. ++ if (target != null && target.getClass().getCanonicalName() != null && ++ (target.getClass().getCanonicalName().equals( ++ "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") || ++ target.getClass().getCanonicalName().equals( ++ "java.util.concurrent.ThreadPoolExecutor.Worker"))) { ++ Field executorField = target.getClass().getDeclaredField("this$0"); ++ executorField.setAccessible(true); ++ result = executorField.get(target); ++ } ++ ++ return result; ++ } + } +diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties b/java/org/apache/tomcat/util/compat/LocalStrings.properties +index 79427da..c4c2f7d 100644 +--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties ++++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties +@@ -16,6 +16,8 @@ + jre16Compat.javaPre16=Class not found so assuming code is running on a pre-Java 16 JVM + jre16Compat.unexpected=Failed to create references to Java 16 classes and methods + ++jre19Compat.javaPre19=Class not found so assuming code is running on a pre-Java 19 JVM ++ + jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be converted to a URL for the JarScanner to process + jre9Compat.javaPre9=Class not found so assuming code is running on a pre-Java 9 JVM + jre9Compat.unexpected=Failed to create references to Java 9 classes and methods +diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml +index d118196..42dfe38 100644 +--- a/webapps/docs/config/context.xml ++++ b/webapps/docs/config/context.xml +@@ -769,7 +769,11 @@ + therefore requires that the command line option + -XaddExports:java.base/java.io=ALL-UNNAMED is set + when running on Java 9 and above. If not specified, the default value of +- true will be used.

++ true will be used.

++

The memory leak associated with ObjectStreamClass has ++ been fixed in Java 19 onwards, Java 17.0.4 onwards and Java 11.0.16 ++ onwards. The check will be disabled when running on a version ++ of Java that contains the fix.

+ + + +diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java b/java/org/apache/tomcat/util/compat/Jre19Compat.java +new file mode 100644 +index 0000000000..fb94810b40 +--- /dev/null ++++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java +@@ -0,0 +1,84 @@ ++/* ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed with ++ * this work for additional information regarding copyright ownership. ++ * The ASF licenses this file to You under the Apache License, Version 2.0 ++ * (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++package org.apache.tomcat.util.compat; ++ ++import java.lang.reflect.Field; ++ ++import org.apache.juli.logging.Log; ++import org.apache.juli.logging.LogFactory; ++import org.apache.tomcat.util.res.StringManager; ++ ++public class Jre19Compat extends Jre16Compat { ++ ++ private static final Log log = LogFactory.getLog(Jre19Compat.class); ++ private static final StringManager sm = StringManager.getManager(Jre19Compat.class); ++ ++ private static final boolean supported; ++ ++ static { ++ // Don't need any Java 19 specific classes (yet) so just test for one of ++ // the new ones for now. ++ Class c1 = null; ++ try { ++ c1 = Class.forName("java.lang.WrongThreadException"); ++ } catch (ClassNotFoundException cnfe) { ++ // Must be pre-Java 16 ++ log.debug(sm.getString("jre19Compat.javaPre19"), cnfe); ++ } ++ ++ supported = (c1 != null); ++ } ++ ++ static boolean isSupported() { ++ return supported; ++ } ++ ++ @Override ++ public Object getExecutor(Thread thread) ++ throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { ++ ++ Object result = super.getExecutor(thread); ++ ++ if (result == null) { ++ Object holder = null; ++ Object task = null; ++ try { ++ Field holderField = thread.getClass().getDeclaredField("holder"); ++ holderField.setAccessible(true); ++ holder = holderField.get(thread); ++ ++ Field taskField = holder.getClass().getDeclaredField("task"); ++ taskField.setAccessible(true); ++ task = taskField.get(holder); ++ } catch (NoSuchFieldException nfe) { ++ return null; ++ } ++ ++ if (task!= null && task.getClass().getCanonicalName() != null && ++ (task.getClass().getCanonicalName().equals( ++ "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") || ++ task.getClass().getCanonicalName().equals( ++ "java.util.concurrent.ThreadPoolExecutor.Worker"))) { ++ Field executorField = task.getClass().getDeclaredField("this$0"); ++ executorField.setAccessible(true); ++ result = executorField.get(task); ++ } ++ } ++ ++ return result; ++ } ++} diff --git a/SOURCES/tomcat-9.0-tomcat-users-webapp.patch b/SOURCES/tomcat-9.0-tomcat-users-webapp.patch new file mode 100644 index 0000000..85b8b9b --- /dev/null +++ b/SOURCES/tomcat-9.0-tomcat-users-webapp.patch @@ -0,0 +1,17 @@ +--- 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 @@ + + + --> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/SOURCES/tomcat-9.0-tool-wrapper.script b/SOURCES/tomcat-9.0-tool-wrapper.script new file mode 100644 index 0000000..949d46d --- /dev/null +++ b/SOURCES/tomcat-9.0-tool-wrapper.script @@ -0,0 +1,45 @@ +#!/bin/sh +# +# tomcat-digest script +# JPackage Project + +# 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 "$@" diff --git a/SOURCES/tomcat-9.0.conf b/SOURCES/tomcat-9.0.conf new file mode 100644 index 0000000..e5fa60a --- /dev/null +++ b/SOURCES/tomcat-9.0.conf @@ -0,0 +1,51 @@ +# 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 pass some parameters to java here if you wish to +#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" + +# Use JAVA_OPTS to set java.library.path for libtcnative.so +#JAVA_OPTS="-Djava.library.path=/usr/lib" + +# Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381 +JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory" + +# You can change your tomcat locale here +#LANG="en_US" + +# Run tomcat under the Java Security Manager +SECURITY_MANAGER="false" + +# SHUTDOWN_WAIT has been deprecated. To change the shutdown wait time, set +# TimeoutStopSec in tomcat.service. + +# If you wish to further customize your tomcat environment, +# put your own definitions here +# (i.e. LD_LIBRARY_PATH for some jdbc drivers) diff --git a/SOURCES/tomcat-9.0.logrotate b/SOURCES/tomcat-9.0.logrotate new file mode 100644 index 0000000..082092a --- /dev/null +++ b/SOURCES/tomcat-9.0.logrotate @@ -0,0 +1,11 @@ +# 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 +} diff --git a/SOURCES/tomcat-9.0.service b/SOURCES/tomcat-9.0.service new file mode 100644 index 0000000..832e7c6 --- /dev/null +++ b/SOURCES/tomcat-9.0.service @@ -0,0 +1,20 @@ +# 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 diff --git a/SOURCES/tomcat-9.0.sysconfig b/SOURCES/tomcat-9.0.sysconfig new file mode 100644 index 0000000..3117bf7 --- /dev/null +++ b/SOURCES/tomcat-9.0.sysconfig @@ -0,0 +1,11 @@ +# 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. diff --git a/SOURCES/tomcat-9.0.wrapper b/SOURCES/tomcat-9.0.wrapper new file mode 100644 index 0000000..c97cb85 --- /dev/null +++ b/SOURCES/tomcat-9.0.wrapper @@ -0,0 +1,24 @@ +#!/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 diff --git a/SOURCES/tomcat-build.patch b/SOURCES/tomcat-build.patch new file mode 100644 index 0000000..49c63ff --- /dev/null +++ b/SOURCES/tomcat-build.patch @@ -0,0 +1,12 @@ +diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd +--- ./res/bnd/build-defaults.bnd.orig 2020-07-13 13:47:01.229077747 -0400 ++++ ./res/bnd/build-defaults.bnd 2020-07-13 13:47:12.923095618 -0400 +@@ -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} + + Specification-Title: Apache Tomcat + Specification-Version: ${version.major.minor} diff --git a/SOURCES/tomcat-functions b/SOURCES/tomcat-functions new file mode 100644 index 0000000..ab08fa2 --- /dev/null +++ b/SOURCES/tomcat-functions @@ -0,0 +1,42 @@ +#!/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" +} + +run_jsvc(){ + if [ -x /usr/bin/jsvc ]; then + TOMCAT_USER="${TOMCAT_USER:-tomcat}" + JSVC="/usr/bin/jsvc" + + JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out" + if [ "$1" = "stop" ]; then + JSVC_OPTS="${JSVC_OPTS} -stop" + fi + + exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}" + else + echo "Can't find /usr/bin/jsvc executable" + fi + +} + +_save_function run run_java + +run() { + if [ "${USE_JSVC}" = "true" ] ; then + run_jsvc $@ + else + run_java $@ + fi +} + diff --git a/SOURCES/tomcat-named.service b/SOURCES/tomcat-named.service new file mode 100644 index 0000000..b6cd8bd --- /dev/null +++ b/SOURCES/tomcat-named.service @@ -0,0 +1,24 @@ +# 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 diff --git a/SOURCES/tomcat-preamble b/SOURCES/tomcat-preamble new file mode 100644 index 0000000..1271dca --- /dev/null +++ b/SOURCES/tomcat-preamble @@ -0,0 +1,52 @@ +#!/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 diff --git a/SOURCES/tomcat-server b/SOURCES/tomcat-server new file mode 100644 index 0000000..17ae385 --- /dev/null +++ b/SOURCES/tomcat-server @@ -0,0 +1,25 @@ +#!/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 diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec new file mode 100644 index 0000000..68f7997 --- /dev/null +++ b/SPECS/tomcat.spec @@ -0,0 +1,515 @@ +# Copyright (c) 2000-2008, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%global jspspec 2.3 +%global major_version 9 +%global minor_version 0 +%global micro_version 62 +%global packdname apache-tomcat-%{version}-src +%global servletspec 4.0 +%global elspec 3.0 +%global tcuid 53 +# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java +%global native_version 1.2.21 + + +# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ +%global basedir %{_var}/lib/%{name} +%global appdir %{basedir}/webapps +%global homedir %{_datadir}/%{name} +%global bindir %{homedir}/bin +%global confdir %{_sysconfdir}/%{name} +%global libdir %{_javadir}/%{name} +%global logdir %{_var}/log/%{name} +%global cachedir %{_var}/cache/%{name} +%global tempdir %{cachedir}/temp +%global workdir %{cachedir}/work +%global _systemddir /lib/systemd/system + +Name: tomcat +Epoch: 1 +Version: %{major_version}.%{minor_version}.%{micro_version} +Release: 5%{?dist} +Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API + +License: ASL 2.0 +URL: http://tomcat.apache.org/ +Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source1: %{name}-%{major_version}.%{minor_version}.conf +Source3: %{name}-%{major_version}.%{minor_version}.sysconfig +Source4: %{name}-%{major_version}.%{minor_version}.wrapper +Source5: %{name}-%{major_version}.%{minor_version}.logrotate +Source6: %{name}-%{major_version}.%{minor_version}-digest.script +Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script +Source11: %{name}-%{major_version}.%{minor_version}.service +Source21: tomcat-functions +Source30: tomcat-preamble +Source31: tomcat-server +Source32: tomcat-named.service +Source33: java-9-start-up-parameters.conf + +Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch +Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +Patch2: %{name}-build.patch +Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch +Patch4: rhbz-1857043.patch +Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch +# remove bnd dependency which version is too low on rhel8 +Patch6: remove-bnd-annotation.patch +# The fixes for memory leak which have been fixed in 9.0.64, remove this patch in the next tomcat update +Patch7: %{name}-%{major_version}.%{minor_version}-memory-leak.patch +Patch8: fix-malformed-dtd.patch + +BuildArch: noarch + +BuildRequires: ant +BuildRequires: ecj >= 1:4.10 +BuildRequires: findutils +BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: javapackages-local +BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib +BuildRequires: systemd + +Requires: java-headless >= 1:1.8.0 +Requires: javapackages-tools +Requires: %{name}-lib = %{epoch}:%{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} > 7 +Recommends: tomcat-native >= %{native_version} +%endif +Requires(pre): shadow-utils +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +# We will change it to an obsoletes whenever the pki team is able to make the switch +Conflicts: pki-servlet-engine <= 1:9.0.50 + +# added after log4j sub-package was removed +Provides: %{name}-log4j = %{epoch}:%{version}-%{release} + +%description +Tomcat is the servlet container that is used in the official Reference +Implementation for the Java Servlet and JavaServer Pages technologies. +The Java Servlet and JavaServer Pages specifications are developed by +Sun under the Java Community Process. + +Tomcat is developed in an open and participatory environment and +released under the Apache Software License version 2.0. Tomcat is intended +to be a collaboration of the best-of-breed developers from around the world. + +%package admin-webapps +Summary: The host-manager and manager web applications for Apache Tomcat +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description admin-webapps +The host-manager and manager web applications for Apache Tomcat. + +%package docs-webapp +Summary: The docs web application for Apache Tomcat +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description docs-webapp +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-2.2-api +Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Conflicts: pki-servlet-engine <= 1:9.0.50 + +%description jsp-%{jspspec}-api +Apache Tomcat JSP API Implementation Classes. + +%package lib +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 >= 1:4.10 +Requires(preun): coreutils +Conflicts: pki-servlet-engine <= 1:9.0.50 + +%description lib +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} +Provides: servlet6 +Provides: servlet3 +Obsoletes: %{name}-servlet-3.1-api +Conflicts: pki-servlet-4.0-api <= 1:9.0.50 + +%description servlet-%{servletspec}-api +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-2.2-api +Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7 + +%description el-%{elspec}-api +Apache Tomcat EL API Implementation Classes. + +%package webapps +Summary: The ROOT web application for Apache Tomcat +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description webapps +The ROOT web application for Apache Tomcat. + +%prep +%setup -q -n %{packdname} +# remove pre-built binaries and windows files +find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ + -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete + +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +# Remove webservices naming resources as it's generally unused +%{__rm} -rf java/org/apache/naming/factory/webservices + +# Configure maven files +%mvn_package ":tomcat-el-api" tomcat-el-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" "org.eclipse.jetty.orbit:javax.servlet.jsp" +%mvn_package ":tomcat-servlet-api" tomcat-servlet-api + + +%build +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 + +# who needs a build.properties file anyway +%{ant} -Dbase.path="." \ + -Dbuild.compiler="modern" \ + -Dcommons-daemon.jar="HACK" \ + -Dcommons-daemon.native.src.tgz="HACK" \ + -Djdt.jar="$(build-classpath ecj/ecj)" \ + -Dtomcat-native.tar.gz="HACK" \ + -Dtomcat-native.home="." \ + -Dcommons-daemon.native.win.mgr.exe="HACK" \ + -Dnsis.exe="HACK" \ + -Djaxrpc-lib.jar="HACK" \ + -Dwsdl4j-lib.jar="HACK" \ + -Dbnd.jar="HACK" \ + -Dversion="%{version}" \ + -Dversion.build="%{micro_version}" \ + deploy + +# remove some jars that we'll replace with symlinks later +%{__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-9.0-doc/security-howto.html +%{__rm} -rf output/build/webapps/examples + + +%install +# 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} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/conf.d +/bin/echo "Place your custom *.conf files here. Shell expansion is supported." > ${RPM_BUILD_ROOT}%{confdir}/conf.d/README +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} + +# move things into place +# First copy supporting libs to tomcat lib +pushd output/build + %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a conf/*.{policy,properties,xml,xsd} ${RPM_BUILD_ROOT}%{confdir} + %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} + %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} +popd + +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \ + > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ + > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} +%{__install} -m 0644 %{SOURCE4} \ + ${RPM_BUILD_ROOT}%{_sbindir}/%{name} +%{__install} -m 0644 %{SOURCE11} \ + ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__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" %{SOURCE6} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper + +%{__install} -m 0644 %{SOURCE21} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions +%{__install} -m 0755 %{SOURCE30} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble +%{__install} -m 0755 %{SOURCE31} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server +%{__install} -m 0644 %{SOURCE32} \ + ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service + +%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ + +# Substitute libnames in catalina-tasks.xml +sed -i \ + "s,el-api.jar,%{name}-el-%{elspec}-api.jar,; + s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,; + s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \ + ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml + +# create jsp and servlet API symlinks +pushd ${RPM_BUILD_ROOT}%{_javadir} + %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar + %{__ln_s} %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar + %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar + %{__ln_s} %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar + %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar + %{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-el-api.jar +popd + +pushd output/build + %{_bindir}/build-jar-repository lib ecj 2>&1 +popd + +pushd ${RPM_BUILD_ROOT}%{libdir} + # symlink JSP and servlet API jars + %{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar . + %{__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 +popd + +# symlink to the FHS locations where we've installed things +pushd ${RPM_BUILD_ROOT}%{homedir} + %{__ln_s} %{appdir} webapps + %{__ln_s} %{confdir} conf + %{__ln_s} %{libdir} lib + %{__ln_s} %{logdir} logs + %{__ln_s} %{tempdir} temp + %{__ln_s} %{workdir} work +popd + +# Install the maven metadata for the spec impl artifacts as other projects use them +#%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} +pushd res/maven + for pom in tomcat-el-api.pom tomcat-jsp-api.pom tomcat-servlet-api.pom; do + # fix-up version in all pom files + sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom + done +popd + +# Configure and install maven artifacts +%mvn_artifact res/maven/tomcat-el-api.pom output/build/lib/el-api.jar +%mvn_artifact res/maven/tomcat-jsp-api.pom output/build/lib/jsp-api.jar +%mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar +%mvn_install + +%pre +# add the tomcat user and group +getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat +if ! getent passwd tomcat >/dev/null ; then + if ! getent passwd %{tcuid} >/dev/null ; then + %{_sbindir}/useradd -r -u %{tcuid} -g tomcat -d %{homedir} -s /sbin/nologin -c "Apache Tomcat" tomcat + # Tomcat uses a reserved ID, so there should never be an else + fi +fi +exit 0 + +%post +# 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 + +%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) +%doc {LICENSE,NOTICE,RELEASE*} +%attr(0755,root,root) %{_bindir}/%{name}-digest +%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper +%attr(0755,root,root) %{_sbindir}/%{name} +%attr(0644,root,root) %{_unitdir}/%{name}.service +%attr(0644,root,root) %{_unitdir}/%{name}@.service +%attr(0755,root,root) %dir %{_libexecdir}/%{name} +%attr(0755,root,root) %dir %{_localstatedir}/lib/tomcats +%attr(0644,root,root) %{_libexecdir}/%{name}/functions +%attr(0755,root,root) %{_libexecdir}/%{name}/preamble +%attr(0755,root,root) %{_libexecdir}/%{name}/server +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled +%attr(0755,root,tomcat) %dir %{basedir} +%attr(0755,root,tomcat) %dir %{confdir} + +%defattr(0664,tomcat,root,0770) +%attr(0770,tomcat,root) %dir %{logdir} + +%defattr(0664,root,tomcat,0770) +%attr(0770,root,tomcat) %dir %{cachedir} +%attr(0770,root,tomcat) %dir %{tempdir} +%attr(0770,root,tomcat) %dir %{workdir} + +%defattr(0644,root,tomcat,0775) +%attr(0775,root,tomcat) %dir %{appdir} +%attr(0775,root,tomcat) %dir %{confdir}/Catalina +%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost +%attr(0755,root,tomcat) %dir %{confdir}/conf.d +%{confdir}/conf.d/README +%{confdir}/conf.d/java-9-start-up-parameters.conf +%config(noreplace) %{confdir}/%{name}.conf +%config(noreplace) %{confdir}/*.policy +%config(noreplace) %{confdir}/*.properties +%config(noreplace) %{confdir}/context.xml +%config(noreplace) %{confdir}/server.xml +%attr(0640,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml +%attr(0664,root,tomcat) %{confdir}/tomcat-users.xsd +%attr(0664,root,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml +%attr(0664,root,tomcat) %{confdir}/jaspic-providers.xsd +%config(noreplace) %{confdir}/web.xml +%dir %{homedir} +%{bindir}/bootstrap.jar +%{bindir}/catalina-tasks.xml +%{homedir}/lib +%{homedir}/temp +%{homedir}/webapps +%{homedir}/work +%{homedir}/logs +%{homedir}/conf + +%files admin-webapps +%defattr(0664,root,tomcat,0755) +%{appdir}/host-manager +%{appdir}/manager + +%files docs-webapp +%{appdir}/docs + +%files lib +%dir %{libdir} +%{libdir}/*.jar +%{_javadir}/*.jar +%{bindir}/tomcat-juli.jar +%exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar +%exclude %{_javadir}/%{name}-el-%{elspec}-api.jar +%exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar + +%files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api +%{_javadir}/%{name}-jsp-%{jspspec}*.jar + +%files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api +%doc LICENSE +%{_javadir}/%{name}-servlet-%{servletspec}*.jar + +%files el-%{elspec}-api -f .mfiles-tomcat-el-api +%doc LICENSE +%{_javadir}/%{name}-el-%{elspec}-api.jar +%{libdir}/%{name}-el-%{elspec}-api.jar + +%files webapps +%defattr(0644,tomcat,tomcat,0755) +%{appdir}/ROOT + + +%changelog +* Thu Feb 16 2023 Coty Sutherland - 1:9.0.62-5 +- Related: #2160455 Add conflicts to subpackage + +* Wed Feb 15 2023 Hui Wang - 1:9.0.62-4 +- Resolves: #2160455 Add Tomcat 9 to RHEL8