Accepting request 1186216 from home:RMestre:branches:Java:packages

- Update to Tomcat 9.0.91 * Fixed CVEs: + CVE-2024-34750: Improper handling of exceptional conditions (bsc#1227399) OBS-URL: https://build.opensuse.org/request/show/1186216 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=312
2024-07-08 16:40:03 +00:00 · 2024-07-08 16:40:03 +00:00 · 01c0bda548
commit 01c0bda548
33 changed files with 3404 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.osc
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <physicalmemory>
+      <size unit="M">2048</size>
+    </physicalmemory>
+  </hardware>
+</constraints> 
--- a/allowLinking.xslt
+++ b/allowLinking.xslt
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+  <!-- Identity template to copy elements and attributes as they are -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Add Resources element with allowLinking attribute -->
+  <xsl:template match="Context">
+    <xsl:copy>
+      <Resources allowLinking="true" />
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>
--- a/apache-tomcat-9.0.91-src.tar.gz
+++ b/apache-tomcat-9.0.91-src.tar.gz
--- a/apache-tomcat-9.0.91-src.tar.gz.asc
+++ b/apache-tomcat-9.0.91-src.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESPjmn2OQyfJc/tzSaCSJWTWecisFAmaD9OQACgkQaCSJWTWe
+cit6cA/+L/gMzNTxjtqsuWDrT1Wkr9MeU6/5oEB/LpUxhWUWam0Ni+eyj51vLO6X
+7UfHOQt8qClNUsyqz6kpmedPLowrhPk2UM9LdJsn7Sh9ttdbJQzjHD3LqVze9CKu
+eHggf6KUTJGcbOpP+8/gttwVM7U4wGppzOLi4vQCSI54yO4tinyyaSEk0DH8zlAa
+Rcb6tJoKEtqtlq1gam9udjPFFcNOcpXEOCLCgLRLqVkna3IVvFUNTx0bccilUDl/
+vGcD/7W1tsULb4A0sqLhQINzZlBpu2kp/5qdWLFhnJhRp0pZbLDo5/gjW77jLrIx
+HMmSuPVuswn/OQmAe57YRo2YF3e+7zxjKJ+73aDhfK/xHEInsQMgMCdgYH+d6Inn
+OT4MrUVEPApOnQPpV2Ag9HEvw3E9zT3dkcNqn3QCF+RaXNtdJgGurRl5UaQapWkH
+Mj6WbnmWpqTBO1SxxPCb1KqIoO3jLqKMR7h0TAchBH/XdRuafy3Ga632dUYX722J
+K73vU1fC1pyh0NZMPsDEAwv3V0JDnYzAF4PKxKb2gnQ/2u/e/p/ACBgaVqXRMAD9
+JFfhgBnt5vj7GOOm5opYoW+B1dtRyJ2CmYmO+g9UstRxYhShH7HPQbyExJo81JgZ
+S1W7wYlopgIAsL9gy1TlPAofa25SI24UaaC4VivDK2FyyAYk21Y=
+=1v5b
+-----END PGP SIGNATURE-----
--- a/tomcat-9.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat-9.0-bootstrap-MANIFEST.MF.patch
@ -0,0 +1,11 @@
+Index: apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
+===================================================================
+--- apache-tomcat-9.0.82-src.orig/res/META-INF/bootstrap.jar.manifest
+++ apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
+@@ -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-9.0-build-with-java-11.patch
+++ b/tomcat-9.0-build-with-java-11.patch
@ -0,0 +1,13 @@
+Index: apache-tomcat-9.0.91-src/build.xml
+===================================================================
+--- apache-tomcat-9.0.91-src.orig/build.xml
+++ apache-tomcat-9.0.91-src/build.xml
+@@ -107,7 +107,7 @@
+   <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
+   <property name="compile.release" value="8"/>
+   <property name="min.java.version" value="8"/>
+-  <property name="build.java.version" value="17"/>
+  <property name="build.java.version" value="11"/>
+   <property name="release.java.version" value="17"/>
+   <property name="skip.build.java.version" value="false"/>
+ 
--- a/tomcat-9.0-digest.script
+++ b/tomcat-9.0-digest.script
@ -0,0 +1,45 @@
+#!/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 tomcat/servlet"
+
+# 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-9.0-fix_catalina.patch
+++ b/tomcat-9.0-fix_catalina.patch
@ -0,0 +1,11 @@
+Index: apache-tomcat-9.0.43-src/conf/logging.properties
+===================================================================
+--- apache-tomcat-9.0.43-src.orig/conf/logging.properties
+++ apache-tomcat-9.0.43-src/conf/logging.properties
+@@ -77,3 +77,6 @@ org.apache.catalina.core.ContainerBase.[
+ 
+ # To see debug messages for WebSocket handling, uncomment the following line:
+ #org.apache.tomcat.websocket.level = FINE
+
+1catalina.org.apache.juli.AsyncFileHandler.suffix = out
+1catalina.org.apache.juli.AsyncFileHandler.rotatable = false
--- a/tomcat-9.0-javadoc.patch
+++ b/tomcat-9.0-javadoc.patch
@ -0,0 +1,13 @@
+Index: apache-tomcat-9.0.35-src/build.xml
+===================================================================
+--- apache-tomcat-9.0.35-src.orig/build.xml
+++ apache-tomcat-9.0.35-src/build.xml
+@@ -2038,8 +2039,6 @@ Apache Tomcat ${version} native binaries
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
+-      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+-      <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
--- a/tomcat-9.0-jdt.patch
+++ b/tomcat-9.0-jdt.patch
@ -0,0 +1,22 @@
+--- apache-tomcat-9.0.75-src/java/org/apache/jasper/compiler/JDTCompiler.java	2023-05-22 18:12:16.915658492 +0200
+++ apache-tomcat-9.0.75-src/java/org/apache/jasper/compiler/JDTCompiler.java	2023-05-22 19:45:14.491706823 +0200
+@@ -310,7 +310,7 @@
+             } else if(opt.equals("15")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
+             } else if(opt.equals("16")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
+                settings.put(CompilerOptions.OPTION_Source, "16");
+             } else if(opt.equals("17")) {
+                 // Constant not available in latest ECJ version that runs on
+                 // Java 8.
+@@ -392,8 +392,8 @@
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
+             } else if(opt.equals("16")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
+                settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
+                settings.put(CompilerOptions.OPTION_Compliance, "16");
+             } else if(opt.equals("17")) {
+                 // Constant not available in latest ECJ version that runs on
+                 // Java 8.
--- a/tomcat-9.0-jsvc.service
+++ b/tomcat-9.0-jsvc.service
@ -0,0 +1,21 @@
+# Systemd unit file for tomcat
+# 
+# To create clones of this service:
+# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined 
+# before tomcat-sysd is called.
+# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
+# to override tomcat defaults
+
+[Unit]
+Description=Apache Tomcat Web Application Container JSVC wrapper
+After=syslog.target network.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/tomcat/tomcat.conf
+Environment="NAME=" "USE_JSVC=true"
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
+
+[Install]
+WantedBy=multi-user.target
--- a/tomcat-9.0-logrotate_everything.patch
+++ b/tomcat-9.0-logrotate_everything.patch
@ -0,0 +1,12 @@
+Index: apache-tomcat-9.0.43-src/conf/logging.properties
+===================================================================
+--- apache-tomcat-9.0.43-src.orig/conf/logging.properties
+++ apache-tomcat-9.0.43-src/conf/logging.properties
+@@ -80,3 +80,7 @@ org.apache.catalina.core.ContainerBase.[
+ 
+ 1catalina.org.apache.juli.AsyncFileHandler.suffix = out
+ 1catalina.org.apache.juli.AsyncFileHandler.rotatable = false
+
+2localhost.org.apache.juli.AsyncFileHandler.rotatable = false
+3manager.org.apache.juli.AsyncFileHandler.rotatable = false
+4host-manager.org.apache.juli.AsyncFileHandler.rotatable = false
--- a/tomcat-9.0-osgi-build.patch
+++ b/tomcat-9.0-osgi-build.patch
@ -0,0 +1,27 @@
+--- apache-tomcat-9.0.75-src/build.xml	2023-05-22 18:12:16.995658642 +0200
+++ apache-tomcat-9.0.75-src/build.xml	2023-05-22 19:41:42.051370923 +0200
+@@ -215,10 +215,10 @@
+ 
+   <!-- Classpaths -->
+   <path id="compile.classpath">
+-    <pathelement location="${bnd.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jaxrpc-lib.jar}"/>
+     <pathelement location="${wsdl4j-lib.jar}"/>
+    <path refid="bnd.classpath"/>
+   </path>
+ 
+   <path id="tomcat.classpath">
+@@ -3845,6 +3845,12 @@
+     <!-- Add bnd tasks to project -->
+     <path id="bnd.classpath">
+       <fileset file="${bnd.jar}" />
+      <fileset dir="${bnd.dir}">
+        <include name="**/*.jar"/>
+      </fileset>
+      <fileset file="${osgiannotation.jar}" />
+      <fileset file="${osgicmpn.jar}" />
+      <fileset file="${slf4j-api.jar}" />
+     </path>
+ 
+     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
--- a/tomcat-9.0-sle.catalina.policy.patch
+++ b/tomcat-9.0-sle.catalina.policy.patch
@ -0,0 +1,30 @@
+Index: apache-tomcat-9.0.82-src/conf/catalina.policy
+===================================================================
+--- apache-tomcat-9.0.82-src.orig/conf/catalina.policy
+++ apache-tomcat-9.0.82-src/conf/catalina.policy
+@@ -171,6 +171,9 @@ grant {
+     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
+ 
+     // Precompiled JSPs need access to these packages.
+    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper";
+    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.servlet";
+    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.compiler";
+     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
+     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
+     permission java.lang.RuntimePermission
+@@ -220,6 +223,15 @@ grant codeBase "file:${catalina.home}/we
+ };
+ 
+ 
+// Additional basic permissions for web applications.
+grant codeBase "file:/usr/share/java/tomcat-servlet-api.jar" {
+	permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/tomcat-el-api.jar" {
+        permission java.security.AllPermission;
+};
+
+ // You can assign additional permissions to particular web applications by
+ // adding additional "grant" entries here, based on the code base for that
+ // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
--- a/tomcat-9.0-tomcat-users-webapp.patch
+++ b/tomcat-9.0-tomcat-users-webapp.patch
@ -0,0 +1,19 @@
+Index: apache-tomcat-9.0.82-src/conf/tomcat-users.xml
+===================================================================
+--- apache-tomcat-9.0.82-src.orig/conf/tomcat-users.xml
+++ apache-tomcat-9.0.82-src/conf/tomcat-users.xml
+@@ -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="adminadmin" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
+ </tomcat-users>
--- a/tomcat-9.0-tool-wrapper.script
+++ b/tomcat-9.0-tool-wrapper.script
@ -0,0 +1,45 @@
+#!/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 tomcat/servlet"
+
+# Set parameters
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
--- a/tomcat-9.0.75-secretRequired-default.patch
+++ b/tomcat-9.0.75-secretRequired-default.patch
@ -0,0 +1,11 @@
+--- apache-tomcat-9.0.75-src/java/org/apache/coyote/ajp/AbstractAjpProtocol.java	2023-05-22 18:12:16.907658477 +0200
+++ apache-tomcat-9.0.75-src/java/org/apache/coyote/ajp/AbstractAjpProtocol.java	2023-05-22 18:31:07.969096813 +0200
+@@ -177,7 +177,7 @@
+     }
+ 
+ 
+-    private boolean secretRequired = true;
+    private boolean secretRequired = false;
+ 
+     public void setSecretRequired(boolean secretRequired) {
+         this.secretRequired = secretRequired;
--- a/tomcat-9.0.conf
+++ b/tomcat-9.0.conf
@ -0,0 +1,52 @@
+# 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/libi64/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"
+
+# Time to wait in seconds, before killing process
+# TODO(stingray): does nothing, fix.
+# SHUTDOWN_WAIT="30"
+
+# If you wish to further customize your tomcat environment,
+# put your own definitions here
+# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
--- a/tomcat-9.0.logrotate
+++ b/tomcat-9.0.logrotate
@ -0,0 +1,10 @@
+@@@TCLOG@@@/catalina.out @@@TCLOG@@@/localhost_access_log.txt @@@TCLOG@@@/host-manager.log @@@TCLOG@@@/localhost.log @@@TCLOG@@@/manager.log{
+    notifempty
+    copytruncate
+    weekly
+    rotate 52
+    compress
+    missingok
+    su tomcat tomcat
+    create 0644 tomcat tomcat
+}
--- a/tomcat-9.0.service
+++ b/tomcat-9.0.service
@ -0,0 +1,25 @@
+# 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]
+TasksMax=576
+LimitNOFILE=8192
+Type=simple
+EnvironmentFile=/etc/tomcat/tomcat.conf
+Environment="NAME="
+EnvironmentFile=-/etc/sysconfig/tomcat
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
+SuccessExitStatus=143
+User=tomcat
+Group=tomcat
+
+
+[Install]
+WantedBy=multi-user.target
--- a/tomcat-9.0.sysconfig
+++ b/tomcat-9.0.sysconfig
--- a/tomcat-9.0.wrapper
+++ b/tomcat-9.0.wrapper
@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ "$1" = "version" ]; then
+  . @LIBEXECDIR@/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/42
+++ b/42
@ -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"
+       	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
+}
+
--- a/tomcat-named.service
+++ b/tomcat-named.service
@ -0,0 +1,26 @@
+# 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=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
+SuccessExitStatus=143
+User=tomcat
+Group=tomcat
+
+[Install]
+WantedBy=multi-user.target
+
--- a/61
+++ b/61
@ -0,0 +1,61 @@
+#!/bin/bash
+
+. @LIBEXECDIR@/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
+
+# Include the optional setenv.sh script.
+# (See section 3.4 of https://tomcat.apache.org/tomcat-8.0-doc/RUNNING.txt)
+if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
+    . "$CATALINA_BASE/bin/setenv.sh"
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
+    . "$CATALINA_HOME/bin/setenv.sh"
+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/2
+++ b/2
@ -0,0 +1,2 @@
+#fix of bnc#520532
+addFilter(".*non-etc-or-var-file-marked-as-conffile /usr/share/tomcat/tomcat-webapps/ROOT.*")
--- a/25
+++ b/25
@ -0,0 +1,25 @@
+#!/bin/bash
+
+. @LIBEXECDIR@/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.changes
+++ b/tomcat.changes
--- a/tomcat.keyring
+++ b/tomcat.keyring
@ -0,0 +1,237 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+      or
+        (gpg --fingerprint --list-sigs <your name>
+             && gpg --armor --export <your name>) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   1024D/33C60243 2004-09-12
+      Key fingerprint = DCFD 35E0 BF8C A734 4752  DE8B 6FB2 1E89 33C6 0243
+uid                  Mark E D Thomas <markt@apache.org>
+uid                  Mark E D Thomas <med.thomas@virgin.net>
+uid                  Mark E D Thomas <mark.thomas@springsource.com>
+sub   2048g/0BECE548 2004-09-12
+
+pub   4096R/2F6059E7 2009-09-18
+      Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid                  Mark E D Thomas <markt@apache.org>
+sub   4096R/5E763BEC 2009-09-18
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (MingW32)
+
+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
+bqWz71CpA7oP5jvoHaPqUihfWEugzOUbQnUzSauDWWOdMqQW+UUo/iDRz6HCKdlf
+ww0288krLusAEQEAAYkCHwQYAQoACQUCSrQO6QIbDAAKCRAQwBxaL2BZ5y3tD/4t
+KCuXBNi5alBCExHEzveMdRF9FJrSqJEX0NwGFivF3hQ/HJkrcu9oTJC/tXNFf/+
+EHOd0lMiyFl5PBSlhe4XS988rgapUW+ee9tQmAt+RgP40fdKdJNb6+9NYGmrdnDU
+zlQtP+h/XBOcmF0/szK/U0oigg8DjYYUm5gCWXOl9H4LJgg+yOcVCOVa4oTf1sdA
+mQba1xlMhOIYBWmEhqbWZpGOS59XvpyNfOQXWu26S8HACBqyPZ2LVV4H+9cmxinT
+z7RX1yKD17nLZ/fTOzZ1gYTbhg5rNmFpDgu3nlgU8SpGQ1kd70ZkcudgehsUe1Ep
+Pyl7O8qhj5H0/3OAmRXzrq2VF17gtz7zpntA0JqsBMbSaK5qBuBcurLhBT634WDI
+oE8u5Em1UwjgTI0Cx/lPxRTbIb4PfjP2b2ik/tJaUbwUrhuZ4LAtGztMVrF4W+qn
+x9oed4OFXMBbwgS+SH6oAHlGwpxhhzXBlqZsHXm+w+2oazWUhxFFGEe5U245GEtN
+f0AznBMDWTqg0SCVEDjlKt+e9tVXkTpHYWZjGbRZbEHkCbFqKhq0KP5BGInFZTFT
+oI5jjszmuX0W/yKpRpQZ+GuJnt4VrYSy7TMvjjhIpuhDY57VUwUIkz/2Kq8Vg2wp
+Gg+29nvcGOTdyZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ==
+=hSkx
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   rsa4096 2019-05-05 [SC]
+      48F8 E69F 6390 C9F2 5CFE  DCD2 6824 8959 359E 722B
+uid           [ultimate] Remy Maucherat <remm@apache.org>
+sig 3        68248959359E722B 2019-05-05  Remy Maucherat <remm@apache.org>
+sub   rsa4096 2019-05-05 [E]
+sig          68248959359E722B 2019-05-05  Remy Maucherat <remm@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=l4Ry
+-----END PGP PUBLIC KEY BLOCK-----
+
--- a/tomcat.spec
+++ b/tomcat.spec
@ -0,0 +1,814 @@
+#
+# spec file for package tomcat
+#
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2000-2009, JPackage Project
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define jspspec 2.3
+%define servletspec 4.0
+%define elspec 3.0
+%define major_version 9
+%define minor_version 0
+%define micro_version 91
+%define packdname apache-tomcat-%{version}-src
+# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
+%global basedir /srv/%{name}
+%define appdir %{basedir}/webapps
+%define bindir %{_datadir}/%{name}/bin
+%define confdir %{_sysconfdir}/%{name}
+%define homedir %{_datadir}/%{name}
+%define libdir %{_javadir}/%{name}
+%define logdir %{_localstatedir}/log/%{name}
+%define cachedir %{_localstatedir}/cache/%{name}
+%define tempdir %{cachedir}/temp
+%define workdir %{cachedir}/work
+%define tomcatappdir %{_datadir}/%{name}/tomcat-webapps
+%define javac_target 1.8
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
+Name:           tomcat
+Version:        %{major_version}.%{minor_version}.%{micro_version}
+Release:        0
+Summary:        Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API
+License:        Apache-2.0
+Group:          Productivity/Networking/Web/Servers
+URL:            https://tomcat.apache.org
+Source0:        https://archive.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
+Source20:       %{name}-%{major_version}.%{minor_version}-jsvc.service
+Source21:       tomcat-functions
+Source30:       tomcat-preamble
+Source31:       tomcat-server
+Source32:       tomcat-named.service
+Source100:      valve.xslt
+Source101:      allowLinking.xslt
+Source1000:     tomcat-rpmlintrc
+Source1001:     https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
+Source1002:     https://downloads.apache.org/tomcat/tomcat-9/KEYS#/%{name}.keyring
+#PATCH-FIX-UPSTREAM: from jpackage.org package
+Patch0:         %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
+#PATCH-FIX-UPSTREAM: from jpackage.org package
+Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
+# PATCH-FIX-SLE: Change security manager default policies bnc#891264
+Patch2:         %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch
+# PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
+Patch3:         %{name}-%{major_version}.%{minor_version}-javadoc.patch
+# PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars
+Patch4:         tomcat-9.0-osgi-build.patch
+# PATCH-FIX-OPENSUSE: build against our ecj that does not have CompilerOptions.VERSION_16
+Patch5:         %{name}-%{major_version}.%{minor_version}-jdt.patch
+# PATCH-FIX-OPENSUSE: set ajp connector secreteRequired to false by default to avoid tomcat not starting
+Patch6:         tomcat-9.0.75-secretRequired-default.patch
+Patch7:         tomcat-9.0-fix_catalina.patch
+Patch8:         tomcat-9.0-logrotate_everything.patch
+Patch9:         tomcat-9.0-build-with-java-11.patch
+BuildRequires:  ant >= 1.8.1
+BuildRequires:  ant-antlr
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-daemon
+BuildRequires:  apache-commons-dbcp >= 2.0
+BuildRequires:  apache-commons-pool2
+BuildRequires:  aqute-bnd >= 5.2
+BuildRequires:  aqute-bndlib >= 5.2
+BuildRequires:  ecj >= 4.4.0
+BuildRequires:  fdupes
+BuildRequires:  findutils
+BuildRequires:  geronimo-jaf-1_0_2-api
+BuildRequires:  geronimo-jaxrpc-1_1-api
+BuildRequires:  geronimo-qname-1_1-api
+BuildRequires:  geronimo-saaj-1_1-api
+BuildRequires:  jakarta-taglibs-standard >= 1.1
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local
+BuildRequires:  junit
+BuildRequires:  pkgconfig
+BuildRequires:  sed
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  unzip
+BuildRequires:  wsdl4j
+BuildRequires:  zip
+BuildRequires:  pkgconfig(systemd)
+Requires:       %{name}-lib = %{version}-%{release}
+Requires:       apache-commons-daemon
+Requires:       apache-commons-dbcp
+Requires:       apache-commons-logging
+Requires:       apache-commons-pool2
+Requires:       java >= 1.8
+Requires(post): %fillup_prereq
+Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
+Requires(pre):  shadow
+%systemd_ordering
+Recommends:     libtcnative-1-0 >= 1.1.24
+Recommends:     logrotate
+Provides:       group(tomcat)
+Provides:       user(tomcat)
+BuildArch:      noarch
+
+%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.
+
+ATTENTION: This tomcat is built with java 1.8.0.
+
+%package admin-webapps
+Summary:        The host manager and manager web applications for Apache Tomcat
+Group:          Productivity/Networking/Web/Servers
+Requires:       %{name} = %{version}-%{release}
+Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
+
+%description admin-webapps
+The host manager and manager web-based applications for Apache Tomcat.
+
+%package embed
+Summary:        Libraries for Embedding Apache Tomcat
+Group:          Productivity/Networking/Web/Servers
+
+%description embed
+Embeddeding support (various libraries) for Apache Tomcat.
+
+%package docs-webapp
+Summary:        The "docs" web application for Apache Tomcat
+Group:          Productivity/Networking/Web/Servers
+Requires:       %{name} = %{version}-%{release}
+Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
+
+%description docs-webapp
+The documentation of web application for Apache Tomcat.
+
+%package el-3_0-api
+Summary:        Expression Language v3.0 API
+Group:          Development/Libraries/Java
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
+Provides:       %{name}-el-%{elspec}-api = %{version}-%{release}
+Provides:       el_3_0_api = %{version}-%{release}
+Provides:       el_api = %{elspec}
+Obsoletes:      el_api < %{elspec}
+Obsoletes:      tomcat-el-2_2-api
+
+%description el-3_0-api
+Expression Language API version 3.0.
+
+%package javadoc
+Summary:        Javadoc generated documentation for Apache Tomcat
+Group:          Documentation/HTML
+BuildArch:      noarch
+
+%description javadoc
+Javadoc generated documentation files for Apache Tomcat.
+
+%package jsp-2_3-api
+Summary:        Apache Tomcat JSP API implementation classes
+Group:          Productivity/Networking/Web/Servers
+Requires:       mvn(org.apache.tomcat:tomcat-el-api)
+Requires:       mvn(org.apache.tomcat:tomcat-servlet-api)
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Provides:       %{name}-jsp-%{jspspec}-api
+Provides:       jsp = %{jspspec}
+Provides:       jsp23
+Obsoletes:      jsp < %{jspspec}
+Obsoletes:      tomcat-jsp-2_2-api
+
+%description jsp-2_3-api
+Apache Tomcat JSP API implementation classes version 2.3
+
+%package jsvc
+Summary:        Apache jsvc wrapper for Apache Tomcat as separate service
+Group:          Productivity/Networking/Web/Servers
+Requires:       %{name} = %{version}-%{release}
+Requires:       apache-commons-daemon-jsvc
+%systemd_ordering
+
+%description jsvc
+Systemd service and wrapper scripts to start tomcat with jsvc,
+which allows tomcat to perform some privileged operations
+(e.g. bind to a port < 1024) and then switch identity to a non-privileged user.
+
+%package lib
+Summary:        Libraries needed to run the Tomcat Web container
+Group:          Productivity/Networking/Web/Servers
+Requires:       %{name}-el-%{elspec}-api = %{version}-%{release}
+Requires:       %{name}-jsp-%{jspspec}-api = %{version}-%{release}
+Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
+Requires(post): ecj >= 4.4
+Requires(preun): coreutils
+Provides:       jakarta-commons-dbcp-tomcat5 = 1.4
+Obsoletes:      jakarta-commons-dbcp-tomcat5 < 1.4
+
+%description lib
+Libraries required to successfully run the Tomcat Web container
+
+%package servlet-4_0-api
+Summary:        Apache Tomcat Servlet API implementation classes
+Group:          Productivity/Networking/Web/Servers
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Provides:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
+Provides:       servlet = %{servletspec}
+Provides:       servlet31
+Provides:       servlet7
+Obsoletes:      servlet < %{servletspec}
+Obsoletes:      tomcat-servlet-3_0-api
+Obsoletes:      tomcat-servlet-3_1-api
+
+%description servlet-4_0-api
+Apache Tomcat Servlet API implementation classes version 3.1
+
+%package webapps
+Summary:        ROOT and examples web applications for Apache Tomcat
+Group:          Productivity/Networking/Web/Servers
+Requires:       %{name} = %{version}-%{release}
+Requires:       jakarta-taglibs-standard >= 1.1
+Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
+
+%description webapps
+The ROOT and examples web applications for Apache Tomcat
+
+%prep
+%autosetup -p1 -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" \) -print -delete
+
+# remove date from docs
+sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
+
+%build
+
+ln -s $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
+ln -s $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
+
+export CLASSPATH=
+export OPT_JAR_LIST="xalan-j2-serializer"
+export ANT_OPTS=-Xmx500M
+
+# we don't care about the tarballs and we're going to replace
+# so just create a dummy file for later removal
+touch HACK
+mkdir -p HACKDIR
+touch HACKDIR/build.xml
+
+ant -Dbase.path="." \
+    -Dadd.osgi.jar.metadata="true" \
+    -Djava.7.home="%{java_home}" \
+    -Dbuild.compiler="modern" \
+    -Dcommons-collections.jar="$(build-classpath commons-collections)" \
+    -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
+    -Dcommons-daemon.native.src.tgz="HACK" \
+    -Djasper-jdt.jar="$(build-classpath ecj/ecj)" \
+    -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="$(build-classpath geronimo-jaxrpc-1.1-api)" \
+    -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
+    -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
+    -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
+    -Dbnd.dir="%{_javadir}/aqute-bnd" \
+    -Dosgiannotation.jar="$(build-classpath osgi-annotation/osgi.annotation)" \
+    -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
+    -Dosgicmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \
+	-Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \
+    -Dcommons-pool.home="$(build-classpath commons-pool2)" \
+    -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \
+    -Dno.build.dbcp=true \
+    -Dversion="%{version}" \
+    -Dversion.build="%{micro_version}" \
+    deploy dist-prepare dist-source javadoc package embed-jars
+
+# remove some jars that we'll replace with symlinks later
+rm output/build/bin/commons-daemon.jar \
+        output/build/lib/ecj.jar
+
+pushd output/dist/src/webapps/docs/appdev/sample/src
+mkdir -p ../web/WEB-INF/classes
+javac -source %{javac_target} -target %{javac_target} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
+pushd ../web
+jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
+popd
+popd
+
+%install
+# build initial path structure
+install -d -m 0755 %{buildroot}%{_bindir}
+install -d -m 0755 %{buildroot}%{_sbindir}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_initddir}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+install -d -m 0755 %{buildroot}%{appdir}
+install -d -m 0755 %{buildroot}%{tomcatappdir}
+install -d -m 0755 %{buildroot}%{bindir}
+install -d -m 0775 %{buildroot}%{confdir}
+install -d -m 0755 %{buildroot}%{cachedir}/Catalina/localhost
+install -d -m 0755 %{buildroot}%{confdir}/conf.d
+/bin/echo "Place your custom *.conf files here. Shell expansion is supported." > %{buildroot}%{confdir}/conf.d/README
+install -d -m 0755 %{buildroot}%{libdir}
+install -d -m 0775 %{buildroot}%{logdir}
+/bin/touch %{buildroot}%{logdir}/catalina.out
+install -d -m 0775 %{buildroot}%{_localstatedir}/lib/tomcats
+/bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> %{buildroot}%{logdir}/catalina.out
+install -d -m 0775 %{buildroot}%{homedir}
+install -d -m 0775 %{buildroot}%{tempdir}
+install -d -m 0775 %{buildroot}%{workdir}
+install -d -m 0755 %{buildroot}%{_unitdir}
+install -d -m 0755 %{buildroot}%{_libexecdir}/%{name}
+install -d -m 0755 %{buildroot}%{_fillupdir}
+
+cp -a %{SOURCE100} %{buildroot}%{confdir}
+cp -a %{SOURCE101} %{buildroot}%{confdir}
+
+# move things into place
+# First copy supporting libs to tomcat lib
+pushd output/build
+    cp -a bin/*.{jar,xml} %{buildroot}%{bindir}
+    cp -a conf/*.{policy,properties,xml} %{buildroot}%{confdir}
+    cp -a lib/*.jar %{buildroot}%{libdir}
+    cp -a webapps/* %{buildroot}%{tomcatappdir}
+popd
+# tomcat embedded
+pushd output/embed
+    cp -a *.jar %{buildroot}%{libdir}
+popd
+
+# javadoc
+cp -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+
+sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+   -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
+    > %{buildroot}%{confdir}/%{name}.conf
+sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+   -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
+    > %{buildroot}%{_fillupdir}/sysconfig.%{name}
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE4} \
+    > %{buildroot}%{_sbindir}/%{name}
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE11} \
+    > %{buildroot}%{_unitdir}/%{name}.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE20} \
+    > %{buildroot}%{_unitdir}/%{name}-jsvc.service
+sed -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
+    > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+   -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
+    > %{buildroot}%{_bindir}/%{name}-digest
+sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+   -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
+    > %{buildroot}%{_bindir}/%{name}-tool-wrapper
+
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} \
+    > %{buildroot}%{_libexecdir}/%{name}/functions
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE30} \
+    > %{buildroot}%{_libexecdir}/%{name}/preamble
+chmod 0755 %{buildroot}%{_libexecdir}/%{name}/preamble
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE31} \
+    > %{buildroot}%{_libexecdir}/%{name}/server
+chmod 0755 %{buildroot}%{_libexecdir}/%{name}/server
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE32} \
+    > %{buildroot}%{_unitdir}/%{name}@.service
+
+ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
+ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc
+
+# create jsp and servlet and el API symlinks
+pushd %{buildroot}%{_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
+   ln -s %{name}-servlet-%{servletspec}-api.jar %{name}-servlet.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 -s lib commons-collections \
+                                        commons-dbcp2 commons-pool2 ecj/ecj 2>&1
+    # need to use -p here with b-j-r otherwise the examples webapp fails to
+    # load with a java.io.IOException
+    %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
+    taglibs-core.jar taglibs-standard.jar 2>&1
+popd
+
+pushd %{buildroot}%{libdir}
+    # symlink JSP and servlet and el API jars
+    ln -s ../%{name}-jsp-%{jspspec}-api.jar .
+    ln -s ../%{name}-servlet-%{servletspec}-api.jar .
+    ln -s ../%{name}-el-%{elspec}-api.jar .
+    ln -s $(build-classpath commons-collections) commons-collections.jar
+    rm -f commons-dbcp.jar
+    ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
+    ln -s $(build-classpath commons-pool2) commons-pool2.jar
+    ln -s $(build-classpath ecj/ecj) jasper-jdt.jar
+    rm ecj.jar
+    ln -s $(build-classpath ecj/ecj) ecj.jar
+
+    # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)
+    cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./
+popd
+
+# symlink to the FHS locations where we've installed things
+pushd %{buildroot}%{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 sample webapp
+mkdir -p %{buildroot}%{tomcatappdir}/sample
+pushd %{buildroot}%{tomcatappdir}/sample
+%jar xf %{buildroot}%{tomcatappdir}/docs/appdev/sample/sample.war
+popd
+
+pushd %{buildroot}%{tomcatappdir}/examples/WEB-INF/lib
+ln -s -f $(build-classpath jakarta-taglibs-core) jstl.jar
+ln -s -f $(build-classpath jakarta-taglibs-standard) standard.jar
+popd
+
+rm %{buildroot}%{tomcatappdir}/docs/appdev/sample/sample.war
+
+# Install the maven metadata
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+pushd output/dist/src/res/maven
+for pom in *.pom; do
+    # fix-up version in all pom files
+    sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
+done
+
+# we won't install dbcp, juli-adapters and juli-extras pom files
+for libname in annotations-api catalina jasper-el jasper catalina-ha jaspic-api; do
+    cp -a %{name}-$libname.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-$libname.pom
+    %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar
+done
+
+# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
+cp -a tomcat-jsp-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f jsp-api -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
+
+cp -a tomcat-el-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-el-api.pom
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f el-api -a "org.eclipse.jetty.orbit:javax.el"
+
+cp -a tomcat-servlet-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
+# Generate a depmap fragment javax.servlet:servlet-api pointing to
+# tomcat-servlet-3.0-api for backwards compatibility
+# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
+%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f servlet-api -a "org.mortbay.jetty:servlet-api"
+
+# two special pom where jar files have different names
+cp -a tomcat-tribes.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
+%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
+
+cp -a tomcat-coyote.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
+%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar
+
+cp -a tomcat-jni.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-jni.pom
+%add_maven_depmap JPP.%{name}-tomcat-jni.pom %{name}/tomcat-jni.jar
+
+cp -a tomcat-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
+%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
+
+cp -a tomcat-jdbc.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
+%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
+
+cp -a tomcat-dbcp.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-dbcp.pom
+%add_maven_depmap JPP.%{name}-tomcat-dbcp.pom %{name}/tomcat-dbcp.jar
+
+cp -a tomcat-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
+%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar
+
+cp -a tomcat-util.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
+%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
+
+cp -a tomcat-util-scan.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util-scan.pom
+%add_maven_depmap JPP.%{name}-tomcat-util-scan.pom %{name}/tomcat-util-scan.jar
+
+cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
+%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
+
+cp -a tomcat-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
+%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar
+
+cp -a tomcat-embed-core.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
+%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom %{name}/tomcat-embed-core.jar -f embed
+
+cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
+%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar -f embed
+
+cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
+%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar -f embed
+
+cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
+%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom %{name}/tomcat-embed-websocket.jar -f embed
+
+# replace temporary copy with link
+ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/
+
+# bnc#424675
+ln -s %{cachedir}/Catalina %{buildroot}/%{confdir}
+rm -rf %{buildroot}/%{confdir}/Catalina
+ln -s %{cachedir}/Catalina %{buildroot}/%{confdir}/
+
+# bnc#418664
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/ant.d/
+echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
+%fdupes %{buildroot} /srv/%{name}
+#bnc#565901
+ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
+
+# Install update-alternatives content
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar
+ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/%{name}-el_1_0_api.jar
+ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar
+# To avoid conflicts with servletapi4 and servletapi5 create a link to incorrect /etc/alternatives/servlet.jar.
+# It will be changed anyways to the correct symlink by update-alternatives.
+ln -s -f %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
+
+%pre
+# add the tomcat user and group
+getent group tomcat >/dev/null || %{_sbindir}/groupadd -r tomcat
+getent passwd tomcat >/dev/null || %{_sbindir}/useradd -c "Apache Tomcat" \
+	-g tomcat -s /sbin/nologin -r -d %{homedir} tomcat
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+%{fillup_only %{name}}
+chown -R tomcat:tomcat %{confdir}/server.xml
+runuser -u tomcat -g tomcat -- xsltproc --output %{confdir}/server.xml %{confdir}/valve.xslt %{confdir}/server.xml
+
+%preun
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+
+%pre jsvc
+%service_add_pre %{name}-jsvc.service
+
+%post jsvc
+%service_add_post %{name}-jsvc.service
+
+%preun jsvc
+%service_del_preun %{name}-jsvc.service
+
+%postun jsvc
+%service_del_postun %{name}-jsvc.service
+
+%post el-3_0-api
+update-alternatives --install %{_javadir}/%{name}-el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
+update-alternatives --install %{_javadir}/%{name}-el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
+
+%preun el-3_0-api
+if [ $1 -eq 0 ] ; then
+    update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+    update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+fi
+
+%post jsp-2_3-api
+update-alternatives --install %{_javadir}/%{name}-jsp.jar jsp \
+    %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
+
+%postun jsp-2_3-api
+if [ $1 -eq 0 ] ; then
+    update-alternatives --remove jsp \
+        %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+fi
+
+%post servlet-4_0-api
+update-alternatives --install %{_javadir}/servlet.jar servlet \
+    %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
+# Fix for bsc#1092163.
+# Keep the /usr/share/java/tomcat-servlet.jar symlink for compatibility.
+# In case of update from an older version where /usr/share/java/tomcat-servlet.jar is an alternatives symlink
+# the update-alternatives in the new version will cause a rename tomcat-servlet.jar -> servlet.jar.
+# This makes sure the tomcat-servlet.jar is recreated if it's missing because of the rename.
+if [ ! -f %{_javadir}/%{name}-servlet.jar ]; then
+    echo "Recreating symlink %{_javadir}/%{name}-servlet.jar"
+    ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet.jar
+fi
+
+%postun servlet-4_0-api
+if [ $1 -eq 0 ] ; then
+    if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then
+        # %{_sysconfdir}/alternatives/servlet was removed on uninstall.
+        # Create a broken symlink to make sure update-alternatives works correctly and falls back
+        # to servletapi5 or servletapi4 if they're installed.
+        ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_sysconfdir}/alternatives/servlet
+    fi
+    update-alternatives --remove servlet \
+        %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+fi
+
+%post lib
+# those links are no longer needed
+rm -f \
+    %{libdir}/\[commons-collections-tomcat5\].jar \
+    %{libdir}/\[commons-dbcp-tomcat5\].jar \
+    %{libdir}/\[commons-pool-tomcat5\].jar \
+    %{libdir}/\[ecj\].jar >/dev/null 2>&1
+
+%post webapps
+chown -R tomcat:tomcat %{tomcatappdir}/examples/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/examples/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/examples/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/examples ]; then
+    ln -sf %{tomcatappdir}/examples %{_datadir}/%{name}/webapps/examples
+fi
+#use the same context.xml for sample war
+mkdir -p %{tomcatappdir}/ROOT/META-INF
+chown -R tomcat:tomcat %{tomcatappdir}/ROOT/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/ROOT/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/examples/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/ROOT ]; then
+    ln -sf  %{tomcatappdir}/ROOT %{_datadir}/%{name}/webapps/ROOT
+fi
+#use the same context.xml for sample war
+mkdir -p %{tomcatappdir}/webapps/sample/META-INF
+chown -R tomcat:tomcat %{tomcatappdir}/sample/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/sample/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/examples/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/sample ]; then
+    ln -sf %{tomcatappdir}/sample  %{_datadir}/%{name}/webapps/sample
+fi
+
+%postun webapps
+if [ $1 -eq 0 ]; then # uninstall only
+    rm %{tomcatappdir}/ROOT/META-INF/context.xml
+    rm %{tomcatappdir}/sample/META-INF/context.xml
+fi
+
+%post admin-webapps
+chown -R tomcat:tomcat %{tomcatappdir}/manager/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/manager/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/manager/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/manager ]; then
+    ln -sf %{tomcatappdir}/manager %{_datadir}/%{name}/webapps/manager
+fi
+
+chown -R tomcat:tomcat %{tomcatappdir}/host-manager/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/host-manager/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/host-manager/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/host-manager ]; then
+    ln -sf %{tomcatappdir}/host-manager %{_datadir}/%{name}/webapps/host-manager
+fi
+
+%post docs-webapp
+chown -R tomcat:tomcat %{tomcatappdir}/docs/META-INF
+runuser -u tomcat -g tomcat -- xsltproc --output %{tomcatappdir}/docs/META-INF/context.xml %{confdir}/allowLinking.xslt %{tomcatappdir}/docs/META-INF/context.xml
+if [ ! -e %{_datadir}/%{name}/webapps/docs ]; then
+    ln -sf %{tomcatappdir}/docs %{_datadir}/%{name}/webapps/docs
+fi
+
+%files
+%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
+%{_sbindir}/rc%{name}
+%attr(0644,root,root) %{_unitdir}/%{name}@.service
+%attr(0755,root,root) %dir %{_libexecdir}/%{name}
+%attr(0755,root,root) %dir %{_localstatedir}/lib/tomcats
+%attr(0755,root,root) %{_libexecdir}/%{name}/functions
+%attr(0755,root,root) %{_libexecdir}/%{name}/preamble
+%attr(0755,root,root) %{_libexecdir}/%{name}/server
+#bnc#565901
+%{bindir}/catalina.sh
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(0755,root,tomcat) %dir %{basedir}
+%attr(0755,root,tomcat) %dir %{confdir}
+%attr(0775,root,tomcat) %dir %{appdir}
+%attr(0770,tomcat,tomcat) %dir %{logdir}
+%attr(0660,tomcat,tomcat) %{logdir}/catalina.out
+%attr(0770,root,tomcat) %dir %{cachedir}
+%attr(0775,root,tomcat) %dir %{cachedir}/Catalina
+
+# tomcat group writtable dirs - bnc#625415
+%attr(0770,root,tomcat) %dir %{tempdir}
+%attr(0770,root,tomcat) %dir %{workdir}
+%attr(0775,root,tomcat) %dir %{tomcatappdir}
+
+%{confdir}/Catalina
+%attr(0755,root,tomcat) %dir %{confdir}/conf.d
+%attr(0644,root,tomcat) %{confdir}/conf.d/README
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/%{name}.conf
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/*.policy
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/*.properties
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/context.xml
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/server.xml
+# keep tomcat-users.xml readable only by root and tomcat group
+%attr(0640,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/web.xml
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml
+%attr(0755,root,tomcat) %dir %{homedir}
+%attr(0644,root,tomcat) %{bindir}/bootstrap.jar
+%attr(0644,root,tomcat) %{bindir}/catalina-tasks.xml
+%{homedir}/lib
+%{homedir}/temp
+%{homedir}/work
+%{homedir}/webapps
+%{homedir}/logs
+%{homedir}/conf
+%attr(0644,root,tomcat) %{_fillupdir}/sysconfig.%{name}
+%attr(0644,root,tomcat) %{confdir}/allowLinking.xslt
+%attr(0644,root,tomcat) %{confdir}/valve.xslt
+
+%files admin-webapps
+%defattr(0644,root,tomcat,0755)
+%{tomcatappdir}/host-manager
+%config(noreplace) %{tomcatappdir}/host-manager/META-INF/context.xml
+%{tomcatappdir}/manager
+%config(noreplace) %{tomcatappdir}/manager/META-INF/context.xml
+
+%files docs-webapp
+%{tomcatappdir}/docs
+
+%files el-3_0-api -f output/dist/src/res/maven/.mfiles-el-api
+%{_javadir}/%{name}-el-%{elspec}-api.jar
+%{_javadir}/%{name}-el-api.jar
+%{libdir}/%{name}-el-%{elspec}-api.jar
+%{_javadir}/%{name}-el_1_0_api.jar
+%{_javadir}/%{name}-el_api.jar
+%ghost %{_sysconfdir}/alternatives/el_1_0_api
+%ghost %{_sysconfdir}/alternatives/el_api
+
+%files javadoc
+%doc %{_javadocdir}/%{name}
+
+%files jsp-2_3-api -f output/dist/src/res/maven/.mfiles-jsp-api
+%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+%{_javadir}/%{name}-jsp-api.jar
+%{_javadir}/%{name}-jsp.jar
+%ghost %{_sysconfdir}/alternatives/jsp
+
+%files lib -f output/dist/src/res/maven/.mfiles
+%{libdir}
+%dir %{bindir}
+%{bindir}/tomcat-juli.jar
+%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
+%exclude %{libdir}/%{name}*-embed-*.jar
+# bnc#418664
+%dir %{_sysconfdir}/ant.d
+%config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
+
+%files embed -f output/dist/src/res/maven/.mfiles-embed
+%dir %{libdir}
+
+%files servlet-4_0-api -f output/dist/src/res/maven/.mfiles-servlet-api
+%license LICENSE
+%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+%{_javadir}/%{name}-servlet-api.jar
+%{_javadir}/%{name}-servlet.jar
+%{_javadir}/servlet.jar
+%ghost %{_sysconfdir}/alternatives/servlet
+
+%files webapps
+%defattr(0644,root,tomcat,0755)
+#bnc#520532
+%config(noreplace) %{tomcatappdir}/ROOT
+%{tomcatappdir}/examples
+%config(noreplace) %{tomcatappdir}/examples/META-INF/context.xml
+%{tomcatappdir}/sample
+
+%files jsvc
+%defattr(755,root,root,0755)
+%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
+%{_sbindir}/rc%{name}-jsvc
+
+%changelog
--- a/valve.xslt
+++ b/valve.xslt
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="Valve[@className='org.apache.catalina.valves.AccessLogValve']">
+    <xsl:copy>
+      <xsl:attribute name="rotatable">false</xsl:attribute>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>