From f5590977b9f57de523a32214be3634deefad1f8d Mon Sep 17 00:00:00 2001 From: squallsama Date: Thu, 11 Jul 2013 12:31:04 +0300 Subject: [PATCH 001/354] update to 7.0.42 Conflicts: tomcat.spec --- sources | 3 ++- tomcat.spec | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 20aa8e6..67edb0d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -158df72e6c046fa5d46a691a7c0805e6 apache-tomcat-7.0.40-src.tar.gz +5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz + diff --git a/tomcat.spec b/tomcat.spec index ddb2cab..158562f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 40 +%global micro_version 42 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -677,6 +677,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 +- Updated to 7.0.42 + * Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 - Updated to 7.0.40 - Resolves: rhbz 956569 added missing commons-pool link From a0886b4640794488b5190f8ef0b0d9c3a9b37029 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Fri, 12 Jul 2013 02:09:26 +0400 Subject: [PATCH 002/354] Fix sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 67edb0d..c9c84cf 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz - From fb74d36077389c292aefd639824ed8dd748549a5 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 4 Nov 2013 00:04:06 +0400 Subject: [PATCH 003/354] Updated to 7.0.47 Conflicts: tomcat.spec --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c9c84cf..2bb650f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz +4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 158562f..44882b6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 42 +%global micro_version 47 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -677,6 +677,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 +- Updated to 7.0.47 + * Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 - Updated to 7.0.42 From 2a1fbf0f3d614b3fccb7d3596b73d1042a56d6a0 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Fri, 7 Feb 2014 16:55:17 +0400 Subject: [PATCH 004/354] Tomcat 7.0.33 for CentOS 6.x --- sources | 2 +- tomcat-7.0-jsvc.service | 19 --- tomcat-7.0-tomcat-jsvc-sysd | 113 ------------------ tomcat-7.0-tomcat-sysd | 79 ------------- tomcat-7.0.service | 23 ---- tomcat-7.0.wrapper | 9 +- tomcat.spec | 224 ++++++++++++------------------------ 7 files changed, 78 insertions(+), 391 deletions(-) delete mode 100644 tomcat-7.0-jsvc.service delete mode 100644 tomcat-7.0-tomcat-jsvc-sysd delete mode 100644 tomcat-7.0-tomcat-sysd delete mode 100644 tomcat-7.0.service diff --git a/sources b/sources index 2bb650f..b76a2e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz +1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz diff --git a/tomcat-7.0-jsvc.service b/tomcat-7.0-jsvc.service deleted file mode 100644 index 3792cef..0000000 --- a/tomcat-7.0-jsvc.service +++ /dev/null @@ -1,19 +0,0 @@ -# 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=forking -ExecStart=/usr/sbin/tomcat-jsvc-sysd start -ExecStop=/usr/sbin/tomcat-jsvc-sysd stop - -[Install] -WantedBy=multi-user.target diff --git a/tomcat-7.0-tomcat-jsvc-sysd b/tomcat-7.0-tomcat-jsvc-sysd deleted file mode 100644 index 9134d5b..0000000 --- a/tomcat-7.0-tomcat-jsvc-sysd +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# -# This script provides systemd activation of the tomcat service -# To create clones of this service: -# 1) SERVICE_NAME must be defined before calling this script -# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat -# to override tomcat defaults - -# SERVICE_NAME is a required value only if the service name is -# different from 'tomcat' -# -NAME="${SERVICE_NAME:-tomcat}" - -#I'll bet this isn't required. -# unset ISBOOT - -# For SELinux we need to use 'runuser' not 'su' -if [ -x "/sbin/runuser" ]; then - SU="/sbin/runuser -s /bin/sh" -else - SU="/bin/su -s /bin/sh" -fi - -# Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat-jsvc" - -# Define the tomcat username -TOMCAT_USER="${TOMCAT_USER:-tomcat}" - -# TOMCAT_LOG should be different from catalina.out. -# Usually the below config is all that is necessary -TOMCAT_LOG=/var/log/${NAME}/${NAME}-sysd.log - -# Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat/tomcat.conf" -if [ -r "$TOMCAT_CFG" ]; then - . $TOMCAT_CFG -fi - -# Get instance specific config file -if [ -r "/etc/sysconfig/${NAME}" ]; then - . /etc/sysconfig/${NAME} -fi - -function parseOptions() { - options="" - options="$options $( - awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \ - $TOMCAT_CFG - )" - if [ -r "/etc/sysconfig/${NAME}" ]; then - options="$options $( - awk '!/^#/ && !/^$/ { ORS=" "; - print "export ", $0, ";" }' \ - /etc/sysconfig/${NAME} - )" - fi - TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" -} - -# See how we were called. -function start() { - # fix permissions on the log and pid files - export CATALINA_PID="/var/run/${NAME}.pid" - touch $CATALINA_PID 2>&1 - if [ "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID - fi - - touch $TOMCAT_LOG 2>&1 - if [ "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG - fi - - # if jsvc installed and USE_JSVC=true - # then start as root and use jsvc to drop privileges - if [ -x /usr/bin/jsvc ]; then - TOMCAT_USER="root" - fi - - parseOptions - if [ "$SECURITY_MANAGER" = "true" ]; then - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" >> $TOMCAT_LOG 2>&1 - else - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 - fi -} - -function stop() { - # if jsvc installed and USE_JSVC=true - # then start as root and use jsvc to drop privileges - if [ -x /usr/bin/jsvc ]; then - TOMCAT_USER="root" - fi - - parseOptions - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; -esac - diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd deleted file mode 100644 index 192329c..0000000 --- a/tomcat-7.0-tomcat-sysd +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -# -# This script provides systemd activation of the tomcat service -# To create clones of this service: -# 1) SERVICE_NAME must be defined before calling this script -# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat -# to override tomcat defaults - -# SERVICE_NAME is a required value only if the service name is -# different from 'tomcat' -# -export NAME="${SERVICE_NAME:-tomcat}" - -#I'll bet this isn't required. -# unset ISBOOT - -# For SELinux we need to use 'runuser' not 'su' -if [ -x "/sbin/runuser" ]; then - SU="/sbin/runuser -s /bin/sh" -else - SU="/bin/su -s /bin/sh" -fi - -# Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat" - -# Define the tomcat username -TOMCAT_USER="${TOMCAT_USER:-tomcat}" - -# TOMCAT_LOG should be different from catalina.out. -# Usually the below config is all that is necessary -TOMCAT_LOG=/var/log/${NAME}/${NAME}-sysd.log - -# Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat/tomcat.conf" -if [ -r "$TOMCAT_CFG" ]; then - . $TOMCAT_CFG -fi - -# Get instance specific config file -if [ -r "/etc/sysconfig/${NAME}" ]; then - . /etc/sysconfig/${NAME} -fi - -# See how we were called. -function start() { - # fix permissions on the log and pid files - export CATALINA_PID="/var/run/${NAME}.pid" - - touch $TOMCAT_LOG 2>&1 - if [ "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG - fi - - if [ "$SECURITY_MANAGER" = "true" ]; then - ${TOMCAT_SCRIPT} start-security >> $TOMCAT_LOG 2>&1 - else - ${TOMCAT_SCRIPT} start #>> $TOMCAT_LOG 2>&1 - fi -} - -function stop() { - ${TOMCAT_SCRIPT} stop >> $TOMCAT_LOG 2>&1 -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; -esac - diff --git a/tomcat-7.0.service b/tomcat-7.0.service deleted file mode 100644 index e2ab30c..0000000 --- a/tomcat-7.0.service +++ /dev/null @@ -1,23 +0,0 @@ -# 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 -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/tomcat-sysd start -ExecStop=/usr/sbin/tomcat-sysd stop -SuccessExitStatus=143 -User=tomcat -Group=tomcat - - -[Install] -WantedBy=multi-user.target diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper index 8d35a2f..820c622 100644 --- a/tomcat-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -22,16 +22,11 @@ if [ -r "/etc/sysconfig/${NAME}" ]; then fi 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):" + CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi -CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar" +CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" diff --git a/tomcat.spec b/tomcat.spec index 44882b6..4d9efbe 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 47 +%global micro_version 33 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -49,7 +49,6 @@ %global tempdir %{cachedir}/temp %global workdir %{cachedir}/work %global _initrddir %{_sysconfdir}/init.d -%global _systemddir /lib/systemd/system Name: tomcat Epoch: 0 @@ -60,7 +59,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{js Group: System Environment/Daemons 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 +Source0: http://www.archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -71,17 +70,12 @@ Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script Source8: servlet-api-OSGi-MANIFEST.MF Source9: jsp-api-OSGi-MANIFEST.MF Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties -Source11: %{name}-%{major_version}.%{minor_version}.service Source12: el-api-OSGi-MANIFEST.MF Source13: jasper-el-OSGi-MANIFEST.MF Source14: jasper-OSGi-MANIFEST.MF Source15: tomcat-api-OSGi-MANIFEST.MF Source16: tomcat-juli-OSGi-MANIFEST.MF -Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd -Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd -Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper -Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service - +Source17: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch @@ -90,34 +84,32 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ant-nodeps -BuildRequires: ecj >= 1:4.2.1 +BuildRequires: ant-trax +BuildRequires: ecj BuildRequires: findutils -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-daemon -BuildRequires: apache-commons-dbcp -BuildRequires: apache-commons-pool +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-daemon +BuildRequires: jakarta-commons-dbcp +BuildRequires: jakarta-commons-pool BuildRequires: jakarta-taglibs-standard BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j -BuildRequires: geronimo-jaxrpc BuildRequires: wsdl4j -BuildRequires: systemd-units -Requires: apache-commons-daemon -Requires: apache-commons-logging -Requires: apache-commons-collections -Requires: apache-commons-dbcp -Requires: apache-commons-pool +Requires: jakarta-commons-daemon +Requires: jakarta-commons-logging +Requires: jakarta-commons-collections +Requires: jakarta-commons-dbcp +Requires: jakarta-commons-pool Requires: java >= 1:1.6.0 Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): redhat-lsb +Requires(preun): redhat-lsb %description Tomcat is the servlet container that is used in the official Reference @@ -153,21 +145,11 @@ Requires: jpackage-utils %description javadoc Javadoc generated documentation for Apache Tomcat. -%package systemv -Group: System Environment/Daemons -Summary: Systemv scripts for Apache Tomcat -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires(post): chkconfig -Requires(postun): chkconfig - -%description systemv -SystemV scripts to start and stop tomcat service - %package jsvc Group: System Environment/Daemons Summary: Apache jsvc wrapper for Apache Tomcat as separate service Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: apache-commons-daemon-jsvc +Requires: jakarta-commons-daemon-jsvc %description jsvc Systemd service and wrapper scripts to start tomcat with jsvc, @@ -193,10 +175,10 @@ 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.2.1 -Requires: apache-commons-collections -Requires: apache-commons-dbcp -Requires: apache-commons-pool +Requires: ecj +Requires: jakarta-commons-collections +Requires: jakarta-commons-dbcp +Requires: jakarta-commons-pool Requires(preun): coreutils %description lib @@ -246,9 +228,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar %build -export OPT_JAR_LIST="xalan-j2-serializer" +export OPT_JAR_LIST="ant/ant-trax 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 + # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK %{__mkdir_p} HACKDIR @@ -256,17 +238,17 @@ export OPT_JAR_LIST="xalan-j2-serializer" # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ - -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ + -Dcommons-collections.jar="$(build-classpath jakarta-commons-collections)" \ + -Dcommons-daemon.jar="$(build-classpath jakarta-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \ + -Dtomcat-dbcp.jar="$(build-classpath jakarta-commons-dbcp)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ - -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ + -Djaxrpc-lib.jar="HACK" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dcommons-pool.home="HACKDIR" \ -Dcommons-dbcp.home="HACKDIR" \ @@ -278,7 +260,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar \ - output/build/lib/apache-commons-dbcp.jar + output/build/lib/jakarta-commons-dbcp.jar # remove the cruft we created %{__rm} output/build/bin/tomcat-native.tar.gz @@ -320,7 +302,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_initrddir} -%{__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} @@ -336,7 +317,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__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} # move things into place # First copy supporting libs to tomcat lib @@ -348,7 +328,7 @@ pushd output/build %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc -%{__cp} -a output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +%{__cp} -a webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ @@ -362,16 +342,8 @@ popd ${RPM_BUILD_ROOT}%{_initrddir}/%{name} %{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE11} \ - ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__install} -m 0644 %{SOURCE17} \ - ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd -%{__install} -m 0644 %{SOURCE19} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc -%{__install} -m 0644 %{SOURCE20} \ - ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service -%{__install} -m 0644 %{SOURCE18} \ - ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd %{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} @@ -394,8 +366,8 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} popd pushd output/build - %{_bindir}/build-jar-repository lib apache-commons-collections \ - apache-commons-dbcp apache-commons-pool ecj 2>&1 + %{_bindir}/build-jar-repository lib jakarta-commons-collections \ + jakarta-commons-dbcp jakarta-commons-pool 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 \ @@ -407,9 +379,8 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__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 apache-commons-collections) commons-collections.jar - %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar - %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar + %{__ln_s} $(build-classpath jakarta-commons-collections) commons-collections.jar + %{__ln_s} $(build-classpath jakarta-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar @@ -446,49 +417,44 @@ pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib %{__ln_s} -f $(build-classpath jakarta-taglibs-standard) standard.jar popd +%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api +%add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api +mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api + # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_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; do - %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom - %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar +#we won't install dhcp, juli-adapters and juli-extras pom files +for pom in tomcat-annotations-api.pom tomcat-catalina.pom tomcat-jasper-el.pom tomcat-jasper.pom \ + tomcat-catalina-ha.pom tomcat-api.pom; do + %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.$pom + base=`basename $pom .pom` + %add_to_maven_depmap org.apache.tomcat $base %{version} JPP $base 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 ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom -%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp" +for pom in tomcat-jsp-api.pom tomcat-servlet-api.pom tomcat-el-api.pom; do + %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-$pom + base=`basename $pom .pom` + %add_to_maven_depmap org.apache.tomcat $base JPP %{name}-$base + %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavendepmapfragdir}/$base +done -%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el" - -%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_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 "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet" # two special pom where jar files have different names %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom -%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar +%add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes %{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom -%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar +%add_to_maven_depmap org.apache.tomcat coyote %{version} JPP/%{name} tomcat-coyote %{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom -%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar - -%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom -%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar +%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli %{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom -%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar +%add_to_maven_depmap org.apache.tomcat util %{version} JPP/%{name} tomcat-util # replace temporary copy with link %{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/ @@ -505,12 +471,7 @@ EOF %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ -s /bin/nologin -r -d %{homedir} tomcat 2>/dev/null || : -%post -# install but don't activate -%systemd_post %{name}.service - -%post systemv -# install but don't activate +%post /sbin/chkconfig --add %{name} %post jsp-%{jspspec}-api @@ -525,17 +486,13 @@ EOF %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 -%preun systemv - %{_initrddir}/%{name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name} %preun # clean tempdir and workdir on removal or upgrade -%{__rm} -rf %{workdir}/* %{tempdir}/* -%systemd_preun %{name}.service +%{_initrddir}/%{name} stop >/dev/null 2>&1 +/sbin/chkconfig --del %{name} -%postun -%systemd_postun_with_restart %{name}.service +%{__rm} -rf %{workdir}/* %{tempdir}/* %postun jsp-%{jspspec}-api if [ "$1" = "0" ]; then @@ -556,26 +513,22 @@ if [ "$1" = "0" ]; then fi %triggerun -- tomcat < 0:7.0.22-2 -/usr/bin/systemd-sysv-convert -- save tomcat > /dev/null 2>&1 || : -# Run these becasue the SysV package being removed won't do them /sbin/chkconfig --del tomcat > /dev/null 2>&1 || : -/bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || : %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}/d%{name} %attr(0755,root,root) %{_sbindir}/%{name} -%attr(0644,root,root) %{_unitdir}/%{name}.service -%attr(0755,root,root) %{_sbindir}/%{name}-sysd +%attr(0755,root,root) %{_initrddir}/%{name} %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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 %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -621,7 +574,7 @@ fi %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{_javadir}/%{name}-jsp-api.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api +%{_mavendepmapfragdir}/%{name}-jsp-api %files lib %defattr(-,root,root,-) @@ -634,7 +587,7 @@ fi %{_mavenpomdir}/JPP.%{name}-catalina.pom %{_mavenpomdir}/JPP.%{name}-jasper-el.pom %{_mavenpomdir}/JPP.%{name}-jasper.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom +%{_mavenpomdir}/JPP.%{name}-api.pom %{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom @@ -646,7 +599,7 @@ fi %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-api.jar -%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api +%{_mavendepmapfragdir}/%{name}-servlet-api %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files el-%{elspec}-api @@ -656,7 +609,7 @@ fi %{_javadir}/%{name}-el-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar %{_mavenpomdir}/JPP-%{name}-el-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-el-api +%{_mavendepmapfragdir}/%{name}-el-api %files webapps @@ -665,49 +618,22 @@ fi %{appdir}/examples %{appdir}/sample -%files systemv -%defattr(755,root,root,0755) -%{_sbindir}/d%{name} -%{_initrddir}/%{name} - %files jsvc %defattr(755,root,root,0755) %{_sbindir}/%{name}-jsvc -%{_sbindir}/%{name}-jsvc-sysd -%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 -- Updated to 7.0.47 - -* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 -- Updated to 7.0.42 - -* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 -- Updated to 7.0.40 -- Resolves: rhbz 956569 added missing commons-pool link - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 -- Add depmaps for org.eclipse.jetty.orbit -- Resolves: rhbz#917626 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 -- Updated to 7.0.39 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 -- Updated to 7.0.37 - -* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 -- Updated to 7.0.35 -- systemd SuccessExitStatus=143 for proper stop exit code processing - -* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 -- Updated to 7.0.34 -- ecj >= 4.2.1 now required -- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME - -* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 -- Resolves: rhbz 883806 refix logdir ownership +* Thu Feb 6 2014 Vlad Slepukhin 0.7.0.33-2 +- Rebuilded for CentOS 6.x compatibility +- Removed systemd for compatibility +- As no systemd used, systemv moved back to tomcat package +- Build now requires ant-trax for compatibility (XSLT and JavaDoc) +- Build now requires redhat-lsb for LSB libraries on CentOS +- Removed geronimo-jaxrpc as no package found in CentOS +- Renamed apache-* packages to jakarta-* ones for CentOS +- %add_maven_depmap replaced with %add_to_maven_depmap as no such Maven script exists in CentOS maven packages +- Refactored and cleaned, removing unused code +- Removed unused files needed for systemd * Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 - Updated to 7.0.33 From 84f3874ac9f530503b97c385420b1bf085b05635 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Fri, 7 Feb 2014 17:29:13 +0400 Subject: [PATCH 005/354] Fixing SOURCE numeration --- tomcat.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 4d9efbe..29971f5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -70,12 +70,12 @@ Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script Source8: servlet-api-OSGi-MANIFEST.MF Source9: jsp-api-OSGi-MANIFEST.MF Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties -Source12: el-api-OSGi-MANIFEST.MF -Source13: jasper-el-OSGi-MANIFEST.MF -Source14: jasper-OSGi-MANIFEST.MF -Source15: tomcat-api-OSGi-MANIFEST.MF -Source16: tomcat-juli-OSGi-MANIFEST.MF -Source17: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper +Source11: el-api-OSGi-MANIFEST.MF +Source12: jasper-el-OSGi-MANIFEST.MF +Source13: jasper-OSGi-MANIFEST.MF +Source14: tomcat-api-OSGi-MANIFEST.MF +Source15: tomcat-juli-OSGi-MANIFEST.MF +Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch @@ -280,19 +280,19 @@ zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE12} META-INF/MANIFEST.MF +cp -p %{SOURCE11} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE13} META-INF/MANIFEST.MF +cp -p %{SOURCE12} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF -cp -p %{SOURCE14} META-INF/MANIFEST.MF +cp -p %{SOURCE13} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF -cp -p %{SOURCE15} META-INF/MANIFEST.MF +cp -p %{SOURCE14} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE16} META-INF/MANIFEST.MF +cp -p %{SOURCE15} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF @@ -342,7 +342,7 @@ popd ${RPM_BUILD_ROOT}%{_initrddir}/%{name} %{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE17} \ +%{__install} -m 0644 %{SOURCE16} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc %{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ From c16cb96349cb69aa11647b67bdd0f8b60f75b864 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Mon, 10 Feb 2014 13:27:08 +0400 Subject: [PATCH 006/354] Some security fixes, systemd stuff removal and changelog update --- tomcat.spec | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 29971f5..f005b60 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -512,7 +512,6 @@ if [ "$1" = "0" ]; then %{_javadir}/%{name}-el-%{elspec}-api.jar fi -%triggerun -- tomcat < 0:7.0.22-2 /sbin/chkconfig --del tomcat > /dev/null 2>&1 || : %files @@ -528,7 +527,7 @@ fi %attr(0755,root,tomcat) %dir %{basedir} %attr(0755,root,tomcat) %dir %{confdir} %defattr(0664,root,tomcat,0770) -%attr(0770,root,tomcat) %dir %{logdir} +%attr(0644,root,tomcat) %dir %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -624,16 +623,49 @@ fi %changelog * Thu Feb 6 2014 Vlad Slepukhin 0.7.0.33-2 -- Rebuilded for CentOS 6.x compatibility +- Rebuilded for EL6 compatibility - Removed systemd for compatibility - As no systemd used, systemv moved back to tomcat package - Build now requires ant-trax for compatibility (XSLT and JavaDoc) - Build now requires redhat-lsb for LSB libraries on CentOS -- Removed geronimo-jaxrpc as no package found in CentOS -- Renamed apache-* packages to jakarta-* ones for CentOS -- %add_maven_depmap replaced with %add_to_maven_depmap as no such Maven script exists in CentOS maven packages +- Removed geronimo-jaxrpc as no package found in EL6 +- Renamed apache-* packages to jakarta-* ones for EL6 +- %add_maven_depmap replaced with %add_to_maven_depmap as no such Maven script exists in EL6 maven packages - Refactored and cleaned, removing unused code - Removed unused files needed for systemd +- Corrected access attributes and rights management for safety purposes + +* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 +- Updated to 7.0.47 + +* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 +- Updated to 7.0.42 + +* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 +- Updated to 7.0.40 +- Resolves: rhbz 956569 added missing commons-pool link + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 +- Add depmaps for org.eclipse.jetty.orbit +- Resolves: rhbz#917626 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 +- Updated to 7.0.39 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 +- Updated to 7.0.37 + +* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 +- Updated to 7.0.35 +- systemd SuccessExitStatus=143 for proper stop exit code processing + +* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 +- Updated to 7.0.34 +- ecj >= 4.2.1 now required +- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME + +* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 +- Resolves: rhbz 883806 refix logdir ownership * Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 - Updated to 7.0.33 From 181e718899eb268600f3b32f7bc9e5c33504f85a Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Tue, 11 Feb 2014 15:55:57 +0400 Subject: [PATCH 007/354] residual lines removal --- tomcat.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index f005b60..a731417 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -491,7 +491,6 @@ EOF # clean tempdir and workdir on removal or upgrade %{_initrddir}/%{name} stop >/dev/null 2>&1 /sbin/chkconfig --del %{name} - %{__rm} -rf %{workdir}/* %{tempdir}/* %postun jsp-%{jspspec}-api @@ -512,7 +511,6 @@ if [ "$1" = "0" ]; then %{_javadir}/%{name}-el-%{elspec}-api.jar fi -/sbin/chkconfig --del tomcat > /dev/null 2>&1 || : %files %defattr(0664,root,tomcat,0755) From 5e8d8f659912666c25692d10759290612908f1af Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Wed, 12 Feb 2014 07:32:16 +0300 Subject: [PATCH 008/354] minor versioning fixes --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index a731417..ca5bbd6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -620,7 +620,7 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Thu Feb 6 2014 Vlad Slepukhin 0.7.0.33-2 +* Thu Feb 12 2014 Vlad Slepukhin 0.7.0.33-1 - Rebuilded for EL6 compatibility - Removed systemd for compatibility - As no systemd used, systemv moved back to tomcat package From 1054595cbff98cf1fdc52db676229370bb42625e Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Fri, 14 Feb 2014 08:38:11 +0300 Subject: [PATCH 009/354] Fixing typo in spec file --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index ca5bbd6..5ed29db 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -620,7 +620,7 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Thu Feb 12 2014 Vlad Slepukhin 0.7.0.33-1 +* Thu Feb 12 2014 Vlad Slepukhin 0:7.0.33-1 - Rebuilded for EL6 compatibility - Removed systemd for compatibility - As no systemd used, systemv moved back to tomcat package From be363bfbe6f56a7f53b4baadbcb70dc225bc47a4 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 17 Feb 2014 23:36:40 +0400 Subject: [PATCH 010/354] F20 changes reverted --- sources | 2 +- tomcat-7.0-log4j.properties | 2 +- tomcat-7.0-tomcat-sysd | 79 +++++++++ tomcat-7.0.conf | 46 +++--- tomcat-7.0.init | 319 ++++++++++++++++++++++++++++++++++++ tomcat-7.0.service | 16 +- tomcat-7.0.sysconfig | 59 ++++++- tomcat-7.0.wrapper | 79 +++++++-- tomcat-named.service | 26 --- tomcat-preamble | 50 ------ tomcat-server | 24 --- tomcat.spec | 86 +++++----- 12 files changed, 590 insertions(+), 198 deletions(-) create mode 100644 tomcat-7.0-tomcat-sysd create mode 100644 tomcat-7.0.init delete mode 100644 tomcat-named.service delete mode 100644 tomcat-preamble delete mode 100644 tomcat-server diff --git a/sources b/sources index 2bb650f..20aa8e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz +158df72e6c046fa5d46a691a7c0805e6 apache-tomcat-7.0.40-src.tar.gz diff --git a/tomcat-7.0-log4j.properties b/tomcat-7.0-log4j.properties index dfc2309..1252a64 100644 --- a/tomcat-7.0-log4j.properties +++ b/tomcat-7.0-log4j.properties @@ -1,6 +1,6 @@ log4j.rootLogger=debug, R log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=${catalina.base}/logs/tomcat.log +log4j.appender.R.File=${catalina.home}/logs/tomcat.log log4j.appender.R.MaxFileSize=10MB log4j.appender.R.MaxBackupIndex=10 log4j.appender.R.layout=org.apache.log4j.PatternLayout diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd new file mode 100644 index 0000000..192329c --- /dev/null +++ b/tomcat-7.0-tomcat-sysd @@ -0,0 +1,79 @@ +#!/bin/bash +# +# This script provides systemd activation of the tomcat service +# To create clones of this service: +# 1) SERVICE_NAME must be defined before calling this script +# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat +# to override tomcat defaults + +# SERVICE_NAME is a required value only if the service name is +# different from 'tomcat' +# +export NAME="${SERVICE_NAME:-tomcat}" + +#I'll bet this isn't required. +# unset ISBOOT + +# For SELinux we need to use 'runuser' not 'su' +if [ -x "/sbin/runuser" ]; then + SU="/sbin/runuser -s /bin/sh" +else + SU="/bin/su -s /bin/sh" +fi + +# Path to the tomcat launch script +TOMCAT_SCRIPT="/usr/sbin/tomcat" + +# Define the tomcat username +TOMCAT_USER="${TOMCAT_USER:-tomcat}" + +# TOMCAT_LOG should be different from catalina.out. +# Usually the below config is all that is necessary +TOMCAT_LOG=/var/log/${NAME}/${NAME}-sysd.log + +# Get the tomcat config (use this for environment specific settings) +TOMCAT_CFG="/etc/tomcat/tomcat.conf" +if [ -r "$TOMCAT_CFG" ]; then + . $TOMCAT_CFG +fi + +# Get instance specific config file +if [ -r "/etc/sysconfig/${NAME}" ]; then + . /etc/sysconfig/${NAME} +fi + +# See how we were called. +function start() { + # fix permissions on the log and pid files + export CATALINA_PID="/var/run/${NAME}.pid" + + touch $TOMCAT_LOG 2>&1 + if [ "$?" -eq "0" ]; then + chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG + fi + + if [ "$SECURITY_MANAGER" = "true" ]; then + ${TOMCAT_SCRIPT} start-security >> $TOMCAT_LOG 2>&1 + else + ${TOMCAT_SCRIPT} start #>> $TOMCAT_LOG 2>&1 + fi +} + +function stop() { + ${TOMCAT_SCRIPT} stop >> $TOMCAT_LOG 2>&1 +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; +esac + diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf index 03119b7..a500479 100644 --- a/tomcat-7.0.conf +++ b/tomcat-7.0.conf @@ -1,37 +1,30 @@ # System-wide configuration file for tomcat services -# This will be loaded by systemd as an environment file, -# so please keep the syntax. +# This will be sourced by tomcat and any secondary service +# Values will be overridden by service-specific configuration +# files in /etc/sysconfig # -# 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 one to change default values for all services +# Change the service specific ones to affect only one service +# (see, for instance, /etc/sysconfig/tomcat) # -# 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_BASE="@@@TCHOME@@@" CATALINA_HOME="@@@TCHOME@@@" - -# System-wide tmp -CATALINA_TMPDIR="/var/cache/tomcat/temp" +JASPER_HOME="@@@TCHOME@@@" +CATALINA_TMPDIR="@@@TCTEMP@@@" # 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" +#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@" + +# What user should run tomcat +TOMCAT_USER="tomcat" # You can change your tomcat locale here #LANG="en_US" @@ -40,9 +33,18 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp" SECURITY_MANAGER="false" # Time to wait in seconds, before killing process -# TODO(stingray): does nothing, fix. -# SHUTDOWN_WAIT="30" +SHUTDOWN_WAIT="30" + +# Whether to annoy the user with "attempting to shut down" messages or not +SHUTDOWN_VERBOSE="false" + +# Set the TOMCAT_PID location +CATALINA_PID="/var/run/tomcat.pid" + +# Connector port is 8080 for this tomcat instance +#CONNECTOR_PORT="8080" # 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/tomcat-7.0.init b/tomcat-7.0.init new file mode 100644 index 0000000..f5269f5 --- /dev/null +++ b/tomcat-7.0.init @@ -0,0 +1,319 @@ +#!/bin/bash +# +# tomcat This shell script takes care of starting and stopping Tomcat +# +# chkconfig: - 80 20 +# +### BEGIN INIT INFO +# Provides: tomcat +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Default-Start: +# Default-Stop: +# Description: Release implementation for Servlet 3.0 and JSP 2.2 +# Short-Description: start and stop tomcat +### END INIT INFO +# +# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot +# - heavily rewritten by Deepak Bhole and Jason Corley +# + +## Source function library. +#. /etc/rc.d/init.d/functions +# Source LSB function library. +if [ -r /lib/lsb/init-functions ]; then + . /lib/lsb/init-functions +else + exit 1 +fi + +DISTRIB_ID=`lsb_release -i -s 2>/dev/null` + +NAME="$(basename $0)" +unset ISBOOT +if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K" ]; then + NAME="${NAME:3}" + ISBOOT="1" +fi + +# For SELinux we need to use 'runuser' not 'su' +if [ -x "/sbin/runuser" ]; then + SU="/sbin/runuser -s /bin/sh" +else + SU="/bin/su -s /bin/sh" +fi + +# Get the tomcat config (use this for environment specific settings) +TOMCAT_CFG="/etc/tomcat/tomcat.conf" +if [ -r "$TOMCAT_CFG" ]; then + . $TOMCAT_CFG +fi + +# Get instance specific config file +if [ -r "/etc/sysconfig/${NAME}" ]; then + . /etc/sysconfig/${NAME} +fi + +# Define which connector port to use +CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" + +# Path to the tomcat launch script +TOMCAT_SCRIPT="/usr/sbin/tomcat" + +# Tomcat program name +TOMCAT_PROG="${NAME}" + +# Define the tomcat username +TOMCAT_USER="${TOMCAT_USER:-tomcat}" + +# Define the tomcat log file +TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" + + +RETVAL="0" + +# Look for open ports, as the function name might imply +function findFreePorts() { + local isSet1="false" + local isSet2="false" + local isSet3="false" + local lower="8000" + randomPort1="0" + randomPort2="0" + randomPort3="0" + local -a listeners="( $( + netstat -ntl | \ + awk '/^tcp/ {gsub("(.)*:", "", $4); print $4}' + ) )" + while [ "$isSet1" = "false" ] || \ + [ "$isSet2" = "false" ] || \ + [ "$isSet3" = "false" ]; do + let port="${lower}+${RANDOM:0:4}" + if [ -z `expr " ${listeners[*]} " : ".*\( $port \).*"` ]; then + if [ "$isSet1" = "false" ]; then + export randomPort1="$port" + isSet1="true" + elif [ "$isSet2" = "false" ]; then + export randomPort2="$port" + isSet2="true" + elif [ "$isSet3" = "false" ]; then + export randomPort3="$port" + isSet3="true" + fi + fi + done +} + +function makeHomeDir() { + if [ ! -d "$CATALINA_HOME" ]; then + echo "$CATALINA_HOME does not exist, creating" + if [ ! -d "/usr/share/${NAME}" ]; then + mkdir /usr/share/${NAME} + cp -pLR /usr/share/tomcat/* /usr/share/${NAME} + fi + mkdir -p /var/log/${NAME} \ + /var/cache/${NAME} \ + /var/tmp/${NAME} + ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work + ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp + cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME + cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME + ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib + ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps + chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} + fi +} + +function parseOptions() { + options="" + options="$options $( + awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \ + $TOMCAT_CFG + )" + if [ -r "/etc/sysconfig/${NAME}" ]; then + options="$options $( + awk '!/^#/ && !/^$/ { ORS=" "; + print "export ", $0, ";" }' \ + /etc/sysconfig/${NAME} + )" + fi + TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" +} + +# See how we were called. +function start() { + + echo -n "Starting ${TOMCAT_PROG}: " + if [ "$RETVAL" != "0" ]; then + log_failure_msg + return + fi + if [ -f "/var/lock/subsys/${NAME}" ]; then + if [ -s "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid +# if checkpid $kpid 2>&1; then + if [ -d "/proc/${kpid}" ]; then + log_success_msg + if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then + echo + fi + return 0 + fi + fi + fi + # fix permissions on the log and pid files + export CATALINA_PID="/var/run/${NAME}.pid" + touch $CATALINA_PID 2>&1 || RETVAL="4" + if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then + chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID + fi + [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" + if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then + chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG + fi + if [ "$CATALINA_HOME" != "/usr/share/tomcat" -a "$RETVAL" -eq "0" ]; then + # Create a tomcat directory if it doesn't exist + makeHomeDir + # If CATALINA_HOME doesn't exist modify port number so that + # multiple instances don't interfere with each other + findFreePorts + sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \ + -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \ + ${CATALINA_HOME}/conf/server.xml + fi + parseOptions + if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then + $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ + >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" + else + + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" + fi + if [ "$RETVAL" -eq "0" ]; then + log_success_msg + touch /var/lock/subsys/${NAME} + else + log_failure_msg "Error code ${RETVAL}" + fi + if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then + echo + fi +} + +function stop() { + echo -n "Stopping ${TOMCAT_PROG}: " + if [ -f "/var/lock/subsys/${NAME}" ]; then + parseOptions + if [ "$RETVAL" -eq "0" ]; then + touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4" + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" + fi + if [ "$RETVAL" -eq "0" ]; then + count="0" + if [ -s "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid + until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \ + [ "$count" -gt "$SHUTDOWN_WAIT" ]; do + if [ "$SHUTDOWN_VERBOSE" = "true" ]; then + echo "waiting for processes $kpid to exit" + fi + sleep 1 + let count="${count}+1" + done + if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then + if [ "$SHUTDOWN_VERBOSE" = "true" ]; then + log_warning_msg "killing processes which did not stop after ${SHUTDOWN_WAIT} seconds" + fi + kill -9 $kpid + fi + log_success_msg + fi + rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid + else + log_failure_msg + RETVAL="4" + fi + else + log_success_msg + RETVAL="0" + fi + if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then + echo + fi +} + +function usage() +{ + echo "Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}" + RETVAL="2" +} + +# See how we were called. +RETVAL="0" +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + condrestart|try-restart) + if [ -s "/var/run/${NAME}.pid" ]; then + stop + start + fi + ;; + reload) + RETVAL="3" + ;; + force-reload) + if [ -s "/var/run/${NAME}.pid" ]; then + stop + start + fi + ;; + status) + if [ -s "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid + if [ -d "/proc/${kpid}" ]; then + log_success_msg "${NAME} (pid ${kpid}) is running..." + RETVAL="0" + else +# The pid file exists but the process is not running + log_warning_msg "PID file exists, but process is not running" + RETVAL="1" + fi + else + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)" + if [ -z "$pid" ]; then +# status ${NAME} +# RETVAL="$?" + log_success_msg "${NAME} is stopped" + RETVAL="3" + else + log_success_msg "${NAME} (pid $pid) is running..." + RETVAL="0" + fi + fi + if [ -f /var/lock/subsys/${NAME} ]; then + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)" +# The lockfile exists but the process is not running + if [ -z "$pid" ]; then + log_failure_msg "${NAME} lockfile exists but process is not running" + RETVAL="2" + fi + fi + ;; + version) + ${TOMCAT_SCRIPT} version + ;; + *) + usage + ;; +esac + +exit $RETVAL diff --git a/tomcat-7.0.service b/tomcat-7.0.service index 103d464..e2ab30c 100644 --- a/tomcat-7.0.service +++ b/tomcat-7.0.service @@ -1,19 +1,19 @@ -# Systemd unit file for default tomcat +# Systemd unit file for tomcat # # To create clones of this service: -# DO NOTHING, use tomcat@.service instead. +# 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 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 -ExecStop=/usr/libexec/tomcat/server stop +Type=forking +ExecStart=/usr/sbin/tomcat-sysd start +ExecStop=/usr/sbin/tomcat-sysd stop SuccessExitStatus=143 User=tomcat Group=tomcat diff --git a/tomcat-7.0.sysconfig b/tomcat-7.0.sysconfig index 3117bf7..c1337e8 100644 --- a/tomcat-7.0.sysconfig +++ b/tomcat-7.0.sysconfig @@ -1,11 +1,56 @@ # 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. +# the SysV init script after the global configuration file +# /etc/tomcat/tomcat.conf, thus allowing values to be overridden in +# a per-service manner. +# +# NEVER change the init script itself. To change values for all services make +# your changes in /etc/tomcat/tomcat.conf +# +# To change values for a specific service make your edits here. +# To create a new service create a link from /etc/init.d/ to +# /etc/init.d/tomcat (do not copy the init script) and make a copy of the +# /etc/sysconfig/tomcat file to /etc/sysconfig/ and change +# the property values so the two services won't conflict. Register the new +# service in the system as usual (see chkconfig and similars). +# -# You will not need to set this, usually. For default service it equals -# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME} +# Where your java installation lives +#JAVA_HOME="/usr/lib/jvm/java" + +# Where your tomcat installation lives #CATALINA_BASE="@@@TCHOME@@@" +#CATALINA_HOME="@@@TCHOME@@@" +#JASPER_HOME="@@@TCHOME@@@" +#CATALINA_TMPDIR="@@@TCTEMP@@@" + +# 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=@@@LIBDIR@@@" + +# What user should run tomcat +#TOMCAT_USER="tomcat" + +# 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 +#SHUTDOWN_WAIT="30" + +# Whether to annoy the user with "attempting to shut down" messages or not +#SHUTDOWN_VERBOSE="false" + +# Set the TOMCAT_PID location +#CATALINA_PID="/var/run/tomcat.pid" + +# Connector port is 8080 for this tomcat instance +#CONNECTOR_PORT="8080" + +# If you wish to further customize your tomcat environment, +# put your own definitions here +# (i.e. LD_LIBRARY_PATH for some jdbc drivers) -# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you -# can override. diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper index c97cb85..8d35a2f 100644 --- a/tomcat-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -1,24 +1,83 @@ #!/bin/bash -if [ "$1" = "version" ]; then - . /usr/libexec/tomcat/preamble - exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ - org.apache.catalina.util.ServerInfo +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 -SRV="tomcat" -if [ -n "$2" ]; then - SRV="tomcat@$2" +# 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 + +# Get instance specific config file +if [ -r "/etc/sysconfig/${NAME}" ]; then + . /etc/sysconfig/${NAME} +fi + +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 [ "$1" = "start" ]; then - systemctl start ${SRV}.service + ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ + -classpath "$CLASSPATH" \ + -Dcatalina.base="$CATALINA_BASE" \ + -Dcatalina.home="$CATALINA_HOME" \ + -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ + -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ + org.apache.catalina.startup.Bootstrap start \ + >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & + if [ ! -z "$CATALINA_PID" ]; then + echo $! > $CATALINA_PID + fi +elif [ "$1" = "start-security" ]; then + ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ + -classpath "$CLASSPATH" \ + -Dcatalina.base="$CATALINA_BASE" \ + -Dcatalina.home="$CATALINA_HOME" \ + -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + -Djava.security.manager \ + -Djava.security.policy=="${CATALINA_BASE}/conf/catalina.policy" \ + -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ + -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ + org.apache.catalina.startup.Bootstrap start \ + >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & + if [ ! -z "$CATALINA_PID" ]; then + echo $! > $CATALINA_PID + fi elif [ "$1" = "stop" ]; then - systemctl stop ${SRV}.service + ${JAVACMD} $JAVA_OPTS \ + -classpath "$CLASSPATH" \ + -Dcatalina.base="$CATALINA_BASE" \ + -Dcatalina.home="$CATALINA_HOME" \ + -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + org.apache.catalina.startup.Bootstrap stop \ + >> ${CATALINA_BASE}/logs/catalina.out 2>&1 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]" + echo "Usage: $0 {start|start-security|stop|version}" exit 1 fi diff --git a/tomcat-named.service b/tomcat-named.service deleted file mode 100644 index 9bbcb17..0000000 --- a/tomcat-named.service +++ /dev/null @@ -1,26 +0,0 @@ -# Systemd unit file for tomcat instances. -# -# To create clones of this service: -# 0. systemctl enable tomcat@name.service -# 1. create catalina.base directory structure in -# /var/lib/tomcats/name -# 2. profit. - -[Unit] -Description=Apache Tomcat Web Application Container -After=syslog.target network.target - -[Service] -Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf -Environment="NAME=%I" -EnvironmentFile=-/etc/sysconfig/tomcat@%I -ExecStart=/usr/libexec/tomcat/server start -ExecStop=/usr/libexec/tomcat/server stop -SuccessExitStatus=143 -User=tomcat -Group=tomcat - -[Install] -WantedBy=multi-user.target - diff --git a/tomcat-preamble b/tomcat-preamble deleted file mode 100644 index 9627522..0000000 --- a/tomcat-preamble +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -if [ -r /usr/share/java-utils/java-functions ]; then - . /usr/share/java-utils/java-functions -else - echo "Can't read Java functions library, aborting" - exit 1 -fi - -# 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 [ -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/tomcat-server b/tomcat-server deleted file mode 100644 index bd55999..0000000 --- a/tomcat-server +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -. /usr/libexec/tomcat/preamble - -MAIN_CLASS=org.apache.catalina.startup.Bootstrap - -FLAGS="$JAVA_OPTS $CATALINA_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 - 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/tomcat.spec b/tomcat.spec index fb9ef77..99d432d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 47 +%global micro_version 40 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -62,6 +62,7 @@ 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 +Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper Source5: %{name}-%{major_version}.%{minor_version}.logrotate @@ -76,12 +77,11 @@ Source13: jasper-el-OSGi-MANIFEST.MF Source14: jasper-OSGi-MANIFEST.MF Source15: tomcat-api-OSGi-MANIFEST.MF Source16: tomcat-juli-OSGi-MANIFEST.MF +Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service -Source30: tomcat-preamble -Source31: tomcat-server -Source32: tomcat-named.service + Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch @@ -109,7 +109,6 @@ Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool Requires: java >= 1:1.6.0 -Requires: jpackage-utils Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils @@ -153,6 +152,16 @@ Requires: jpackage-utils %description javadoc Javadoc generated documentation for Apache Tomcat. +%package systemv +Group: System Environment/Daemons +Summary: Systemv scripts for Apache Tomcat +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires(post): chkconfig +Requires(postun): chkconfig + +%description systemv +SystemV scripts to start and stop tomcat service + %package jsvc Group: System Environment/Daemons Summary: Apache jsvc wrapper for Apache Tomcat as separate service @@ -327,7 +336,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__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 @@ -349,16 +357,21 @@ popd -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} +%{__install} -m 0644 %{SOURCE2} \ + ${RPM_BUILD_ROOT}%{_initrddir}/%{name} %{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} %{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__install} -m 0644 %{SOURCE17} \ + ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd %{__install} -m 0644 %{SOURCE19} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc %{__install} -m 0644 %{SOURCE20} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service %{__install} -m 0644 %{SOURCE18} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd +%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ @@ -369,14 +382,6 @@ popd -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper - -%{__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 - # create jsp and servlet API symlinks pushd ${RPM_BUILD_ROOT}%{_javadir} %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar @@ -468,9 +473,6 @@ done # 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 "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet" -# replace temporary copy with link -%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/ - # two special pom where jar files have different names %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom %add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar @@ -487,6 +489,9 @@ done %{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar +# replace temporary copy with link +%{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/ + mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf </dev/null 2>&1 + /sbin/chkconfig --del %{name} + %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir}/* %{tempdir}/* @@ -554,10 +567,7 @@ fi %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) %{_libexecdir}/%{name}/preamble -%attr(0755,root,root) %{_libexecdir}/%{name}/server +%attr(0755,root,root) %{_sbindir}/%{name}-sysd %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(0755,root,tomcat) %dir %{basedir} @@ -654,6 +664,11 @@ fi %{appdir}/examples %{appdir}/sample +%files systemv +%defattr(755,root,root,0755) +%{_sbindir}/d%{name} +%{_initrddir}/%{name} + %files jsvc %defattr(755,root,root,0755) %{_sbindir}/%{name}-jsvc @@ -661,33 +676,6 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 -- Fix installation of Maven metadata for tomcat-juli.jar -- Resolves: rhbz#1033664 - -* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2 -- Rebuild for bug #1033664 - -* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 -- Updated to 7.0.47 -- Fix java.security.policy - -* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2 -- Remove jpackage-utils R - -* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 -- Updated to 7.0.42 - -* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3 -- Dropped systemv inits. Bye-bye. -- Updated the systemd wrappers to allow running multiple instances. - Added wrapper scripts to do that, ported the original non-named - service file to work with the same wrappers, updated - /usr/sbin/tomcat to call systemctl. - * Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 - Updated to 7.0.40 - Resolves: rhbz 956569 added missing commons-pool link From 2f93af69c5f97f768680121f41d4545ac9ffe2c6 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Tue, 18 Feb 2014 11:17:37 +0300 Subject: [PATCH 011/354] Typo in Source0 fixed --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 5ed29db..dfadf41 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{js Group: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: http://www.archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source0: http://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig From 0e914b1053935e8ba584779a4794d2de777e1dc1 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Thu, 20 Feb 2014 10:28:35 +0400 Subject: [PATCH 012/354] Typo in date fixed --- tomcat.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 2f23497..d065aa4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -620,7 +620,7 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Thu Feb 12 2014 Vlad Slepukhin 0:7.0.33-1 +* Thu Feb 20 2014 Vlad Slepukhin 0:7.0.33-1 - Rebuilded for EL6 compatibility - Removed systemd for compatibility - As no systemd used, systemv moved back to tomcat package @@ -642,7 +642,6 @@ fi * Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 - Updated to 7.0.40 - Resolves: rhbz 956569 added missing commons-pool link -- Remove ant-nodeps BR * Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 - Add depmaps for org.eclipse.jetty.orbit From c091d4485f96517fea2a51e73d97f02f662a434e Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Tue, 25 Feb 2014 10:45:01 +0400 Subject: [PATCH 013/354] added platform restriction due to obligatory java >=1.6 --- tomcat.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index d065aa4..0d5a52a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -82,6 +82,8 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat BuildArch: noarch +ExclusiveArch: x86_64 i686 + BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ant-trax @@ -620,6 +622,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Mon Feb 24 2014 Vlad Slepukhin 0:7.0.33-2 +- Restrctied to x86_64 and i686 platforms as now requires java 1.6 or later for building and running + * Thu Feb 20 2014 Vlad Slepukhin 0:7.0.33-1 - Rebuilded for EL6 compatibility - Removed systemd for compatibility From a6c97575bfc1953214bb93d4e910583925e66e05 Mon Sep 17 00:00:00 2001 From: Vlad Slepukhin Date: Wed, 26 Feb 2014 14:24:03 +0400 Subject: [PATCH 014/354] changing ExclusiveArch to ExcludeArch because of bug --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 0d5a52a..2919271 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -82,7 +82,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat BuildArch: noarch -ExclusiveArch: x86_64 i686 +ExcludeArch: ppc64 BuildRequires: ant BuildRequires: ant-nodeps @@ -622,6 +622,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Feb 26 2014 Vlad Slepukhin 0:7.0.33-3 +- Changed ExclusiveArch to ExcludeArch due to bug appearing during build with this parameter + * Mon Feb 24 2014 Vlad Slepukhin 0:7.0.33-2 - Restrctied to x86_64 and i686 platforms as now requires java 1.6 or later for building and running From cee7beed0a207ae3e82b9ee9bb31df300b86b760 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Wed, 26 Mar 2014 03:34:21 +0400 Subject: [PATCH 015/354] Updated to 7.0.52 - Rewrite jsvc implementation, resolves: rhbz#1051743 - Switch to java-headless R, resolves: rhbz#1068566 - Create and own %{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 - Add pom for tomcat-jdbc, resolves: rhbz#1011003 --- sources | 2 +- tomcat-7.0-jsvc.service | 8 ++- tomcat-7.0-jsvc.wrapper | 83 -------------------------- tomcat-7.0-tomcat-jsvc-sysd | 113 ------------------------------------ tomcat-functions | 42 ++++++++++++++ tomcat-preamble | 8 +-- tomcat.spec | 35 +++++++---- 7 files changed, 72 insertions(+), 219 deletions(-) delete mode 100644 tomcat-7.0-jsvc.wrapper delete mode 100644 tomcat-7.0-tomcat-jsvc-sysd create mode 100644 tomcat-functions diff --git a/sources b/sources index 2bb650f..7b1d1be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz +1b85c08721ab9d891b72ca35cd4a0e2d apache-tomcat-7.0.52-src.tar.gz diff --git a/tomcat-7.0-jsvc.service b/tomcat-7.0-jsvc.service index 3792cef..8275796 100644 --- a/tomcat-7.0-jsvc.service +++ b/tomcat-7.0-jsvc.service @@ -11,9 +11,11 @@ Description=Apache Tomcat Web Application Container JSVC wrapper After=syslog.target network.target [Service] -Type=forking -ExecStart=/usr/sbin/tomcat-jsvc-sysd start -ExecStop=/usr/sbin/tomcat-jsvc-sysd stop +Type=simple +EnvironmentFile=/etc/tomcat/tomcat.conf +Environment="NAME=" "USE_JSVC=true" +ExecStart=/usr/libexec/tomcat/server start +ExecStop=/usr/libexec/tomcat/server stop [Install] WantedBy=multi-user.target diff --git a/tomcat-7.0-jsvc.wrapper b/tomcat-7.0-jsvc.wrapper deleted file mode 100644 index 56fcc09..0000000 --- a/tomcat-7.0-jsvc.wrapper +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -if [ -r /usr/share/java-utils/java-functions ]; then - . /usr/share/java-utils/java-functions -else - echo "Can't read Java functions library, aborting" - exit 1 -fi - -# 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" -CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" - -# if jsvc installed and USE_JSVC=true -# then use jsvc instead of calling java directly -if [ -x /usr/bin/jsvc ]; then - JAVACMD="/usr/bin/jsvc -nodetach -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out" - if [ "$1" = "stop" ]; then - JAVACMD="${JAVACMD} -stop" - fi -fi - -if [ "$1" = "start" ]; then - ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ - -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ - -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ - org.apache.catalina.startup.Bootstrap start \ - >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID - fi -elif [ "$1" = "start-security" ]; then - ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ - -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - -Djava.security.manager \ - -Djava.security.policy=="${CATALINA_BASE}/conf/catalina.policy" \ - -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ - -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ - org.apache.catalina.startup.Bootstrap start \ - >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID - fi -elif [ "$1" = "stop" ]; then - ${JAVACMD} $JAVA_OPTS \ - -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - org.apache.catalina.startup.Bootstrap stop \ - >> ${CATALINA_BASE}/logs/catalina.out 2>&1 -elif [ "$1" = "version" ]; then - ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ - org.apache.catalina.util.ServerInfo -else - echo "Usage: $0 {start|start-security|stop|version}" - exit 1 -fi diff --git a/tomcat-7.0-tomcat-jsvc-sysd b/tomcat-7.0-tomcat-jsvc-sysd deleted file mode 100644 index 9134d5b..0000000 --- a/tomcat-7.0-tomcat-jsvc-sysd +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# -# This script provides systemd activation of the tomcat service -# To create clones of this service: -# 1) SERVICE_NAME must be defined before calling this script -# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat -# to override tomcat defaults - -# SERVICE_NAME is a required value only if the service name is -# different from 'tomcat' -# -NAME="${SERVICE_NAME:-tomcat}" - -#I'll bet this isn't required. -# unset ISBOOT - -# For SELinux we need to use 'runuser' not 'su' -if [ -x "/sbin/runuser" ]; then - SU="/sbin/runuser -s /bin/sh" -else - SU="/bin/su -s /bin/sh" -fi - -# Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat-jsvc" - -# Define the tomcat username -TOMCAT_USER="${TOMCAT_USER:-tomcat}" - -# TOMCAT_LOG should be different from catalina.out. -# Usually the below config is all that is necessary -TOMCAT_LOG=/var/log/${NAME}/${NAME}-sysd.log - -# Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat/tomcat.conf" -if [ -r "$TOMCAT_CFG" ]; then - . $TOMCAT_CFG -fi - -# Get instance specific config file -if [ -r "/etc/sysconfig/${NAME}" ]; then - . /etc/sysconfig/${NAME} -fi - -function parseOptions() { - options="" - options="$options $( - awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \ - $TOMCAT_CFG - )" - if [ -r "/etc/sysconfig/${NAME}" ]; then - options="$options $( - awk '!/^#/ && !/^$/ { ORS=" "; - print "export ", $0, ";" }' \ - /etc/sysconfig/${NAME} - )" - fi - TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" -} - -# See how we were called. -function start() { - # fix permissions on the log and pid files - export CATALINA_PID="/var/run/${NAME}.pid" - touch $CATALINA_PID 2>&1 - if [ "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID - fi - - touch $TOMCAT_LOG 2>&1 - if [ "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG - fi - - # if jsvc installed and USE_JSVC=true - # then start as root and use jsvc to drop privileges - if [ -x /usr/bin/jsvc ]; then - TOMCAT_USER="root" - fi - - parseOptions - if [ "$SECURITY_MANAGER" = "true" ]; then - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" >> $TOMCAT_LOG 2>&1 - else - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 - fi -} - -function stop() { - # if jsvc installed and USE_JSVC=true - # then start as root and use jsvc to drop privileges - if [ -x /usr/bin/jsvc ]; then - TOMCAT_USER="root" - fi - - parseOptions - $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; -esac - diff --git a/tomcat-functions b/tomcat-functions new file mode 100644 index 0000000..6f03951 --- /dev/null +++ b/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" + 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/tomcat-preamble b/tomcat-preamble index 9627522..0079a8c 100644 --- a/tomcat-preamble +++ b/tomcat-preamble @@ -1,11 +1,6 @@ #!/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 +. /usr/libexec/tomcat/functions # Get the tomcat config (use this for environment specific settings) @@ -26,7 +21,6 @@ if [ -z "$CATALINA_BASE" ]; then CATALINA_BASE="${CATALINA_HOME}" fi fi - VERBOSE=1 set_javacmd cd ${CATALINA_HOME} diff --git a/tomcat.spec b/tomcat.spec index fb9ef77..03d6e53 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 47 +%global micro_version 52 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -76,9 +76,8 @@ Source13: jasper-el-OSGi-MANIFEST.MF Source14: jasper-OSGi-MANIFEST.MF Source15: tomcat-api-OSGi-MANIFEST.MF Source16: tomcat-juli-OSGi-MANIFEST.MF -Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd -Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service +Source21: tomcat-functions Source30: tomcat-preamble Source31: tomcat-server Source32: tomcat-named.service @@ -108,7 +107,7 @@ Requires: apache-commons-logging Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool -Requires: java >= 1:1.6.0 +Requires: java-headless >= 1:1.6.0 Requires: jpackage-utils Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} @@ -160,7 +159,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: apache-commons-daemon-jsvc %description jsvc -Systemd service and wrapper scripts to start tomcat with jsvc, +Systemd service 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. @@ -263,6 +262,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Djava.7.home=%{java_home} \ deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later @@ -321,6 +321,7 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir} /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/run +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats /bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}.pid /bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} @@ -353,12 +354,8 @@ popd ${RPM_BUILD_ROOT}%{_sbindir}/%{name} %{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__install} -m 0644 %{SOURCE19} \ - ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc %{__install} -m 0644 %{SOURCE20} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service -%{__install} -m 0644 %{SOURCE18} \ - ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ @@ -370,6 +367,8 @@ popd -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} \ @@ -487,6 +486,9 @@ done %{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar +%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom +%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar + mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf < 0:7.0.52-1 +- Updated to 7.0.52 +- Rewrite jsvc implementation, resolves: rhbz#1051743 +- Switch to java-headless R, resolves: rhbz#1068566 +- Create and own %{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 +- Add pom for tomcat-jdbc, resolves: rhbz#1011003 + * Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 - Fix installation of Maven metadata for tomcat-juli.jar - Resolves: rhbz#1033664 From e4eaf9df8e62b04dc5ed2a35c49dce4529d1a7f6 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Fri, 28 Mar 2014 02:46:09 +0400 Subject: [PATCH 016/354] Revert "Removed log4j sub-package with bundled log4j (replaced by system symlink)" This reverts commit 5746174c039169deb2a1032b2b03bada4dc77f75. Conflicts: tomcat6.spec --- tomcat.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 03d6e53..3715583 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -175,6 +175,13 @@ Requires(postun): chkconfig %description jsp-%{jspspec}-api Apache Tomcat JSP API implementation classes. +%package log4j +Group: Applications/Internet +Summary: Log4j support for Apache Tomcat +Requires: log4j + +%description log4j +Log4j support for Apache Tomcat %package lib Group: Development/Libraries @@ -596,6 +603,8 @@ fi %{homedir}/logs %{homedir}/conf +%exclude %{confdir}/log4j.properties + %files admin-webapps %defattr(0664,root,tomcat,0755) %{appdir}/host-manager @@ -616,6 +625,11 @@ fi %{_mavenpomdir}/JPP-%{name}-jsp-api.pom %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api +%files log4j +%defattr(0664,root,tomcat,0755) +%config(noreplace) %{confdir}/log4j.properties +%{libdir}/log4j.jar + %files lib %defattr(-,root,root,-) %{libdir} @@ -635,6 +649,7 @@ fi %exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{libdir}/log4j.jar %files servlet-%{servletspec}-api %defattr(-,root,root,-) From 4bbbd3e6c6fd9d8cc7e0168a17a9a0333e337672 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 31 Mar 2014 00:10:23 +0400 Subject: [PATCH 017/354] Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 --- tomcat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 3715583..1c06b1e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -463,7 +463,7 @@ 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 ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom -%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp" +%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom %add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el" @@ -680,6 +680,10 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 +- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 +- Move log4j support into subpackage, resolves: rhbz#1027716 + * Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1 - Updated to 7.0.52 - Rewrite jsvc implementation, resolves: rhbz#1051743 From 9661f8da0d7e82b63ef65ebe467e0eb103ae624f Mon Sep 17 00:00:00 2001 From: Vlad Selpukhin Date: Thu, 1 May 2014 00:11:18 +0400 Subject: [PATCH 018/354] fixed bug 1080195 --- tomcat-7.0.wrapper | 5 ----- tomcat.spec | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper index 820c622..d6db6e8 100644 --- a/tomcat-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -16,11 +16,6 @@ if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi -# Get instance specific config file -if [ -r "/etc/sysconfig/${NAME}" ]; then - . /etc/sysconfig/${NAME} -fi - set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then diff --git a/tomcat.spec b/tomcat.spec index 2919271..67431be 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -527,7 +527,7 @@ fi %attr(0755,root,tomcat) %dir %{basedir} %attr(0755,root,tomcat) %dir %{confdir} %defattr(0664,root,tomcat,0770) -%attr(0644,root,tomcat) %dir %{logdir} +%attr(0770,root,tomcat) %dir %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -622,6 +622,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue Apr 29 2014 Vlad Slepukhin 0:7.0.33-4 +- Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory +- Removed residual systemd configuration from the wrapper + * Wed Feb 26 2014 Vlad Slepukhin 0:7.0.33-3 - Changed ExclusiveArch to ExcludeArch due to bug appearing during build with this parameter From 7290014b82f31331b44e6483eeaeabf47e14536e Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 21 May 2014 15:16:36 +0300 Subject: [PATCH 019/354] Drop servlet/el api provides to reduce user machines ending with both. --- tomcat.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 1c06b1e..e4a3844 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -466,13 +466,13 @@ done %add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el" +%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el" %{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_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 "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet" +%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet" # replace temporary copy with link %{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/ @@ -680,6 +680,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 +- Drop servlet/el api provides to reduce user machines ending with both. + * Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 - Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 - Move log4j support into subpackage, resolves: rhbz#1027716 From b5a9b72e6c8c09e80d32ca2208628123b49c51d7 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 5 Jun 2014 11:29:46 +0300 Subject: [PATCH 020/354] Update to upstream 7.0.54 - fixes compile with Java 8. --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7b1d1be..156bd93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b85c08721ab9d891b72ca35cd4a0e2d apache-tomcat-7.0.52-src.tar.gz +bb0c079d6a16466cc70dba07754c9ee6 apache-tomcat-7.0.54-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index e4a3844..a7baecf 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 52 +%global micro_version 54 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -680,6 +680,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 +- Update to upstream 7.0.54 - fixes compile with Java 8. + * Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 - Drop servlet/el api provides to reduce user machines ending with both. From 995a509b8844f5cef62d0c0b212959b540ad8e71 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 5 Jun 2014 15:29:45 +0300 Subject: [PATCH 021/354] Fix compile with xmvn 2.0. --- tomcat.spec | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index a7baecf..9f00fe4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -458,7 +458,7 @@ done # we won't install dbcp, juli-adapters and juli-extras pom files for libname in annotations-api catalina jasper-el jasper catalina-ha; do %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom - %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar + %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib" done # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere @@ -556,7 +556,7 @@ fi /sbin/chkconfig --del tomcat > /dev/null 2>&1 || : /bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || : -%files +%files %defattr(0664,root,tomcat,0755) %doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest @@ -618,23 +618,19 @@ fi %defattr(-,root,root,-) %{_javadocdir}/%{name} -%files jsp-%{jspspec}-api +%files jsp-%{jspspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-jsp-api %defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar -%{_javadir}/%{name}-jsp-api.jar -%{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api %files log4j %defattr(0664,root,tomcat,0755) %config(noreplace) %{confdir}/log4j.properties %{libdir}/log4j.jar -%files lib +%files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib %defattr(-,root,root,-) %{libdir} %{bindir}/tomcat-juli.jar -%{_mavendepmapfragdir}/%{name} %{_mavenpomdir}/JPP.%{name}-annotations-api.pom %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom @@ -646,28 +642,20 @@ fi %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom - - +%{_datadir}/maven-metadata/tomcat.xml %exclude %{libdir}/%{name}-el-%{elspec}-api.jar %exclude %{libdir}/log4j.jar -%files servlet-%{servletspec}-api +%files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api %defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar -%{_javadir}/%{name}-servlet-api.jar -%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api -%{_mavenpomdir}/JPP-%{name}-servlet-api.pom -%files el-%{elspec}-api +%files el-%{elspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-el-api %defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar -%{_javadir}/%{name}-el-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar -%{_mavenpomdir}/JPP-%{name}-el-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-el-api - %files webapps %defattr(0644,tomcat,tomcat,0755) From 084db1837c1dc8153510f4e51d544f8c2a720d7c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:44:23 -0500 Subject: [PATCH 022/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 9f00fe4..1f5d211 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -668,6 +668,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 - Update to upstream 7.0.54 - fixes compile with Java 8. From be711a2ff6efc98e2fc8ce27b4ad75dbf449b212 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 16 Jun 2014 10:24:24 +0200 Subject: [PATCH 023/354] jsp-api requires el-api Signed-off-by: Mikolaj Izdebski --- tomcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 1f5d211..d9de221 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -169,6 +169,7 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig Requires(postun): chkconfig @@ -668,6 +669,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 +- jsp-api requires el-api + * Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 53dd1361b3ab4535e39dae014a53eb7b56627f24 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Sun, 21 Sep 2014 04:11:01 +0400 Subject: [PATCH 024/354] Updated to 8.0.12 Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 Use CATALINA_OPTS only on start, resolves: rhbz#1051194 --- ... => tomcat-8.0-bootstrap-MANIFEST.MF.patch | 0 ...-digest.script => tomcat-8.0-digest.script | 0 ....0-jsvc.service => tomcat-8.0-jsvc.service | 0 ....properties => tomcat-8.0-log4j.properties | 0 ...ch => tomcat-8.0-tomcat-users-webapp.patch | 0 ...r.script => tomcat-8.0-tool-wrapper.script | 0 tomcat-7.0.conf => tomcat-8.0.conf | 0 tomcat-7.0.logrotate => tomcat-8.0.logrotate | 0 tomcat-7.0.service => tomcat-8.0.service | 0 tomcat-7.0.sysconfig => tomcat-8.0.sysconfig | 0 tomcat-7.0.wrapper => tomcat-8.0.wrapper | 0 tomcat-server | 3 +- tomcat.spec | 47 +++++++++++++------ 13 files changed, 35 insertions(+), 15 deletions(-) rename tomcat-7.0-bootstrap-MANIFEST.MF.patch => tomcat-8.0-bootstrap-MANIFEST.MF.patch (100%) rename tomcat-7.0-digest.script => tomcat-8.0-digest.script (100%) rename tomcat-7.0-jsvc.service => tomcat-8.0-jsvc.service (100%) rename tomcat-7.0-log4j.properties => tomcat-8.0-log4j.properties (100%) rename tomcat-7.0-tomcat-users-webapp.patch => tomcat-8.0-tomcat-users-webapp.patch (100%) rename tomcat-7.0-tool-wrapper.script => tomcat-8.0-tool-wrapper.script (100%) rename tomcat-7.0.conf => tomcat-8.0.conf (100%) rename tomcat-7.0.logrotate => tomcat-8.0.logrotate (100%) rename tomcat-7.0.service => tomcat-8.0.service (100%) rename tomcat-7.0.sysconfig => tomcat-8.0.sysconfig (100%) rename tomcat-7.0.wrapper => tomcat-8.0.wrapper (100%) diff --git a/tomcat-7.0-bootstrap-MANIFEST.MF.patch b/tomcat-8.0-bootstrap-MANIFEST.MF.patch similarity index 100% rename from tomcat-7.0-bootstrap-MANIFEST.MF.patch rename to tomcat-8.0-bootstrap-MANIFEST.MF.patch diff --git a/tomcat-7.0-digest.script b/tomcat-8.0-digest.script similarity index 100% rename from tomcat-7.0-digest.script rename to tomcat-8.0-digest.script diff --git a/tomcat-7.0-jsvc.service b/tomcat-8.0-jsvc.service similarity index 100% rename from tomcat-7.0-jsvc.service rename to tomcat-8.0-jsvc.service diff --git a/tomcat-7.0-log4j.properties b/tomcat-8.0-log4j.properties similarity index 100% rename from tomcat-7.0-log4j.properties rename to tomcat-8.0-log4j.properties diff --git a/tomcat-7.0-tomcat-users-webapp.patch b/tomcat-8.0-tomcat-users-webapp.patch similarity index 100% rename from tomcat-7.0-tomcat-users-webapp.patch rename to tomcat-8.0-tomcat-users-webapp.patch diff --git a/tomcat-7.0-tool-wrapper.script b/tomcat-8.0-tool-wrapper.script similarity index 100% rename from tomcat-7.0-tool-wrapper.script rename to tomcat-8.0-tool-wrapper.script diff --git a/tomcat-7.0.conf b/tomcat-8.0.conf similarity index 100% rename from tomcat-7.0.conf rename to tomcat-8.0.conf diff --git a/tomcat-7.0.logrotate b/tomcat-8.0.logrotate similarity index 100% rename from tomcat-7.0.logrotate rename to tomcat-8.0.logrotate diff --git a/tomcat-7.0.service b/tomcat-8.0.service similarity index 100% rename from tomcat-7.0.service rename to tomcat-8.0.service diff --git a/tomcat-7.0.sysconfig b/tomcat-8.0.sysconfig similarity index 100% rename from tomcat-7.0.sysconfig rename to tomcat-8.0.sysconfig diff --git a/tomcat-7.0.wrapper b/tomcat-8.0.wrapper similarity index 100% rename from tomcat-7.0.wrapper rename to tomcat-8.0.wrapper diff --git a/tomcat-server b/tomcat-server index bd55999..951b3ee 100644 --- a/tomcat-server +++ b/tomcat-server @@ -4,7 +4,7 @@ MAIN_CLASS=org.apache.catalina.startup.Bootstrap -FLAGS="$JAVA_OPTS $CATALINA_OPTS" +FLAGS="$JAVA_OPTS" OPTIONS="-Dcatalina.base=$CATALINA_BASE \ -Dcatalina.home=$CATALINA_HOME \ -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \ @@ -14,6 +14,7 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \ if [ "$1" = "start" ] ; then if [ "${SECURITY_MANAGER}" = "true" ] ; then + FLAGS="${FLAGS} $CATALINA_OPTS" OPTIONS="${OPTIONS} \ -Djava.security.manager \ -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy" diff --git a/tomcat.spec b/tomcat.spec index d9de221..a0a96bb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -28,13 +28,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%global jspspec 2.2 -%global major_version 7 +%global jspspec 2.3 +%global major_version 8 %global minor_version 0 -%global micro_version 54 +%global micro_version 12 %global packdname apache-tomcat-%{version}-src -%global servletspec 3.0 -%global elspec 2.2 +%global servletspec 3.1 +%global elspec 3.0 %global tcuid 91 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -88,7 +88,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat BuildArch: noarch BuildRequires: ant -BuildRequires: ecj >= 1:4.2.1 +BuildRequires: ecj >= 1:4.4.0 BuildRequires: findutils BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon @@ -168,6 +168,8 @@ Group: Development/Libraries Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 +Provides: %{name}-jsp-2.2-api +Obsoletes: %{name}-jsp-2.2-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig @@ -205,6 +207,8 @@ Summary: Apache Tomcat Servlet API implementation classes Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet3 +Provides: %{name}-servlet-3.0-api +Obsoletes: %{name}-servlet-3.0-api Requires(post): chkconfig Requires(postun): chkconfig @@ -213,14 +217,16 @@ Apache Tomcat Servlet API implementation classes. %package el-%{elspec}-api Group: Development/Libraries -Summary: Expression Language v1.0 API +Summary: Expression Language v%{elspec} API Provides: el_1_0_api = %{epoch}:%{version}-%{release} Provides: el_api = %{elspec} +Provides: %{name}-el-2.2-api +Obsoletes: %{name}-el-2.2-api Requires(post): chkconfig Requires(postun): chkconfig %description el-%{elspec}-api -Expression Language 1.0. +Expression Language %{elspec}. %package webapps Group: Applications/Internet @@ -250,6 +256,8 @@ export OPT_JAR_LIST="xalan-j2-serializer" touch HACK %{__mkdir_p} HACKDIR touch HACKDIR/build.xml + touch HACKDIR/LICENSE + # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ @@ -258,9 +266,9 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ + -Dtomcat-native.win.path="HACKDIR" \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ @@ -275,8 +283,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ - output/build/lib/ecj.jar \ - output/build/lib/apache-commons-dbcp.jar + output/build/lib/ecj.jar # remove the cruft we created %{__rm} output/build/bin/tomcat-native.tar.gz @@ -384,6 +391,13 @@ popd %{__install} -m 0644 %{SOURCE32} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service +# 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 @@ -467,7 +481,7 @@ done %add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el" +%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el,javax.el:el-api" %{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom # Generate a depmap fragment javax.servlet:servlet-api pointing to @@ -643,7 +657,7 @@ fi %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom -%{_datadir}/maven-metadata/tomcat.xml +%{_datadir}/maven-fragments/%{name} %exclude %{libdir}/%{name}-el-%{elspec}-api.jar %exclude %{libdir}/log4j.jar @@ -669,6 +683,11 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 +- Updated to 8.0.12 +- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 +- Use CATALINA_OPTS only on start, resolves: rhbz#1051194 + * Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 - jsp-api requires el-api From 1001f00e0ddfa70cfd4d67c426884343b03fe9c1 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 16 Feb 2015 00:43:27 +0300 Subject: [PATCH 025/354] Updated to 8.0.18 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 156bd93..f4fa4f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb0c079d6a16466cc70dba07754c9ee6 apache-tomcat-7.0.54-src.tar.gz +a57119b64a853c796de6b319effae632 apache-tomcat-8.0.18-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index a0a96bb..9d68f44 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 12 +%global micro_version 18 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -657,7 +657,7 @@ fi %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom -%{_datadir}/maven-fragments/%{name} +%{_datadir}/maven-metadata/tomcat.xml %exclude %{libdir}/%{name}-el-%{elspec}-api.jar %exclude %{libdir}/log4j.jar @@ -683,6 +683,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 +- Updated to 8.0.18 + * Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 - Updated to 8.0.12 - Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 From d6cc435f664371605534c3a7415b458b89121c18 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 16 Feb 2015 15:50:26 +0100 Subject: [PATCH 026/354] Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 9d68f44..c65713a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -471,7 +471,7 @@ for pom in *.pom; do done # we won't install dbcp, juli-adapters and juli-extras pom files -for libname in annotations-api catalina jasper-el jasper catalina-ha; do +for libname in annotations-api catalina jasper-el jasper catalina-ha util-scan jni; do %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib" done @@ -683,6 +683,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 +- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + * Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 - Updated to 8.0.18 From bdf0d75b2e44f06ab2a7dd7b92ea837107209d3e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 3 Mar 2015 15:20:56 -0500 Subject: [PATCH 027/354] Bump epoch to maintain upgrade path from Fedora 22 --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index c65713a..718ce94 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -52,9 +52,9 @@ %global _systemddir /lib/systemd/system Name: tomcat -Epoch: 0 +Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -683,6 +683,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 +- Bump epoch to maintain upgrade path from Fedora 22 + * Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 - Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} From a7f5683fd0bbfcb59f4c8f2ae99f9be8fdd9eee7 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 4 Mar 2015 08:33:30 +0200 Subject: [PATCH 028/354] Drop old provides. --- tomcat.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 718ce94..82c11ca 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -167,8 +167,6 @@ which allows tomcat to perform some privileged operations Group: Development/Libraries Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} -Provides: jsp22 -Provides: %{name}-jsp-2.2-api Obsoletes: %{name}-jsp-2.2-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -207,7 +205,6 @@ Summary: Apache Tomcat Servlet API implementation classes Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet3 -Provides: %{name}-servlet-3.0-api Obsoletes: %{name}-servlet-3.0-api Requires(post): chkconfig Requires(postun): chkconfig @@ -218,9 +215,7 @@ Apache Tomcat Servlet API implementation classes. %package el-%{elspec}-api Group: Development/Libraries Summary: Expression Language v%{elspec} API -Provides: el_1_0_api = %{epoch}:%{version}-%{release} Provides: el_api = %{elspec} -Provides: %{name}-el-2.2-api Obsoletes: %{name}-el-2.2-api Requires(post): chkconfig Requires(postun): chkconfig @@ -683,6 +678,10 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 +- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. +- Drop old provides. + * Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 - Bump epoch to maintain upgrade path from Fedora 22 From 07e2fb497b2d21c5ba850d60fcbcc68470f7f030 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 5 Mar 2015 21:46:43 +0200 Subject: [PATCH 029/354] Rebuild against tomcat-taglibs-standard. --- tomcat.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 82c11ca..4abe4d7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -94,7 +94,7 @@ BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-pool -BuildRequires: jakarta-taglibs-standard +BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit @@ -227,7 +227,7 @@ Expression Language %{elspec}. Group: Applications/Internet Summary: The ROOT and examples web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jakarta-taglibs-standard >= 0:1.1 +Requires: tomcat-taglibs-standard >= 0:1.1 %description webapps The ROOT and examples web applications for Apache Tomcat. @@ -240,8 +240,8 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 -%{__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 +%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar +%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar %build export OPT_JAR_LIST="xalan-j2-serializer" @@ -409,7 +409,7 @@ pushd output/build # 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 + tomcat-taglibs-standard/taglibs-standard-impl.jar tomcat-taglibs-standard/taglibs-standard-compat.jar 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -452,8 +452,8 @@ echo ''>>context.xml popd pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib -%{__ln_s} -f $(build-classpath jakarta-taglibs-core) jstl.jar -%{__ln_s} -f $(build-classpath jakarta-taglibs-standard) standard.jar +%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) jstl.jar +%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) standard.jar popd @@ -678,6 +678,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 +- Rebuild against tomcat-taglibs-standard. + * Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 - Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. - Drop old provides. From c2e91f9ffc469f42c55530f85b0a77819b49daea Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 6 Mar 2015 12:01:37 +0200 Subject: [PATCH 030/354] Update to tomcat 8.0.20. --- sources | 2 +- tomcat.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f4fa4f5..86d2311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a57119b64a853c796de6b319effae632 apache-tomcat-8.0.18-src.tar.gz +6006e1de147f2e71668fba49238fdd8a apache-tomcat-8.0.20-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 4abe4d7..5dfb5e3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 18 +%global micro_version 20 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons From 62f8d6a9131da0b9fed43affd58e3f16c4e995bd Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 10 Jun 2015 07:49:59 +0200 Subject: [PATCH 031/354] Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} --- tomcat.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 5dfb5e3..e9e6882 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -466,11 +466,19 @@ for pom in *.pom; do done # we won't install dbcp, juli-adapters and juli-extras pom files -for libname in annotations-api catalina jasper-el jasper catalina-ha util-scan jni; do +for libname in annotations-api catalina jasper-el jasper catalina-ha; do %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib" done +# tomcat-util-scan +%{__cp} -a %{name}-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-util-scan.pom +%add_maven_depmap JPP.%{name}-util-scan.pom %{name}/%{name}-util-scan.jar -f "tomcat-lib" + +# tomcat-jni +%{__cp} -a %{name}-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jni.pom +%add_maven_depmap JPP.%{name}-jni.pom %{name}/%{name}-jni.jar -f "tomcat-lib" + # 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 ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom %add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" @@ -678,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 +- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + * Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 - Rebuild against tomcat-taglibs-standard. From a599bc57f39e7724aef4ec50780b552f473db8a6 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 18 Jun 2015 14:54:27 +0300 Subject: [PATCH 032/354] Drop jetty alias for servlet. XMvn ignores duplicate provides so better to drop the jetty alias. --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index e9e6882..491bed6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -490,7 +490,7 @@ done # 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 "tomcat-servlet-api" -a "org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet" +%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" # replace temporary copy with link %{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/ @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 +- Drop jetty alias for servlet. + * Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 - Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} From b2dda770528f619f0dd07b78b756f5546a5150c1 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 18 Jun 2015 15:28:42 +0300 Subject: [PATCH 033/354] Update to 8.0.23. --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 86d2311..36d85f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6006e1de147f2e71668fba49238fdd8a apache-tomcat-8.0.20-src.tar.gz +f357c13b1e45cef40627ca995c0796e6 apache-tomcat-8.0.23-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 491bed6..bb5ccd9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 20 +%global micro_version 23 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 +- Update to 8.0.23. + * Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 - Drop jetty alias for servlet. From 6d77b875509642900905e50812d3e912c704b1d8 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 19 Jun 2015 19:36:40 +0300 Subject: [PATCH 034/354] Drop javax.el:el-api alias. XMvn ignores duplicated provides and glassfish-el-api provides it too but has fewer deps so is better match for default. --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index bb5ccd9..24daeeb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -484,7 +484,7 @@ done %add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el,javax.el:el-api" +%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el" %{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom # Generate a depmap fragment javax.servlet:servlet-api pointing to @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 +- Drop javax.el:el-api alias. + * Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 - Update to 8.0.23. From 3a20f845cd0c7af7d5871ee7ddf3fc4e45d014da Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 10 Jul 2015 11:07:03 +0300 Subject: [PATCH 035/354] Update to 8.0.24. --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 36d85f8..9e1f56d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f357c13b1e45cef40627ca995c0796e6 apache-tomcat-8.0.23-src.tar.gz +1184955015a2290252f0ec9495640b23 apache-tomcat-8.0.24-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 24daeeb..b052f87 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 23 +%global micro_version 24 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 +- Update to 8.0.24. + * Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 - Drop javax.el:el-api alias. From 872c4690973ad6c3322b8694ed103bbd65f8d7e9 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 27 Aug 2015 10:57:42 +0300 Subject: [PATCH 036/354] Update to 8.0.26. --- jasper-OSGi-MANIFEST.MF | 22 +++++++++++----------- jasper-el-OSGi-MANIFEST.MF | 2 +- sources | 2 +- tomcat-api-OSGi-MANIFEST.MF | 4 ++-- tomcat-juli-OSGi-MANIFEST.MF | 6 +++--- tomcat.spec | 7 +++++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/jasper-OSGi-MANIFEST.MF b/jasper-OSGi-MANIFEST.MF index 9a3d98a..ad34978 100644 --- a/jasper-OSGi-MANIFEST.MF +++ b/jasper-OSGi-MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 -Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c - ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version - ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas - per.runtime;version="7.0.21",org.apache.jasper.security;version="7.0. - 19",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp - lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v - ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja - sper.xmlparser;version="7.0.21" +Export-Package: org.apache.jasper;version="8.0.26",org.apache.jasper.c + ompiler;version="8.0.26",org.apache.jasper.compiler.tagplugin;version + ="8.0.26",org.apache.jasper.resources;version="8.0.26",org.apache.jas + per.runtime;version="8.0.26",org.apache.jasper.security;version="7.0. + 19",org.apache.jasper.servlet;version="8.0.26",org.apache.jasper.tagp + lugins.jstl;version="8.0.26",org.apache.jasper.tagplugins.jstl.core;v + ersion="8.0.26",org.apache.jasper.util;version="8.0.26",org.apache.ja + sper.xmlparser;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Localization: plugin Bundle-Name: %bundleName Bundle-ManifestVersion: 2 @@ -24,8 +24,8 @@ Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util; resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml. - sax.helpers,org.apache.tomcat;version="7.0.21",org.apache.juli.loggin - g;version="7.0.21",javax.el;version="2.2.0",org.eclipse.jdt.internal. + sax.helpers,org.apache.tomcat;version="8.0.26",org.apache.juli.loggin + g;version="8.0.26",javax.el;version="2.2.0",org.eclipse.jdt.internal. compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp diff --git a/jasper-el-OSGi-MANIFEST.MF b/jasper-el-OSGi-MANIFEST.MF index fd2879f..14e4282 100644 --- a/jasper-el-OSGi-MANIFEST.MF +++ b/jasper-el-OSGi-MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Export-Package: org.apache.el;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/sources b/sources index 9e1f56d..a36c73e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1184955015a2290252f0ec9495640b23 apache-tomcat-8.0.24-src.tar.gz +866415a62d9f5ba0422cad7d890ab35a apache-tomcat-8.0.26-src.tar.gz diff --git a/tomcat-api-OSGi-MANIFEST.MF b/tomcat-api-OSGi-MANIFEST.MF index 3522c72..85b12b8 100644 --- a/tomcat-api-OSGi-MANIFEST.MF +++ b/tomcat-api-OSGi-MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 -Export-Package: org.apache.tomcat;version="7.0.21" +Export-Package: org.apache.tomcat;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/tomcat-juli-OSGi-MANIFEST.MF b/tomcat-juli-OSGi-MANIFEST.MF index cbb5674..b856d9f 100644 --- a/tomcat-juli-OSGi-MANIFEST.MF +++ b/tomcat-juli-OSGi-MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 -Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi - ng;version="7.0.21" +Export-Package: org.apache.juli;version="8.0.26",org.apache.juli.loggi + ng;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/tomcat.spec b/tomcat.spec index b052f87..7a661c0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 24 +%global micro_version 26 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 +- Update to 8.0.26. + * Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 - Update to 8.0.24. From dc47b586d3a7832ecc89ed77e8fc9542a8e571df Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 17 Nov 2015 23:42:26 +0100 Subject: [PATCH 037/354] CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) --- tomcat-server | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat-server b/tomcat-server index 951b3ee..17ae385 100644 --- a/tomcat-server +++ b/tomcat-server @@ -13,8 +13,8 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \ -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" if [ "$1" = "start" ] ; then + FLAGS="${FLAGS} $CATALINA_OPTS" if [ "${SECURITY_MANAGER}" = "true" ] ; then - FLAGS="${FLAGS} $CATALINA_OPTS" OPTIONS="${OPTIONS} \ -Djava.security.manager \ -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy" diff --git a/tomcat.spec b/tomcat.spec index 7a661c0..76dedd4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Tue Nov 11 2015 Robert Scheck 1:8.0.26-2 +- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) + * Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 - Update to 8.0.26. From ae0ef248d658612c597f334b87e2130bb355d0c8 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 16 Nov 2015 09:10:29 -0500 Subject: [PATCH 038/354] Updated to 7.0.65 --- add_parent_logger_getter.patch | 29 ------- sources | 2 +- tomcat-7.0.57-CompilerOptionsV8.patch | 109 ++++++++++++++++++++++++++ tomcat.spec | 20 +++-- 4 files changed, 124 insertions(+), 36 deletions(-) delete mode 100644 add_parent_logger_getter.patch create mode 100644 tomcat-7.0.57-CompilerOptionsV8.patch diff --git a/add_parent_logger_getter.patch b/add_parent_logger_getter.patch deleted file mode 100644 index 40b9268..0000000 --- a/add_parent_logger_getter.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400 -+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400 -@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool; - import java.io.PrintWriter; - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Iterator; - import java.util.Properties; - import java.util.concurrent.Future; -+import java.util.logging.Logger; - - import javax.sql.XAConnection; - -@@ -534,6 +536,14 @@ public class DataSourceProxy implements - } - - /** -+ * no-op -+ * {@link javax.sql.DataSource#getParentLogger} -+ */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ -+ /** - * no-op - * {@link javax.sql.DataSource#getLogWriter} - */ diff --git a/sources b/sources index b76a2e2..08fad59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz +f26a57bbb9713c1a101e37243eaa2175 apache-tomcat-7.0.65-src.tar.gz diff --git a/tomcat-7.0.57-CompilerOptionsV8.patch b/tomcat-7.0.57-CompilerOptionsV8.patch new file mode 100644 index 0000000..baf9fce --- /dev/null +++ b/tomcat-7.0.57-CompilerOptionsV8.patch @@ -0,0 +1,109 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500 +@@ -67,7 +67,6 @@ + /** + * Compile the servlet from .java file to .class file + */ +- @Override + protected void generateClass(String[] smap) + throws FileNotFoundException, JasperException, Exception { + +@@ -98,12 +97,10 @@ + this.sourceFile = sourceFile; + } + +- @Override + public char[] getFileName() { + return sourceFile.toCharArray(); + } + +- @Override + public char[] getContents() { + char[] result = null; + FileInputStream is = null; +@@ -145,7 +142,6 @@ + return result; + } + +- @Override + public char[] getMainTypeName() { + int dot = className.lastIndexOf('.'); + if (dot > 0) { +@@ -154,7 +150,6 @@ + return className.toCharArray(); + } + +- @Override + public char[][] getPackageName() { + StringTokenizer izer = + new StringTokenizer(className, "."); +@@ -166,7 +161,6 @@ + return result; + } + +- @Override + public boolean ignoreOptionalProblems() { + return false; + } +@@ -174,7 +168,6 @@ + + final INameEnvironment env = new INameEnvironment() { + +- @Override + public NameEnvironmentAnswer + findType(char[][] compoundTypeName) { + String result = ""; +@@ -187,7 +180,6 @@ + return findType(result); + } + +- @Override + public NameEnvironmentAnswer + findType(char[] typeName, + char[][] packageName) { +@@ -269,7 +261,6 @@ + } + } + +- @Override + public boolean isPackage(char[][] parentPackageName, + char[] packageName) { + String result = ""; +@@ -293,7 +284,6 @@ + return isPackage(result); + } + +- @Override + public void cleanup() { + } + +@@ -342,9 +332,6 @@ + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -386,11 +373,6 @@ + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, +@@ -408,7 +390,6 @@ + new DefaultProblemFactory(Locale.getDefault()); + + final ICompilerRequestor requestor = new ICompilerRequestor() { +- @Override + public void acceptResult(CompilationResult result) { + try { + if (result.hasProblems()) { diff --git a/tomcat.spec b/tomcat.spec index 67431be..999eeda 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 33 +%global micro_version 65 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,13 +53,13 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: http://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -79,11 +79,11 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +# Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 +Patch2: %{name}-7.0.57-CompilerOptionsV8.patch BuildArch: noarch -ExcludeArch: ppc64 - BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ant-trax @@ -164,6 +164,7 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig Requires(postun): chkconfig @@ -226,6 +227,8 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 +%patch2 -p0 + %{__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 @@ -257,6 +260,7 @@ export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer" -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Djava.7.home=%{java_home} \ deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later @@ -526,8 +530,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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 %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -622,6 +627,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 +- Updated to 7.0.65 + * Tue Apr 29 2014 Vlad Slepukhin 0:7.0.33-4 - Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory - Removed residual systemd configuration from the wrapper From 5eb026baf5d8ecc03e22a41dc6c364319df61be6 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 16 Nov 2015 09:10:29 -0500 Subject: [PATCH 039/354] Updated to 7.0.65 --- add_parent_logger_getter.patch | 29 ------- sources | 2 +- tomcat-7.0.57-CompilerOptionsV8.patch | 109 ++++++++++++++++++++++++++ tomcat-7.0.65-build.patch | 53 +++++++++++++ tomcat.spec | 25 ++++-- 5 files changed, 181 insertions(+), 37 deletions(-) delete mode 100644 add_parent_logger_getter.patch create mode 100644 tomcat-7.0.57-CompilerOptionsV8.patch create mode 100644 tomcat-7.0.65-build.patch diff --git a/add_parent_logger_getter.patch b/add_parent_logger_getter.patch deleted file mode 100644 index 40b9268..0000000 --- a/add_parent_logger_getter.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400 -+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400 -@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool; - import java.io.PrintWriter; - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Iterator; - import java.util.Properties; - import java.util.concurrent.Future; -+import java.util.logging.Logger; - - import javax.sql.XAConnection; - -@@ -534,6 +536,14 @@ public class DataSourceProxy implements - } - - /** -+ * no-op -+ * {@link javax.sql.DataSource#getParentLogger} -+ */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ -+ /** - * no-op - * {@link javax.sql.DataSource#getLogWriter} - */ diff --git a/sources b/sources index b76a2e2..08fad59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz +f26a57bbb9713c1a101e37243eaa2175 apache-tomcat-7.0.65-src.tar.gz diff --git a/tomcat-7.0.57-CompilerOptionsV8.patch b/tomcat-7.0.57-CompilerOptionsV8.patch new file mode 100644 index 0000000..baf9fce --- /dev/null +++ b/tomcat-7.0.57-CompilerOptionsV8.patch @@ -0,0 +1,109 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500 +@@ -67,7 +67,6 @@ + /** + * Compile the servlet from .java file to .class file + */ +- @Override + protected void generateClass(String[] smap) + throws FileNotFoundException, JasperException, Exception { + +@@ -98,12 +97,10 @@ + this.sourceFile = sourceFile; + } + +- @Override + public char[] getFileName() { + return sourceFile.toCharArray(); + } + +- @Override + public char[] getContents() { + char[] result = null; + FileInputStream is = null; +@@ -145,7 +142,6 @@ + return result; + } + +- @Override + public char[] getMainTypeName() { + int dot = className.lastIndexOf('.'); + if (dot > 0) { +@@ -154,7 +150,6 @@ + return className.toCharArray(); + } + +- @Override + public char[][] getPackageName() { + StringTokenizer izer = + new StringTokenizer(className, "."); +@@ -166,7 +161,6 @@ + return result; + } + +- @Override + public boolean ignoreOptionalProblems() { + return false; + } +@@ -174,7 +168,6 @@ + + final INameEnvironment env = new INameEnvironment() { + +- @Override + public NameEnvironmentAnswer + findType(char[][] compoundTypeName) { + String result = ""; +@@ -187,7 +180,6 @@ + return findType(result); + } + +- @Override + public NameEnvironmentAnswer + findType(char[] typeName, + char[][] packageName) { +@@ -269,7 +261,6 @@ + } + } + +- @Override + public boolean isPackage(char[][] parentPackageName, + char[] packageName) { + String result = ""; +@@ -293,7 +284,6 @@ + return isPackage(result); + } + +- @Override + public void cleanup() { + } + +@@ -342,9 +332,6 @@ + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -386,11 +373,6 @@ + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, +@@ -408,7 +390,6 @@ + new DefaultProblemFactory(Locale.getDefault()); + + final ICompilerRequestor requestor = new ICompilerRequestor() { +- @Override + public void acceptResult(CompilationResult result) { + try { + if (result.hasProblems()) { diff --git a/tomcat-7.0.65-build.patch b/tomcat-7.0.65-build.patch new file mode 100644 index 0000000..5e98385 --- /dev/null +++ b/tomcat-7.0.65-build.patch @@ -0,0 +1,53 @@ +--- build.xml 2015-12-11 07:27:23.026996172 -0500 ++++ build.xml 2015-12-11 07:29:46.762002209 -0500 +@@ -1042,12 +1042,11 @@ + + + +- +- ++ + + + +- ++ + + + +@@ -2826,7 +2825,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2857,7 +2856,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2886,7 +2885,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2927,7 +2926,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + diff --git a/tomcat.spec b/tomcat.spec index 67431be..3446a19 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 33 +%global micro_version 65 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,13 +53,13 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: http://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -79,11 +79,13 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +# Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 +Patch2: %{name}-7.0.57-CompilerOptionsV8.patch +# Adding patch to remove unsupport ant tasks/attributes +Patch3: %{name}-7.0.65-build.patch BuildArch: noarch -ExcludeArch: ppc64 - BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ant-trax @@ -94,7 +96,7 @@ BuildRequires: jakarta-commons-daemon BuildRequires: jakarta-commons-dbcp BuildRequires: jakarta-commons-pool BuildRequires: jakarta-taglibs-standard -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java7-devel >= 1:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j @@ -164,6 +166,7 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig Requires(postun): chkconfig @@ -226,6 +229,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 +%patch2 -p0 +%patch3 -p0 + %{__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 @@ -257,6 +263,7 @@ export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer" -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Djava.7.home=%{java_home} \ deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later @@ -526,8 +533,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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 %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -622,6 +630,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 +- Updated to 7.0.65 + * Tue Apr 29 2014 Vlad Slepukhin 0:7.0.33-4 - Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory - Removed residual systemd configuration from the wrapper From cecdb36d07e5da33ccf930cf7e4b7ea426719f4e Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 16 Nov 2015 09:10:29 -0500 Subject: [PATCH 040/354] Updated to 7.0.65 --- add_parent_logger_getter.patch | 29 ------- sources | 2 +- tomcat-7.0.57-CompilerOptionsV8.patch | 109 ++++++++++++++++++++++++++ tomcat-7.0.65-build.patch | 53 +++++++++++++ tomcat.spec | 27 +++++-- 5 files changed, 182 insertions(+), 38 deletions(-) delete mode 100644 add_parent_logger_getter.patch create mode 100644 tomcat-7.0.57-CompilerOptionsV8.patch create mode 100644 tomcat-7.0.65-build.patch diff --git a/add_parent_logger_getter.patch b/add_parent_logger_getter.patch deleted file mode 100644 index 40b9268..0000000 --- a/add_parent_logger_getter.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400 -+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400 -@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool; - import java.io.PrintWriter; - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Iterator; - import java.util.Properties; - import java.util.concurrent.Future; -+import java.util.logging.Logger; - - import javax.sql.XAConnection; - -@@ -534,6 +536,14 @@ public class DataSourceProxy implements - } - - /** -+ * no-op -+ * {@link javax.sql.DataSource#getParentLogger} -+ */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ -+ /** - * no-op - * {@link javax.sql.DataSource#getLogWriter} - */ diff --git a/sources b/sources index b76a2e2..08fad59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz +f26a57bbb9713c1a101e37243eaa2175 apache-tomcat-7.0.65-src.tar.gz diff --git a/tomcat-7.0.57-CompilerOptionsV8.patch b/tomcat-7.0.57-CompilerOptionsV8.patch new file mode 100644 index 0000000..baf9fce --- /dev/null +++ b/tomcat-7.0.57-CompilerOptionsV8.patch @@ -0,0 +1,109 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500 +@@ -67,7 +67,6 @@ + /** + * Compile the servlet from .java file to .class file + */ +- @Override + protected void generateClass(String[] smap) + throws FileNotFoundException, JasperException, Exception { + +@@ -98,12 +97,10 @@ + this.sourceFile = sourceFile; + } + +- @Override + public char[] getFileName() { + return sourceFile.toCharArray(); + } + +- @Override + public char[] getContents() { + char[] result = null; + FileInputStream is = null; +@@ -145,7 +142,6 @@ + return result; + } + +- @Override + public char[] getMainTypeName() { + int dot = className.lastIndexOf('.'); + if (dot > 0) { +@@ -154,7 +150,6 @@ + return className.toCharArray(); + } + +- @Override + public char[][] getPackageName() { + StringTokenizer izer = + new StringTokenizer(className, "."); +@@ -166,7 +161,6 @@ + return result; + } + +- @Override + public boolean ignoreOptionalProblems() { + return false; + } +@@ -174,7 +168,6 @@ + + final INameEnvironment env = new INameEnvironment() { + +- @Override + public NameEnvironmentAnswer + findType(char[][] compoundTypeName) { + String result = ""; +@@ -187,7 +180,6 @@ + return findType(result); + } + +- @Override + public NameEnvironmentAnswer + findType(char[] typeName, + char[][] packageName) { +@@ -269,7 +261,6 @@ + } + } + +- @Override + public boolean isPackage(char[][] parentPackageName, + char[] packageName) { + String result = ""; +@@ -293,7 +284,6 @@ + return isPackage(result); + } + +- @Override + public void cleanup() { + } + +@@ -342,9 +332,6 @@ + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -386,11 +373,6 @@ + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, +@@ -408,7 +390,6 @@ + new DefaultProblemFactory(Locale.getDefault()); + + final ICompilerRequestor requestor = new ICompilerRequestor() { +- @Override + public void acceptResult(CompilationResult result) { + try { + if (result.hasProblems()) { diff --git a/tomcat-7.0.65-build.patch b/tomcat-7.0.65-build.patch new file mode 100644 index 0000000..5e98385 --- /dev/null +++ b/tomcat-7.0.65-build.patch @@ -0,0 +1,53 @@ +--- build.xml 2015-12-11 07:27:23.026996172 -0500 ++++ build.xml 2015-12-11 07:29:46.762002209 -0500 +@@ -1042,12 +1042,11 @@ + + + +- +- ++ + + + +- ++ + + + +@@ -2826,7 +2825,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2857,7 +2856,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2886,7 +2885,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + +@@ -2927,7 +2926,7 @@ Apache Tomcat ${version} native binaries + + + +- ++ + + + diff --git a/tomcat.spec b/tomcat.spec index 67431be..167c04d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 33 +%global micro_version 65 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,13 +53,13 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: http://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -79,11 +79,13 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +# Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 +Patch2: %{name}-7.0.57-CompilerOptionsV8.patch +# Adding patch to remove unsupport ant tasks/attributes +Patch3: %{name}-7.0.65-build.patch BuildArch: noarch -ExcludeArch: ppc64 - BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ant-trax @@ -94,7 +96,7 @@ BuildRequires: jakarta-commons-daemon BuildRequires: jakarta-commons-dbcp BuildRequires: jakarta-commons-pool BuildRequires: jakarta-taglibs-standard -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java7-devel >= 1:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j @@ -164,6 +166,7 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig Requires(postun): chkconfig @@ -226,11 +229,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 +%patch2 -p0 +%patch3 -p0 + %{__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 %build -export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer" +export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps xalan-j2-serializer" # we don't care about the tarballs and we're going to replace # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal @@ -257,6 +263,7 @@ export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer" -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Djava.7.home=%{java_home} \ deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later @@ -526,8 +533,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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 %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} @@ -622,6 +630,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 +- Updated to 7.0.65 + * Tue Apr 29 2014 Vlad Slepukhin 0:7.0.33-4 - Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory - Removed residual systemd configuration from the wrapper From f277685a2851ac3f50ef616c5af4ac0b9483c86e Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 4 Jan 2016 16:16:07 -0500 Subject: [PATCH 041/354] Adding back the ppc64 exclusion because java7 doesn't exist on ppc64. --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 167c04d..eada7ab 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,6 +86,8 @@ Patch3: %{name}-7.0.65-build.patch BuildArch: noarch +ExcludeArch: ppc64 + BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ant-trax From 6f36935bb4959ef0ff959a328a7758e27b2cb1ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 01:46:06 +0000 Subject: [PATCH 042/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 76dedd4..1492829 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 11 2015 Robert Scheck 1:8.0.26-2 - CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) From 4f6d837abcc02bc1f0b946b8f7b7bd3a03c59e68 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 10 Feb 2016 15:59:41 -0500 Subject: [PATCH 043/354] Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking=true in context.xml --- tomcat.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 1492829..1f06bfa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -447,8 +447,10 @@ popd # Allow linking for example webapp %{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF -echo ''>context.xml -echo ''>>context.xml +echo '' > context.xml +echo '' >> context.xml +echo ' ' >> context.xml +echo '' >> context.xml popd pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib @@ -686,6 +688,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 +- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml + * Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 669936a5b838c05597e4a4e2e5e19cdaa4f6705d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 2 Feb 2016 11:36:08 -0500 Subject: [PATCH 044/354] Resolves: rhbz-1302718 Program /bin/nologin does not exist --- tomcat.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 1f06bfa..5feb2b7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -526,7 +526,7 @@ EOF # add the tomcat user and group %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ - -s /bin/nologin -r -d %{homedir} tomcat 2>/dev/null || : + -s /sbin/nologin -r -d %{homedir} tomcat 2>/dev/null || : %post # install but don't activate @@ -690,6 +690,7 @@ fi %changelog * Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 - Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml +- Program /bin/nologin does not exist (#1302718) * Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5067f18094d98e677226a93760ac26fc83cf8f74 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 4 Feb 2016 15:04:58 +0300 Subject: [PATCH 045/354] Resolves: rhbz-1121896 tomcat.service loads /etc/sysconfig/tomcat without shell expansion --- tomcat-8.0.conf | 52 +++++--------------------------------------- tomcat-8.0.service | 3 +-- tomcat-8.0.sysconfig | 49 +++++++++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 55 deletions(-) diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf index 03119b7..bd141e8 100644 --- a/tomcat-8.0.conf +++ b/tomcat-8.0.conf @@ -1,48 +1,8 @@ -# System-wide configuration file for tomcat services -# This will be loaded by systemd as an environment file, -# so please keep the syntax. +# System-wide configuration file for tomcat services. # -# 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 tomcat services. Change the +# service specific ones to affect only one service. For tomcat.service it is +# /etc/sysconfig/tomcat. For tomcat@instance it is /etc/sysconfig/tomcat@instance. # -# 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" - -# 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) +# This will not be sourced by systemd as an environment file. Feel free to add +# your overrides here. Shell invocations will work. diff --git a/tomcat-8.0.service b/tomcat-8.0.service index 103d464..157e7e1 100644 --- a/tomcat-8.0.service +++ b/tomcat-8.0.service @@ -9,9 +9,8 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" -EnvironmentFile=-/etc/sysconfig/tomcat +EnvironmentFile=/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 diff --git a/tomcat-8.0.sysconfig b/tomcat-8.0.sysconfig index 3117bf7..9e33f1f 100644 --- a/tomcat-8.0.sysconfig +++ b/tomcat-8.0.sysconfig @@ -1,11 +1,46 @@ -# Service-specific configuration file for tomcat. This will be sourced by -# systemd for the default service (tomcat.service) +# Service-specific configuration file for tomcat services. 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. +# +# This will be loaded by systemd as an environment file, so please keep +# the syntax. If you need to use shell expansion, configure the necessary +# variables in /etc/tomcat/tomcat.conf. -# 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@@@" +# This variable is used to figure out if config is loaded or not. +# Default is empty to load /etc/tomcat/tomcat.conf for overrides. +#TOMCAT_CFG_LOADED="1" -# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you -# can override. +# 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" + +# 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) From 9d76b5346814066d02b7c6be89487775a18bd1c9 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Thu, 4 Feb 2016 16:13:40 +0300 Subject: [PATCH 046/354] Set TOMCAT_CFG_LOADED in tomcat.conf --- tomcat-8.0.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf index bd141e8..4631d83 100644 --- a/tomcat-8.0.conf +++ b/tomcat-8.0.conf @@ -6,3 +6,9 @@ # # This will not be sourced by systemd as an environment file. Feel free to add # your overrides here. Shell invocations will work. +# + +# This variable is used to figure out if config is loaded or not. +# To prevent this file to be loaded multiple times. +TOMCAT_CFG_LOADED="1" + From 3bf9b4c925392dca01451971fd27c1aa4ecd8144 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Fri, 5 Feb 2016 12:20:13 +0300 Subject: [PATCH 047/354] Switch non-primary service files to sysconfig --- tomcat-8.0-jsvc.service | 2 +- tomcat-named.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.0-jsvc.service index 8275796..413114b 100644 --- a/tomcat-8.0-jsvc.service +++ b/tomcat-8.0-jsvc.service @@ -12,7 +12,7 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf +EnvironmentFile=/etc/sysconfig/tomcat Environment="NAME=" "USE_JSVC=true" ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop diff --git a/tomcat-named.service b/tomcat-named.service index 9bbcb17..bb89293 100644 --- a/tomcat-named.service +++ b/tomcat-named.service @@ -12,7 +12,7 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf +EnvironmentFile=/etc/sysconfig/tomcat Environment="NAME=%I" EnvironmentFile=-/etc/sysconfig/tomcat@%I ExecStart=/usr/libexec/tomcat/server start From 7977e008b982e5fedaa47b3b56a55f6739745ee7 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Thu, 4 Feb 2016 18:04:14 +0300 Subject: [PATCH 048/354] Updated to 8.0.32 - Remove log4j support. It has never been working actually. See rhbz#1236297 --- sources | 2 +- tomcat.spec | 33 +++++++++++---------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/sources b/sources index a36c73e..c2a102c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -866415a62d9f5ba0422cad7d890ab35a apache-tomcat-8.0.26-src.tar.gz +f8a1a0f811f6ffe0a4ccc1132c442d8b apache-tomcat-8.0.32-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 5feb2b7..5a75a32 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 26 +%global micro_version 32 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -69,7 +69,6 @@ Source6: %{name}-%{major_version}.%{minor_version}-digest.script Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script Source8: servlet-api-OSGi-MANIFEST.MF Source9: jsp-api-OSGi-MANIFEST.MF -Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties Source11: %{name}-%{major_version}.%{minor_version}.service Source12: el-api-OSGi-MANIFEST.MF Source13: jasper-el-OSGi-MANIFEST.MF @@ -98,7 +97,6 @@ BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit -BuildRequires: log4j BuildRequires: geronimo-jaxrpc BuildRequires: wsdl4j BuildRequires: systemd-units @@ -118,6 +116,9 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +# 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. @@ -176,14 +177,6 @@ Requires(postun): chkconfig %description jsp-%{jspspec}-api Apache Tomcat JSP API implementation classes. -%package log4j -Group: Applications/Internet -Summary: Log4j support for Apache Tomcat -Requires: log4j - -%description log4j -Log4j support for Apache Tomcat - %package lib Group: Development/Libraries Summary: Libraries needed to run the Tomcat Web container @@ -344,7 +337,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF # First copy supporting libs to tomcat lib pushd output/build %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} - %{__cp} %{SOURCE10} conf/log4j.properties %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} @@ -420,7 +412,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar - %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap) @@ -623,8 +614,6 @@ fi %{homedir}/logs %{homedir}/conf -%exclude %{confdir}/log4j.properties - %files admin-webapps %defattr(0664,root,tomcat,0755) %{appdir}/host-manager @@ -642,11 +631,6 @@ fi %defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar -%files log4j -%defattr(0664,root,tomcat,0755) -%config(noreplace) %{confdir}/log4j.properties -%{libdir}/log4j.jar - %files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib %defattr(-,root,root,-) %{libdir} @@ -664,7 +648,6 @@ fi %{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom %{_datadir}/maven-metadata/tomcat.xml %exclude %{libdir}/%{name}-el-%{elspec}-api.jar -%exclude %{libdir}/log4j.jar %files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api %defattr(-,root,root,-) @@ -688,6 +671,12 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +<<<<<<< HEAD +* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 +- Updated to 8.0.32 +- Remove log4j support. It has never been working actually. See rhbz#1236297 +- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 + * Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 - Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml - Program /bin/nologin does not exist (#1302718) From 65e6257e5007c349f9c1ca2ad1fca65c22177497 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Sun, 14 Feb 2016 01:44:02 +0300 Subject: [PATCH 049/354] Add Recommends: tomcat-native --- tomcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 5a75a32..97e41bd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -36,6 +36,9 @@ %global servletspec 3.1 %global elspec 3.0 %global tcuid 91 +#Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java +%global native_version 1.1.33 + # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir %{_var}/lib/%{name} @@ -109,6 +112,7 @@ Requires: java-headless >= 1:1.6.0 Requires: jpackage-utils Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Recommends: tomcat-native >= %{native_version} Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig @@ -671,11 +675,11 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -<<<<<<< HEAD * Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 - Updated to 8.0.32 - Remove log4j support. It has never been working actually. See rhbz#1236297 - Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 +- Recommend tomcat-native, resolves: rhbz#1243132 * Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 - Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml From d6fc5df332b33b39a8a32d3e566657ca307564e3 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Sun, 21 Feb 2016 23:49:52 +0300 Subject: [PATCH 050/354] [rhbz#1308685] Fix symlinks from $CATALINA_HOME/lib perspective --- tomcat.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 97e41bd..fadbc5c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -410,9 +410,9 @@ popd pushd ${RPM_BUILD_ROOT}%{libdir} # symlink JSP and servlet 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} ../../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 apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar @@ -675,6 +675,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-3 +- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 + * Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 - Updated to 8.0.32 - Remove log4j support. It has never been working actually. See rhbz#1236297 From ef1b76e880ba0ef33687d2a89aeb1da9e71496be Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Sat, 27 Feb 2016 17:56:47 +0300 Subject: [PATCH 051/354] Fix non-service use and default datasource factory - Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 - Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 - Fix changelog --- tomcat-8.0.conf | 8 ++++++++ tomcat-8.0.sysconfig | 8 +++++--- tomcat.spec | 10 +++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf index 4631d83..ad6e668 100644 --- a/tomcat-8.0.conf +++ b/tomcat-8.0.conf @@ -12,3 +12,11 @@ # To prevent this file to be loaded multiple times. TOMCAT_CFG_LOADED="1" + +if [ -z "${TOMCAT_SYSCONF_LOADED}" ]; then + if [ -z "${TOMCAT_SYSCONF}" ]; then + TOMCAT_SYSCONF="/etc/sysconfig/tomcat" + fi + . $TOMCAT_SYSCONF +fi + diff --git a/tomcat-8.0.sysconfig b/tomcat-8.0.sysconfig index 9e33f1f..d918420 100644 --- a/tomcat-8.0.sysconfig +++ b/tomcat-8.0.sysconfig @@ -8,9 +8,8 @@ # the syntax. If you need to use shell expansion, configure the necessary # variables in /etc/tomcat/tomcat.conf. -# This variable is used to figure out if config is loaded or not. -# Default is empty to load /etc/tomcat/tomcat.conf for overrides. -#TOMCAT_CFG_LOADED="1" +# This variable is used to figure out if this config is loaded or not. +TOMCAT_SYSCONF_LOADED="1" # In new-style instances, if CATALINA_BASE isn't specified, it will # be constructed by joining TOMCATS_BASE and NAME. @@ -31,6 +30,9 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp" # 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" diff --git a/tomcat.spec b/tomcat.spec index fadbc5c..1aa07f5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -675,7 +675,11 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-3 +* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 +- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 +- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 + +* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2 - Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 * Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 @@ -691,7 +695,7 @@ fi * Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Tue Nov 11 2015 Robert Scheck 1:8.0.26-2 +* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2 - CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) * Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 From e0ea77351d434ddde2f8ff80fea788d24cd8bc56 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Wed, 2 Mar 2016 19:40:56 +0300 Subject: [PATCH 052/354] Revert sysconfig migration --- tomcat-8.0-jsvc.service | 2 +- tomcat-8.0.conf | 57 +++++++++++++++++++++++++++++++---------- tomcat-8.0.service | 3 ++- tomcat-8.0.sysconfig | 51 +++++------------------------------- tomcat-named.service | 2 +- 5 files changed, 54 insertions(+), 61 deletions(-) diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.0-jsvc.service index 413114b..8275796 100644 --- a/tomcat-8.0-jsvc.service +++ b/tomcat-8.0-jsvc.service @@ -12,7 +12,7 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/sysconfig/tomcat +EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" "USE_JSVC=true" ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf index ad6e668..8550df7 100644 --- a/tomcat-8.0.conf +++ b/tomcat-8.0.conf @@ -1,22 +1,51 @@ -# System-wide configuration file for tomcat services. +# System-wide configuration file for tomcat services +# This will be loaded by systemd as an environment file, +# so please keep the syntax. # -# Use this file to change default values for all tomcat services. Change the -# service specific ones to affect only one service. For tomcat.service it is -# /etc/sysconfig/tomcat. For tomcat@instance it is /etc/sysconfig/tomcat@instance. -# -# This will not be sourced by systemd as an environment file. Feel free to add -# your overrides here. Shell invocations will work. +# 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. -# To prevent this file to be loaded multiple times. 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/" -if [ -z "${TOMCAT_SYSCONF_LOADED}" ]; then - if [ -z "${TOMCAT_SYSCONF}" ]; then - TOMCAT_SYSCONF="/etc/sysconfig/tomcat" - fi - . $TOMCAT_SYSCONF -fi +# 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" + +# 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) diff --git a/tomcat-8.0.service b/tomcat-8.0.service index 157e7e1..103d464 100644 --- a/tomcat-8.0.service +++ b/tomcat-8.0.service @@ -9,8 +9,9 @@ After=syslog.target network.target [Service] Type=simple +EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" -EnvironmentFile=/etc/sysconfig/tomcat +EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 diff --git a/tomcat-8.0.sysconfig b/tomcat-8.0.sysconfig index d918420..3117bf7 100644 --- a/tomcat-8.0.sysconfig +++ b/tomcat-8.0.sysconfig @@ -1,48 +1,11 @@ -# Service-specific configuration file for tomcat services. This will be sourced by -# systemd for the default service (tomcat.service). -# +# 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. -# -# This will be loaded by systemd as an environment file, so please keep -# the syntax. If you need to use shell expansion, configure the necessary -# variables in /etc/tomcat/tomcat.conf. -# This variable is used to figure out if this config is loaded or not. -TOMCAT_SYSCONF_LOADED="1" +# 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@@@" -# 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" - -# 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) +# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you +# can override. diff --git a/tomcat-named.service b/tomcat-named.service index bb89293..9bbcb17 100644 --- a/tomcat-named.service +++ b/tomcat-named.service @@ -12,7 +12,7 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/sysconfig/tomcat +EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=%I" EnvironmentFile=-/etc/sysconfig/tomcat@%I ExecStart=/usr/libexec/tomcat/server start From 7d21a720d9dbbd55a2017283d8ee5dd75590fe19 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Wed, 2 Mar 2016 20:53:07 +0300 Subject: [PATCH 053/354] Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 --- tomcat-8.0.conf | 3 ++- tomcat-preamble | 8 ++++++++ tomcat.spec | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf index 8550df7..3f43006 100644 --- a/tomcat-8.0.conf +++ b/tomcat-8.0.conf @@ -1,6 +1,7 @@ # System-wide configuration file for tomcat services # This will be loaded by systemd as an environment file, -# so please keep the syntax. +# 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. diff --git a/tomcat-preamble b/tomcat-preamble index 0079a8c..1271dca 100644 --- a/tomcat-preamble +++ b/tomcat-preamble @@ -11,6 +11,14 @@ if [ -z "${TOMCAT_CFG_LOADED}" ]; then . $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 diff --git a/tomcat.spec b/tomcat.spec index 1aa07f5..3a8850e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -324,6 +324,8 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__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} /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out @@ -600,6 +602,8 @@ fi %attr(0775,root,tomcat) %dir %{appdir} %attr(0775,root,tomcat) %dir %{confdir}/Catalina %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost +%attr(0775,root,tomcat) %dir %{confdir}/conf.d +%attr(0664,tomcat,tomcat) %{confdir}/conf.d/README %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties @@ -675,6 +679,10 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 +- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 +- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 + * Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 - Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 - Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 From da5404f2d4e040aada61c37b8e4c222b045e569b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 12:49:22 -0400 Subject: [PATCH 054/354] Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index eada7ab..98e2e0a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -339,7 +339,7 @@ pushd output/build %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc -%{__cp} -a webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +%{__cp} -a output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ @@ -632,6 +632,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Jul 01 2016 Coty Sutherland 0:7.0.65-2 +- Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html + * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From b225805ced6eed068da3e2c4f9b65951fdba0d1b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 09:43:24 -0400 Subject: [PATCH 055/354] Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) --- tomcat-7.0-catalina-policy.patch | 38 ++++++++++++++++++++++++++++++++ tomcat.spec | 7 +++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tomcat-7.0-catalina-policy.patch diff --git a/tomcat-7.0-catalina-policy.patch b/tomcat-7.0-catalina-policy.patch new file mode 100644 index 0000000..0666d07 --- /dev/null +++ b/tomcat-7.0-catalina-policy.patch @@ -0,0 +1,38 @@ +--- conf/catalina.policy 2016-07-07 16:31:44.473000159 -0400 ++++ conf/catalina.policy 2016-07-07 16:32:14.349000359 -0400 +@@ -51,6 +51,36 @@ + }; + + ++// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= ++ ++// Allowing everything in /usr/share/java allows too many unknowns to be permitted ++// Specifying the individual jars that tomcat needs to function with the security manager ++// is the safest way forward. ++grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/tomcat-servlet-3.0-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/jakarta-commons-collections.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/jakarta-commons-dbcp.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/ecj.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/log4j.jar" { ++ permission java.security.AllPermission; ++}; ++ + // ========== CATALINA CODE PERMISSIONS ======================================= + diff --git a/tomcat.spec b/tomcat.spec index 98e2e0a..a7bac4f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,6 +59,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{js Group: System Environment/Daemons 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 Source2: %{name}-%{major_version}.%{minor_version}.init @@ -83,6 +84,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat Patch2: %{name}-7.0.57-CompilerOptionsV8.patch # Adding patch to remove unsupport ant tasks/attributes Patch3: %{name}-7.0.65-build.patch +Patch4: %{name}-7.0-catalina-policy.patch BuildArch: noarch @@ -103,6 +105,7 @@ BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j BuildRequires: wsdl4j + Requires: jakarta-commons-daemon Requires: jakarta-commons-logging Requires: jakarta-commons-collections @@ -233,6 +236,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %{__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 @@ -632,8 +636,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Fri Jul 01 2016 Coty Sutherland 0:7.0.65-2 +* Fri Aug 05 2016 Coty Sutherland 0:7.0.65-2 - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html +- Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From aa5454a96d7b783b3214ed97916b868918b21e26 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 09:46:24 -0400 Subject: [PATCH 056/354] Related: rhbz#1347838 I noticed an erroneous block in the policy patch. Removed it. --- tomcat-7.0-catalina-policy.patch | 3 --- 1 file changed, 3 deletions(-) diff --git a/tomcat-7.0-catalina-policy.patch b/tomcat-7.0-catalina-policy.patch index 0666d07..3f7dbc7 100644 --- a/tomcat-7.0-catalina-policy.patch +++ b/tomcat-7.0-catalina-policy.patch @@ -12,9 +12,6 @@ +grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" { + permission java.security.AllPermission; +}; -+grant codeBase "file:" { -+ permission java.security.AllPermission; -+}; +grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" { + permission java.security.AllPermission; +}; From 24b2b7a82d1aee958e8506df1564d489d1f193fb Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 14 Apr 2016 15:39:12 -0400 Subject: [PATCH 057/354] Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out --- tomcat.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index a7bac4f..8903bd6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -542,8 +542,8 @@ fi %defattr(0664,tomcat,root,0770) %attr(0770,tomcat,root) %dir %{logdir} %defattr(0664,root,tomcat,0770) -%attr(0660,tomcat,tomcat) %{logdir}/catalina.out -%attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid +%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out +%attr(0644,tomcat,tomcat) %verify(not size md5 mtime) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} %attr(0770,root,tomcat) %dir %{tempdir} %attr(0770,root,tomcat) %dir %{workdir} @@ -639,6 +639,7 @@ fi * Fri Aug 05 2016 Coty Sutherland 0:7.0.65-2 - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) +- Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 8e804f0efdd370ea629a9822ebbb5d11618ef964 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 09:56:41 -0400 Subject: [PATCH 058/354] Resolved: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index 8903bd6..3956c3c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -640,6 +640,7 @@ fi - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out +- Resolved: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 56cc1dee84c0793aed116417146433a6ab9a6419 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 09:57:40 -0400 Subject: [PATCH 059/354] Related: rhbz#1314177 Forgot to commit to init change... --- tomcat-7.0.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index f5269f5..f1b6d2d 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -288,7 +288,7 @@ case "$1" in RETVAL="1" fi else - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f \"${NAME}[ $]\")" if [ -z "$pid" ]; then # status ${NAME} # RETVAL="$?" @@ -300,7 +300,7 @@ case "$1" in fi fi if [ -f /var/lock/subsys/${NAME} ]; then - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f \"${NAME}[ $]\")" # The lockfile exists but the process is not running if [ -z "$pid" ]; then log_failure_msg "${NAME} lockfile exists but process is not running" From 93f643e335a2cf28b8ac471dc7e9f777fd3e57e7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 10:02:54 -0400 Subject: [PATCH 060/354] Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable --- tomcat-7.0.init | 2 +- tomcat.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index f1b6d2d..a3fd004 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -58,7 +58,7 @@ fi CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat" +TOMCAT_SCRIPT="${TOMCAT_SCRIPT:-/usr/sbin/tomcat}" # Tomcat program name TOMCAT_PROG="${NAME}" diff --git a/tomcat.spec b/tomcat.spec index 3956c3c..62ef199 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -640,7 +640,8 @@ fi - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out -- Resolved: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped +- Resolves: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped +- Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From bbe9e2eb9c49750763f44aad94c0ba0c08091ebc Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 2 Feb 2016 22:35:50 -0500 Subject: [PATCH 061/354] Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat --- tomcat-7.0.init | 21 +++++++++++---------- tomcat.spec | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index a3fd004..bf0b5fc 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -69,6 +69,8 @@ TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" +# Define the tomcat pid file +CATALINA_PID="${CATALINA_PID:-/var/run/${NAME}.pid}" RETVAL="0" @@ -149,8 +151,8 @@ function start() { return fi if [ -f "/var/lock/subsys/${NAME}" ]; then - if [ -s "/var/run/${NAME}.pid" ]; then - read kpid < /var/run/${NAME}.pid + if [ -s "$CATALINA_PID" ]; then + read kpid < $CATALINA_PID # if checkpid $kpid 2>&1; then if [ -d "/proc/${kpid}" ]; then log_success_msg @@ -162,7 +164,6 @@ function start() { fi fi # fix permissions on the log and pid files - export CATALINA_PID="/var/run/${NAME}.pid" touch $CATALINA_PID 2>&1 || RETVAL="4" if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID @@ -210,8 +211,8 @@ function stop() { fi if [ "$RETVAL" -eq "0" ]; then count="0" - if [ -s "/var/run/${NAME}.pid" ]; then - read kpid < /var/run/${NAME}.pid + if [ -s "$CATALINA_PID" ]; then + read kpid < $CATALINA_PID until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \ [ "$count" -gt "$SHUTDOWN_WAIT" ]; do if [ "$SHUTDOWN_VERBOSE" = "true" ]; then @@ -228,7 +229,7 @@ function stop() { fi log_success_msg fi - rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid + rm -f /var/lock/subsys/${NAME} $CATALINA_PID else log_failure_msg RETVAL="4" @@ -262,7 +263,7 @@ case "$1" in start ;; condrestart|try-restart) - if [ -s "/var/run/${NAME}.pid" ]; then + if [ -s "$CATALINA_PID" ]; then stop start fi @@ -271,14 +272,14 @@ case "$1" in RETVAL="3" ;; force-reload) - if [ -s "/var/run/${NAME}.pid" ]; then + if [ -s "$CATALINA_PID" ]; then stop start fi ;; status) - if [ -s "/var/run/${NAME}.pid" ]; then - read kpid < /var/run/${NAME}.pid + if [ -s "$CATALINA_PID" ]; then + read kpid < $CATALINA_PID if [ -d "/proc/${kpid}" ]; then log_success_msg "${NAME} (pid ${kpid}) is running..." RETVAL="0" diff --git a/tomcat.spec b/tomcat.spec index 62ef199..a55bd56 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -642,6 +642,7 @@ fi - Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out - Resolves: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped - Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable +- Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 694a0068763cf44eabe6b8fba7816a1a7e8698ca Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 10 Feb 2016 14:58:16 -0500 Subject: [PATCH 062/354] Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME} --- tomcat-7.0.conf | 3 +++ tomcat-7.0.wrapper | 13 ++++++++----- tomcat.spec | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf index a500479..327cdd9 100644 --- a/tomcat-7.0.conf +++ b/tomcat-7.0.conf @@ -8,6 +8,9 @@ # (see, for instance, /etc/sysconfig/tomcat) # +# This variable is used to figure out if config is loaded or not. +TOMCAT_CFG_LOADED="1" + # Where your java installation lives JAVA_HOME="/usr/lib/jvm/jre" diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper index d6db6e8..61b25c3 100644 --- a/tomcat-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -8,12 +8,15 @@ else fi # Get the tomcat config (use this for environment specific settings) -if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat/tomcat.conf" -fi +# if $TOMCAT_CFG wasn't already loaded +if [ -z "${TOMCAT_CFG_LOADED}" ]; then + if [ -z "${TOMCAT_CFG}" ]; then + TOMCAT_CFG="/etc/tomcat/tomcat.conf" + fi -if [ -r "$TOMCAT_CFG" ]; then - . $TOMCAT_CFG + if [ -r "$TOMCAT_CFG" ]; then + . $TOMCAT_CFG + fi fi set_javacmd diff --git a/tomcat.spec b/tomcat.spec index a55bd56..723ab0c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -643,6 +643,7 @@ fi - Resolves: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped - Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable - Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat +- Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME} * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From bac4255793e25db3745b44deaf310421c9b98215 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 10:13:20 -0400 Subject: [PATCH 063/354] Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken --- tomcat-7.0-tool-wrapper.script | 2 +- tomcat.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat-7.0-tool-wrapper.script b/tomcat-7.0-tool-wrapper.script index 2640ce2..a43568b 100644 --- a/tomcat-7.0-tool-wrapper.script +++ b/tomcat-7.0-tool-wrapper.script @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" -BASE_JARS="commons-daemon tomcat/catalina servlet" +BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat.spec b/tomcat.spec index 723ab0c..e269eed 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -644,6 +644,7 @@ fi - Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable - Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat - Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME} +- Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 109dad6dbb4ac8056e6b5c62b445717b403667da Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 10:17:32 -0400 Subject: [PATCH 064/354] Resolves: rhbz#1364068 The command tomcat-digest doesn't work --- tomcat-7.0-digest.script | 2 +- tomcat.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat-7.0-digest.script b/tomcat-7.0-digest.script index 2ff7e64..86f05ec 100644 --- a/tomcat-7.0-digest.script +++ b/tomcat-7.0-digest.script @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" -BASE_JARS="commons-daemon tomcat/catalina servlet" +BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat.spec b/tomcat.spec index e269eed..832f606 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -645,6 +645,7 @@ fi - Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat - Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME} - Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken +- Resolves: rhbz#1364068 The command tomcat-digest doesn't work * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 8c1e26a72440fad616c20aa4deaa46033222c695 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 28 Mar 2016 15:18:37 -0400 Subject: [PATCH 065/354] Resolves: rhbz#1311499 Updating package causes tomcat to not start on boot --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 832f606..84b8203 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -504,9 +504,11 @@ EOF %preun # clean tempdir and workdir on removal or upgrade -%{_initrddir}/%{name} stop >/dev/null 2>&1 -/sbin/chkconfig --del %{name} %{__rm} -rf %{workdir}/* %{tempdir}/* +if [ "$1" = "0" ]; then + %{_initrddir}/%{name} stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi %postun jsp-%{jspspec}-api if [ "$1" = "0" ]; then @@ -646,6 +648,7 @@ fi - Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME} - Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken - Resolves: rhbz#1364068 The command tomcat-digest doesn't work +- Resolves: rhbz#1311499 Updating package causes tomcat to not start on boot * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 7cac3fa020f621b14a3c9f807c7c5ac8aea02f72 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 08:56:41 -0400 Subject: [PATCH 066/354] Resolves: rhbz#1352009 tomcat: multiple security vulnerabilities (updates to 7.0.70) This patch also removed the references to jaxrpc since the jar file is emtpy anyway. It was causing the javadoc phase to crash, so removing it resolves the build failure. --- .gitignore | 2 +- sources | 2 +- tomcat-7.0-tomcat-users-webapp.patch | 6 +-- ...h => tomcat-7.0.70-CompilerOptionsV8.patch | 50 +++++++++---------- ...5-build.patch => tomcat-7.0.70-build.patch | 40 +++++++++++---- tomcat.spec | 9 ++-- 6 files changed, 65 insertions(+), 44 deletions(-) rename tomcat-7.0.57-CompilerOptionsV8.patch => tomcat-7.0.70-CompilerOptionsV8.patch (73%) rename tomcat-7.0.65-build.patch => tomcat-7.0.70-build.patch (71%) diff --git a/.gitignore b/.gitignore index fd61fdd..27051a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ apache-tomcat-*-src.tar.gz - +apache-tomcat-*-src diff --git a/sources b/sources index 08fad59..e0d7898 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f26a57bbb9713c1a101e37243eaa2175 apache-tomcat-7.0.65-src.tar.gz +0f56c888df5002cce25fce91634a65c9 apache-tomcat-7.0.70-src.tar.gz diff --git a/tomcat-7.0-tomcat-users-webapp.patch b/tomcat-7.0-tomcat-users-webapp.patch index 9f05e37..860c4cf 100644 --- a/tomcat-7.0-tomcat-users-webapp.patch +++ b/tomcat-7.0-tomcat-users-webapp.patch @@ -1,8 +1,8 @@ --- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 +++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 @@ -23,4 +23,14 @@ - - + + --> + + @@ -13,5 +13,5 @@ + + + -+ ++ diff --git a/tomcat-7.0.57-CompilerOptionsV8.patch b/tomcat-7.0.70-CompilerOptionsV8.patch similarity index 73% rename from tomcat-7.0.57-CompilerOptionsV8.patch rename to tomcat-7.0.70-CompilerOptionsV8.patch index baf9fce..1edba43 100644 --- a/tomcat-7.0.57-CompilerOptionsV8.patch +++ b/tomcat-7.0.70-CompilerOptionsV8.patch @@ -1,43 +1,43 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500 -@@ -67,7 +67,6 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-06-16 09:53:52.793827761 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-06-16 09:59:29.809134932 -0400 +@@ -67,7 +67,6 @@ public class JDTCompiler extends org.apa /** * Compile the servlet from .java file to .class file */ - @Override protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { - -@@ -98,12 +97,10 @@ + +@@ -98,12 +97,10 @@ public class JDTCompiler extends org.apa this.sourceFile = sourceFile; } - + - @Override public char[] getFileName() { return sourceFile.toCharArray(); } - + - @Override public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -145,7 +142,6 @@ +@@ -145,7 +142,6 @@ public class JDTCompiler extends org.apa return result; } - + - @Override public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -154,7 +150,6 @@ +@@ -154,7 +150,6 @@ public class JDTCompiler extends org.apa return className.toCharArray(); } - + - @Override public char[][] getPackageName() { StringTokenizer izer = new StringTokenizer(className, "."); -@@ -166,7 +161,6 @@ +@@ -166,7 +161,6 @@ public class JDTCompiler extends org.apa return result; } @@ -45,39 +45,39 @@ public boolean ignoreOptionalProblems() { return false; } -@@ -174,7 +168,6 @@ +@@ -174,7 +168,6 @@ public class JDTCompiler extends org.apa final INameEnvironment env = new INameEnvironment() { - @Override public NameEnvironmentAnswer findType(char[][] compoundTypeName) { - String result = ""; -@@ -187,7 +180,6 @@ - return findType(result); + StringBuilder result = new StringBuilder(); +@@ -187,7 +180,6 @@ public class JDTCompiler extends org.apa + return findType(result.toString()); } - @Override public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { -@@ -269,7 +261,6 @@ +@@ -269,7 +261,6 @@ public class JDTCompiler extends org.apa } } - + - @Override public boolean isPackage(char[][] parentPackageName, char[] packageName) { - String result = ""; -@@ -293,7 +284,6 @@ - return isPackage(result); + StringBuilder result = new StringBuilder(); +@@ -291,7 +282,6 @@ public class JDTCompiler extends org.apa + return isPackage(result.toString()); } - @Override public void cleanup() { } -@@ -342,9 +332,6 @@ +@@ -340,9 +330,6 @@ public class JDTCompiler extends org.apa } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); @@ -87,7 +87,7 @@ } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -386,11 +373,6 @@ +@@ -384,11 +371,6 @@ public class JDTCompiler extends org.apa CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); @@ -99,9 +99,9 @@ } else { log.warn("Unknown target VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -408,7 +390,6 @@ +@@ -406,7 +388,6 @@ public class JDTCompiler extends org.apa new DefaultProblemFactory(Locale.getDefault()); - + final ICompilerRequestor requestor = new ICompilerRequestor() { - @Override public void acceptResult(CompilationResult result) { diff --git a/tomcat-7.0.65-build.patch b/tomcat-7.0.70-build.patch similarity index 71% rename from tomcat-7.0.65-build.patch rename to tomcat-7.0.70-build.patch index 5e98385..6c8d8cc 100644 --- a/tomcat-7.0.65-build.patch +++ b/tomcat-7.0.70-build.patch @@ -1,8 +1,17 @@ ---- build.xml 2015-12-11 07:27:23.026996172 -0500 -+++ build.xml 2015-12-11 07:29:46.762002209 -0500 -@@ -1042,12 +1042,11 @@ +--- build.xml.orig 2016-06-15 12:45:47.000000000 -0400 ++++ build.xml 2016-07-01 12:01:58.494022657 -0400 +@@ -213,7 +213,7 @@ + + + +- ++ + + + +@@ -1046,12 +1046,11 @@ - + - - @@ -15,7 +24,18 @@ -@@ -2826,7 +2825,7 @@ Apache Tomcat ${version} native binaries +@@ -1699,8 +1698,8 @@ + + + +- ++ + + +@@ -2814,7 +2813,7 @@ @@ -24,7 +44,7 @@ -@@ -2857,7 +2856,7 @@ Apache Tomcat ${version} native binaries +@@ -2845,7 +2844,7 @@ @@ -33,7 +53,7 @@ -@@ -2886,7 +2885,7 @@ Apache Tomcat ${version} native binaries +@@ -2874,7 +2873,7 @@ @@ -42,12 +62,12 @@ -@@ -2927,7 +2926,7 @@ Apache Tomcat ${version} native binaries - +@@ -2915,7 +2914,7 @@ + - + - + diff --git a/tomcat.spec b/tomcat.spec index 84b8203..d45dcc3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 65 +%global micro_version 70 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -81,9 +81,9 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 -Patch2: %{name}-7.0.57-CompilerOptionsV8.patch +Patch2: %{name}-7.0.70-CompilerOptionsV8.patch # Adding patch to remove unsupport ant tasks/attributes -Patch3: %{name}-7.0.65-build.patch +Patch3: %{name}-7.0.70-build.patch Patch4: %{name}-7.0-catalina-policy.patch BuildArch: noarch @@ -638,7 +638,7 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Fri Aug 05 2016 Coty Sutherland 0:7.0.65-2 +* Fri Aug 05 2016 Coty Sutherland 0:7.0.70-1 - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out @@ -649,6 +649,7 @@ fi - Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken - Resolves: rhbz#1364068 The command tomcat-digest doesn't work - Resolves: rhbz#1311499 Updating package causes tomcat to not start on boot +- Resolves: rhbz#1352009 tomcat: multiple security vulnerabilities (updates to 7.0.70) * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65 From 817844a3cdb31b8b0b95d477fe424d6ff3aabaf9 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 11:17:22 -0400 Subject: [PATCH 067/354] Apparently my attention to detail caused a problem here. Whitespace cleaned up in my patch files caused them to fail to apply :( --- tomcat-7.0-catalina-policy.patch | 8 +++-- tomcat-7.0.70-CompilerOptionsV8.patch | 42 +++++++++++++-------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/tomcat-7.0-catalina-policy.patch b/tomcat-7.0-catalina-policy.patch index 3f7dbc7..494e696 100644 --- a/tomcat-7.0-catalina-policy.patch +++ b/tomcat-7.0-catalina-policy.patch @@ -1,6 +1,6 @@ ---- conf/catalina.policy 2016-07-07 16:31:44.473000159 -0400 -+++ conf/catalina.policy 2016-07-07 16:32:14.349000359 -0400 -@@ -51,6 +51,36 @@ +--- conf/catalina.policy.orig 2016-08-05 11:13:17.192398668 -0400 ++++ conf/catalina.policy 2016-08-05 11:13:40.855396127 -0400 +@@ -51,6 +51,34 @@ }; @@ -30,6 +30,8 @@ +grant codeBase "file:/usr/share/java/log4j.jar" { + permission java.security.AllPermission; +}; ++ + // ========== CATALINA CODE PERMISSIONS ======================================= + diff --git a/tomcat-7.0.70-CompilerOptionsV8.patch b/tomcat-7.0.70-CompilerOptionsV8.patch index 1edba43..63c352f 100644 --- a/tomcat-7.0.70-CompilerOptionsV8.patch +++ b/tomcat-7.0.70-CompilerOptionsV8.patch @@ -1,43 +1,43 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-06-16 09:53:52.793827761 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-06-16 09:59:29.809134932 -0400 -@@ -67,7 +67,6 @@ public class JDTCompiler extends org.apa +--- java/org/apache/jasper/compiler/JDTCompiler.java 2016-08-05 10:42:20.654618855 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-08-05 10:44:51.486599219 -0400 +@@ -67,7 +67,6 @@ /** * Compile the servlet from .java file to .class file */ - @Override protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { - -@@ -98,12 +97,10 @@ public class JDTCompiler extends org.apa + +@@ -98,12 +97,10 @@ this.sourceFile = sourceFile; } - + - @Override public char[] getFileName() { return sourceFile.toCharArray(); } - + - @Override public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -145,7 +142,6 @@ public class JDTCompiler extends org.apa +@@ -145,7 +142,6 @@ return result; } - + - @Override public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -154,7 +150,6 @@ public class JDTCompiler extends org.apa +@@ -154,7 +150,6 @@ return className.toCharArray(); } - + - @Override public char[][] getPackageName() { StringTokenizer izer = new StringTokenizer(className, "."); -@@ -166,7 +161,6 @@ public class JDTCompiler extends org.apa +@@ -166,7 +161,6 @@ return result; } @@ -45,7 +45,7 @@ public boolean ignoreOptionalProblems() { return false; } -@@ -174,7 +168,6 @@ public class JDTCompiler extends org.apa +@@ -174,7 +168,6 @@ final INameEnvironment env = new INameEnvironment() { @@ -53,7 +53,7 @@ public NameEnvironmentAnswer findType(char[][] compoundTypeName) { StringBuilder result = new StringBuilder(); -@@ -187,7 +180,6 @@ public class JDTCompiler extends org.apa +@@ -187,7 +180,6 @@ return findType(result.toString()); } @@ -61,15 +61,15 @@ public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { -@@ -269,7 +261,6 @@ public class JDTCompiler extends org.apa +@@ -269,7 +261,6 @@ } } - + - @Override public boolean isPackage(char[][] parentPackageName, char[] packageName) { StringBuilder result = new StringBuilder(); -@@ -291,7 +282,6 @@ public class JDTCompiler extends org.apa +@@ -291,7 +282,6 @@ return isPackage(result.toString()); } @@ -77,7 +77,7 @@ public void cleanup() { } -@@ -340,9 +330,6 @@ public class JDTCompiler extends org.apa +@@ -340,9 +330,6 @@ } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); @@ -87,7 +87,7 @@ } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -384,11 +371,6 @@ public class JDTCompiler extends org.apa +@@ -384,11 +371,6 @@ CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); @@ -99,9 +99,9 @@ } else { log.warn("Unknown target VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -406,7 +388,6 @@ public class JDTCompiler extends org.apa +@@ -406,7 +388,6 @@ new DefaultProblemFactory(Locale.getDefault()); - + final ICompilerRequestor requestor = new ICompilerRequestor() { - @Override public void acceptResult(CompilationResult result) { From 79044f754b1bc1be7685f9e57f2fbbd4e2edb903 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 11:23:57 -0400 Subject: [PATCH 068/354] Updating the release to 1 for the first build of 7.0.70 --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index d45dcc3..eab6bcb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons From 36a3e9ffec3336d29483c6830c171ed09e9b1254 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 15:17:10 -0400 Subject: [PATCH 069/354] Related: rhbz#1314177 Had to fix a minor syntax issue that caused it to improperly eval --- tomcat-7.0.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index bf0b5fc..c020083 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -289,7 +289,7 @@ case "$1" in RETVAL="1" fi else - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f \"${NAME}[ $]\")" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "${NAME}[ $]")" if [ -z "$pid" ]; then # status ${NAME} # RETVAL="$?" @@ -301,7 +301,7 @@ case "$1" in fi fi if [ -f /var/lock/subsys/${NAME} ]; then - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f \"${NAME}[ $]\")" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "${NAME}[ $]")" # The lockfile exists but the process is not running if [ -z "$pid" ]; then log_failure_msg "${NAME} lockfile exists but process is not running" From 35e239433c7a32610637e9ef671c9e03e13d3a8b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Aug 2016 15:21:26 -0400 Subject: [PATCH 070/354] Related: rhbz#1314177 Had to fix a minor syntax issue that caused it to improperly eval. Bumping release to rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index eab6bcb..099b39e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -638,6 +638,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Aug 05 2016 Coty Sutherland 0:7.0.70-2 +- Related: rhbz#1314177 Had to fix a minor syntax issue that caused it to improperly eval + * Fri Aug 05 2016 Coty Sutherland 0:7.0.70-1 - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) From 6bc593d2ccef648d0776aa8f4f52a0d225565f6b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 4 Aug 2016 08:05:02 -0400 Subject: [PATCH 071/354] Resolves: rhbz#1364056 The command tomcat-digest doesn't work --- tomcat-8.0-digest.script | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat-8.0-digest.script b/tomcat-8.0-digest.script index 2ff7e64..ce4aa0f 100644 --- a/tomcat-8.0-digest.script +++ b/tomcat-8.0-digest.script @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" -BASE_JARS="commons-daemon tomcat/catalina servlet" +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 diff --git a/tomcat.spec b/tomcat.spec index 3a8850e..ee606a8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -679,6 +679,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Aug 04 2016 Coty Sutherland - 1:8.0.32-5 +- Resolves: rhbz#1364056 The command tomcat-digest doesn't work + * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 - Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 From 43760819ea5808bea519c008cae0a1f1657c82f3 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 3 Aug 2016 16:12:06 -0400 Subject: [PATCH 072/354] Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken --- tomcat-8.0-tool-wrapper.script | 2 +- tomcat.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat-8.0-tool-wrapper.script b/tomcat-8.0-tool-wrapper.script index 2640ce2..949d46d 100644 --- a/tomcat-8.0-tool-wrapper.script +++ b/tomcat-8.0-tool-wrapper.script @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" -BASE_JARS="commons-daemon tomcat/catalina servlet" +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 diff --git a/tomcat.spec b/tomcat.spec index ee606a8..f429dc3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -679,8 +679,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -* Thu Aug 04 2016 Coty Sutherland - 1:8.0.32-5 +* Mon Aug 08 2016 Coty Sutherland - 1:8.0.32-5 - Resolves: rhbz#1364056 The command tomcat-digest doesn't work +- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From 50c91f3fe283a1b0f8744cd2541da3e45d736e98 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 14:45:28 -0400 Subject: [PATCH 073/354] Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) --- sources | 2 +- tomcat-8.0-tomcat-users-webapp.patch | 6 +++--- tomcat-8.0.36-CompilerOptionsV9.patch | 24 ++++++++++++++++++++++++ tomcat.spec | 10 +++++++--- 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 tomcat-8.0.36-CompilerOptionsV9.patch diff --git a/sources b/sources index c2a102c..525648d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8a1a0f811f6ffe0a4ccc1132c442d8b apache-tomcat-8.0.32-src.tar.gz +be048e9ffa26957892933c9fa6bca0d8 apache-tomcat-8.0.36-src.tar.gz diff --git a/tomcat-8.0-tomcat-users-webapp.patch b/tomcat-8.0-tomcat-users-webapp.patch index 9f05e37..860c4cf 100644 --- a/tomcat-8.0-tomcat-users-webapp.patch +++ b/tomcat-8.0-tomcat-users-webapp.patch @@ -1,8 +1,8 @@ --- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 +++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 @@ -23,4 +23,14 @@ - - + + --> + + @@ -13,5 +13,5 @@ + + + -+ ++ diff --git a/tomcat-8.0.36-CompilerOptionsV9.patch b/tomcat-8.0.36-CompilerOptionsV9.patch new file mode 100644 index 0000000..0b44236 --- /dev/null +++ b/tomcat-8.0.36-CompilerOptionsV9.patch @@ -0,0 +1,24 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-07-01 14:39:19.728255958 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-07-01 14:39:37.191311760 -0400 +@@ -312,9 +312,6 @@ + } else if(opt.equals("1.8")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_8); +- } else if(opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_9); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -361,11 +358,6 @@ + CompilerOptions.VERSION_1_8); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_8); +- } else if(opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_9); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_9); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/tomcat.spec b/tomcat.spec index f429dc3..be5d53b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 32 +%global micro_version 36 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -86,6 +86,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +Patch2: %{name}-8.0.36-CompilerOptionsV9.patch BuildArch: noarch @@ -237,6 +238,8 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 +%patch2 -p0 + %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -679,7 +682,8 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog -* Mon Aug 08 2016 Coty Sutherland - 1:8.0.32-5 +* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 +- Resolves: rhbz#1349463 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) - Resolves: rhbz#1364056 The command tomcat-digest doesn't work - Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken From 5d682aa9e1abcec962dfb851bae942b59dbcfa86 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 17 Jun 2016 17:46:17 -0400 Subject: [PATCH 074/354] Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully --- tomcat-8.0.service | 1 - tomcat.spec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat-8.0.service b/tomcat-8.0.service index 103d464..2b20aa0 100644 --- a/tomcat-8.0.service +++ b/tomcat-8.0.service @@ -13,7 +13,6 @@ EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start -ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 User=tomcat Group=tomcat diff --git a/tomcat.spec b/tomcat.spec index be5d53b..e017fa1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -686,6 +686,7 @@ fi - Resolves: rhbz#1349463 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) - Resolves: rhbz#1364056 The command tomcat-digest doesn't work - Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken +- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From 4dc51a6a96283e917df086e08e7b8bd6c562c6c9 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 14:14:32 -0400 Subject: [PATCH 075/354] Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) --- tomcat-8.0-catalina-policy.patch | 39 ++++++++++++++++++++++++++++++++ tomcat.spec | 1 + 2 files changed, 40 insertions(+) create mode 100644 tomcat-8.0-catalina-policy.patch diff --git a/tomcat-8.0-catalina-policy.patch b/tomcat-8.0-catalina-policy.patch new file mode 100644 index 0000000..3694929 --- /dev/null +++ b/tomcat-8.0-catalina-policy.patch @@ -0,0 +1,39 @@ +--- conf/catalina.policy~ 2016-06-17 10:20:17.649171968 -0400 ++++ conf/catalina.policy 2016-06-17 10:23:35.358309244 -0400 +@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex + permission java.security.AllPermission; + }; + ++// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= ++ ++// Allowing everything in /usr/share/java allows too many unknowns to be permitted ++// Specifying the individual jars that tomcat needs to function with the security manager ++// is the safest way forward. ++grant codeBase "file:/usr/share/java/tomcat-servlet-3.0-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/log4j.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/ecj.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/apache-commons-pool.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/apache-commons-dbcp.jar" { ++ permission java.security.AllPermission; ++}; ++grant codeBase "file:/usr/share/java/apache-commons-collections.jar" { ++ permission java.security.AllPermission; ++}; ++ + + // ========== CATALINA CODE PERMISSIONS ======================================= + diff --git a/tomcat.spec b/tomcat.spec index e017fa1..258a218 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -687,6 +687,7 @@ fi - Resolves: rhbz#1364056 The command tomcat-digest doesn't work - Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken - Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully +- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From b6ffa60f91cee48ba29d09503b0df3b85d6abc16 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 13:58:16 -0400 Subject: [PATCH 076/354] Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out --- tomcat.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 258a218..7a7dab8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -596,8 +596,8 @@ fi %defattr(0664,tomcat,root,0770) %attr(0770,tomcat,root) %dir %{logdir} %defattr(0664,root,tomcat,0770) -%attr(0660,tomcat,tomcat) %{logdir}/catalina.out -%attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid +%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out +%attr(0644,tomcat,tomcat) %verify(not size md5 mtime) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} %attr(0770,root,tomcat) %dir %{tempdir} %attr(0770,root,tomcat) %dir %{workdir} @@ -688,6 +688,7 @@ fi - Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken - Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully - Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) +- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From ea624b137132b3935a082c79fb44672cdfb475df Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Jul 2016 13:47:54 -0400 Subject: [PATCH 077/354] Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded --- tomcat-8.0-jsvc.service | 1 + tomcat-functions | 12 ++++++------ tomcat.spec | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.0-jsvc.service index 8275796..f480324 100644 --- a/tomcat-8.0-jsvc.service +++ b/tomcat-8.0-jsvc.service @@ -14,6 +14,7 @@ After=syslog.target network.target Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" "USE_JSVC=true" +EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop diff --git a/tomcat-functions b/tomcat-functions index 6f03951..ab08fa2 100644 --- a/tomcat-functions +++ b/tomcat-functions @@ -15,12 +15,12 @@ _save_function() { 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" + 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}" "${@}" diff --git a/tomcat.spec b/tomcat.spec index 7a7dab8..2a3cdc1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -689,6 +689,7 @@ fi - Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully - Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out +- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From 2b099c582bad923ddb1bc15d2102eb263e54e644 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 8 Aug 2016 16:38:52 -0400 Subject: [PATCH 078/354] Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api --- tomcat.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 2a3cdc1..1a4fa89 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -516,6 +516,14 @@ done %{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom %add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar +# tomcat-websocket-api +%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom +%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar + +# tomcat-tomcat-websocket +%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom +%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar + mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf < - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From d64bf2e904e2fd0484832ccda3f1e621b4730d48 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 8 Aug 2016 17:34:21 -0400 Subject: [PATCH 079/354] Resolves: asfbz#59960 Building javadocs with java8 fails --- tomcat-8.0.36-asfbz-59960.patch | 13 +++++++++++++ tomcat.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 tomcat-8.0.36-asfbz-59960.patch diff --git a/tomcat-8.0.36-asfbz-59960.patch b/tomcat-8.0.36-asfbz-59960.patch new file mode 100644 index 0000000..20de181 --- /dev/null +++ b/tomcat-8.0.36-asfbz-59960.patch @@ -0,0 +1,13 @@ +Index: java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java +=================================================================== +--- java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (revision 1755541) ++++ java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (working copy) +@@ -18,7 +18,7 @@ + + /** + * @deprecated Originally provided an optional implementation that used Java 5+ +- * features. Now the minimum Java version is >=5, those features ++ * features. Now the minimum Java version is >=5, those features + * have been added to {@link MessageDispatchInterceptor} which + * should be used instead. This class will be removed in Tomcat + * 8.5.x onwards. diff --git a/tomcat.spec b/tomcat.spec index 1a4fa89..6f162cb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -87,6 +87,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch +Patch3: %{name}-8.0.36-asfbz-59960.patch BuildArch: noarch @@ -239,6 +240,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -701,6 +703,7 @@ fi - Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out - Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded - Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api +- Resolves: asfbz#59960 Building javadocs with java8 fails * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 From d5efee4acc4063fefe6e1152d9ae561252e5080d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 11 Aug 2016 14:05:18 -0400 Subject: [PATCH 080/354] Related: rhbz#1349469 Correct typo in changelog entry --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 6f162cb..c0dfcd3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -694,8 +694,11 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 +- Related: rhbz#1349469 Correct typo in changelog entry + * Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 -- Resolves: rhbz#1349463 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) +- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) - Resolves: rhbz#1364056 The command tomcat-digest doesn't work - Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken - Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully From 5a42e79227cf45c151135f19465a8c13d3778f8a Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 17 Aug 2016 16:06:51 -0400 Subject: [PATCH 081/354] Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones) --- tomcat.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 099b39e..3cc6dcd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -117,8 +117,8 @@ Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig -Requires(post): redhat-lsb -Requires(preun): redhat-lsb +Requires(post): /lib/lsb/init-functions +Requires(preun): /lib/lsb/init-functions %description Tomcat is the servlet container that is used in the official Reference @@ -638,6 +638,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Aug 17 2016 Coty Sutherland 0:7.0.70-3 +- Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones) + * Fri Aug 05 2016 Coty Sutherland 0:7.0.70-2 - Related: rhbz#1314177 Had to fix a minor syntax issue that caused it to improperly eval From fe6d560133c35f3e7fcf1ca0a55ff1a4f13cbe0d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 13 Sep 2016 13:03:04 -0400 Subject: [PATCH 082/354] Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header --- sources | 2 +- tomcat-8.0.36-asfbz-59960.patch | 13 ------------- tomcat-8.0.37-javadoc-fix.patch | 13 +++++++++++++ tomcat.spec | 10 +++++++--- 4 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 tomcat-8.0.36-asfbz-59960.patch create mode 100644 tomcat-8.0.37-javadoc-fix.patch diff --git a/sources b/sources index 525648d..739ef6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be048e9ffa26957892933c9fa6bca0d8 apache-tomcat-8.0.36-src.tar.gz +8723324d35eed02a4aa979066d810d86 apache-tomcat-8.0.37-src.tar.gz diff --git a/tomcat-8.0.36-asfbz-59960.patch b/tomcat-8.0.36-asfbz-59960.patch deleted file mode 100644 index 20de181..0000000 --- a/tomcat-8.0.36-asfbz-59960.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java -=================================================================== ---- java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (revision 1755541) -+++ java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (working copy) -@@ -18,7 +18,7 @@ - - /** - * @deprecated Originally provided an optional implementation that used Java 5+ -- * features. Now the minimum Java version is >=5, those features -+ * features. Now the minimum Java version is >=5, those features - * have been added to {@link MessageDispatchInterceptor} which - * should be used instead. This class will be removed in Tomcat - * 8.5.x onwards. diff --git a/tomcat-8.0.37-javadoc-fix.patch b/tomcat-8.0.37-javadoc-fix.patch new file mode 100644 index 0000000..502f373 --- /dev/null +++ b/tomcat-8.0.37-javadoc-fix.patch @@ -0,0 +1,13 @@ +Index: java/org/apache/catalina/servlets/CGIServlet.java +=================================================================== +--- java/org/apache/catalina/servlets/CGIServlet.java (revision 1759564) ++++ java/org/apache/catalina/servlets/CGIServlet.java (revision 1759565) +@@ -358,7 +358,7 @@ + * + * @exception IOException if a write operation exception occurs + * +- * @deprecated Use {@link #printServletEnvironment(HttpServletRequest). ++ * @deprecated Use {@link #printServletEnvironment(HttpServletRequest)}. + * This will be removed in Tomcat 8.5.X onwards + */ + @Deprecated diff --git a/tomcat.spec b/tomcat.spec index c0dfcd3..4c02fed 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 36 +%global micro_version 37 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -87,7 +87,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch -Patch3: %{name}-8.0.36-asfbz-59960.patch +Patch3: %{name}-8.0.37-javadoc-fix.patch BuildArch: noarch @@ -694,6 +694,10 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 +- Rebase to 8.0.37 +- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header + * Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 - Related: rhbz#1349469 Correct typo in changelog entry From 55c043f4292055fdd2694a1eca38cea80a0e0fde Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 13 Sep 2016 14:44:55 -0400 Subject: [PATCH 083/354] Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated --- tomcat.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 4c02fed..8a42bd3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -337,7 +337,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/run %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats /bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}.pid -/bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir} @@ -599,14 +598,12 @@ fi %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}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %verify(not size md5 mtime) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} %attr(0770,root,tomcat) %dir %{tempdir} @@ -692,11 +689,14 @@ fi %files jsvc %defattr(755,root,root,0755) %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog * Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 - Rebase to 8.0.37 - Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header +- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated * Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 - Related: rhbz#1349469 Correct typo in changelog entry From 25759ac67c46a47304d707404f1f002e3834a014 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 23 Sep 2016 16:32:11 -0400 Subject: [PATCH 084/354] Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e0d7898..7e4e264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f56c888df5002cce25fce91634a65c9 apache-tomcat-7.0.70-src.tar.gz +e176d014e49685e2642f7abd8eb7b53b apache-tomcat-7.0.72-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 3cc6dcd..2db8839 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 70 +%global micro_version 72 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -638,6 +638,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Sep 23 2016 Coty Sutherland 0:7.0.70-4 +- Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header + * Wed Aug 17 2016 Coty Sutherland 0:7.0.70-3 - Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones) From 2d519e3c751dbe637f62af1d288ba38f783b53be Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 23 Sep 2016 16:59:38 -0400 Subject: [PATCH 085/354] Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script --- tomcat-7.0.init | 11 ++++++++--- tomcat.spec | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index c020083..f3a4f2b 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -66,6 +66,9 @@ TOMCAT_PROG="${NAME}" # Define the tomcat username TOMCAT_USER="${TOMCAT_USER:-tomcat}" +# Define the tomcat group +TOMCAT_GROUP="${TOMCAT_GROUP:-`id -gn $TOMCAT_USER`}" + # Define the tomcat log file TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" @@ -122,7 +125,7 @@ function makeHomeDir() { cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps - chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} + install -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} -d -m 0770 /var/log/${NAME} fi } @@ -166,11 +169,13 @@ function start() { # fix permissions on the log and pid files touch $CATALINA_PID 2>&1 || RETVAL="4" if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID + install -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} -m 644 /dev/null "${CATALINA_PID}" fi [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then - chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG + if [ ! -f "${TOMCAT_LOG}" ]; then + install -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} -m 644 /dev/null "${TOMCAT_LOG}" + fi fi if [ "$CATALINA_HOME" != "/usr/share/tomcat" -a "$RETVAL" -eq "0" ]; then # Create a tomcat directory if it doesn't exist diff --git a/tomcat.spec b/tomcat.spec index 2db8839..edbfc34 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -640,6 +640,7 @@ fi %changelog * Fri Sep 23 2016 Coty Sutherland 0:7.0.70-4 - Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header +- Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script * Wed Aug 17 2016 Coty Sutherland 0:7.0.70-3 - Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones) From 53a0501e50cf5e9595f4d75198b78b914b800a30 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 23 Sep 2016 17:00:13 -0400 Subject: [PATCH 086/354] Updating changelog version --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index edbfc34..7c4e1a4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -638,7 +638,7 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Fri Sep 23 2016 Coty Sutherland 0:7.0.70-4 +* Fri Sep 23 2016 Coty Sutherland 0:7.0.72-1 - Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header - Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script From 99a815126836fa46e781a52cfa9427da74bd4dd6 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Sun, 25 Sep 2016 14:30:39 -0400 Subject: [PATCH 087/354] Resolves: rhbz#1379170 jsvc script is broken --- tomcat-7.0-jsvc.wrapper | 20 +++++++++++++------- tomcat.spec | 1 + 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tomcat-7.0-jsvc.wrapper b/tomcat-7.0-jsvc.wrapper index 56fcc09..3bcff1e 100644 --- a/tomcat-7.0-jsvc.wrapper +++ b/tomcat-7.0-jsvc.wrapper @@ -8,13 +8,16 @@ else fi # Get the tomcat config (use this for environment specific settings) -#if [ -z "${TOMCAT_CFG}" ]; then -# TOMCAT_CFG="/etc/tomcat/tomcat.conf" -#fi +# if $TOMCAT_CFG wasn't already loaded +if [ -z "${TOMCAT_CFG_LOADED}" ]; then + if [ -z "${TOMCAT_CFG}" ]; then + TOMCAT_CFG="/etc/tomcat/tomcat.conf" + fi -#if [ -r "$TOMCAT_CFG" ]; then -# . $TOMCAT_CFG -#fi + if [ -r "$TOMCAT_CFG" ]; then + . $TOMCAT_CFG + fi +fi set_javacmd @@ -29,6 +32,9 @@ CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" # if jsvc installed and USE_JSVC=true # then use jsvc instead of calling java directly if [ -x /usr/bin/jsvc ]; then + # Command to use for version so it doesn't use jsvc + VER_JAVACMD=$JAVACMD + JAVACMD="/usr/bin/jsvc -nodetach -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out" if [ "$1" = "stop" ]; then JAVACMD="${JAVACMD} -stop" @@ -75,7 +81,7 @@ elif [ "$1" = "stop" ]; then org.apache.catalina.startup.Bootstrap stop \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 elif [ "$1" = "version" ]; then - ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ + ${VER_JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ org.apache.catalina.util.ServerInfo else echo "Usage: $0 {start|start-security|stop|version}" diff --git a/tomcat.spec b/tomcat.spec index 7c4e1a4..40b31f7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -641,6 +641,7 @@ fi * Fri Sep 23 2016 Coty Sutherland 0:7.0.72-1 - Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header - Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script +- Resolves: rhbz#1379170 jsvc script is broken * Wed Aug 17 2016 Coty Sutherland 0:7.0.70-3 - Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones) From ca41eb1168269e61f504942590b3eb74740b27cd Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 13 Oct 2016 05:00:29 -0400 Subject: [PATCH 088/354] Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service --- tomcat.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 8a42bd3..45e1e85 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -334,9 +334,7 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir} /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out -%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/run %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats -/bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}.pid %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir} @@ -525,11 +523,6 @@ done %{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom %add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar -mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d -cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf < - 1:8.0.37-2 +- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service + * Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 - Rebase to 8.0.37 - Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header From 6452f0b23bf74e80a66b58348f2998b812e620b4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Sun, 23 Oct 2016 19:11:56 -0400 Subject: [PATCH 089/354] Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation --- tomcat.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 45e1e85..e31319e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -591,28 +591,31 @@ fi %attr(0644,root,root) %{_libexecdir}/%{name}/functions %attr(0755,root,root) %{_libexecdir}/%{name}/preamble %attr(0755,root,root) %{_libexecdir}/%{name}/server -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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(0664,root,tomcat,0775) + +%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(0775,root,tomcat) %dir %{confdir}/conf.d -%attr(0664,tomcat,tomcat) %{confdir}/conf.d/README -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml -%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml +%attr(0755,root,tomcat) %dir %{confdir}/conf.d +%{confdir}/conf.d/README +%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 +%config(noreplace) %{confdir}/web.xml %dir %{homedir} %{bindir}/bootstrap.jar %{bindir}/catalina-tasks.xml @@ -684,6 +687,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 +- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation + * Thu Oct 13 2016 Coty Sutherland - 1:8.0.37-2 - Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service From ca7279eaa68c1a059dc4aae4fbc5ebfba607c337 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Sun, 23 Oct 2016 19:33:16 -0400 Subject: [PATCH 090/354] I forgot to bump the release --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index e31319e..cb486ae 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons From 387c0999f622e4c1c6ae587ffe900c6507b52c7a Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 25 Oct 2016 11:04:12 -0400 Subject: [PATCH 091/354] Update to 8.0.38 --- sources | 2 +- tomcat-8.0.37-javadoc-fix.patch | 13 ------------- tomcat.spec | 11 +++++------ 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 tomcat-8.0.37-javadoc-fix.patch diff --git a/sources b/sources index 739ef6e..4e45b2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8723324d35eed02a4aa979066d810d86 apache-tomcat-8.0.37-src.tar.gz +0090279f9a78c17115b520e70cb7116e apache-tomcat-8.0.38-src.tar.gz diff --git a/tomcat-8.0.37-javadoc-fix.patch b/tomcat-8.0.37-javadoc-fix.patch deleted file mode 100644 index 502f373..0000000 --- a/tomcat-8.0.37-javadoc-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: java/org/apache/catalina/servlets/CGIServlet.java -=================================================================== ---- java/org/apache/catalina/servlets/CGIServlet.java (revision 1759564) -+++ java/org/apache/catalina/servlets/CGIServlet.java (revision 1759565) -@@ -358,7 +358,7 @@ - * - * @exception IOException if a write operation exception occurs - * -- * @deprecated Use {@link #printServletEnvironment(HttpServletRequest). -+ * @deprecated Use {@link #printServletEnvironment(HttpServletRequest)}. - * This will be removed in Tomcat 8.5.X onwards - */ - @Deprecated diff --git a/tomcat.spec b/tomcat.spec index cb486ae..d3c9a5e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 37 +%global micro_version 38 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -87,7 +87,6 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch -Patch3: %{name}-8.0.37-javadoc-fix.patch BuildArch: noarch @@ -240,7 +239,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -687,10 +685,11 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 +- Update to 8.0.38 + * Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 - Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation - -* Thu Oct 13 2016 Coty Sutherland - 1:8.0.37-2 - Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service * Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 From 71d81d1e1e89765bd488925d1670a080a16ab34d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 29 Nov 2016 17:27:17 -0500 Subject: [PATCH 092/354] Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws Update to 8.0.39 --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4e45b2e..5a9dee3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0090279f9a78c17115b520e70cb7116e apache-tomcat-8.0.38-src.tar.gz +71cefedb0a9c7f70af6c866a1b322fca apache-tomcat-8.0.39-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index d3c9a5e..235b339 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 38 +%global micro_version 39 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -685,6 +685,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 +- Update to 8.0.39 +- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws + * Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 - Update to 8.0.38 From 449935b9adece9693ac1d38c40da5c9243a0e363 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 30 Nov 2016 09:52:02 -0500 Subject: [PATCH 093/354] Resolves: rhbz#1397495 CVE-2016-6816 CVE-2016-8735 tomcat: various flaws --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7e4e264..c9d3615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e176d014e49685e2642f7abd8eb7b53b apache-tomcat-7.0.72-src.tar.gz +c8391fe6504d2104835a2f7f883858ad apache-tomcat-7.0.73-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 40b31f7..2fd5e9f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 72 +%global micro_version 73 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -638,6 +638,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue Nov 29 2016 Coty Sutherland - 0:7.0.73-1 +- Update to 7.0.73 +- Resolves: rhbz#1397495 CVE-2016-6816 CVE-2016-8735 tomcat: various flaws + * Fri Sep 23 2016 Coty Sutherland 0:7.0.72-1 - Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header - Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script From e0f6e3167b76f273393156bfdf8ffd2160c38a7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:07:14 +0000 Subject: [PATCH 094/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 235b339..68d2c9f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -685,6 +685,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 - Update to 8.0.39 - Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws From bcf38b1abed501b25c6e21aa667899dbafa8b5b3 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 16 Feb 2017 15:34:40 -0500 Subject: [PATCH 095/354] Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing Update to 8.0.41 --- sources | 2 +- tomcat.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5a9dee3..36a5187 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71cefedb0a9c7f70af6c866a1b322fca apache-tomcat-8.0.39-src.tar.gz +SHA512 (apache-tomcat-8.0.41-src.tar.gz) = 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d diff --git a/tomcat.spec b/tomcat.spec index 68d2c9f..8ce382d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 39 +%global micro_version 41 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -685,6 +685,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 +- Update to 8.0.41 +- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing + * Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e7435cfab30bb7c9b4371b6f4f9994559890c976 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 16 Feb 2017 16:07:32 -0500 Subject: [PATCH 096/354] Update to 7.0.75 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c9d3615..2316b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8391fe6504d2104835a2f7f883858ad apache-tomcat-7.0.73-src.tar.gz +SHA512 (apache-tomcat-7.0.75-src.tar.gz) = 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 diff --git a/tomcat.spec b/tomcat.spec index 2fd5e9f..fc39d65 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 73 +%global micro_version 75 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -638,6 +638,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Feb 16 2017 Coty Sutherland - 0:7.0.75-1 +- Update to 7.0.75 + * Tue Nov 29 2016 Coty Sutherland - 0:7.0.73-1 - Update to 7.0.73 - Resolves: rhbz#1397495 CVE-2016-6816 CVE-2016-8735 tomcat: various flaws From e84a075a5a9b11c46ceb349a1c890ffe5306987f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 17 Feb 2017 14:23:24 -0500 Subject: [PATCH 097/354] Resolves: rhbz#1420223 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation --- tomcat.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index fc39d65..79cb8fb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -538,28 +538,31 @@ fi %attr(0755,root,root) %{_sbindir}/%{name} %attr(0755,root,root) %{_initrddir}/%{name} %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %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(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %attr(0644,tomcat,tomcat) %verify(not size md5 mtime) %{_localstatedir}/run/%{name}.pid %attr(0770,root,tomcat) %dir %{cachedir} %attr(0770,root,tomcat) %dir %{tempdir} %attr(0770,root,tomcat) %dir %{workdir} -%defattr(0664,root,tomcat,0775) + +%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(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml -%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml +%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 +%config(noreplace) %{confdir}/web.xml %dir %{homedir} %{_prefix}/lib/tmpfiles.d/%{name}.conf %{bindir}/bootstrap.jar @@ -640,6 +643,7 @@ fi %changelog * Thu Feb 16 2017 Coty Sutherland - 0:7.0.75-1 - Update to 7.0.75 +- Resolves: rhbz#1420223 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation * Tue Nov 29 2016 Coty Sutherland - 0:7.0.73-1 - Update to 7.0.73 From 7ea089f878290247ba685f93fa871b336d6b4989 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 17 Feb 2017 15:14:12 -0500 Subject: [PATCH 098/354] Resolves: rhbz#1372789 init script status command gives incorrect result --- tomcat-7.0.init | 4 ++-- tomcat.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index f3a4f2b..026adb9 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -294,7 +294,7 @@ case "$1" in RETVAL="1" fi else - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "${NAME}[ $]")" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "catalina\.base=${CATALINA_BASE}[ $]")" if [ -z "$pid" ]; then # status ${NAME} # RETVAL="$?" @@ -306,7 +306,7 @@ case "$1" in fi fi if [ -f /var/lock/subsys/${NAME} ]; then - pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "${NAME}[ $]")" + pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} -f "catalina\.base=${CATALINA_BASE}[ $]")" # The lockfile exists but the process is not running if [ -z "$pid" ]; then log_failure_msg "${NAME} lockfile exists but process is not running" diff --git a/tomcat.spec b/tomcat.spec index 79cb8fb..dfce3e4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -644,6 +644,7 @@ fi * Thu Feb 16 2017 Coty Sutherland - 0:7.0.75-1 - Update to 7.0.75 - Resolves: rhbz#1420223 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation +- Resolves: rhbz#1372789 init script status command gives incorrect result * Tue Nov 29 2016 Coty Sutherland - 0:7.0.73-1 - Update to 7.0.73 From bfc4824563781849d56892323b4e87faa277c853 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 31 Mar 2017 09:24:17 -0400 Subject: [PATCH 099/354] Update to 7.0.76 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2316b87..8597b5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.75-src.tar.gz) = 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 +SHA512 (apache-tomcat-7.0.76-src.tar.gz) = 5f469723fbbf77bb1cb7d3939cd8ab47e200bba4fcc0d6cb53ea8d1447ca126987f870b063b22f9bffa083601f0e3ac69fb2c32be723d8c7055a6acb93a749e1 diff --git a/tomcat.spec b/tomcat.spec index dfce3e4..4f2f60e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 75 +%global micro_version 76 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Mar 31 2017 Coty Sutherland - 0:7.0.76-1 +- Update to 7.0.76 + * Thu Feb 16 2017 Coty Sutherland - 0:7.0.75-1 - Update to 7.0.75 - Resolves: rhbz#1420223 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation From 0f6fb3909847999a3ad8fdada51d0c48eeed68d4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 31 Mar 2017 09:28:51 -0400 Subject: [PATCH 100/354] Update to 8.0.42 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 36a5187..81c0910 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.41-src.tar.gz) = 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d +SHA512 (apache-tomcat-8.0.42-src.tar.gz) = 973c04c1950caafc2221e0aa96e2b6d7ec5d7c7a90461208a97b81ca1631a223b1595c86def027186fbaf367605cfaa4a936ee7ce7860c01bf7a4f26399c4752 diff --git a/tomcat.spec b/tomcat.spec index 8ce382d..6ef99be 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 41 +%global micro_version 42 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -685,6 +685,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 +- Update to 8.0.42 + * Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 - Update to 8.0.41 - Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing From ed0c45ddd883d191b7dfbaf4612a84911dcaac9f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 11 Apr 2017 09:03:00 -0400 Subject: [PATCH 101/354] Update to 8.0.43 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 81c0910..e2b50ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.42-src.tar.gz) = 973c04c1950caafc2221e0aa96e2b6d7ec5d7c7a90461208a97b81ca1631a223b1595c86def027186fbaf367605cfaa4a936ee7ce7860c01bf7a4f26399c4752 +SHA512 (apache-tomcat-8.0.43-src.tar.gz) = aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b diff --git a/tomcat.spec b/tomcat.spec index 6ef99be..5bee033 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 42 +%global micro_version 43 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -685,6 +685,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 +- Update to 8.0.43 + * Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 - Update to 8.0.42 From cd0ac4a1ff4e73d808443d132192582437e82efd Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 11 Apr 2017 09:06:43 -0400 Subject: [PATCH 102/354] Update to 7.0.77 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8597b5a..9e8669d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.76-src.tar.gz) = 5f469723fbbf77bb1cb7d3939cd8ab47e200bba4fcc0d6cb53ea8d1447ca126987f870b063b22f9bffa083601f0e3ac69fb2c32be723d8c7055a6acb93a749e1 +SHA512 (apache-tomcat-7.0.77-src.tar.gz) = 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 diff --git a/tomcat.spec b/tomcat.spec index 4f2f60e..1ff4208 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 76 +%global micro_version 77 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue Apr 11 2017 Coty Sutherland - 0:7.0.77-1 +- Update to 7.0.77 + * Fri Mar 31 2017 Coty Sutherland - 0:7.0.76-1 - Update to 7.0.76 From 0e797f55f0bc5b8d2f359281f4b649089f5407d2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jun 2017 15:33:46 -0400 Subject: [PATCH 103/354] Resolves: rhbz#1459161 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9e8669d..ed7e98f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.77-src.tar.gz) = 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 +8232183c0484f7ab5a3aab5a734e0642 apache-tomcat-7.0.78-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 1ff4208..5fc85dc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 77 +%global micro_version 78 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Jun 09 2017 Coty Sutherland - 0:7.0.78-1 +- Update to 7.0.78 +- Resolves: rhbz#1459161 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism + * Tue Apr 11 2017 Coty Sutherland - 0:7.0.77-1 - Update to 7.0.77 From 85038a7beb4525b114218a729f884033e9b4167e Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jun 2017 15:39:00 -0400 Subject: [PATCH 104/354] Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e2b50ac..c8bb84d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.43-src.tar.gz) = aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b +b9eccb2c956aabd2c319e91ce308971b apache-tomcat-8.0.44-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 5bee033..169f6ec 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 43 +%global micro_version 44 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -685,6 +685,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 +- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism + * Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 - Update to 8.0.43 From e1abf5cd6dee5174693babb2792b20a8c5d35d43 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jun 2017 15:46:39 -0400 Subject: [PATCH 105/354] Updated sources with rhpkg instead of fedpkg accidentally. Fixing that --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c8bb84d..a673958 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9eccb2c956aabd2c319e91ce308971b apache-tomcat-8.0.44-src.tar.gz +SHA512 (apache-tomcat-8.0.44-src.tar.gz) = e9b793aeeced1c4bf8e1eabc7717dd839b13cbb886a2e3144fdc37f5ed14b4a0bff2c893221a4b29ccd3270950c1ebb37977588f3743b195c4e33796fad47abe From db12ab1d5e89664078d6affb200f9b96f82f6636 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jun 2017 15:47:27 -0400 Subject: [PATCH 106/354] Updated sources with rhpkg instead of fedpkg accidentally. Fixing that --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ed7e98f..9e8669d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8232183c0484f7ab5a3aab5a734e0642 apache-tomcat-7.0.78-src.tar.gz +SHA512 (apache-tomcat-7.0.77-src.tar.gz) = 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 From e12e1e78e78299071e5da5a38b23a7dc24c79fd7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jun 2017 15:54:14 -0400 Subject: [PATCH 107/354] Updated wrong source tar...this time it's right for sure --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 9e8669d..a825da8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.77-src.tar.gz) = 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 +SHA512 (apache-tomcat-7.0.78-src.tar.gz) = d623f8d04c23bfeb38f20eeaa5051db9ec16a945a727810ef0e0aa4179140d6089e1d5974276df23ab5e21ba50739a969766663af25cd74436377e14cba291dc From ac7bc260a5925796b09e4691dd0e61c2e1475704 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:25:50 +0000 Subject: [PATCH 108/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 169f6ec..54581b7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -685,6 +685,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 - Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism From 4b8fa750e763f7a42e7b58d9583a60a120baedd5 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 21 Aug 2017 10:26:03 -0400 Subject: [PATCH 109/354] Resolves: rhbz#1480621 CVE-2017-7674 tomcat: Cache Poisoning --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a825da8..ceccb82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.78-src.tar.gz) = d623f8d04c23bfeb38f20eeaa5051db9ec16a945a727810ef0e0aa4179140d6089e1d5974276df23ab5e21ba50739a969766663af25cd74436377e14cba291dc +bb0b227624b4d2134366ffe629e2fe2d apache-tomcat-7.0.81-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 5fc85dc..ea2a819 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 78 +%global micro_version 81 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Mon Aug 21 2017 Coty Sutherland - 0:7.0.81-1 +- Update to 7.0.81 +- Resolves: rhbz#1480621 CVE-2017-7674 tomcat: Cache Poisoning + * Fri Jun 09 2017 Coty Sutherland - 0:7.0.78-1 - Update to 7.0.78 - Resolves: rhbz#1459161 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism From 49ac0f639ecd32b70ce879ac11aebf1eac1bdf8a Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 21 Aug 2017 10:32:14 -0400 Subject: [PATCH 110/354] Updating sources with fedpkg instead of rhpkg... --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ceccb82..385fc09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb0b227624b4d2134366ffe629e2fe2d apache-tomcat-7.0.81-src.tar.gz +SHA512 (apache-tomcat-7.0.81-src.tar.gz) = 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b From 623e2f2fe03481f88a4562b4d9b0941b263560f1 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 21 Aug 2017 10:36:47 -0400 Subject: [PATCH 111/354] Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a673958..a01c193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.44-src.tar.gz) = e9b793aeeced1c4bf8e1eabc7717dd839b13cbb886a2e3144fdc37f5ed14b4a0bff2c893221a4b29ccd3270950c1ebb37977588f3743b195c4e33796fad47abe +SHA512 (apache-tomcat-8.0.46-src.tar.gz) = 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 diff --git a/tomcat.spec b/tomcat.spec index 54581b7..7460e82 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 44 +%global micro_version 46 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -685,6 +685,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 +- Update to 8.0.46 +- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning + * Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 95abd8ee71fad1a8f0ff6956c5b49850420937f2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 21 Aug 2017 10:54:20 -0400 Subject: [PATCH 112/354] Release 1 instead of 2 --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 7460e82..1c3ed2b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons From c154cf4359e3ad5d5f00523ee3699d05b00c5fea Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 21 Aug 2017 11:22:17 -0400 Subject: [PATCH 113/354] Adding temporary workaround for add_maven_depmap deprecation --- tomcat.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 1c3ed2b..9ff886e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -100,6 +100,11 @@ BuildRequires: apache-commons-pool BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 +%if 0%{?fedora} >= 27 +# add_maven_depmap is deprecated, using javapackages-local for now +# See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro +BuildRequires: javapackages-local +%endif BuildRequires: junit BuildRequires: geronimo-jaxrpc BuildRequires: wsdl4j From f62ae76aa7e9b459ff5262ef3237dcfbba296974 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 4 Oct 2017 08:57:15 -0400 Subject: [PATCH 114/354] Update to 8.0.47 Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a01c193..6a8aabc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.46-src.tar.gz) = 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 +SHA512 (apache-tomcat-8.0.47-src.tar.gz) = 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 diff --git a/tomcat.spec b/tomcat.spec index 9ff886e..d15494a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 46 +%global micro_version 47 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -690,6 +690,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 +- Update to 8.0.47 +- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 + * Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 - Update to 8.0.46 - Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning From 1e5a8963670d925c47c4ced9d2de22b595b3d3bb Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 4 Oct 2017 09:05:46 -0400 Subject: [PATCH 115/354] Update to 7.0.82 Resolves: rhbz#1497681 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 385fc09..c8ddf34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.81-src.tar.gz) = 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b +SHA512 (apache-tomcat-7.0.82-src.tar.gz) = fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db diff --git a/tomcat.spec b/tomcat.spec index ea2a819..a3f3341 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 81 +%global micro_version 82 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Oct 04 2017 Coty Sutherland - 0:7.0.82-1 +- Update to 7.0.82 +- Resolves: rhbz#1497681 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 + * Mon Aug 21 2017 Coty Sutherland - 0:7.0.81-1 - Update to 7.0.81 - Resolves: rhbz#1480621 CVE-2017-7674 tomcat: Cache Poisoning From 83edb0c5e8499b5ea8a1c41cb38daebc2870b5aa Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 24 Oct 2017 10:12:21 -0500 Subject: [PATCH 116/354] Change "zip -u" to "zip" Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition --- tomcat.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index d15494a..bc48119 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -299,25 +299,25 @@ popd mkdir -p META-INF cp -p %{SOURCE8} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF +zip output/build/lib/servlet-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF +zip output/build/lib/jsp-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE12} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF +zip output/build/lib/el-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE13} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF +zip output/build/lib/jasper-el.jar META-INF/MANIFEST.MF cp -p %{SOURCE14} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF +zip output/build/lib/jasper.jar META-INF/MANIFEST.MF cp -p %{SOURCE15} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF +zip output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE16} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF +zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %install # build initial path structure @@ -690,6 +690,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 +- Change "zip -u" to "zip" +- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition + * Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 - Update to 8.0.47 - Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 From 56956f7ea70830091dae66580cbcd9616683cf00 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 12 Dec 2017 09:14:28 -0600 Subject: [PATCH 117/354] Cleanup spec file conditionals --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index bc48119..151572f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -100,7 +100,7 @@ BuildRequires: apache-commons-pool BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # add_maven_depmap is deprecated, using javapackages-local for now # See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro BuildRequires: javapackages-local @@ -690,6 +690,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3 +- Cleanup spec file conditionals + * Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 - Change "zip -u" to "zip" - Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition From d28664612bf8b2e289b913b158bd22985adec7e1 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 08:48:31 -0500 Subject: [PATCH 118/354] Update to 8.0.49 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6a8aabc..dd38972 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.47-src.tar.gz) = 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 +SHA512 (apache-tomcat-8.0.49-src.tar.gz) = 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 diff --git a/tomcat.spec b/tomcat.spec index bc48119..8e47d5a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 47 +%global micro_version 49 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -690,6 +690,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 +- Update to 8.0.49 + * Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 - Change "zip -u" to "zip" - Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition From 586be331e6003e9d45b59d84227ac8ca5e48c091 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 08:54:42 -0500 Subject: [PATCH 119/354] Fix release for rebase --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 15665b0..54cf6b6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons From ac5e3ee050898dd67e4325c6d60a47be962449fc Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 08:56:29 -0500 Subject: [PATCH 120/354] Update to 7.0.84 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c8ddf34..9759435 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.82-src.tar.gz) = fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db +SHA512 (apache-tomcat-7.0.84-src.tar.gz) = ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74 diff --git a/tomcat.spec b/tomcat.spec index a3f3341..6dd14dc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 82 +%global micro_version 84 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -641,6 +641,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Feb 01 2018 Coty Sutherland - 0:7.0.84-1 +- Update to 7.0.84 + * Wed Oct 04 2017 Coty Sutherland - 0:7.0.82-1 - Update to 7.0.82 - Resolves: rhbz#1497681 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 From cf8509a357eb5f53b259d20610a65e99b7e6d5d0 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 10:09:27 -0500 Subject: [PATCH 121/354] The tomcat-native binary is no longer copied to bin. See http://svn.apache.org/r1818186 for more details --- tomcat.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 54cf6b6..0a4c8d9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -285,8 +285,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar - # remove the cruft we created - %{__rm} output/build/bin/tomcat-native.tar.gz pushd output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes %{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java From 04ebf2cc896ced610294c86e174908f7a3258c40 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 10:09:27 -0500 Subject: [PATCH 122/354] The tomcat-native binary is no longer copied to bin. See http://svn.apache.org/r1818186 for more details --- tomcat.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 6dd14dc..626cb2f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -277,8 +277,6 @@ export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps xalan-j2-serializer" output/build/lib/ecj.jar \ output/build/lib/jakarta-commons-dbcp.jar - # remove the cruft we created - %{__rm} output/build/bin/tomcat-native.tar.gz pushd output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes %{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java From b2405bc450a79279c4239562ccf3e9530fde8fcd Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Feb 2018 10:18:53 -0500 Subject: [PATCH 123/354] Update CompilerOptions patch to remove Java 1.9 version --- ... => tomcat-7.0.84-CompilerOptionsV89.patch | 56 +++++++++++-------- tomcat.spec | 2 +- 2 files changed, 33 insertions(+), 25 deletions(-) rename tomcat-7.0.70-CompilerOptionsV8.patch => tomcat-7.0.84-CompilerOptionsV89.patch (67%) diff --git a/tomcat-7.0.70-CompilerOptionsV8.patch b/tomcat-7.0.84-CompilerOptionsV89.patch similarity index 67% rename from tomcat-7.0.70-CompilerOptionsV8.patch rename to tomcat-7.0.84-CompilerOptionsV89.patch index 63c352f..aa379e0 100644 --- a/tomcat-7.0.70-CompilerOptionsV8.patch +++ b/tomcat-7.0.84-CompilerOptionsV89.patch @@ -1,14 +1,14 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java 2016-08-05 10:42:20.654618855 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-08-05 10:44:51.486599219 -0400 -@@ -67,7 +67,6 @@ - /** +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-02-01 10:13:12.975989687 -0500 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-02-01 10:15:47.913534769 -0500 +@@ -67,7 +67,6 @@ public class JDTCompiler extends org.apa + /** * Compile the servlet from .java file to .class file */ - @Override protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { -@@ -98,12 +97,10 @@ +@@ -98,12 +97,10 @@ public class JDTCompiler extends org.apa this.sourceFile = sourceFile; } @@ -16,28 +16,28 @@ public char[] getFileName() { return sourceFile.toCharArray(); } - + - @Override public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -145,7 +142,6 @@ +@@ -145,7 +142,6 @@ public class JDTCompiler extends org.apa return result; } - + - @Override public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -154,7 +150,6 @@ +@@ -154,7 +150,6 @@ public class JDTCompiler extends org.apa return className.toCharArray(); } - + - @Override public char[][] getPackageName() { - StringTokenizer izer = + StringTokenizer izer = new StringTokenizer(className, "."); -@@ -166,7 +161,6 @@ +@@ -166,7 +161,6 @@ public class JDTCompiler extends org.apa return result; } @@ -45,31 +45,31 @@ public boolean ignoreOptionalProblems() { return false; } -@@ -174,7 +168,6 @@ +@@ -174,7 +168,6 @@ public class JDTCompiler extends org.apa final INameEnvironment env = new INameEnvironment() { - @Override - public NameEnvironmentAnswer + public NameEnvironmentAnswer findType(char[][] compoundTypeName) { StringBuilder result = new StringBuilder(); -@@ -187,7 +180,6 @@ +@@ -187,7 +180,6 @@ public class JDTCompiler extends org.apa return findType(result.toString()); } - @Override - public NameEnvironmentAnswer - findType(char[] typeName, + public NameEnvironmentAnswer + findType(char[] typeName, char[][] packageName) { -@@ -269,7 +261,6 @@ +@@ -269,7 +261,6 @@ public class JDTCompiler extends org.apa } } - @Override - public boolean isPackage(char[][] parentPackageName, + public boolean isPackage(char[][] parentPackageName, char[] packageName) { StringBuilder result = new StringBuilder(); -@@ -291,7 +282,6 @@ +@@ -291,7 +282,6 @@ public class JDTCompiler extends org.apa return isPackage(result.toString()); } @@ -77,17 +77,20 @@ public void cleanup() { } -@@ -340,9 +330,6 @@ +@@ -340,12 +330,6 @@ public class JDTCompiler extends org.apa } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); +- } else if(opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_Source, +- "1.9"); // CompilerOptions.VERSION_1_9 } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -384,11 +371,6 @@ +@@ -387,16 +371,6 @@ public class JDTCompiler extends org.apa CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); @@ -96,12 +99,17 @@ - CompilerOptions.VERSION_1_8); - settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); +- } else if(opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- "1.9"); // CompilerOptions.VERSION_1_9 +- settings.put(CompilerOptions.OPTION_Compliance, +- "1.9"); // CompilerOptions.VERSION_1_9 } else { log.warn("Unknown target VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -406,7 +388,6 @@ +@@ -414,7 +388,6 @@ public class JDTCompiler extends org.apa new DefaultProblemFactory(Locale.getDefault()); - + final ICompilerRequestor requestor = new ICompilerRequestor() { - @Override public void acceptResult(CompilationResult result) { diff --git a/tomcat.spec b/tomcat.spec index 626cb2f..8bb6cb3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -81,7 +81,7 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 -Patch2: %{name}-7.0.70-CompilerOptionsV8.patch +Patch2: %{name}-7.0.84-CompilerOptionsV89.patch # Adding patch to remove unsupport ant tasks/attributes Patch3: %{name}-7.0.70-build.patch Patch4: %{name}-7.0-catalina-policy.patch From 8766ecaeb9cc59468963427b4eb34aafac6f1592 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:06:26 +0100 Subject: [PATCH 124/354] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- tomcat.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 0a4c8d9..ba7c74b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -57,7 +57,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -688,6 +688,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 +- Escape macros in %%changelog + * Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 - Update to 8.0.49 @@ -841,7 +844,7 @@ fi - Updated to 7.0.52 - Rewrite jsvc implementation, resolves: rhbz#1051743 - Switch to java-headless R, resolves: rhbz#1068566 -- Create and own %{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 +- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 - Add pom for tomcat-jdbc, resolves: rhbz#1011003 * Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 @@ -920,7 +923,7 @@ fi - Updated to 7.0.28 - Resolves: rhbz 820119 Remove bundled apache-commons-dbcp - Resolves: rhbz 814900 Added tomcat-coyote POM -- Resolves: rhbz 810775 Remove systemv stuff from %post scriptlet +- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet - Remove redhat-lsb R * Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2 @@ -1040,7 +1043,7 @@ fi * Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2 - Package now named just tomcat instead of tomcat7 -- Removed Provides: %{name}-log4j +- Removed Provides: %%{name}-log4j - Switched to apache-commons-* names instead of jakarta-commons-* . - Remove the old changelog - BR/R java >= 1:1.6.0 , same for java-devel From bc28cc3bb0cd3d7a30647a9669019972a2af2cea Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 15 Mar 2018 12:57:12 -0400 Subject: [PATCH 125/354] Rebase to 8.5.29! Finally :) --- tomcat.spec | 62 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index ba7c74b..0e3d384 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -30,14 +30,14 @@ %global jspspec 2.3 %global major_version 8 -%global minor_version 0 -%global micro_version 49 +%global minor_version 5 +%global micro_version 29 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 %global tcuid 91 -#Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java -%global native_version 1.1.33 +# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java +%global native_version 1.2.8 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -54,10 +54,16 @@ %global _initrddir %{_sysconfdir}/init.d %global _systemddir /lib/systemd/system +# Fedora doesn't seem to have this macro, so we define it if it doesn't exist +%{!?_mavendepmapfragdir: %global _mavendepmapfragdir /usr/share/maven-metadata} +# Fedora 24 erroneously uses %%{_datadir}/maven-fragments instead of /maven-metadata for some reason... +# Override the mavendepmapfragdir var on fc24 +%{?fc24: %global _mavendepmapfragdir /usr/share/maven-metadata} + Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -109,8 +115,8 @@ BuildRequires: junit BuildRequires: geronimo-jaxrpc BuildRequires: wsdl4j BuildRequires: systemd-units + Requires: apache-commons-daemon -Requires: apache-commons-logging Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool @@ -176,7 +182,7 @@ which allows tomcat to perform some privileged operations %package jsp-%{jspspec}-api Group: Development/Libraries -Summary: Apache Tomcat JSP API implementation classes +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} @@ -185,7 +191,7 @@ Requires(post): chkconfig Requires(postun): chkconfig %description jsp-%{jspspec}-api -Apache Tomcat JSP API implementation classes. +Apache Tomcat JSP API Implementation Classes. %package lib Group: Development/Libraries @@ -204,7 +210,7 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Group: Development/Libraries -Summary: Apache Tomcat Servlet API implementation classes +Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet3 @@ -213,18 +219,18 @@ Requires(post): chkconfig Requires(postun): chkconfig %description servlet-%{servletspec}-api -Apache Tomcat Servlet API implementation classes. +Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Group: Development/Libraries -Summary: Expression Language v%{elspec} API +Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-2.2-api Requires(post): chkconfig Requires(postun): chkconfig %description el-%{elspec}-api -Expression Language %{elspec}. +Apache Tomcat EL API Implementation Classes. %package webapps Group: Applications/Internet @@ -254,9 +260,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK - %{__mkdir_p} HACKDIR - touch HACKDIR/build.xml - touch HACKDIR/LICENSE # who needs a build.properties file anyway %{ant} -Dbase.path="." \ @@ -264,27 +267,22 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ - -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ - -Dtomcat-native.win.path="HACKDIR" \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ - -Dcommons-pool.home="HACKDIR" \ - -Dcommons-dbcp.home="HACKDIR" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ -Djava.7.home=%{java_home} \ + -Dexecute.validate=false \ deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later - %{__rm} output/build/bin/commons-daemon.jar \ - output/build/lib/ecj.jar - + %{__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} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java @@ -346,7 +344,7 @@ zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF # 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} ${RPM_BUILD_ROOT}%{confdir} + %{__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 @@ -524,6 +522,10 @@ done %{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom %add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar +# tomcat-jaspic-api +%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom +%add_maven_depmap JPP.%{name}-jaspic-api.pom %{name}/jaspic-api.jar + %pre # add the tomcat user and group @@ -616,6 +618,9 @@ fi %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 @@ -646,7 +651,9 @@ fi %files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib %defattr(-,root,root,-) -%{libdir} +%dir %{libdir} +%{libdir}/*.jar +%{_javadir}/*.jar %{bindir}/tomcat-juli.jar %{_mavenpomdir}/JPP.%{name}-annotations-api.pom %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom @@ -661,8 +668,12 @@ fi %{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom %{_mavenpomdir}/JPP.%{name}-websocket-api.pom %{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom +%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom %{_datadir}/maven-metadata/tomcat.xml %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 servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api %defattr(-,root,root,-) @@ -688,6 +699,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 +- Update to 8.5.29 + * Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 - Escape macros in %%changelog From 161c6b7f49b11a51cd32e9adc01056a4b1798070 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 15 Mar 2018 12:59:10 -0400 Subject: [PATCH 126/354] Adding sources for 8.5.29 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index dd38972..892cf01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.0.49-src.tar.gz) = 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 +SHA512 (apache-tomcat-8.5.29-src.tar.gz) = af3827642cfc9a5a4a6e1e802537e0ccecb002b330ffedafb0106cf2f4ff4999374248636cff29a2d73b2c46fc00acd3b81f4e27003ac8883e70643d426f6490 From e02f29cc464d6b39c20607c4d5e1dc1f1c125f0d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 15 Mar 2018 13:05:24 -0400 Subject: [PATCH 127/354] Forgot to rename service scripts, etc for the 8.5 rebase --- ...ap-MANIFEST.MF.patch => tomcat-8.5-bootstrap-MANIFEST.MF.patch | 0 ...-8.0-catalina-policy.patch => tomcat-8.5-catalina-policy.patch | 0 tomcat-8.0-digest.script => tomcat-8.5-digest.script | 0 tomcat-8.0-jsvc.service => tomcat-8.5-jsvc.service | 0 tomcat-8.0-log4j.properties => tomcat-8.5-log4j.properties | 0 ...cat-users-webapp.patch => tomcat-8.5-tomcat-users-webapp.patch | 0 tomcat-8.0-tool-wrapper.script => tomcat-8.5-tool-wrapper.script | 0 tomcat-8.0.conf => tomcat-8.5.conf | 0 tomcat-8.0.logrotate => tomcat-8.5.logrotate | 0 tomcat-8.0.service => tomcat-8.5.service | 0 tomcat-8.0.sysconfig => tomcat-8.5.sysconfig | 0 tomcat-8.0.wrapper => tomcat-8.5.wrapper | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename tomcat-8.0-bootstrap-MANIFEST.MF.patch => tomcat-8.5-bootstrap-MANIFEST.MF.patch (100%) rename tomcat-8.0-catalina-policy.patch => tomcat-8.5-catalina-policy.patch (100%) rename tomcat-8.0-digest.script => tomcat-8.5-digest.script (100%) rename tomcat-8.0-jsvc.service => tomcat-8.5-jsvc.service (100%) rename tomcat-8.0-log4j.properties => tomcat-8.5-log4j.properties (100%) rename tomcat-8.0-tomcat-users-webapp.patch => tomcat-8.5-tomcat-users-webapp.patch (100%) rename tomcat-8.0-tool-wrapper.script => tomcat-8.5-tool-wrapper.script (100%) rename tomcat-8.0.conf => tomcat-8.5.conf (100%) rename tomcat-8.0.logrotate => tomcat-8.5.logrotate (100%) rename tomcat-8.0.service => tomcat-8.5.service (100%) rename tomcat-8.0.sysconfig => tomcat-8.5.sysconfig (100%) rename tomcat-8.0.wrapper => tomcat-8.5.wrapper (100%) diff --git a/tomcat-8.0-bootstrap-MANIFEST.MF.patch b/tomcat-8.5-bootstrap-MANIFEST.MF.patch similarity index 100% rename from tomcat-8.0-bootstrap-MANIFEST.MF.patch rename to tomcat-8.5-bootstrap-MANIFEST.MF.patch diff --git a/tomcat-8.0-catalina-policy.patch b/tomcat-8.5-catalina-policy.patch similarity index 100% rename from tomcat-8.0-catalina-policy.patch rename to tomcat-8.5-catalina-policy.patch diff --git a/tomcat-8.0-digest.script b/tomcat-8.5-digest.script similarity index 100% rename from tomcat-8.0-digest.script rename to tomcat-8.5-digest.script diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.5-jsvc.service similarity index 100% rename from tomcat-8.0-jsvc.service rename to tomcat-8.5-jsvc.service diff --git a/tomcat-8.0-log4j.properties b/tomcat-8.5-log4j.properties similarity index 100% rename from tomcat-8.0-log4j.properties rename to tomcat-8.5-log4j.properties diff --git a/tomcat-8.0-tomcat-users-webapp.patch b/tomcat-8.5-tomcat-users-webapp.patch similarity index 100% rename from tomcat-8.0-tomcat-users-webapp.patch rename to tomcat-8.5-tomcat-users-webapp.patch diff --git a/tomcat-8.0-tool-wrapper.script b/tomcat-8.5-tool-wrapper.script similarity index 100% rename from tomcat-8.0-tool-wrapper.script rename to tomcat-8.5-tool-wrapper.script diff --git a/tomcat-8.0.conf b/tomcat-8.5.conf similarity index 100% rename from tomcat-8.0.conf rename to tomcat-8.5.conf diff --git a/tomcat-8.0.logrotate b/tomcat-8.5.logrotate similarity index 100% rename from tomcat-8.0.logrotate rename to tomcat-8.5.logrotate diff --git a/tomcat-8.0.service b/tomcat-8.5.service similarity index 100% rename from tomcat-8.0.service rename to tomcat-8.5.service diff --git a/tomcat-8.0.sysconfig b/tomcat-8.5.sysconfig similarity index 100% rename from tomcat-8.0.sysconfig rename to tomcat-8.5.sysconfig diff --git a/tomcat-8.0.wrapper b/tomcat-8.5.wrapper similarity index 100% rename from tomcat-8.0.wrapper rename to tomcat-8.5.wrapper From b14bf8b1a58371c3c8949d9d47dbf21a9f2b48f6 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 15 Mar 2018 13:52:10 -0400 Subject: [PATCH 128/354] Disable failOnWarning so that javadoc won't fail the build --- disableJavadocFailOnWarning.patch | 47 +++++++++++++++++++++++++++++++ tomcat.spec | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 disableJavadocFailOnWarning.patch diff --git a/disableJavadocFailOnWarning.patch b/disableJavadocFailOnWarning.patch new file mode 100644 index 0000000..03d03c5 --- /dev/null +++ b/disableJavadocFailOnWarning.patch @@ -0,0 +1,47 @@ +--- build.xml.orig 2018-03-15 13:49:03.366863009 -0400 ++++ build.xml 2018-03-15 13:49:29.690870139 -0400 +@@ -1777,7 +1777,7 @@ Apache Tomcat ${version} native binaries + additionalparam="-breakiterator -notimestamp" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1798,7 +1798,7 @@ Apache Tomcat ${version} native binaries + additionalparam="-breakiterator -notimestamp" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1819,7 +1819,7 @@ Apache Tomcat ${version} native binaries + additionalparam="-breakiterator -notimestamp" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1840,7 +1840,7 @@ Apache Tomcat ${version} native binaries + additionalparam="-breakiterator -notimestamp" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + +@@ -1860,7 +1860,7 @@ Apache Tomcat ${version} native binaries + additionalparam="-breakiterator -notimestamp ${java9.add.modules}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + + + diff --git a/tomcat.spec b/tomcat.spec index 0e3d384..e19394c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -93,6 +93,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch +Patch3: disableJavadocFailOnWarning.patch BuildArch: noarch @@ -250,6 +251,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar From ddf0b328a15b6c552d14e847a322acc4b6df9f1f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 16 Mar 2018 11:16:34 -0400 Subject: [PATCH 129/354] Update to 7.0.85 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9759435..3c79e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.84-src.tar.gz) = ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74 +SHA512 (apache-tomcat-7.0.85-src.tar.gz) = f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044 diff --git a/tomcat.spec b/tomcat.spec index 8bb6cb3..a72b66e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 84 +%global micro_version 85 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -639,6 +639,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Fri Mar 16 2018 Coty Sutherland - 1:7.0.85-1 +- Update to 7.0.85 + * Thu Feb 01 2018 Coty Sutherland - 0:7.0.84-1 - Update to 7.0.84 From 4b33f22df61355594ad647f0478b0afbb7789d29 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 16 Mar 2018 11:27:13 -0400 Subject: [PATCH 130/354] Forgot to add changelog entires for the CVEs --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index a72b66e..c1bef53 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -641,6 +641,8 @@ fi %changelog * Fri Mar 16 2018 Coty Sutherland - 1:7.0.85-1 - Update to 7.0.85 +- Resolves: rhbz#1548291 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources +- Resolves: rhbz#1548283 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users * Thu Feb 01 2018 Coty Sutherland - 0:7.0.84-1 - Update to 7.0.84 From 70272203ee03a85a68ca8f41d3de2f52b499d4a4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 16 Mar 2018 11:27:50 -0400 Subject: [PATCH 131/354] Forgot to add changelog entires for the CVEs --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index e19394c..7fe827e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -703,6 +703,8 @@ fi %changelog * Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 - Update to 8.5.29 +- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources +- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users * Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 - Escape macros in %%changelog From fb3fee7d60ea4fad77771d356ec6b3e6ea1dcae4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 1 May 2018 09:34:30 -0400 Subject: [PATCH 132/354] Resolves: rhbz#1557507 Update to 9.0.7 --- sources | 2 +- ... => tomcat-9.0-bootstrap-MANIFEST.MF.patch | 0 ....patch => tomcat-9.0-catalina-policy.patch | 0 ...-digest.script => tomcat-9.0-digest.script | 0 ....5-jsvc.service => tomcat-9.0-jsvc.service | 0 ....properties => tomcat-9.0-log4j.properties | 0 ...ch => tomcat-9.0-tomcat-users-webapp.patch | 0 ...r.script => tomcat-9.0-tool-wrapper.script | 0 tomcat-8.5.conf => tomcat-9.0.conf | 0 tomcat-8.5.logrotate => tomcat-9.0.logrotate | 0 tomcat-8.5.service => tomcat-9.0.service | 0 tomcat-8.5.sysconfig => tomcat-9.0.sysconfig | 0 tomcat-8.5.wrapper => tomcat-9.0.wrapper | 0 tomcat.spec | 25 ++++++++++--------- 14 files changed, 14 insertions(+), 13 deletions(-) rename tomcat-8.5-bootstrap-MANIFEST.MF.patch => tomcat-9.0-bootstrap-MANIFEST.MF.patch (100%) rename tomcat-8.5-catalina-policy.patch => tomcat-9.0-catalina-policy.patch (100%) rename tomcat-8.5-digest.script => tomcat-9.0-digest.script (100%) rename tomcat-8.5-jsvc.service => tomcat-9.0-jsvc.service (100%) rename tomcat-8.5-log4j.properties => tomcat-9.0-log4j.properties (100%) rename tomcat-8.5-tomcat-users-webapp.patch => tomcat-9.0-tomcat-users-webapp.patch (100%) rename tomcat-8.5-tool-wrapper.script => tomcat-9.0-tool-wrapper.script (100%) rename tomcat-8.5.conf => tomcat-9.0.conf (100%) rename tomcat-8.5.logrotate => tomcat-9.0.logrotate (100%) rename tomcat-8.5.service => tomcat-9.0.service (100%) rename tomcat-8.5.sysconfig => tomcat-9.0.sysconfig (100%) rename tomcat-8.5.wrapper => tomcat-9.0.wrapper (100%) diff --git a/sources b/sources index 892cf01..81f63ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-8.5.29-src.tar.gz) = af3827642cfc9a5a4a6e1e802537e0ccecb002b330ffedafb0106cf2f4ff4999374248636cff29a2d73b2c46fc00acd3b81f4e27003ac8883e70643d426f6490 +SHA512 (apache-tomcat-9.0.7-src.tar.gz) = cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/tomcat-8.5-bootstrap-MANIFEST.MF.patch b/tomcat-9.0-bootstrap-MANIFEST.MF.patch similarity index 100% rename from tomcat-8.5-bootstrap-MANIFEST.MF.patch rename to tomcat-9.0-bootstrap-MANIFEST.MF.patch diff --git a/tomcat-8.5-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch similarity index 100% rename from tomcat-8.5-catalina-policy.patch rename to tomcat-9.0-catalina-policy.patch diff --git a/tomcat-8.5-digest.script b/tomcat-9.0-digest.script similarity index 100% rename from tomcat-8.5-digest.script rename to tomcat-9.0-digest.script diff --git a/tomcat-8.5-jsvc.service b/tomcat-9.0-jsvc.service similarity index 100% rename from tomcat-8.5-jsvc.service rename to tomcat-9.0-jsvc.service diff --git a/tomcat-8.5-log4j.properties b/tomcat-9.0-log4j.properties similarity index 100% rename from tomcat-8.5-log4j.properties rename to tomcat-9.0-log4j.properties diff --git a/tomcat-8.5-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch similarity index 100% rename from tomcat-8.5-tomcat-users-webapp.patch rename to tomcat-9.0-tomcat-users-webapp.patch diff --git a/tomcat-8.5-tool-wrapper.script b/tomcat-9.0-tool-wrapper.script similarity index 100% rename from tomcat-8.5-tool-wrapper.script rename to tomcat-9.0-tool-wrapper.script diff --git a/tomcat-8.5.conf b/tomcat-9.0.conf similarity index 100% rename from tomcat-8.5.conf rename to tomcat-9.0.conf diff --git a/tomcat-8.5.logrotate b/tomcat-9.0.logrotate similarity index 100% rename from tomcat-8.5.logrotate rename to tomcat-9.0.logrotate diff --git a/tomcat-8.5.service b/tomcat-9.0.service similarity index 100% rename from tomcat-8.5.service rename to tomcat-9.0.service diff --git a/tomcat-8.5.sysconfig b/tomcat-9.0.sysconfig similarity index 100% rename from tomcat-8.5.sysconfig rename to tomcat-9.0.sysconfig diff --git a/tomcat-8.5.wrapper b/tomcat-9.0.wrapper similarity index 100% rename from tomcat-8.5.wrapper rename to tomcat-9.0.wrapper diff --git a/tomcat.spec b/tomcat.spec index 7fe827e..bef10e0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -29,15 +29,15 @@ # %global jspspec 2.3 -%global major_version 8 -%global minor_version 5 -%global micro_version 29 +%global major_version 9 +%global minor_version 0 +%global micro_version 7 %global packdname apache-tomcat-%{version}-src -%global servletspec 3.1 +%global servletspec 4.0 %global elspec 3.0 %global tcuid 91 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java -%global native_version 1.2.8 +%global native_version 1.2.14 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -93,19 +93,18 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch -Patch3: disableJavadocFailOnWarning.patch BuildArch: noarch BuildRequires: ant -BuildRequires: ecj >= 1:4.4.0 +BuildRequires: ecj >= 1:4.6.1 BuildRequires: findutils BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-pool BuildRequires: tomcat-taglibs-standard -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-devel >= 1:1.8.0 BuildRequires: jpackage-utils >= 0:1.7.0 %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # add_maven_depmap is deprecated, using javapackages-local for now @@ -121,7 +120,7 @@ Requires: apache-commons-daemon Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool -Requires: java-headless >= 1:1.6.0 +Requires: java-headless >= 1:1.8.0 Requires: jpackage-utils Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} @@ -200,7 +199,7 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj >= 1:4.2.1 +Requires: ecj >= 1:4.6.1 Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool @@ -215,7 +214,7 @@ Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet3 -Obsoletes: %{name}-servlet-3.0-api +Obsoletes: %{name}-servlet-3.1-api Requires(post): chkconfig Requires(postun): chkconfig @@ -251,7 +250,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -701,6 +699,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 +- Update to 9.0.7 + * Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 - Update to 8.5.29 - Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources From 779b38363ec4e69cd8cee2866a39d48b8c82623b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 15 Mar 2018 13:52:10 -0400 Subject: [PATCH 133/354] Disable failOnWarning so that javadoc won't fail the build --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index bef10e0..3d62a83 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -93,6 +93,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch +Patch3: disableJavadocFailOnWarning.patch BuildArch: noarch @@ -250,6 +251,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar From 6ddb487a2a85281e3c2ea486e6771feec6d1473c Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 1 May 2018 09:56:53 -0400 Subject: [PATCH 134/354] Update to 7.0.86 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3c79e88..ec97d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.85-src.tar.gz) = f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044 +SHA512 (apache-tomcat-7.0.86-src.tar.gz) = 2029299879121267e38030e7ef38ec7b9e27f679d6437a218b72b7f94cf8352cc9f7762af1db06c119d1a9905f74a335041b884cdab101b0039025120e6f7b96 diff --git a/tomcat.spec b/tomcat.spec index c1bef53..48cf16d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 85 +%global micro_version 86 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -639,6 +639,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue May 01 2018 Coty Sutherland - 1:7.0.86-1 +- Update to 7.0.86 + * Fri Mar 16 2018 Coty Sutherland - 1:7.0.85-1 - Update to 7.0.85 - Resolves: rhbz#1548291 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources From e60ff004d760469134fda2c886657824ef432a97 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:34:40 -0500 Subject: [PATCH 135/354] Remove needless use of %defattr --- tomcat.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 3d62a83..5238fc8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -640,19 +640,15 @@ fi %{appdir}/manager %files docs-webapp -%defattr(-,root,root,-) %{appdir}/docs %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %files jsp-%{jspspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-jsp-api -%defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar %files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib -%defattr(-,root,root,-) %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar @@ -678,12 +674,10 @@ fi %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar %files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api -%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar %files el-%{elspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-el-api -%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar From 1bf763910f0cf1a7246edb07bced3fec84ce363a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:42:30 +0000 Subject: [PATCH 136/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 5238fc8..8186364 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -63,7 +63,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -695,6 +695,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 - Update to 9.0.7 From 87acbd604780de1205494c6ffc26afdadf60cf27 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 16:08:49 -0400 Subject: [PATCH 137/354] Update to 9.0.10 --- sources | 2 +- tomcat.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 81f63ce..e5351b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.7-src.tar.gz) = cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 +SHA512 (apache-tomcat-9.0.10-src.tar.gz) = 55655f7ca04caf9633765a11a7a089b56dc29b8eabff013f646879645e337cd31dd43247b93834deefc3bcd1498e2bd3cd48c971a0692df7463ba5a23adc94b8 diff --git a/tomcat.spec b/tomcat.spec index 8186364..d23aac7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 7 +%global micro_version 10 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -63,7 +63,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -695,6 +695,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 + * Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -708,6 +711,9 @@ fi * Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 - Escape macros in %%changelog +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 + * Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 - Update to 8.0.49 From dd598eae602a82012b293edcadc76f98185037aa Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 16:08:49 -0400 Subject: [PATCH 138/354] Update to 9.0.10 --- sources | 2 +- tomcat.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 81f63ce..e5351b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.7-src.tar.gz) = cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 +SHA512 (apache-tomcat-9.0.10-src.tar.gz) = 55655f7ca04caf9633765a11a7a089b56dc29b8eabff013f646879645e337cd31dd43247b93834deefc3bcd1498e2bd3cd48c971a0692df7463ba5a23adc94b8 diff --git a/tomcat.spec b/tomcat.spec index 8186364..d23aac7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 7 +%global micro_version 10 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -63,7 +63,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -695,6 +695,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 + * Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -708,6 +711,9 @@ fi * Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 - Escape macros in %%changelog +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 + * Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 - Update to 8.0.49 From 715415eccc2b29ca47ac1c303b6d67a154ee58d0 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 16:17:53 -0400 Subject: [PATCH 139/354] Update to 7.0.90 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index ec97d49..6a3c1ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.86-src.tar.gz) = 2029299879121267e38030e7ef38ec7b9e27f679d6437a218b72b7f94cf8352cc9f7762af1db06c119d1a9905f74a335041b884cdab101b0039025120e6f7b96 +SHA512 (apache-tomcat-7.0.90-src.tar.gz) = b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a diff --git a/tomcat.spec b/tomcat.spec index 48cf16d..4cfe1f0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 86 +%global micro_version 90 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -639,6 +639,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue Jul 31 2018 Coty Sutherland - 1:7.0.90-1 +- Update to 7.0.90 + * Tue May 01 2018 Coty Sutherland - 1:7.0.86-1 - Update to 7.0.86 From 69c429d6280780296d4ec2c01146c2ec5d703ea1 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 17:01:08 -0400 Subject: [PATCH 140/354] Related: Update to 7.0.90 Fix patch files so that they apply correctly --- ... tomcat-7.0.90-RemoveCompilerOptions.patch | 52 +++++++------------ ...0-build.patch => tomcat-7.0.90-build.patch | 46 ++++++++-------- tomcat.spec | 4 +- 3 files changed, 45 insertions(+), 57 deletions(-) rename tomcat-7.0.84-CompilerOptionsV89.patch => tomcat-7.0.90-RemoveCompilerOptions.patch (61%) rename tomcat-7.0.70-build.patch => tomcat-7.0.90-build.patch (74%) diff --git a/tomcat-7.0.84-CompilerOptionsV89.patch b/tomcat-7.0.90-RemoveCompilerOptions.patch similarity index 61% rename from tomcat-7.0.84-CompilerOptionsV89.patch rename to tomcat-7.0.90-RemoveCompilerOptions.patch index aa379e0..3de72aa 100644 --- a/tomcat-7.0.84-CompilerOptionsV89.patch +++ b/tomcat-7.0.90-RemoveCompilerOptions.patch @@ -1,6 +1,6 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-02-01 10:13:12.975989687 -0500 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-02-01 10:15:47.913534769 -0500 -@@ -67,7 +67,6 @@ public class JDTCompiler extends org.apa +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-02 13:12:33.000000000 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 16:48:35.420679218 -0400 +@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apa /** * Compile the servlet from .java file to .class file */ @@ -8,7 +8,7 @@ protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { -@@ -98,12 +97,10 @@ public class JDTCompiler extends org.apa +@@ -126,12 +125,10 @@ public class JDTCompiler extends org.apa this.sourceFile = sourceFile; } @@ -21,7 +21,7 @@ public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -145,7 +142,6 @@ public class JDTCompiler extends org.apa +@@ -173,7 +170,6 @@ public class JDTCompiler extends org.apa return result; } @@ -29,7 +29,7 @@ public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -154,7 +150,6 @@ public class JDTCompiler extends org.apa +@@ -182,7 +178,6 @@ public class JDTCompiler extends org.apa return className.toCharArray(); } @@ -37,7 +37,7 @@ public char[][] getPackageName() { StringTokenizer izer = new StringTokenizer(className, "."); -@@ -166,7 +161,6 @@ public class JDTCompiler extends org.apa +@@ -194,7 +189,6 @@ public class JDTCompiler extends org.apa return result; } @@ -45,7 +45,7 @@ public boolean ignoreOptionalProblems() { return false; } -@@ -174,7 +168,6 @@ public class JDTCompiler extends org.apa +@@ -202,7 +196,6 @@ public class JDTCompiler extends org.apa final INameEnvironment env = new INameEnvironment() { @@ -53,7 +53,7 @@ public NameEnvironmentAnswer findType(char[][] compoundTypeName) { StringBuilder result = new StringBuilder(); -@@ -187,7 +180,6 @@ public class JDTCompiler extends org.apa +@@ -215,7 +208,6 @@ public class JDTCompiler extends org.apa return findType(result.toString()); } @@ -61,7 +61,7 @@ public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { -@@ -269,7 +261,6 @@ public class JDTCompiler extends org.apa +@@ -297,7 +289,6 @@ public class JDTCompiler extends org.apa } } @@ -69,7 +69,7 @@ public boolean isPackage(char[][] parentPackageName, char[] packageName) { StringBuilder result = new StringBuilder(); -@@ -291,7 +282,6 @@ public class JDTCompiler extends org.apa +@@ -319,7 +310,6 @@ public class JDTCompiler extends org.apa return isPackage(result.toString()); } @@ -77,37 +77,25 @@ public void cleanup() { } -@@ -340,12 +330,6 @@ public class JDTCompiler extends org.apa +@@ -368,17 +358,6 @@ public class JDTCompiler extends org.apa } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); -- } else if(opt.equals("1.9")) { +- // Support old format that was used in EA implementation as well +- } else if(opt.equals("9") || opt.equals("1.9")) { - settings.put(CompilerOptions.OPTION_Source, -- "1.9"); // CompilerOptions.VERSION_1_9 +- JDT_JAVA_9_VERSION); +- } else if(opt.equals("10")) { +- // Constant not available in latest ECJ version that runs on +- // Java 7 +- settings.put(CompilerOptions.OPTION_Source, "10"); } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -387,16 +371,6 @@ public class JDTCompiler extends org.apa - CompilerOptions.VERSION_1_7); - settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_7); -- } else if(opt.equals("1.8")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, -- CompilerOptions.VERSION_1_8); -- settings.put(CompilerOptions.OPTION_Compliance, -- CompilerOptions.VERSION_1_8); -- } else if(opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, -- "1.9"); // CompilerOptions.VERSION_1_9 -- settings.put(CompilerOptions.OPTION_Compliance, -- "1.9"); // CompilerOptions.VERSION_1_9 - } else { - log.warn("Unknown target VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -414,7 +388,6 @@ public class JDTCompiler extends org.apa +@@ -452,7 +431,6 @@ public class JDTCompiler extends org.apa new DefaultProblemFactory(Locale.getDefault()); final ICompilerRequestor requestor = new ICompilerRequestor() { diff --git a/tomcat-7.0.70-build.patch b/tomcat-7.0.90-build.patch similarity index 74% rename from tomcat-7.0.70-build.patch rename to tomcat-7.0.90-build.patch index 6c8d8cc..63a974c 100644 --- a/tomcat-7.0.70-build.patch +++ b/tomcat-7.0.90-build.patch @@ -1,6 +1,6 @@ ---- build.xml.orig 2016-06-15 12:45:47.000000000 -0400 -+++ build.xml 2016-07-01 12:01:58.494022657 -0400 -@@ -213,7 +213,7 @@ +--- build.xml.orig 2018-07-31 16:53:30.644130082 -0400 ++++ build.xml 2018-07-31 16:56:12.472419607 -0400 +@@ -216,7 +216,7 @@ @@ -9,9 +9,9 @@ -@@ -1046,12 +1046,11 @@ +@@ -1056,12 +1056,11 @@ - + - - @@ -24,10 +24,10 @@ -@@ -1699,8 +1698,8 @@ - +@@ -1734,8 +1733,8 @@ + - + - + - + - + diff --git a/tomcat.spec b/tomcat.spec index 4cfe1f0..ed4f9ad 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -81,9 +81,9 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 -Patch2: %{name}-7.0.84-CompilerOptionsV89.patch +Patch2: %{name}-7.0.90-RemoveCompilerOptions.patch # Adding patch to remove unsupport ant tasks/attributes -Patch3: %{name}-7.0.70-build.patch +Patch3: %{name}-7.0.90-build.patch Patch4: %{name}-7.0-catalina-policy.patch BuildArch: noarch From 60e8a419006256a9df2c31c0b56f2307f1f6ed78 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 17:13:18 -0400 Subject: [PATCH 141/354] Related: Update to 9.0.10 Fix patch files so they apply cleanly --- tomcat-8.0.36-CompilerOptionsV9.patch | 24 --------------- tomcat-9.0.10-RemoveCompilerOptions.patch | 36 +++++++++++++++++++++++ tomcat.spec | 2 +- 3 files changed, 37 insertions(+), 25 deletions(-) delete mode 100644 tomcat-8.0.36-CompilerOptionsV9.patch create mode 100644 tomcat-9.0.10-RemoveCompilerOptions.patch diff --git a/tomcat-8.0.36-CompilerOptionsV9.patch b/tomcat-8.0.36-CompilerOptionsV9.patch deleted file mode 100644 index 0b44236..0000000 --- a/tomcat-8.0.36-CompilerOptionsV9.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-07-01 14:39:19.728255958 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-07-01 14:39:37.191311760 -0400 -@@ -312,9 +312,6 @@ - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); -- } else if(opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_Source, -- CompilerOptions.VERSION_1_9); - } else { - log.warn("Unknown source VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_Source, -@@ -361,11 +358,6 @@ - CompilerOptions.VERSION_1_8); - settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); -- } else if(opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, -- CompilerOptions.VERSION_1_9); -- settings.put(CompilerOptions.OPTION_Compliance, -- CompilerOptions.VERSION_1_9); - } else { - log.warn("Unknown target VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/tomcat-9.0.10-RemoveCompilerOptions.patch b/tomcat-9.0.10-RemoveCompilerOptions.patch new file mode 100644 index 0000000..4a60efb --- /dev/null +++ b/tomcat-9.0.10-RemoveCompilerOptions.patch @@ -0,0 +1,36 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-31 17:05:49.639378409 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 17:06:36.947209122 -0400 +@@ -313,14 +313,6 @@ public class JDTCompiler extends org.apa + } else if(opt.equals("1.8")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_8); +- // Version format changed from Java 9 onwards. +- // Support old format that was used in EA implementation as well +- } else if(opt.equals("9") || opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_9); +- } else if(opt.equals("10")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_10); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -367,18 +359,6 @@ public class JDTCompiler extends org.apa + CompilerOptions.VERSION_1_8); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_8); +- // Version format changed from Java 9 onwards. +- // Support old format that was used in EA implementation as well +- } else if(opt.equals("9") || opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_9); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_9); +- } else if(opt.equals("10")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_10); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_10); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/tomcat.spec b/tomcat.spec index f5e4851..1658bd0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -92,7 +92,7 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -Patch2: %{name}-8.0.36-CompilerOptionsV9.patch +Patch2: %{name}-9.0.10-RemoveCompilerOptions.patch Patch3: disableJavadocFailOnWarning.patch BuildArch: noarch From 5faf05bcc5f86cf75f2889b801c71fbdd2b227bf Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 31 Jul 2018 21:48:25 -0400 Subject: [PATCH 142/354] Related: Update to 9.0.10 Add new dependency on saaj-api so that you can build with java 11 --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 1658bd0..0bb8dbc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -114,6 +114,7 @@ BuildRequires: javapackages-local %endif BuildRequires: junit BuildRequires: geronimo-jaxrpc +BuildRequires: geronimo-saaj BuildRequires: wsdl4j BuildRequires: systemd-units @@ -276,6 +277,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dsaaj-api.jar="$(build-classpath geronimo-saaj)" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ From 11261db135e441d49e64badb95a3e5c5f1ca6f9a Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 1 Aug 2018 14:15:07 -0400 Subject: [PATCH 143/354] Related: Update to 9.0.10 Add new dependency on aqute-bnd libraries for OSGi metadata --- tomcat.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 0bb8dbc..7aa5a87 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -115,6 +115,8 @@ BuildRequires: javapackages-local BuildRequires: junit BuildRequires: geronimo-jaxrpc BuildRequires: geronimo-saaj +BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib BuildRequires: wsdl4j BuildRequires: systemd-units @@ -278,6 +280,8 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dsaaj-api.jar="$(build-classpath geronimo-saaj)" \ + -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ + -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ From c670fc3d7c5f83576b91251514d2eb355f151c54 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 2 Aug 2018 08:21:16 -0400 Subject: [PATCH 144/354] Related: Update to 9.0.10 Updating build.xml to include a required JAR. The version of the aQute libs is old and the structure changed in the new version that upstream uses, so we have to add the required classes manually --- tomcat-build.patch | 12 ++++++++++++ tomcat.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 tomcat-build.patch diff --git a/tomcat-build.patch b/tomcat-build.patch new file mode 100644 index 0000000..d20b527 --- /dev/null +++ b/tomcat-build.patch @@ -0,0 +1,12 @@ +Index: build.xml +=================================================================== +--- build.xml (revision 1837267) ++++ build.xml (working copy) +@@ -3207,6 +3207,7 @@ + + + ++ + + + diff --git a/tomcat.spec b/tomcat.spec index 7aa5a87..f33be29 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -94,6 +94,7 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-9.0.10-RemoveCompilerOptions.patch Patch3: disableJavadocFailOnWarning.patch +Patch4: %{name}-build.patch BuildArch: noarch @@ -255,6 +256,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -282,6 +284,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dsaaj-api.jar="$(build-classpath geronimo-saaj)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ + -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ From 32304e7570f56a02b3ae76ed8175636792828c2d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 7 Aug 2018 10:36:36 -0400 Subject: [PATCH 145/354] Related: Update to 9.0.10 Add bnd.annotation and slf4j-api jars to the classpath so that the build can complete the OSGi steps --- tomcat-build.patch | 10 +++++----- tomcat.spec | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tomcat-build.patch b/tomcat-build.patch index d20b527..acaac9c 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,12 @@ -Index: build.xml -=================================================================== ---- build.xml (revision 1837267) -+++ build.xml (working copy) -@@ -3207,6 +3207,7 @@ +--- build.xml.orig 2018-08-07 10:32:04.994403913 -0400 ++++ build.xml 2018-08-07 10:32:30.874319588 -0400 +@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom + ++ ++ diff --git a/tomcat.spec b/tomcat.spec index f33be29..15abdce 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -285,6 +285,8 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ + -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ From cb0df92eb9c4e28ceb6ac131c443efedf4c5fb6e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 16 Oct 2018 17:41:15 +0100 Subject: [PATCH 146/354] Drop legcy sys-v bits --- tomcat.spec | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 15abdce..b4cfdc2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -51,7 +51,6 @@ %global cachedir %{_var}/cache/%{name} %global tempdir %{cachedir}/temp %global workdir %{cachedir}/work -%global _initrddir %{_sysconfdir}/init.d %global _systemddir /lib/systemd/system # Fedora doesn't seem to have this macro, so we define it if it doesn't exist @@ -63,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -119,7 +118,7 @@ BuildRequires: geronimo-saaj BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: wsdl4j -BuildRequires: systemd-units +BuildRequires: systemd Requires: apache-commons-daemon Requires: apache-commons-collections @@ -131,11 +130,9 @@ Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} Requires(pre): shadow-utils -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd # added after log4j sub-package was removed Provides: %{name}-log4j = %{epoch}:%{version}-%{release} @@ -192,8 +189,6 @@ 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} -Requires(post): chkconfig -Requires(postun): chkconfig %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -220,8 +215,6 @@ Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet3 Obsoletes: %{name}-servlet-3.1-api -Requires(post): chkconfig -Requires(postun): chkconfig %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -231,8 +224,6 @@ Group: Development/Libraries Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-2.2-api -Requires(post): chkconfig -Requires(postun): chkconfig %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -333,7 +324,6 @@ zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_initrddir} %{__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 @@ -588,12 +578,6 @@ if [ "$1" = "0" ]; then %{_javadir}/%{name}-el-%{elspec}-api.jar fi -%triggerun -- tomcat < 0:7.0.22-2 -/usr/bin/systemd-sysv-convert -- save tomcat > /dev/null 2>&1 || : -# Run these becasue the SysV package being removed won't do them -/sbin/chkconfig --del tomcat > /dev/null 2>&1 || : -/bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || : - %files %defattr(0664,root,tomcat,0755) %doc {LICENSE,NOTICE,RELEASE*} @@ -706,6 +690,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 +- Drop legcy sys-v bits + * Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 - Update to 9.0.10 From 43c6ccdf49b2a7eb256866aed1484a2ff42bf6c8 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 13 Dec 2018 09:15:59 -0500 Subject: [PATCH 147/354] Update to 9.0.13 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e5351b3..8d4722c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.10-src.tar.gz) = 55655f7ca04caf9633765a11a7a089b56dc29b8eabff013f646879645e337cd31dd43247b93834deefc3bcd1498e2bd3cd48c971a0692df7463ba5a23adc94b8 +SHA512 (apache-tomcat-9.0.13-src.tar.gz) = ee61f13d54d2fde81f6a9333e0963d42374f79d3e884f28daae2f4426b7b2d1d26b7a99d6872f0648474c9277c189ac412a91f67faf173532f4367ed3ffd238c diff --git a/tomcat.spec b/tomcat.spec index b4cfdc2..3cb52c0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 10 +%global micro_version 13 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -62,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -690,6 +690,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 +- Update to 9.0.13 + * Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 - Drop legcy sys-v bits From 27dc97c365d7902a35fb59d8ee1c05e790c59ed7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 13 Dec 2018 10:54:36 -0500 Subject: [PATCH 148/354] Add changelog entries for CVEs to update notes --- tomcat.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 3cb52c0..b8f2d7b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -692,12 +692,17 @@ fi %changelog * Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 - Update to 9.0.13 +- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet * Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 - Drop legcy sys-v bits * Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 - Update to 9.0.10 +- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS +- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins +- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client +- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up * Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5d151717172d449a4bb1b29230ae9dc69c8f7d62 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 13 Dec 2018 11:45:59 -0500 Subject: [PATCH 149/354] Update to 7.0.92 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6a3c1ff..bdb6545 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.90-src.tar.gz) = b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a +SHA512 (apache-tomcat-7.0.92-src.tar.gz) = 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a diff --git a/tomcat.spec b/tomcat.spec index ed4f9ad..2cf0c7a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 90 +%global micro_version 92 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -639,6 +639,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Dec 13 2018 Coty Sutherland - 1:7.0.92-1 +- Update to 7.0.92 + * Tue Jul 31 2018 Coty Sutherland - 1:7.0.90-1 - Update to 7.0.90 From 05293ee2a3e5bbdf4a5b3de8df6dc2b42954b94b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 13 Dec 2018 11:48:15 -0500 Subject: [PATCH 150/354] Add changelog entries for CVEs to update notes --- tomcat.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 2cf0c7a..0d418cc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -641,9 +641,13 @@ fi %changelog * Thu Dec 13 2018 Coty Sutherland - 1:7.0.92-1 - Update to 7.0.92 +- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet * Tue Jul 31 2018 Coty Sutherland - 1:7.0.90-1 - Update to 7.0.90 +- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client +- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins +- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS * Tue May 01 2018 Coty Sutherland - 1:7.0.86-1 - Update to 7.0.86 From 0a18dfafbb68edbff3c0d36c6037f647ddc31c1c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:28 +0100 Subject: [PATCH 151/354] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- tomcat.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index b8f2d7b..65b674b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -65,7 +65,6 @@ Version: %{major_version}.%{minor_version}.%{micro_version} Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API -Group: System Environment/Daemons 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 @@ -148,7 +147,6 @@ 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 -Group: Applications/System Summary: The host-manager and manager web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} @@ -156,7 +154,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} The host-manager and manager web applications for Apache Tomcat. %package docs-webapp -Group: Applications/Text Summary: The docs web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} @@ -164,7 +161,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} The docs web application for Apache Tomcat. %package javadoc -Group: Documentation Summary: Javadoc generated documentation for Apache Tomcat Requires: jpackage-utils @@ -172,7 +168,6 @@ Requires: jpackage-utils Javadoc generated documentation for Apache Tomcat. %package jsvc -Group: System Environment/Daemons Summary: Apache jsvc wrapper for Apache Tomcat as separate service Requires: %{name} = %{epoch}:%{version}-%{release} Requires: apache-commons-daemon-jsvc @@ -183,7 +178,6 @@ 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 jsp-%{jspspec}-api -Group: Development/Libraries Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} Obsoletes: %{name}-jsp-2.2-api @@ -194,7 +188,6 @@ Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Apache Tomcat JSP API Implementation Classes. %package lib -Group: Development/Libraries 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} @@ -209,7 +202,6 @@ Requires(preun): coreutils Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api -Group: Development/Libraries Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Provides: servlet6 @@ -220,7 +212,6 @@ Obsoletes: %{name}-servlet-3.1-api Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api -Group: Development/Libraries Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-2.2-api @@ -229,7 +220,6 @@ Obsoletes: %{name}-el-2.2-api Apache Tomcat EL API Implementation Classes. %package webapps -Group: Applications/Internet Summary: The ROOT and examples web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} Requires: tomcat-taglibs-standard >= 0:1.1 From deb40c8cad6d0f79de52972c7dd218b11c8251e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:03:06 +0000 Subject: [PATCH 152/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 65b674b..137e1f9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -62,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -680,6 +680,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 - Update to 9.0.13 - Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet From ca3ba12276d4d76383a27b4e0dd4dd1c55c4e077 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 20 Feb 2019 15:18:44 -0500 Subject: [PATCH 153/354] Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) --- el-api-OSGi-MANIFEST.MF | 13 ------------ jasper-OSGi-MANIFEST.MF | 40 ------------------------------------ jasper-el-OSGi-MANIFEST.MF | 13 ------------ jsp-api-OSGi-MANIFEST.MF | 13 ------------ servlet-api-OSGi-MANIFEST.MF | 17 --------------- tomcat-api-OSGi-MANIFEST.MF | 12 ----------- tomcat-juli-OSGi-MANIFEST.MF | 13 ------------ tomcat.spec | 34 +++--------------------------- 8 files changed, 3 insertions(+), 152 deletions(-) delete mode 100644 el-api-OSGi-MANIFEST.MF delete mode 100644 jasper-OSGi-MANIFEST.MF delete mode 100644 jasper-el-OSGi-MANIFEST.MF delete mode 100644 jsp-api-OSGi-MANIFEST.MF delete mode 100644 servlet-api-OSGi-MANIFEST.MF delete mode 100644 tomcat-api-OSGi-MANIFEST.MF delete mode 100644 tomcat-juli-OSGi-MANIFEST.MF diff --git a/el-api-OSGi-MANIFEST.MF b/el-api-OSGi-MANIFEST.MF deleted file mode 100644 index 69b797f..0000000 --- a/el-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: javax.el;version="2.2.0" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 2.2.0 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: javax.el -DynamicImport-Package: org.apache.el -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jasper-OSGi-MANIFEST.MF b/jasper-OSGi-MANIFEST.MF deleted file mode 100644 index ad34978..0000000 --- a/jasper-OSGi-MANIFEST.MF +++ /dev/null @@ -1,40 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.jasper;version="8.0.26",org.apache.jasper.c - ompiler;version="8.0.26",org.apache.jasper.compiler.tagplugin;version - ="8.0.26",org.apache.jasper.resources;version="8.0.26",org.apache.jas - per.runtime;version="8.0.26",org.apache.jasper.security;version="7.0. - 19",org.apache.jasper.servlet;version="8.0.26",org.apache.jasper.tagp - lugins.jstl;version="8.0.26",org.apache.jasper.tagplugins.jstl.core;v - ersion="8.0.26",org.apache.jasper.util;version="8.0.26",org.apache.ja - sper.xmlparser;version="8.0.26" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 8.0.26 -Bundle-Localization: plugin -Bundle-Name: %bundleName -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.jasper -Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h - ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0 - ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re - sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2 - .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax. - xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache. - commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti - on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a - pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util; - resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml. - sax.helpers,org.apache.tomcat;version="8.0.26",org.apache.juli.loggin - g;version="8.0.26",javax.el;version="2.2.0",org.eclipse.jdt.internal. - compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int - ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow - ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp - iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in - ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e - clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil - er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte - rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt. - core.compiler -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jasper-el-OSGi-MANIFEST.MF b/jasper-el-OSGi-MANIFEST.MF deleted file mode 100644 index 14e4282..0000000 --- a/jasper-el-OSGi-MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.el;version="7.0.21" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 8.0.26 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Import-Package: javax.el;version="2.2" -Bundle-SymbolicName: org.apache.el -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF deleted file mode 100644 index 62bc00d..0000000 --- a/jsp-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Vendor: %bundleProvider -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 -Bundle-Name: %bundleName -Bundle-SymbolicName: javax.servlet.jsp -Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v - ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp - .tagext; version=2.2 -Bundle-Version: 2.2.0.v200806031607 -Bundle-ManifestVersion: 2 -Import-Package: javax.servlet; version=3.0,javax.servlet.http; version - =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0" diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF deleted file mode 100644 index 3938935..0000000 --- a/servlet-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4 -Bundle-SymbolicName: javax.servlet -Bundle-ManifestVersion: 2 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-Version: 3.0.0 -Bundle-Vendor: %bundleProvider -Export-Package: javax.servlet;version="3.0", - javax.servlet;version="2.6", - javax.servlet.http;version="3.0", - javax.servlet.http;version="2.6", - javax.servlet.annotation;version="2.6", - javax.servlet.descriptor;version="3.0", - javax.servlet.descriptor;version="2.6", - javax.servlet.resources;version="3.0", - javax.servlet.resources;version="2.6" diff --git a/tomcat-api-OSGi-MANIFEST.MF b/tomcat-api-OSGi-MANIFEST.MF deleted file mode 100644 index 85b12b8..0000000 --- a/tomcat-api-OSGi-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.tomcat;version="8.0.26" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 8.0.26 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.tomcat -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/tomcat-juli-OSGi-MANIFEST.MF b/tomcat-juli-OSGi-MANIFEST.MF deleted file mode 100644 index b856d9f..0000000 --- a/tomcat-juli-OSGi-MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.juli;version="8.0.26",org.apache.juli.loggi - ng;version="8.0.26" -Bundle-Vendor: %bundleProvider -Bundle-ClassPath: . -Bundle-Version: 8.0.26 -Bundle-Name: %bundleName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.juli -Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J - 2SE-1.3 - diff --git a/tomcat.spec b/tomcat.spec index 137e1f9..b34284e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -74,14 +74,7 @@ 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 -Source8: servlet-api-OSGi-MANIFEST.MF -Source9: jsp-api-OSGi-MANIFEST.MF Source11: %{name}-%{major_version}.%{minor_version}.service -Source12: el-api-OSGi-MANIFEST.MF -Source13: jasper-el-OSGi-MANIFEST.MF -Source14: jasper-OSGi-MANIFEST.MF -Source15: tomcat-api-OSGi-MANIFEST.MF -Source16: tomcat-juli-OSGi-MANIFEST.MF Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service Source21: tomcat-functions Source30: tomcat-preamble @@ -285,30 +278,6 @@ pushd ../web popd popd -# inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE8} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/servlet-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE9} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/jsp-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE12} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/el-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE13} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/jasper-el.jar META-INF/MANIFEST.MF -cp -p %{SOURCE14} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/jasper.jar META-INF/MANIFEST.MF -cp -p %{SOURCE15} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF -cp -p %{SOURCE16} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF - %install # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} @@ -680,6 +649,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 +- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) + * Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 27d871ef2c95891c6dd43cdf2a01c9210dcef027 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 20 Feb 2019 15:23:38 -0500 Subject: [PATCH 154/354] Bump release number --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index b34284e..13716c7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -62,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 From 07b8ade141d06d741f3d9cd0ac2725ba84731895 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 20 Feb 2019 15:26:05 -0500 Subject: [PATCH 155/354] Remove unnecessary patch, the change was included upstream for asfbz#52493 --- add_parent_logger_getter.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 add_parent_logger_getter.patch diff --git a/add_parent_logger_getter.patch b/add_parent_logger_getter.patch deleted file mode 100644 index 40b9268..0000000 --- a/add_parent_logger_getter.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400 -+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400 -@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool; - import java.io.PrintWriter; - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Iterator; - import java.util.Properties; - import java.util.concurrent.Future; -+import java.util.logging.Logger; - - import javax.sql.XAConnection; - -@@ -534,6 +536,14 @@ public class DataSourceProxy implements - } - - /** -+ * no-op -+ * {@link javax.sql.DataSource#getParentLogger} -+ */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ -+ /** - * no-op - * {@link javax.sql.DataSource#getLogWriter} - */ From fd75e507d2417caa15a01ca99c456e866dfa4350 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 12:52:37 -0500 Subject: [PATCH 156/354] Removing unused dependency, apache-commons-collections, which was removed from upstream's build in r783696 --- tomcat.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 13716c7..c7fa0fa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -92,7 +92,6 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ecj >= 1:4.6.1 BuildRequires: findutils -BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-pool @@ -113,7 +112,6 @@ BuildRequires: wsdl4j BuildRequires: systemd Requires: apache-commons-daemon -Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool Requires: java-headless >= 1:1.8.0 @@ -186,7 +184,6 @@ 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.6.1 -Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool Requires(preun): coreutils @@ -245,7 +242,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ -Djdt.jar="$(build-classpath ecj)" \ @@ -365,8 +361,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} popd pushd output/build - %{_bindir}/build-jar-repository lib apache-commons-collections \ - apache-commons-dbcp apache-commons-pool ecj 2>&1 + %{_bindir}/build-jar-repository lib apache-commons-dbcp apache-commons-pool 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 \ @@ -378,7 +373,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__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 apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar From fca3df7ab879bdbc282cb600b18bec66f53d3f69 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 13:00:54 -0500 Subject: [PATCH 157/354] Add mock results to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd61fdd..ba6d6e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apache-tomcat-*-src.tar.gz - +results_tomcat +tomcat*.src.rpm From 54436d8faf9f43beecfbce4113f025ec83b4eac8 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 13:10:42 -0500 Subject: [PATCH 158/354] Remove unused dependencies, apache-commons-daemon and apache-commons-pool --- tomcat.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index c7fa0fa..2219309 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -93,8 +93,6 @@ BuildRequires: ant BuildRequires: ecj >= 1:4.6.1 BuildRequires: findutils BuildRequires: apache-commons-daemon -BuildRequires: apache-commons-dbcp -BuildRequires: apache-commons-pool BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.8.0 BuildRequires: jpackage-utils >= 0:1.7.0 @@ -112,8 +110,6 @@ BuildRequires: wsdl4j BuildRequires: systemd Requires: apache-commons-daemon -Requires: apache-commons-dbcp -Requires: apache-commons-pool Requires: java-headless >= 1:1.8.0 Requires: jpackage-utils Requires: procps @@ -184,8 +180,6 @@ 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.6.1 -Requires: apache-commons-dbcp -Requires: apache-commons-pool Requires(preun): coreutils %description lib @@ -361,7 +355,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} popd pushd output/build - %{_bindir}/build-jar-repository lib apache-commons-dbcp apache-commons-pool ecj 2>&1 + %{_bindir}/build-jar-repository lib 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 \ @@ -373,8 +367,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__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 apache-commons-dbcp) commons-dbcp.jar - %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap) From 7ec1edc4feb9d4033232aea18e10d2e93add0cf3 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 13:11:37 -0500 Subject: [PATCH 159/354] Update changelog for dependency cleanup --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index 2219309..0aedce5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -637,6 +637,7 @@ fi %changelog * Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 - Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) +- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool * Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 4b9ac6b73723fc3e03fa6278538d3338fe0d5f20 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 13:23:51 -0500 Subject: [PATCH 160/354] Remove unused junit dependency --- tomcat.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 0aedce5..26ce3ad 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -101,7 +101,6 @@ BuildRequires: jpackage-utils >= 0:1.7.0 # See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro BuildRequires: javapackages-local %endif -BuildRequires: junit BuildRequires: geronimo-jaxrpc BuildRequires: geronimo-saaj BuildRequires: aqute-bnd @@ -637,7 +636,7 @@ fi %changelog * Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 - Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) -- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool +- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit * Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d290d60864700e0815f65fcc068c9e901aa2afa1 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 14:27:58 -0500 Subject: [PATCH 161/354] Cleanup ant targets and unused system properties --- tomcat.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 26ce3ad..ae1f78b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -250,12 +250,9 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - -Djava.7.home=%{java_home} \ - -Dexecute.validate=false \ - deploy dist-prepare dist-source javadoc + deploy javadoc # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar From b394a44ff147c00dd5b043ffd9bb5bb396b4cd68 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 1 Mar 2019 16:18:57 -0500 Subject: [PATCH 162/354] Remove deprecated SHUTDOWN_WAIT setting from conf comments and provide an alternative --- tomcat-9.0.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf index 3f43006..e5fa60a 100644 --- a/tomcat-9.0.conf +++ b/tomcat-9.0.conf @@ -43,9 +43,8 @@ JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourc # 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" +# 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 From 32a679992bb93dfa50ebad6324eb7c0d917c5fb4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 2 Apr 2019 15:57:06 -0400 Subject: [PATCH 163/354] Remove javadoc subpackage to drop the jpackage-utils dependency --- tomcat.spec | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index ae1f78b..156e25a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -62,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -95,7 +95,6 @@ BuildRequires: findutils BuildRequires: apache-commons-daemon BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.8.0 -BuildRequires: jpackage-utils >= 0:1.7.0 %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # add_maven_depmap is deprecated, using javapackages-local for now # See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro @@ -110,7 +109,6 @@ BuildRequires: systemd Requires: apache-commons-daemon Requires: java-headless >= 1:1.8.0 -Requires: jpackage-utils Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} @@ -146,13 +144,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description docs-webapp The docs web application for Apache Tomcat. -%package javadoc -Summary: Javadoc generated documentation for Apache Tomcat -Requires: jpackage-utils - -%description javadoc -Javadoc generated documentation for Apache Tomcat. - %package jsvc Summary: Apache jsvc wrapper for Apache Tomcat as separate service Requires: %{name} = %{epoch}:%{version}-%{release} @@ -252,7 +243,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy javadoc + deploy # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar @@ -268,7 +259,6 @@ popd # 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}%{_javadocdir}/%{name} %{__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 @@ -296,8 +286,6 @@ pushd output/build %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd -# javadoc -%{__cp} -a output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ @@ -578,9 +566,6 @@ fi %files docs-webapp %{appdir}/docs -%files javadoc -%{_javadocdir}/%{name} - %files jsp-%{jspspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-jsp-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar @@ -631,6 +616,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 +- Remove javadoc subpackage to drop the jpackage-utils dependency + * Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 - Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) - Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit From 35c4e39e720b3b209ef8f8d511f28ee0196bb229 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 5 Apr 2019 16:11:15 -0400 Subject: [PATCH 164/354] Add ant target 'dist-source' to allow packaging of maven artifacts and sample webapp code --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 156e25a..efb3104 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -243,7 +243,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy + deploy dist-source # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar From 59a8d55f5af598d96780167c7abf048a0fd50a95 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 18 Jun 2019 09:17:56 -0400 Subject: [PATCH 165/354] Update to 9.0.21 --- sources | 2 +- tomcat.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8d4722c..c247f9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.13-src.tar.gz) = ee61f13d54d2fde81f6a9333e0963d42374f79d3e884f28daae2f4426b7b2d1d26b7a99d6872f0648474c9277c189ac412a91f67faf173532f4367ed3ffd238c +SHA512 (apache-tomcat-9.0.21-src.tar.gz) = 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f diff --git a/tomcat.spec b/tomcat.spec index efb3104..4277fd2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,13 +31,13 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 13 +%global micro_version 21 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 %global tcuid 91 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java -%global native_version 1.2.14 +%global native_version 1.2.21 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -62,7 +62,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -616,6 +616,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 +- Update to 9.0.21 + * Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 - Remove javadoc subpackage to drop the jpackage-utils dependency From f905e7e82292c039261ec36e0f4fbebf6439c027 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 18 Jun 2019 09:22:07 -0400 Subject: [PATCH 166/354] Remove fc24 conditional as it's EOL --- tomcat.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 4277fd2..990101e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -55,9 +55,6 @@ # Fedora doesn't seem to have this macro, so we define it if it doesn't exist %{!?_mavendepmapfragdir: %global _mavendepmapfragdir /usr/share/maven-metadata} -# Fedora 24 erroneously uses %%{_datadir}/maven-fragments instead of /maven-metadata for some reason... -# Override the mavendepmapfragdir var on fc24 -%{?fc24: %global _mavendepmapfragdir /usr/share/maven-metadata} Name: tomcat Epoch: 1 From c3a377befc55ce99ba9082621675921fbb3e13f9 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 18 Jun 2019 09:53:08 -0400 Subject: [PATCH 167/354] Remove unnecessary patches and update version of ECJ required by tomcat --- .gitignore | 1 + disableJavadocFailOnWarning.patch | 47 ----------------------- tomcat-9.0.10-RemoveCompilerOptions.patch | 36 ----------------- tomcat.spec | 10 ++--- 4 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 disableJavadocFailOnWarning.patch delete mode 100644 tomcat-9.0.10-RemoveCompilerOptions.patch diff --git a/.gitignore b/.gitignore index ba6d6e4..471c3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ apache-tomcat-*-src.tar.gz results_tomcat tomcat*.src.rpm +apache-tomcat-*-src/ diff --git a/disableJavadocFailOnWarning.patch b/disableJavadocFailOnWarning.patch deleted file mode 100644 index 03d03c5..0000000 --- a/disableJavadocFailOnWarning.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- build.xml.orig 2018-03-15 13:49:03.366863009 -0400 -+++ build.xml 2018-03-15 13:49:29.690870139 -0400 -@@ -1777,7 +1777,7 @@ Apache Tomcat ${version} native binaries - additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1798,7 +1798,7 @@ Apache Tomcat ${version} native binaries - additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1819,7 +1819,7 @@ Apache Tomcat ${version} native binaries - additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1840,7 +1840,7 @@ Apache Tomcat ${version} native binaries - additionalparam="-breakiterator -notimestamp" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - -@@ -1860,7 +1860,7 @@ Apache Tomcat ${version} native binaries - additionalparam="-breakiterator -notimestamp ${java9.add.modules}" - maxmemory="512m" - failonerror="true" -- failonwarning="true"> -+ failonwarning="false"> - - - diff --git a/tomcat-9.0.10-RemoveCompilerOptions.patch b/tomcat-9.0.10-RemoveCompilerOptions.patch deleted file mode 100644 index 4a60efb..0000000 --- a/tomcat-9.0.10-RemoveCompilerOptions.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-31 17:05:49.639378409 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 17:06:36.947209122 -0400 -@@ -313,14 +313,6 @@ public class JDTCompiler extends org.apa - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); -- // Version format changed from Java 9 onwards. -- // Support old format that was used in EA implementation as well -- } else if(opt.equals("9") || opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_Source, -- CompilerOptions.VERSION_9); -- } else if(opt.equals("10")) { -- settings.put(CompilerOptions.OPTION_Source, -- CompilerOptions.VERSION_10); - } else { - log.warn("Unknown source VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_Source, -@@ -367,18 +359,6 @@ public class JDTCompiler extends org.apa - CompilerOptions.VERSION_1_8); - settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); -- // Version format changed from Java 9 onwards. -- // Support old format that was used in EA implementation as well -- } else if(opt.equals("9") || opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, -- CompilerOptions.VERSION_9); -- settings.put(CompilerOptions.OPTION_Compliance, -- CompilerOptions.VERSION_9); -- } else if(opt.equals("10")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, -- CompilerOptions.VERSION_10); -- settings.put(CompilerOptions.OPTION_Compliance, -- CompilerOptions.VERSION_10); - } else { - log.warn("Unknown target VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/tomcat.spec b/tomcat.spec index 990101e..9c1b1ef 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -80,14 +80,12 @@ Source32: tomcat-named.service Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -Patch2: %{name}-9.0.10-RemoveCompilerOptions.patch -Patch3: disableJavadocFailOnWarning.patch -Patch4: %{name}-build.patch +Patch2: %{name}-build.patch BuildArch: noarch BuildRequires: ant -BuildRequires: ecj >= 1:4.6.1 +BuildRequires: ecj >= 1:4.10 BuildRequires: findutils BuildRequires: apache-commons-daemon BuildRequires: tomcat-taglibs-standard @@ -166,7 +164,7 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj >= 1:4.6.1 +Requires: ecj >= 1:4.10 Requires(preun): coreutils %description lib @@ -207,8 +205,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 -%patch4 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar From 86ec90907ed0a55d108adb98718e4a86b8553ad4 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 18 Jun 2019 10:12:41 -0400 Subject: [PATCH 168/354] Update to 7.0.94 Resolves: rhbz#1713280 - CVE-2019-0221 tomcat: XSS in SSI printenv --- .gitignore | 2 + sources | 2 +- tomcat-7.0.90-RemoveCompilerOptions.patch | 105 -------------- tomcat-7.0.94-RemoveCompilerOptions.patch | 162 ++++++++++++++++++++++ tomcat.spec | 8 +- 5 files changed, 171 insertions(+), 108 deletions(-) delete mode 100644 tomcat-7.0.90-RemoveCompilerOptions.patch create mode 100644 tomcat-7.0.94-RemoveCompilerOptions.patch diff --git a/.gitignore b/.gitignore index 27051a9..095e3b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ apache-tomcat-*-src.tar.gz apache-tomcat-*-src +results_tomcat/ +tomcat*src.rpm diff --git a/sources b/sources index bdb6545..27faf09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.92-src.tar.gz) = 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a +SHA512 (apache-tomcat-7.0.94-src.tar.gz) = 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139 diff --git a/tomcat-7.0.90-RemoveCompilerOptions.patch b/tomcat-7.0.90-RemoveCompilerOptions.patch deleted file mode 100644 index 3de72aa..0000000 --- a/tomcat-7.0.90-RemoveCompilerOptions.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-02 13:12:33.000000000 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 16:48:35.420679218 -0400 -@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apa - /** - * Compile the servlet from .java file to .class file - */ -- @Override - protected void generateClass(String[] smap) - throws FileNotFoundException, JasperException, Exception { - -@@ -126,12 +125,10 @@ public class JDTCompiler extends org.apa - this.sourceFile = sourceFile; - } - -- @Override - public char[] getFileName() { - return sourceFile.toCharArray(); - } - -- @Override - public char[] getContents() { - char[] result = null; - FileInputStream is = null; -@@ -173,7 +170,6 @@ public class JDTCompiler extends org.apa - return result; - } - -- @Override - public char[] getMainTypeName() { - int dot = className.lastIndexOf('.'); - if (dot > 0) { -@@ -182,7 +178,6 @@ public class JDTCompiler extends org.apa - return className.toCharArray(); - } - -- @Override - public char[][] getPackageName() { - StringTokenizer izer = - new StringTokenizer(className, "."); -@@ -194,7 +189,6 @@ public class JDTCompiler extends org.apa - return result; - } - -- @Override - public boolean ignoreOptionalProblems() { - return false; - } -@@ -202,7 +196,6 @@ public class JDTCompiler extends org.apa - - final INameEnvironment env = new INameEnvironment() { - -- @Override - public NameEnvironmentAnswer - findType(char[][] compoundTypeName) { - StringBuilder result = new StringBuilder(); -@@ -215,7 +208,6 @@ public class JDTCompiler extends org.apa - return findType(result.toString()); - } - -- @Override - public NameEnvironmentAnswer - findType(char[] typeName, - char[][] packageName) { -@@ -297,7 +289,6 @@ public class JDTCompiler extends org.apa - } - } - -- @Override - public boolean isPackage(char[][] parentPackageName, - char[] packageName) { - StringBuilder result = new StringBuilder(); -@@ -319,7 +310,6 @@ public class JDTCompiler extends org.apa - return isPackage(result.toString()); - } - -- @Override - public void cleanup() { - } - -@@ -368,17 +358,6 @@ public class JDTCompiler extends org.apa - } else if(opt.equals("1.7")) { - settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_7); -- } else if(opt.equals("1.8")) { -- settings.put(CompilerOptions.OPTION_Source, -- CompilerOptions.VERSION_1_8); -- // Support old format that was used in EA implementation as well -- } else if(opt.equals("9") || opt.equals("1.9")) { -- settings.put(CompilerOptions.OPTION_Source, -- JDT_JAVA_9_VERSION); -- } else if(opt.equals("10")) { -- // Constant not available in latest ECJ version that runs on -- // Java 7 -- settings.put(CompilerOptions.OPTION_Source, "10"); - } else { - log.warn("Unknown source VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_Source, -@@ -452,7 +431,6 @@ public class JDTCompiler extends org.apa - new DefaultProblemFactory(Locale.getDefault()); - - final ICompilerRequestor requestor = new ICompilerRequestor() { -- @Override - public void acceptResult(CompilationResult result) { - try { - if (result.hasProblems()) { diff --git a/tomcat-7.0.94-RemoveCompilerOptions.patch b/tomcat-7.0.94-RemoveCompilerOptions.patch new file mode 100644 index 0000000..ea4d12f --- /dev/null +++ b/tomcat-7.0.94-RemoveCompilerOptions.patch @@ -0,0 +1,162 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2019-06-18 10:38:02.381894455 -0400 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2019-06-18 10:39:28.932684377 -0400 +@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apa + /** + * Compile the servlet from .java file to .class file + */ +- @Override + protected void generateClass(String[] smap) + throws FileNotFoundException, JasperException, Exception { + +@@ -126,12 +125,10 @@ public class JDTCompiler extends org.apa + this.sourceFile = sourceFile; + } + +- @Override + public char[] getFileName() { + return sourceFile.toCharArray(); + } + +- @Override + public char[] getContents() { + char[] result = null; + FileInputStream is = null; +@@ -173,7 +170,6 @@ public class JDTCompiler extends org.apa + return result; + } + +- @Override + public char[] getMainTypeName() { + int dot = className.lastIndexOf('.'); + if (dot > 0) { +@@ -182,7 +178,6 @@ public class JDTCompiler extends org.apa + return className.toCharArray(); + } + +- @Override + public char[][] getPackageName() { + StringTokenizer izer = + new StringTokenizer(className, "."); +@@ -194,7 +189,6 @@ public class JDTCompiler extends org.apa + return result; + } + +- @Override + public boolean ignoreOptionalProblems() { + return false; + } +@@ -202,7 +196,6 @@ public class JDTCompiler extends org.apa + + final INameEnvironment env = new INameEnvironment() { + +- @Override + public NameEnvironmentAnswer + findType(char[][] compoundTypeName) { + StringBuilder result = new StringBuilder(); +@@ -215,7 +208,6 @@ public class JDTCompiler extends org.apa + return findType(result.toString()); + } + +- @Override + public NameEnvironmentAnswer + findType(char[] typeName, + char[][] packageName) { +@@ -297,7 +289,6 @@ public class JDTCompiler extends org.apa + } + } + +- @Override + public boolean isPackage(char[][] parentPackageName, + char[] packageName) { + StringBuilder result = new StringBuilder(); +@@ -319,7 +310,6 @@ public class JDTCompiler extends org.apa + return isPackage(result.toString()); + } + +- @Override + public void cleanup() { + } + +@@ -368,33 +358,6 @@ public class JDTCompiler extends org.apa + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); +- // Support old format that was used in EA implementation as well +- } else if(opt.equals("9") || opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_Source, +- JDT_JAVA_9_VERSION); +- } else if(opt.equals("10")) { +- // Constant not available in latest ECJ version that runs on +- // Java 6. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "10"); +- } else if(opt.equals("11")) { +- // Constant not available in latest ECJ version that runs on +- // Java 6. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "11"); +- } else if(opt.equals("12")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "12"); +- } else if(opt.equals("13")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "13"); + } else { + log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt)); + settings.put(CompilerOptions.OPTION_Source, +@@ -436,40 +399,6 @@ public class JDTCompiler extends org.apa + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); +- } else if(opt.equals("9") || opt.equals("1.9")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- JDT_JAVA_9_VERSION); +- settings.put(CompilerOptions.OPTION_Compliance, +- JDT_JAVA_9_VERSION); +- } else if(opt.equals("10")) { +- // Constant not available in latest ECJ version that runs on +- // Java 6. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "10"); +- settings.put(CompilerOptions.OPTION_Compliance, "10"); +- } else if(opt.equals("11")) { +- // Constant not available in latest ECJ version that runs on +- // Java 6. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "11"); +- settings.put(CompilerOptions.OPTION_Compliance, "11"); +- } else if(opt.equals("12")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "12"); +- settings.put(CompilerOptions.OPTION_Compliance, "12"); +- } else if(opt.equals("13")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "13"); +- settings.put(CompilerOptions.OPTION_Compliance, "13"); + } else { + log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt)); + settings.put(CompilerOptions.OPTION_TargetPlatform, +@@ -487,7 +416,6 @@ public class JDTCompiler extends org.apa + new DefaultProblemFactory(Locale.getDefault()); + + final ICompilerRequestor requestor = new ICompilerRequestor() { +- @Override + public void acceptResult(CompilationResult result) { + try { + if (result.hasProblems()) { diff --git a/tomcat.spec b/tomcat.spec index 0d418cc..f961de0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 92 +%global micro_version 94 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -81,7 +81,7 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 -Patch2: %{name}-7.0.90-RemoveCompilerOptions.patch +Patch2: %{name}-7.0.94-RemoveCompilerOptions.patch # Adding patch to remove unsupport ant tasks/attributes Patch3: %{name}-7.0.90-build.patch Patch4: %{name}-7.0-catalina-policy.patch @@ -639,6 +639,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Tue Jun 18 2019 Coty Sutherland - 1:7.0.94-1 +- Update to 7.0.94 +- Resolves: rhbz#1713280 - CVE-2019-0221 tomcat: XSS in SSI printenv + * Thu Dec 13 2018 Coty Sutherland - 1:7.0.92-1 - Update to 7.0.92 - Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet From 3d2693a555b74ded874d851ccb44327d64c8b7b2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 18 Jun 2019 15:26:48 -0400 Subject: [PATCH 169/354] Drop some outdated deps and use zip instead of zip -u --- tomcat.spec | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index f961de0..a70b170 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -95,10 +95,7 @@ BuildRequires: ant-nodeps BuildRequires: ant-trax BuildRequires: ecj BuildRequires: findutils -BuildRequires: jakarta-commons-collections BuildRequires: jakarta-commons-daemon -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-pool BuildRequires: jakarta-taglibs-standard BuildRequires: java7-devel >= 1:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0 @@ -107,10 +104,6 @@ BuildRequires: log4j BuildRequires: wsdl4j Requires: jakarta-commons-daemon -Requires: jakarta-commons-logging -Requires: jakarta-commons-collections -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-pool Requires: java >= 1:1.6.0 Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} @@ -186,9 +179,6 @@ 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 -Requires: jakarta-commons-collections -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-pool Requires(preun): coreutils %description lib @@ -243,30 +233,21 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %build export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps xalan-j2-serializer" - # we don't care about the tarballs and we're going to replace - # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar - # so just create a dummy file for later removal touch HACK %{__mkdir_p} HACKDIR touch HACKDIR/build.xml # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath jakarta-commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath jakarta-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ - -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-dbcp.jar="$(build-classpath jakarta-commons-dbcp)" \ -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="$(build-classpath wsdl4j)" \ - -Dcommons-pool.home="HACKDIR" \ - -Dcommons-dbcp.home="HACKDIR" \ - -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ -Djava.7.home=%{java_home} \ @@ -274,8 +255,7 @@ export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps xalan-j2-serializer" # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ - output/build/lib/ecj.jar \ - output/build/lib/jakarta-commons-dbcp.jar + output/build/lib/ecj.jar pushd output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes @@ -289,25 +269,25 @@ popd mkdir -p META-INF cp -p %{SOURCE8} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF +zip output/build/lib/servlet-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF +zip output/build/lib/jsp-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE11} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF +zip output/build/lib/el-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE12} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF +zip output/build/lib/jasper-el.jar META-INF/MANIFEST.MF cp -p %{SOURCE13} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF +zip output/build/lib/jasper.jar META-INF/MANIFEST.MF cp -p %{SOURCE14} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF +zip output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE15} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF +zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF %install # build initial path structure @@ -379,8 +359,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} popd pushd output/build - %{_bindir}/build-jar-repository lib jakarta-commons-collections \ - jakarta-commons-dbcp jakarta-commons-pool ecj 2>&1 + %{_bindir}/build-jar-repository lib 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 \ @@ -392,8 +371,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__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 jakarta-commons-collections) commons-collections.jar - %{__ln_s} $(build-classpath jakarta-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar From c6f685500a6b76ad9b724f6d1bf642875818b587 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 17 Jul 2019 13:16:33 -0400 Subject: [PATCH 170/354] Update build-classpath calls to ECJ to specify the JAR we want to use --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 9c1b1ef..ba82da8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -221,7 +221,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbuild.compiler="modern" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ - -Djdt.jar="$(build-classpath ecj)" \ + -Djdt.jar="$(build-classpath ecj/ecj)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ @@ -344,7 +344,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__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) jasper-jdt.jar + %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap) %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./ @@ -609,6 +609,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 +- Update build-classpath calls to ECJ to specify the JAR we want to use + * Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 - Update to 9.0.21 From c45e83f43a2c6681519b972a4ef6fbfb5833b50d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 17 Jul 2019 13:32:12 -0400 Subject: [PATCH 171/354] Resolves: rhbz#1730755 Adding javapackages-tools back as a Requirement as it's required to run the service scripts --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index ba82da8..2ff5b16 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -104,6 +104,7 @@ BuildRequires: systemd Requires: apache-commons-daemon Requires: java-headless >= 1:1.8.0 +Requires: javapackages-tools Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} From 4c36cc2105a320d2b3ee9e6023bdaa425af2a296 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 17 Jul 2019 14:17:34 -0400 Subject: [PATCH 172/354] Bump release version --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 2ff5b16..fd44966 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 From d973e255b338581062b25888603607ea1ac80262 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 01:39:36 +0000 Subject: [PATCH 173/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index fd44966..f5a36ce 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -610,6 +610,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 - Update build-classpath calls to ECJ to specify the JAR we want to use From 5ac49193adab92efc08c3c94c3e6bd483ce7d0f1 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 12:00:56 -0400 Subject: [PATCH 174/354] Resolves: rhbz#1466026 JVM options are duplicated after service restart --- tomcat-7.0.init | 8 +++++++- tomcat.spec | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tomcat-7.0.init b/tomcat-7.0.init index 026adb9..dd737e8 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -75,6 +75,9 @@ TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" # Define the tomcat pid file CATALINA_PID="${CATALINA_PID:-/var/run/${NAME}.pid}" +# Variable to keep parseOptions status +OPTIONS_PARSED="0" + RETVAL="0" # Look for open ports, as the function name might imply @@ -142,7 +145,10 @@ function parseOptions() { /etc/sysconfig/${NAME} )" fi - TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" + if [ "$OPTIONS_PARSED" -eq 0 ]; then + TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" + OPTIONS_PARSED=1 + fi } # See how we were called. diff --git a/tomcat.spec b/tomcat.spec index a70b170..3ee9115 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -616,6 +616,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Sep 26 2019 Coty Sutherland - 1:7.0.94-2 +- Resolves: rhbz#1466026 JVM options are duplicated after service restart + * Tue Jun 18 2019 Coty Sutherland - 1:7.0.94-1 - Update to 7.0.94 - Resolves: rhbz#1713280 - CVE-2019-0221 tomcat: XSS in SSI printenv From 90835a7334092280ad68f90a357f19bf8203973f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 12:35:29 -0400 Subject: [PATCH 175/354] Update to 7.0.96 --- sources | 2 +- tomcat.spec | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 27faf09..81fb7f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.94-src.tar.gz) = 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139 +SHA512 (apache-tomcat-7.0.96-src.tar.gz) = 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 diff --git a/tomcat.spec b/tomcat.spec index 3ee9115..92bdbd8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 94 +%global micro_version 96 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -616,7 +616,8 @@ fi %{_sbindir}/%{name}-jsvc %changelog -* Thu Sep 26 2019 Coty Sutherland - 1:7.0.94-2 +* Thu Sep 26 2019 Coty Sutherland - 1:7.0.96-1 +- Update to 7.0.96 - Resolves: rhbz#1466026 JVM options are duplicated after service restart * Tue Jun 18 2019 Coty Sutherland - 1:7.0.94-1 From dda1be6b792b046de1ad24dee43899f5e28b862d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 14:22:47 -0400 Subject: [PATCH 176/354] Update to 9.0.26 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c247f9d..462e73a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.21-src.tar.gz) = 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f +SHA512 (apache-tomcat-9.0.26-src.tar.gz) = 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837 diff --git a/tomcat.spec b/tomcat.spec index f5a36ce..e3a816b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 21 +%global micro_version 26 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -610,6 +610,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 +- Update to 9.0.26 + * Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 679778488ac7ec3efa795d9ebbee7c2edabfcdf0 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 14:28:51 -0400 Subject: [PATCH 177/354] Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names --- tomcat-named.service | 4 ++-- tomcat.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat-named.service b/tomcat-named.service index 9bbcb17..7393672 100644 --- a/tomcat-named.service +++ b/tomcat-named.service @@ -13,8 +13,8 @@ After=syslog.target network.target [Service] Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf -Environment="NAME=%I" -EnvironmentFile=-/etc/sysconfig/tomcat@%I +Environment="NAME=%i" +EnvironmentFile=-/etc/sysconfig/tomcat@%i ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 diff --git a/tomcat.spec b/tomcat.spec index e3a816b..77619ca 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -612,6 +612,7 @@ fi %changelog * Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 - Update to 9.0.26 +- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names * Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 98e48e45f4373bc5108c1c1493577b13b48af2d7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 14:32:36 -0400 Subject: [PATCH 178/354] Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user --- tomcat-9.0.service | 2 -- tomcat-named.service | 2 -- tomcat.spec | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tomcat-9.0.service b/tomcat-9.0.service index 2b20aa0..832e7c6 100644 --- a/tomcat-9.0.service +++ b/tomcat-9.0.service @@ -15,8 +15,6 @@ EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start SuccessExitStatus=143 User=tomcat -Group=tomcat - [Install] WantedBy=multi-user.target diff --git a/tomcat-named.service b/tomcat-named.service index 7393672..b6cd8bd 100644 --- a/tomcat-named.service +++ b/tomcat-named.service @@ -19,8 +19,6 @@ ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 User=tomcat -Group=tomcat [Install] WantedBy=multi-user.target - diff --git a/tomcat.spec b/tomcat.spec index 77619ca..d53c576 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -613,6 +613,7 @@ fi * Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 - Update to 9.0.26 - Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names +- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user * Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 582d8e227092a3b70bf0dd2cc65ceee3dba6526b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 16:05:30 -0400 Subject: [PATCH 179/354] Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts --- tomcat.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index d53c576..c64d9ea 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -35,7 +35,7 @@ %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 -%global tcuid 91 +%global tcuid 53 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java %global native_version 1.2.21 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -455,9 +455,14 @@ done %pre # add the tomcat user and group -%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : -%{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ - -s /sbin/nologin -r -d %{homedir} tomcat 2>/dev/null || : +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 @@ -610,6 +615,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 +- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts + * Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 - Update to 9.0.26 - Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names From 086e236b296eefad9511130d1e49cdb07d004b05 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 20 Dec 2019 07:54:07 -0500 Subject: [PATCH 180/354] Update to 9.0.30 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 462e73a..33c6aba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.26-src.tar.gz) = 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837 +SHA512 (apache-tomcat-9.0.30-src.tar.gz) = 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d diff --git a/tomcat.spec b/tomcat.spec index c64d9ea..39d113d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 26 +%global micro_version 30 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -615,6 +615,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 +- Update to 9.0.30 + * Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 - Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts From b9c7fad2ffc274dca635374a879ca2d9a10fcc6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:47:34 +0000 Subject: [PATCH 181/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 39d113d..784750d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -615,6 +615,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 - Update to 9.0.30 From b3f5333fe2e47a65906b8a9dee1631a324337cc5 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 6 Feb 2020 13:15:28 -0500 Subject: [PATCH 182/354] Update to 7.0.99 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 81fb7f5..62331da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.96-src.tar.gz) = 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 +SHA512 (apache-tomcat-7.0.99-src.tar.gz) = 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 diff --git a/tomcat.spec b/tomcat.spec index 92bdbd8..1deb89b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 96 +%global micro_version 99 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -616,6 +616,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Feb 06 2020 Coty Sutherland - 1:7.0.99-1 +- Update to 7.0.99 + * Thu Sep 26 2019 Coty Sutherland - 1:7.0.96-1 - Update to 7.0.96 - Resolves: rhbz#1466026 JVM options are duplicated after service restart From 53af7d2339c9ccbc2420512a178d9ca527d9b1a8 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 6 Feb 2020 14:38:45 -0500 Subject: [PATCH 183/354] Remove SAAJ API addition (not necessary) and javac release attributes (not yet supported) --- ...0-build.patch => tomcat-7.0.99-build.patch | 77 ++++++++++++++++--- tomcat.spec | 2 +- 2 files changed, 68 insertions(+), 11 deletions(-) rename tomcat-7.0.90-build.patch => tomcat-7.0.99-build.patch (53%) diff --git a/tomcat-7.0.90-build.patch b/tomcat-7.0.99-build.patch similarity index 53% rename from tomcat-7.0.90-build.patch rename to tomcat-7.0.99-build.patch index 63a974c..80d2358 100644 --- a/tomcat-7.0.90-build.patch +++ b/tomcat-7.0.99-build.patch @@ -1,6 +1,14 @@ ---- build.xml.orig 2018-07-31 16:53:30.644130082 -0400 -+++ build.xml 2018-07-31 16:56:12.472419607 -0400 -@@ -216,7 +216,7 @@ +--- build.xml.orig 2019-12-11 08:21:52.000000000 -0500 ++++ build.xml 2020-02-06 14:32:03.578329367 -0500 +@@ -222,7 +222,6 @@ + + + +- + + + +@@ -244,7 +243,7 @@ @@ -9,9 +17,17 @@ -@@ -1056,12 +1056,11 @@ +@@ -636,7 +635,6 @@ + deprecation="${compile.deprecation}" + source="${compile.source}" + target="${compile.target}" +- release="${compile.release}" + encoding="ISO-8859-1" + includeAntRuntime="true" > + +@@ -1141,12 +1139,11 @@ - + - - @@ -24,7 +40,31 @@ -@@ -1734,8 +1733,8 @@ +@@ -1177,7 +1174,6 @@ + debug="${compile.debug}" deprecation="${compile.deprecation}" + source="${compile.source}" + target="${compile.target}" +- release="${compile.release}" + classpath="${tomcat.classes}" + encoding="ISO-8859-1" + includeantruntime="false"> +@@ -1189,7 +1185,6 @@ + debug="${compile.debug}" deprecation="${compile.deprecation}" + source="${compile.source}" + target="${compile.target}" +- release="${compile.release}" + classpath="${tomcat.classes}" + encoding="ISO-8859-1" + includeantruntime="false"> +@@ -1416,7 +1411,6 @@ + deprecation="${compile.deprecation}" + source="${compile.source}" + target="${compile.target}" +- release="${compile.release}" + encoding="ISO-8859-1" + includeantruntime="true"> + +@@ -1859,8 +1853,8 @@ @@ -35,7 +75,24 @@ -@@ -2976,7 +2975,7 @@ Apache Tomcat ${version} native binaries +@@ -2912,16 +2906,6 @@ skip.installer property in build.propert + + + +- +- +- +- +- +- +- +- +- +- + + + @@ -44,7 +101,7 @@ @@ -53,7 +110,7 @@ @@ -62,7 +119,7 @@ diff --git a/tomcat.spec b/tomcat.spec index 1deb89b..041f4b1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -83,7 +83,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 Patch2: %{name}-7.0.94-RemoveCompilerOptions.patch # Adding patch to remove unsupport ant tasks/attributes -Patch3: %{name}-7.0.90-build.patch +Patch3: %{name}-7.0.99-build.patch Patch4: %{name}-7.0-catalina-policy.patch BuildArch: noarch From bee90cc4459bf5ad2f7d1f71b4845320454a9153 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 5 Mar 2020 15:07:47 -0500 Subject: [PATCH 184/354] Update to 7.0.100 Resolves: rhbz#1806805 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 62331da..abfb952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.99-src.tar.gz) = 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 +SHA512 (apache-tomcat-7.0.100-src.tar.gz) = 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57 diff --git a/tomcat.spec b/tomcat.spec index 041f4b1..8cde319 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 99 +%global micro_version 100 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -616,6 +616,10 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Mar 05 2020 Coty Sutherland - 1:7.0.100-1 +- Update to 7.0.100 +- Resolves: rhbz#1806805 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability + * Thu Feb 06 2020 Coty Sutherland - 1:7.0.99-1 - Update to 7.0.99 From afaf8d3bf411cd9f2ccbc620a59c79e10f49143f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 5 Mar 2020 15:12:02 -0500 Subject: [PATCH 185/354] Update to 9.0.31 Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability --- sources | 2 +- tomcat.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 33c6aba..7481d0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.30-src.tar.gz) = 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d +SHA512 (apache-tomcat-9.0.31-src.tar.gz) = a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f diff --git a/tomcat.spec b/tomcat.spec index 784750d..66877fa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 30 +%global micro_version 31 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -615,6 +615,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 +- Update to 9.0.31 +- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability + * Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ba7ec40020b5ae0d7574b793e4d627bcf1abd78f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 6 Mar 2020 18:42:26 +0100 Subject: [PATCH 186/354] Avoid using recommends when not supported Signed-off-by: Nicolas Chauvet --- tomcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 66877fa..86c89dd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -107,7 +107,9 @@ Requires: java-headless >= 1:1.8.0 Requires: javapackages-tools Requires: procps 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 From 4f8faf67f26c91c13cacc9dd7c70a2d5b3458182 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 12 Mar 2020 14:29:24 -0400 Subject: [PATCH 187/354] Related: rhbz#1806398 Undo changes in defaults for AJP connector (CVE-2020-1938) to prevent breakage, please update your configuration --- change-defaults-for-CVE-2020-1938.patch | 223 ++++++++++++++++++++++++ tomcat.spec | 7 +- 2 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 change-defaults-for-CVE-2020-1938.patch diff --git a/change-defaults-for-CVE-2020-1938.patch b/change-defaults-for-CVE-2020-1938.patch new file mode 100644 index 0000000..cb7cedd --- /dev/null +++ b/change-defaults-for-CVE-2020-1938.patch @@ -0,0 +1,223 @@ +diff -up ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java +--- ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig 2020-03-12 14:21:39.270821184 -0400 ++++ ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java 2020-03-12 14:22:17.771716954 -0400 +@@ -134,7 +134,7 @@ public abstract class AbstractAjpProtoco + } + + +- private boolean secretRequired = true; ++ private boolean secretRequired = false; + public void setSecretRequired(boolean secretRequired) { + this.secretRequired = secretRequired; + } +diff -up ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig ./java/org/apache/coyote/ajp/AjpAprProtocol.java +--- ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig 2020-03-12 14:18:38.918311184 -0400 ++++ ./java/org/apache/coyote/ajp/AjpAprProtocol.java 2020-03-12 14:18:51.031278148 -0400 +@@ -20,7 +20,6 @@ import org.apache.coyote.AbstractProtoco + import org.apache.coyote.Processor; + import org.apache.juli.logging.Log; + import org.apache.juli.logging.LogFactory; +-import org.apache.tomcat.util.compat.JreCompat; + import org.apache.tomcat.util.net.AbstractEndpoint; + import org.apache.tomcat.util.net.AprEndpoint; + import org.apache.tomcat.util.net.AprEndpoint.Handler; +@@ -62,7 +61,6 @@ public class AjpAprProtocol extends Abst + + public AjpAprProtocol() { + endpoint = new AprEndpoint(); +- endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress()); + cHandler = new AjpConnectionHandler(this); + ((AprEndpoint) endpoint).setHandler(cHandler); + setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); +diff -up ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig ./java/org/apache/coyote/ajp/AjpNioProtocol.java +--- ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig 2020-03-12 14:18:58.405258036 -0400 ++++ ./java/org/apache/coyote/ajp/AjpNioProtocol.java 2020-03-12 14:19:02.577246659 -0400 +@@ -23,7 +23,6 @@ import org.apache.coyote.AbstractProtoco + import org.apache.coyote.Processor; + import org.apache.juli.logging.Log; + import org.apache.juli.logging.LogFactory; +-import org.apache.tomcat.util.compat.JreCompat; + import org.apache.tomcat.util.net.AbstractEndpoint; + import org.apache.tomcat.util.net.NioChannel; + import org.apache.tomcat.util.net.NioEndpoint; +@@ -57,7 +56,6 @@ public class AjpNioProtocol extends Abst + + public AjpNioProtocol() { + endpoint = new NioEndpoint(); +- endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress()); + cHandler = new AjpConnectionHandler(this); + ((NioEndpoint) endpoint).setHandler(cHandler); + setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); +diff -up ./java/org/apache/coyote/ajp/AjpProtocol.java.orig ./java/org/apache/coyote/ajp/AjpProtocol.java +--- ./java/org/apache/coyote/ajp/AjpProtocol.java.orig 2020-03-12 14:19:11.121223357 -0400 ++++ ./java/org/apache/coyote/ajp/AjpProtocol.java 2020-03-12 14:19:16.402208954 -0400 +@@ -22,7 +22,6 @@ import org.apache.coyote.AbstractProtoco + import org.apache.coyote.Processor; + import org.apache.juli.logging.Log; + import org.apache.juli.logging.LogFactory; +-import org.apache.tomcat.util.compat.JreCompat; + import org.apache.tomcat.util.net.AbstractEndpoint; + import org.apache.tomcat.util.net.JIoEndpoint; + import org.apache.tomcat.util.net.JIoEndpoint.Handler; +@@ -58,7 +57,6 @@ public class AjpProtocol extends Abstrac + + public AjpProtocol() { + endpoint = new JIoEndpoint(); +- endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress()); + cHandler = new AjpConnectionHandler(this); + ((JIoEndpoint) endpoint).setHandler(cHandler); + setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); +diff -up ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig ./java/org/apache/tomcat/util/compat/Jre7Compat.java +--- ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig 2020-03-12 14:19:23.641189211 -0400 ++++ ./java/org/apache/tomcat/util/compat/Jre7Compat.java 2020-03-12 14:19:52.162111426 -0400 +@@ -20,7 +20,6 @@ import java.io.OutputStream; + import java.lang.reflect.Constructor; + import java.lang.reflect.InvocationTargetException; + import java.lang.reflect.Method; +-import java.net.InetAddress; + import java.sql.CallableStatement; + import java.sql.Connection; + import java.sql.DatabaseMetaData; +@@ -57,7 +56,6 @@ class Jre7Compat extends JreCompat { + private static final Method resultSetGetObjectName; + private static final Method statementCloseOnCompletion; + private static final Method statementIsCloseOnCompletion; +- private static final Method getLoopbackAddress; + + static { + Method m1 = null; +@@ -74,7 +72,6 @@ class Jre7Compat extends JreCompat { + Method m12 = null; + Method m13 = null; + Method m14 = null; +- Method m15 = null; + Constructor c = null; + try { + // Order is important for the error handling below. +@@ -94,7 +91,6 @@ class Jre7Compat extends JreCompat { + m12 = ResultSet.class.getMethod("getObject", String.class, Class.class); + m13 = Statement.class.getMethod("closeOnCompletion"); + m14 = Statement.class.getMethod("isCloseOnCompletion"); +- m15 = InetAddress.class.getMethod("getLoopbackAddress"); + } catch (SecurityException e) { + // Should never happen + log.error(sm.getString("jre7Compat.unexpected"), e); +@@ -122,7 +118,6 @@ class Jre7Compat extends JreCompat { + resultSetGetObjectName = m12; + statementCloseOnCompletion = m13; + statementIsCloseOnCompletion = m14; +- getLoopbackAddress = m15; + } + + +@@ -357,20 +352,6 @@ class Jre7Compat extends JreCompat { + } + } + +- +- @Override +- public InetAddress getLoopbackAddress() { +- try { +- return (InetAddress) getLoopbackAddress.invoke(null); +- } catch (IllegalArgumentException e) { +- throw new UnsupportedOperationException(e); +- } catch (IllegalAccessException e) { +- throw new UnsupportedOperationException(e); +- } catch (InvocationTargetException e) { +- throw new UnsupportedOperationException(e); +- } +- } +- + + // Java 9 methods + +diff -up ./java/org/apache/tomcat/util/compat/JreCompat.java.orig ./java/org/apache/tomcat/util/compat/JreCompat.java +--- ./java/org/apache/tomcat/util/compat/JreCompat.java.orig 2020-03-12 14:20:03.476080570 -0400 ++++ ./java/org/apache/tomcat/util/compat/JreCompat.java 2020-03-12 14:20:23.158027178 -0400 +@@ -21,10 +21,8 @@ import java.io.IOException; + import java.io.OutputStream; + import java.lang.reflect.AccessibleObject; + import java.lang.reflect.Method; +-import java.net.InetAddress; + import java.net.URL; + import java.net.URLConnection; +-import java.net.UnknownHostException; + import java.sql.CallableStatement; + import java.sql.Connection; + import java.sql.DatabaseMetaData; +@@ -234,32 +232,6 @@ public class JreCompat { + } + + +- public InetAddress getLoopbackAddress() { +- // Javadoc for getByName() states that calling with null will return one +- // of the loopback addresses +- InetAddress result = null; +- try { +- result = InetAddress.getByName(null); +- } catch (UnknownHostException e) { +- // This would be unusual but ignore it in this case. +- } +- if (result == null) { +- // Fallback to default IPv4 loopback address. +- // Not perfect but good enough and if the address is not valid the +- // bind will fail later with an appropriate error message +- try { +- result = InetAddress.getByName("127.0.0.1"); +- } catch (UnknownHostException e) { +- // Unreachable. +- // For text representations of IP addresses only the format is +- // checked. +- } +- } +- +- return result; +- } +- +- + // Java 6 implementation of Java 8 methods + + public static boolean isJre8Available() { +diff -up ./webapps/docs/changelog.xml.orig ./webapps/docs/changelog.xml +--- ./webapps/docs/changelog.xml.orig 2020-03-12 14:20:30.645006916 -0400 ++++ ./webapps/docs/changelog.xml 2020-03-12 14:23:07.339582809 -0400 +@@ -143,14 +143,10 @@ + Disable (comment out in server.xml) the AJP/1.3 connector by default. + (markt) + +- +- Change the default bind address for the AJP/1.3 connector to be the +- loopback address. (markt) +- + + Rename the requiredSecret attribute of the AJP/1.3 + Connector to secret and add a new attribute +- secretRequired that defaults to true. When ++ secretRequired that defaults to false. When + secretRequired is true the AJP/1.3 Connector + will not start unless the secret attribute is configured to + a non-null, non-zero length String. (markt) +diff -up ./webapps/docs/config/ajp.xml.orig ./webapps/docs/config/ajp.xml +--- ./webapps/docs/config/ajp.xml.orig 2020-03-12 14:20:50.750952504 -0400 ++++ ./webapps/docs/config/ajp.xml 2020-03-12 14:23:31.800516611 -0400 +@@ -306,7 +306,10 @@ + +

For servers with more than one IP address, this attribute + specifies which address will be used for listening on the specified +- port. By default, the loopback address will be used.

++ port. By default, this port will be used on all IP addresses ++ associated with the server. A value of 127.0.0.1 ++ indicates that the Connector will only listen on the loopback ++ interface.

+ + + +@@ -461,7 +464,7 @@ + +

If this attribute is true, the AJP Connector will only + start if the secret attribute is configured with a +- non-null, non-zero length value. The default value is true. ++ non-null, non-zero length value. The default value is false. +

+ + diff --git a/tomcat.spec b/tomcat.spec index 8cde319..3178fff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -85,6 +85,7 @@ Patch2: %{name}-7.0.94-RemoveCompilerOptions.patch # Adding patch to remove unsupport ant tasks/attributes Patch3: %{name}-7.0.99-build.patch Patch4: %{name}-7.0-catalina-policy.patch +Patch5: change-defaults-for-CVE-2020-1938.patch BuildArch: noarch @@ -227,6 +228,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch2 -p0 %patch3 -p0 %patch4 -p0 +%patch5 -p0 %{__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 @@ -616,6 +618,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Mar 12 2020 Coty Sutherland - 1:7.0.100-2 +- Related: rhbz#1806398 Undo changes in defaults for AJP connector (CVE-2020-1938) to prevent breakage, please update your configuration + * Thu Mar 05 2020 Coty Sutherland - 1:7.0.100-1 - Update to 7.0.100 - Resolves: rhbz#1806805 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability From eaac8d384cbfa1086150c121cf0d9fea99a1f24d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 21 Apr 2020 15:56:44 -0400 Subject: [PATCH 188/354] Update to 9.0.34 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7481d0f..1bf01fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.31-src.tar.gz) = a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f +SHA512 (apache-tomcat-9.0.34-src.tar.gz) = 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df diff --git a/tomcat.spec b/tomcat.spec index 86c89dd..d627c33 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 31 +%global micro_version 34 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -617,6 +617,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 +- Update to 9.0.34 + * Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 - Update to 9.0.31 - Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability From 3ab821b1f1a843cd3dcaf15b8ae4b5fb52856807 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 22 Apr 2020 14:21:43 -0400 Subject: [PATCH 189/354] Update to 7.0.103 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index abfb952..de4a5fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.100-src.tar.gz) = 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57 +SHA512 (apache-tomcat-7.0.103-src.tar.gz) = 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b diff --git a/tomcat.spec b/tomcat.spec index 3178fff..a5ec50c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 100 +%global micro_version 103 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -618,6 +618,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Apr 22 2020 Coty Sutherland - 1:7.0.103-1 +- Update to 7.0.103 + * Thu Mar 12 2020 Coty Sutherland - 1:7.0.100-2 - Related: rhbz#1806398 Undo changes in defaults for AJP connector (CVE-2020-1938) to prevent breakage, please update your configuration From 8d1457151e21f1788f277ec8ed15c83dfd44e197 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 22 Apr 2020 14:55:15 -0400 Subject: [PATCH 190/354] Add updated catalina.policy patch to allow ECJ usage under the Security Manager --- tomcat-9.0-catalina-policy.patch | 35 ++++++++------------------------ tomcat.spec | 7 ++++++- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/tomcat-9.0-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch index 3694929..487e2be 100644 --- a/tomcat-9.0-catalina-policy.patch +++ b/tomcat-9.0-catalina-policy.patch @@ -1,39 +1,20 @@ ---- conf/catalina.policy~ 2016-06-17 10:20:17.649171968 -0400 -+++ conf/catalina.policy 2016-06-17 10:23:35.358309244 -0400 -@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex - permission java.security.AllPermission; +--- conf/catalina.policy.orig 2020-04-22 14:51:13.734893403 -0400 ++++ conf/catalina.policy 2020-04-22 15:14:57.609677967 -0400 +@@ -51,6 +51,17 @@ grant codeBase "file:${java.home}/lib/ex }; + +// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= + ++ +// Allowing everything in /usr/share/java allows too many unknowns to be permitted +// Specifying the individual jars that tomcat needs to function with the security manager +// is the safest way forward. -+grant codeBase "file:/usr/share/java/tomcat-servlet-3.0-api.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/log4j.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/ecj.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/apache-commons-pool.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/apache-commons-dbcp.jar" { -+ permission java.security.AllPermission; -+}; -+grant codeBase "file:/usr/share/java/apache-commons-collections.jar" { ++grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; + - ++ // ========== CATALINA CODE PERMISSIONS ======================================= + diff --git a/tomcat.spec b/tomcat.spec index d627c33..b738456 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -81,6 +81,7 @@ Source32: tomcat-named.service 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 BuildArch: noarch @@ -208,6 +209,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -617,6 +619,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 +- Add updated catalina.policy patch to allow ECJ usage under the Security Manager + * Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 - Update to 9.0.34 From 2e1623eaa329aa35da8223838f7edcddfa3f642f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 22 Apr 2020 15:26:52 -0400 Subject: [PATCH 191/354] Update dependency version for ECJ to >= 4.15 --- tomcat.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index b738456..714ff8e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,7 +86,7 @@ Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch BuildArch: noarch BuildRequires: ant -BuildRequires: ecj >= 1:4.10 +BuildRequires: ecj >= 1:4.15 BuildRequires: findutils BuildRequires: apache-commons-daemon BuildRequires: tomcat-taglibs-standard @@ -621,6 +621,7 @@ fi %changelog * Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 - Add updated catalina.policy patch to allow ECJ usage under the Security Manager +- Update dependency version for ECJ to >= 4.15 * Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 - Update to 9.0.34 From 2f8bca3680e1d35e7425b7c76185cc9e31867c96 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Wed, 22 Apr 2020 15:46:02 -0400 Subject: [PATCH 192/354] Tweak the default changes for CVE-2020-1938 so the patch applies cleanly --- change-defaults-for-CVE-2020-1938.patch | 69 ++++++++++++------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/change-defaults-for-CVE-2020-1938.patch b/change-defaults-for-CVE-2020-1938.patch index cb7cedd..3d40389 100644 --- a/change-defaults-for-CVE-2020-1938.patch +++ b/change-defaults-for-CVE-2020-1938.patch @@ -1,6 +1,6 @@ diff -up ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java ---- ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig 2020-03-12 14:21:39.270821184 -0400 -+++ ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java 2020-03-12 14:22:17.771716954 -0400 +--- ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig 2020-03-16 04:41:13.000000000 -0400 ++++ ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java 2020-04-22 15:42:50.544106513 -0400 @@ -134,7 +134,7 @@ public abstract class AbstractAjpProtoco } @@ -11,8 +11,8 @@ diff -up ./java/org/apache/coyote/ajp/AbstractAjpProtocol.java.orig ./java/org/a this.secretRequired = secretRequired; } diff -up ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig ./java/org/apache/coyote/ajp/AjpAprProtocol.java ---- ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig 2020-03-12 14:18:38.918311184 -0400 -+++ ./java/org/apache/coyote/ajp/AjpAprProtocol.java 2020-03-12 14:18:51.031278148 -0400 +--- ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig 2020-03-16 04:41:13.000000000 -0400 ++++ ./java/org/apache/coyote/ajp/AjpAprProtocol.java 2020-04-22 15:42:50.544106513 -0400 @@ -20,7 +20,6 @@ import org.apache.coyote.AbstractProtoco import org.apache.coyote.Processor; import org.apache.juli.logging.Log; @@ -30,8 +30,8 @@ diff -up ./java/org/apache/coyote/ajp/AjpAprProtocol.java.orig ./java/org/apache ((AprEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); diff -up ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig ./java/org/apache/coyote/ajp/AjpNioProtocol.java ---- ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig 2020-03-12 14:18:58.405258036 -0400 -+++ ./java/org/apache/coyote/ajp/AjpNioProtocol.java 2020-03-12 14:19:02.577246659 -0400 +--- ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig 2020-03-16 04:41:13.000000000 -0400 ++++ ./java/org/apache/coyote/ajp/AjpNioProtocol.java 2020-04-22 15:42:50.545106511 -0400 @@ -23,7 +23,6 @@ import org.apache.coyote.AbstractProtoco import org.apache.coyote.Processor; import org.apache.juli.logging.Log; @@ -49,8 +49,8 @@ diff -up ./java/org/apache/coyote/ajp/AjpNioProtocol.java.orig ./java/org/apache ((NioEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); diff -up ./java/org/apache/coyote/ajp/AjpProtocol.java.orig ./java/org/apache/coyote/ajp/AjpProtocol.java ---- ./java/org/apache/coyote/ajp/AjpProtocol.java.orig 2020-03-12 14:19:11.121223357 -0400 -+++ ./java/org/apache/coyote/ajp/AjpProtocol.java 2020-03-12 14:19:16.402208954 -0400 +--- ./java/org/apache/coyote/ajp/AjpProtocol.java.orig 2020-03-16 04:41:13.000000000 -0400 ++++ ./java/org/apache/coyote/ajp/AjpProtocol.java 2020-04-22 15:42:50.545106511 -0400 @@ -22,7 +22,6 @@ import org.apache.coyote.AbstractProtoco import org.apache.coyote.Processor; import org.apache.juli.logging.Log; @@ -68,8 +68,8 @@ diff -up ./java/org/apache/coyote/ajp/AjpProtocol.java.orig ./java/org/apache/co ((JIoEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); diff -up ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig ./java/org/apache/tomcat/util/compat/Jre7Compat.java ---- ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig 2020-03-12 14:19:23.641189211 -0400 -+++ ./java/org/apache/tomcat/util/compat/Jre7Compat.java 2020-03-12 14:19:52.162111426 -0400 +--- ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig 2020-03-16 04:41:15.000000000 -0400 ++++ ./java/org/apache/tomcat/util/compat/Jre7Compat.java 2020-04-22 15:42:50.546106509 -0400 @@ -20,7 +20,6 @@ import java.io.OutputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -132,8 +132,8 @@ diff -up ./java/org/apache/tomcat/util/compat/Jre7Compat.java.orig ./java/org/ap // Java 9 methods diff -up ./java/org/apache/tomcat/util/compat/JreCompat.java.orig ./java/org/apache/tomcat/util/compat/JreCompat.java ---- ./java/org/apache/tomcat/util/compat/JreCompat.java.orig 2020-03-12 14:20:03.476080570 -0400 -+++ ./java/org/apache/tomcat/util/compat/JreCompat.java 2020-03-12 14:20:23.158027178 -0400 +--- ./java/org/apache/tomcat/util/compat/JreCompat.java.orig 2020-03-16 04:41:15.000000000 -0400 ++++ ./java/org/apache/tomcat/util/compat/JreCompat.java 2020-04-22 15:42:50.547106507 -0400 @@ -21,10 +21,8 @@ import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.AccessibleObject; @@ -179,9 +179,9 @@ diff -up ./java/org/apache/tomcat/util/compat/JreCompat.java.orig ./java/org/apa public static boolean isJre8Available() { diff -up ./webapps/docs/changelog.xml.orig ./webapps/docs/changelog.xml ---- ./webapps/docs/changelog.xml.orig 2020-03-12 14:20:30.645006916 -0400 -+++ ./webapps/docs/changelog.xml 2020-03-12 14:23:07.339582809 -0400 -@@ -143,14 +143,10 @@ +--- ./webapps/docs/changelog.xml.orig 2020-03-16 04:41:18.000000000 -0400 ++++ ./webapps/docs/changelog.xml 2020-04-22 15:42:50.554106492 -0400 +@@ -260,14 +260,10 @@ Disable (comment out in server.xml) the AJP/1.3 connector by default. (markt) @@ -198,26 +198,25 @@ diff -up ./webapps/docs/changelog.xml.orig ./webapps/docs/changelog.xml will not start unless the secret attribute is configured to a non-null, non-zero length String. (markt) diff -up ./webapps/docs/config/ajp.xml.orig ./webapps/docs/config/ajp.xml ---- ./webapps/docs/config/ajp.xml.orig 2020-03-12 14:20:50.750952504 -0400 -+++ ./webapps/docs/config/ajp.xml 2020-03-12 14:23:31.800516611 -0400 -@@ -306,7 +306,10 @@ +--- ./webapps/docs/config/ajp.xml.orig 2020-04-22 15:42:50.557106486 -0400 ++++ ./webapps/docs/config/ajp.xml 2020-04-22 15:44:54.425843527 -0400 +@@ -306,7 +306,9 @@ -

For servers with more than one IP address, this attribute - specifies which address will be used for listening on the specified -- port. By default, the loopback address will be used.

-+ port. By default, this port will be used on all IP addresses -+ associated with the server. A value of 127.0.0.1 -+ indicates that the Connector will only listen on the loopback -+ interface.

- - - -@@ -461,7 +464,7 @@ - -

If this attribute is true, the AJP Connector will only - start if the secret attribute is configured with a -- non-null, non-zero length value. The default value is true. -+ non-null, non-zero length value. The default value is false. -

+

For servers with more than one IP address, this attribute specifies + which address will be used for listening on the specified port. By +- default, the connector will listen on the loopback address. Unless the JVM ++ default, this port will be used on all IP addresses associated with the ++ server. A value of 127.0.0.1 indicates that the Connector ++ will only listen on the loopback interface. Unless the JVM + is configured otherwise using system properties, the Java based connectors + (BIO, NIO) will listen on both IPv4 and IPv6 addresses when configured + with either 0.0.0.0 or ::. The APR/native +@@ -483,7 +485,7 @@ + the secret attribute is required to be specified for the + AJP Connector to start. It does not control whether + workers are required to provide the secret. The default value is +- true. This attribute should only be set to false ++ false. This attribute should only be set to false + when the Connector is used on a trusted network.

 From 2b394dec218ed9c94f19e3c8a1d955f9fc6fb509 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 4 May 2020 12:22:01 -0400 Subject: [PATCH 193/354] Revert "Update dependency version for ECJ to >= 4.15" due to causing issues (it's missing in fc32) with testing the java 11 builds This reverts commit 2e1623eaa329aa35da8223838f7edcddfa3f642f. --- tomcat.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 714ff8e..b738456 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,7 +86,7 @@ Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch BuildArch: noarch BuildRequires: ant -BuildRequires: ecj >= 1:4.15 +BuildRequires: ecj >= 1:4.10 BuildRequires: findutils BuildRequires: apache-commons-daemon BuildRequires: tomcat-taglibs-standard @@ -621,7 +621,6 @@ fi %changelog * Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 - Add updated catalina.policy patch to allow ECJ usage under the Security Manager -- Update dependency version for ECJ to >= 4.15 * Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 - Update to 9.0.34 From faf98ce047ca87e0b9124353d59438b46dbf7892 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 31 May 2020 21:10:41 +0800 Subject: [PATCH 194/354] Upgrade to 9.0.35 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1bf01fc..9722027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.34-src.tar.gz) = 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df +SHA512 (apache-tomcat-9.0.35-src.tar.gz) = 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a diff --git a/tomcat.spec b/tomcat.spec index b738456..df89e52 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 34 +%global micro_version 35 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -619,6 +619,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sun May 31 2020 Hui Wang - 1:9.0.34-1 +- Upgrade to 9.0.35 + * Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 - Add updated catalina.policy patch to allow ECJ usage under the Security Manager From 84e90958f5fadc2a579a5ecfad3291bb75fec43b Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 1 Jun 2020 09:09:44 -0400 Subject: [PATCH 195/354] Fix changelog entry --- tomcat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index df89e52..1450718 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -619,7 +619,7 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog -* Sun May 31 2020 Hui Wang - 1:9.0.34-1 +* Sun May 31 2020 Hui Wang - 1:9.0.35-2 - Upgrade to 9.0.35 * Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 From 0e6b8f1b04975294f745637b6627599223548f43 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 4 Jun 2020 17:11:34 +0800 Subject: [PATCH 196/354] Update to 7.0.104 --- sources | 2 +- tomcat.spec | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sources b/sources index de4a5fc..4417343 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.103-src.tar.gz) = 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b +SHA512 (apache-tomcat-7.0.104-src.tar.gz) = 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257 diff --git a/tomcat.spec b/tomcat.spec index a5ec50c..a0292e2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -29,9 +29,9 @@ # %global jspspec 2.2 -%global major_version 7 -%global minor_version 0 -%global micro_version 103 +%global major_version +%global minor_version +%global micro_version %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -618,6 +618,12 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Thu Jun 04 2020 Hui Wang - 1:7.0.104-1 +- Update to 7.0.104 + +* Thu Jun 04 2020 Hui Wang - 1:..-1 +- Update to .. + * Wed Apr 22 2020 Coty Sutherland - 1:7.0.103-1 - Update to 7.0.103 From 3509fc4b4b4e6a9b07214b0b26a4d596b5a9e211 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 4 Jun 2020 17:36:59 +0800 Subject: [PATCH 197/354] Fix the changelog and version parts --- tomcat.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index a0292e2..814084f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -29,9 +29,9 @@ # %global jspspec 2.2 -%global major_version -%global minor_version -%global micro_version +%global major_version 7 +%global minor_version 0 +%global micro_version 104 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -621,9 +621,6 @@ fi * Thu Jun 04 2020 Hui Wang - 1:7.0.104-1 - Update to 7.0.104 -* Thu Jun 04 2020 Hui Wang - 1:..-1 -- Update to .. - * Wed Apr 22 2020 Coty Sutherland - 1:7.0.103-1 - Update to 7.0.103 From 208522a9f22b26d596c74b0bdf07ef61f49f5bc9 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 8 Jun 2020 14:08:44 +0800 Subject: [PATCH 198/354] Update tomcat-RemoveCompilerOptions.patch --- ...tomcat-7.0.104-RemoveCompilerOptions.patch | 78 ++++++++++++------- tomcat.spec | 2 +- 2 files changed, 52 insertions(+), 28 deletions(-) rename tomcat-7.0.94-RemoveCompilerOptions.patch => tomcat-7.0.104-RemoveCompilerOptions.patch (66%) diff --git a/tomcat-7.0.94-RemoveCompilerOptions.patch b/tomcat-7.0.104-RemoveCompilerOptions.patch similarity index 66% rename from tomcat-7.0.94-RemoveCompilerOptions.patch rename to tomcat-7.0.104-RemoveCompilerOptions.patch index ea4d12f..d90a5a6 100644 --- a/tomcat-7.0.94-RemoveCompilerOptions.patch +++ b/tomcat-7.0.104-RemoveCompilerOptions.patch @@ -1,14 +1,16 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2019-06-18 10:38:02.381894455 -0400 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2019-06-18 10:39:28.932684377 -0400 -@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apa +diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java +index 2836724..5d5c44b 100644 +--- a/java/org/apache/jasper/compiler/JDTCompiler.java ++++ b/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { /** * Compile the servlet from .java file to .class file */ - @Override - protected void generateClass(String[] smap) - throws FileNotFoundException, JasperException, Exception { + protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { -@@ -126,12 +125,10 @@ public class JDTCompiler extends org.apa + long t1 = 0; +@@ -122,12 +121,10 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { this.sourceFile = sourceFile; } @@ -21,7 +23,7 @@ public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -173,7 +170,6 @@ public class JDTCompiler extends org.apa +@@ -167,7 +164,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return result; } @@ -29,15 +31,15 @@ public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -182,7 +178,6 @@ public class JDTCompiler extends org.apa +@@ -176,7 +172,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return className.toCharArray(); } - @Override public char[][] getPackageName() { - StringTokenizer izer = - new StringTokenizer(className, "."); -@@ -194,7 +189,6 @@ public class JDTCompiler extends org.apa + StringTokenizer izer = new StringTokenizer(className, "."); + char[][] result = new char[izer.countTokens()-1][]; +@@ -187,7 +182,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return result; } @@ -45,7 +47,7 @@ public boolean ignoreOptionalProblems() { return false; } -@@ -202,7 +196,6 @@ public class JDTCompiler extends org.apa +@@ -195,7 +189,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { final INameEnvironment env = new INameEnvironment() { @@ -53,23 +55,23 @@ public NameEnvironmentAnswer findType(char[][] compoundTypeName) { StringBuilder result = new StringBuilder(); -@@ -215,7 +208,6 @@ public class JDTCompiler extends org.apa +@@ -208,7 +201,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return findType(result.toString()); } - @Override - public NameEnvironmentAnswer - findType(char[] typeName, - char[][] packageName) { -@@ -297,7 +289,6 @@ public class JDTCompiler extends org.apa + public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { + StringBuilder result = new StringBuilder(); + String sep = ""; +@@ -281,7 +273,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { } } - @Override - public boolean isPackage(char[][] parentPackageName, - char[] packageName) { + public boolean isPackage(char[][] parentPackageName, char[] packageName) { StringBuilder result = new StringBuilder(); -@@ -319,7 +310,6 @@ public class JDTCompiler extends org.apa + String sep = ""; +@@ -302,7 +293,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return isPackage(result.toString()); } @@ -77,7 +79,7 @@ public void cleanup() { } -@@ -368,33 +358,6 @@ public class JDTCompiler extends org.apa +@@ -350,43 +340,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); @@ -99,8 +101,8 @@ - // This is checked against the actual version below. - settings.put(CompilerOptions.OPTION_Source, "11"); - } else if(opt.equals("12")) { -- // Constant not available in latest available ECJ version. -- // May be supported in a snapshot build. +- // Constant not available in latest ECJ version that runs on +- // Java 6. - // This is checked against the actual version below. - settings.put(CompilerOptions.OPTION_Source, "12"); - } else if(opt.equals("13")) { @@ -108,10 +110,20 @@ - // May be supported in a snapshot build. - // This is checked against the actual version below. - settings.put(CompilerOptions.OPTION_Source, "13"); +- } else if(opt.equals("14")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "14"); +- } else if(opt.equals("15")) { +- // Constant not available in latest available ECJ version. +- // May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_Source, "15"); } else { log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt)); settings.put(CompilerOptions.OPTION_Source, -@@ -436,40 +399,6 @@ public class JDTCompiler extends org.apa +@@ -428,52 +381,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); @@ -138,8 +150,8 @@ - settings.put(CompilerOptions.OPTION_TargetPlatform, "11"); - settings.put(CompilerOptions.OPTION_Compliance, "11"); - } else if(opt.equals("12")) { -- // Constant not available in latest available ECJ version. -- // May be supported in a snapshot build. +- // Constant not available in latest ECJ version that runs on +- // Java 6. - // This is checked against the actual version below. - settings.put(CompilerOptions.OPTION_TargetPlatform, "12"); - settings.put(CompilerOptions.OPTION_Compliance, "12"); @@ -149,10 +161,22 @@ - // This is checked against the actual version below. - settings.put(CompilerOptions.OPTION_TargetPlatform, "13"); - settings.put(CompilerOptions.OPTION_Compliance, "13"); +- } else if(opt.equals("14")) { +- // Constant not available in latest ECJ version shipped with +- // Tomcat. May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "14"); +- settings.put(CompilerOptions.OPTION_Compliance, "14"); +- } else if(opt.equals("15")) { +- // Constant not available in latest ECJ version shipped with +- // Tomcat. May be supported in a snapshot build. +- // This is checked against the actual version below. +- settings.put(CompilerOptions.OPTION_TargetPlatform, "15"); +- settings.put(CompilerOptions.OPTION_Compliance, "15"); } else { log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt)); settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -487,7 +416,6 @@ public class JDTCompiler extends org.apa +@@ -491,7 +398,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { new DefaultProblemFactory(Locale.getDefault()); final ICompilerRequestor requestor = new ICompilerRequestor() { diff --git a/tomcat.spec b/tomcat.spec index 814084f..3ce8a84 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -81,7 +81,7 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch # Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6 -Patch2: %{name}-7.0.94-RemoveCompilerOptions.patch +Patch2: %{name}-7.0.104-RemoveCompilerOptions.patch # Adding patch to remove unsupport ant tasks/attributes Patch3: %{name}-7.0.99-build.patch Patch4: %{name}-7.0-catalina-policy.patch From 4ac0942113d6dcda669d2689e100a2b7f3c291dc Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 8 Jun 2020 14:48:38 +0800 Subject: [PATCH 199/354] Re-create tomcat-7.0.104-RemoveCompilerOptions.patch --- tomcat-7.0.104-RemoveCompilerOptions.patch | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tomcat-7.0.104-RemoveCompilerOptions.patch b/tomcat-7.0.104-RemoveCompilerOptions.patch index d90a5a6..1a6190c 100644 --- a/tomcat-7.0.104-RemoveCompilerOptions.patch +++ b/tomcat-7.0.104-RemoveCompilerOptions.patch @@ -1,8 +1,6 @@ -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 2836724..5d5c44b 100644 ---- a/java/org/apache/jasper/compiler/JDTCompiler.java -+++ b/java/org/apache/jasper/compiler/JDTCompiler.java -@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2020-06-08 14:28:56.745393437 +0800 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2020-06-08 14:33:16.421538658 +0800 +@@ -95,7 +95,6 @@ /** * Compile the servlet from .java file to .class file */ @@ -10,7 +8,7 @@ index 2836724..5d5c44b 100644 protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { long t1 = 0; -@@ -122,12 +121,10 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -122,12 +121,10 @@ this.sourceFile = sourceFile; } @@ -23,7 +21,7 @@ index 2836724..5d5c44b 100644 public char[] getContents() { char[] result = null; FileInputStream is = null; -@@ -167,7 +164,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -167,7 +164,6 @@ return result; } @@ -31,7 +29,7 @@ index 2836724..5d5c44b 100644 public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { -@@ -176,7 +172,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -176,7 +172,6 @@ return className.toCharArray(); } @@ -39,7 +37,7 @@ index 2836724..5d5c44b 100644 public char[][] getPackageName() { StringTokenizer izer = new StringTokenizer(className, "."); char[][] result = new char[izer.countTokens()-1][]; -@@ -187,7 +182,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -187,7 +182,6 @@ return result; } @@ -47,7 +45,7 @@ index 2836724..5d5c44b 100644 public boolean ignoreOptionalProblems() { return false; } -@@ -195,7 +189,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -195,7 +189,6 @@ final INameEnvironment env = new INameEnvironment() { @@ -55,7 +53,7 @@ index 2836724..5d5c44b 100644 public NameEnvironmentAnswer findType(char[][] compoundTypeName) { StringBuilder result = new StringBuilder(); -@@ -208,7 +201,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -208,7 +201,6 @@ return findType(result.toString()); } @@ -63,7 +61,7 @@ index 2836724..5d5c44b 100644 public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { StringBuilder result = new StringBuilder(); String sep = ""; -@@ -281,7 +273,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -281,7 +273,6 @@ } } @@ -71,7 +69,7 @@ index 2836724..5d5c44b 100644 public boolean isPackage(char[][] parentPackageName, char[] packageName) { StringBuilder result = new StringBuilder(); String sep = ""; -@@ -302,7 +293,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -302,7 +293,6 @@ return isPackage(result.toString()); } @@ -79,7 +77,7 @@ index 2836724..5d5c44b 100644 public void cleanup() { } -@@ -350,43 +340,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -350,43 +340,6 @@ } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); @@ -123,7 +121,7 @@ index 2836724..5d5c44b 100644 } else { log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt)); settings.put(CompilerOptions.OPTION_Source, -@@ -428,52 +381,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -428,52 +381,6 @@ CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); @@ -176,7 +174,7 @@ index 2836724..5d5c44b 100644 } else { log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt)); settings.put(CompilerOptions.OPTION_TargetPlatform, -@@ -491,7 +398,6 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -491,7 +398,6 @@ new DefaultProblemFactory(Locale.getDefault()); final ICompilerRequestor requestor = new ICompilerRequestor() { From 141fed8ee12a04025933f7b38d2746f336654dac Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 10 Jun 2020 13:48:53 +0800 Subject: [PATCH 200/354] Upgrade to 9.0.36 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 9722027..63e6a2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.35-src.tar.gz) = 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a +SHA512 (apache-tomcat-9.0.36-src.tar.gz) = f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b diff --git a/tomcat.spec b/tomcat.spec index 1450718..341d3df 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 35 +%global micro_version 36 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -619,6 +619,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 +- Upgrade to 9.0.36 + * Sun May 31 2020 Hui Wang - 1:9.0.35-2 - Upgrade to 9.0.35 From 76fc84d68e44fd17c0e46b3520abe3b2b505a5e5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 07:36:02 +0200 Subject: [PATCH 201/354] Rebuilt for JDK-11 --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 341d3df..cd38d0b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -619,6 +619,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 - Upgrade to 9.0.36 From 52bdf0a6d0a2a46cbf3a6140ee4ee84ae3091bd2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 13 Jul 2020 14:02:57 -0400 Subject: [PATCH 202/354] Update to 9.0.37 --- sources | 2 +- tomcat-build.patch | 27 +++++++++++++++++++++------ tomcat.spec | 8 ++++++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 63e6a2c..1cf78f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.36-src.tar.gz) = f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b +SHA512 (apache-tomcat-9.0.37-src.tar.gz) = 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98 diff --git a/tomcat-build.patch b/tomcat-build.patch index acaac9c..97440f1 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,27 @@ ---- build.xml.orig 2018-08-07 10:32:04.994403913 -0400 -+++ build.xml 2018-08-07 10:32:30.874319588 -0400 -@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom - +diff -up ./build.xml.orig ./build.xml +--- ./build.xml.orig 2020-07-13 12:59:09.555368724 -0400 ++++ ./build.xml 2020-07-13 13:06:51.246135917 -0400 +@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom + + - ++ + + + ++ - + +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/tomcat.spec b/tomcat.spec index cd38d0b..a705c9a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 36 +%global micro_version 37 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -239,6 +239,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ + -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy dist-source @@ -619,6 +620,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 +- Update to 9.0.37 + * Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 9563f11b9e2c97b5b64739128da4a0f8ef49ce43 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 15 Jul 2020 18:27:04 +0800 Subject: [PATCH 203/354] Update to 7.0.105 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4417343..f6d956a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.104-src.tar.gz) = 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257 +SHA512 (apache-tomcat-7.0.105-src.tar.gz) = 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2 diff --git a/tomcat.spec b/tomcat.spec index 3ce8a84..e8211ba 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 104 +%global micro_version 105 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -618,6 +618,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Jul 15 2020 Hui Wang - 1:7.0.105-1 +- Update to 7.0.105 + * Thu Jun 04 2020 Hui Wang - 1:7.0.104-1 - Update to 7.0.104 From a8c5ea85614dca66b492fe030a7e7cfc10cd52de Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 20 Jul 2020 15:17:57 -0400 Subject: [PATCH 204/354] Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar --- rhbz-1857043.patch | 21 +++++++++++++++++++++ tomcat.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 rhbz-1857043.patch diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch new file mode 100644 index 0000000..e78852e --- /dev/null +++ b/rhbz-1857043.patch @@ -0,0 +1,21 @@ +diff -up ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig ./res/bnd/tomcat-coyote.jar.tmp.bnd +--- ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig 2020-07-20 15:14:12.469921562 -0400 ++++ ./res/bnd/tomcat-coyote.jar.tmp.bnd 2020-07-20 15:14:28.452941874 -0400 +@@ -35,11 +35,11 @@ Export-Package: \ + org.apache.tomcat.util.modeler,\ + org.apache.tomcat.util.net,\ + org.apache.tomcat.util.net.openssl,\ +- org.apache.tomcat.util.net.openssl.ciphers ++ org.apache.tomcat.util.net.openssl.ciphers,\ ++ org.apache.tomcat.util.modeler.modules,\ ++ org.apache.tomcat.util.net.jsse + + -includepackage: \ + org.apache.tomcat.util.bcel,\ + org.apache.tomcat.util.http.fileupload.impl,\ +- org.apache.tomcat.util.http.fileupload.util.mime,\ +- org.apache.tomcat.util.modeler.modules,\ +- org.apache.tomcat.util.net.jsse +\ No newline at end of file ++ org.apache.tomcat.util.http.fileupload.util.mime +\ No newline at end of file diff --git a/tomcat.spec b/tomcat.spec index a705c9a..e506e0d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -82,6 +82,7 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p 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 BuildArch: noarch @@ -210,6 +211,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -620,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 +- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar + * Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 - Update to 9.0.37 From b8a539711f80833de329ef7921004d36e66d4e6f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 24 Jul 2020 10:50:23 -0400 Subject: [PATCH 205/354] Related: rhbz#1857043 I'm temporarily removing the OSGi metadata from the tomcat ant build because the older verison of aqute-bnd is causing classes to be removed when generating the metadata. If the aqute-bnd library is updated it should fix the issue, if not and someone needs to metadata to be added back I can generate it with the upstream tomcat build and add those manifests to the srpm sources --- rhbz-1857043.patch | 219 ++++++++++++++++++++++++++++++++++++++++----- tomcat.spec | 5 +- 2 files changed, 203 insertions(+), 21 deletions(-) diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index e78852e..3730769 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,21 +1,200 @@ -diff -up ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig ./res/bnd/tomcat-coyote.jar.tmp.bnd ---- ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig 2020-07-20 15:14:12.469921562 -0400 -+++ ./res/bnd/tomcat-coyote.jar.tmp.bnd 2020-07-20 15:14:28.452941874 -0400 -@@ -35,11 +35,11 @@ Export-Package: \ - org.apache.tomcat.util.modeler,\ - org.apache.tomcat.util.net,\ - org.apache.tomcat.util.net.openssl,\ -- org.apache.tomcat.util.net.openssl.ciphers -+ org.apache.tomcat.util.net.openssl.ciphers,\ -+ org.apache.tomcat.util.modeler.modules,\ -+ org.apache.tomcat.util.net.jsse +diff -up ./build.xml.orig ./build.xml +--- ./build.xml.orig 2020-07-24 10:24:08.313796968 -0400 ++++ ./build.xml 2020-07-24 10:24:38.027427445 -0400 +@@ -757,7 +757,7 @@ + filesDir="${tomcat.classes}" + filesId="files.annotations-api" + manifest="${tomcat.manifests}/annotations-api.jar.manifest" +- addOSGi="true" /> ++ addOSGi="false" /> - -includepackage: \ - org.apache.tomcat.util.bcel,\ - org.apache.tomcat.util.http.fileupload.impl,\ -- org.apache.tomcat.util.http.fileupload.util.mime,\ -- org.apache.tomcat.util.modeler.modules,\ -- org.apache.tomcat.util.net.jsse -\ No newline at end of file -+ org.apache.tomcat.util.http.fileupload.util.mime -\ No newline at end of file + + ++ 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" /> + + + - 1:9.0.37-3 +- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars + * Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 - Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar From d023b96d1f829a35b2d5cb586b7667f597058af4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:39:58 +0000 Subject: [PATCH 206/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 190684e..3722559 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -622,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3 - Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars From bddbd4330e8acae06a7762db84a3f98a7cd59dd0 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 16 Sep 2020 17:41:36 +0800 Subject: [PATCH 207/354] Update to 9.0.38 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1cf78f2..564403f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.37-src.tar.gz) = 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98 +SHA512 (apache-tomcat-9.0.38-src.tar.gz) = 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b diff --git a/tomcat.spec b/tomcat.spec index 3722559..1e8d9fa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 37 +%global micro_version 38 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -622,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 +- Update to 9.0.38 + * Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 20e12fb70e1399420282b3cecf3a18d8435a8bcd Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 12 Oct 2020 13:50:13 +0800 Subject: [PATCH 208/354] Update to 9.0.39 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 564403f..0f52225 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.38-src.tar.gz) = 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b +SHA512 (apache-tomcat-9.0.39-src.tar.gz) = d13a74789db0fdd9d814296cb66ae1321407b1452e0aa7b4f554c86b9c4f0abbeb9c9c6ab4723740174fe95ade4673c67fb7cb6f220d0d3c71ac27146faf5374 diff --git a/tomcat.spec b/tomcat.spec index 1e8d9fa..50609ae 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 38 +%global micro_version 39 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -622,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 +- Update to 9.0.39 + * Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 - Update to 9.0.38 From f60e452abe83bd7a39a5d2d676b4d9b4b325a83d Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 14 Oct 2020 10:49:43 +0800 Subject: [PATCH 209/354] Configure osgi-annotations.jar for the source commit 33e874fa31e6c411421ad1304dfa65f30bd58958 (Fix Javadoc build error and ensure 'ant clean javadoc' works) --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index 50609ae..4ca4af4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -240,6 +240,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ From a1745856032b6d2d046cca12159c9e2bcdec299e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 28 Oct 2020 18:40:15 +0800 Subject: [PATCH 210/354] Update to 7.0.106 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f6d956a..083dee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-7.0.105-src.tar.gz) = 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2 +SHA512 (apache-tomcat-7.0.106-src.tar.gz) = 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573 diff --git a/tomcat.spec b/tomcat.spec index e8211ba..a8dd919 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 105 +%global micro_version 106 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -618,6 +618,9 @@ fi %{_sbindir}/%{name}-jsvc %changelog +* Wed Oct 28 2020 Hui Wang - 1:7.0.106-1 +- Update to 7.0.106 + * Wed Jul 15 2020 Hui Wang - 1:7.0.105-1 - Update to 7.0.105 From 083152752796b7b2782032576ae15633d243906e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 18 Nov 2020 15:01:59 +0800 Subject: [PATCH 211/354] Update to 9.0.40 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0f52225..7b614e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.39-src.tar.gz) = d13a74789db0fdd9d814296cb66ae1321407b1452e0aa7b4f554c86b9c4f0abbeb9c9c6ab4723740174fe95ade4673c67fb7cb6f220d0d3c71ac27146faf5374 +SHA512 (apache-tomcat-9.0.40-src.tar.gz) = 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb diff --git a/tomcat.spec b/tomcat.spec index 4ca4af4..bfb3aae 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 39 +%global micro_version 40 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -623,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 +- Update to 9.0.40 + * Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 - Update to 9.0.39 From 23db76574c916e14094e3733eadd491d1a286416 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 9 Dec 2020 14:53:37 +0800 Subject: [PATCH 212/354] Update to 9.0.41 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7b614e9..14b6e11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.40-src.tar.gz) = 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb +SHA512 (apache-tomcat-9.0.41-src.tar.gz) = 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 diff --git a/tomcat.spec b/tomcat.spec index bfb3aae..edaaa7f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 40 +%global micro_version 41 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -623,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Dec 09 2020 Hui Wang - 1:0.0.41-1 +- Update to 9.0.41 + * Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 - Update to 9.0.40 From 63889634115c67483bdb9e1c8ceb8346373605e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:06:12 +0000 Subject: [PATCH 213/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index edaaa7f..6b82016 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -623,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 09 2020 Hui Wang - 1:0.0.41-1 - Update to 9.0.41 From 2f697945d5351aa9788e1187f642e14bd769982c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 3 Feb 2021 14:51:05 +0800 Subject: [PATCH 214/354] Update to 9.0.43 --- sources | 2 +- tomcat.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 14b6e11..150d10f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.41-src.tar.gz) = 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 +SHA512 (apache-tomcat-9.0.43-src.tar.gz) = 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 diff --git a/tomcat.spec b/tomcat.spec index 6b82016..f2f91ee 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 41 +%global micro_version 43 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -623,10 +623,13 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Jan 03 2021 Hui Wang - 1:9.0.43-1 +- Update to 9.0.43 + * Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Wed Dec 09 2020 Hui Wang - 1:0.0.41-1 +* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 - Update to 9.0.41 * Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 From 7b96b1368624449aa2aa699123a91d2aabcb2bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:08 +0100 Subject: [PATCH 215/354] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- tomcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index f2f91ee..a6bb221 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -623,6 +623,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 03 2021 Hui Wang - 1:9.0.43-1 - Update to 9.0.43 From 5eebe0ea54deda31d18eaaeb5b4a66fcb6c0844c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 18 Mar 2021 15:39:57 +0800 Subject: [PATCH 216/354] Update to 9.0.44 --- sources | 2 +- tomcat.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 150d10f..de38a39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.43-src.tar.gz) = 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 +SHA512 (apache-tomcat-9.0.44-src.tar.gz) = 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f diff --git a/tomcat.spec b/tomcat.spec index a6bb221..f2e4291 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 43 +%global micro_version 44 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -623,11 +623,14 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 +- Update to 9.0.44 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. -* Wed Jan 03 2021 Hui Wang - 1:9.0.43-1 +* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 - Update to 9.0.43 * Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 From b2675ecc09359d9c53f603af9e6ab8b330fc3be9 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Apr 2021 18:27:04 +0800 Subject: [PATCH 217/354] Update to 9.0.45 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index de38a39..fd2a7c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.44-src.tar.gz) = 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f +SHA512 (apache-tomcat-9.0.45-src.tar.gz) = e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e diff --git a/tomcat.spec b/tomcat.spec index f2e4291..e8db2bd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 44 +%global micro_version 45 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -623,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 +- Update to 9.0.45 + * Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 - Update to 9.0.44 From 8db0343ee9b0b10b669c602bb23264bc2af42816 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 3 Jun 2021 14:56:15 -0400 Subject: [PATCH 218/354] Remove examples webapps from subpackage --- tomcat.spec | 56 +++++++++-------------------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index e8db2bd..7fce0f1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -90,13 +90,8 @@ BuildRequires: ant BuildRequires: ecj >= 1:4.10 BuildRequires: findutils BuildRequires: apache-commons-daemon -BuildRequires: tomcat-taglibs-standard BuildRequires: java-devel >= 1:1.8.0 -%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 -# add_maven_depmap is deprecated, using javapackages-local for now -# See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro BuildRequires: javapackages-local -%endif BuildRequires: geronimo-jaxrpc BuildRequires: geronimo-saaj BuildRequires: aqute-bnd @@ -194,12 +189,11 @@ Obsoletes: %{name}-el-2.2-api Apache Tomcat EL API Implementation Classes. %package webapps -Summary: The ROOT and examples web applications for Apache Tomcat +Summary: The ROOT web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: tomcat-taglibs-standard >= 0:1.1 %description webapps -The ROOT and examples web applications for Apache Tomcat. +The ROOT web application for Apache Tomcat. %prep %setup -q -n %{packdname} @@ -213,9 +207,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 -p0 %patch4 -p0 -%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar -%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar - %build export OPT_JAR_LIST="xalan-j2-serializer" # we don't care about the tarballs and we're going to replace @@ -249,13 +240,9 @@ export OPT_JAR_LIST="xalan-j2-serializer" # 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} -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 + # 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 @@ -342,10 +329,6 @@ popd pushd output/build %{_bindir}/build-jar-repository lib 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 \ - tomcat-taglibs-standard/taglibs-standard-impl.jar tomcat-taglibs-standard/taglibs-standard-compat.jar 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -369,28 +352,6 @@ pushd ${RPM_BUILD_ROOT}%{homedir} %{__ln_s} %{workdir} work popd -# install sample webapp -%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/sample -pushd ${RPM_BUILD_ROOT}%{appdir}/sample -%{jar} xf ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war -popd -%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war - -# Allow linking for example webapp -%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF -pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF -echo '' > context.xml -echo '' >> context.xml -echo ' ' >> context.xml -echo '' >> context.xml -popd - -pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib -%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) jstl.jar -%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) standard.jar -popd - - # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} pushd output/dist/src/res/maven @@ -613,8 +574,6 @@ fi %files webapps %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT -%{appdir}/examples -%{appdir}/sample %files jsvc %defattr(755,root,root,0755) @@ -623,6 +582,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Jun 03 2021 Coty Sutherland 1:9.0.45-2 +- Remove examples webapps from subpackage + * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From 972b590988e15d6d82db951aa8b14a2ef06e0cc9 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 3 Jun 2021 15:45:09 -0400 Subject: [PATCH 219/354] Remove maven artifacts from build as they aren't very useful --- tomcat.spec | 103 ++++------------------------------------------------ 1 file changed, 8 insertions(+), 95 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 7fce0f1..6458f23 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,9 +53,6 @@ %global workdir %{cachedir}/work %global _systemddir /lib/systemd/system -# Fedora doesn't seem to have this macro, so we define it if it doesn't exist -%{!?_mavendepmapfragdir: %global _mavendepmapfragdir /usr/share/maven-metadata} - Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} @@ -207,6 +204,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 -p0 %patch4 -p0 + %build export OPT_JAR_LIST="xalan-j2-serializer" # we don't care about the tarballs and we're going to replace @@ -236,7 +234,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy dist-source + deploy # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar @@ -337,9 +335,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - - # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap) - %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./ popd # symlink to the FHS locations where we've installed things @@ -352,75 +347,6 @@ pushd ${RPM_BUILD_ROOT}%{homedir} %{__ln_s} %{workdir} work popd -# Install the maven metadata -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_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; do - %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom - %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib" -done - -# tomcat-util-scan -%{__cp} -a %{name}-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-util-scan.pom -%add_maven_depmap JPP.%{name}-util-scan.pom %{name}/%{name}-util-scan.jar -f "tomcat-lib" - -# tomcat-jni -%{__cp} -a %{name}-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jni.pom -%add_maven_depmap JPP.%{name}-jni.pom %{name}/%{name}-jni.jar -f "tomcat-lib" - -# 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 ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom -%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp" - -%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el" - -%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_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 "tomcat-servlet-api" - -# replace temporary copy with link -%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/ - -# two special pom where jar files have different names -%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom -%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar - -%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom -%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar - -%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom -%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar - -%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom -%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar - -%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom -%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar - -%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom -%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar - -# tomcat-websocket-api -%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom -%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar - -# tomcat-tomcat-websocket -%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom -%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar - -# tomcat-jaspic-api -%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom -%add_maven_depmap JPP.%{name}-jaspic-api.pom %{name}/jaspic-api.jar - %pre # add the tomcat user and group @@ -534,39 +460,24 @@ fi %files docs-webapp %{appdir}/docs -%files jsp-%{jspspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-jsp-api +%files jsp-%{jspspec}-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar -%files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib +%files lib %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar %{bindir}/tomcat-juli.jar -%{_mavenpomdir}/JPP.%{name}-annotations-api.pom -%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom -%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom -%{_mavenpomdir}/JPP.%{name}-catalina.pom -%{_mavenpomdir}/JPP.%{name}-jasper-el.pom -%{_mavenpomdir}/JPP.%{name}-jasper.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom -%{_mavenpomdir}/JPP.%{name}-websocket-api.pom -%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom -%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom -%{_datadir}/maven-metadata/tomcat.xml %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 servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api +%files servlet-%{servletspec}-api %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar -%files el-%{elspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-el-api +%files el-%{elspec}-api %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar @@ -584,6 +495,8 @@ fi %changelog * Thu Jun 03 2021 Coty Sutherland 1:9.0.45-2 - Remove examples webapps from subpackage +- Updates to javapackages-local removed %%add_maven_depmap which broke the build, + so I removed the maven artifacts as they aren't very useful anyway * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From c363ab5b505a6b50450a59897c13ffed530f4cb2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 3 Jun 2021 16:01:50 -0400 Subject: [PATCH 220/354] Drop JSVC support as it's not very useful these days --- tomcat-9.0-jsvc.service | 22 ---------------------- tomcat-9.0.logrotate | 8 -------- tomcat.spec | 29 ++--------------------------- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 tomcat-9.0-jsvc.service delete mode 100644 tomcat-9.0.logrotate diff --git a/tomcat-9.0-jsvc.service b/tomcat-9.0-jsvc.service deleted file mode 100644 index f480324..0000000 --- a/tomcat-9.0-jsvc.service +++ /dev/null @@ -1,22 +0,0 @@ -# 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" -EnvironmentFile=-/etc/sysconfig/tomcat -ExecStart=/usr/libexec/tomcat/server start -ExecStop=/usr/libexec/tomcat/server stop - -[Install] -WantedBy=multi-user.target diff --git a/tomcat-9.0.logrotate b/tomcat-9.0.logrotate deleted file mode 100644 index a87b4c0..0000000 --- a/tomcat-9.0.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -@@@TCLOG@@@/catalina.out { - copytruncate - weekly - rotate 52 - compress - missingok - create 0644 tomcat tomcat -} diff --git a/tomcat.spec b/tomcat.spec index 6458f23..4153302 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -65,11 +65,9 @@ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{vers 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 @@ -86,7 +84,6 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ecj >= 1:4.10 BuildRequires: findutils -BuildRequires: apache-commons-daemon BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: geronimo-jaxrpc @@ -96,7 +93,6 @@ BuildRequires: aqute-bndlib BuildRequires: wsdl4j BuildRequires: systemd -Requires: apache-commons-daemon Requires: java-headless >= 1:1.8.0 Requires: javapackages-tools Requires: procps @@ -136,16 +132,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description docs-webapp The docs web application for Apache Tomcat. -%package jsvc -Summary: Apache jsvc wrapper for Apache Tomcat as separate service -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: apache-commons-daemon-jsvc - -%description jsvc -Systemd service 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 jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} @@ -215,7 +201,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ + -Dcommons-daemon.jar="HACK" \ -Dcommons-daemon.native.src.tgz="HACK" \ -Djdt.jar="$(build-classpath ecj/ecj)" \ -Dtomcat-native.tar.gz="HACK" \ @@ -247,7 +233,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" %{__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} @@ -257,7 +242,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" /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} -/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__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} @@ -286,10 +270,6 @@ popd ${RPM_BUILD_ROOT}%{_sbindir}/%{name} %{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__install} -m 0644 %{SOURCE20} \ - ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ - > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ @@ -486,17 +466,12 @@ fi %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT -%files jsvc -%defattr(755,root,root,0755) -%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out - %changelog * Thu Jun 03 2021 Coty Sutherland 1:9.0.45-2 - Remove examples webapps from subpackage - Updates to javapackages-local removed %%add_maven_depmap which broke the build, so I removed the maven artifacts as they aren't very useful anyway +- Drop JSVC support as it's not very useful these days * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From 395ca77492ffeca15ffa41190b57935d1c6a37fc Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 3 Jun 2021 16:21:37 -0400 Subject: [PATCH 221/354] Drop geronimo-saaj as it's no longer required --- tomcat.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 4153302..d56d7dc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -87,7 +87,6 @@ BuildRequires: findutils BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: geronimo-jaxrpc -BuildRequires: geronimo-saaj BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: wsdl4j @@ -210,7 +209,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ - -Dsaaj-api.jar="$(build-classpath geronimo-saaj)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ @@ -472,6 +470,7 @@ fi - Updates to javapackages-local removed %%add_maven_depmap which broke the build, so I removed the maven artifacts as they aren't very useful anyway - Drop JSVC support as it's not very useful these days +- Drop geronimo-saaj as it's no longer required * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From 66b528dc613d98d0184d26b993af387af2e0061e Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 4 Jun 2021 07:22:37 -0400 Subject: [PATCH 222/354] Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index d56d7dc..5308ba2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,7 +86,6 @@ BuildRequires: ecj >= 1:4.10 BuildRequires: findutils BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local -BuildRequires: geronimo-jaxrpc BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: wsdl4j @@ -189,6 +188,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 -p0 %patch4 -p0 +# Remove webservices naming resources as it's generally unused +%{__rm} -rf java/org/apache/naming/factory/webservices + %build export OPT_JAR_LIST="xalan-j2-serializer" @@ -207,7 +209,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ - -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ + -Djaxrpc-lib.jar="HACK" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ @@ -471,6 +473,7 @@ fi so I removed the maven artifacts as they aren't very useful anyway - Drop JSVC support as it's not very useful these days - Drop geronimo-saaj as it's no longer required +- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From da829a92c9a5ff9cc097d278b2b84e7106ce9175 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 4 Jun 2021 07:23:54 -0400 Subject: [PATCH 223/354] Increment release number --- tomcat.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 5308ba2..4fd3e6d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -467,13 +467,15 @@ fi %{appdir}/ROOT %changelog +* Fri Jun 04 2021 Coty Sutherland 1:9.0.45-3 +- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused + * Thu Jun 03 2021 Coty Sutherland 1:9.0.45-2 - Remove examples webapps from subpackage - Updates to javapackages-local removed %%add_maven_depmap which broke the build, so I removed the maven artifacts as they aren't very useful anyway - Drop JSVC support as it's not very useful these days - Drop geronimo-saaj as it's no longer required -- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From 7d7781ca2404b56d3b0a455e550b072cccbee980 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 4 Jun 2021 10:29:44 -0400 Subject: [PATCH 224/354] Add back logrotate config file per devel list request --- tomcat-9.0.logrotate | 11 +++++++++++ tomcat.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tomcat-9.0.logrotate diff --git a/tomcat-9.0.logrotate b/tomcat-9.0.logrotate new file mode 100644 index 0000000..082092a --- /dev/null +++ b/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/tomcat.spec b/tomcat.spec index 4fd3e6d..3c95116 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -65,6 +65,7 @@ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{vers 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 @@ -233,6 +234,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" %{__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} @@ -270,6 +272,8 @@ popd ${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} \ @@ -395,6 +399,7 @@ fi %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} @@ -467,6 +472,9 @@ fi %{appdir}/ROOT %changelog +* Fri Jun 04 2021 Coty Sutherland 1:9.0.45-4 +- Add back logrotate config file per devel list request + * Fri Jun 04 2021 Coty Sutherland 1:9.0.45-3 - Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused From de863ffa6657ae4fb789d2ece41abe9f2413ea12 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Sat, 5 Jun 2021 20:23:34 -0400 Subject: [PATCH 225/354] Add mvn virtual provides back for the servlet, el, and jsp spec impls --- tomcat.spec | 97 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 37 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 3c95116..ae4a3fe 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -192,42 +192,50 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # 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 +# 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="$(build-classpath wsdl4j)" \ - -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ - -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ - -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ - -Dversion="%{version}" \ - -Dversion.build="%{micro_version}" \ - deploy +# 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="$(build-classpath wsdl4j)" \ + -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ + -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ + -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ + -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ + -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ + -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 - # 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 @@ -331,6 +339,20 @@ pushd ${RPM_BUILD_ROOT}%{homedir} %{__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 @@ -445,9 +467,6 @@ fi %files docs-webapp %{appdir}/docs -%files jsp-%{jspspec}-api -%{_javadir}/%{name}-jsp-%{jspspec}*.jar - %files lib %dir %{libdir} %{libdir}/*.jar @@ -458,11 +477,14 @@ fi %exclude %{_javadir}/%{name}-el-%{elspec}-api.jar %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar -%files servlet-%{servletspec}-api +%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 +%files el-%{elspec}-api -f .mfiles-tomcat-el-api %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar @@ -472,8 +494,9 @@ fi %{appdir}/ROOT %changelog -* Fri Jun 04 2021 Coty Sutherland 1:9.0.45-4 +* Sat Jun 05 2021 Coty Sutherland 1:9.0.45-4 - Add back logrotate config file per devel list request +- Add mvn virtual provides back for the servlet, el, and jsp spec impls * Fri Jun 04 2021 Coty Sutherland 1:9.0.45-3 - Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused From fde9af69056bae4ace1b5fafe18bc1090917f684 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 7 Jul 2021 14:16:09 +0800 Subject: [PATCH 226/354] Update to 9.0.50 --- rhbz-1857043.patch | 24 ++++++++++++------------ tomcat-9.0-JDTCompiler.patch | 23 +++++++++++++++++++++++ tomcat-9.0-catalina-policy.patch | 20 +++++++++++++------- tomcat.spec | 9 +++++++-- 4 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 tomcat-9.0-JDTCompiler.patch diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 3730769..7d68c42 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,16 +1,16 @@ diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-07-24 10:24:08.313796968 -0400 -+++ ./build.xml 2020-07-24 10:24:38.027427445 -0400 -@@ -757,7 +757,7 @@ +--- build.xml.orig 2021-07-07 10:53:55.493742841 +0800 ++++ build.xml 2021-07-07 11:09:43.107968515 +0800 +@@ -1030,7 +1030,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" - addOSGi="true" /> + addOSGi="false" /> - + + addOSGi="false" /> - + 1:9.0.50-1 +- Update to 9.0.50 + * Sat Jun 05 2021 Coty Sutherland 1:9.0.45-4 - Add back logrotate config file per devel list request - Add mvn virtual provides back for the servlet, el, and jsp spec impls From fd93ca49bb21e8f857897a2e5a6c1220822525ad Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 7 Jul 2021 14:22:35 +0800 Subject: [PATCH 227/354] 9.0.50 source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index fd2a7c6..6e8caa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.45-src.tar.gz) = e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e +SHA512 (apache-tomcat-9.0.50-src.tar.gz) = 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 From 7a01193a3924eac36044e5a16dcc5e5daf31dc99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:26:22 +0000 Subject: [PATCH 228/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 53f945f..bced38a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jul 06 2021 Hui Wang 1:9.0.50-1 - Update to 9.0.50 From 2c4c2c1d936d4bf2ad1543bd0f7ff6c3507841f8 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 18 Aug 2021 15:52:49 +0800 Subject: [PATCH 229/354] Update to 9.0.52 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6e8caa6..c659d36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.50-src.tar.gz) = 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 +SHA512 (apache-tomcat-9.0.52-src.tar.gz) = 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d diff --git a/tomcat.spec b/tomcat.spec index bced38a..2e9ea9e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 50 +%global micro_version 52 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Wed Aug 18 2021 Hui Wang 1:9.0.52-1 +- Update to 9.0.52 + * Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5bcc834dc35a70706738b1dc1a4273593de27b45 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 16 Sep 2021 17:58:33 +0800 Subject: [PATCH 230/354] Update to 9.0.53 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c659d36..aaa42c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.52-src.tar.gz) = 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d +SHA512 (apache-tomcat-9.0.53-src.tar.gz) = f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 diff --git a/tomcat.spec b/tomcat.spec index 2e9ea9e..d22fd4a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 52 +%global micro_version 53 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Thu Sep 16 2021 Hui Wang 1:9.0.53-1 +- Update to 9.0.53 + * Wed Aug 18 2021 Hui Wang 1:9.0.52-1 - Update to 9.0.52 From bb861ab8fa9f6884a8cbb40b4dcb5415ac6c2fbf Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 12 Oct 2021 14:45:31 +0800 Subject: [PATCH 231/354] Update to 9.0.54 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index aaa42c4..99f5bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.53-src.tar.gz) = f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 +SHA512 (apache-tomcat-9.0.54-src.tar.gz) = e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b diff --git a/tomcat.spec b/tomcat.spec index d22fd4a..fe5e9a6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 53 +%global micro_version 54 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Tue Oct 12 2021 Hui Wang 1:9.0.54-1 +- Update to 9.0.54 + * Thu Sep 16 2021 Hui Wang 1:9.0.53-1 - Update to 9.0.53 From 1eeff668b547b170ccbd23b58b8fa43cb22fb10c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 23 Nov 2021 14:57:50 +0800 Subject: [PATCH 232/354] Update to 9.0.55 --- sources | 2 +- tomcat.spec | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 99f5bbd..f5c9c8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.54-src.tar.gz) = e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b +SHA512 (apache-tomcat-9.0.55-src.tar.gz) = abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c diff --git a/tomcat.spec b/tomcat.spec index fe5e9a6..7d59ec9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 54 +%global micro_version 55 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,29 +496,32 @@ fi %{appdir}/ROOT %changelog -* Tue Oct 12 2021 Hui Wang 1:9.0.54-1 +* Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 +- Update to 9.0.55 + +* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 - Update to 9.0.54 -* Thu Sep 16 2021 Hui Wang 1:9.0.53-1 +* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 - Update to 9.0.53 -* Wed Aug 18 2021 Hui Wang 1:9.0.52-1 +* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 - Update to 9.0.52 * Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Tue Jul 06 2021 Hui Wang 1:9.0.50-1 +* Tue Jul 06 2021 Hui Wang - 1:9.0.50-1 - Update to 9.0.50 -* Sat Jun 05 2021 Coty Sutherland 1:9.0.45-4 +* Sat Jun 05 2021 Coty Sutherland - 1:9.0.45-4 - Add back logrotate config file per devel list request - Add mvn virtual provides back for the servlet, el, and jsp spec impls -* Fri Jun 04 2021 Coty Sutherland 1:9.0.45-3 +* Fri Jun 04 2021 Coty Sutherland - 1:9.0.45-3 - Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused -* Thu Jun 03 2021 Coty Sutherland 1:9.0.45-2 +* Thu Jun 03 2021 Coty Sutherland - 1:9.0.45-2 - Remove examples webapps from subpackage - Updates to javapackages-local removed %%add_maven_depmap which broke the build, so I removed the maven artifacts as they aren't very useful anyway From da561178516b386e5387bf450e7ae44f3214f1c3 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 9 Dec 2021 18:15:03 +0800 Subject: [PATCH 233/354] Update to 9.0.56 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f5c9c8e..259252b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.55-src.tar.gz) = abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c +SHA512 (apache-tomcat-9.0.56-src.tar.gz) = 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5 diff --git a/tomcat.spec b/tomcat.spec index 7d59ec9..b605dde 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 55 +%global micro_version 56 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 +- Update to 9.0.56 + * Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 - Update to 9.0.55 From dc8a02a819a3322e44de613d3c7a7791e6289bc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:53:10 +0000 Subject: [PATCH 234/354] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index b605dde..295e0cc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 - Update to 9.0.56 From cdf645a2cff682220adcab3ccbe4152b021cf540 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:27:17 +0100 Subject: [PATCH 235/354] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 295e0cc..31a5258 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 37136861dfa67cc58a4d72d3928f2b0ee8ef99c8 Mon Sep 17 00:00:00 2001 From: Sonia Xu Date: Wed, 2 Mar 2022 23:41:57 +0000 Subject: [PATCH 236/354] Update to 9.0.59 Fixes CVE-2022-23181 --- sources | 2 +- tomcat-9.0-JDTCompiler.patch | 19 ++++++++++--------- tomcat.spec | 8 ++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/sources b/sources index 259252b..8ef1969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.56-src.tar.gz) = 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5 +SHA512 (apache-tomcat-9.0.59-src.tar.gz) = cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 diff --git a/tomcat-9.0-JDTCompiler.patch b/tomcat-9.0-JDTCompiler.patch index 20605ce..edf156a 100644 --- a/tomcat-9.0-JDTCompiler.patch +++ b/tomcat-9.0-JDTCompiler.patch @@ -1,16 +1,17 @@ -diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apache/jasper/compiler/JDTCompiler.java ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2021-07-07 11:31:21.583507995 +0800 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2021-07-07 11:35:13.009251246 +0800 -@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apa +diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java +index 2e361f2..277d8f4 100644 +--- java/org/apache/jasper/compiler/JDTCompiler.java ++++ java/org/apache/jasper/compiler/JDTCompiler.java +@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { } 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 shipped with - // Tomcat. May be supported in a snapshot build. -@@ -372,8 +372,8 @@ public class JDTCompiler extends org.apa + // Constant not available in latest ECJ version that runs on + // Java 8. +@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15); } else if(opt.equals("16")) { @@ -19,5 +20,5 @@ diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apac + settings.put(CompilerOptions.OPTION_TargetPlatform, "16"); + settings.put(CompilerOptions.OPTION_Compliance, "16"); } else if(opt.equals("17")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. + // Constant not available in latest ECJ version that runs on + // Java 8. diff --git a/tomcat.spec b/tomcat.spec index 31a5258..8f3948c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 56 +%global micro_version 59 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,10 @@ fi %{appdir}/ROOT %changelog +* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 +- Update to 9.0.59 +- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability + * Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 - Rebuilt for java-17-openjdk as system jdk From 9b5ef6dbd7adb3dca35411e43d1f8ba9517b8010 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 8 Mar 2022 15:22:53 -0500 Subject: [PATCH 237/354] Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection --- java-9-start-up-parameters.conf | 6 ++++++ tomcat.spec | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 java-9-start-up-parameters.conf diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf new file mode 100644 index 0000000..0fd43ba --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,6 @@ +# Add the JAVA 9 specific start-up parameters required by Tomcat +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" diff --git a/tomcat.spec b/tomcat.spec index 8f3948c..4d48f16 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -73,6 +73,7 @@ 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 @@ -302,6 +303,8 @@ popd %{__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,; @@ -441,6 +444,7 @@ fi %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 @@ -496,6 +500,9 @@ fi %{appdir}/ROOT %changelog +* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 +- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection + * Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 - Update to 9.0.59 - Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability From d3f20202a305e997a7cde37c20b45ee3b3d55ec3 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 10 Mar 2022 15:44:16 -0500 Subject: [PATCH 238/354] Related: rhbz#2061424 Adjust fix so that it uses the proper env var --- java-9-start-up-parameters.conf | 11 ++++++----- tomcat.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf index 0fd43ba..341e077 100644 --- a/java-9-start-up-parameters.conf +++ b/java-9-start-up-parameters.conf @@ -1,6 +1,7 @@ # Add the JAVA 9 specific start-up parameters required by Tomcat -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JDK_JAVA_OPTIONS diff --git a/tomcat.spec b/tomcat.spec index 4d48f16..fc199ff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -500,6 +500,9 @@ fi %{appdir}/ROOT %changelog +* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 +- Related: rhbz#2061424 Adjust fix so that it uses the proper env var + * Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 - Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection From 57ef513427d2d4d46134b153ac135140aa24a717 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 21 Jun 2022 21:03:19 +0800 Subject: [PATCH 239/354] Update for 9.0.64 --- rhbz-1857043.patch | 16 +++---- sources | 2 +- tomcat-9.0-catalina-policy.patch | 2 +- tomcat-9.0-osgi-annotations.patch | 66 ++++++++++++++++++++++++++++ tomcat-9.0-tomcat-users-webapp.patch | 2 +- tomcat-build.patch | 15 ------- tomcat.spec | 10 ++++- 7 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 tomcat-9.0-osgi-annotations.patch diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 7d68c42..dd74c3b 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,7 @@ 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 -@@ -1030,7 +1030,7 @@ +@@ -1020,7 +1020,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +10,7 @@ diff -up ./build.xml.orig ./build.xml + + ++ + + + +@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries + failonwarning="true"> + + +- ++ ++ + + + +@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + ++ ++ ++ ++ ++ + + + diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch index 860c4cf..85b8b9b 100644 --- a/tomcat-9.0-tomcat-users-webapp.patch +++ b/tomcat-9.0-tomcat-users-webapp.patch @@ -1,6 +1,6 @@ --- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 +++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 -@@ -23,4 +23,14 @@ +@@ -53,4 +53,14 @@ --> diff --git a/tomcat-build.patch b/tomcat-build.patch index 97440f1..49c63ff 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,18 +1,3 @@ -diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-07-13 12:59:09.555368724 -0400 -+++ ./build.xml 2020-07-13 13:06:51.246135917 -0400 -@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom - - - -+ -+ -+ -+ -+ - - - 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 diff --git a/tomcat.spec b/tomcat.spec index fc199ff..142b2bd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 59 +%global micro_version 64 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -81,6 +81,7 @@ 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 +Patch6: %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch BuildArch: noarch @@ -191,6 +192,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p0 # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices @@ -500,6 +502,10 @@ fi %{appdir}/ROOT %changelog +* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 +- Update to 9.0.64 +- Add osgi-annotations dependency back + * Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 - Related: rhbz#2061424 Adjust fix so that it uses the proper env var From 882334e985cd20fce979418228c3e14cd7ad8d05 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:55:08 +0200 Subject: [PATCH 240/354] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- tomcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 142b2bd..8f6270f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -84,6 +84,7 @@ Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch Patch6: %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: ecj >= 1:4.10 @@ -502,6 +503,9 @@ fi %{appdir}/ROOT %changelog +* Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 +- Rebuilt for Drop i686 JDKs + * Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 - Update to 9.0.64 - Add osgi-annotations dependency back From 84177caec5a7e90d4b9a45492c8420754287bd09 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 22 Jul 2022 17:33:41 +0800 Subject: [PATCH 241/354] Update to 9.0.65 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 82edd85..78df857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.64-src.tar.gz) = 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 +SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc diff --git a/tomcat.spec b/tomcat.spec index 8f6270f..22e25c2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 64 +%global micro_version 65 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -503,6 +503,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 +- Update to 9.0.65 + * Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 - Rebuilt for Drop i686 JDKs From 83e980a86f856fff632adb866fe0f29ddcfac322 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 1 Sep 2022 14:35:49 -0400 Subject: [PATCH 242/354] Cleaning up some unused deps and system properties --- tomcat.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 22e25c2..ad3145e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -92,8 +92,6 @@ BuildRequires: findutils BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd -BuildRequires: aqute-bndlib -BuildRequires: wsdl4j BuildRequires: systemd Requires: java-headless >= 1:1.8.0 @@ -224,14 +222,9 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dwsdl4j-lib.jar="HACK" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ - -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ - -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy @@ -503,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Thu Sep 01 2022 Coty Sutherland - 1:9.0.65-2 +- Cleaning up some unused deps and system properties + * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 - Update to 9.0.65 From 8e4906e924e855514fd1bf7db251bcba4868437e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 8 Nov 2022 16:50:53 +0800 Subject: [PATCH 243/354] Update tomcat to 9.0.68 --- sources | 2 +- tomcat-9.0-catalina-policy.patch | 9 ++++----- tomcat-9.0-osgi-annotations.patch | 4 ++-- tomcat.spec | 17 ++++++++++++----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sources b/sources index 78df857..5c55728 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc +SHA512 (apache-tomcat-9.0.68-src.tar.gz) = 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be diff --git a/tomcat-9.0-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch index 0211e70..dd6a47d 100644 --- a/tomcat-9.0-catalina-policy.patch +++ b/tomcat-9.0-catalina-policy.patch @@ -1,6 +1,6 @@ ---- conf/catalina.policy.orig 2021-07-07 10:25:53.461393329 +0800 -+++ conf/catalina.policy 2021-07-07 10:27:47.688682404 +0800 -@@ -56,6 +56,16 @@ grant codeBase "file:${java.home}/lib/ex +--- conf/catalina.policy.orig 2022-11-04 16:17:41.227506990 +0800 ++++ conf/catalina.policy 2022-11-04 16:21:51.393351415 +0800 +@@ -56,6 +56,15 @@ grant codeBase "file:${java.home}/lib/ex // permission java.security.AllPermission; //}; @@ -13,11 +13,10 @@ +grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; -+ // ========== CATALINA CODE PERMISSIONS ======================================= -@@ -261,4 +271,4 @@ grant codeBase "file:${catalina.home}/we +@@ -261,4 +270,4 @@ grant codeBase "file:${catalina.home}/we // // The permissions granted to a specific JAR // grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" { diff --git a/tomcat-9.0-osgi-annotations.patch b/tomcat-9.0-osgi-annotations.patch index c68708a..c70b463 100644 --- a/tomcat-9.0-osgi-annotations.patch +++ b/tomcat-9.0-osgi-annotations.patch @@ -1,6 +1,6 @@ --- build.properties.default.orig 2022-06-21 20:30:04.498997718 +0800 +++ build.properties.default 2022-06-21 20:30:57.579522800 +0800 -@@ -308,6 +308,16 @@ bnd.home=${base.path}/bnd-${bnd.version} +@@ -309,6 +309,16 @@ bnd.home=${base.path}/bnd-${bnd.version} bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar @@ -15,7 +15,7 @@ +osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar + # ----- JSign, version 4.1 or later ----- - jsign.version=4.1 + jsign.version=4.2 --- build.xml.orig 2022-06-21 20:36:12.785560093 +0800 +++ build.xml 2022-06-21 20:40:41.155154959 +0800 diff --git a/tomcat.spec b/tomcat.spec index ad3145e..7acea9b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 65 +%global micro_version 68 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -92,6 +92,8 @@ BuildRequires: findutils BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib +BuildRequires: wsdl4j BuildRequires: systemd Requires: java-headless >= 1:1.8.0 @@ -222,9 +224,14 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="HACK" \ + -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ + -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ + -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ + -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ + -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy @@ -496,8 +503,8 @@ fi %{appdir}/ROOT %changelog -* Thu Sep 01 2022 Coty Sutherland - 1:9.0.65-2 -- Cleaning up some unused deps and system properties +* Thu Nov 03 2033 Hui Wang - 1:9.0.68-1 +- Update to 9.0.68 * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 - Update to 9.0.65 From f1660807811a5b94ea5ac6ed4e201db6e64c3d3c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 13 Jan 2023 19:25:32 +0800 Subject: [PATCH 244/354] Update tomcat to 9.0.70 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5c55728..e456e94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.68-src.tar.gz) = 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be +SHA512 (apache-tomcat-9.0.70-src.tar.gz) = 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e diff --git a/tomcat.spec b/tomcat.spec index 7acea9b..d86c64b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 68 +%global micro_version 70 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -503,7 +503,10 @@ fi %{appdir}/ROOT %changelog -* Thu Nov 03 2033 Hui Wang - 1:9.0.68-1 +* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 +- Update to 9.0.70 + +* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 - Update to 9.0.68 * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 From 3d349e6aeafcabfd53be4239c7b951ada14b7f5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:15:06 +0000 Subject: [PATCH 245/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index d86c64b..932e42d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -503,6 +503,9 @@ fi %{appdir}/ROOT %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 - Update to 9.0.70 From 06d3a3141584885d8416da02c4124539cdc229c3 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 29 Jan 2023 19:23:32 +0800 Subject: [PATCH 246/354] Update to 9.0.71 Remove osgi-annotations patch Add bnd annotation dependency which is in bndlib package --- tomcat-9.0-bnd-annotation.patch | 10 +++++ tomcat-9.0-osgi-annotations.patch | 66 ------------------------------- tomcat.spec | 22 +++++------ 3 files changed, 20 insertions(+), 78 deletions(-) create mode 100644 tomcat-9.0-bnd-annotation.patch delete mode 100644 tomcat-9.0-osgi-annotations.patch diff --git a/tomcat-9.0-bnd-annotation.patch b/tomcat-9.0-bnd-annotation.patch new file mode 100644 index 0000000..9d57c81 --- /dev/null +++ b/tomcat-9.0-bnd-annotation.patch @@ -0,0 +1,10 @@ +--- build.xml.orig 2023-01-29 17:38:29.477052402 +0800 ++++ build.xml 2023-01-29 17:42:03.369583841 +0800 +@@ -216,6 +216,7 @@ + + + ++ + + + diff --git a/tomcat-9.0-osgi-annotations.patch b/tomcat-9.0-osgi-annotations.patch deleted file mode 100644 index c70b463..0000000 --- a/tomcat-9.0-osgi-annotations.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- build.properties.default.orig 2022-06-21 20:30:04.498997718 +0800 -+++ build.properties.default 2022-06-21 20:30:57.579522800 +0800 -@@ -309,6 +309,16 @@ bnd.home=${base.path}/bnd-${bnd.version} - bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar - bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar - -+# ----- OSGi annotations bundle, version 1.0.0 or later ----- -+# ----- required to avoid Javadoc error when using bnd annotations ----- -+osgi-annotations.version=1.1.1 -+osgi-annotations.checksum.enabled=true -+osgi-annotations.checksum.algorithm=MD5|SHA-1 -+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d -+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version} -+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+ - # ----- JSign, version 4.1 or later ----- - jsign.version=4.2 - ---- build.xml.orig 2022-06-21 20:36:12.785560093 +0800 -+++ build.xml 2022-06-21 20:40:41.155154959 +0800 -@@ -213,6 +213,7 @@ - - - -+ - - - -@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries - failonwarning="true"> - - -- -+ -+ - - - -@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - - -+ -+ -+ -+ -+ - - - diff --git a/tomcat.spec b/tomcat.spec index 932e42d..0e194dd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 70 +%global micro_version 71 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -81,7 +81,7 @@ 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 -Patch6: %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch +Patch6: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -93,12 +93,10 @@ BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib -BuildRequires: wsdl4j BuildRequires: systemd Requires: java-headless >= 1:1.8.0 Requires: javapackages-tools -Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 Recommends: tomcat-native >= %{native_version} @@ -224,14 +222,9 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dwsdl4j-lib.jar="HACK" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ - -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ - -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ + -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy @@ -503,6 +496,11 @@ fi %{appdir}/ROOT %changelog +* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 +- Update to 9.0.71 +- Remove osgi-annotations patch +- Add bnd-annotation dependency which is in bndlib package + * Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 013888a3ae3d51a70673472c883df7d66cbd4ce2 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 29 Jan 2023 19:31:45 +0800 Subject: [PATCH 247/354] Upload 9.0.72 source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e456e94..fa93e4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.70-src.tar.gz) = 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e +SHA512 (apache-tomcat-9.0.71-src.tar.gz) = 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930 From 2145287741463cc2fd7e1fefd84cdb004d38d05f Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 17 Mar 2023 17:05:19 +0800 Subject: [PATCH 248/354] Update to 9.0.73 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index fa93e4d..261d4f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.71-src.tar.gz) = 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930 +SHA512 (apache-tomcat-9.0.73-src.tar.gz) = 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237 diff --git a/tomcat.spec b/tomcat.spec index 0e194dd..f89963e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 71 +%global micro_version 73 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 +- Update to 9.0.73 + * Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 - Update to 9.0.71 - Remove osgi-annotations patch From f590c47ebf36dd7913b2862374284604d4380d1c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 9 Jun 2023 14:50:31 +0800 Subject: [PATCH 249/354] Update to 9.0.75 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 261d4f4..27278f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.73-src.tar.gz) = 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237 +SHA512 (apache-tomcat-9.0.75-src.tar.gz) = 19f78fbe3391bbad65494e0071a6df9a26ceb1a4bd387b3425c5f34a02391fcaaae40442cdca3a98c4b7b45963d3a9e51dd6a1b72f11c29904c755cff03def64 diff --git a/tomcat.spec b/tomcat.spec index f89963e..f457721 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 73 +%global micro_version 75 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -496,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 +- Updated to 9.0.75 + * Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 - Update to 9.0.73 From 92faf5efdbf5b83cf1eb350acce9c86c791e319b Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 14 Jun 2023 09:46:01 +0800 Subject: [PATCH 250/354] Update to 9.0.76 --- sources | 2 +- tomcat.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 27278f4..2bc150a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.75-src.tar.gz) = 19f78fbe3391bbad65494e0071a6df9a26ceb1a4bd387b3425c5f34a02391fcaaae40442cdca3a98c4b7b45963d3a9e51dd6a1b72f11c29904c755cff03def64 +SHA512 (apache-tomcat-9.0.76-src.tar.gz) = 64de4778a4e142baa6e49d5b2d2ca30aaf0133fa1cb450ceb528d6da0440933d01dc9571b6f7b35162de41bf740b71487948ba179ea3d2c75a842848e1bae7bf diff --git a/tomcat.spec b/tomcat.spec index f457721..8211813 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 75 +%global micro_version 76 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -328,6 +328,8 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar + + %{__ln_s} ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./ popd # symlink to the FHS locations where we've installed things @@ -496,8 +498,12 @@ fi %{appdir}/ROOT %changelog +* Wed Jun 14 2023 Hui Wang - 1:9.0.76-1 +- Update to 9.0.76 +- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java + * Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 -- Updated to 9.0.75 +- Update to 9.0.75 * Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 - Update to 9.0.73 From 33141d8c71b2eba2c6be8a32a70a50fc504ff435 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 14 Jun 2023 12:34:57 +0800 Subject: [PATCH 251/354] Update to 9.0.76 Update patch command because %patchN is deprecated Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages --- tomcat.spec | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 8211813..10f0b72 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -185,13 +185,13 @@ The ROOT web application for Apache Tomcat. 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 -p0 +%patch 0 -p0 +%patch 1 -p0 +%patch 2 -p0 +%patch 3 -p0 +%patch 4 -p0 +%patch 5 -p0 +%patch 6 -p0 # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices @@ -329,7 +329,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - %{__ln_s} ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./ + %{__cp} -a ../../%{name}/bin/tomcat-juli.jar . popd # symlink to the FHS locations where we've installed things @@ -477,21 +477,31 @@ fi %{_javadir}/*.jar %{bindir}/tomcat-juli.jar %exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{libdir}/%{name}-servlet-%{servletspec}*.jar +%exclude %{libdir}/%{name}-jsp-%{jspspec}*.jar %exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar %exclude %{_javadir}/%{name}-el-%{elspec}-api.jar %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%exclude %{_javadir}/%{name}-servlet-api.jar +%exclude %{_javadir}/%{name}-el-api.jar +%exclude %{_javadir}/%{name}-jsp-api.jar %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%{libdir}/%{name}-jsp-%{jspspec}*.jar +%{_javadir}/%{name}-jsp-api.jar %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar +%{libdir}/%{name}-servlet-%{servletspec}*.jar +%{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar +%{_javadir}/%{name}-el-api.jar %files webapps %defattr(0644,tomcat,tomcat,0755) @@ -501,6 +511,7 @@ fi * Wed Jun 14 2023 Hui Wang - 1:9.0.76-1 - Update to 9.0.76 - Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java +- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages * Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 - Update to 9.0.75 From e6859de378cb6ccaf7039209cbdc9eef810bf1f9 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 20 Jun 2023 15:02:14 +0800 Subject: [PATCH 252/354] Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide --- tomcat.spec | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 10f0b72..ebfe52b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -80,7 +80,6 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat 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 Patch6: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch BuildArch: noarch @@ -190,7 +189,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 -%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -345,7 +343,7 @@ 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 + for pom in *.pom; do # fix-up version in all pom files sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom done @@ -355,6 +353,37 @@ popd %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_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar +%mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar +%mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar +%mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar +%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar +%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar +%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar +%mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar +%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar +%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar +%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar +%mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar +%mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar +%mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar +%mvn_artifact res/maven/tomcat-i18n-de.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-de.jar +%mvn_artifact res/maven/tomcat-i18n-es.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-es.jar +%mvn_artifact res/maven/tomcat-i18n-fr.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-fr.jar +%mvn_artifact res/maven/tomcat-i18n-ja.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ja.jar +%mvn_artifact res/maven/tomcat-i18n-ko.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ko.jar +%mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar +%mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar +%mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar +%mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar +%mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar +%mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar +%mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar +%mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar +%mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar +%mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar +%mvn_artifact res/maven/tomcat.pom + %mvn_install %pre @@ -471,7 +500,7 @@ fi %files docs-webapp %{appdir}/docs -%files lib +%files lib -f .mfiles %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar @@ -508,7 +537,9 @@ fi %{appdir}/ROOT %changelog -* Wed Jun 14 2023 Hui Wang - 1:9.0.76-1 +* Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 +- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide +- Remove JDTCompiler patch because ecj has been update - Update to 9.0.76 - Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java - Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages From 3321e54ad4fb13646c4c961ac1580bb97dffaed7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:33:06 +0000 Subject: [PATCH 253/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index ebfe52b..4888982 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -537,6 +537,9 @@ fi %{appdir}/ROOT %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 - Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide - Remove JDTCompiler patch because ecj has been update From 629d280689cc736385b042a9d39de1d41db2e387 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 25 Jul 2023 18:33:59 +0800 Subject: [PATCH 254/354] Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage Update to 9.0.78 --- sources | 2 +- tomcat.spec | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/sources b/sources index 2bc150a..fcff246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.76-src.tar.gz) = 64de4778a4e142baa6e49d5b2d2ca30aaf0133fa1cb450ceb528d6da0440933d01dc9571b6f7b35162de41bf740b71487948ba179ea3d2c75a842848e1bae7bf +SHA512 (apache-tomcat-9.0.78-src.tar.gz) = 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4 diff --git a/tomcat.spec b/tomcat.spec index 4888982..2185fb7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 76 +%global micro_version 78 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -327,7 +327,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - %{__cp} -a ../../%{name}/bin/tomcat-juli.jar . + %{__ln_s} ../../%{name}/bin/tomcat-juli.jar . popd # symlink to the FHS locations where we've installed things @@ -353,17 +353,16 @@ popd %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_file org.apache.tomcat:tomcat-annotations-api annotations-api.jar %mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar %mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ant catalina-ant.jar %mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ha catalina-ha.jar %mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar -%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar -%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar -%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar +%mvn_file org.apache.tomcat:tomcat-catalina catalina.jar %mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar -%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar -%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar -%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar %mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar %mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar %mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar @@ -375,11 +374,24 @@ popd %mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar %mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar %mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar +%mvn_file org.apache.tomcat:tomcat-jasper-el jasper-el.jar +%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar +%mvn_file org.apache.tomcat:tomcat-jasper jasper.jar +%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar +%mvn_file org.apache.tomcat:tomcat-jaspic-api jaspic-api.jar +%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar %mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar %mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar %mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar +%mvn_file org.apache.tomcat:tomcat-ssi catalina-ssi.jar +%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar +%mvn_file org.apache.tomcat:tomcat-storeconfig catalina-storeconfig.jar +%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar +%mvn_file org.apache.tomcat:tomcat-tribes catalina-tribes.jar +%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar %mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar %mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar +%mvn_file org.apache.tomcat:tomcat-websocket-api websocket-api.jar %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar %mvn_artifact res/maven/tomcat.pom @@ -537,6 +549,10 @@ fi %{appdir}/ROOT %changelog +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage +- Update to 9.0.78 + * Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6a5576eae4a7cb6888d5ae514fbaacd4fa76e71d Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 25 Jul 2023 18:45:35 +0800 Subject: [PATCH 255/354] copy tomcat-juli.jar into the lib subpackage Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 2185fb7..c1244ae 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -327,7 +327,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - %{__ln_s} ../../%{name}/bin/tomcat-juli.jar . + cp ../../%{name}/bin/tomcat-juli.jar . popd # symlink to the FHS locations where we've installed things From 8b4c6be1c692dfba42febdca263feb0fc26ba4d5 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 25 Jul 2023 19:53:55 +0800 Subject: [PATCH 256/354] Related: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage --- tomcat.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index c1244ae..63070c6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -354,14 +354,14 @@ popd %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_file org.apache.tomcat:tomcat-annotations-api annotations-api.jar +%mvn_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api %mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar %mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar -%mvn_file org.apache.tomcat:tomcat-catalina-ant catalina-ant.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant %mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar -%mvn_file org.apache.tomcat:tomcat-catalina-ha catalina-ha.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha %mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar -%mvn_file org.apache.tomcat:tomcat-catalina catalina.jar +%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina %mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar %mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar %mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar @@ -374,29 +374,31 @@ popd %mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar %mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar %mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar -%mvn_file org.apache.tomcat:tomcat-jasper-el jasper-el.jar +%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el %mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar -%mvn_file org.apache.tomcat:tomcat-jasper jasper.jar +%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper %mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar -%mvn_file org.apache.tomcat:tomcat-jaspic-api jaspic-api.jar +%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api %mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar %mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar %mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar %mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar -%mvn_file org.apache.tomcat:tomcat-ssi catalina-ssi.jar +%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi %mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar -%mvn_file org.apache.tomcat:tomcat-storeconfig catalina-storeconfig.jar +%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig %mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar -%mvn_file org.apache.tomcat:tomcat-tribes catalina-tribes.jar +%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes %mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar %mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar %mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar -%mvn_file org.apache.tomcat:tomcat-websocket-api websocket-api.jar +%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar %mvn_artifact res/maven/tomcat.pom %mvn_install +#remove the jars which %mvn_file installs jars in the %{_javadir} +%{__rm} ${RPM_BUILD_ROOT}%{_javadir}/*.jar %pre # add the tomcat user and group @@ -549,6 +551,9 @@ fi %{appdir}/ROOT %changelog +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage + * Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 - Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage - Update to 9.0.78 From e5a0772f993b5fb85f42741e017eada92d40cf61 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 25 Jul 2023 20:04:31 +0800 Subject: [PATCH 257/354] Related: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage --- tomcat.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 63070c6..fb404e0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -397,8 +397,6 @@ popd %mvn_artifact res/maven/tomcat.pom %mvn_install -#remove the jars which %mvn_file installs jars in the %{_javadir} -%{__rm} ${RPM_BUILD_ROOT}%{_javadir}/*.jar %pre # add the tomcat user and group From 335305ef4fababd76569811ca18ebc065c4426bb Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 26 Jul 2023 18:04:07 +0800 Subject: [PATCH 258/354] Exclude jnidir in the lib subpackage --- tomcat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index fb404e0..2becd14 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -526,6 +526,7 @@ fi %exclude %{_javadir}/%{name}-servlet-api.jar %exclude %{_javadir}/%{name}-el-api.jar %exclude %{_javadir}/%{name}-jsp-api.jar +%exclude %{_jnidir}/* %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar @@ -549,8 +550,11 @@ fi %{appdir}/ROOT %changelog +* Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 +- Exclude jnidir in the lib subpackage + * Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 -- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage * Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 - Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage From d26c29c4e836e1083303a2dfe4858e7b1e9be824 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 4 Aug 2023 21:55:14 +0800 Subject: [PATCH 259/354] Fix files permission --- tomcat.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 2becd14..fe229b4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -510,9 +510,11 @@ fi %{appdir}/manager %files docs-webapp +%defattr(-,root,root,-) %{appdir}/docs %files lib -f .mfiles +%defattr(-,root,root,-) %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar @@ -529,17 +531,20 @@ fi %exclude %{_jnidir}/* %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api +%defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{libdir}/%{name}-jsp-%{jspspec}*.jar %{_javadir}/%{name}-jsp-api.jar %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api +%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{libdir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api +%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar @@ -550,6 +555,9 @@ fi %{appdir}/ROOT %changelog +* Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 +- Fix files permission + * Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 - Exclude jnidir in the lib subpackage From 95b25c29b3b64ad79f0949ff09093d2c03034341 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 8 Aug 2023 15:35:30 +0800 Subject: [PATCH 260/354] Revert the fix files permission --- tomcat.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index fe229b4..101c183 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -510,11 +510,9 @@ fi %{appdir}/manager %files docs-webapp -%defattr(-,root,root,-) %{appdir}/docs %files lib -f .mfiles -%defattr(-,root,root,-) %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar @@ -531,20 +529,17 @@ fi %exclude %{_jnidir}/* %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api -%defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{libdir}/%{name}-jsp-%{jspspec}*.jar %{_javadir}/%{name}-jsp-api.jar %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api -%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{libdir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api -%defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar From f1ec641a7b07729b29bf8babcd2deea15ad8a720 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 13 Sep 2023 15:32:34 +0800 Subject: [PATCH 261/354] Update to 9.0.80 --- sources | 2 +- tomcat.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index fcff246..2068d0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.78-src.tar.gz) = 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4 +SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114 diff --git a/tomcat.spec b/tomcat.spec index 101c183..c33f106 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 78 +%global micro_version 80 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -94,7 +94,7 @@ BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: java-headless >= 1:1.8.0 +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 +- Update to 9.0.80 +- Fix java version + * Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 - Fix files permission From 703557e0a6e86d22c00a160620749e61af18f818 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 16 Oct 2023 11:06:28 +0800 Subject: [PATCH 262/354] Update to 9.0.82 Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 --- sources | 2 +- tomcat-9.0.conf | 2 +- tomcat.spec | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2068d0a..05325b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114 +SHA512 (apache-tomcat-9.0.82-src.tar.gz) = 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf index e5fa60a..6e9eed1 100644 --- a/tomcat-9.0.conf +++ b/tomcat-9.0.conf @@ -35,7 +35,7 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp" #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" +JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory" # You can change your tomcat locale here #LANG="en_US" diff --git a/tomcat.spec b/tomcat.spec index c33f106..8c97935 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 80 +%global micro_version 82 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 +- Update to 9.0.82 +- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 + * Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 - Update to 9.0.80 - Fix java version From 939897238cdd90835ccc354c775b4c86463c98f2 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 16 Oct 2023 11:36:25 +0800 Subject: [PATCH 263/354] Update tomcat-build.patch --- tomcat-build.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tomcat-build.patch b/tomcat-build.patch index 49c63ff..cdf73ef 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,19 @@ 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 +--- res/bnd/build-defaults.bnd.orig 2023-10-16 11:23:04.752754202 +0800 ++++ res/bnd/build-defaults.bnd 2023-10-16 11:23:29.931876910 +0800 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -Bundle-Version: ${version_cleanup;${version}} +Bundle-Version: ${version} + Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt Specification-Title: Apache Tomcat - Specification-Version: ${version.major.minor} +@@ -36,4 +36,4 @@ X-Compile-Target-JDK: ${compile.release} + + -removeheaders: DSTAMP,TODAY,TSTAMP + +-module.name: org.apache.${replace;${Bundle-Name};-;.} +\ No newline at end of file ++module.name: org.apache.${replace;${Bundle-Name};-;.} From a1fd99bcdea731d166b0e6b587c503b6119a3b70 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 1 Dec 2023 17:41:19 +0800 Subject: [PATCH 264/354] Update to 9.0.83 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 05325b8..4196751 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.82-src.tar.gz) = 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e +SHA512 (apache-tomcat-9.0.83-src.tar.gz) = 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 diff --git a/tomcat.spec b/tomcat.spec index 8c97935..4d2cae1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 82 +%global micro_version 83 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 +- Update to 9.0.83 + * Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 - Update to 9.0.82 - Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 From a50fce8a6a5dff61c9bff89e785859f33d9ee893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:30:56 +0000 Subject: [PATCH 265/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 4d2cae1..74eb1ea 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 - Update to 9.0.83 From 1c0506a38e7f9988511a996d4923e7053cb21ee7 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:20:42 +0100 Subject: [PATCH 266/354] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 74eb1ea..cbed8f5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1ee70ac927e6926b3afdd3164175319e5b78a5c1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 29 Feb 2024 15:45:57 -0800 Subject: [PATCH 267/354] Accept java-21-headless as one of the alternatives for java --- tomcat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index cbed8f5..3e2e6e6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -94,7 +94,7 @@ BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 +- Accept java-21-headless as one of the alternatives for java + * Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 - Rebuilt for java-21-openjdk as system jdk From 9f4d5c76f549c6a11c349097c60bc44662663248 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 24 May 2024 14:10:14 +0300 Subject: [PATCH 268/354] Update to 10.1.24 --- java-9-start-up-parameters.conf | 7 - module-start-up-parameters.conf | 7 + rhbz-1857043.patch | 29 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 46 ++++++ ....patch => tomcat-10.1-bnd-annotation.patch | 0 ...=> tomcat-10.1-bootstrap-MANIFEST.MF.patch | 0 tomcat-10.1-catalina-policy.patch | 17 +++ ...digest.script => tomcat-10.1-digest.script | 0 ...h => tomcat-10.1-tomcat-users-webapp.patch | 0 ....script => tomcat-10.1-tool-wrapper.script | 0 tomcat-9.0.conf => tomcat-10.1.conf | 15 +- tomcat-9.0.logrotate => tomcat-10.1.logrotate | 0 tomcat-9.0.service => tomcat-10.1.service | 0 tomcat-9.0.sysconfig => tomcat-10.1.sysconfig | 0 tomcat-9.0.wrapper => tomcat-10.1.wrapper | 0 tomcat-9.0-JDTCompiler.patch | 24 --- tomcat-9.0-catalina-policy.patch | 25 ---- tomcat-9.0-log4j.properties | 11 -- tomcat.spec | 139 ++++++++---------- 20 files changed, 150 insertions(+), 172 deletions(-) delete mode 100644 java-9-start-up-parameters.conf create mode 100644 module-start-up-parameters.conf create mode 100644 tomcat-10.1-JDTCompiler.patch rename tomcat-9.0-bnd-annotation.patch => tomcat-10.1-bnd-annotation.patch (100%) rename tomcat-9.0-bootstrap-MANIFEST.MF.patch => tomcat-10.1-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-10.1-catalina-policy.patch rename tomcat-9.0-digest.script => tomcat-10.1-digest.script (100%) rename tomcat-9.0-tomcat-users-webapp.patch => tomcat-10.1-tomcat-users-webapp.patch (100%) rename tomcat-9.0-tool-wrapper.script => tomcat-10.1-tool-wrapper.script (100%) rename tomcat-9.0.conf => tomcat-10.1.conf (73%) rename tomcat-9.0.logrotate => tomcat-10.1.logrotate (100%) rename tomcat-9.0.service => tomcat-10.1.service (100%) rename tomcat-9.0.sysconfig => tomcat-10.1.sysconfig (100%) rename tomcat-9.0.wrapper => tomcat-10.1.wrapper (100%) delete mode 100644 tomcat-9.0-JDTCompiler.patch delete mode 100644 tomcat-9.0-catalina-policy.patch delete mode 100644 tomcat-9.0-log4j.properties diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf deleted file mode 100644 index 341e077..0000000 --- a/java-9-start-up-parameters.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Add the JAVA 9 specific start-up parameters required by Tomcat -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -export JDK_JAVA_OPTIONS diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf new file mode 100644 index 0000000..ba35e23 --- /dev/null +++ b/module-start-up-parameters.conf @@ -0,0 +1,7 @@ +# Add the module start-up parameters required by Tomcat +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JAVA_OPTS diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd74c3b..dd2a38c 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,6 @@ -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 @@ +--- build.xml.orig 2024-05-09 20:41:23.000000000 +0300 ++++ build.xml 2024-05-22 17:26:11.558331902 +0300 +@@ -1111,7 +1111,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +9,7 @@ diff -up ./build.xml.orig ./build.xml ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -58,7 +65,7 @@ diff -up ./build.xml.orig ./build.xml = 1:4.10 +BuildRequires: ant >= 1.10.2 +BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: java-devel >= 17 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd +BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) +Requires: (java-headless >= 11 or java >= 11) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -135,7 +137,7 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-2.2-api +Obsoletes: %{name}-jsp-2.3-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -147,7 +149,8 @@ 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: ecj >= 4.20 +Requires: tomcat-jakartaee-migration Requires(preun): coreutils %description lib @@ -156,9 +159,7 @@ 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 +Obsoletes: %{name}-servlet-4.0-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -166,7 +167,7 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-2.2-api +Obsoletes: %{name}-el-3.0-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -189,6 +190,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 +%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -196,14 +198,13 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Configure maven files %mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el" +%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api" %mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api - %build -export OPT_JAR_LIST="xalan-j2-serializer" +#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 @@ -225,12 +226,13 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ deploy # remove some jars that we'll replace with symlinks later -%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar +%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar output/build/lib/jakartaee-migration.jar # Remove the example webapps per Apache Tomcat Security Considerations -# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html +# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html %{__rm} -rf output/build/webapps/examples @@ -238,7 +240,6 @@ touch HACK # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} @@ -271,33 +272,33 @@ popd > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0644 %{SOURCE4} \ +%{__install} -m 0755 %{SOURCE3} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE7} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ > ${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} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE21} \ +%{__install} -m 0644 %{SOURCE8} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE30} \ +%{__install} -m 0755 %{SOURCE9} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE31} \ +%{__install} -m 0755 %{SOURCE10} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE32} \ +%{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ +%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ # Substitute libnames in catalina-tasks.xml sed -i \ @@ -318,6 +319,7 @@ popd pushd output/build %{_bindir}/build-jar-repository lib ecj 2>&1 + %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -326,6 +328,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar + %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar cp ../../%{name}/bin/tomcat-juli.jar . popd @@ -394,6 +397,7 @@ popd %mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar +%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar %mvn_artifact res/maven/tomcat.pom %mvn_install @@ -413,18 +417,6 @@ exit 0 # install but don't activate %systemd_post %{name}.service -%post jsp-%{jspspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 - -%post servlet-%{servletspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 - -%post el-%{elspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ - %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 - %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir}/* %{tempdir}/* @@ -433,24 +425,6 @@ exit 0 %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*} @@ -483,7 +457,7 @@ fi %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 +%{confdir}/conf.d/module-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -550,6 +524,9 @@ fi %{appdir}/ROOT %changelog +* Fri May 31 2024 Dimitris Soumis - 1:10.1.24-1 +- Update to 10.1.24 + * Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 - Accept java-21-headless as one of the alternatives for java From e151cd9da8aeccd9bf6c13296d2ea78a6cf8c8ab Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Jun 2024 19:04:58 +0300 Subject: [PATCH 269/354] Revert "Update to 10.1.24" This reverts commit 9f4d5c76f549c6a11c349097c60bc44662663248. --- java-9-start-up-parameters.conf | 7 + module-start-up-parameters.conf | 7 - rhbz-1857043.patch | 29 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 46 ------ tomcat-10.1-catalina-policy.patch | 17 --- tomcat-9.0-JDTCompiler.patch | 24 +++ ...n.patch => tomcat-9.0-bnd-annotation.patch | 0 ... => tomcat-9.0-bootstrap-MANIFEST.MF.patch | 0 tomcat-9.0-catalina-policy.patch | 25 ++++ ...-digest.script => tomcat-9.0-digest.script | 0 tomcat-9.0-log4j.properties | 11 ++ ...ch => tomcat-9.0-tomcat-users-webapp.patch | 0 ...r.script => tomcat-9.0-tool-wrapper.script | 0 tomcat-10.1.conf => tomcat-9.0.conf | 15 +- tomcat-10.1.logrotate => tomcat-9.0.logrotate | 0 tomcat-10.1.service => tomcat-9.0.service | 0 tomcat-10.1.sysconfig => tomcat-9.0.sysconfig | 0 tomcat-10.1.wrapper => tomcat-9.0.wrapper | 0 tomcat.spec | 139 ++++++++++-------- 20 files changed, 172 insertions(+), 150 deletions(-) create mode 100644 java-9-start-up-parameters.conf delete mode 100644 module-start-up-parameters.conf delete mode 100644 tomcat-10.1-JDTCompiler.patch delete mode 100644 tomcat-10.1-catalina-policy.patch create mode 100644 tomcat-9.0-JDTCompiler.patch rename tomcat-10.1-bnd-annotation.patch => tomcat-9.0-bnd-annotation.patch (100%) rename tomcat-10.1-bootstrap-MANIFEST.MF.patch => tomcat-9.0-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-9.0-catalina-policy.patch rename tomcat-10.1-digest.script => tomcat-9.0-digest.script (100%) create mode 100644 tomcat-9.0-log4j.properties rename tomcat-10.1-tomcat-users-webapp.patch => tomcat-9.0-tomcat-users-webapp.patch (100%) rename tomcat-10.1-tool-wrapper.script => tomcat-9.0-tool-wrapper.script (100%) rename tomcat-10.1.conf => tomcat-9.0.conf (73%) rename tomcat-10.1.logrotate => tomcat-9.0.logrotate (100%) rename tomcat-10.1.service => tomcat-9.0.service (100%) rename tomcat-10.1.sysconfig => tomcat-9.0.sysconfig (100%) rename tomcat-10.1.wrapper => tomcat-9.0.wrapper (100%) diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf new file mode 100644 index 0000000..341e077 --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,7 @@ +# Add the JAVA 9 specific start-up parameters required by Tomcat +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JDK_JAVA_OPTIONS diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf deleted file mode 100644 index ba35e23..0000000 --- a/module-start-up-parameters.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Add the module start-up parameters required by Tomcat -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -export JAVA_OPTS diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd2a38c..dd74c3b 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,6 +1,7 @@ ---- build.xml.orig 2024-05-09 20:41:23.000000000 +0300 -+++ build.xml 2024-05-22 17:26:11.558331902 +0300 -@@ -1111,7 +1111,7 @@ +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" @@ -9,7 +10,7 @@ -+ addOSGi="false" /> - - - + addOSGi="false" /> @@ -65,7 +58,7 @@ = 1.10.2 -BuildRequires: ecj >= 4.20 +BuildRequires: ant +BuildRequires: ecj >= 1:4.10 BuildRequires: findutils -BuildRequires: java-devel >= 17 +BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -137,7 +135,7 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-2.3-api +Obsoletes: %{name}-jsp-2.2-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -149,8 +147,7 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj >= 4.20 -Requires: tomcat-jakartaee-migration +Requires: ecj >= 1:4.10 Requires(preun): coreutils %description lib @@ -159,7 +156,9 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} -Obsoletes: %{name}-servlet-4.0-api +Provides: servlet6 +Provides: servlet3 +Obsoletes: %{name}-servlet-3.1-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -167,7 +166,7 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-3.0-api +Obsoletes: %{name}-el-2.2-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -190,7 +189,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 -%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -198,13 +196,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Configure maven files %mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api" +%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el" %mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api + %build -#export OPT_JAR_LIST="xalan-j2-serializer" +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 @@ -226,13 +225,12 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ deploy # remove some jars that we'll replace with symlinks later -%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar output/build/lib/jakartaee-migration.jar +%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar # Remove the example webapps per Apache Tomcat Security Considerations -# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html +# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html %{__rm} -rf output/build/webapps/examples @@ -240,6 +238,7 @@ touch HACK # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} @@ -272,33 +271,33 @@ popd > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0755 %{SOURCE3} \ +%{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE7} \ +%{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE8} \ +%{__install} -m 0644 %{SOURCE21} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE9} \ +%{__install} -m 0755 %{SOURCE30} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE10} \ +%{__install} -m 0755 %{SOURCE31} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE32} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ +%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ # Substitute libnames in catalina-tasks.xml sed -i \ @@ -319,7 +318,6 @@ popd pushd output/build %{_bindir}/build-jar-repository lib ecj 2>&1 - %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -328,7 +326,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar - %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar cp ../../%{name}/bin/tomcat-juli.jar . popd @@ -397,7 +394,6 @@ popd %mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar -%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar %mvn_artifact res/maven/tomcat.pom %mvn_install @@ -417,6 +413,18 @@ exit 0 # install but don't activate %systemd_post %{name}.service +%post jsp-%{jspspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 + +%post servlet-%{servletspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 + +%post el-%{elspec}-api +%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ + %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 + %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir}/* %{tempdir}/* @@ -425,6 +433,24 @@ exit 0 %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*} @@ -457,7 +483,7 @@ exit 0 %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0755,root,tomcat) %dir %{confdir}/conf.d %{confdir}/conf.d/README -%{confdir}/conf.d/module-start-up-parameters.conf +%{confdir}/conf.d/java-9-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -524,9 +550,6 @@ exit 0 %{appdir}/ROOT %changelog -* Fri May 31 2024 Dimitris Soumis - 1:10.1.24-1 -- Update to 10.1.24 - * Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 - Accept java-21-headless as one of the alternatives for java From 6222b99f521358c465446c3c9957d82c05eb1c47 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Jun 2024 19:07:06 +0300 Subject: [PATCH 270/354] Revert 10.1.24 update, rebase to 9.0.89 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4196751..a23d2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.83-src.tar.gz) = 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 +SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 diff --git a/tomcat.spec b/tomcat.spec index 3e2e6e6..cb29eb8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 83 +%global micro_version 89 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 +- Update to 9.0.89 + * Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 - Accept java-21-headless as one of the alternatives for java From b34c55f50e11a51a2aeb457295318240b94b3a57 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 20 Jun 2024 13:29:56 +0300 Subject: [PATCH 271/354] Update to 9.0.90 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a23d2c8..6bccc7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 +SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb diff --git a/tomcat.spec b/tomcat.spec index cb29eb8..e8a8ee9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 89 +%global micro_version 90 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 +- Update to 9.0.90 + * Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 - Update to 9.0.89 From 8ad9415f16a133ccf1342ee8479b286ec09fd58e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 9 Jul 2024 15:58:14 +0300 Subject: [PATCH 272/354] Add packit integration --- .packit.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..f335425 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,38 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +create_sync_note: false + +upstream_project_url: https://github.com/apache/tomcat.git + +issue_repository: https://github.com/dsoumis/fedora-tomcat-packit-notifications + +jobs: +# https://packit.dev/docs/configuration/downstream/pull_from_upstream +# Make sure there is Fedora mapping for the 'tomcat' project in https://release-monitoring.org/projects/search/?pattern=tomcat +# Make sure Monitoring status on the left side at https://src.fedoraproject.org/rpms/tomcat is set to Monitoring +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + +# https://packit.dev/docs/configuration/downstream/koji_build +- job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + +- job: koji_build + trigger: commit + scratch: true + allowed_pr_authors: ['all_admins', 'all_committers'] + allowed_committers: ['all_admins', 'all_committers'] + dist_git_branches: + - fedora-all + +# https://packit.dev/docs/configuration/downstream/bodhi_update +- job: bodhi_update + trigger: commit + allowed_builders: ['packit', 'all_admins'] + dist_git_branches: + - fedora-branched # rawhide updates are created automatically From 18974097f961245f2af3dff4ff795d93df103d05 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 9 Jul 2024 18:25:39 +0300 Subject: [PATCH 273/354] Replace issue repository with project's repo --- .packit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index f335425..0bb10aa 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,7 +5,7 @@ create_sync_note: false upstream_project_url: https://github.com/apache/tomcat.git -issue_repository: https://github.com/dsoumis/fedora-tomcat-packit-notifications +issue_repository: https://src.fedoraproject.org/rpms/tomcat jobs: # https://packit.dev/docs/configuration/downstream/pull_from_upstream From 91e20eb8e1acea0dd3c242f7641deaec671841ab Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 11 Jul 2024 12:55:24 +0300 Subject: [PATCH 274/354] Update to 9.0.91 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6bccc7c..02d68a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb +SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 diff --git a/tomcat.spec b/tomcat.spec index e8a8ee9..75e8ab3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 90 +%global micro_version 91 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: %autorelease Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 +- Update to 9.0.91 + * Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 - Update to 9.0.90 From 673c7dd900dc140aa8a61266a594bf0f749d8827 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:40:00 +0000 Subject: [PATCH 275/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ebf0621e4119d4be82cd752215cbe65bd5fb3690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 18:07:27 +0200 Subject: [PATCH 276/354] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- tomcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 75e8ab3..41380fc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,8 @@ Version: %{major_version}.%{minor_version}.%{micro_version} Release: %autorelease Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-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 @@ -550,6 +551,9 @@ fi %{appdir}/ROOT %changelog +* Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 +- convert license to SPDX + * Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 - Update to 9.0.91 From 7ace2fa74f3668dcc77c2f1581458b21abb184b0 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 6 Aug 2024 03:32:00 +0000 Subject: [PATCH 277/354] Update to 9.0.93 upstream release - Resolves: rhbz#2303026 Upstream tag: 9.0.93 Upstream commit: a33d708d Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 02d68a0..087b80d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 +SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac diff --git a/tomcat.spec b/tomcat.spec index 41380fc..3665b9f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 91 +%global micro_version 93 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Tue Aug 06 2024 Packit - 1:9.0.93-1 +- Update to version 9.0.93 +- Resolves: rhbz#2303026 + * Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 - convert license to SPDX From ad550ee3ce6030b8cbed9eeaec6c15b7fbb8da03 Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Tue, 6 Aug 2024 13:45:18 +0300 Subject: [PATCH 278/354] Fix rhbz-1857043.patch --- rhbz-1857043.patch | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd74c3b..d6185aa 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,6 @@ -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 @@ +--- build.xml.orig 2024-08-03 00:24:59.000000000 +0300 ++++ build.xml 2024-08-06 13:42:04.710875124 +0300 +@@ -1110,7 +1110,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +9,7 @@ diff -up ./build.xml.orig ./build.xml ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -130,7 +137,7 @@ diff -up ./build.xml.orig ./build.xml Date: Tue, 10 Sep 2024 21:14:04 +0000 Subject: [PATCH 279/354] Update to 9.0.94 upstream release - Resolves: rhbz#2311320 Upstream tag: 9.0.94 Upstream commit: ce248107 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 087b80d..9db4cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac +SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 diff --git a/tomcat.spec b/tomcat.spec index 3665b9f..fdf851b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 93 +%global micro_version 94 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 10 2024 Packit - 1:9.0.94-1 +- Update to version 9.0.94 +- Resolves: rhbz#2311320 + * Tue Aug 06 2024 Packit - 1:9.0.93-1 - Update to version 9.0.93 - Resolves: rhbz#2303026 From b5aebabac2ee0fd17388af278bbea88d663cbb74 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 17 Sep 2024 14:36:08 +0000 Subject: [PATCH 280/354] Update to 9.0.95 upstream release - Resolves: rhbz#2312858 Upstream tag: 9.0.95 Upstream commit: 9f8c522e Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9db4cad..2347049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 +SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db diff --git a/tomcat.spec b/tomcat.spec index fdf851b..6309c24 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 94 +%global micro_version 95 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 17 2024 Packit - 1:9.0.95-1 +- Update to version 9.0.95 +- Resolves: rhbz#2312858 + * Tue Sep 10 2024 Packit - 1:9.0.94-1 - Update to version 9.0.94 - Resolves: rhbz#2311320 From f262deda85fa0b1e377b26f3b9ca5ceaf55347a8 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 8 Oct 2024 15:01:50 +0000 Subject: [PATCH 281/354] Update to 9.0.96 upstream release - Resolves: rhbz#2317237 Upstream tag: 9.0.96 Upstream commit: 7ecea316 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2347049..3fe0723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db +SHA512 (apache-tomcat-9.0.96-src.tar.gz) = cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884 diff --git a/tomcat.spec b/tomcat.spec index 6309c24..33de45a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 95 +%global micro_version 96 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Tue Oct 08 2024 Packit - 1:9.0.96-1 +- Update to version 9.0.96 +- Resolves: rhbz#2317237 + * Tue Sep 17 2024 Packit - 1:9.0.95-1 - Update to version 9.0.95 - Resolves: rhbz#2312858 From 0c53740592737bfa78309b576305003bcccde4de Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Mon, 2 Dec 2024 16:08:53 +0200 Subject: [PATCH 282/354] Update to 9.0.97 upstream release --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3fe0723..5b5a264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.96-src.tar.gz) = cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884 +SHA512 (apache-tomcat-9.0.97-src.tar.gz) = e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a diff --git a/tomcat.spec b/tomcat.spec index 33de45a..fa53e89 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 96 +%global micro_version 97 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 +- Update to version 9.0.97 +- Resolves: rhbz#2327090 + * Tue Oct 08 2024 Packit - 1:9.0.96-1 - Update to version 9.0.96 - Resolves: rhbz#2317237 From 3cf9b421bd0aa8259beac70efa47a8b651d70e9d Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 9 Dec 2024 15:24:06 +0000 Subject: [PATCH 283/354] Update to 9.0.98 upstream release - Resolves: rhbz#2331168 Upstream tag: 9.0.98 Upstream commit: 727a8467 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5b5a264..18f1e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.97-src.tar.gz) = e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a +SHA512 (apache-tomcat-9.0.98-src.tar.gz) = eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc diff --git a/tomcat.spec b/tomcat.spec index fa53e89..0ae6d33 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 97 +%global micro_version 98 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -551,6 +551,10 @@ fi %{appdir}/ROOT %changelog +* Mon Dec 09 2024 Packit - 1:9.0.98-1 +- Update to version 9.0.98 +- Resolves: rhbz#2331168 + * Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 - Update to version 9.0.97 - Resolves: rhbz#2327090 From 0611308b2d4dfbc123d76668610f5994796bd804 Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Thu, 5 Dec 2024 16:18:03 +0200 Subject: [PATCH 284/354] This pull request enables tests in the Fedora CI using `tmt` which also allows to easily execute and debug tests from your laptop: Run tests directly on your localhost: sudo dnf install -y tmt tmt run --all provision --how local Run tests in a virtual machine: sudo dnf install -y tmt+provision-virtual tmt run Check the documentation to learn more about the tool: https://docs.fedoraproject.org/en-US/ci/tmt/ --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 13 +++++++++++++ plans/javapackages.fmf | 7 +++++++ plans/smoke.fmf | 5 +++++ 5 files changed, 27 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..b81b8c4 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,13 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..86bfcea --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f42 +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..039f41a --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +discover: + how: fmf + url: https://src.fedoraproject.org/tests/tomcat +execute: + how: tmt From 723739222226745128b36c0b6c6b58c2db97839d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 7 Jan 2025 15:47:48 +0200 Subject: [PATCH 285/354] Update to 10.1.34 --- .packit.yaml | 2 +- java-9-start-up-parameters.conf | 7 - module-start-up-parameters.conf | 8 + rhbz-1857043.patch | 28 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 30 ++++ ....patch => tomcat-10.1-bnd-annotation.patch | 0 ...=> tomcat-10.1-bootstrap-MANIFEST.MF.patch | 0 tomcat-10.1-catalina-policy.patch | 16 ++ ...digest.script => tomcat-10.1-digest.script | 0 ...h => tomcat-10.1-tomcat-users-webapp.patch | 0 ....script => tomcat-10.1-tool-wrapper.script | 0 tomcat-9.0.conf => tomcat-10.1.conf | 15 +- tomcat-9.0.logrotate => tomcat-10.1.logrotate | 0 tomcat-9.0.service => tomcat-10.1.service | 0 tomcat-9.0.sysconfig => tomcat-10.1.sysconfig | 0 tomcat-9.0.wrapper => tomcat-10.1.wrapper | 0 tomcat-9.0-JDTCompiler.patch | 24 --- tomcat-9.0-catalina-policy.patch | 25 --- tomcat-9.0-log4j.properties | 11 -- tomcat-functions | 21 --- tomcat.spec | 143 ++++++++---------- 22 files changed, 136 insertions(+), 196 deletions(-) delete mode 100644 java-9-start-up-parameters.conf create mode 100644 module-start-up-parameters.conf create mode 100644 tomcat-10.1-JDTCompiler.patch rename tomcat-9.0-bnd-annotation.patch => tomcat-10.1-bnd-annotation.patch (100%) rename tomcat-9.0-bootstrap-MANIFEST.MF.patch => tomcat-10.1-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-10.1-catalina-policy.patch rename tomcat-9.0-digest.script => tomcat-10.1-digest.script (100%) rename tomcat-9.0-tomcat-users-webapp.patch => tomcat-10.1-tomcat-users-webapp.patch (100%) rename tomcat-9.0-tool-wrapper.script => tomcat-10.1-tool-wrapper.script (100%) rename tomcat-9.0.conf => tomcat-10.1.conf (73%) rename tomcat-9.0.logrotate => tomcat-10.1.logrotate (100%) rename tomcat-9.0.service => tomcat-10.1.service (100%) rename tomcat-9.0.sysconfig => tomcat-10.1.sysconfig (100%) rename tomcat-9.0.wrapper => tomcat-10.1.wrapper (100%) delete mode 100644 tomcat-9.0-JDTCompiler.patch delete mode 100644 tomcat-9.0-catalina-policy.patch delete mode 100644 tomcat-9.0-log4j.properties diff --git a/.packit.yaml b/.packit.yaml index 0bb10aa..2986867 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,7 +14,7 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-all + - fedora-branched # https://packit.dev/docs/configuration/downstream/koji_build - job: koji_build diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf deleted file mode 100644 index 341e077..0000000 --- a/java-9-start-up-parameters.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Add the JAVA 9 specific start-up parameters required by Tomcat -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -export JDK_JAVA_OPTIONS diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf new file mode 100644 index 0000000..7f8652a --- /dev/null +++ b/module-start-up-parameters.conf @@ -0,0 +1,8 @@ +# Add the module start-up parameters required by Tomcat +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JAVA_OPTS + diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index d6185aa..4028ee1 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,6 +1,6 @@ ---- build.xml.orig 2024-08-03 00:24:59.000000000 +0300 -+++ build.xml 2024-08-06 13:42:04.710875124 +0300 -@@ -1110,7 +1110,7 @@ +--- build.xml.orig 2024-08-02 18:14:43.000000000 +0300 ++++ build.xml 2024-08-19 13:56:38.991730088 +0300 +@@ -1121,7 +1121,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -9,7 +9,7 @@ ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -57,7 +65,7 @@ = 1:4.10 +BuildRequires: ant >= 1.10.2 +BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: java-devel >= 17 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd +BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) +Requires: (java-headless >= 11 or java >= 11) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -136,7 +137,7 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-2.2-api +Obsoletes: %{name}-jsp-api < %{jspspec} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -148,7 +149,8 @@ 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: ecj >= 4.20 +Recommends: tomcat-jakartaee-migration Requires(preun): coreutils %description lib @@ -157,9 +159,7 @@ 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 +Obsoletes: %{name}-servlet-api < %{servletspec} %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -167,7 +167,7 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-2.2-api +Obsoletes: %{name}-el-api < %{elspec} %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -190,6 +190,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 +%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -197,16 +198,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Configure maven files %mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el" +%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api" %mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.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 +# we don't care about the tarballs and we're going to replace jars # so just create a dummy file for later removal touch HACK @@ -226,12 +225,13 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ + -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ deploy # remove some jars that we'll replace with symlinks later -%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar +%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar output/build/lib/jakartaee-migration.jar # Remove the example webapps per Apache Tomcat Security Considerations -# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html +# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html %{__rm} -rf output/build/webapps/examples @@ -239,7 +239,6 @@ touch HACK # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} @@ -272,33 +271,33 @@ popd > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0644 %{SOURCE4} \ +%{__install} -m 0755 %{SOURCE3} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE7} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ > ${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} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE21} \ +%{__install} -m 0644 %{SOURCE8} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE30} \ +%{__install} -m 0755 %{SOURCE9} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE31} \ +%{__install} -m 0755 %{SOURCE10} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE32} \ +%{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ +%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ # Substitute libnames in catalina-tasks.xml sed -i \ @@ -319,6 +318,7 @@ popd pushd output/build %{_bindir}/build-jar-repository lib ecj 2>&1 + %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 popd pushd ${RPM_BUILD_ROOT}%{libdir} @@ -327,6 +327,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar + %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar cp ../../%{name}/bin/tomcat-juli.jar . popd @@ -395,6 +396,7 @@ popd %mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar +%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar %mvn_artifact res/maven/tomcat.pom %mvn_install @@ -414,43 +416,13 @@ exit 0 # install but don't activate %systemd_post %{name}.service -%post jsp-%{jspspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 - -%post servlet-%{servletspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 - -%post el-%{elspec}-api -%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ - %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 - %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir}/* %{tempdir}/* %systemd_preun %{name}.service %postun -%systemd_postun_with_restart %{name}.service - -%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 +%systemd_postun_with_restart %{name}.service %files %defattr(0664,root,tomcat,0755) @@ -484,7 +456,7 @@ fi %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 +%{confdir}/conf.d/module-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -551,13 +523,16 @@ fi %{appdir}/ROOT %changelog +* Tue Jan 07 2025 Dimitris Soumis - 1:10.1.28-1 +- Update to version 10.1.28 + * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 - Resolves: rhbz#2331168 * Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 - Update to version 9.0.97 -- Resolves: rhbz#2327090 +- Resolves: rhbz#2327090 * Tue Oct 08 2024 Packit - 1:9.0.96-1 - Update to version 9.0.96 From 20bfa9f9729de17fd0333c26b8ae7c313a1c8042 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 10 Jan 2025 23:00:41 +0200 Subject: [PATCH 286/354] Fix changelog version of Tomcat 10 --- tomcat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 61f2ad7..dcd924e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -523,8 +523,8 @@ exit 0 %{appdir}/ROOT %changelog -* Tue Jan 07 2025 Dimitris Soumis - 1:10.1.28-1 -- Update to version 10.1.28 +* Tue Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 +- Update to version 10.1.34 * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 From 351e1a546c21145a3c3ded3f0dddf7b837c2d02a Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 10 Jan 2025 23:05:01 +0200 Subject: [PATCH 287/354] Fix bogus date in changelog --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index dcd924e..2d36335 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -523,7 +523,7 @@ exit 0 %{appdir}/ROOT %changelog -* Tue Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 +* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 - Update to version 10.1.34 * Mon Dec 09 2024 Packit - 1:9.0.98-1 From 9da444c4e4892f04916b69b743e724063e28c6d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:04:22 +0000 Subject: [PATCH 288/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d3fe6302c199d1591a8894e34bfdf181dcb66fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 21:12:17 +0100 Subject: [PATCH 289/354] Add sysusers.d config file to allow rpm to create users/groups automatically --- tomcat.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 2d36335..8689ef0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -102,7 +102,6 @@ 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 @@ -203,6 +202,11 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api +# Create a sysusers.d config file +cat >tomcat.sysusers.conf </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 +install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %post # install but don't activate @@ -476,6 +471,7 @@ exit 0 %{homedir}/work %{homedir}/logs %{homedir}/conf +%{_sysusersdir}/tomcat.conf %files admin-webapps %defattr(0664,root,tomcat,0755) From a7d2bc1fe90786612fc38330fc1903c42f7e7f8b Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 11 Feb 2025 14:03:35 +0200 Subject: [PATCH 290/354] General tweaks, fixes and enhancements - Refactor maven relevant parts - Fix file permissions - Fix JAR must have Javapackages-GroupId manifest attribute errors --- changelog | 643 +++++++++++++++++++++++++++++++ tomcat.spec | 1052 +++++++-------------------------------------------- 2 files changed, 789 insertions(+), 906 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7d2f562 --- /dev/null +++ b/changelog @@ -0,0 +1,643 @@ +* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 +- Update to version 10.1.34 + +* Mon Dec 09 2024 Packit - 1:9.0.98-1 +- Update to version 9.0.98 +- Resolves: rhbz#2331168 + +* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 +- Update to version 9.0.97 +- Resolves: rhbz#2327090 + +* Tue Oct 08 2024 Packit - 1:9.0.96-1 +- Update to version 9.0.96 +- Resolves: rhbz#2317237 + +* Tue Sep 17 2024 Packit - 1:9.0.95-1 +- Update to version 9.0.95 +- Resolves: rhbz#2312858 + +* Tue Sep 10 2024 Packit - 1:9.0.94-1 +- Update to version 9.0.94 +- Resolves: rhbz#2311320 + +* Tue Aug 06 2024 Packit - 1:9.0.93-1 +- Update to version 9.0.93 +- Resolves: rhbz#2303026 + +* Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 +- convert license to SPDX + +* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 +- Update to 9.0.91 + +* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 +- Update to 9.0.90 + +* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 +- Update to 9.0.89 + +* Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 +- Accept java-21-headless as one of the alternatives for java + +* Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 +- Update to 9.0.83 + +* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 +- Update to 9.0.82 +- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 + +* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 +- Update to 9.0.80 +- Fix java version + +* Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 +- Fix files permission + +* Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 +- Exclude jnidir in the lib subpackage + +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage + +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage +- Update to 9.0.78 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 +- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide +- Remove JDTCompiler patch because ecj has been update +- Update to 9.0.76 +- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java +- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages + +* Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 +- Update to 9.0.75 + +* Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 +- Update to 9.0.73 + +* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 +- Update to 9.0.71 +- Remove osgi-annotations patch +- Add bnd-annotation dependency which is in bndlib package + +* Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 +- Update to 9.0.70 + +* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 +- Update to 9.0.68 + +* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 +- Update to 9.0.65 + +* Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 +- Rebuilt for Drop i686 JDKs + +* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 +- Update to 9.0.64 +- Add osgi-annotations dependency back + +* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 +- Related: rhbz#2061424 Adjust fix so that it uses the proper env var + +* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 +- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection + +* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 +- Update to 9.0.59 +- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability + +* Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 +- Update to 9.0.56 + +* Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 +- Update to 9.0.55 + +* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 +- Update to 9.0.54 + +* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 +- Update to 9.0.53 + +* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 +- Update to 9.0.52 + +* Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 06 2021 Hui Wang - 1:9.0.50-1 +- Update to 9.0.50 + +* Sat Jun 05 2021 Coty Sutherland - 1:9.0.45-4 +- Add back logrotate config file per devel list request +- Add mvn virtual provides back for the servlet, el, and jsp spec impls + +* Fri Jun 04 2021 Coty Sutherland - 1:9.0.45-3 +- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused + +* Thu Jun 03 2021 Coty Sutherland - 1:9.0.45-2 +- Remove examples webapps from subpackage +- Updates to javapackages-local removed %%add_maven_depmap which broke the build, + so I removed the maven artifacts as they aren't very useful anyway +- Drop JSVC support as it's not very useful these days +- Drop geronimo-saaj as it's no longer required + +* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 +- Update to 9.0.45 + +* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 +- Update to 9.0.44 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 +- Update to 9.0.43 + +* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 +- Update to 9.0.41 + +* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 +- Update to 9.0.40 + +* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 +- Update to 9.0.39 + +* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 +- Update to 9.0.38 + +* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3 +- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars + +* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 +- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar + +* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 +- Update to 9.0.37 + +* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 +- Upgrade to 9.0.36 + +* Sun May 31 2020 Hui Wang - 1:9.0.35-2 +- Upgrade to 9.0.35 + +* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 +- Add updated catalina.policy patch to allow ECJ usage under the Security Manager + +* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 +- Update to 9.0.34 + +* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 +- Update to 9.0.31 +- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability + +* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 +- Update to 9.0.30 + +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 +- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts + +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 +- Update to 9.0.26 +- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names +- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user + +* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 +- Update build-classpath calls to ECJ to specify the JAR we want to use + +* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 +- Update to 9.0.21 + +* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 +- Remove javadoc subpackage to drop the jpackage-utils dependency + +* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 +- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) +- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit + +* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 +- Update to 9.0.13 +- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet + +* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 +- Drop legcy sys-v bits + +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 +- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS +- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins +- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client +- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up + +* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 +- Update to 9.0.7 + +* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 +- Update to 8.5.29 +- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources +- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users + +* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 +- Escape macros in %%changelog + +* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 +- Update to 8.0.49 + +* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3 +- Cleanup spec file conditionals + +* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 +- Change "zip -u" to "zip" +- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition + +* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 +- Update to 8.0.47 +- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 + +* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 +- Update to 8.0.46 +- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning + +* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 +- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism + +* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 +- Update to 8.0.43 + +* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 +- Update to 8.0.42 + +* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 +- Update to 8.0.41 +- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing + +* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 +- Update to 8.0.39 +- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws + +* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 +- Update to 8.0.38 + +* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 +- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation +- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service + +* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 +- Rebase to 8.0.37 +- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header +- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated + +* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 +- Related: rhbz#1349469 Correct typo in changelog entry + +* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 +- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) +- Resolves: rhbz#1364056 The command tomcat-digest doesn't work +- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken +- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully +- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) +- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out +- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded +- Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api +- Resolves: asfbz#59960 Building javadocs with java8 fails + +* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 +- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 +- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 + +* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 +- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 +- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 + +* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2 +- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 + +* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 +- Updated to 8.0.32 +- Remove log4j support. It has never been working actually. See rhbz#1236297 +- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 +- Recommend tomcat-native, resolves: rhbz#1243132 + +* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 +- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml +- Program /bin/nologin does not exist (#1302718) + +* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2 +- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) + +* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 +- Update to 8.0.26. + +* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 +- Update to 8.0.24. + +* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 +- Drop javax.el:el-api alias. + +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 +- Update to 8.0.23. + +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 +- Drop jetty alias for servlet. + +* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 +- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + +* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 +- Rebuild against tomcat-taglibs-standard. + +* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 +- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. +- Drop old provides. + +* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 +- Bump epoch to maintain upgrade path from Fedora 22 + +* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 +- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + +* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 +- Updated to 8.0.18 + +* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 +- Updated to 8.0.12 +- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 +- Use CATALINA_OPTS only on start, resolves: rhbz#1051194 + +* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 +- jsp-api requires el-api + +* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 +- Update to upstream 7.0.54 - fixes compile with Java 8. + +* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 +- Drop servlet/el api provides to reduce user machines ending with both. + +* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 +- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 +- Move log4j support into subpackage, resolves: rhbz#1027716 + +* Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1 +- Updated to 7.0.52 +- Rewrite jsvc implementation, resolves: rhbz#1051743 +- Switch to java-headless R, resolves: rhbz#1068566 +- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 +- Add pom for tomcat-jdbc, resolves: rhbz#1011003 + +* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 +- Fix installation of Maven metadata for tomcat-juli.jar +- Resolves: rhbz#1033664 + +* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2 +- Rebuild for bug #1033664 + +* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 +- Updated to 7.0.47 +- Fix java.security.policy + +* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2 +- Remove jpackage-utils R + +* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 +- Updated to 7.0.42 + +* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3 +- Dropped systemv inits. Bye-bye. +- Updated the systemd wrappers to allow running multiple instances. + Added wrapper scripts to do that, ported the original non-named + service file to work with the same wrappers, updated + /usr/sbin/tomcat to call systemctl. + +* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 +- Updated to 7.0.40 +- Resolves: rhbz 956569 added missing commons-pool link +- Remove ant-nodeps BR + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 +- Add depmaps for org.eclipse.jetty.orbit +- Resolves: rhbz#917626 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 +- Updated to 7.0.39 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 +- Updated to 7.0.37 + +* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 +- Updated to 7.0.35 +- systemd SuccessExitStatus=143 for proper stop exit code processing + +* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 +- Updated to 7.0.34 +- ecj >= 4.2.1 now required +- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME + +* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 +- Resolves: rhbz 883806 refix logdir ownership + +* Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 +- Updated to 7.0.33 +- Resolves: rhbz 873620 need chkconfig for update-alternatives + +* Wed Oct 17 2012 Ivan Afonichev 0:7.0.32-1 +- Updated to 7.0.32 +- Resolves: rhbz 842620 symlinks to taglibs + +* Fri Aug 24 2012 Ivan Afonichev 0:7.0.29-1 +- Updated to 7.0.29 +- Add pidfile as tmpfile +- Use systemd for running as unprivileged user +- Resolves: rhbz 847751 upgrade path was broken +- Resolves: rhbz 850343 use new systemd-rpm macros + +* Sat Jul 21 2012 Fedora Release Engineering - 0:7.0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 2 2012 Ivan Afonichev 0:7.0.28-1 +- Updated to 7.0.28 +- Resolves: rhbz 820119 Remove bundled apache-commons-dbcp +- Resolves: rhbz 814900 Added tomcat-coyote POM +- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet +- Remove redhat-lsb R + +* Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2 +- Fixed native download hack + +* Sat Apr 7 2012 Ivan Afonichev 0:7.0.27-1 +- Updated to 7.0.27 +- Fixed jakarta-taglibs-standard BR and R + +* Wed Mar 21 2012 Stanislav Ochotnicky - 0:7.0.26-2 +- Add more depmaps to J2EE apis to help jetty/glassfish updates + +* Wed Mar 14 2012 Juan Hernandez 0:7.0.26-2 +- Added the POM files for tomcat-api and tomcat-util (#803495) + +* Wed Feb 22 2012 Ivan Afonichev 0:7.0.26-1 +- Updated to 7.0.26 +- Bug 790334: Change ownership of logdir for logrotate + +* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4 +- Bug 790694: Priorities of jsp, servlet and el packages updated. + +* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 +- Dropped indirect dependecy to tomcat 5 + +* Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 +- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly + +* Sat Jan 21 2012 Ivan Afonichev 0:7.0.25-1 +- Updated to 7.0.25 +- Removed EntityResolver patch (changes already in upstream sources) +- Place poms and depmaps in the same package as jars +- Added javax.servlet.descriptor to export-package of servlet-api +- Move several chkconfig actions and reqs to systemv subpackage +- New maven depmaps generation method +- Add patch to support java7. (patch sent upstream). +- Require java >= 1:1.6.0 + +* Fri Jan 13 2012 Krzysztof Daniel 0:7.0.23-5 +- Exported javax.servlet.* packages in version 3.0 as 2.6 to make + servlet-api compatible with Eclipse. + +* Thu Jan 12 2012 Ivan Afonichev 0:7.0.23-4 +- Move jsvc support to subpackage + +* Wed Jan 11 2012 Alexander Kurtakov 0:7.0.23-2 +- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream). + +* Mon Dec 12 2011 Joseph D. Wagner 0:7.0.23-3 +- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for + starting 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. Must add USE_JSVC="true" to + /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat. + +* Mon Nov 28 2011 Ivan Afonichev 0:7.0.23-1 +- Updated to 7.0.23 + +* Fri Nov 11 2011 Ivan Afonichev 0:7.0.22-2 +- Move tomcat-juli.jar to lib package +- Drop %%update_maven_depmap as in tomcat6 +- Provide native systemd unit file ported from tomcat6 + +* Thu Oct 6 2011 Ivan Afonichev 0:7.0.22-1 +- Updated to 7.0.22 + +* Mon Oct 03 2011 Rex Dieter - 0:7.0.21-3.1 +- rebuild (java), rel-eng#4932 + +* Mon Sep 26 2011 Ivan Afonichev 0:7.0.21-3 +- Fix basedir mode + +* Tue Sep 20 2011 Roland Grunberg 0:7.0.21-2 +- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli. + +* Thu Sep 8 2011 Ivan Afonichev 0:7.0.21-1 +- Updated to 7.0.21 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-3 +- Require java = 1:1.6.0 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-2 +- Require java < 1.7.0 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-1 +- Updated to 7.0.20 + +* Tue Jul 26 2011 Ivan Afonichev 0:7.0.19-1 +- Updated to 7.0.19 + +* Tue Jun 21 2011 Ivan Afonichev 0:7.0.16-1 +- Updated to 7.0.16 + +* Mon Jun 6 2011 Ivan Afonichev 0:7.0.14-3 +- Added initial systemd service +- Fix some paths + +* Sat May 21 2011 Ivan Afonichev 0:7.0.14-2 +- Fixed http source link +- Securify some permissions +- Added licenses for el-api and servlet-api +- Added dependency on jpackage-utils for the javadoc subpackage + +* Sat May 14 2011 Ivan Afonichev 0:7.0.14-1 +- Updated to 7.0.14 + +* Thu May 5 2011 Ivan Afonichev 0:7.0.12-4 +- Provided local paths for libs +- Fixed dependencies +- Fixed update temp/work cleanup + +* Mon May 2 2011 Ivan Afonichev 0:7.0.12-3 +- Fixed package groups +- Fixed some permissions +- Fixed some links +- Removed old tomcat6 crap + +* Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2 +- Package now named just tomcat instead of tomcat7 +- Removed Provides: %%{name}-log4j +- Switched to apache-commons-* names instead of jakarta-commons-* . +- Remove the old changelog +- BR/R java >= 1:1.6.0 , same for java-devel +- Removed old tomcat6 crap + +* Wed Apr 27 2011 Ivan Afonichev 0:7.0.12-1 +- Tomcat7 \ No newline at end of file diff --git a/tomcat.spec b/tomcat.spec index 8689ef0..b25b959 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,33 +1,3 @@ -# 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 3.1 %global major_version 10 %global minor_version 1 @@ -39,9 +9,10 @@ # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java %global native_version 2.0.8 - # FHS 3.0 compliant tree structure - http://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html %global basedir %{_var}/lib/%{name} +%global baseconfdir %{basedir}/conf +%global baselogdir %{basedir}/logs %global appdir %{basedir}/webapps %global homedir %{_datadir}/%{name} %global bindir %{homedir}/bin @@ -50,7 +21,7 @@ %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} %global tempdir %{cachedir}/temp -%global workdir %{cachedir}/work +%global workdir %{basedir}/work Name: tomcat Epoch: 1 @@ -75,39 +46,35 @@ Source10: %{name}-server Source11: %{name}-named.service Source12: module-start-up-parameters.conf +# https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-build.patch +# catalina.policy patch to allow ECJ usage under the Security Manager Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1857043 Patch4: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch +# Fixes not available constants in ECJ Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1857043 Patch6: rhbz-1857043.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: ant >= 1.10.2 -BuildRequires: ecj >= 4.20 +BuildRequires: ant +BuildRequires: ecj BuildRequires: findutils -BuildRequires: java-devel >= 17 +BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: aqute-bnd -BuildRequires: aqute-bndlib -BuildRequires: systemd BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) -Requires: javapackages-tools -Requires: %{name}-lib = %{epoch}:%{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} > 7 -Recommends: tomcat-native >= %{native_version} -%endif -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -# added after log4j sub-package was removed -Provides: %{name}-log4j = %{epoch}:%{version}-%{release} +Requires: (java-headless >= 11 or java >= 11) +Requires: javapackages-tools +Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Recommends: tomcat-native >= %{native_version} +Requires: systemd %description Tomcat is the servlet container that is used in the official Reference @@ -136,9 +103,10 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-api < %{jspspec} +Obsoletes: jsp < %{jspspec} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -158,7 +126,8 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} -Obsoletes: %{name}-servlet-api < %{servletspec} +Obsoletes: servlet < %{servletspec} +Conflicts: tomcat-servlet-4.0-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -166,7 +135,8 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-api < %{elspec} +Obsoletes: el_api < %{elspec} +Conflicts: tomcat-el-3.0-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -195,19 +165,11 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # 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" "jakarta.servlet:jakarta.servlet-api" -%mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" -%mvn_package ":tomcat-servlet-api" tomcat-servlet-api - # Create a sysusers.d config file cat >tomcat.sysusers.conf < ${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} +%{__install} -d ${RPM_BUILD_ROOT}%{libdir} +%{__install} -d ${RPM_BUILD_ROOT}%{logdir} +%{__install} -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats +%{__install} -d ${RPM_BUILD_ROOT}%{homedir} +%{__install} -d ${RPM_BUILD_ROOT}%{tempdir} +%{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} +%{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} + +for jar in output/build/lib/*.jar; do + # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm + jar tf ${jar} | grep -E -q '.*\.class' || continue + + jarname=$(basename $jar .jar) + + case "${jarname}" in + jasper) pom="res/maven/tomcat-jasper.pom" ;; + catalina-tribes) pom="res/maven/tomcat-tribes.pom" ;; + catalina-ssi) pom="res/maven/tomcat-ssi.pom" ;; + catalina-storeconfig) pom="res/maven/tomcat-storeconfig.pom" ;; + *) pom=$(ls res/maven/*"${jarname}".pom 2>/dev/null) ;; + esac + + sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" ${pom} + + case "${jarname}" in + tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni ;; + jsp-api) %mvn_file org.apache.tomcat:tomcat-jsp-api tomcat/jsp-api tomcat/%{name}-jsp-%{jspspec}-api %{name}-jsp-%{jspspec}-api %{name}-jsp-api ;; + servlet-api) %mvn_file org.apache.tomcat:tomcat-servlet-api tomcat/servlet-api tomcat/%{name}-servlet-%{servletspec}-api %{name}-servlet-%{servletspec}-api %{name}-servlet-api ;; + el-api) %mvn_file org.apache.tomcat:tomcat-el-api tomcat/el-api tomcat/%{name}-el-%{servletspec}-api %{name}-el-%{servletspec}-api %{name}-el-api ;; + catalina-tribes) %mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes ;; + catalina-ssi) %mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi ;; + catalina-storeconfig) %mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig ;; + *) %mvn_file org.apache.tomcat:$(sed -n "/.*${jarname}.*<\/artifactId>/ { s/.*\(.*${jarname}.*\)<\/artifactId>.*/\1/; p; q; }" "${pom}" 2>/dev/null) tomcat/${jarname} ;; + esac + + %mvn_artifact ${pom} ${jar} +done + +sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom +%mvn_artifact res/maven/tomcat-juli.pom output/build/bin/tomcat-juli.jar +# bootstrap does not have a pom, generate one +%mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar + +#Create symlinks to bindir +%mvn_file :tomcat-bootstrap tomcat/tomcat-bootstrap ${RPM_BUILD_ROOT}%{bindir}/bootstrap.jar +%mvn_file :tomcat-juli tomcat/tomcat-juli ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar + +# tomcat-parent pom +sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom +%mvn_artifact res/maven/tomcat.pom + +%mvn_package ":tomcat-el-api" tomcat-el-api +%mvn_package ":tomcat-jsp-api" tomcat-jsp-api +%mvn_package ":tomcat-servlet-api" tomcat-servlet-api + +%mvn_install + +# Fixes JAR must have Javapackages-GroupId manifest attribute error +jar ufm ${RPM_BUILD_ROOT}%{libdir}/el-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") +jar ufm ${RPM_BUILD_ROOT}%{libdir}/jsp-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") +jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") # 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 bin/*.xml ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd @@ -277,9 +289,9 @@ popd -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0755 %{SOURCE3} \ +%{__install} %{SOURCE3} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE7} \ +%{__install} %{SOURCE7} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled @@ -292,33 +304,11 @@ popd -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE8} \ - ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE9} \ - ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE10} \ - ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE11} \ - ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service - -%{__install} -m 0644 %{SOURCE12} ${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 +%{__install} %{SOURCE8} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions +%{__install} %{SOURCE9} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble +%{__install} %{SOURCE10} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server +%{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service +%{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ pushd output/build %{_bindir}/build-jar-repository lib ecj 2>&1 @@ -326,84 +316,13 @@ pushd output/build 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 - %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar - - cp ../../%{name}/bin/tomcat-juli.jar . + %{__cp} $(build-classpath ecj/ecj) ecj-x.jar + %{__cp} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration-x.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 *.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_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api -%mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar -%mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar -%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant -%mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar -%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha -%mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar -%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina -%mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar -%mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar -%mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar -%mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar -%mvn_artifact res/maven/tomcat-i18n-de.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-de.jar -%mvn_artifact res/maven/tomcat-i18n-es.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-es.jar -%mvn_artifact res/maven/tomcat-i18n-fr.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-fr.jar -%mvn_artifact res/maven/tomcat-i18n-ja.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ja.jar -%mvn_artifact res/maven/tomcat-i18n-ko.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ko.jar -%mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar -%mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar -%mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar -%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el -%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar -%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper -%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar -%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api -%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar -%mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar -%mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar -%mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar -%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi -%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar -%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig -%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar -%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes -%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar -%mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar -%mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar -%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api -%mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar -%mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar -%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar -%mvn_artifact res/maven/tomcat.pom - -%mvn_install +ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} +ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} +ln -sr %{logdir} ${RPM_BUILD_ROOT}%{baselogdir} install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf @@ -419,62 +338,44 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %postun %systemd_postun_with_restart %{name}.service -%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/module-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 +%doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} +%{_bindir}/%{name}-digest +%{_bindir}/%{name}-tool-wrapper +%{_sbindir}/%{name} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}@.service +%{_libexecdir}/%{name} +%{_localstatedir}/lib/tomcats +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf +%{homedir} +%{baseconfdir} +%{baselogdir} +%{workdir} +%attr(2770,tomcat,adm) %dir %{logdir} +%attr(750,tomcat,tomcat) %dir %{cachedir} +%attr(0770,root,tomcat) %{tempdir} +%attr(2775,tomcat,tomcat) %dir %{appdir} + +%{confdir}/conf.d +%config(noreplace) %{confdir}/%{name}.conf +# Configuration files should not be modifiable by the tomcat user, as this can be +# a security issue (an attacker may insert code in a webapp and rewrite the tomcat +# configuration) but those files should be readable by tomcat, so we set the group to tomcat. +%attr(640,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml +%attr(640,root,tomcat) %config(noreplace) %{confdir}/web.xml +%attr(640,root,tomcat) %config(noreplace) %{confdir}/server.xml +%attr(640,root,tomcat) %config(noreplace) %{confdir}/logging.properties +%attr(640,root,tomcat) %config(noreplace) %{confdir}/catalina.properties +%attr(640,root,tomcat) %config(noreplace) %{confdir}/context.xml +%attr(640,root,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml +%attr(640,root,tomcat) %config(noreplace) %{confdir}/catalina.policy +%attr(2775,root,tomcat) %dir %{confdir}/Catalina +%attr(2775,root,tomcat) %dir %{confdir}/Catalina/localhost %files admin-webapps -%defattr(0664,root,tomcat,0755) %{appdir}/host-manager %{appdir}/manager @@ -482,683 +383,22 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/docs %files lib -f .mfiles -%dir %{libdir} -%{libdir}/*.jar -%{_javadir}/*.jar -%{bindir}/tomcat-juli.jar -%exclude %{libdir}/%{name}-el-%{elspec}-api.jar -%exclude %{libdir}/%{name}-servlet-%{servletspec}*.jar -%exclude %{libdir}/%{name}-jsp-%{jspspec}*.jar -%exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar -%exclude %{_javadir}/%{name}-el-%{elspec}-api.jar -%exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar -%exclude %{_javadir}/%{name}-servlet-api.jar -%exclude %{_javadir}/%{name}-el-api.jar -%exclude %{_javadir}/%{name}-jsp-api.jar -%exclude %{_jnidir}/* +%defattr(644, root, tomcat, 2775) +%{libdir}/jakartaee-migration-x.jar +%{libdir}/ecj-x.jar %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api -%{_javadir}/%{name}-jsp-%{jspspec}*.jar -%{libdir}/%{name}-jsp-%{jspspec}*.jar -%{_javadir}/%{name}-jsp-api.jar +%doc LICENSE %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api %doc LICENSE -%{_javadir}/%{name}-servlet-%{servletspec}*.jar -%{libdir}/%{name}-servlet-%{servletspec}*.jar -%{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api %doc LICENSE -%{_javadir}/%{name}-el-%{elspec}-api.jar -%{libdir}/%{name}-el-%{elspec}-api.jar -%{_javadir}/%{name}-el-api.jar %files webapps %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT %changelog -* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 -- Update to version 10.1.34 - -* Mon Dec 09 2024 Packit - 1:9.0.98-1 -- Update to version 9.0.98 -- Resolves: rhbz#2331168 - -* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 -- Update to version 9.0.97 -- Resolves: rhbz#2327090 - -* Tue Oct 08 2024 Packit - 1:9.0.96-1 -- Update to version 9.0.96 -- Resolves: rhbz#2317237 - -* Tue Sep 17 2024 Packit - 1:9.0.95-1 -- Update to version 9.0.95 -- Resolves: rhbz#2312858 - -* Tue Sep 10 2024 Packit - 1:9.0.94-1 -- Update to version 9.0.94 -- Resolves: rhbz#2311320 - -* Tue Aug 06 2024 Packit - 1:9.0.93-1 -- Update to version 9.0.93 -- Resolves: rhbz#2303026 - -* Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 -- convert license to SPDX - -* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 -- Update to 9.0.91 - -* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 -- Update to 9.0.90 - -* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 -- Update to 9.0.89 - -* Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 -- Accept java-21-headless as one of the alternatives for java - -* Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 -- Update to 9.0.83 - -* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 -- Update to 9.0.82 -- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 - -* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 -- Update to 9.0.80 -- Fix java version - -* Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 -- Fix files permission - -* Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 -- Exclude jnidir in the lib subpackage - -* Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 -- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage - -* Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 -- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage -- Update to 9.0.78 - -* Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 -- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide -- Remove JDTCompiler patch because ecj has been update -- Update to 9.0.76 -- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java -- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages - -* Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 -- Update to 9.0.75 - -* Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 -- Update to 9.0.73 - -* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 -- Update to 9.0.71 -- Remove osgi-annotations patch -- Add bnd-annotation dependency which is in bndlib package - -* Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 -- Update to 9.0.70 - -* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 -- Update to 9.0.68 - -* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 -- Update to 9.0.65 - -* Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 -- Rebuilt for Drop i686 JDKs - -* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 -- Update to 9.0.64 -- Add osgi-annotations dependency back - -* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 -- Related: rhbz#2061424 Adjust fix so that it uses the proper env var - -* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 -- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection - -* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 -- Update to 9.0.59 -- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability - -* Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 -- Update to 9.0.56 - -* Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 -- Update to 9.0.55 - -* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 -- Update to 9.0.54 - -* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 -- Update to 9.0.53 - -* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 -- Update to 9.0.52 - -* Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 06 2021 Hui Wang - 1:9.0.50-1 -- Update to 9.0.50 - -* Sat Jun 05 2021 Coty Sutherland - 1:9.0.45-4 -- Add back logrotate config file per devel list request -- Add mvn virtual provides back for the servlet, el, and jsp spec impls - -* Fri Jun 04 2021 Coty Sutherland - 1:9.0.45-3 -- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused - -* Thu Jun 03 2021 Coty Sutherland - 1:9.0.45-2 -- Remove examples webapps from subpackage -- Updates to javapackages-local removed %%add_maven_depmap which broke the build, - so I removed the maven artifacts as they aren't very useful anyway -- Drop JSVC support as it's not very useful these days -- Drop geronimo-saaj as it's no longer required - -* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 -- Update to 9.0.45 - -* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 -- Update to 9.0.44 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 -- Update to 9.0.43 - -* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 -- Update to 9.0.41 - -* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 -- Update to 9.0.40 - -* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 -- Update to 9.0.39 - -* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 -- Update to 9.0.38 - -* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3 -- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars - -* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 -- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar - -* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 -- Update to 9.0.37 - -* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 -- Upgrade to 9.0.36 - -* Sun May 31 2020 Hui Wang - 1:9.0.35-2 -- Upgrade to 9.0.35 - -* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 -- Add updated catalina.policy patch to allow ECJ usage under the Security Manager - -* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 -- Update to 9.0.34 - -* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 -- Update to 9.0.31 -- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability - -* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 -- Update to 9.0.30 - -* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 -- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts - -* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 -- Update to 9.0.26 -- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names -- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user - -* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 -- Update build-classpath calls to ECJ to specify the JAR we want to use - -* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 -- Update to 9.0.21 - -* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 -- Remove javadoc subpackage to drop the jpackage-utils dependency - -* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 -- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) -- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit - -* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 -- Update to 9.0.13 -- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet - -* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 -- Drop legcy sys-v bits - -* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 -- Update to 9.0.10 -- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS -- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins -- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client -- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up - -* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 -- Update to 9.0.7 - -* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 -- Update to 8.5.29 -- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources -- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users - -* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 -- Escape macros in %%changelog - -* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 -- Update to 8.0.49 - -* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3 -- Cleanup spec file conditionals - -* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 -- Change "zip -u" to "zip" -- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition - -* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 -- Update to 8.0.47 -- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 - -* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 -- Update to 8.0.46 -- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning - -* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 -- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism - -* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 -- Update to 8.0.43 - -* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 -- Update to 8.0.42 - -* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 -- Update to 8.0.41 -- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing - -* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 -- Update to 8.0.39 -- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws - -* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 -- Update to 8.0.38 - -* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 -- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation -- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service - -* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 -- Rebase to 8.0.37 -- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header -- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated - -* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 -- Related: rhbz#1349469 Correct typo in changelog entry - -* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 -- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) -- Resolves: rhbz#1364056 The command tomcat-digest doesn't work -- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken -- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully -- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) -- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out -- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded -- Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api -- Resolves: asfbz#59960 Building javadocs with java8 fails - -* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 -- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 -- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 - -* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 -- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 -- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 - -* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2 -- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 - -* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 -- Updated to 8.0.32 -- Remove log4j support. It has never been working actually. See rhbz#1236297 -- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 -- Recommend tomcat-native, resolves: rhbz#1243132 - -* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 -- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml -- Program /bin/nologin does not exist (#1302718) - -* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2 -- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) - -* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 -- Update to 8.0.26. - -* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 -- Update to 8.0.24. - -* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 -- Drop javax.el:el-api alias. - -* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 -- Update to 8.0.23. - -* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 -- Drop jetty alias for servlet. - -* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 -- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} - -* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 -- Rebuild against tomcat-taglibs-standard. - -* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 -- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. -- Drop old provides. - -* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 -- Bump epoch to maintain upgrade path from Fedora 22 - -* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 -- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} - -* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 -- Updated to 8.0.18 - -* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 -- Updated to 8.0.12 -- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 -- Use CATALINA_OPTS only on start, resolves: rhbz#1051194 - -* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 -- jsp-api requires el-api - -* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 -- Update to upstream 7.0.54 - fixes compile with Java 8. - -* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 -- Drop servlet/el api provides to reduce user machines ending with both. - -* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 -- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 -- Move log4j support into subpackage, resolves: rhbz#1027716 - -* Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1 -- Updated to 7.0.52 -- Rewrite jsvc implementation, resolves: rhbz#1051743 -- Switch to java-headless R, resolves: rhbz#1068566 -- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 -- Add pom for tomcat-jdbc, resolves: rhbz#1011003 - -* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 -- Fix installation of Maven metadata for tomcat-juli.jar -- Resolves: rhbz#1033664 - -* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2 -- Rebuild for bug #1033664 - -* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 -- Updated to 7.0.47 -- Fix java.security.policy - -* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2 -- Remove jpackage-utils R - -* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 -- Updated to 7.0.42 - -* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3 -- Dropped systemv inits. Bye-bye. -- Updated the systemd wrappers to allow running multiple instances. - Added wrapper scripts to do that, ported the original non-named - service file to work with the same wrappers, updated - /usr/sbin/tomcat to call systemctl. - -* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 -- Updated to 7.0.40 -- Resolves: rhbz 956569 added missing commons-pool link -- Remove ant-nodeps BR - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 -- Add depmaps for org.eclipse.jetty.orbit -- Resolves: rhbz#917626 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 -- Updated to 7.0.39 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 -- Updated to 7.0.37 - -* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 -- Updated to 7.0.35 -- systemd SuccessExitStatus=143 for proper stop exit code processing - -* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 -- Updated to 7.0.34 -- ecj >= 4.2.1 now required -- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME - -* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 -- Resolves: rhbz 883806 refix logdir ownership - -* Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 -- Updated to 7.0.33 -- Resolves: rhbz 873620 need chkconfig for update-alternatives - -* Wed Oct 17 2012 Ivan Afonichev 0:7.0.32-1 -- Updated to 7.0.32 -- Resolves: rhbz 842620 symlinks to taglibs - -* Fri Aug 24 2012 Ivan Afonichev 0:7.0.29-1 -- Updated to 7.0.29 -- Add pidfile as tmpfile -- Use systemd for running as unprivileged user -- Resolves: rhbz 847751 upgrade path was broken -- Resolves: rhbz 850343 use new systemd-rpm macros - -* Sat Jul 21 2012 Fedora Release Engineering - 0:7.0.28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 2 2012 Ivan Afonichev 0:7.0.28-1 -- Updated to 7.0.28 -- Resolves: rhbz 820119 Remove bundled apache-commons-dbcp -- Resolves: rhbz 814900 Added tomcat-coyote POM -- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet -- Remove redhat-lsb R - -* Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2 -- Fixed native download hack - -* Sat Apr 7 2012 Ivan Afonichev 0:7.0.27-1 -- Updated to 7.0.27 -- Fixed jakarta-taglibs-standard BR and R - -* Wed Mar 21 2012 Stanislav Ochotnicky - 0:7.0.26-2 -- Add more depmaps to J2EE apis to help jetty/glassfish updates - -* Wed Mar 14 2012 Juan Hernandez 0:7.0.26-2 -- Added the POM files for tomcat-api and tomcat-util (#803495) - -* Wed Feb 22 2012 Ivan Afonichev 0:7.0.26-1 -- Updated to 7.0.26 -- Bug 790334: Change ownership of logdir for logrotate - -* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4 -- Bug 790694: Priorities of jsp, servlet and el packages updated. - -* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 -- Dropped indirect dependecy to tomcat 5 - -* Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 -- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly - -* Sat Jan 21 2012 Ivan Afonichev 0:7.0.25-1 -- Updated to 7.0.25 -- Removed EntityResolver patch (changes already in upstream sources) -- Place poms and depmaps in the same package as jars -- Added javax.servlet.descriptor to export-package of servlet-api -- Move several chkconfig actions and reqs to systemv subpackage -- New maven depmaps generation method -- Add patch to support java7. (patch sent upstream). -- Require java >= 1:1.6.0 - -* Fri Jan 13 2012 Krzysztof Daniel 0:7.0.23-5 -- Exported javax.servlet.* packages in version 3.0 as 2.6 to make - servlet-api compatible with Eclipse. - -* Thu Jan 12 2012 Ivan Afonichev 0:7.0.23-4 -- Move jsvc support to subpackage - -* Wed Jan 11 2012 Alexander Kurtakov 0:7.0.23-2 -- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream). - -* Mon Dec 12 2011 Joseph D. Wagner 0:7.0.23-3 -- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for - starting 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. Must add USE_JSVC="true" to - /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat. - -* Mon Nov 28 2011 Ivan Afonichev 0:7.0.23-1 -- Updated to 7.0.23 - -* Fri Nov 11 2011 Ivan Afonichev 0:7.0.22-2 -- Move tomcat-juli.jar to lib package -- Drop %%update_maven_depmap as in tomcat6 -- Provide native systemd unit file ported from tomcat6 - -* Thu Oct 6 2011 Ivan Afonichev 0:7.0.22-1 -- Updated to 7.0.22 - -* Mon Oct 03 2011 Rex Dieter - 0:7.0.21-3.1 -- rebuild (java), rel-eng#4932 - -* Mon Sep 26 2011 Ivan Afonichev 0:7.0.21-3 -- Fix basedir mode - -* Tue Sep 20 2011 Roland Grunberg 0:7.0.21-2 -- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli. - -* Thu Sep 8 2011 Ivan Afonichev 0:7.0.21-1 -- Updated to 7.0.21 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-3 -- Require java = 1:1.6.0 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-2 -- Require java < 1.7.0 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-1 -- Updated to 7.0.20 - -* Tue Jul 26 2011 Ivan Afonichev 0:7.0.19-1 -- Updated to 7.0.19 - -* Tue Jun 21 2011 Ivan Afonichev 0:7.0.16-1 -- Updated to 7.0.16 - -* Mon Jun 6 2011 Ivan Afonichev 0:7.0.14-3 -- Added initial systemd service -- Fix some paths - -* Sat May 21 2011 Ivan Afonichev 0:7.0.14-2 -- Fixed http source link -- Securify some permissions -- Added licenses for el-api and servlet-api -- Added dependency on jpackage-utils for the javadoc subpackage - -* Sat May 14 2011 Ivan Afonichev 0:7.0.14-1 -- Updated to 7.0.14 - -* Thu May 5 2011 Ivan Afonichev 0:7.0.12-4 -- Provided local paths for libs -- Fixed dependencies -- Fixed update temp/work cleanup - -* Mon May 2 2011 Ivan Afonichev 0:7.0.12-3 -- Fixed package groups -- Fixed some permissions -- Fixed some links -- Removed old tomcat6 crap - -* Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2 -- Package now named just tomcat instead of tomcat7 -- Removed Provides: %%{name}-log4j -- Switched to apache-commons-* names instead of jakarta-commons-* . -- Remove the old changelog -- BR/R java >= 1:1.6.0 , same for java-devel -- Removed old tomcat6 crap - -* Wed Apr 27 2011 Ivan Afonichev 0:7.0.12-1 -- Tomcat7 +%autochangelog From 727c3d6f657ad7d523dbf99c662d7e1bbcacc36f Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 12 Feb 2025 14:08:33 +0200 Subject: [PATCH 291/354] Use ecj and jakartaee-migration jars from the installed system rather than distributing the jars in tomcat-lib package. --- tomcat.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index b25b959..6b5787b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -191,7 +191,7 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ + -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration)" \ deploy # remove some jars that we'll replace with symlinks later @@ -310,15 +310,8 @@ popd %{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service %{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ -pushd output/build - %{_bindir}/build-jar-repository lib ecj 2>&1 - %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 -popd - -pushd ${RPM_BUILD_ROOT}%{libdir} - %{__cp} $(build-classpath ecj/ecj) ecj-x.jar - %{__cp} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration-x.jar -popd +ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar +ln -sr $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) ${RPM_BUILD_ROOT}%{libdir}/jakartaee-migration-x.jar ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} From 2c9c3acaccc5eb73509a13d07e1115c005448592 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 13 Feb 2025 15:41:04 +0200 Subject: [PATCH 292/354] Remove javapackages test case rule from gating --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index b81b8c4..e49f5a7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -9,5 +9,4 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} From 0ca450977f6e29b85c371b7cc706b3d61decedd5 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 17 Feb 2025 15:28:21 +0200 Subject: [PATCH 293/354] - This commit introduces the major change of dropping the custom scripts and using the upstream scripts for tomcat deployment. - Fix links created by %mvn_file - Remove packaging of tempdir as /tmp is being used currently -Update the service and conf files --- module-start-up-parameters.conf | 8 -- tomcat-build.patch => tomcat-10.1-build.patch | 0 tomcat-10.1-digest.script | 45 --------- tomcat-10.1-locate-java.sh | 21 +++++ tomcat-10.1-start.sh | 18 ++++ tomcat-10.1-tool-wrapper.script | 45 --------- ...pp.patch => tomcat-10.1-users-webapp.patch | 0 tomcat-10.1.conf | 54 ++++------- tomcat-10.1.service | 35 +++++-- tomcat-10.1.sysconfig | 11 --- tomcat-10.1.wrapper | 24 ----- tomcat-functions | 21 ----- tomcat-named.service | 24 ----- tomcat-preamble | 52 ---------- tomcat-server | 25 ----- tomcat.spec | 94 +++++-------------- 16 files changed, 110 insertions(+), 367 deletions(-) delete mode 100644 module-start-up-parameters.conf rename tomcat-build.patch => tomcat-10.1-build.patch (100%) delete mode 100644 tomcat-10.1-digest.script create mode 100644 tomcat-10.1-locate-java.sh create mode 100644 tomcat-10.1-start.sh delete mode 100644 tomcat-10.1-tool-wrapper.script rename tomcat-10.1-tomcat-users-webapp.patch => tomcat-10.1-users-webapp.patch (100%) delete mode 100644 tomcat-10.1.sysconfig delete mode 100644 tomcat-10.1.wrapper delete mode 100644 tomcat-functions delete mode 100644 tomcat-named.service delete mode 100644 tomcat-preamble delete mode 100644 tomcat-server diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf deleted file mode 100644 index 7f8652a..0000000 --- a/module-start-up-parameters.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Add the module start-up parameters required by Tomcat -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -export JAVA_OPTS - diff --git a/tomcat-build.patch b/tomcat-10.1-build.patch similarity index 100% rename from tomcat-build.patch rename to tomcat-10.1-build.patch diff --git a/tomcat-10.1-digest.script b/tomcat-10.1-digest.script deleted file mode 100644 index ce4aa0f..0000000 --- a/tomcat-10.1-digest.script +++ /dev/null @@ -1,45 +0,0 @@ -#!/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_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/tomcat-10.1-locate-java.sh b/tomcat-10.1-locate-java.sh new file mode 100644 index 0000000..cb272e7 --- /dev/null +++ b/tomcat-10.1-locate-java.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Script looking for a Java runtime suitable for running Tomcat. +#The Java runtime found is exported in the JAVA_HOME environment variable. +set -e +if [ -z "$JAVA_HOME" ]; then + INSTALLATION_PATH="/usr/lib/jvm/" + for jvmdir in "${INSTALLATION_PATH}"java* "${INSTALLATION_PATH}"jre*; do + if [ -d "${jvmdir}" ] && [ -r "${jvmdir}/bin/java" ]; then + MAJOR_JAVA_VERSION=$("${jvmdir}/bin/java" --version | head -n 1 | sed -E 's/^[^0-9]*1\.([0-9]+).*/\1/; t; s/^[^0-9]*([0-9]+)\..*/\1/') + # Tomcat 10 requires Java >= 11 + if [ "${MAJOR_JAVA_VERSION}" -ge 11 ]; then + export JAVA_HOME="${jvmdir}" + exit 0 + fi + fi + done +fi +if [ -z "$JAVA_HOME" ]; then + echo "No JDK or JRE found - Please set the JAVA_HOME variable." + exit 1 +fi diff --git a/tomcat-10.1-start.sh b/tomcat-10.1-start.sh new file mode 100644 index 0000000..d682610 --- /dev/null +++ b/tomcat-10.1-start.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# Startup script for Apache Tomcat with systemd + +set -e + +# Load the service settings +. /etc/tomcat/tomcat.conf + +# Try to find Java installation and set JAVA_HOME +/bin/sh /usr/libexec/tomcat/tomcat-locate-java.sh + +# Enable the Java security manager? +SECURITY="" +[ "$SECURITY_MANAGER" = "true" ] && SECURITY="-security" + + +# Start Tomcat +cd "$CATALINA_BASE" && "$CATALINA_HOME"/bin/catalina.sh run $SECURITY \ No newline at end of file diff --git a/tomcat-10.1-tool-wrapper.script b/tomcat-10.1-tool-wrapper.script deleted file mode 100644 index 949d46d..0000000 --- a/tomcat-10.1-tool-wrapper.script +++ /dev/null @@ -1,45 +0,0 @@ -#!/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/tomcat-10.1-tomcat-users-webapp.patch b/tomcat-10.1-users-webapp.patch similarity index 100% rename from tomcat-10.1-tomcat-users-webapp.patch rename to tomcat-10.1-users-webapp.patch diff --git a/tomcat-10.1.conf b/tomcat-10.1.conf index c83305a..a698426 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -1,42 +1,24 @@ -# 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. +# Minimum required Java version is 11. +#export JAVA_HOME=/usr/lib/jvm/java-11 -# This variable is used to figure out if config is loaded or not. -TOMCAT_CFG_LOADED="1" +# Include here and not in JAVA_OPTS all options, that should only be used by Tomcat itself. +# Examples are heap size, GC logging, JMX ports etc. +#export CATALINA_OPTS="-Dcatalina.http.port=8082" -# 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/" +# Java runtime options used when any command is executed. +#export JAVA_OPTS="-Xmx512m -Xms256m" -# Where your java installation lives -JAVA_HOME="/usr/lib/jvm/jre" +# To enable remote debugging uncomment the following line. +# You will then be able to use a Java debugger on port 8000. +#export JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n" -# Where your tomcat installation lives -CATALINA_HOME="@@@TCHOME@@@" +# Java compiler to use for translating JavaServer Pages (JSPs). You can use all +# compilers that are accepted by Ant's build.compiler property. +#export JSP_COMPILER=javac +#export JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" -# System-wide tmp -CATALINA_TMPDIR="/var/cache/tomcat/temp" +# Enable the Java security manager? (true/false, default: false) +#export SECURITY_MANAGER=true -# You can change your tomcat locale here -#LANG="en_US" - -# Run tomcat under the Java Security Manager -SECURITY_MANAGER="false" - -# If you wish to further customize your tomcat environment, -# put your own definitions here -# (i.e. LD_LIBRARY_PATH for some jdbc drivers) - -# You can also pass parameters to Java here by defining JAVA_OPTS variable -# (e.g. JAVA_OPTS="-Xminf0.1 -Xmaxf0.3") +# Whether to compress logfiles older than today's +#export LOGFILE_COMPRESS=1 \ No newline at end of file diff --git a/tomcat-10.1.service b/tomcat-10.1.service index 832e7c6..55639b2 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -1,20 +1,39 @@ -# Systemd unit file for default tomcat -# -# To create clones of this service: -# DO NOTHING, use tomcat@.service instead. +# Systemd unit file for for Apache Tomcat [Unit] Description=Apache Tomcat Web Application Container +Documentation=https://tomcat.apache.org/tomcat-10.1-doc/index.html After=syslog.target network.target +RequiresMountsFor=/var/log/tomcat /var/lib/tomcat [Service] +# Configuration +Environment="CATALINA_HOME=/usr/share/tomcat" +Environment="CATALINA_BASE=/var/lib/tomcat" +Environment="CATALINA_TMPDIR=/tmp" +Environment="JAVA_OPTS=-Djava.awt.headless=true" + +# Lifecycle Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf -Environment="NAME=" -EnvironmentFile=-/etc/sysconfig/tomcat -ExecStart=/usr/libexec/tomcat/server start +ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-start.sh SuccessExitStatus=143 +Restart=on-abort + +# Logging +SyslogIdentifier=tomcat + +# Security User=tomcat +Group=tomcat +PrivateTmp=yes +AmbientCapabilities=CAP_NET_BIND_SERVICE +NoNewPrivileges=true +CacheDirectory=tomcat +CacheDirectoryMode=750 +ProtectSystem=strict +ReadWritePaths=/etc/tomcat/Catalina/ +ReadWritePaths=/var/lib/tomcat/webapps/ +ReadWritePaths=/var/log/tomcat/ [Install] WantedBy=multi-user.target diff --git a/tomcat-10.1.sysconfig b/tomcat-10.1.sysconfig deleted file mode 100644 index 3117bf7..0000000 --- a/tomcat-10.1.sysconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Service-specific configuration file for tomcat. This will be sourced by -# systemd for the default service (tomcat.service) -# If you want to customize named instance, make a similar file -# and name it tomcat@instancename. - -# You will not need to set this, usually. For default service it equals -# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME} -#CATALINA_BASE="@@@TCHOME@@@" - -# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you -# can override. diff --git a/tomcat-10.1.wrapper b/tomcat-10.1.wrapper deleted file mode 100644 index c97cb85..0000000 --- a/tomcat-10.1.wrapper +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -if [ "$1" = "version" ]; then - . /usr/libexec/tomcat/preamble - exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ - org.apache.catalina.util.ServerInfo -fi - -SRV="tomcat" -if [ -n "$2" ]; then - SRV="tomcat@$2" -fi - -if [ "$1" = "start" ]; then - systemctl start ${SRV}.service -elif [ "$1" = "stop" ]; then - systemctl stop ${SRV}.service -elif [ "$1" = "version" ]; then - ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ - org.apache.catalina.util.ServerInfo -else - echo "Usage: $0 {start|stop|version} [server-id]" - exit 1 -fi diff --git a/tomcat-functions b/tomcat-functions deleted file mode 100644 index 1187653..0000000 --- a/tomcat-functions +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -if [ -r /usr/share/java-utils/java-functions ]; then - . /usr/share/java-utils/java-functions -else - echo "Can't read Java functions library, aborting" - exit 1 -fi - -_save_function() { - local ORIG_FUNC=$(declare -f $1) - local NEWNAME_FUNC="$2${ORIG_FUNC#$1}" - eval "$NEWNAME_FUNC" -} - -_save_function run run_java - -run() { - run_java $@ -} - diff --git a/tomcat-named.service b/tomcat-named.service deleted file mode 100644 index b6cd8bd..0000000 --- a/tomcat-named.service +++ /dev/null @@ -1,24 +0,0 @@ -# Systemd unit file for tomcat instances. -# -# To create clones of this service: -# 0. systemctl enable tomcat@name.service -# 1. create catalina.base directory structure in -# /var/lib/tomcats/name -# 2. profit. - -[Unit] -Description=Apache Tomcat Web Application Container -After=syslog.target network.target - -[Service] -Type=simple -EnvironmentFile=/etc/tomcat/tomcat.conf -Environment="NAME=%i" -EnvironmentFile=-/etc/sysconfig/tomcat@%i -ExecStart=/usr/libexec/tomcat/server start -ExecStop=/usr/libexec/tomcat/server stop -SuccessExitStatus=143 -User=tomcat - -[Install] -WantedBy=multi-user.target diff --git a/tomcat-preamble b/tomcat-preamble deleted file mode 100644 index 1271dca..0000000 --- a/tomcat-preamble +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /usr/libexec/tomcat/functions - -# Get the tomcat config (use this for environment specific settings) - -if [ -z "${TOMCAT_CFG_LOADED}" ]; then - if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat/tomcat.conf" - fi - . $TOMCAT_CFG -fi - -if [ -d "${TOMCAT_CONFD=/etc/tomcat/conf.d}" ]; then - for file in ${TOMCAT_CONFD}/*.conf ; do - if [ -f "$file" ] ; then - . "$file" - fi - done -fi - -if [ -z "$CATALINA_BASE" ]; then - if [ -n "$NAME" ]; then - if [ -z "$TOMCATS_BASE" ]; then - TOMCATS_BASE="/var/lib/tomcats/" - fi - CATALINA_BASE="${TOMCATS_BASE}${NAME}" - else - CATALINA_BASE="${CATALINA_HOME}" - fi -fi -VERBOSE=1 -set_javacmd -cd ${CATALINA_HOME} -# CLASSPATH munging -if [ ! -z "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH": -fi - -if [ -n "$JSSE_HOME" ]; then - CLASSPATH="${CLASSPATH}$(build-classpath jcert jnet jsse 2>/dev/null):" -fi -CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar" -CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" -CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" - -if [ -z "$LOGGING_PROPERTIES" ] ; then - LOGGING_PROPERTIES="${CATALINA_BASE}/conf/logging.properties" - if [ ! -f "${LOGGING_PROPERTIES}" ] ; then - LOGGING_PROPERTIES="${CATALINA_HOME}/conf/logging.properties" - fi -fi diff --git a/tomcat-server b/tomcat-server deleted file mode 100644 index 17ae385..0000000 --- a/tomcat-server +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /usr/libexec/tomcat/preamble - -MAIN_CLASS=org.apache.catalina.startup.Bootstrap - -FLAGS="$JAVA_OPTS" -OPTIONS="-Dcatalina.base=$CATALINA_BASE \ --Dcatalina.home=$CATALINA_HOME \ --Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \ --Djava.io.tmpdir=$CATALINA_TMPDIR \ --Djava.util.logging.config.file=${LOGGING_PROPERTIES} \ --Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" - -if [ "$1" = "start" ] ; then - FLAGS="${FLAGS} $CATALINA_OPTS" - if [ "${SECURITY_MANAGER}" = "true" ] ; then - OPTIONS="${OPTIONS} \ - -Djava.security.manager \ - -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy" - fi - run start -elif [ "$1" = "stop" ] ; then - run stop -fi diff --git a/tomcat.spec b/tomcat.spec index 6b5787b..e39e9e4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -20,7 +20,6 @@ %global libdir %{_javadir}/%{name} %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} -%global tempdir %{cachedir}/temp %global workdir %{basedir}/work Name: tomcat @@ -34,22 +33,15 @@ License: Apache-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 -Source2: %{name}-%{major_version}.%{minor_version}.sysconfig -Source3: %{name}-%{major_version}.%{minor_version}.wrapper -Source4: %{name}-%{major_version}.%{minor_version}.logrotate -Source5: %{name}-%{major_version}.%{minor_version}-digest.script -Source6: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script -Source7: %{name}-%{major_version}.%{minor_version}.service -Source8: %{name}-functions -Source9: %{name}-preamble -Source10: %{name}-server -Source11: %{name}-named.service -Source12: module-start-up-parameters.conf +Source2: %{name}-%{major_version}.%{minor_version}.logrotate +Source3: %{name}-%{major_version}.%{minor_version}.service +Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh +Source5: %{name}-%{major_version}.%{minor_version}-start.sh # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch -Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -Patch2: %{name}-build.patch +Patch1: %{name}-%{major_version}.%{minor_version}-users-webapp.patch +Patch2: %{name}-%{major_version}.%{minor_version}-build.patch # catalina.policy patch to allow ECJ usage under the Security Manager Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1857043 @@ -60,7 +52,9 @@ Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch Patch6: rhbz-1857043.patch BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +# Can't use noarch since we are packaging tomcat-jni.jar. +# See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Java/#_architecture_support +ExclusiveArch: %{java_arches} BuildRequires: ant BuildRequires: ecj @@ -69,9 +63,9 @@ BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration +BuildRequires: systemd Requires: (java-headless >= 11 or java >= 11) -Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} Requires: systemd @@ -118,7 +112,6 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj >= 4.20 Recommends: tomcat-jakartaee-migration -Requires(preun): coreutils %description lib Libraries needed to run the Tomcat Web container. @@ -202,10 +195,8 @@ touch HACK %install # build initial path structure -%{__install} -d ${RPM_BUILD_ROOT}%{_bindir} -%{__install} -d ${RPM_BUILD_ROOT}%{_sbindir} +# %{__install} -d ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d -%{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir} @@ -214,12 +205,19 @@ touch HACK /bin/echo "Place your custom *.conf files here. Shell expansion is supported." > ${RPM_BUILD_ROOT}%{confdir}/conf.d/README %{__install} -d ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} -%{__install} -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats %{__install} -d ${RPM_BUILD_ROOT}%{homedir} -%{__install} -d ${RPM_BUILD_ROOT}%{tempdir} +%{__install} -d ${RPM_BUILD_ROOT}%{cachedir} %{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} %{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} +%{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE2} > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled +%{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh +%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh + +%{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf + for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm jar tf ${jar} | grep -E -q '.*\.class' || continue @@ -237,7 +235,7 @@ for jar in output/build/lib/*.jar; do sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" ${pom} case "${jarname}" in - tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni ;; + tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni %{libdir}/tomcat-jni ;; jsp-api) %mvn_file org.apache.tomcat:tomcat-jsp-api tomcat/jsp-api tomcat/%{name}-jsp-%{jspspec}-api %{name}-jsp-%{jspspec}-api %{name}-jsp-api ;; servlet-api) %mvn_file org.apache.tomcat:tomcat-servlet-api tomcat/servlet-api tomcat/%{name}-servlet-%{servletspec}-api %{name}-servlet-%{servletspec}-api %{name}-servlet-api ;; el-api) %mvn_file org.apache.tomcat:tomcat-el-api tomcat/el-api tomcat/%{name}-el-%{servletspec}-api %{name}-el-%{servletspec}-api %{name}-el-api ;; @@ -255,9 +253,8 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -#Create symlinks to bindir -%mvn_file :tomcat-bootstrap tomcat/tomcat-bootstrap ${RPM_BUILD_ROOT}%{bindir}/bootstrap.jar -%mvn_file :tomcat-juli tomcat/tomcat-juli ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar +%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap +%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom @@ -276,56 +273,24 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build - %{__cp} -a bin/*.xml ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__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" %{SOURCE2} \ - > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} %{SOURCE3} \ - ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} %{SOURCE7} \ - ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ - > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled -%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ - -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ - > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest -%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ - -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ - > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper - -%{__install} %{SOURCE8} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} %{SOURCE9} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} %{SOURCE10} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ - ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar ln -sr $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) ${RPM_BUILD_ROOT}%{libdir}/jakartaee-migration-x.jar ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} ln -sr %{logdir} ${RPM_BUILD_ROOT}%{baselogdir} - -install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf +ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %post # install but don't activate %systemd_post %{name}.service %preun -# clean tempdir and workdir on removal or upgrade -%{__rm} -rf %{workdir}/* %{tempdir}/* %systemd_preun %{name}.service %postun @@ -333,14 +298,8 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %files %doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} -%{_bindir}/%{name}-digest -%{_bindir}/%{name}-tool-wrapper -%{_sbindir}/%{name} %{_unitdir}/%{name}.service -%{_unitdir}/%{name}@.service %{_libexecdir}/%{name} -%{_localstatedir}/lib/tomcats -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf %{homedir} @@ -349,7 +308,6 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{workdir} %attr(2770,tomcat,adm) %dir %{logdir} %attr(750,tomcat,tomcat) %dir %{cachedir} -%attr(0770,root,tomcat) %{tempdir} %attr(2775,tomcat,tomcat) %dir %{appdir} %{confdir}/conf.d @@ -376,9 +334,9 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/docs %files lib -f .mfiles -%defattr(644, root, tomcat, 2775) %{libdir}/jakartaee-migration-x.jar %{libdir}/ecj-x.jar +%exclude %{libdir}/tomcat-jni.pom %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %doc LICENSE From da88992d305c75f9c407eeedbd28be0ef038237d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 19 Feb 2025 13:47:07 +0200 Subject: [PATCH 294/354] Introduce tomcat-common subpackage --- tomcat.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index e39e9e4..7ad4bc5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -65,8 +65,7 @@ BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd -Requires: (java-headless >= 11 or java >= 11) -Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} Requires: systemd @@ -105,6 +104,14 @@ Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. +%package common +Summary: Apache Tomcat - Servlet and JSP engine -- common files +Requires: (java-headless >= 11 or java >= 11) +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description common +Apache Tomcat - Servlet and JSP engine -- common files + %package lib Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} @@ -263,6 +270,7 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom %mvn_package ":tomcat-el-api" tomcat-el-api %mvn_package ":tomcat-jsp-api" tomcat-jsp-api %mvn_package ":tomcat-servlet-api" tomcat-servlet-api +%mvn_package ":tomcat-bootstrap" tomcat-common %mvn_install @@ -299,10 +307,9 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files %doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} %{_unitdir}/%{name}.service -%{_libexecdir}/%{name} +%{_libexecdir}/%{name}/tomcat-start.sh %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf -%{homedir} %{baseconfdir} %{baselogdir} %{workdir} @@ -333,7 +340,12 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files docs-webapp %{appdir}/docs +%files common -f .mfiles-tomcat-common +%{_libexecdir}/%{name}/tomcat-locate-java.sh +%{homedir}/bin + %files lib -f .mfiles +%{homedir}/lib %{libdir}/jakartaee-migration-x.jar %{libdir}/ecj-x.jar %exclude %{libdir}/tomcat-jni.pom From 6313caf0fda55b4b222de9fbe5a31d7d46c7cf69 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 19 Feb 2025 14:10:51 +0200 Subject: [PATCH 295/354] Add min_java_version variable --- tomcat.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 7ad4bc5..f603e54 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -6,6 +6,7 @@ %global servletspec 6.0 %global elspec 5.0 %global tcuid 53 +%global min_java_version 11 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java %global native_version 2.0.8 @@ -106,7 +107,7 @@ Apache Tomcat JSP API Implementation Classes. %package common Summary: Apache Tomcat - Servlet and JSP engine -- common files -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) Requires: %{name}-lib = %{epoch}:%{version}-%{release} %description common From e4b70e261a6f8ce13784f4ec086867792000c8d1 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 20 Feb 2025 18:33:17 +0200 Subject: [PATCH 296/354] Reorganize docs and add RUNNING.txt file in tomcat-common package --- tomcat-10.1-RUNNING.txt | 133 ++++++++++++++++++++++++++++++++++++++++ tomcat-10.1.conf | 4 +- tomcat.spec | 23 +++++-- 3 files changed, 154 insertions(+), 6 deletions(-) create mode 100644 tomcat-10.1-RUNNING.txt diff --git a/tomcat-10.1-RUNNING.txt b/tomcat-10.1-RUNNING.txt new file mode 100644 index 0000000..e114b14 --- /dev/null +++ b/tomcat-10.1-RUNNING.txt @@ -0,0 +1,133 @@ +================================================================================ + 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. +================================================================================ + + =================================================== + Running The Apache Tomcat 10.1 Servlet/JSP Container + =================================================== + +Apache Tomcat 10.1 requires a Java Standard Edition Runtime +Environment (JRE) version 11 or later. + +============================= +Running With JRE 11 Or Later +============================= + +(1) Download and Install a Java SE Runtime Environment (JRE) or a full Java Development Kit (JDK), release version 11 or later. + +(2) Configure Environment Variables + +Tomcat is a Java application and does not use environment variables directly. +Environment variables are used by the Tomcat startup scripts. The scripts use +the environment variables to prepare the command that starts Tomcat. + +The CATALINA_HOME (required) environment variable should be set to the location of the +root directory of the "binary" distribution of Tomcat. It defaults to /usr/share/tomcat/ + +The CATALINA_BASE (optional) environment variable specifies location of the root +directory of the "active configuration" of Tomcat. It defaults to /var/lib/tomcat/ + +(3) Set JAVA_HOME (required) + +Variable is used to specify location of a Java Runtime +Environment or of a Java Development Kit that is used to start Tomcat. + +/usr/libexec/tomcat/tomcat-locate-java.sh script is ran by default when starting the tomcat service +and tries to set JAVA_HOME, if empty, without any user interaction. + +(4) Other variables (optional) + +See the comments at the top of /usr/share/tomcat/bin/catalina.sh script for +the list and a description of each of them. + +One frequently used variable is CATALINA_OPTS. It allows specification of +additional options for the java command that starts Tomcat. + +See the Java documentation for the options that affect the Java Runtime +Environment. + +See the "System Properties" page in the Tomcat Configuration Reference for +the system properties that are specific to Tomcat. + +A similar variable is JAVA_OPTS. It is used less frequently. It allows +specification of options that are used both to start and to stop Tomcat as well +as for other commands. + +Note: Do not use JAVA_OPTS to specify memory limits. You do not need much +memory for a small process that is used to stop Tomcat. Those settings +belong to CATALINA_OPTS. + +Another frequently used variable is CATALINA_PID. It +specifies the location of the file where process id of the forked Tomcat +java process will be written. This setting is optional. It will activate +the following features: + + * better protection against duplicate start attempts and + * allows forceful termination of Tomcat process when it does not react to + the standard shutdown command. + +You can assign those variables in /etc/tomcat/tomcat.conf when running Tomcat as a service. + +(4) Start Up Tomcat As A Service + +(4.1) Tomcat can be started by executing: + + $systemctl start tomcat.service + +(4.2) After startup, the default web applications included with tomcat-webapps package will be + available by visiting: + + http://localhost:8080/ + +(4.3) Further information about configuring and running Tomcat can be found in + the documentation included in tomcat-docs-webapp package, as well as on the Tomcat website: + + https://tomcat.apache.org/ + +(5) Check Tomcat Service Status + +$systemctl status tomcat.service + +(6) Shut Down Tomcat Service + +$systemctl stop tomcat.service + +================ +Troubleshooting +================ + +There are only really 2 things likely to go wrong during the stand-alone +Tomcat install: + +(1) The most common hiccup is when another web server (or any process for that + matter) has laid claim to port 8080. This is the default HTTP port that + Tomcat attempts to bind to at startup. To change this, open the file: + + $CATALINA_HOME/conf/server.xml + + and search for '8080'. Change it to a port that isn't in use, and is + greater than 1024, as ports less than or equal to 1024 require superuser + access to bind under UNIX. + + Restart Tomcat and you're in business. Be sure that you replace the "8080" + in the URL you're using to access Tomcat. For example, if you change the + port to 1977, you would request the URL http://localhost:1977/ in your + browser. + +(2) The 'localhost' machine isn't found. This could happen if you're behind a + proxy. If that's the case, make sure the proxy configuration for your + browser knows that you shouldn't be going through the proxy to access the + "localhost". diff --git a/tomcat-10.1.conf b/tomcat-10.1.conf index a698426..fbb3951 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -3,10 +3,10 @@ # Include here and not in JAVA_OPTS all options, that should only be used by Tomcat itself. # Examples are heap size, GC logging, JMX ports etc. -#export CATALINA_OPTS="-Dcatalina.http.port=8082" +#export CATALINA_OPTS="-Xmx512m -Xms256m" # Java runtime options used when any command is executed. -#export JAVA_OPTS="-Xmx512m -Xms256m" +#export JAVA_OPTS="" # To enable remote debugging uncomment the following line. # You will then be able to use a Java debugger on port 8000. diff --git a/tomcat.spec b/tomcat.spec index f603e54..a50a7d6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -38,6 +38,7 @@ Source2: %{name}-%{major_version}.%{minor_version}.logrotate Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh +Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -166,6 +167,12 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices +sed -i -e "s/@VERSION@/%{version}/g" \ + -e "s/@VERSION_MAJOR_MINOR@/%{major_version}.%{minor_version}/g" \ + -e "s/@VERSION_MAJOR@/%{major_version}/g" \ + -e "s/@MIN_JAVA_VERSION@/%{min_java_version}/g" \ + -e "s/@JDT_VERSION@/x/g" RELEASE-NOTES + # Create a sysusers.d config file cat >tomcat.sysusers.conf < Date: Thu, 20 Feb 2025 18:54:37 +0200 Subject: [PATCH 297/354] Add Suggests: sections in tomcat package --- tomcat.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index a50a7d6..1bdc3c9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -68,9 +68,14 @@ BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd Requires: %{name}-common = %{epoch}:%{version}-%{release} -Recommends: tomcat-native >= %{native_version} Requires: systemd +Recommends: tomcat-native >= %{native_version} + +Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} +Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} +Suggests: %{name}-webapps = %{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. From 4cb746528937b2740d45c3484c3a18ad04c147e2 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 25 Feb 2025 16:49:55 +0200 Subject: [PATCH 298/354] Introduce tomcat-user-instance package --- tomcat-10.1-setenv.sh | 12 ++ tomcat-10.1-user-instance-create.asciidoc | 85 ++++++++++++ tomcat-10.1-user-instance-create.sh | 149 ++++++++++++++++++++++ tomcat.spec | 31 ++++- 4 files changed, 276 insertions(+), 1 deletion(-) create mode 100755 tomcat-10.1-setenv.sh create mode 100644 tomcat-10.1-user-instance-create.asciidoc create mode 100644 tomcat-10.1-user-instance-create.sh diff --git a/tomcat-10.1-setenv.sh b/tomcat-10.1-setenv.sh new file mode 100755 index 0000000..76bea76 --- /dev/null +++ b/tomcat-10.1-setenv.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# + +export CATALINA_HOME=/usr/share/tomcat + +# Try to find Java installation and set JAVA_HOME +/bin/sh /usr/libexec/tomcat/tomcat-locate-java.sh + +# Default Java options +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true" +fi diff --git a/tomcat-10.1-user-instance-create.asciidoc b/tomcat-10.1-user-instance-create.asciidoc new file mode 100644 index 0000000..6c02e94 --- /dev/null +++ b/tomcat-10.1-user-instance-create.asciidoc @@ -0,0 +1,85 @@ +tomcat-user-instance-create(1) +================================ +:doctype: manpage +:man source: TOMCAT +:man manual: Apache Tomcat + +NAME +---- +tomcat-user-instance-create - Creates a standalone Tomcat instance with a separate configuration + +SYNOPSIS +-------- +*tomcat-user-instance-create* [OPTIONS] DIRECTORYNAME + +DESCRIPTION +----------- +The `tomcat-user-instance-create` script creates a self-contained Tomcat instance in a specified directory. +This instance has its own configuration, libraries, and web applications, allowing multiple independent Tomcat instances to run on the same system. + +The script automatically sets up the required `CATALINA_BASE` structure, including: +- `bin/startup.sh` – Starts the Tomcat instance. +- `bin/shutdown.sh` – Stops the Tomcat instance. + +By using this script, users can configure and manage multiple Tomcat instances independently of the system-wide Tomcat installation. + +USAGE +----- +To create a new Tomcat instance, specify the target directory where the instance should be created. +This directory **must not already exist**, as the script will create it. + +If no additional options are provided, the instance will be created with **default** ports and settings. + +OPTIONS +------- + +*-p *:: +Set the TCP port for the default HTTP connector. The default is `8080`. + +*-c *:: +Set the TCP port for the Tomcat shutdown control mechanism. The default is `8005`. + +*-w *:: +Set the shutdown keyword. When sent to the control port, this triggers a graceful shutdown of the instance. The default keyword is `SHUTDOWN`. + +*-h, --help*:: +Display usage information and exit. + +EXAMPLES +-------- +Create a Tomcat instance in `~/mytomcat` using default ports: +---- +$ tomcat-user-instance-create ~/mytomcat +---- + +Create an instance with a custom HTTP and control port: +---- +$ tomcat-user-instance-create -p 9090 -c 9005 ~/mytomcat +---- + +Create an instance with a custom shutdown keyword: +---- +$ tomcat-user-instance-create -w "STOPNOW" ~/mytomcat +---- + +NOTES +----- +- Ensure that the selected HTTP and control ports are not already in use. +- Ports **below 1024** require root privileges. +- The created instance is independent of the system-wide Tomcat installation. + +FILES +----- +The script generates a directory structure similar to: +---- +DIRECTORYNAME/ +│── bin/ +│ ├── startup.sh +│ ├── shutdown.sh +│── conf/ +│── logs/ +│── webapps/ +│── work/ +│── temp/ +│── lib/ +---- diff --git a/tomcat-10.1-user-instance-create.sh b/tomcat-10.1-user-instance-create.sh new file mode 100644 index 0000000..4854928 --- /dev/null +++ b/tomcat-10.1-user-instance-create.sh @@ -0,0 +1,149 @@ +#!/bin/sh +# Script to create a CATALINA_BASE directory for your own tomcat + +PROG=$(basename "$0") +CATALINA_HOME="/usr/share/tomcat" +TARGET="" +HPORT=8080 +CPORT=8005 +CWORD="SHUTDOWN" +warned=0 +warnlowport=0 + +usage() { + echo "Usage: $PROG [options] " + echo " directoryname: name of the tomcat instance directory to create" + echo "Options:" + echo " -h, --help Display this help message" + echo " -p HTTP port to be used by Tomcat (default is $HPORT)" + echo " -c Server shutdown control port (default is $CPORT)" + echo " -w Word to send to trigger shutdown (default is $CWORD)" +} + +checkport() { + type=$1 + port=$2 + # Fail if port is non-numeric + case "$port" in + ''|*[!0-9]*) + echo "Error: ${type} port '${port}' is not a valid TCP port number." + exit 1 + ;; + esac + + num=$((port + 1)) 2>/dev/null || { + echo "Error: ${type} port '${port}' is not a valid TCP port number." + exit 1 + } + + if [ "$num" -lt 2 ] || [ "$num" -gt 65536 ]; then + echo "Error: ${type} port '${port}' is not a valid TCP port number or is above TCP port numbers (> 65535)." + exit 1 + fi + + # Warn if port is below 1024 (once) + if [ ${warnlowport} -eq 0 ]; then + if [ "${port}" -lt 1024 ]; then + echo "Warning: ports below 1024 are reserved to the super-user." + warnlowport=1 + warned=1 + fi + fi + + # Warn if port appears to be in use + if ss -tln | grep -q ":${port} "; then + echo "Warning: ${type} port ${port} appears to be in use." + warned=1 + fi +} + +if [ "$#" -lt 1 ]; then + usage + exit 1 +fi +if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then + usage + exit 0 +fi + +while getopts ":p:c:w:h" options; do + case $options in + p ) HPORT=$OPTARG ;; + c ) CPORT=$OPTARG ;; + w ) CWORD=$OPTARG ;; + h ) usage;; + \? ) echo "Error: Unknown parameter '-$OPTARG'." + exit 1;; + esac +done + +shift $((OPTIND - 1)) +TARGET=$1 +shift +echo "You are about to create a Tomcat instance in directory '$TARGET'" + +# Fail if no target specified +if [ -z "${TARGET}" ]; then + echo "Error: No target directory specified (use -d)." + exit 1 +fi + +# Fail if ports are the same +if [ "${HPORT}" = "${CPORT}" ]; then + echo "Error: HTTP port and control port must be different." + exit 1 +fi + +# Fail if target directory already exists +if [ -d "${TARGET}" ]; then + echo "Error: Target directory already exists." + exit 1 +fi + +# Check ports +checkport HTTP "${HPORT}" +checkport Control "${CPORT}" + +# Ask for confirmation if warnings were printed out +if [ ${warned} -eq 1 ]; then + echo "Press to continue, or type 'no' to abort." + read -r answer + case "$answer" in + [nN][oO]|[nN]) + echo "Aborting." + exit 1 + ;; + esac +fi + +mkdir -p "${TARGET}" + +FULLTARGET=$(cd "${TARGET}" > /dev/null && pwd) + +mkdir "${TARGET}/conf" +mkdir "${TARGET}/logs" +mkdir "${TARGET}/webapps" +mkdir "${TARGET}/work" +mkdir "${TARGET}/temp" +cp -r "${CATALINA_HOME}/user-instance/*" "${TARGET}" + +sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml" + +cat > "${TARGET}/bin/startup.sh" << EOF +#!/bin/sh +export CATALINA_BASE="${FULLTARGET}" +"${CATALINA_HOME}"/bin/startup.sh +echo "Tomcat started" +EOF + +cat > "${TARGET}/bin/shutdown.sh" << EOF +#!/bin/sh +export CATALINA_BASE="${FULLTARGET}" +"${CATALINA_HOME}"/bin/shutdown.sh +echo "Tomcat stopped" +EOF + +chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh" +echo "* New Tomcat instance created in ${TARGET}" +echo "* You might want to edit default configuration in ${TARGET}/conf" +echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance" diff --git a/tomcat.spec b/tomcat.spec index 1bdc3c9..560c452 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -22,6 +22,7 @@ %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} %global workdir %{basedir}/work +%global userinstancedir %{homedir}/user-instance Name: tomcat Epoch: 1 @@ -39,6 +40,9 @@ Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt +Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh +Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh +Source9: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -66,6 +70,7 @@ BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd +BuildRequires: rubygem-asciidoctor Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: systemd @@ -75,6 +80,7 @@ Recommends: tomcat-native >= %{native_version} Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} +Suggests: %{name}-user-instance = %{epoch}:%{version}-%{release} %description Tomcat is the servlet container that is used in the official Reference @@ -155,6 +161,17 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description webapps The ROOT web application for Apache Tomcat. +%package user-instance +Summary: Apache Tomcat - Servlet and JSP engine -- tools to create user instances +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Suggests: %{name} = %{epoch}:%{version}-%{release} +Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} +Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} +Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} + +%description user-instance +Apache Tomcat - Servlet and JSP engine -- tools to create user instances + %prep %setup -q -n %{packdname} # remove pre-built binaries and windows files @@ -215,7 +232,6 @@ touch HACK %install # build initial path structure -# %{__install} -d ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} @@ -239,6 +255,12 @@ touch HACK %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf +%{__install} -d ${RPM_BUILD_ROOT}%{userinstancedir}/conf +%{__install} -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh +%{__install} -D %{SOURCE8} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh + +asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE9} + for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm jar tf ${jar} | grep -E -q '.*\.class' || continue @@ -297,6 +319,7 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: pushd output/build %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} + %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd @@ -384,5 +407,11 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT +%files user-instance +%license LICENSE +%{userinstancedir} +%{_bindir}/tomcat-user-instance-create.sh +%{_mandir}/man1/tomcat-user-instance-create.1* + %changelog %autochangelog From fd0d6ea01f1162ad19304dd7296f2ad8c19bf8fa Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 12:48:42 +0200 Subject: [PATCH 299/354] Remove redundant defattr from webapps files section --- tomcat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 560c452..a1f7da4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -404,7 +404,6 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files webapps %license LICENSE -%defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT %files user-instance From c1868d66549c281c36dc3006ec37190871ceb8e5 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 14:26:18 +0200 Subject: [PATCH 300/354] Improve package descriptions and summaries --- tomcat.spec | 142 ++++++++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 66 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index a1f7da4..a1b5416 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -28,7 +28,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} Release: %autorelease -Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API +Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -83,28 +83,75 @@ Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} Suggests: %{name}-user-instance = %{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. +Apache Tomcat is an open-source implementation of the Java Servlet, JavaServer Pages (JSP), and WebSocket technologies. +It provides a pure Java HTTP web server environment for running Java applications. +This package includes only the startup scripts for managing a system-wide Tomcat daemon. +It does not include documentation or web applications. + * To install the default web applications, use the tomcat-webapps package. + * To access online documentation, install tomcat-docs-webapps package. + * To create user instances without running Tomcat as a system service, use tomcat-user-instance package instead. -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 user-instance +Summary: Apache Tomcat - Tools for creating user-managed instances +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Suggests: %{name} = %{epoch}:%{version}-%{release} +Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} +Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} +Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} + +%description user-instance +This package provides the tools necessary to create user-managed Tomcat instances, +allowing users to run Tomcat independently of the system-wide service. +A user instance includes its own configuration, libraries, and web applications, +which can be started and stopped using scripts inside the instance directory. + +%package common +Summary: Apache Tomcat - Common files for Tomcat packages +Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description common +This package contains common files required by both tomcat and tomcat-user-instance packages, including essential Tomcat +scripts and libraries. Installing this package alone does not provide a functional Tomcat installation, +but is required as a dependency for other Tomcat-related packages. + +%package lib +Summary: Apache Tomcat - Core libraries for embedding Tomcat +Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Requires: ecj >= 4.20 +Recommends: tomcat-jakartaee-migration + +%description lib +This package contains the core libraries of Apache Tomcat, which allow other Java applications to embed Tomcat +as a lightweight servlet container. It is primarily intended for use by developers and applications that need Tomcat +as an embedded runtime. %package admin-webapps -Summary: The host-manager and manager web applications for Apache Tomcat +Summary: Apache Tomcat - Administrative web applications Requires: %{name} = %{epoch}:%{version}-%{release} %description admin-webapps -The host-manager and manager web applications for Apache Tomcat. +This package provides the Tomcat Web Application Manager and Virtual Host Manager, which allow administrators to deploy, +manage, and configure web applications through a web interface. +These tools simplify application lifecycle management without requiring direct filesystem access. %package docs-webapp -Summary: The docs web application for Apache Tomcat +Summary: Apache Tomcat - Online documentation web application Requires: %{name} = %{epoch}:%{version}-%{release} %description docs-webapp -The docs web application for Apache Tomcat. +This package provides the Tomcat documentation web application, accessible via the Tomcat server. +It includes API references, configuration guidelines, and development documentation. + +%package webapps +Summary: Apache Tomcat - Default ROOT web application +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description webapps +This package includes the default ROOT web applications bundled with Apache Tomcat, +which serves as the default homepage when accessing Tomcat in a browser. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes @@ -117,25 +164,6 @@ Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. -%package common -Summary: Apache Tomcat - Servlet and JSP engine -- common files -Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) -Requires: %{name}-lib = %{epoch}:%{version}-%{release} - -%description common -Apache Tomcat - Servlet and JSP engine -- common files - -%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 >= 4.20 -Recommends: tomcat-jakartaee-migration - -%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} @@ -154,24 +182,6 @@ Conflicts: tomcat-el-3.0-api %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. - -%package user-instance -Summary: Apache Tomcat - Servlet and JSP engine -- tools to create user instances -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Suggests: %{name} = %{epoch}:%{version}-%{release} -Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} -Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} -Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} - -%description user-instance -Apache Tomcat - Servlet and JSP engine -- tools to create user instances - %prep %setup -q -n %{packdname} # remove pre-built binaries and windows files @@ -371,14 +381,11 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %attr(2775,root,tomcat) %dir %{confdir}/Catalina %attr(2775,root,tomcat) %dir %{confdir}/Catalina/localhost -%files admin-webapps +%files user-instance %license LICENSE -%{appdir}/host-manager -%{appdir}/manager - -%files docs-webapp -%license LICENSE -%{appdir}/docs +%{userinstancedir} +%{_bindir}/tomcat-user-instance-create.sh +%{_mandir}/man1/tomcat-user-instance-create.1* %files common -f .mfiles-tomcat-common %license LICENSE @@ -393,6 +400,19 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{libdir}/ecj-x.jar %exclude %{libdir}/tomcat-jni.pom +%files admin-webapps +%license LICENSE +%{appdir}/host-manager +%{appdir}/manager + +%files docs-webapp +%license LICENSE +%{appdir}/docs + +%files webapps +%license LICENSE +%{appdir}/ROOT + %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %license LICENSE @@ -402,15 +422,5 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files el-%{elspec}-api -f .mfiles-tomcat-el-api %license LICENSE -%files webapps -%license LICENSE -%{appdir}/ROOT - -%files user-instance -%license LICENSE -%{userinstancedir} -%{_bindir}/tomcat-user-instance-create.sh -%{_mandir}/man1/tomcat-user-instance-create.1* - %changelog %autochangelog From 48b049b11647bccf850d5d7d6f5355fe75222faf Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 17:41:06 +0200 Subject: [PATCH 301/354] Remove logrotate file since Tomcat rotates its own logs --- tomcat-10.1.logrotate | 11 ----------- tomcat.spec | 4 ---- 2 files changed, 15 deletions(-) delete mode 100644 tomcat-10.1.logrotate diff --git a/tomcat-10.1.logrotate b/tomcat-10.1.logrotate deleted file mode 100644 index 082092a..0000000 --- a/tomcat-10.1.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -# This is an example config only and is disabled by default -# If you wish to use it, you'll need to update /etc/tomcat/logging.properties -# to prevent catalina*.log from being rotated by Tomcat -@@@TCLOG@@@/catalina*.log { - copytruncate - weekly - rotate 52 - compress - missingok - create 0644 tomcat tomcat -} diff --git a/tomcat.spec b/tomcat.spec index a1b5416..fe6de25 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -35,7 +35,6 @@ License: Apache-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 -Source2: %{name}-%{major_version}.%{minor_version}.logrotate Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh @@ -242,7 +241,6 @@ touch HACK %install # build initial path structure -%{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir} @@ -257,7 +255,6 @@ touch HACK %{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} %{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE2} > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled %{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh %{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh @@ -356,7 +353,6 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{homedir}/doc/RUNNING.txt %{_unitdir}/%{name}.service %{_libexecdir}/%{name}/tomcat-start.sh -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf %{baseconfdir} %{baselogdir} From 74d5d938592bfab95c3a362fae14f0185e8b2435 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 17:42:32 +0200 Subject: [PATCH 302/354] Rename service start script more properly --- tomcat-10.1-start.sh => tomcat-10.1-run.sh | 0 tomcat.spec | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename tomcat-10.1-start.sh => tomcat-10.1-run.sh (100%) diff --git a/tomcat-10.1-start.sh b/tomcat-10.1-run.sh similarity index 100% rename from tomcat-10.1-start.sh rename to tomcat-10.1-run.sh diff --git a/tomcat.spec b/tomcat.spec index fe6de25..56613ff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -37,7 +37,7 @@ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{vers Source1: %{name}-%{major_version}.%{minor_version}.conf Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh -Source5: %{name}-%{major_version}.%{minor_version}-start.sh +Source5: %{name}-%{major_version}.%{minor_version}-run.sh Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh @@ -257,7 +257,7 @@ touch HACK %{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh -%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh +%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh %{__install} -D %{SOURCE6} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf @@ -352,7 +352,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %license LICENSE %{homedir}/doc/RUNNING.txt %{_unitdir}/%{name}.service -%{_libexecdir}/%{name}/tomcat-start.sh +%{_libexecdir}/%{name}/tomcat-run.sh %{_sysusersdir}/tomcat.conf %{baseconfdir} %{baselogdir} From c86e1e94da32c7cbe05e5e03ebe0c939a0bae741 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 17:44:14 +0200 Subject: [PATCH 303/354] Remove unused parameter --- tomcat-10.1.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tomcat-10.1.conf b/tomcat-10.1.conf index fbb3951..dc9fec5 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -18,7 +18,4 @@ #export JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" # Enable the Java security manager? (true/false, default: false) -#export SECURITY_MANAGER=true - -# Whether to compress logfiles older than today's -#export LOGFILE_COMPRESS=1 \ No newline at end of file +#export SECURITY_MANAGER=true \ No newline at end of file From 4c675c785fc5b871b842bf76ded75a82da30efe3 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Feb 2025 18:13:31 +0200 Subject: [PATCH 304/354] Fix tomcat-juli.jar not placed in tomcat-common package --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index 56613ff..c62b7c4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -314,6 +314,7 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom %mvn_package ":tomcat-jsp-api" tomcat-jsp-api %mvn_package ":tomcat-servlet-api" tomcat-servlet-api %mvn_package ":tomcat-bootstrap" tomcat-common +%mvn_package ":tomcat-juli" tomcat-common %mvn_install From d584406620b7ae49f0457ee6a06758b6bb7c0691 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Mar 2025 14:41:10 +0200 Subject: [PATCH 305/354] Update catalina-policy.patch --- tomcat-10.1-catalina-policy.patch | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tomcat-10.1-catalina-policy.patch b/tomcat-10.1-catalina-policy.patch index 3254968..5c01b4a 100644 --- a/tomcat-10.1-catalina-policy.patch +++ b/tomcat-10.1-catalina-policy.patch @@ -1,16 +1,23 @@ ---- conf/catalina.policy.orig 2024-05-22 16:12:23.809886452 +0300 -+++ conf/catalina.policy 2024-05-22 16:14:38.913939654 +0300 -@@ -55,6 +55,14 @@ +--- conf/catalina.policy.orig 2025-03-04 21:02:32.000000000 +0200 ++++ conf/catalina.policy 2025-03-07 14:23:42.341169484 +0200 +@@ -55,6 +55,20 @@ grant codeBase "jrt:/jdk.compiler" { permission java.security.AllPermission; }; - -+// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= + ++// ========== FEDORA SPECIFIC CODE PERMISSIONS ======================================= + -+// Allowing everything in /usr/share/java allows too many unknowns to be permitted -+// Specifying the individual jars that tomcat needs to function with the security manager -+// is the safest way forward. +grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; - ++ ++grant codeBase "file:/usr/share/tomcat-jakartaee-migration/jakartaee-migration.jar" { ++ permission java.security.AllPermission; ++}; ++ ++grant codeBase "file:/usr/lib/java/tomcat/tomcat-jni.jar" { ++ permission java.security.AllPermission; ++}; ++ + // ========== CATALINA CODE PERMISSIONS ======================================= + From 740d603f373bdd64cc4d117eb731d2e432019434 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Mar 2025 14:42:06 +0200 Subject: [PATCH 306/354] Reorganize installs and preserve timestamps as suggested by Fedora Packaging guidelines --- tomcat.spec | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index c62b7c4..b43b30a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -34,14 +34,16 @@ Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment License: Apache-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}.service -Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh -Source5: %{name}-%{major_version}.%{minor_version}-run.sh -Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt -Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh -Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh -Source9: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc +# Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +# Source2: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source3: %{name}-%{major_version}.%{minor_version}.conf +Source4: %{name}-%{major_version}.%{minor_version}.service +Source5: %{name}-%{major_version}.%{minor_version}-locate-java.sh +Source6: %{name}-%{major_version}.%{minor_version}-run.sh +Source7: %{name}-%{major_version}.%{minor_version}-RUNNING.txt +Source8: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh +Source9: %{name}-%{major_version}.%{minor_version}-setenv.sh +Source10: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -243,30 +245,26 @@ touch HACK # build initial path structure %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} -%{__install} -d ${RPM_BUILD_ROOT}%{confdir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d ${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 ${RPM_BUILD_ROOT}%{libdir} +# %{__install} -d ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} -%{__install} -d ${RPM_BUILD_ROOT}%{homedir} %{__install} -d ${RPM_BUILD_ROOT}%{cachedir} -%{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} -%{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} -%{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf -%{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh -%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh -%{__install} -D %{SOURCE6} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt +%{__install} -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__install} -D -p %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__install} -D -p %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh +%{__install} -D -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh +%{__install} -D -p %{SOURCE7} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf %{__install} -d ${RPM_BUILD_ROOT}%{userinstancedir}/conf -%{__install} -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh -%{__install} -D %{SOURCE8} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh +%{__install} -D -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh +%{__install} -D -p %{SOURCE9} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh -asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE9} +asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE10} for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm @@ -325,10 +323,10 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build - %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} - %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} - %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf - %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} + %{__cp} -ap bin/* ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} + %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf + %{__cp} -ap webapps/* ${RPM_BUILD_ROOT}%{appdir} popd ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar From 03b7b8f8e69991d5b6bc8b728a56722bbe7d5f30 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Mar 2025 16:25:35 +0200 Subject: [PATCH 307/354] Fix man page rendering --- tomcat-10.1-user-instance-create.asciidoc | 57 +++++++++-------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/tomcat-10.1-user-instance-create.asciidoc b/tomcat-10.1-user-instance-create.asciidoc index 6c02e94..c474e16 100644 --- a/tomcat-10.1-user-instance-create.asciidoc +++ b/tomcat-10.1-user-instance-create.asciidoc @@ -1,19 +1,16 @@ -tomcat-user-instance-create(1) -================================ += tomcat-user-instance-create(1) +DIMITRIS SOUMIS :doctype: manpage :man source: TOMCAT :man manual: Apache Tomcat -NAME ----- +== NAME tomcat-user-instance-create - Creates a standalone Tomcat instance with a separate configuration SYNOPSIS --------- *tomcat-user-instance-create* [OPTIONS] DIRECTORYNAME -DESCRIPTION ------------ +== DESCRIPTION The `tomcat-user-instance-create` script creates a self-contained Tomcat instance in a specified directory. This instance has its own configuration, libraries, and web applications, allowing multiple independent Tomcat instances to run on the same system. @@ -23,16 +20,13 @@ The script automatically sets up the required `CATALINA_BASE` structure, includi By using this script, users can configure and manage multiple Tomcat instances independently of the system-wide Tomcat installation. -USAGE ------ +== USAGE To create a new Tomcat instance, specify the target directory where the instance should be created. This directory **must not already exist**, as the script will create it. If no additional options are provided, the instance will be created with **default** ports and settings. -OPTIONS -------- - +== OPTIONS *-p *:: Set the TCP port for the default HTTP connector. The default is `8080`. @@ -45,41 +39,36 @@ Set the shutdown keyword. When sent to the control port, this triggers a gracefu *-h, --help*:: Display usage information and exit. -EXAMPLES --------- +== EXAMPLES Create a Tomcat instance in `~/mytomcat` using default ports: ----- + $ tomcat-user-instance-create ~/mytomcat ----- Create an instance with a custom HTTP and control port: ----- + $ tomcat-user-instance-create -p 9090 -c 9005 ~/mytomcat ----- Create an instance with a custom shutdown keyword: ----- -$ tomcat-user-instance-create -w "STOPNOW" ~/mytomcat ----- -NOTES ------ +$ tomcat-user-instance-create -w "STOPNOW" ~/mytomcat + +== NOTES - Ensure that the selected HTTP and control ports are not already in use. - Ports **below 1024** require root privileges. - The created instance is independent of the system-wide Tomcat installation. -FILES ------ +== FILES The script generates a directory structure similar to: + ---- DIRECTORYNAME/ -│── bin/ -│ ├── startup.sh -│ ├── shutdown.sh -│── conf/ -│── logs/ -│── webapps/ -│── work/ -│── temp/ -│── lib/ +|-- bin/ +| |-- startup.sh +| |-- shutdown.sh +|-- conf/ +|-- logs/ +|-- webapps/ +|-- work/ +|-- temp/ +|-- lib/ ---- From 07f14cc8f87a7cca1ccbf054cda88a4dc1f5a7c6 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Mar 2025 16:31:23 +0200 Subject: [PATCH 308/354] Update to 10.1.36 and verify signatures as suggested in the Fedora Packaging Guidelines https://docs.fedoraproject.org/en-US/packaging-guidelines/#_verifying_signatures --- .gitignore | 2 +- KEYS | 562 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 3 +- tomcat.spec | 10 +- 4 files changed, 572 insertions(+), 5 deletions(-) create mode 100644 KEYS diff --git a/.gitignore b/.gitignore index 471c3e4..312c881 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -apache-tomcat-*-src.tar.gz +apache-tomcat-*-src.tar.gz* results_tomcat tomcat*.src.rpm apache-tomcat-*-src/ diff --git a/KEYS b/KEYS new file mode 100644 index 0000000..6b7231f --- /dev/null +++ b/KEYS @@ -0,0 +1,562 @@ +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 && pgpk -xa ) >> this file. + or + (gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: GPGTools - http://gpgtools.org + +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 +c3EtcnwlXI07qk8nmCl1XudlS5KHeJ5axWLEDNJCvEuJGy4moaFllwmTUtxDzRK/ +zG6QSJEPfH8VZiEl6HBpgzlBB5aToxc+Wy7UpGzwaNrA6KvwSaB+jSxrZYtHbwBq +2U3ttmamynBF1izPuOeJAn4EEAECAGgFAksM3mcgHFNhbmRlciBUZW1tZSA8c2Fu +ZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUub3Jn +Ph0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUuY29tPgAKCRCbuGOw9Ru4igbUD/9+ ++F4uqkO+F6g1QNiyFM47K1NaFLga/lNp72mOOIlZMORXpBJGeL9DhbDvN5KIQqR4 +I5wCONGtzeU8P7M+uLapFZmofROABlACUeVhOPx8fOCeNz9xU4f33dKJJnAsIfis +SMMyJR9Xz/IbNWvM6Kb7hU+L86G2cZPD8uvZ7oHyY4wZWtjTHM0ne/usodJffxIj +oQFhn0vAC8hBNWStI8UUih+n+iqvvXA2cB9v3Ni3VjQOGLKSZ5Ke2jpKdYTl5zST +frHfjgjGvIdkWz0hbVMzL+urU9oIChBK6Nr3DxY/XvO8PmFGh7V+M9C/gahLCrNz +fD3vKGi7OYkp6dODPnREpOSZ7elGO5mGQnSosqzrLb7kw/vEobBbxsYDwxxl+ONZ +8yxUaBpvRIrwqNEwb1YxlMCLnpRs7TJxxitq+zF7F0MxB5sqdLHSNqxcfbxpTflz +Tn/H9h34aF7f4Qkn276XKIomhge4su7jxHNH/G9gTk6oicdalBFRMFwBRpaOivno +FmSGa1Yt7C1mBBQkRXjw52ZRx8MHKnccNNgpk5Xc7+VT9nqmoulq1JfzLsrtu4D1 +TaleWOVN4X4FYk3S2VWxLV5dhmuCy7hP0ZsXOTBjLXC5wMxJcp7I3IlIx39a6U7O +vhWbguPxyXR3AjBUsMRfO0pGZKXxDI3N+yHOWAtDcokCkwQQAQIAfQUCTNK0KDUc +SmltIEphZ2llbHNraSAoUmVsZWFzZSBTaWduaW5nIEtleSkgPGppbUBhcGFjaGUu +b3JnPiAcSmltIEphZ2llbHNraSA8amltQGphZ3VORVQuY29tPh8cSmltIEphZ2ll +bHNraSA8amltQGppbWphZy5jb20+AAoJEDTqduZ5FIWo/wEP/immECQXMIMQ9zj7 +4RU2R6YV7Slzc3YATfjwOgOwzQ3qF+UTSHui7eiYoHOwRK0OTKW6fe7bh9/XeWLB +sglUl+RNuvCNHAQNg9/p7x9mJL05e3OnGpVLVnq/yQezCWo1GWIPxodwmoyI2C3S +iUapfKN1q0Ml6nwZOyHsgNCFYDVhmtEnIcK7/PXLpeYTpTBuXETZZQY++XyZDiVI +le2W3uxrY0k8zVPvGSXGIh2iHtAuCrJoNKY+webEe5QVNoAYnNyu5de+50gpQOr+ +wYsvuf7S1MAPAX2L48U/JvpBfDikZR8qujvCDAAe0bnom/Ov/eWtnONi4hpsD4T3 +kcElxWOph3mEm1YUksGmoWE0FvE6o7r04XF+VrIA/YwcgC5wGgGmYFU4DR384hMZ +1EMAsd8cKdYBja/PA4BTcA6Vc0uJVFaB8o117m7r7sHKRsD7CHbbKcK8ZtRNDQa3 +SzTMqLhsRDRl5wp9Bwq6l++BKPpvEnpbs8SdW+TxrxpM/0aIhQ6ZS5RKJvhZK3Ap +3cgYBVW23CwPtVc+40/t8XqBRRlzbLdfWhEC+FU4f9RHS+DQRFSxl/xXeLtDBH75 +1WbhkRIRTktQxapEDuRFfd02Oeo356/r0TYUQHL4bwYEbTBm+HO1KJn64BCaUMOU +pW881K8SHQaHMr1iiQUpvMkTcofRiQKpBBABAgCTBQJM0uOxIBxTYW5kZXIgVGVt +bWUgPHNhbmRlckB0ZW1tZS5uZXQ+IhxTYW5kZXIgVGVtbWUgPHNjdGVtbWVAYXBh +Y2hlLm9yZz4dHFNhbmRlciBUZW1tZSA8c2FuZGVyQG1lLmNvbT4qHFNhbmRlciBU +ZW1tZSA8c2N0ZW1tZUBrZXlzaW50aGVjbG91ZC5jb20+AAoJEJu4Y7D1G7iKG0YP +/3AweZFnchITlhDdEkozl8M89VZGTBqfU6Rg7mNxL/HDnJRtBBGXmSQ5NLygX+kS +PKci3KRbjbeVEmEcWs/ZfzxN4gR+6y8ohUOaA0UDrZYctYkzG1d7HbkcM1lmvtde +Gelj1j/+eu4LRu5h9oczkqRnWV5xnqz7xsEH9Rrcgm39RpNzFf43Joo25iqdVGk4 +yBVjoHQsnD1qZwdZQ0EHxYozNkGfa6j7VXAzCYVstfRMPGKrYH/xRg2jNy750z/p +apgT3GXbpvcB9Z3gj2LRn+FKLxoH2WLf2DabdzyZz9KXfnG4ZeOd2BrFXexKT2MQ +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 +yZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ== +=4AB7 +-----END PGP PUBLIC KEY BLOCK----- +pub rsa4096 2012-05-08 [SCEA] + 5C3C 5F3E 314C 8662 92F3 59A8 F3AD 5C94 A67F 707E +uid [ultimate] Christopher Schultz +uid [ultimate] Christopher Schultz +uid [ultimate] Christopher Schultz +uid [ultimate] Christopher Schultz +sub rsa4096 2012-05-08 [SEA] + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +NwUqv9cUGhf+Di0nAX1diWxfd7DdEi8= +=6zfV +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 1bac248..df42da2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (apache-tomcat-10.1.34-src.tar.gz) = 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca +SHA512 (apache-tomcat-10.1.36-src.tar.gz) = 18123ea1639733f14cf0b1ca0df8255b8d69abc7dd19cad10ad51f4f1f1c16f8f08fba668101169df68d23400f75f3aacab9040edba9330b78939b7c6399ae10 +SHA512 (apache-tomcat-10.1.36-src.tar.gz.asc) = 22153e1d7797cfb519f7df0968a60f2b1a39de156cd53011fba32c4e51a61e7f8fe4a4b75b673bd5611485f4ef1ca50e43f08d7d09925731253dc114ba0221e1 diff --git a/tomcat.spec b/tomcat.spec index b43b30a..792eb92 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ %global jspspec 3.1 %global major_version 10 %global minor_version 1 -%global micro_version 34 +%global micro_version 36 %global packdname apache-tomcat-%{version}-src %global servletspec 6.0 %global elspec 5.0 @@ -34,8 +34,9 @@ Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment License: Apache-2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -# Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -# Source2: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc +# https://www.apache.org/dist/tomcat/tomcat-%{major_version}/KEYS +Source2: KEYS Source3: %{name}-%{major_version}.%{minor_version}.conf Source4: %{name}-%{major_version}.%{minor_version}.service Source5: %{name}-%{major_version}.%{minor_version}-locate-java.sh @@ -63,6 +64,7 @@ BuildArch: noarch # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Java/#_architecture_support ExclusiveArch: %{java_arches} +BuildRequires: gnupg2 BuildRequires: ant BuildRequires: ecj BuildRequires: findutils @@ -184,6 +186,8 @@ Conflicts: tomcat-el-3.0-api Apache Tomcat EL API Implementation Classes. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' + %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 \ From 1a5e851e22de0c608cf33d49391f76a21297df84 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Mar 2025 17:11:40 +0200 Subject: [PATCH 309/354] Add symlinks of tomcat-bootstrap.jar and tomcat-juli.jar in libdir --- tomcat.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 792eb92..fc1a128 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -252,7 +252,6 @@ touch HACK %{__install} -d ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d ${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 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} %{__install} -d ${RPM_BUILD_ROOT}%{cachedir} @@ -305,8 +304,8 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap -%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli +%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap %{libdir}/tomcat-bootstrap +%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli %{libdir}/tomcat-juli # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom From 524080c49f7f59c25ee80580deafa3dadc9b6858 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Mar 2025 15:53:05 +0200 Subject: [PATCH 310/354] Fix script calling from service file --- tomcat-10.1.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat-10.1.service b/tomcat-10.1.service index 55639b2..d510faf 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -15,7 +15,7 @@ Environment="JAVA_OPTS=-Djava.awt.headless=true" # Lifecycle Type=simple -ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-start.sh +ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-run.sh SuccessExitStatus=143 Restart=on-abort From 9e1550b6088a9f5ae25174fc4158ab937f1812db Mon Sep 17 00:00:00 2001 From: dsoumis Date: Wed, 26 Mar 2025 15:54:17 +0200 Subject: [PATCH 311/354] - Enhancing comments - Some mvn_file fixes - Remove daemon.sh as commons-daemon is not packaged --- tomcat.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index fc1a128..d747252 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -35,7 +35,7 @@ License: Apache-2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc -# https://www.apache.org/dist/tomcat/tomcat-%{major_version}/KEYS +# https://www.apache.org/dist/tomcat/tomcat-10/KEYS Source2: KEYS Source3: %{name}-%{major_version}.%{minor_version}.conf Source4: %{name}-%{major_version}.%{minor_version}.service @@ -270,7 +270,7 @@ touch HACK asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE10} for jar in output/build/lib/*.jar; do - # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm + # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm since it requires to be built with Java>=23 jar tf ${jar} | grep -E -q '.*\.class' || continue jarname=$(basename $jar .jar) @@ -304,8 +304,8 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap %{libdir}/tomcat-bootstrap -%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli %{libdir}/tomcat-juli +%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap +%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom @@ -326,6 +326,7 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build + rm -f bin/daemon.sh %{__cp} -ap bin/* ${RPM_BUILD_ROOT}%{bindir} %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf From 5c8a69decae8a9f5af65d3bfaf68e9d38c5afe20 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 7 Apr 2025 16:50:23 +0300 Subject: [PATCH 312/354] - Fixes in tomcat-10.1-user-instance-create.sh - Add required ReadWritePaths in service file. - Disable shutdown port when tomcat runs as a service. - Add webapps-javaee directory - Remove .sh suffix from binary executable - Link require libraries for migration tool to work as expected. --- tomcat-10.1-user-instance-create.sh | 3 +-- tomcat-10.1.service | 2 ++ tomcat.spec | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tomcat-10.1-user-instance-create.sh b/tomcat-10.1-user-instance-create.sh index 4854928..12aa1d8 100644 --- a/tomcat-10.1-user-instance-create.sh +++ b/tomcat-10.1-user-instance-create.sh @@ -120,12 +120,11 @@ mkdir -p "${TARGET}" FULLTARGET=$(cd "${TARGET}" > /dev/null && pwd) -mkdir "${TARGET}/conf" mkdir "${TARGET}/logs" mkdir "${TARGET}/webapps" mkdir "${TARGET}/work" mkdir "${TARGET}/temp" -cp -r "${CATALINA_HOME}/user-instance/*" "${TARGET}" +cp -r ${CATALINA_HOME}/user-instance/* "${TARGET}" sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml" diff --git a/tomcat-10.1.service b/tomcat-10.1.service index d510faf..16727db 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -33,7 +33,9 @@ CacheDirectoryMode=750 ProtectSystem=strict ReadWritePaths=/etc/tomcat/Catalina/ ReadWritePaths=/var/lib/tomcat/webapps/ +ReadWritePaths=/var/lib/tomcat/webapps-javaee/ ReadWritePaths=/var/log/tomcat/ +ReadWritePaths=/tmp [Install] WantedBy=multi-user.target diff --git a/tomcat.spec b/tomcat.spec index d747252..c4e6f7d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -73,7 +73,7 @@ BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd -BuildRequires: rubygem-asciidoctor +BuildRequires: rubygem-asciidoctor Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: systemd @@ -215,6 +215,8 @@ cat >tomcat.sysusers.conf < Date: Tue, 8 Apr 2025 13:32:29 +0300 Subject: [PATCH 313/354] Define the provision method for tests --- plans/smoke.fmf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 039f41a..db364b6 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -3,3 +3,6 @@ discover: url: https://src.fedoraproject.org/tests/tomcat execute: how: tmt +provision: + how: virtual + image: fedora:rawhide From afc96310f4e02deb7663335e772e64aea563ef5e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:37:55 +0300 Subject: [PATCH 314/354] Fix gating rules --- gating.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gating.yaml b/gating.yaml index e49f5a7..19d2681 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,12 +1,16 @@ --- !Policy product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable + - fedora-rawhide +decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file From 153431058bcb850f6b15790aa2bdf675cc4372d9 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:46:54 +0300 Subject: [PATCH 315/354] Fix gating rules --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 19d2681..da1c0b0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,6 +5,7 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule { test_case_name: fedora-ci.koji-build./plans/smoke.functional } --- !Policy product_versions: - fedora-* @@ -12,5 +13,4 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} \ No newline at end of file From 5a663f3961cedb2db7e53dd78a716072909b072b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:25:36 +0000 Subject: [PATCH 316/354] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5b42bbd1ae24e9a6de149d12e7428c913f6550dd Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 317/354] Revert "Fix gating rules" This reverts commit 153431058bcb850f6b15790aa2bdf675cc4372d9. --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index da1c0b0..19d2681 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule { test_case_name: fedora-ci.koji-build./plans/smoke.functional } --- !Policy product_versions: - fedora-* @@ -13,4 +12,5 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file From 0d75b57e96da7e74fd6097aecde7436907d3d8c4 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 318/354] Revert "Fix gating rules" This reverts commit afc96310f4e02deb7663335e772e64aea563ef5e. --- gating.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gating.yaml b/gating.yaml index 19d2681..e49f5a7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,16 +1,12 @@ --- !Policy -product_versions: - - fedora-rawhide -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} ---- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} From f771c96d92fb9911bff4f6b33c2288b55b6536a9 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 319/354] Revert "Define the provision method for tests" This reverts commit eca613a2ab4f3a2ad23ab89e4bb61cc0f11b0998. --- plans/smoke.fmf | 3 --- 1 file changed, 3 deletions(-) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index db364b6..039f41a 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -3,6 +3,3 @@ discover: url: https://src.fedoraproject.org/tests/tomcat execute: how: tmt -provision: - how: virtual - image: fedora:rawhide From 527e2158f3822e8f06485d65db3dad397a34d2bc Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 320/354] Revert "- Fixes in tomcat-10.1-user-instance-create.sh" This reverts commit 5c8a69decae8a9f5af65d3bfaf68e9d38c5afe20. --- tomcat-10.1-user-instance-create.sh | 3 ++- tomcat-10.1.service | 2 -- tomcat.spec | 18 +++--------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/tomcat-10.1-user-instance-create.sh b/tomcat-10.1-user-instance-create.sh index 12aa1d8..4854928 100644 --- a/tomcat-10.1-user-instance-create.sh +++ b/tomcat-10.1-user-instance-create.sh @@ -120,11 +120,12 @@ mkdir -p "${TARGET}" FULLTARGET=$(cd "${TARGET}" > /dev/null && pwd) +mkdir "${TARGET}/conf" mkdir "${TARGET}/logs" mkdir "${TARGET}/webapps" mkdir "${TARGET}/work" mkdir "${TARGET}/temp" -cp -r ${CATALINA_HOME}/user-instance/* "${TARGET}" +cp -r "${CATALINA_HOME}/user-instance/*" "${TARGET}" sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml" diff --git a/tomcat-10.1.service b/tomcat-10.1.service index 16727db..d510faf 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -33,9 +33,7 @@ CacheDirectoryMode=750 ProtectSystem=strict ReadWritePaths=/etc/tomcat/Catalina/ ReadWritePaths=/var/lib/tomcat/webapps/ -ReadWritePaths=/var/lib/tomcat/webapps-javaee/ ReadWritePaths=/var/log/tomcat/ -ReadWritePaths=/tmp [Install] WantedBy=multi-user.target diff --git a/tomcat.spec b/tomcat.spec index c4e6f7d..d747252 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -73,7 +73,7 @@ BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd -BuildRequires: rubygem-asciidoctor +BuildRequires: rubygem-asciidoctor Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: systemd @@ -215,8 +215,6 @@ cat >tomcat.sysusers.conf < Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 321/354] Revert "- Enhancing comments" This reverts commit 9e1550b6088a9f5ae25174fc4158ab937f1812db. --- tomcat.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index d747252..fc1a128 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -35,7 +35,7 @@ License: Apache-2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc -# https://www.apache.org/dist/tomcat/tomcat-10/KEYS +# https://www.apache.org/dist/tomcat/tomcat-%{major_version}/KEYS Source2: KEYS Source3: %{name}-%{major_version}.%{minor_version}.conf Source4: %{name}-%{major_version}.%{minor_version}.service @@ -270,7 +270,7 @@ touch HACK asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE10} for jar in output/build/lib/*.jar; do - # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm since it requires to be built with Java>=23 + # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm jar tf ${jar} | grep -E -q '.*\.class' || continue jarname=$(basename $jar .jar) @@ -304,8 +304,8 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap -%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli +%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap %{libdir}/tomcat-bootstrap +%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli %{libdir}/tomcat-juli # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom @@ -326,7 +326,6 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build - rm -f bin/daemon.sh %{__cp} -ap bin/* ${RPM_BUILD_ROOT}%{bindir} %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf From 177c1aa024f5870b1124abe200353c26940522ce Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 322/354] Revert "Fix script calling from service file" This reverts commit 524080c49f7f59c25ee80580deafa3dadc9b6858. --- tomcat-10.1.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat-10.1.service b/tomcat-10.1.service index d510faf..55639b2 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -15,7 +15,7 @@ Environment="JAVA_OPTS=-Djava.awt.headless=true" # Lifecycle Type=simple -ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-run.sh +ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-start.sh SuccessExitStatus=143 Restart=on-abort From 8d8a869c2eee707ace0db3f149d839798fd4ef6f Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 323/354] Revert "Add symlinks of tomcat-bootstrap.jar and tomcat-juli.jar in libdir" This reverts commit 1a5e851e22de0c608cf33d49391f76a21297df84. --- tomcat.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index fc1a128..792eb92 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -252,6 +252,7 @@ touch HACK %{__install} -d ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d ${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 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} %{__install} -d ${RPM_BUILD_ROOT}%{cachedir} @@ -304,8 +305,8 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap %{libdir}/tomcat-bootstrap -%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli %{libdir}/tomcat-juli +%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap +%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom From 0559a64142d685421e763139a2ab66a75118a52d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 324/354] Revert "Update to 10.1.36 and verify signatures as suggested in the Fedora Packaging Guidelines" This reverts commit 07f14cc8f87a7cca1ccbf054cda88a4dc1f5a7c6. --- .gitignore | 2 +- KEYS | 562 ---------------------------------------------------- sources | 3 +- tomcat.spec | 10 +- 4 files changed, 5 insertions(+), 572 deletions(-) delete mode 100644 KEYS diff --git a/.gitignore b/.gitignore index 312c881..471c3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -apache-tomcat-*-src.tar.gz* +apache-tomcat-*-src.tar.gz results_tomcat tomcat*.src.rpm apache-tomcat-*-src/ diff --git a/KEYS b/KEYS deleted file mode 100644 index 6b7231f..0000000 --- a/KEYS +++ /dev/null @@ -1,562 +0,0 @@ -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 && pgpk -xa ) >> this file. - or - (gpg --fingerprint --list-sigs - && gpg --armor --export ) >> this file. - -Apache developers: please ensure that your key is also available via the -PGP keyservers (such as pgpkeys.mit.edu). - - -pub 4096R/2F6059E7 2009-09-18 - Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 -uid Mark E D Thomas -sub 4096R/5E763BEC 2009-09-18 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: GPGTools - http://gpgtools.org - -mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX -pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t -6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K -GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz -4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M -UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF -kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn -lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi -GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 -Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e -aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QARAQAB -tCJNYXJrIEUgRCBUaG9tYXMgPG1hcmt0QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJK -tA7pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEBDAHFovYFnn2YgQAKN6 -FLG/I1Ij3PUlC/XNlhasQxPeE3w2OvttweOQPYkblJ9nHtGH5pNqG2/qoGShlpI0 -4jJy9GxWKOo7NV4v7M0mbVlCXVgjdlvMFWdL7lnocggwJAFejQcYlVtxyhu4m50L -BvBunEhxCbQcKnnWmkB7Ocm0Ictaqjc9rCc1F/aNhVMUpJ0zG1kyTp9hxvN6TbCQ -lacMx5ocTWzL0zn6QZhbUfrYwfxYJmSnkVYZOYzXIXIsLN5sJ9Q4P8tjY4qWgd+b -QvOqPWrkzL9LVRnGOrSYIsoM5zWdoj1g1glMzK/ZqJdRqqqBhe6FYTbXipz8oX8i -mCebcaxZnfLhGiqqX+yDa3YUwDiqom+sZOc0iXGvKkqltPLpNeF0MVT7aZjalsQ/ -v2Ysb24RQl9FfjfWmvT8ZPWz8Kore1AI4UcIIgFVtM+zuLlL9CIsGjg+gHDE2dhZ -DY0qfizlHL9CoAWUDM3pIfxM2V4BRn1xO+j/mModhjmYLZvnFVz4KGkNO7wRkofA -ANIWYo3WI5x83BGDH371t3NRrrpSSFP0XpQX6/Leaj2j6U6puABL2qBxhscsO6ch -c3u4/+019ff+peZVsc9ttcTQXsKIujmMb8p2sk5usmv6PKVX3oW/RAxpbVHU5kZ5 -px1Hq7mMQdZfLs5ff4YymXBH02z4/RmSzPam0Xb5iEYEEBEKAAYFAkq0IlsACgkQ -b7IeiTPGAkN0nQCfUkbSwYiPeKQg6n2w/DuE91bVWLgAninl71+xlXNMZ+n6kBCX -On7R8UCpiQIcBBABCgAGBQJKtCKAAAoJEDGBeFpSfIEkwqkP/37xinx1zPlX9XZ4 -S9ShAl5+H/ZDvqJ45eJvHcxsym8/Go5nT3n0ny4wgjFQjG+X49wk/P0/rwG32xlk -/3tLLGmQA0MQwBCd9F9Mq3gLof09sgB6qyr9N4PfPHmsnkae4vmsS9cd5pXB0Gyy -b03rveedxUjD/joOrCfA28VIyF2yrCqiANr1dJruS0ieTuK9BskY++BoADtlwxhh -OGEEV/xAMggA20oWtCoib0cPZAj0exi3c+s3E2mUaBI7Ycy2yKpztXImb0cPsd6v -h0YpymXIl2OY1XPV8G5vUVwS4Ojs94lR4ozDXkl7UCPEW356SWVNPpDUTwxE37mt -TKqgsWjwEmfXU+N2rh9pqZY5RApFmKRgxOmF0BTG8ml9d3U49KAk4VUGIav+Fy32 -4M82Ka+mG7ZqgoBuc5nnEMmVYO4Zhh1yEt8d3lKRl3jRbmvoxvxQRRGUYrfEkCxd -XhspVh1OD+ZcY7V592OoUmsi4a6LZHrRirUuz9t4tVNctPtraDtClczEw1QdAseJ -Z/oTQrKVQ9mzXOeFdVjLOdXrAuLagcr/ENa8QlYxulal5YqN7pqRM5DQbZiVY2+o -wgsNDh2s8LyArJuOJdt0KTGiFz3i2tx77JOVKkXBRl155dnhN+NuxW22Itf2okMM -Y5vwnQ22rpa6PUXLwmf/lL9SC6//iEYEEBECAAYFAkr7Bl4ACgkQEy5J1OQe3H5o -QACdGWeT0hXpsWvi8LG4smhXgqzCKdEAn0ec6xU4cBJJ9e/DRPzj9S7nqZFHiEYE -EBEKAAYFAkrzvDUACgkQmx/anzwGIjEsXACg6MZYvM+2cATmO1/SeAChCmzuPDoA -oLVG30rJdaAm2GiA5oMNLOdxf1SviQIcBBABCAAGBQJK82GzAAoJEIWPxMT0OFaj -8QgP/i6E4jje3nEn6c+/2CTXuSP7Q9L5EsPNnMinKDi+3ksnLOAOTGZZoaekb7Q1 -v1rEQCIwxcGDUynsh7xr7pafky/taYouoVDWdvyy6BC7itQ3DkynHV5AwL1sazmp -itGcmmLWs9sDYyjgMYnFAVxgoQnFEmU5lgZXI3bnAp5qRhPHPlFEiraki0qFP4z+ -gb7ljRC58xH3Id/3Zv8fxO4cVH6hX4KHDINEa/KTwRJCMvd7tol/IojkWxH73IMH -cvQHrxV3tRGfQD67TJTP9jvqfm34edIsF9hjd473y4aKNgt0G+h3g3ND+K7+ECn2 -XfYi6xWlMlP4TQOGKMln9P0QHrs1qv63iBO/D/rd/MfFj1pKl888DXBIQ6ytO3iL -DPNuRF2M9T4Rjy10nDXHnigs6jktg5hWKzXSnLKPmRmT9c+UCmym9c16044bKnwK -Abi8aOdXI4IkOLTedX8qZsQ3L8rSXMPpIqlfmLfDzvY1rXyO7loFRW76cfZE2Rkv -ZzjSOpgC4kWtaxXPJZI/gfDpUQFKFFU98dmDCRgFJXpVcRIMWaZ1iGT8MRVBos98 -M4JBX3//ftLNoTFQS5V1Ks3TEOrK80FdQXGLLXpz3cpfh3MoXLz+yjTMSkehhF1Q -X7JFBP/aYk5Nv08qaQJwPYvXNqyFLgk6Dg6dLOkJ/U+AboK7iQIcBBABCgAGBQJK -82DsAAoJEJmgMCnd+hmeW2MP/34UZZwx2v/RNONuCCMVaPqDxlAWaNlKOjx4s4ej -DtyyNaSB4zKOqrcLNdZUr1YlcrNduRHjrt9ue17lhhg/zfBWiau4PG/LZp6Yhhv2 -OAsRpUd6djcWW8InjDKG57Ks65dReZgOmd37VNYUZFlDMTtRgk002e75l8Kr1diZ -qHWQ97eHCWQrCmQSe6mRGIUMiMzqlzCK01BhJvM5fyhCigseuIWwYaLO0MYyGANq -qvDfp3iCoH1f7e0MhBT7fYXAM1Vebx5OAeU8Sm2NyeVSVXNmEsh+fPdPX3HjDhsU -0ht0LsZLsf+oktes+iavQ/wWJ3TVADHiC2sOcckcnG7hbI9MhV8IC5XkCfubVpR6 -5RTbCbyJAQQQ/AEwAsTtYaJIYPx+W8xh9W1qC3CJbfwNAJgYP3f2f9wOM3ha9zb+ -AevBV1+tWUNOlGg9uM1c1MS7e5ifSF52TIsZpsxyJE7kwW1C+rLYwvyFMP+5pfm+ -/IMUEVLnlOAndo542RtGgVJtoTyA/JHh4rVimf6a9AdpDMG4eNWzzLX7C54FbEOS -+zecBiJLsbwW1GoYatlNrrhDAkZSNsmAJjCkmK3gf5EjRAUVYOsh9oVGoi9iDMQi -K1OsymMTsBF9MYNkdU3Hz04uanIbMpZuB0WFvi6d3cMXwnhCdyxSTMmgl5SizXPX -M6AniQIcBBABCgAGBQJK87unAAoJECBchnPcdCx8joYQAMm3NgBPLxKtVxzRFBYN -VuhrQpWYkkC+eVEmwIimvcf/cJmgImu6M9YdJvfsNcZ9510/qm9MF0QrPYeIgkK9 -INJwuNPM1dCR9N9z+Odxt+G6ZPW4wK0pHq+CIWMBJe83+szfMi1X/t4fa5/9kV7t -4tTSIrwMmmclm0trn2U84xwAsAjTdWH8OFBISSu1W0TEHnYU4x21i4Vcvu75KYJB -zbGawunsbyTcf8xw3GKg6kHpNpaQwkU78nBhRMKYxEqW3p9ar/eDg/BbdD1TaGk3 -N8Ej370Us9dhcBeRR0u5tYmMsbcI5r8W0smBFmuJzvHmi1q4p5SHYI2yRyHHxr2G -AE/LGGrEvwJmmsNAfYsoT4z+C+DLwijawkeQETB9A3fPsd4y0NTmCYKY9hdTwIhS -jdcP9lLIqSjQuNwG4b2hUdUf+XlW/4EuK41SllLTgz9osliU2Xzzx1wO0z2FWfUv -pdJro+PAqO9RrBw7F4M4gJ84JzECritS40WAeO4fDj5vw/oPP4sedZOwJ9O3VvAq -ibaWxdJZ8XclnxquD/OMCMaV9rK46bHv66x0HLXopfDhbI+oPuzYkpQaubxAVt0k -ttzBqEnBBqGazuvkxvfqjt6byix/Pee5jAGrUYHEjAiNUHYrzwFy1PK6TOoDLww4 -en6UgMqMO/xYsqKyYlERnyHsiQIcBBABCgAGBQJK+zaeAAoJEDWVOV6z2OG65aUP -/1gXindkH7yiYnvBIyk72M2s9KV/msWjoGeHcOy+XNfj+NSseLun88wf+2guh3z+ -v+MM5eUFtTSiJfftOkFIp+SQyEBAtAgf4iiwA8jKHiffiJ0fP3qLxhaO4t8uaSbg -cbgmsYbtD6iuBH20kHZbK9FO5Bl6FcQ8Xy4YOi300LiPa3vR2Rza6kgpCqlZ0d+A -qlgUZ7X+Zdm2RSew5jXsRB5K9jPxbYUaJUJgUAcIkUnnnhk1zN1/3yi4mLM6eEL8 -7efoZfgLRbd6UZvE+nKEwpjU1ocI9a8dHpr48PVOpSu/bNLVs+LhEHfFQcrZx6FO -yuR/J7CuMw/DyNICY2denzMhmqYNVaveGTEZQn7RHPIV/KEsw8AyPv3pFX7uz0km -ISMJCmMQRRpW/Hl80H7vuFyQQUcNpCvYBii46+Mf3qCKVIhUwNZ92ytRQ1lrC7P+ -Qe7iCYHgVX1F749i13qp+EZTU63Zz6AfFA+P4LdUmmGCFvAhJ8HTlOS75b3eryOg -vUBLnSAXHQDbFQ3Ku3sOkCVVbXkHO4aGFNlEaQeatBtonCFmx9CDkEgdxUd777D3 -i/jll4DLOJkwd6AFAOzivuQqq6Rn5XO7QrCTD6gw5+yeRPZIf7cq6PHTkHplt1pm -FCpfUkVSpOdX0F++al/vSvyAK/XHRSETpjxrZ80deGNOiQQcBBABCAAGBQJK/hs7 -AAoJEIqviNbYTkGuHYgf/jmm4EqMBNvUDUVxBkMCHFFURIdQO+xQnuB4So5p/XVf -c55WKDPG/4fCvcB+sritcJa+FdPFT4EzxMDzbgnbsfoVuF27WV5yQzgTNUiHszYe -X45oFF30fh9vPKGfjzy4zeQzzgGzAlyijjBXdAEgN0TXkxdMCiVxrK4TAve41ZEH -bS9lmtFCXrX7SBoZhOTSVfGUDaxb/5FVgP/GhtG35wtFtDlaca3W0x8Wl0kyRMb2 -NPjO/h/VYhoSDlJGBEGotCafY3tqdwEcnfTcz2mv0Y0ASI6aaCN/BVegkCO1Q5uI -EpTa6YPiRJqZqvjUlocy/LjNzmcDa/11Ai8DUd9wHFVEPBPRc6Xz+jbi9VqsN07E -S1FCnOr+YIh1E7dsKENdnWmRW/vJjsyzLGcU5G7xzxZAyqHRPB6v1MX3HdAQL91z -V62LpvGHynGHJbQQclKv/3PKCu/IM2XAOVbHhakPNmT/1+ceoeLgTRD9WL7/6lrM -bYFCxVfNNYAUqkxo52bV/TBVfLvgsrNyhfpPGJ3pqOP5IaWzMcoi+hyrFv4LZYdL -8r7SNvkuX7z+WeYzPbj3gPg5lS9YjFYOuvr63DMPzsWng4MZqVSxiB/BAvGAvJwd -bDPqmHjL4cctxQOV4yPoHEacR8S6Ajg1tAdc0Xn2LFcErLnsmNz0nuBACYNb8cOE -v6UD12ovs1jLXK2KY0QcrQ23lJi/9awpoLgPcbwRFplUnXsNrsOMl9n+0CquSXAq -uoynmWYGvDgFE5TT6V2IVTTasPToxb32+TegfiLFI+rwaQPFgP11whxVrs2a07yw -QWT5P7UgX6t6veedw6udqzDJ/kRYjZhoV7aUfj05stRGIsRxzahRhRoybRG0RCBO -rYILg40pKIvAlN/wwpxKwj3tdgsAxkdCfatYJGH9HP5DLYS14tgHwyt9/7xbl6d9 -aswj1gBK0cciy2i+tBp5UoMKrIa3dijYY2IGLca7thXz3WfWYd9qEYa+rkbjvj3H -vuF6tnNlg9n893Xx1nHA016TyUzwyOGhIXvctKTpoPP59AC9WCG6GbFoZHG6uyR+ -d5T0eTBApbUxO814wEOL+Ux9BvQHEimuUsv8ib9WYPGr4A4f+vI/4MOKNRro7tRv -eVfIIemXwYX691Yum+d6ndVcUPOTZw9i952fwX2NdyNimk8svWO4fXI9IlU9FEy3 -El//1bJgxxE670Y2/3uKhziNu2b3YEEyTh5i0geiFJQjFggIQVCgYhS2KhkBxJJ5 -p+4NI3s/i8H6TMn7gHxmh8gf2QhcdIXoBypj554vDuqKS8JZd4uyhyNmSCex/4m3 -Xho4utrGZDoo1ZOrQvPLQ+fZxdcpqPVjdI5p2vpKXeiJAhwEEAECAAYFAks9za0A -CgkQ7Thz9dMmJyJhbA//cEIpU0T4dqP8fkYpff4cuAbOmgDlQtH8BlJVUYDAXaL+ -TTwx3sdjPbj5lIsl+6vVEHQRgftgZy2TMTnrz5OZdDKmxqAc3ae4qr4yjPZNzqBg -7FalLsUYve0KGqOM5WhOWOq25MRyjD3IEARuMpc0SRmggNZj2Pke/bByvs/EJUx0 -KAktsWHDQYPkutsh809lbpTLPUsc1cpw394gj7EESKv+jWe0rOlB3TuWexrD7RgH -RenDYa7lJIFZdtWX1vYAhJJVzeq5D8nMffTvppXgAHQPmNwK7Ys6i7mYChvp/k2i -At2BDISVEtssnP+joZjrAE+8HXqlDFXnR+Y6YjW5i/+/sKbdySe6ZZEgvlmw/4vD -zZXGabwj4WFRrmR2bLKcsrut+VtnVIlTZ0QqV/UcVcqBp/4vuW6Dq68NVdbXKe8+ -cAXFQHTfbpXQ8G0PTcvMsrQBMkfFBeYvi96UvQIbVF/dxW43eyQR8El8E3Z+ECNO -2GAkI7wNAU5HcfL9HNyw1X3nMx/NZ2qgaMnQdUzVgEk56/d0ub4TyE2mdNvINa4C -DvsHWjjz5QOqdA/2qZDKv6qpea/ZHAE8gt0fqSVY8rTJYhjvuO6CMeU2BDPp4YNU -+iQzMnAE1se0DeX32t5Ry+dS2DrrAXQK5Q56vZfbIUdsmzB4Fxis/lDt+L0lKquJ -AhwEEAEKAAYFAkslSR0ACgkQMXxt+Dx3Bc9pwA/8C6q6iGBCgNEHz0R6x9GAhmgU -ib7Gqu5XajASaH9A1Zd0sT4gBcFxdY3boUeDU9nr8a+wTPRCN4K7RZJVL4RzWnyf -HNBVzFlck996FztO1gsR4yS2NcuMxGTc7fc8I0s216nr2pwJmP4HzF8QVeLGsCbm -MIfylKXCriqaoBAcf+jRBGzQrqn0U3SqQfzkD/rGXKpDkZgS2ynI230JWKWqemsL -EhODDEWaz+nSOko3pASPNs4RbL4g21sFqJjy7u+BIKnmdwQkxVLBMj7MHRftnP8/ -JyJOlO0TgmoX3pB4QVC+xVz34S2Sfgeo5M+YtPkRl4DEBe5F2K9rEQt3XBBW79qz -aogtawbhjFpbKy1Hkp9CaoWmGg6bJV2NyXj2CWjrWeLwIlWgWDemYLiX90zlwTby -ubUQI8/2O52f3QFtO5G6Dap593ReYC8ZKQOPvbhkEKaipJbSAYwakNQAhqGZXnYh -FVwpdOFOnO3uwv+1JrUJgobXLGx1WX4BZwgZBqvGZXHnFkAaH4lzinwdHBNCgvTc -j3d3WpPoVUgpxxbd2pmYL5iT9jTnBviH+VmxDObgikWMMWbLIl2cCcwhhUB3SFe/ -emyKG27nwY/BAneez9qeWBrm9YtcQpONXRb8ct3N6mV9fh3SAKUBJ/8YQeFtrhm7 -fLyM7J6FDUikqqm5X0uIRgQQEQIABgUCTc6p/QAKCRALA65uTiRRfGzaAJ9zSN2x -ZS8+lr72Dy3ui3w4YiFalACgrGvpN1BuW0jAjqqQwZAVg+IqM/CIygQQEQIAigUC -TNK0Qx8cSmltIEphZ2llbHNraSA8amltQGFwYWNoZS5vcmc+IBxKaW0gSmFnaWVs -c2tpIDxqaW1AamFndU5FVC5jb20+HxxKaW0gSmFnaWVsc2tpIDxqaW1AamltamFn -LmNvbT4iHEppbSBKYWdpZWxza2kgPGppbWpAY292YWxlbnQubmV0PgAKCRCLOmAf -CMl15XBxAKDZ5PuM6hG8AHDNZaG+xyUOO00QZwCgkuvUBDrrb78TZweYttGPXB5P -7B6JARwEEAECAAYFAkwjU4gACgkQzl51YrnSm9IDQAgA0A7zvnzcxbG8298qiUWG -wnl/vH+ZqA7RkBQlyjvZuB8MadKWK6kxq6sSgyttOelw2jBpZ57LXl+9C/8s09/R -kfWpgQJK9J7oPm8dXiJjwuTgkr8dxQIuFLgiLHvwVUR9tPHw7xr/w8LaZiTvHqop -MMVfhV+TMB8EoR7G40PnaVlmahy2hrOJK2VkYNIoaKAWmApGAcZInM+aT/BWth7X -Ya1QxGxr1QDerM6XiygfdjRKJgrTPrxCBrRZ5ooYOnH4xxwqiTlWnesvmzxA+ipM -FPFpzU3NWIVqeFrb0hDSVE+jGoE8Tr5bujy2rHrWkcGmFYt2Mis316+6/3MVXBzn -lokCGwQQAQoABgUCS87t3AAKCRD46bjF0BjmsT6TD/dk0AS53pTGh2onWjpKJUOJ -XIDlSq99wY1A4cE8sNDYRnAlOWjsYocN2ds0u0vcc84q4DpnwGE40iaRaeD0ik1p -gBFexl0OTmYBkhzc/6TxS2EXQ7eQBl2a47cOXU15jtRHkfTJW1wddzXCby5mjUa5 -FH6RYxkK7s/2ZlAFpPpDj5Lh0dYezvEYaNk7tFPhl9DJnRKYi00XGFcypyU8eeEu -GQ6YItx0iccFVc82On5M+1YW4dg1aViXrXwTHcmWkfz5r0WVzRvAS99hwWcNmu8U -XfolKeqtO/VOU2aUmRRd9XiJMeJ0vmJZBwFRbSH5gLKbiMEAxOHb5tIViP/EoQkI -ZPwke7bLD8QefkwFW29c+U9bX5cIoLh8SEGCXIkrB+FrO/++VWN7Yt+SBtcA98rp -ejVgbEu/laV7rXmpq6+7EUlaUgjk99ddNHqvKTSIbAcfHm7sWCQm5hcLSDEXUBp3 -wimuKJbO/gu6Kbf3RVBzcIr3zz9M+tFBzp9UHHbraA2J1+gP4PickU/lBbvd3S+0 -E9X/vhInCPHlbZCJDilfa5xcUW1AL36OutPRO23PRLBqhEVlyDuUxG7gaHsm2QjF -x8hlx4ZTtfN91wl1KWmhi6Um6uZOselNTsxouRoel868GsbN+2HS+/oHGZt87DEm -bZSCGvlLuLM4OyZQGfQMiQIcBBABAgAGBQJNzqqEAAoJEDxcCZ7pYzSqXHYQAKVu -x81368OzRdnOkce14esVtGj77lEdlDt3HYJgCBo3D6QiEzTHOnQB5AtKpOq73rqx -XqljAOBHt4x07ibL5HoTulmfxRsFdFOCXqYtnkBNVAF6nrotCBcKkSnNFhfSqqMr -eC8ifKjkzbWHi5Q1ERsXnKzZXht50EyMj9Urw/WAM+kFyDLTKqVIUueKQVSQrv6v -uFIUBNQLKmqVvf9OSn67jqM6jCidwH95BLFrJHDUtxTpJq4GkfK4qN3sVBjExCRY -kNfAKKLlewKILGl7Xc+TYZuRQR8/MM6VZ2lMnphL53YgVT8KuWPYhJnk/8Rt3cBS -vuxXDd5w02xHucoqPH7X3UjEJ0fhPlmIxAErJWKojRy/aja7S0jjvKPX9AIh3DO3 -dgTAVdWnL/ur5qq29ak0PI6xMX03mhx+oNW61n6N1opSKsdgdcwWO7iA9trOtHhL -7X0zm4I0zBCEB+fjpxipX7XwD8GXhG7r/ohHl8iaD6VVf81kPeol+ecmFrfm6s9F -TIlQ2gVI7ZC0IWq/VmX2pD3G7LlufOL2lz9fEH+Sn8im/XpV2kMreno79Cy0mQmX -UAkSoogiWxDt33T8uXANC78wlixmPy1xVhLy1/5G1ICYbzgE6Ce1D13TGnXar+OU -87hP96ppmbYEgwQZs3dAcbxpgeyisv/A/p1jcnkdiQIcBBABCgAGBQJMdpNqAAoJ -EOE2CIoYJL3BZZcP/3un/2Cs1CwPe47u0wOtHuKEqnYCzarpy5dw3ucIh+3PFeul -nVcaFmP516FFlQSsFVtWf2Gnvqz0fPMoqiXR1wyAGN9venc70hvo33MJ/K2ATG2S -ttNgVAGMmxRsNsYPhrx7jv8ud7Pbld5ZTKn8eQP0qIeMzDECP2yQ+WpT8R31SWAB -N4i4y0ivyMJpWMndkCXPehSLQcuydufVcOHlvvCBUBaR+6o6qzn5gvZBITHUCZhl -jNMWzFqiAhQyUzTHB7PBfEWd3Jy0eSA8VcY835IgOPnzbn87f8uxKs7sTlff9cHa -Ut8usMClKpZQCHiO8KZ0Ulmcg3Ex20nVBth7+ce3Ggduv3syi2sWnlNtFl9vF0bF -Fx0OdLbJZdiBSYji5WGx1oBYQsCT5SuDArOngaTGJyvPodj1rB+4XwzIqnQpuJZj -A3y/j+C+ur3rEgNUzCdMpNGkN6SIjpbPGOqXosVy8xpkwtoOVocR4dUD18uqjpMD -N8d/NAxd1nBkv3AjQ3wQd/32ROs5JIkH47AI1kJ5JymZKma0qSz4NTweTFp6jMCE -b4AjfsePnV+mUxAaOIu+QApkhKjjKwXqokWfay/maAJvyS7va2ANYEKCrNoNZUL4 -Oh6vNCr0WGrrzcbK1sXSzqYMvf0asYoCbYA6F6gxuqKdNjlLaRb7s/XPvadniQIc -BBABCgAGBQJN0A4UAAoJEAjjDy2TKbhQsXEP/RlUMOvS5sfRvqqYtJiStJEOwNM+ -0z13wVIlA5rNywvGJcUAwdOjRxlZSnyjBe2+nZnFIvFcZw0/36+q/zCorwDD7OiG -axNk/xDvIhUj5u26v0RvjhDsbOwC0f1uddV0SDX4VDy6UNy5BW7YtkP6t0kGxWPN -0Ze269Y9vlWaFxdmNPLEoC6czU+oAjETeJYuHImHc2LAyTvwrw8K92Rk2WTXPXdu -txLTT0uNOQDk38DaiG0V9Yaqwq9+7wI/19QRvVAk4d7d4TBHoS9fngDLw83GC8P7 -qymM94h+bidJSYyQbjfGsNg8VVlx6sQ3V7rECb2uRmH5u+6eOsZBMZNFB7C4xio8 -ON6brHlmtHeIhGHiqd9vwQbhsS0T+Ixvkfblmp9of/EidAWAq/JbPuEJeR6n0P4P -UetKZ3ordZYKdh/bAXjnbrcucglEa7dYPwkIC2k9oLwzEWYayq2UPPS+Dm5vzmNP -ba/1Z/Wv2K+SffyOe2N/QYuSPlSUUYcaBcbY16Lbz3kW656qDGpxoU470Xy+xiTW -fQCfsvwT4HM0AxwVWmaOPp/Lu8lHDOgqZ+DhSTY7LRgXfXe4IVu2lw9t1QUdLKBt -QN+V8r0G5q4pFUzBC0zKck73LNd86ueuNvZp3dCFyEk8P2RPB5TG1rM0IcZc4PKv -tGvMHLLxuyX4IU/8iQJSBBABAgA8BQJM0s2oNRxUaG9tYXMgRHVkemlhayAoQ09E -RSBTSUdOSU5HIEtFWSkgPHRvbWR6QGFwYWNoZS5vcmc+AAoJEOpNytxNyqiPuSIP -/jM/q2a8cHJaFx6aW6vCJHeANgp8N3NKmaQAXj0WleNIG7iskhAb30wDGAvD8O0I -YO+tPRRxdp3QfzafP8vGECOhsKNG2pX9VUwXaLB7w+miRXbxD+yAbbo+4jSqXI4N -AYoR+tschgEVwyQZeMw0sntLPsQzRDMs1HXli/a5YZeUvQHu5HZlKmxRkZyAH9la -/nAzNWZH7n/+vLfUvwe1/susA2NubsGiHK4H62gsfXeU2ns5wcj/RM642KpQl3uy -hv593dx3IB/ze42jCbkVKcDorYOGEPccbLm1IQRTQxwoje7xpdpFnkNLVh51SnAh -02PC+pzvcMd4TtY2A2SWyEA3Jp/yvJsTd6vdSMR1VcJBvfyCN41b6cCiciKgDOMD -xLx1+0c6A7ZUqqgivMEalZsEQPJaD6Kn9X0jjh+aJR3Bhx/LGOSJUHa72gizLrv5 -hLVCA0PuiaP0dHHYiuch6OuZgwww3DUhsYQOKmXvOqoIztGSjVTAB8D9pbbxlyuF -Hih1hbg7T5q2tLTxb5JrlW4G4+0AoOybe4gEkPubf9JdzA2RuQD5vN7krpmiVlgJ -PDaG9pYUE+FqwiJsuDH2xyjNksZtCFyNbSAexPFY4GbuN8TMveOh/1FUspUTERp7 -hF91WIg93+AIzyIpQc1ryL1cnAzBF4uQ62T4mUR9JNIWiQJaBBABAgBEBQJM0rjY -PRxBbnRvaW5lIExldnktTGFtYmVydCAoQ09ERSBTSUdOSU5HIEtFWSkgPGFudG9p -bmVAYXBhY2hlLm9yZz4ACgkQXvrZ/oKn+81T6hAAmePBc4tVmcPvBl3iAiPD0UKa -bMa3tVYWLh9LDkaBnQOXiPHYfZCpACfnXfZLCg469xEEVrgpRl2aJHjEypm6txg7 -kGKcLkozKLxRRw52LYVuYO99CYXoTdmTZpsoC/CrkXpJXPl153zY80eZ/P4XNrxY -p8Pys5VrpvRibjURphwhDGTEHJKel6/so5mI7axuRxgd3fBUs9wUmTTB3h2cN0hK -mysMFmYjn5vG+WdJWmB4wRPDwz6pMRGKX9lVfdgs9RwH2YoeY1zCc1CXw2I8ox+X -KsD5OLyowCnGRftnPylTCqWx0LXko1xF7nY3+CN4P/ghh+0BRUiiVzT0pbzdhEVc -S7cXOLm99wXrDRzVcgrp4TGkaJSRjP7WWQ1KHsAI1lZLQyhOEdYex32+U+66bCjp -FiiBPpX2zdu/lXpFUIwmjNjEbXb7rK0Uk3lToF/QrNTaPnttrDFQNTOmGp/4+PmI -Acz2PkGcb+Osr6k1mx3f9p87saZMaGZXx9Vl+60w1d4PSJRqvawqHpAyMYEvgzjx -c3EtcnwlXI07qk8nmCl1XudlS5KHeJ5axWLEDNJCvEuJGy4moaFllwmTUtxDzRK/ -zG6QSJEPfH8VZiEl6HBpgzlBB5aToxc+Wy7UpGzwaNrA6KvwSaB+jSxrZYtHbwBq -2U3ttmamynBF1izPuOeJAn4EEAECAGgFAksM3mcgHFNhbmRlciBUZW1tZSA8c2Fu -ZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUub3Jn -Ph0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUuY29tPgAKCRCbuGOw9Ru4igbUD/9+ -+F4uqkO+F6g1QNiyFM47K1NaFLga/lNp72mOOIlZMORXpBJGeL9DhbDvN5KIQqR4 -I5wCONGtzeU8P7M+uLapFZmofROABlACUeVhOPx8fOCeNz9xU4f33dKJJnAsIfis -SMMyJR9Xz/IbNWvM6Kb7hU+L86G2cZPD8uvZ7oHyY4wZWtjTHM0ne/usodJffxIj -oQFhn0vAC8hBNWStI8UUih+n+iqvvXA2cB9v3Ni3VjQOGLKSZ5Ke2jpKdYTl5zST -frHfjgjGvIdkWz0hbVMzL+urU9oIChBK6Nr3DxY/XvO8PmFGh7V+M9C/gahLCrNz -fD3vKGi7OYkp6dODPnREpOSZ7elGO5mGQnSosqzrLb7kw/vEobBbxsYDwxxl+ONZ -8yxUaBpvRIrwqNEwb1YxlMCLnpRs7TJxxitq+zF7F0MxB5sqdLHSNqxcfbxpTflz -Tn/H9h34aF7f4Qkn276XKIomhge4su7jxHNH/G9gTk6oicdalBFRMFwBRpaOivno -FmSGa1Yt7C1mBBQkRXjw52ZRx8MHKnccNNgpk5Xc7+VT9nqmoulq1JfzLsrtu4D1 -TaleWOVN4X4FYk3S2VWxLV5dhmuCy7hP0ZsXOTBjLXC5wMxJcp7I3IlIx39a6U7O -vhWbguPxyXR3AjBUsMRfO0pGZKXxDI3N+yHOWAtDcokCkwQQAQIAfQUCTNK0KDUc -SmltIEphZ2llbHNraSAoUmVsZWFzZSBTaWduaW5nIEtleSkgPGppbUBhcGFjaGUu -b3JnPiAcSmltIEphZ2llbHNraSA8amltQGphZ3VORVQuY29tPh8cSmltIEphZ2ll -bHNraSA8amltQGppbWphZy5jb20+AAoJEDTqduZ5FIWo/wEP/immECQXMIMQ9zj7 -4RU2R6YV7Slzc3YATfjwOgOwzQ3qF+UTSHui7eiYoHOwRK0OTKW6fe7bh9/XeWLB -sglUl+RNuvCNHAQNg9/p7x9mJL05e3OnGpVLVnq/yQezCWo1GWIPxodwmoyI2C3S -iUapfKN1q0Ml6nwZOyHsgNCFYDVhmtEnIcK7/PXLpeYTpTBuXETZZQY++XyZDiVI -le2W3uxrY0k8zVPvGSXGIh2iHtAuCrJoNKY+webEe5QVNoAYnNyu5de+50gpQOr+ -wYsvuf7S1MAPAX2L48U/JvpBfDikZR8qujvCDAAe0bnom/Ov/eWtnONi4hpsD4T3 -kcElxWOph3mEm1YUksGmoWE0FvE6o7r04XF+VrIA/YwcgC5wGgGmYFU4DR384hMZ -1EMAsd8cKdYBja/PA4BTcA6Vc0uJVFaB8o117m7r7sHKRsD7CHbbKcK8ZtRNDQa3 -SzTMqLhsRDRl5wp9Bwq6l++BKPpvEnpbs8SdW+TxrxpM/0aIhQ6ZS5RKJvhZK3Ap -3cgYBVW23CwPtVc+40/t8XqBRRlzbLdfWhEC+FU4f9RHS+DQRFSxl/xXeLtDBH75 -1WbhkRIRTktQxapEDuRFfd02Oeo356/r0TYUQHL4bwYEbTBm+HO1KJn64BCaUMOU -pW881K8SHQaHMr1iiQUpvMkTcofRiQKpBBABAgCTBQJM0uOxIBxTYW5kZXIgVGVt -bWUgPHNhbmRlckB0ZW1tZS5uZXQ+IhxTYW5kZXIgVGVtbWUgPHNjdGVtbWVAYXBh -Y2hlLm9yZz4dHFNhbmRlciBUZW1tZSA8c2FuZGVyQG1lLmNvbT4qHFNhbmRlciBU -ZW1tZSA8c2N0ZW1tZUBrZXlzaW50aGVjbG91ZC5jb20+AAoJEJu4Y7D1G7iKG0YP -/3AweZFnchITlhDdEkozl8M89VZGTBqfU6Rg7mNxL/HDnJRtBBGXmSQ5NLygX+kS -PKci3KRbjbeVEmEcWs/ZfzxN4gR+6y8ohUOaA0UDrZYctYkzG1d7HbkcM1lmvtde -Gelj1j/+eu4LRu5h9oczkqRnWV5xnqz7xsEH9Rrcgm39RpNzFf43Joo25iqdVGk4 -yBVjoHQsnD1qZwdZQ0EHxYozNkGfa6j7VXAzCYVstfRMPGKrYH/xRg2jNy750z/p -apgT3GXbpvcB9Z3gj2LRn+FKLxoH2WLf2DabdzyZz9KXfnG4ZeOd2BrFXexKT2MQ -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 -yZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ== -=4AB7 ------END PGP PUBLIC KEY BLOCK----- -pub rsa4096 2012-05-08 [SCEA] - 5C3C 5F3E 314C 8662 92F3 59A8 F3AD 5C94 A67F 707E -uid [ultimate] Christopher Schultz -uid [ultimate] Christopher Schultz -uid [ultimate] Christopher Schultz -uid [ultimate] Christopher Schultz -sub rsa4096 2012-05-08 [SEA] - ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -NwUqv9cUGhf+Di0nAX1diWxfd7DdEi8= -=6zfV ------END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index df42da2..1bac248 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (apache-tomcat-10.1.36-src.tar.gz) = 18123ea1639733f14cf0b1ca0df8255b8d69abc7dd19cad10ad51f4f1f1c16f8f08fba668101169df68d23400f75f3aacab9040edba9330b78939b7c6399ae10 -SHA512 (apache-tomcat-10.1.36-src.tar.gz.asc) = 22153e1d7797cfb519f7df0968a60f2b1a39de156cd53011fba32c4e51a61e7f8fe4a4b75b673bd5611485f4ef1ca50e43f08d7d09925731253dc114ba0221e1 +SHA512 (apache-tomcat-10.1.34-src.tar.gz) = 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca diff --git a/tomcat.spec b/tomcat.spec index 792eb92..b43b30a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ %global jspspec 3.1 %global major_version 10 %global minor_version 1 -%global micro_version 36 +%global micro_version 34 %global packdname apache-tomcat-%{version}-src %global servletspec 6.0 %global elspec 5.0 @@ -34,9 +34,8 @@ Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment License: Apache-2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc -# https://www.apache.org/dist/tomcat/tomcat-%{major_version}/KEYS -Source2: KEYS +# Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +# Source2: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source3: %{name}-%{major_version}.%{minor_version}.conf Source4: %{name}-%{major_version}.%{minor_version}.service Source5: %{name}-%{major_version}.%{minor_version}-locate-java.sh @@ -64,7 +63,6 @@ BuildArch: noarch # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Java/#_architecture_support ExclusiveArch: %{java_arches} -BuildRequires: gnupg2 BuildRequires: ant BuildRequires: ecj BuildRequires: findutils @@ -186,8 +184,6 @@ Conflicts: tomcat-el-3.0-api Apache Tomcat EL API Implementation Classes. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' - %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 \ From fb80fe23e4a264e9cc4a6cd930e625169d921818 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:03 +0300 Subject: [PATCH 325/354] Revert "Fix man page rendering" This reverts commit 03b7b8f8e69991d5b6bc8b728a56722bbe7d5f30. --- tomcat-10.1-user-instance-create.asciidoc | 55 ++++++++++++++--------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/tomcat-10.1-user-instance-create.asciidoc b/tomcat-10.1-user-instance-create.asciidoc index c474e16..6c02e94 100644 --- a/tomcat-10.1-user-instance-create.asciidoc +++ b/tomcat-10.1-user-instance-create.asciidoc @@ -1,16 +1,19 @@ -= tomcat-user-instance-create(1) -DIMITRIS SOUMIS +tomcat-user-instance-create(1) +================================ :doctype: manpage :man source: TOMCAT :man manual: Apache Tomcat -== NAME +NAME +---- tomcat-user-instance-create - Creates a standalone Tomcat instance with a separate configuration SYNOPSIS +-------- *tomcat-user-instance-create* [OPTIONS] DIRECTORYNAME -== DESCRIPTION +DESCRIPTION +----------- The `tomcat-user-instance-create` script creates a self-contained Tomcat instance in a specified directory. This instance has its own configuration, libraries, and web applications, allowing multiple independent Tomcat instances to run on the same system. @@ -20,13 +23,16 @@ The script automatically sets up the required `CATALINA_BASE` structure, includi By using this script, users can configure and manage multiple Tomcat instances independently of the system-wide Tomcat installation. -== USAGE +USAGE +----- To create a new Tomcat instance, specify the target directory where the instance should be created. This directory **must not already exist**, as the script will create it. If no additional options are provided, the instance will be created with **default** ports and settings. -== OPTIONS +OPTIONS +------- + *-p *:: Set the TCP port for the default HTTP connector. The default is `8080`. @@ -39,36 +45,41 @@ Set the shutdown keyword. When sent to the control port, this triggers a gracefu *-h, --help*:: Display usage information and exit. -== EXAMPLES +EXAMPLES +-------- Create a Tomcat instance in `~/mytomcat` using default ports: - +---- $ tomcat-user-instance-create ~/mytomcat +---- Create an instance with a custom HTTP and control port: - +---- $ tomcat-user-instance-create -p 9090 -c 9005 ~/mytomcat +---- Create an instance with a custom shutdown keyword: - +---- $ tomcat-user-instance-create -w "STOPNOW" ~/mytomcat +---- -== NOTES +NOTES +----- - Ensure that the selected HTTP and control ports are not already in use. - Ports **below 1024** require root privileges. - The created instance is independent of the system-wide Tomcat installation. -== FILES +FILES +----- The script generates a directory structure similar to: - ---- DIRECTORYNAME/ -|-- bin/ -| |-- startup.sh -| |-- shutdown.sh -|-- conf/ -|-- logs/ -|-- webapps/ -|-- work/ -|-- temp/ -|-- lib/ +│── bin/ +│ ├── startup.sh +│ ├── shutdown.sh +│── conf/ +│── logs/ +│── webapps/ +│── work/ +│── temp/ +│── lib/ ---- From 36b27510aa7c10d69f2b9fb8fe77f445c416a58a Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:04 +0300 Subject: [PATCH 326/354] Revert "Reorganize installs and preserve timestamps as suggested by Fedora Packaging guidelines" This reverts commit 740d603f373bdd64cc4d117eb731d2e432019434. --- tomcat.spec | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index b43b30a..c62b7c4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -34,16 +34,14 @@ Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment License: Apache-2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -# Source1: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -# Source2: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz -Source3: %{name}-%{major_version}.%{minor_version}.conf -Source4: %{name}-%{major_version}.%{minor_version}.service -Source5: %{name}-%{major_version}.%{minor_version}-locate-java.sh -Source6: %{name}-%{major_version}.%{minor_version}-run.sh -Source7: %{name}-%{major_version}.%{minor_version}-RUNNING.txt -Source8: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh -Source9: %{name}-%{major_version}.%{minor_version}-setenv.sh -Source10: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc +Source1: %{name}-%{major_version}.%{minor_version}.conf +Source3: %{name}-%{major_version}.%{minor_version}.service +Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh +Source5: %{name}-%{major_version}.%{minor_version}-run.sh +Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt +Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh +Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh +Source9: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -245,26 +243,30 @@ touch HACK # build initial path structure %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} +%{__install} -d ${RPM_BUILD_ROOT}%{confdir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d ${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 ${RPM_BUILD_ROOT}%{libdir} +%{__install} -d ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} +%{__install} -d ${RPM_BUILD_ROOT}%{homedir} %{__install} -d ${RPM_BUILD_ROOT}%{cachedir} +%{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} +%{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} -%{__install} -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf -%{__install} -D -p %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__install} -D -p %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh -%{__install} -D -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh -%{__install} -D -p %{SOURCE7} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt +%{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh +%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh +%{__install} -D %{SOURCE6} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf %{__install} -d ${RPM_BUILD_ROOT}%{userinstancedir}/conf -%{__install} -D -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh -%{__install} -D -p %{SOURCE9} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh +%{__install} -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh +%{__install} -D %{SOURCE8} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh -asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE10} +asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE9} for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm @@ -323,10 +325,10 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build - %{__cp} -ap bin/* ${RPM_BUILD_ROOT}%{bindir} - %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} - %{__cp} -ap conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf - %{__cp} -ap webapps/* ${RPM_BUILD_ROOT}%{appdir} + %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} + %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf + %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar From cd185fa508ea29d1d70b9f63568859b66ce256cb Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:04 +0300 Subject: [PATCH 327/354] Revert "Update catalina-policy.patch" This reverts commit d584406620b7ae49f0457ee6a06758b6bb7c0691. --- tomcat-10.1-catalina-policy.patch | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/tomcat-10.1-catalina-policy.patch b/tomcat-10.1-catalina-policy.patch index 5c01b4a..3254968 100644 --- a/tomcat-10.1-catalina-policy.patch +++ b/tomcat-10.1-catalina-policy.patch @@ -1,23 +1,16 @@ ---- conf/catalina.policy.orig 2025-03-04 21:02:32.000000000 +0200 -+++ conf/catalina.policy 2025-03-07 14:23:42.341169484 +0200 -@@ -55,6 +55,20 @@ grant codeBase "jrt:/jdk.compiler" { +--- conf/catalina.policy.orig 2024-05-22 16:12:23.809886452 +0300 ++++ conf/catalina.policy 2024-05-22 16:14:38.913939654 +0300 +@@ -55,6 +55,14 @@ permission java.security.AllPermission; }; - -+// ========== FEDORA SPECIFIC CODE PERMISSIONS ======================================= + ++// ========== RHEL SPECIFIC CODE PERMISSIONS ======================================= + ++// Allowing everything in /usr/share/java allows too many unknowns to be permitted ++// Specifying the individual jars that tomcat needs to function with the security manager ++// is the safest way forward. +grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; -+ -+grant codeBase "file:/usr/share/tomcat-jakartaee-migration/jakartaee-migration.jar" { -+ permission java.security.AllPermission; -+}; -+ -+grant codeBase "file:/usr/lib/java/tomcat/tomcat-jni.jar" { -+ permission java.security.AllPermission; -+}; -+ - + // ========== CATALINA CODE PERMISSIONS ======================================= - From bd10c72eff8cdaca5abd01bb8da81fea9781ea75 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:04 +0300 Subject: [PATCH 328/354] Revert "Fix tomcat-juli.jar not placed in tomcat-common package" This reverts commit 4c675c785fc5b871b842bf76ded75a82da30efe3. --- tomcat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index c62b7c4..56613ff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -314,7 +314,6 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom %mvn_package ":tomcat-jsp-api" tomcat-jsp-api %mvn_package ":tomcat-servlet-api" tomcat-servlet-api %mvn_package ":tomcat-bootstrap" tomcat-common -%mvn_package ":tomcat-juli" tomcat-common %mvn_install From d56e3c9a0ed6e8a6bb1980c7d49f409d8e0fe185 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:05 +0300 Subject: [PATCH 329/354] Revert "Remove unused parameter" This reverts commit c86e1e94da32c7cbe05e5e03ebe0c939a0bae741. --- tomcat-10.1.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat-10.1.conf b/tomcat-10.1.conf index dc9fec5..fbb3951 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -18,4 +18,7 @@ #export JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" # Enable the Java security manager? (true/false, default: false) -#export SECURITY_MANAGER=true \ No newline at end of file +#export SECURITY_MANAGER=true + +# Whether to compress logfiles older than today's +#export LOGFILE_COMPRESS=1 \ No newline at end of file From 866385e700f5b7665830f13f28570335d486a26a Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:05 +0300 Subject: [PATCH 330/354] Revert "Rename service start script more properly" This reverts commit 74d5d938592bfab95c3a362fae14f0185e8b2435. --- tomcat-10.1-run.sh => tomcat-10.1-start.sh | 0 tomcat.spec | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename tomcat-10.1-run.sh => tomcat-10.1-start.sh (100%) diff --git a/tomcat-10.1-run.sh b/tomcat-10.1-start.sh similarity index 100% rename from tomcat-10.1-run.sh rename to tomcat-10.1-start.sh diff --git a/tomcat.spec b/tomcat.spec index 56613ff..fe6de25 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -37,7 +37,7 @@ Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{vers Source1: %{name}-%{major_version}.%{minor_version}.conf Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh -Source5: %{name}-%{major_version}.%{minor_version}-run.sh +Source5: %{name}-%{major_version}.%{minor_version}-start.sh Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh @@ -257,7 +257,7 @@ touch HACK %{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh -%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-run.sh +%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh %{__install} -D %{SOURCE6} ${RPM_BUILD_ROOT}%{homedir}/doc/RUNNING.txt %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf @@ -352,7 +352,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %license LICENSE %{homedir}/doc/RUNNING.txt %{_unitdir}/%{name}.service -%{_libexecdir}/%{name}/tomcat-run.sh +%{_libexecdir}/%{name}/tomcat-start.sh %{_sysusersdir}/tomcat.conf %{baseconfdir} %{baselogdir} From 78f701590927589179814ff3cbb132ef90d95b8c Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:05 +0300 Subject: [PATCH 331/354] Revert "Remove logrotate file since Tomcat rotates its own logs" This reverts commit 48b049b11647bccf850d5d7d6f5355fe75222faf. --- tomcat-10.1.logrotate | 11 +++++++++++ tomcat.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 tomcat-10.1.logrotate diff --git a/tomcat-10.1.logrotate b/tomcat-10.1.logrotate new file mode 100644 index 0000000..082092a --- /dev/null +++ b/tomcat-10.1.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/tomcat.spec b/tomcat.spec index fe6de25..a1b5416 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -35,6 +35,7 @@ License: Apache-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 +Source2: %{name}-%{major_version}.%{minor_version}.logrotate Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh @@ -241,6 +242,7 @@ touch HACK %install # build initial path structure +%{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir} @@ -255,6 +257,7 @@ touch HACK %{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} %{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE2} > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled %{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh %{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh @@ -353,6 +356,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{homedir}/doc/RUNNING.txt %{_unitdir}/%{name}.service %{_libexecdir}/%{name}/tomcat-start.sh +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf %{baseconfdir} %{baselogdir} From b4f52963388d6e1c1da31227707fb8c85184963d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:06 +0300 Subject: [PATCH 332/354] Revert "Improve package descriptions and summaries" This reverts commit c1868d66549c281c36dc3006ec37190871ceb8e5. --- tomcat.spec | 142 ++++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 76 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index a1b5416..a1f7da4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -28,7 +28,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} Release: %autorelease -Summary: Apache Tomcat - Servlet and JSP engine for system-wide deployment +Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -83,75 +83,28 @@ Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} Suggests: %{name}-user-instance = %{epoch}:%{version}-%{release} %description -Apache Tomcat is an open-source implementation of the Java Servlet, JavaServer Pages (JSP), and WebSocket technologies. -It provides a pure Java HTTP web server environment for running Java applications. -This package includes only the startup scripts for managing a system-wide Tomcat daemon. -It does not include documentation or web applications. - * To install the default web applications, use the tomcat-webapps package. - * To access online documentation, install tomcat-docs-webapps package. - * To create user instances without running Tomcat as a system service, use tomcat-user-instance package instead. +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. -%package user-instance -Summary: Apache Tomcat - Tools for creating user-managed instances -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Suggests: %{name} = %{epoch}:%{version}-%{release} -Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} -Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} -Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} - -%description user-instance -This package provides the tools necessary to create user-managed Tomcat instances, -allowing users to run Tomcat independently of the system-wide service. -A user instance includes its own configuration, libraries, and web applications, -which can be started and stopped using scripts inside the instance directory. - -%package common -Summary: Apache Tomcat - Common files for Tomcat packages -Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) -Requires: %{name}-lib = %{epoch}:%{version}-%{release} - -%description common -This package contains common files required by both tomcat and tomcat-user-instance packages, including essential Tomcat -scripts and libraries. Installing this package alone does not provide a functional Tomcat installation, -but is required as a dependency for other Tomcat-related packages. - -%package lib -Summary: Apache Tomcat - Core libraries for embedding Tomcat -Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} -Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} -Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj >= 4.20 -Recommends: tomcat-jakartaee-migration - -%description lib -This package contains the core libraries of Apache Tomcat, which allow other Java applications to embed Tomcat -as a lightweight servlet container. It is primarily intended for use by developers and applications that need Tomcat -as an embedded runtime. +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: Apache Tomcat - Administrative web applications +Summary: The host-manager and manager web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} %description admin-webapps -This package provides the Tomcat Web Application Manager and Virtual Host Manager, which allow administrators to deploy, -manage, and configure web applications through a web interface. -These tools simplify application lifecycle management without requiring direct filesystem access. +The host-manager and manager web applications for Apache Tomcat. %package docs-webapp -Summary: Apache Tomcat - Online documentation web application +Summary: The docs web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} %description docs-webapp -This package provides the Tomcat documentation web application, accessible via the Tomcat server. -It includes API references, configuration guidelines, and development documentation. - -%package webapps -Summary: Apache Tomcat - Default ROOT web application -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description webapps -This package includes the default ROOT web applications bundled with Apache Tomcat, -which serves as the default homepage when accessing Tomcat in a browser. +The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes @@ -164,6 +117,25 @@ Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. +%package common +Summary: Apache Tomcat - Servlet and JSP engine -- common files +Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description common +Apache Tomcat - Servlet and JSP engine -- common files + +%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 >= 4.20 +Recommends: tomcat-jakartaee-migration + +%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} @@ -182,6 +154,24 @@ Conflicts: tomcat-el-3.0-api %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. + +%package user-instance +Summary: Apache Tomcat - Servlet and JSP engine -- tools to create user instances +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Suggests: %{name} = %{epoch}:%{version}-%{release} +Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} +Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} +Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} + +%description user-instance +Apache Tomcat - Servlet and JSP engine -- tools to create user instances + %prep %setup -q -n %{packdname} # remove pre-built binaries and windows files @@ -381,11 +371,14 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %attr(2775,root,tomcat) %dir %{confdir}/Catalina %attr(2775,root,tomcat) %dir %{confdir}/Catalina/localhost -%files user-instance +%files admin-webapps %license LICENSE -%{userinstancedir} -%{_bindir}/tomcat-user-instance-create.sh -%{_mandir}/man1/tomcat-user-instance-create.1* +%{appdir}/host-manager +%{appdir}/manager + +%files docs-webapp +%license LICENSE +%{appdir}/docs %files common -f .mfiles-tomcat-common %license LICENSE @@ -400,19 +393,6 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{libdir}/ecj-x.jar %exclude %{libdir}/tomcat-jni.pom -%files admin-webapps -%license LICENSE -%{appdir}/host-manager -%{appdir}/manager - -%files docs-webapp -%license LICENSE -%{appdir}/docs - -%files webapps -%license LICENSE -%{appdir}/ROOT - %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %license LICENSE @@ -422,5 +402,15 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files el-%{elspec}-api -f .mfiles-tomcat-el-api %license LICENSE +%files webapps +%license LICENSE +%{appdir}/ROOT + +%files user-instance +%license LICENSE +%{userinstancedir} +%{_bindir}/tomcat-user-instance-create.sh +%{_mandir}/man1/tomcat-user-instance-create.1* + %changelog %autochangelog From 3bc9669c92b1ed9099704985a1d6c1ffcd392d2e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:06 +0300 Subject: [PATCH 333/354] Revert "Remove redundant defattr from webapps files section" This reverts commit fd0d6ea01f1162ad19304dd7296f2ad8c19bf8fa. --- tomcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat.spec b/tomcat.spec index a1f7da4..560c452 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -404,6 +404,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files webapps %license LICENSE +%defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT %files user-instance From 4a35676781734e27eb64e2ac0ad2cd855c54c986 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:06 +0300 Subject: [PATCH 334/354] Revert "Introduce tomcat-user-instance package" This reverts commit 4cb746528937b2740d45c3484c3a18ad04c147e2. --- tomcat-10.1-setenv.sh | 12 -- tomcat-10.1-user-instance-create.asciidoc | 85 ------------ tomcat-10.1-user-instance-create.sh | 149 ---------------------- tomcat.spec | 31 +---- 4 files changed, 1 insertion(+), 276 deletions(-) delete mode 100755 tomcat-10.1-setenv.sh delete mode 100644 tomcat-10.1-user-instance-create.asciidoc delete mode 100644 tomcat-10.1-user-instance-create.sh diff --git a/tomcat-10.1-setenv.sh b/tomcat-10.1-setenv.sh deleted file mode 100755 index 76bea76..0000000 --- a/tomcat-10.1-setenv.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# - -export CATALINA_HOME=/usr/share/tomcat - -# Try to find Java installation and set JAVA_HOME -/bin/sh /usr/libexec/tomcat/tomcat-locate-java.sh - -# Default Java options -if [ -z "$JAVA_OPTS" ]; then - JAVA_OPTS="-Djava.awt.headless=true" -fi diff --git a/tomcat-10.1-user-instance-create.asciidoc b/tomcat-10.1-user-instance-create.asciidoc deleted file mode 100644 index 6c02e94..0000000 --- a/tomcat-10.1-user-instance-create.asciidoc +++ /dev/null @@ -1,85 +0,0 @@ -tomcat-user-instance-create(1) -================================ -:doctype: manpage -:man source: TOMCAT -:man manual: Apache Tomcat - -NAME ----- -tomcat-user-instance-create - Creates a standalone Tomcat instance with a separate configuration - -SYNOPSIS --------- -*tomcat-user-instance-create* [OPTIONS] DIRECTORYNAME - -DESCRIPTION ------------ -The `tomcat-user-instance-create` script creates a self-contained Tomcat instance in a specified directory. -This instance has its own configuration, libraries, and web applications, allowing multiple independent Tomcat instances to run on the same system. - -The script automatically sets up the required `CATALINA_BASE` structure, including: -- `bin/startup.sh` – Starts the Tomcat instance. -- `bin/shutdown.sh` – Stops the Tomcat instance. - -By using this script, users can configure and manage multiple Tomcat instances independently of the system-wide Tomcat installation. - -USAGE ------ -To create a new Tomcat instance, specify the target directory where the instance should be created. -This directory **must not already exist**, as the script will create it. - -If no additional options are provided, the instance will be created with **default** ports and settings. - -OPTIONS -------- - -*-p *:: -Set the TCP port for the default HTTP connector. The default is `8080`. - -*-c *:: -Set the TCP port for the Tomcat shutdown control mechanism. The default is `8005`. - -*-w *:: -Set the shutdown keyword. When sent to the control port, this triggers a graceful shutdown of the instance. The default keyword is `SHUTDOWN`. - -*-h, --help*:: -Display usage information and exit. - -EXAMPLES --------- -Create a Tomcat instance in `~/mytomcat` using default ports: ----- -$ tomcat-user-instance-create ~/mytomcat ----- - -Create an instance with a custom HTTP and control port: ----- -$ tomcat-user-instance-create -p 9090 -c 9005 ~/mytomcat ----- - -Create an instance with a custom shutdown keyword: ----- -$ tomcat-user-instance-create -w "STOPNOW" ~/mytomcat ----- - -NOTES ------ -- Ensure that the selected HTTP and control ports are not already in use. -- Ports **below 1024** require root privileges. -- The created instance is independent of the system-wide Tomcat installation. - -FILES ------ -The script generates a directory structure similar to: ----- -DIRECTORYNAME/ -│── bin/ -│ ├── startup.sh -│ ├── shutdown.sh -│── conf/ -│── logs/ -│── webapps/ -│── work/ -│── temp/ -│── lib/ ----- diff --git a/tomcat-10.1-user-instance-create.sh b/tomcat-10.1-user-instance-create.sh deleted file mode 100644 index 4854928..0000000 --- a/tomcat-10.1-user-instance-create.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/sh -# Script to create a CATALINA_BASE directory for your own tomcat - -PROG=$(basename "$0") -CATALINA_HOME="/usr/share/tomcat" -TARGET="" -HPORT=8080 -CPORT=8005 -CWORD="SHUTDOWN" -warned=0 -warnlowport=0 - -usage() { - echo "Usage: $PROG [options] " - echo " directoryname: name of the tomcat instance directory to create" - echo "Options:" - echo " -h, --help Display this help message" - echo " -p HTTP port to be used by Tomcat (default is $HPORT)" - echo " -c Server shutdown control port (default is $CPORT)" - echo " -w Word to send to trigger shutdown (default is $CWORD)" -} - -checkport() { - type=$1 - port=$2 - # Fail if port is non-numeric - case "$port" in - ''|*[!0-9]*) - echo "Error: ${type} port '${port}' is not a valid TCP port number." - exit 1 - ;; - esac - - num=$((port + 1)) 2>/dev/null || { - echo "Error: ${type} port '${port}' is not a valid TCP port number." - exit 1 - } - - if [ "$num" -lt 2 ] || [ "$num" -gt 65536 ]; then - echo "Error: ${type} port '${port}' is not a valid TCP port number or is above TCP port numbers (> 65535)." - exit 1 - fi - - # Warn if port is below 1024 (once) - if [ ${warnlowport} -eq 0 ]; then - if [ "${port}" -lt 1024 ]; then - echo "Warning: ports below 1024 are reserved to the super-user." - warnlowport=1 - warned=1 - fi - fi - - # Warn if port appears to be in use - if ss -tln | grep -q ":${port} "; then - echo "Warning: ${type} port ${port} appears to be in use." - warned=1 - fi -} - -if [ "$#" -lt 1 ]; then - usage - exit 1 -fi -if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then - usage - exit 0 -fi - -while getopts ":p:c:w:h" options; do - case $options in - p ) HPORT=$OPTARG ;; - c ) CPORT=$OPTARG ;; - w ) CWORD=$OPTARG ;; - h ) usage;; - \? ) echo "Error: Unknown parameter '-$OPTARG'." - exit 1;; - esac -done - -shift $((OPTIND - 1)) -TARGET=$1 -shift -echo "You are about to create a Tomcat instance in directory '$TARGET'" - -# Fail if no target specified -if [ -z "${TARGET}" ]; then - echo "Error: No target directory specified (use -d)." - exit 1 -fi - -# Fail if ports are the same -if [ "${HPORT}" = "${CPORT}" ]; then - echo "Error: HTTP port and control port must be different." - exit 1 -fi - -# Fail if target directory already exists -if [ -d "${TARGET}" ]; then - echo "Error: Target directory already exists." - exit 1 -fi - -# Check ports -checkport HTTP "${HPORT}" -checkport Control "${CPORT}" - -# Ask for confirmation if warnings were printed out -if [ ${warned} -eq 1 ]; then - echo "Press to continue, or type 'no' to abort." - read -r answer - case "$answer" in - [nN][oO]|[nN]) - echo "Aborting." - exit 1 - ;; - esac -fi - -mkdir -p "${TARGET}" - -FULLTARGET=$(cd "${TARGET}" > /dev/null && pwd) - -mkdir "${TARGET}/conf" -mkdir "${TARGET}/logs" -mkdir "${TARGET}/webapps" -mkdir "${TARGET}/work" -mkdir "${TARGET}/temp" -cp -r "${CATALINA_HOME}/user-instance/*" "${TARGET}" - -sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml" - -cat > "${TARGET}/bin/startup.sh" << EOF -#!/bin/sh -export CATALINA_BASE="${FULLTARGET}" -"${CATALINA_HOME}"/bin/startup.sh -echo "Tomcat started" -EOF - -cat > "${TARGET}/bin/shutdown.sh" << EOF -#!/bin/sh -export CATALINA_BASE="${FULLTARGET}" -"${CATALINA_HOME}"/bin/shutdown.sh -echo "Tomcat stopped" -EOF - -chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh" -echo "* New Tomcat instance created in ${TARGET}" -echo "* You might want to edit default configuration in ${TARGET}/conf" -echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance" diff --git a/tomcat.spec b/tomcat.spec index 560c452..1bdc3c9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -22,7 +22,6 @@ %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} %global workdir %{basedir}/work -%global userinstancedir %{homedir}/user-instance Name: tomcat Epoch: 1 @@ -40,9 +39,6 @@ Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt -Source7: %{name}-%{major_version}.%{minor_version}-user-instance-create.sh -Source8: %{name}-%{major_version}.%{minor_version}-setenv.sh -Source9: %{name}-%{major_version}.%{minor_version}-user-instance-create.asciidoc # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -70,7 +66,6 @@ BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd -BuildRequires: rubygem-asciidoctor Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: systemd @@ -80,7 +75,6 @@ Recommends: tomcat-native >= %{native_version} Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} -Suggests: %{name}-user-instance = %{epoch}:%{version}-%{release} %description Tomcat is the servlet container that is used in the official Reference @@ -161,17 +155,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description webapps The ROOT web application for Apache Tomcat. -%package user-instance -Summary: Apache Tomcat - Servlet and JSP engine -- tools to create user instances -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Suggests: %{name} = %{epoch}:%{version}-%{release} -Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} -Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} -Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} - -%description user-instance -Apache Tomcat - Servlet and JSP engine -- tools to create user instances - %prep %setup -q -n %{packdname} # remove pre-built binaries and windows files @@ -232,6 +215,7 @@ touch HACK %install # build initial path structure +# %{__install} -d ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} @@ -255,12 +239,6 @@ touch HACK %{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf -%{__install} -d ${RPM_BUILD_ROOT}%{userinstancedir}/conf -%{__install} -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/tomcat-user-instance-create.sh -%{__install} -D %{SOURCE8} ${RPM_BUILD_ROOT}%{userinstancedir}/bin/setenv.sh - -asciidoctor -b manpage -D ${RPM_BUILD_ROOT}%{_mandir}/man1 -o tomcat-user-instance-create.1 %{SOURCE9} - for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm jar tf ${jar} | grep -E -q '.*\.class' || continue @@ -319,7 +297,6 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: pushd output/build %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} - %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{userinstancedir}/conf %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd @@ -407,11 +384,5 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT -%files user-instance -%license LICENSE -%{userinstancedir} -%{_bindir}/tomcat-user-instance-create.sh -%{_mandir}/man1/tomcat-user-instance-create.1* - %changelog %autochangelog From 33955ca6394eb5a62b83c5941007eca8c6c98243 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:06 +0300 Subject: [PATCH 335/354] Revert "Add Suggests: sections in tomcat package" This reverts commit c76067efd85d5106aa517461e25d286d63898ece. --- tomcat.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 1bdc3c9..a50a7d6 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -68,13 +68,8 @@ BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: systemd - Recommends: tomcat-native >= %{native_version} - -Suggests: %{name}-admin-webapps = %{epoch}:%{version}-%{release} -Suggests: %{name}-docs-webapp = %{epoch}:%{version}-%{release} -Suggests: %{name}-webapps = %{epoch}:%{version}-%{release} +Requires: systemd %description Tomcat is the servlet container that is used in the official Reference From 987625859ec450c28b8e4fd19e90ecb1f36da405 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:07 +0300 Subject: [PATCH 336/354] Revert "Reorganize docs and add RUNNING.txt file in tomcat-common package" This reverts commit e4b70e261a6f8ce13784f4ec086867792000c8d1. --- tomcat-10.1-RUNNING.txt | 133 ---------------------------------------- tomcat-10.1.conf | 4 +- tomcat.spec | 23 ++----- 3 files changed, 6 insertions(+), 154 deletions(-) delete mode 100644 tomcat-10.1-RUNNING.txt diff --git a/tomcat-10.1-RUNNING.txt b/tomcat-10.1-RUNNING.txt deleted file mode 100644 index e114b14..0000000 --- a/tomcat-10.1-RUNNING.txt +++ /dev/null @@ -1,133 +0,0 @@ -================================================================================ - 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. -================================================================================ - - =================================================== - Running The Apache Tomcat 10.1 Servlet/JSP Container - =================================================== - -Apache Tomcat 10.1 requires a Java Standard Edition Runtime -Environment (JRE) version 11 or later. - -============================= -Running With JRE 11 Or Later -============================= - -(1) Download and Install a Java SE Runtime Environment (JRE) or a full Java Development Kit (JDK), release version 11 or later. - -(2) Configure Environment Variables - -Tomcat is a Java application and does not use environment variables directly. -Environment variables are used by the Tomcat startup scripts. The scripts use -the environment variables to prepare the command that starts Tomcat. - -The CATALINA_HOME (required) environment variable should be set to the location of the -root directory of the "binary" distribution of Tomcat. It defaults to /usr/share/tomcat/ - -The CATALINA_BASE (optional) environment variable specifies location of the root -directory of the "active configuration" of Tomcat. It defaults to /var/lib/tomcat/ - -(3) Set JAVA_HOME (required) - -Variable is used to specify location of a Java Runtime -Environment or of a Java Development Kit that is used to start Tomcat. - -/usr/libexec/tomcat/tomcat-locate-java.sh script is ran by default when starting the tomcat service -and tries to set JAVA_HOME, if empty, without any user interaction. - -(4) Other variables (optional) - -See the comments at the top of /usr/share/tomcat/bin/catalina.sh script for -the list and a description of each of them. - -One frequently used variable is CATALINA_OPTS. It allows specification of -additional options for the java command that starts Tomcat. - -See the Java documentation for the options that affect the Java Runtime -Environment. - -See the "System Properties" page in the Tomcat Configuration Reference for -the system properties that are specific to Tomcat. - -A similar variable is JAVA_OPTS. It is used less frequently. It allows -specification of options that are used both to start and to stop Tomcat as well -as for other commands. - -Note: Do not use JAVA_OPTS to specify memory limits. You do not need much -memory for a small process that is used to stop Tomcat. Those settings -belong to CATALINA_OPTS. - -Another frequently used variable is CATALINA_PID. It -specifies the location of the file where process id of the forked Tomcat -java process will be written. This setting is optional. It will activate -the following features: - - * better protection against duplicate start attempts and - * allows forceful termination of Tomcat process when it does not react to - the standard shutdown command. - -You can assign those variables in /etc/tomcat/tomcat.conf when running Tomcat as a service. - -(4) Start Up Tomcat As A Service - -(4.1) Tomcat can be started by executing: - - $systemctl start tomcat.service - -(4.2) After startup, the default web applications included with tomcat-webapps package will be - available by visiting: - - http://localhost:8080/ - -(4.3) Further information about configuring and running Tomcat can be found in - the documentation included in tomcat-docs-webapp package, as well as on the Tomcat website: - - https://tomcat.apache.org/ - -(5) Check Tomcat Service Status - -$systemctl status tomcat.service - -(6) Shut Down Tomcat Service - -$systemctl stop tomcat.service - -================ -Troubleshooting -================ - -There are only really 2 things likely to go wrong during the stand-alone -Tomcat install: - -(1) The most common hiccup is when another web server (or any process for that - matter) has laid claim to port 8080. This is the default HTTP port that - Tomcat attempts to bind to at startup. To change this, open the file: - - $CATALINA_HOME/conf/server.xml - - and search for '8080'. Change it to a port that isn't in use, and is - greater than 1024, as ports less than or equal to 1024 require superuser - access to bind under UNIX. - - Restart Tomcat and you're in business. Be sure that you replace the "8080" - in the URL you're using to access Tomcat. For example, if you change the - port to 1977, you would request the URL http://localhost:1977/ in your - browser. - -(2) The 'localhost' machine isn't found. This could happen if you're behind a - proxy. If that's the case, make sure the proxy configuration for your - browser knows that you shouldn't be going through the proxy to access the - "localhost". diff --git a/tomcat-10.1.conf b/tomcat-10.1.conf index fbb3951..a698426 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -3,10 +3,10 @@ # Include here and not in JAVA_OPTS all options, that should only be used by Tomcat itself. # Examples are heap size, GC logging, JMX ports etc. -#export CATALINA_OPTS="-Xmx512m -Xms256m" +#export CATALINA_OPTS="-Dcatalina.http.port=8082" # Java runtime options used when any command is executed. -#export JAVA_OPTS="" +#export JAVA_OPTS="-Xmx512m -Xms256m" # To enable remote debugging uncomment the following line. # You will then be able to use a Java debugger on port 8000. diff --git a/tomcat.spec b/tomcat.spec index a50a7d6..f603e54 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -38,7 +38,6 @@ Source2: %{name}-%{major_version}.%{minor_version}.logrotate Source3: %{name}-%{major_version}.%{minor_version}.service Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh Source5: %{name}-%{major_version}.%{minor_version}-start.sh -Source6: %{name}-%{major_version}.%{minor_version}-RUNNING.txt # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch @@ -167,12 +166,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices -sed -i -e "s/@VERSION@/%{version}/g" \ - -e "s/@VERSION_MAJOR_MINOR@/%{major_version}.%{minor_version}/g" \ - -e "s/@VERSION_MAJOR@/%{major_version}/g" \ - -e "s/@MIN_JAVA_VERSION@/%{min_java_version}/g" \ - -e "s/@JDT_VERSION@/x/g" RELEASE-NOTES - # Create a sysusers.d config file cat >tomcat.sysusers.conf < Date: Mon, 28 Jul 2025 16:09:07 +0300 Subject: [PATCH 337/354] Revert "Add min_java_version variable" This reverts commit 6313caf0fda55b4b222de9fbe5a31d7d46c7cf69. --- tomcat.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index f603e54..7ad4bc5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -6,7 +6,6 @@ %global servletspec 6.0 %global elspec 5.0 %global tcuid 53 -%global min_java_version 11 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java %global native_version 2.0.8 @@ -107,7 +106,7 @@ Apache Tomcat JSP API Implementation Classes. %package common Summary: Apache Tomcat - Servlet and JSP engine -- common files -Requires: (java-headless >= %{min_java_version} or java >= %{min_java_version}) +Requires: (java-headless >= 11 or java >= 11) Requires: %{name}-lib = %{epoch}:%{version}-%{release} %description common From 25b0e35ce6b33437ae72311d5e50bd4fa1813a9e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:07 +0300 Subject: [PATCH 338/354] Revert "Introduce tomcat-common subpackage" This reverts commit da88992d305c75f9c407eeedbd28be0ef038237d. --- tomcat.spec | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 7ad4bc5..e39e9e4 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -65,7 +65,8 @@ BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration BuildRequires: systemd -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: (java-headless >= 11 or java >= 11) +Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} Requires: systemd @@ -104,14 +105,6 @@ Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. -%package common -Summary: Apache Tomcat - Servlet and JSP engine -- common files -Requires: (java-headless >= 11 or java >= 11) -Requires: %{name}-lib = %{epoch}:%{version}-%{release} - -%description common -Apache Tomcat - Servlet and JSP engine -- common files - %package lib Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} @@ -270,7 +263,6 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom %mvn_package ":tomcat-el-api" tomcat-el-api %mvn_package ":tomcat-jsp-api" tomcat-jsp-api %mvn_package ":tomcat-servlet-api" tomcat-servlet-api -%mvn_package ":tomcat-bootstrap" tomcat-common %mvn_install @@ -307,9 +299,10 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files %doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} %{_unitdir}/%{name}.service -%{_libexecdir}/%{name}/tomcat-start.sh +%{_libexecdir}/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf +%{homedir} %{baseconfdir} %{baselogdir} %{workdir} @@ -340,12 +333,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files docs-webapp %{appdir}/docs -%files common -f .mfiles-tomcat-common -%{_libexecdir}/%{name}/tomcat-locate-java.sh -%{homedir}/bin - %files lib -f .mfiles -%{homedir}/lib %{libdir}/jakartaee-migration-x.jar %{libdir}/ecj-x.jar %exclude %{libdir}/tomcat-jni.pom From 79945597b972036788be4f873ee038546963e61c Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:08 +0300 Subject: [PATCH 339/354] Revert "- This commit introduces the major change of dropping the custom scripts and using the upstream scripts for tomcat deployment." This reverts commit 0ca450977f6e29b85c371b7cc706b3d61decedd5. --- module-start-up-parameters.conf | 8 ++ tomcat-10.1-digest.script | 45 +++++++++ tomcat-10.1-locate-java.sh | 21 ----- tomcat-10.1-start.sh | 18 ---- ...h => tomcat-10.1-tomcat-users-webapp.patch | 0 tomcat-10.1-tool-wrapper.script | 45 +++++++++ tomcat-10.1.conf | 54 +++++++---- tomcat-10.1.service | 35 ++----- tomcat-10.1.sysconfig | 11 +++ tomcat-10.1.wrapper | 24 +++++ tomcat-10.1-build.patch => tomcat-build.patch | 0 tomcat-functions | 21 +++++ tomcat-named.service | 24 +++++ tomcat-preamble | 52 ++++++++++ tomcat-server | 25 +++++ tomcat.spec | 94 ++++++++++++++----- 16 files changed, 367 insertions(+), 110 deletions(-) create mode 100644 module-start-up-parameters.conf create mode 100644 tomcat-10.1-digest.script delete mode 100644 tomcat-10.1-locate-java.sh delete mode 100644 tomcat-10.1-start.sh rename tomcat-10.1-users-webapp.patch => tomcat-10.1-tomcat-users-webapp.patch (100%) create mode 100644 tomcat-10.1-tool-wrapper.script create mode 100644 tomcat-10.1.sysconfig create mode 100644 tomcat-10.1.wrapper rename tomcat-10.1-build.patch => tomcat-build.patch (100%) create mode 100644 tomcat-functions create mode 100644 tomcat-named.service create mode 100644 tomcat-preamble create mode 100644 tomcat-server diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf new file mode 100644 index 0000000..7f8652a --- /dev/null +++ b/module-start-up-parameters.conf @@ -0,0 +1,8 @@ +# Add the module start-up parameters required by Tomcat +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JAVA_OPTS + diff --git a/tomcat-10.1-digest.script b/tomcat-10.1-digest.script new file mode 100644 index 0000000..ce4aa0f --- /dev/null +++ b/tomcat-10.1-digest.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_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/tomcat-10.1-locate-java.sh b/tomcat-10.1-locate-java.sh deleted file mode 100644 index cb272e7..0000000 --- a/tomcat-10.1-locate-java.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# Script looking for a Java runtime suitable for running Tomcat. -#The Java runtime found is exported in the JAVA_HOME environment variable. -set -e -if [ -z "$JAVA_HOME" ]; then - INSTALLATION_PATH="/usr/lib/jvm/" - for jvmdir in "${INSTALLATION_PATH}"java* "${INSTALLATION_PATH}"jre*; do - if [ -d "${jvmdir}" ] && [ -r "${jvmdir}/bin/java" ]; then - MAJOR_JAVA_VERSION=$("${jvmdir}/bin/java" --version | head -n 1 | sed -E 's/^[^0-9]*1\.([0-9]+).*/\1/; t; s/^[^0-9]*([0-9]+)\..*/\1/') - # Tomcat 10 requires Java >= 11 - if [ "${MAJOR_JAVA_VERSION}" -ge 11 ]; then - export JAVA_HOME="${jvmdir}" - exit 0 - fi - fi - done -fi -if [ -z "$JAVA_HOME" ]; then - echo "No JDK or JRE found - Please set the JAVA_HOME variable." - exit 1 -fi diff --git a/tomcat-10.1-start.sh b/tomcat-10.1-start.sh deleted file mode 100644 index d682610..0000000 --- a/tomcat-10.1-start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Startup script for Apache Tomcat with systemd - -set -e - -# Load the service settings -. /etc/tomcat/tomcat.conf - -# Try to find Java installation and set JAVA_HOME -/bin/sh /usr/libexec/tomcat/tomcat-locate-java.sh - -# Enable the Java security manager? -SECURITY="" -[ "$SECURITY_MANAGER" = "true" ] && SECURITY="-security" - - -# Start Tomcat -cd "$CATALINA_BASE" && "$CATALINA_HOME"/bin/catalina.sh run $SECURITY \ No newline at end of file diff --git a/tomcat-10.1-users-webapp.patch b/tomcat-10.1-tomcat-users-webapp.patch similarity index 100% rename from tomcat-10.1-users-webapp.patch rename to tomcat-10.1-tomcat-users-webapp.patch diff --git a/tomcat-10.1-tool-wrapper.script b/tomcat-10.1-tool-wrapper.script new file mode 100644 index 0000000..949d46d --- /dev/null +++ b/tomcat-10.1-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/tomcat-10.1.conf b/tomcat-10.1.conf index a698426..c83305a 100644 --- a/tomcat-10.1.conf +++ b/tomcat-10.1.conf @@ -1,24 +1,42 @@ -# Minimum required Java version is 11. -#export JAVA_HOME=/usr/lib/jvm/java-11 +# 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. -# Include here and not in JAVA_OPTS all options, that should only be used by Tomcat itself. -# Examples are heap size, GC logging, JMX ports etc. -#export CATALINA_OPTS="-Dcatalina.http.port=8082" +# This variable is used to figure out if config is loaded or not. +TOMCAT_CFG_LOADED="1" -# Java runtime options used when any command is executed. -#export JAVA_OPTS="-Xmx512m -Xms256m" +# 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/" -# To enable remote debugging uncomment the following line. -# You will then be able to use a Java debugger on port 8000. -#export JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n" +# Where your java installation lives +JAVA_HOME="/usr/lib/jvm/jre" -# Java compiler to use for translating JavaServer Pages (JSPs). You can use all -# compilers that are accepted by Ant's build.compiler property. -#export JSP_COMPILER=javac -#export JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" +# Where your tomcat installation lives +CATALINA_HOME="@@@TCHOME@@@" -# Enable the Java security manager? (true/false, default: false) -#export SECURITY_MANAGER=true +# System-wide tmp +CATALINA_TMPDIR="/var/cache/tomcat/temp" -# Whether to compress logfiles older than today's -#export LOGFILE_COMPRESS=1 \ No newline at end of file +# You can change your tomcat locale here +#LANG="en_US" + +# Run tomcat under the Java Security Manager +SECURITY_MANAGER="false" + +# If you wish to further customize your tomcat environment, +# put your own definitions here +# (i.e. LD_LIBRARY_PATH for some jdbc drivers) + +# You can also pass parameters to Java here by defining JAVA_OPTS variable +# (e.g. JAVA_OPTS="-Xminf0.1 -Xmaxf0.3") diff --git a/tomcat-10.1.service b/tomcat-10.1.service index 55639b2..832e7c6 100644 --- a/tomcat-10.1.service +++ b/tomcat-10.1.service @@ -1,39 +1,20 @@ -# Systemd unit file for for Apache Tomcat +# 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 -Documentation=https://tomcat.apache.org/tomcat-10.1-doc/index.html After=syslog.target network.target -RequiresMountsFor=/var/log/tomcat /var/lib/tomcat [Service] -# Configuration -Environment="CATALINA_HOME=/usr/share/tomcat" -Environment="CATALINA_BASE=/var/lib/tomcat" -Environment="CATALINA_TMPDIR=/tmp" -Environment="JAVA_OPTS=-Djava.awt.headless=true" - -# Lifecycle Type=simple -ExecStart=/bin/sh /usr/libexec/tomcat/tomcat-start.sh +EnvironmentFile=/etc/tomcat/tomcat.conf +Environment="NAME=" +EnvironmentFile=-/etc/sysconfig/tomcat +ExecStart=/usr/libexec/tomcat/server start SuccessExitStatus=143 -Restart=on-abort - -# Logging -SyslogIdentifier=tomcat - -# Security User=tomcat -Group=tomcat -PrivateTmp=yes -AmbientCapabilities=CAP_NET_BIND_SERVICE -NoNewPrivileges=true -CacheDirectory=tomcat -CacheDirectoryMode=750 -ProtectSystem=strict -ReadWritePaths=/etc/tomcat/Catalina/ -ReadWritePaths=/var/lib/tomcat/webapps/ -ReadWritePaths=/var/log/tomcat/ [Install] WantedBy=multi-user.target diff --git a/tomcat-10.1.sysconfig b/tomcat-10.1.sysconfig new file mode 100644 index 0000000..3117bf7 --- /dev/null +++ b/tomcat-10.1.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/tomcat-10.1.wrapper b/tomcat-10.1.wrapper new file mode 100644 index 0000000..c97cb85 --- /dev/null +++ b/tomcat-10.1.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/tomcat-10.1-build.patch b/tomcat-build.patch similarity index 100% rename from tomcat-10.1-build.patch rename to tomcat-build.patch diff --git a/tomcat-functions b/tomcat-functions new file mode 100644 index 0000000..1187653 --- /dev/null +++ b/tomcat-functions @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -r /usr/share/java-utils/java-functions ]; then + . /usr/share/java-utils/java-functions +else + echo "Can't read Java functions library, aborting" + exit 1 +fi + +_save_function() { + local ORIG_FUNC=$(declare -f $1) + local NEWNAME_FUNC="$2${ORIG_FUNC#$1}" + eval "$NEWNAME_FUNC" +} + +_save_function run run_java + +run() { + run_java $@ +} + diff --git a/tomcat-named.service b/tomcat-named.service new file mode 100644 index 0000000..b6cd8bd --- /dev/null +++ b/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/tomcat-preamble b/tomcat-preamble new file mode 100644 index 0000000..1271dca --- /dev/null +++ b/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/tomcat-server b/tomcat-server new file mode 100644 index 0000000..17ae385 --- /dev/null +++ b/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/tomcat.spec b/tomcat.spec index e39e9e4..6b5787b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -20,6 +20,7 @@ %global libdir %{_javadir}/%{name} %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} +%global tempdir %{cachedir}/temp %global workdir %{basedir}/work Name: tomcat @@ -33,15 +34,22 @@ License: Apache-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 -Source2: %{name}-%{major_version}.%{minor_version}.logrotate -Source3: %{name}-%{major_version}.%{minor_version}.service -Source4: %{name}-%{major_version}.%{minor_version}-locate-java.sh -Source5: %{name}-%{major_version}.%{minor_version}-start.sh +Source2: %{name}-%{major_version}.%{minor_version}.sysconfig +Source3: %{name}-%{major_version}.%{minor_version}.wrapper +Source4: %{name}-%{major_version}.%{minor_version}.logrotate +Source5: %{name}-%{major_version}.%{minor_version}-digest.script +Source6: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script +Source7: %{name}-%{major_version}.%{minor_version}.service +Source8: %{name}-functions +Source9: %{name}-preamble +Source10: %{name}-server +Source11: %{name}-named.service +Source12: module-start-up-parameters.conf # https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch -Patch1: %{name}-%{major_version}.%{minor_version}-users-webapp.patch -Patch2: %{name}-%{major_version}.%{minor_version}-build.patch +Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +Patch2: %{name}-build.patch # catalina.policy patch to allow ECJ usage under the Security Manager Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1857043 @@ -52,9 +60,7 @@ Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch Patch6: rhbz-1857043.patch BuildArch: noarch -# Can't use noarch since we are packaging tomcat-jni.jar. -# See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Java/#_architecture_support -ExclusiveArch: %{java_arches} +ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: ecj @@ -63,9 +69,9 @@ BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: tomcat-jakartaee-migration -BuildRequires: systemd Requires: (java-headless >= 11 or java >= 11) +Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} Recommends: tomcat-native >= %{native_version} Requires: systemd @@ -112,6 +118,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj >= 4.20 Recommends: tomcat-jakartaee-migration +Requires(preun): coreutils %description lib Libraries needed to run the Tomcat Web container. @@ -195,8 +202,10 @@ touch HACK %install # build initial path structure -# %{__install} -d ${RPM_BUILD_ROOT}%{_bindir} +%{__install} -d ${RPM_BUILD_ROOT}%{_bindir} +%{__install} -d ${RPM_BUILD_ROOT}%{_sbindir} %{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d +%{__install} -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d ${RPM_BUILD_ROOT}%{appdir} %{__install} -d ${RPM_BUILD_ROOT}%{bindir} %{__install} -d ${RPM_BUILD_ROOT}%{confdir} @@ -205,19 +214,12 @@ touch HACK /bin/echo "Place your custom *.conf files here. Shell expansion is supported." > ${RPM_BUILD_ROOT}%{confdir}/conf.d/README %{__install} -d ${RPM_BUILD_ROOT}%{libdir} %{__install} -d ${RPM_BUILD_ROOT}%{logdir} +%{__install} -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats %{__install} -d ${RPM_BUILD_ROOT}%{homedir} -%{__install} -d ${RPM_BUILD_ROOT}%{cachedir} +%{__install} -d ${RPM_BUILD_ROOT}%{tempdir} %{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} %{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} -%{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE2} > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled -%{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-locate-java.sh -%{__install} %{SOURCE5} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/%{name}-start.sh - -%{__install} -D tomcat.sysusers.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/tomcat.conf - for jar in output/build/lib/*.jar; do # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm jar tf ${jar} | grep -E -q '.*\.class' || continue @@ -235,7 +237,7 @@ for jar in output/build/lib/*.jar; do sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" ${pom} case "${jarname}" in - tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni %{libdir}/tomcat-jni ;; + tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni ;; jsp-api) %mvn_file org.apache.tomcat:tomcat-jsp-api tomcat/jsp-api tomcat/%{name}-jsp-%{jspspec}-api %{name}-jsp-%{jspspec}-api %{name}-jsp-api ;; servlet-api) %mvn_file org.apache.tomcat:tomcat-servlet-api tomcat/servlet-api tomcat/%{name}-servlet-%{servletspec}-api %{name}-servlet-%{servletspec}-api %{name}-servlet-api ;; el-api) %mvn_file org.apache.tomcat:tomcat-el-api tomcat/el-api tomcat/%{name}-el-%{servletspec}-api %{name}-el-%{servletspec}-api %{name}-el-api ;; @@ -253,8 +255,9 @@ sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom # bootstrap does not have a pom, generate one %mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar -%mvn_file org.apache.tomcat:tomcat-bootstrap tomcat/tomcat-bootstrap -%mvn_file org.apache.tomcat:tomcat-juli tomcat/tomcat-juli +#Create symlinks to bindir +%mvn_file :tomcat-bootstrap tomcat/tomcat-bootstrap ${RPM_BUILD_ROOT}%{bindir}/bootstrap.jar +%mvn_file :tomcat-juli tomcat/tomcat-juli ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar # tomcat-parent pom sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom @@ -273,24 +276,56 @@ jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: # move things into place pushd output/build - %{__cp} -a bin/* ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a bin/*.xml ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__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" %{SOURCE2} \ + > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} +%{__install} %{SOURCE3} \ + ${RPM_BUILD_ROOT}%{_sbindir}/%{name} +%{__install} %{SOURCE7} \ + ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ + > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper + +%{__install} %{SOURCE8} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions +%{__install} %{SOURCE9} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble +%{__install} %{SOURCE10} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server +%{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service +%{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ + ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar ln -sr $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) ${RPM_BUILD_ROOT}%{libdir}/jakartaee-migration-x.jar ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} ln -sr %{logdir} ${RPM_BUILD_ROOT}%{baselogdir} -ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib + +install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %post # install but don't activate %systemd_post %{name}.service %preun +# clean tempdir and workdir on removal or upgrade +%{__rm} -rf %{workdir}/* %{tempdir}/* %systemd_preun %{name}.service %postun @@ -298,8 +333,14 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %files %doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} +%{_bindir}/%{name}-digest +%{_bindir}/%{name}-tool-wrapper +%{_sbindir}/%{name} %{_unitdir}/%{name}.service +%{_unitdir}/%{name}@.service %{_libexecdir}/%{name} +%{_localstatedir}/lib/tomcats +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled %{_sysusersdir}/tomcat.conf %{homedir} @@ -308,6 +349,7 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{workdir} %attr(2770,tomcat,adm) %dir %{logdir} %attr(750,tomcat,tomcat) %dir %{cachedir} +%attr(0770,root,tomcat) %{tempdir} %attr(2775,tomcat,tomcat) %dir %{appdir} %{confdir}/conf.d @@ -334,9 +376,9 @@ ln -sr %{libdir} ${RPM_BUILD_ROOT}%{homedir}/lib %{appdir}/docs %files lib -f .mfiles +%defattr(644, root, tomcat, 2775) %{libdir}/jakartaee-migration-x.jar %{libdir}/ecj-x.jar -%exclude %{libdir}/tomcat-jni.pom %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %doc LICENSE From 3b3d4720d719fb08bdf88edab78a047a778e073f Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:08 +0300 Subject: [PATCH 340/354] Revert "Remove javapackages test case rule from gating" This reverts commit 2c9c3acaccc5eb73509a13d07e1115c005448592. --- gating.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gating.yaml b/gating.yaml index e49f5a7..b81b8c4 100644 --- a/gating.yaml +++ b/gating.yaml @@ -9,4 +9,5 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} From 3c60e9fb09464f4d385e536bdc12d234589f3896 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:08 +0300 Subject: [PATCH 341/354] Revert "Use ecj and jakartaee-migration jars from the installed system rather than distributing the jars in tomcat-lib package." This reverts commit 727c3d6f657ad7d523dbf99c662d7e1bbcacc36f. --- tomcat.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 6b5787b..b25b959 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -191,7 +191,7 @@ touch HACK -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration)" \ + -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \ deploy # remove some jars that we'll replace with symlinks later @@ -310,8 +310,15 @@ popd %{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service %{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ -ln -sr $(build-classpath ecj/ecj) ${RPM_BUILD_ROOT}%{libdir}/ecj-x.jar -ln -sr $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) ${RPM_BUILD_ROOT}%{libdir}/jakartaee-migration-x.jar +pushd output/build + %{_bindir}/build-jar-repository lib ecj 2>&1 + %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1 +popd + +pushd ${RPM_BUILD_ROOT}%{libdir} + %{__cp} $(build-classpath ecj/ecj) ecj-x.jar + %{__cp} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration-x.jar +popd ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} From 397fdf2e2e4ee04a6933417dc8850278f59dba1d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:09:09 +0300 Subject: [PATCH 342/354] Revert "General tweaks, fixes and enhancements" This reverts commit a7d2bc1fe90786612fc38330fc1903c42f7e7f8b. --- changelog | 643 ------------------------------- tomcat.spec | 1050 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 905 insertions(+), 788 deletions(-) delete mode 100644 changelog diff --git a/changelog b/changelog deleted file mode 100644 index 7d2f562..0000000 --- a/changelog +++ /dev/null @@ -1,643 +0,0 @@ -* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 -- Update to version 10.1.34 - -* Mon Dec 09 2024 Packit - 1:9.0.98-1 -- Update to version 9.0.98 -- Resolves: rhbz#2331168 - -* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 -- Update to version 9.0.97 -- Resolves: rhbz#2327090 - -* Tue Oct 08 2024 Packit - 1:9.0.96-1 -- Update to version 9.0.96 -- Resolves: rhbz#2317237 - -* Tue Sep 17 2024 Packit - 1:9.0.95-1 -- Update to version 9.0.95 -- Resolves: rhbz#2312858 - -* Tue Sep 10 2024 Packit - 1:9.0.94-1 -- Update to version 9.0.94 -- Resolves: rhbz#2311320 - -* Tue Aug 06 2024 Packit - 1:9.0.93-1 -- Update to version 9.0.93 -- Resolves: rhbz#2303026 - -* Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 -- convert license to SPDX - -* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 -- Update to 9.0.91 - -* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 -- Update to 9.0.90 - -* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 -- Update to 9.0.89 - -* Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 -- Accept java-21-headless as one of the alternatives for java - -* Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 -- Update to 9.0.83 - -* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 -- Update to 9.0.82 -- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 - -* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 -- Update to 9.0.80 -- Fix java version - -* Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 -- Fix files permission - -* Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 -- Exclude jnidir in the lib subpackage - -* Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 -- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage - -* Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 -- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage -- Update to 9.0.78 - -* Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 -- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide -- Remove JDTCompiler patch because ecj has been update -- Update to 9.0.76 -- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java -- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages - -* Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 -- Update to 9.0.75 - -* Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 -- Update to 9.0.73 - -* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 -- Update to 9.0.71 -- Remove osgi-annotations patch -- Add bnd-annotation dependency which is in bndlib package - -* Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 -- Update to 9.0.70 - -* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 -- Update to 9.0.68 - -* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 -- Update to 9.0.65 - -* Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 -- Rebuilt for Drop i686 JDKs - -* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 -- Update to 9.0.64 -- Add osgi-annotations dependency back - -* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 -- Related: rhbz#2061424 Adjust fix so that it uses the proper env var - -* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 -- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection - -* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 -- Update to 9.0.59 -- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability - -* Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 -- Update to 9.0.56 - -* Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 -- Update to 9.0.55 - -* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 -- Update to 9.0.54 - -* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 -- Update to 9.0.53 - -* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 -- Update to 9.0.52 - -* Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 06 2021 Hui Wang - 1:9.0.50-1 -- Update to 9.0.50 - -* Sat Jun 05 2021 Coty Sutherland - 1:9.0.45-4 -- Add back logrotate config file per devel list request -- Add mvn virtual provides back for the servlet, el, and jsp spec impls - -* Fri Jun 04 2021 Coty Sutherland - 1:9.0.45-3 -- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused - -* Thu Jun 03 2021 Coty Sutherland - 1:9.0.45-2 -- Remove examples webapps from subpackage -- Updates to javapackages-local removed %%add_maven_depmap which broke the build, - so I removed the maven artifacts as they aren't very useful anyway -- Drop JSVC support as it's not very useful these days -- Drop geronimo-saaj as it's no longer required - -* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 -- Update to 9.0.45 - -* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 -- Update to 9.0.44 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 -- Update to 9.0.43 - -* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 -- Update to 9.0.41 - -* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 -- Update to 9.0.40 - -* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 -- Update to 9.0.39 - -* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 -- Update to 9.0.38 - -* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3 -- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars - -* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 -- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar - -* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 -- Update to 9.0.37 - -* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 -- Upgrade to 9.0.36 - -* Sun May 31 2020 Hui Wang - 1:9.0.35-2 -- Upgrade to 9.0.35 - -* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 -- Add updated catalina.policy patch to allow ECJ usage under the Security Manager - -* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 -- Update to 9.0.34 - -* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 -- Update to 9.0.31 -- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability - -* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 -- Update to 9.0.30 - -* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 -- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts - -* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 -- Update to 9.0.26 -- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names -- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user - -* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 -- Update build-classpath calls to ECJ to specify the JAR we want to use - -* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 -- Update to 9.0.21 - -* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 -- Remove javadoc subpackage to drop the jpackage-utils dependency - -* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 -- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) -- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit - -* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 -- Update to 9.0.13 -- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet - -* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 -- Drop legcy sys-v bits - -* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 -- Update to 9.0.10 -- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS -- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins -- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client -- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up - -* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 -- Update to 9.0.7 - -* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 -- Update to 8.5.29 -- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources -- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users - -* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 -- Escape macros in %%changelog - -* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 -- Update to 8.0.49 - -* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3 -- Cleanup spec file conditionals - -* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 -- Change "zip -u" to "zip" -- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition - -* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 -- Update to 8.0.47 -- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 - -* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 -- Update to 8.0.46 -- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning - -* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 -- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism - -* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 -- Update to 8.0.43 - -* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 -- Update to 8.0.42 - -* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 -- Update to 8.0.41 -- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing - -* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 -- Update to 8.0.39 -- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws - -* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 -- Update to 8.0.38 - -* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 -- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation -- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service - -* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 -- Rebase to 8.0.37 -- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header -- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated - -* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 -- Related: rhbz#1349469 Correct typo in changelog entry - -* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 -- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) -- Resolves: rhbz#1364056 The command tomcat-digest doesn't work -- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken -- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully -- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) -- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out -- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded -- Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api -- Resolves: asfbz#59960 Building javadocs with java8 fails - -* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 -- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 -- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 - -* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 -- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 -- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 - -* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2 -- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 - -* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 -- Updated to 8.0.32 -- Remove log4j support. It has never been working actually. See rhbz#1236297 -- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 -- Recommend tomcat-native, resolves: rhbz#1243132 - -* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 -- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml -- Program /bin/nologin does not exist (#1302718) - -* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2 -- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) - -* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 -- Update to 8.0.26. - -* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 -- Update to 8.0.24. - -* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 -- Drop javax.el:el-api alias. - -* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 -- Update to 8.0.23. - -* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 -- Drop jetty alias for servlet. - -* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 -- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} - -* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 -- Rebuild against tomcat-taglibs-standard. - -* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 -- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. -- Drop old provides. - -* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 -- Bump epoch to maintain upgrade path from Fedora 22 - -* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 -- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} - -* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 -- Updated to 8.0.18 - -* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 -- Updated to 8.0.12 -- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 -- Use CATALINA_OPTS only on start, resolves: rhbz#1051194 - -* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 -- jsp-api requires el-api - -* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 -- Update to upstream 7.0.54 - fixes compile with Java 8. - -* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 -- Drop servlet/el api provides to reduce user machines ending with both. - -* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 -- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 -- Move log4j support into subpackage, resolves: rhbz#1027716 - -* Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1 -- Updated to 7.0.52 -- Rewrite jsvc implementation, resolves: rhbz#1051743 -- Switch to java-headless R, resolves: rhbz#1068566 -- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 -- Add pom for tomcat-jdbc, resolves: rhbz#1011003 - -* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 -- Fix installation of Maven metadata for tomcat-juli.jar -- Resolves: rhbz#1033664 - -* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2 -- Rebuild for bug #1033664 - -* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 -- Updated to 7.0.47 -- Fix java.security.policy - -* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2 -- Remove jpackage-utils R - -* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 -- Updated to 7.0.42 - -* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3 -- Dropped systemv inits. Bye-bye. -- Updated the systemd wrappers to allow running multiple instances. - Added wrapper scripts to do that, ported the original non-named - service file to work with the same wrappers, updated - /usr/sbin/tomcat to call systemctl. - -* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 -- Updated to 7.0.40 -- Resolves: rhbz 956569 added missing commons-pool link -- Remove ant-nodeps BR - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 -- Add depmaps for org.eclipse.jetty.orbit -- Resolves: rhbz#917626 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 -- Updated to 7.0.39 - -* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 -- Updated to 7.0.37 - -* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 -- Updated to 7.0.35 -- systemd SuccessExitStatus=143 for proper stop exit code processing - -* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 -- Updated to 7.0.34 -- ecj >= 4.2.1 now required -- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME - -* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 -- Resolves: rhbz 883806 refix logdir ownership - -* Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 -- Updated to 7.0.33 -- Resolves: rhbz 873620 need chkconfig for update-alternatives - -* Wed Oct 17 2012 Ivan Afonichev 0:7.0.32-1 -- Updated to 7.0.32 -- Resolves: rhbz 842620 symlinks to taglibs - -* Fri Aug 24 2012 Ivan Afonichev 0:7.0.29-1 -- Updated to 7.0.29 -- Add pidfile as tmpfile -- Use systemd for running as unprivileged user -- Resolves: rhbz 847751 upgrade path was broken -- Resolves: rhbz 850343 use new systemd-rpm macros - -* Sat Jul 21 2012 Fedora Release Engineering - 0:7.0.28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 2 2012 Ivan Afonichev 0:7.0.28-1 -- Updated to 7.0.28 -- Resolves: rhbz 820119 Remove bundled apache-commons-dbcp -- Resolves: rhbz 814900 Added tomcat-coyote POM -- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet -- Remove redhat-lsb R - -* Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2 -- Fixed native download hack - -* Sat Apr 7 2012 Ivan Afonichev 0:7.0.27-1 -- Updated to 7.0.27 -- Fixed jakarta-taglibs-standard BR and R - -* Wed Mar 21 2012 Stanislav Ochotnicky - 0:7.0.26-2 -- Add more depmaps to J2EE apis to help jetty/glassfish updates - -* Wed Mar 14 2012 Juan Hernandez 0:7.0.26-2 -- Added the POM files for tomcat-api and tomcat-util (#803495) - -* Wed Feb 22 2012 Ivan Afonichev 0:7.0.26-1 -- Updated to 7.0.26 -- Bug 790334: Change ownership of logdir for logrotate - -* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4 -- Bug 790694: Priorities of jsp, servlet and el packages updated. - -* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 -- Dropped indirect dependecy to tomcat 5 - -* Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 -- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly - -* Sat Jan 21 2012 Ivan Afonichev 0:7.0.25-1 -- Updated to 7.0.25 -- Removed EntityResolver patch (changes already in upstream sources) -- Place poms and depmaps in the same package as jars -- Added javax.servlet.descriptor to export-package of servlet-api -- Move several chkconfig actions and reqs to systemv subpackage -- New maven depmaps generation method -- Add patch to support java7. (patch sent upstream). -- Require java >= 1:1.6.0 - -* Fri Jan 13 2012 Krzysztof Daniel 0:7.0.23-5 -- Exported javax.servlet.* packages in version 3.0 as 2.6 to make - servlet-api compatible with Eclipse. - -* Thu Jan 12 2012 Ivan Afonichev 0:7.0.23-4 -- Move jsvc support to subpackage - -* Wed Jan 11 2012 Alexander Kurtakov 0:7.0.23-2 -- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream). - -* Mon Dec 12 2011 Joseph D. Wagner 0:7.0.23-3 -- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for - starting 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. Must add USE_JSVC="true" to - /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat. - -* Mon Nov 28 2011 Ivan Afonichev 0:7.0.23-1 -- Updated to 7.0.23 - -* Fri Nov 11 2011 Ivan Afonichev 0:7.0.22-2 -- Move tomcat-juli.jar to lib package -- Drop %%update_maven_depmap as in tomcat6 -- Provide native systemd unit file ported from tomcat6 - -* Thu Oct 6 2011 Ivan Afonichev 0:7.0.22-1 -- Updated to 7.0.22 - -* Mon Oct 03 2011 Rex Dieter - 0:7.0.21-3.1 -- rebuild (java), rel-eng#4932 - -* Mon Sep 26 2011 Ivan Afonichev 0:7.0.21-3 -- Fix basedir mode - -* Tue Sep 20 2011 Roland Grunberg 0:7.0.21-2 -- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli. - -* Thu Sep 8 2011 Ivan Afonichev 0:7.0.21-1 -- Updated to 7.0.21 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-3 -- Require java = 1:1.6.0 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-2 -- Require java < 1.7.0 - -* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-1 -- Updated to 7.0.20 - -* Tue Jul 26 2011 Ivan Afonichev 0:7.0.19-1 -- Updated to 7.0.19 - -* Tue Jun 21 2011 Ivan Afonichev 0:7.0.16-1 -- Updated to 7.0.16 - -* Mon Jun 6 2011 Ivan Afonichev 0:7.0.14-3 -- Added initial systemd service -- Fix some paths - -* Sat May 21 2011 Ivan Afonichev 0:7.0.14-2 -- Fixed http source link -- Securify some permissions -- Added licenses for el-api and servlet-api -- Added dependency on jpackage-utils for the javadoc subpackage - -* Sat May 14 2011 Ivan Afonichev 0:7.0.14-1 -- Updated to 7.0.14 - -* Thu May 5 2011 Ivan Afonichev 0:7.0.12-4 -- Provided local paths for libs -- Fixed dependencies -- Fixed update temp/work cleanup - -* Mon May 2 2011 Ivan Afonichev 0:7.0.12-3 -- Fixed package groups -- Fixed some permissions -- Fixed some links -- Removed old tomcat6 crap - -* Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2 -- Package now named just tomcat instead of tomcat7 -- Removed Provides: %%{name}-log4j -- Switched to apache-commons-* names instead of jakarta-commons-* . -- Remove the old changelog -- BR/R java >= 1:1.6.0 , same for java-devel -- Removed old tomcat6 crap - -* Wed Apr 27 2011 Ivan Afonichev 0:7.0.12-1 -- Tomcat7 \ No newline at end of file diff --git a/tomcat.spec b/tomcat.spec index b25b959..8689ef0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,3 +1,33 @@ +# 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 3.1 %global major_version 10 %global minor_version 1 @@ -9,10 +39,9 @@ # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java %global native_version 2.0.8 + # FHS 3.0 compliant tree structure - http://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html %global basedir %{_var}/lib/%{name} -%global baseconfdir %{basedir}/conf -%global baselogdir %{basedir}/logs %global appdir %{basedir}/webapps %global homedir %{_datadir}/%{name} %global bindir %{homedir}/bin @@ -21,7 +50,7 @@ %global logdir %{_var}/log/%{name} %global cachedir %{_var}/cache/%{name} %global tempdir %{cachedir}/temp -%global workdir %{basedir}/work +%global workdir %{cachedir}/work Name: tomcat Epoch: 1 @@ -46,35 +75,39 @@ Source10: %{name}-server Source11: %{name}-named.service Source12: module-start-up-parameters.conf -# https://bugzilla.redhat.com/show_bug.cgi?id=435829 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-build.patch -# catalina.policy patch to allow ECJ usage under the Security Manager Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1857043 Patch4: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch -# Fixes not available constants in ECJ Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1857043 Patch6: rhbz-1857043.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: ant -BuildRequires: ecj +BuildRequires: ant >= 1.10.2 +BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel +BuildRequires: java-devel >= 17 BuildRequires: javapackages-local BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib +BuildRequires: systemd BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) -Requires: javapackages-tools -Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Recommends: tomcat-native >= %{native_version} -Requires: systemd +Requires: (java-headless >= 11 or java >= 11) +Requires: javapackages-tools +Requires: %{name}-lib = %{epoch}:%{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} > 7 +Recommends: tomcat-native >= %{native_version} +%endif +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +# 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 @@ -103,10 +136,9 @@ 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: jsp < %{jspspec} +Obsoletes: %{name}-jsp-api < %{jspspec} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -126,8 +158,7 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} -Obsoletes: servlet < %{servletspec} -Conflicts: tomcat-servlet-4.0-api +Obsoletes: %{name}-servlet-api < %{servletspec} %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -135,8 +166,7 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: el_api < %{elspec} -Conflicts: tomcat-el-3.0-api +Obsoletes: %{name}-el-api < %{elspec} %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -165,11 +195,19 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # 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" "jakarta.servlet:jakarta.servlet-api" +%mvn_package ":tomcat-jsp-api" tomcat-jsp-api +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" +%mvn_package ":tomcat-servlet-api" tomcat-servlet-api + # Create a sysusers.d config file cat >tomcat.sysusers.conf < ${RPM_BUILD_ROOT}%{confdir}/conf.d/README -%{__install} -d ${RPM_BUILD_ROOT}%{libdir} -%{__install} -d ${RPM_BUILD_ROOT}%{logdir} -%{__install} -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats -%{__install} -d ${RPM_BUILD_ROOT}%{homedir} -%{__install} -d ${RPM_BUILD_ROOT}%{tempdir} -%{__install} -d ${RPM_BUILD_ROOT}%{_unitdir} -%{__install} -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} - -for jar in output/build/lib/*.jar; do - # Skip Jar if empty, applies to tomcat-coyote-ffm.jar atm - jar tf ${jar} | grep -E -q '.*\.class' || continue - - jarname=$(basename $jar .jar) - - case "${jarname}" in - jasper) pom="res/maven/tomcat-jasper.pom" ;; - catalina-tribes) pom="res/maven/tomcat-tribes.pom" ;; - catalina-ssi) pom="res/maven/tomcat-ssi.pom" ;; - catalina-storeconfig) pom="res/maven/tomcat-storeconfig.pom" ;; - *) pom=$(ls res/maven/*"${jarname}".pom 2>/dev/null) ;; - esac - - sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" ${pom} - - case "${jarname}" in - tomcat-jni) %mvn_file org.apache.tomcat:tomcat-jni tomcat/tomcat-jni ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni ;; - jsp-api) %mvn_file org.apache.tomcat:tomcat-jsp-api tomcat/jsp-api tomcat/%{name}-jsp-%{jspspec}-api %{name}-jsp-%{jspspec}-api %{name}-jsp-api ;; - servlet-api) %mvn_file org.apache.tomcat:tomcat-servlet-api tomcat/servlet-api tomcat/%{name}-servlet-%{servletspec}-api %{name}-servlet-%{servletspec}-api %{name}-servlet-api ;; - el-api) %mvn_file org.apache.tomcat:tomcat-el-api tomcat/el-api tomcat/%{name}-el-%{servletspec}-api %{name}-el-%{servletspec}-api %{name}-el-api ;; - catalina-tribes) %mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes ;; - catalina-ssi) %mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi ;; - catalina-storeconfig) %mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig ;; - *) %mvn_file org.apache.tomcat:$(sed -n "/.*${jarname}.*<\/artifactId>/ { s/.*\(.*${jarname}.*\)<\/artifactId>.*/\1/; p; q; }" "${pom}" 2>/dev/null) tomcat/${jarname} ;; - esac - - %mvn_artifact ${pom} ${jar} -done - -sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat-juli.pom -%mvn_artifact res/maven/tomcat-juli.pom output/build/bin/tomcat-juli.jar -# bootstrap does not have a pom, generate one -%mvn_artifact 'org.apache.tomcat:tomcat-bootstrap:%{version}' output/build/bin/bootstrap.jar - -#Create symlinks to bindir -%mvn_file :tomcat-bootstrap tomcat/tomcat-bootstrap ${RPM_BUILD_ROOT}%{bindir}/bootstrap.jar -%mvn_file :tomcat-juli tomcat/tomcat-juli ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar - -# tomcat-parent pom -sed -i "s/@MAVEN.DEPLOY.VERSION@/%{version}/g" res/maven/tomcat.pom -%mvn_artifact res/maven/tomcat.pom - -%mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_package ":tomcat-servlet-api" tomcat-servlet-api - -%mvn_install - -# Fixes JAR must have Javapackages-GroupId manifest attribute error -jar ufm ${RPM_BUILD_ROOT}%{libdir}/el-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") -jar ufm ${RPM_BUILD_ROOT}%{libdir}/jsp-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") -jar ufm ${RPM_BUILD_ROOT}%{libdir}/servlet-api.jar <(echo "JavaPackages-GroupId: org.apache.tomcat") +%{__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/*.xml ${RPM_BUILD_ROOT}%{bindir} - %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} + %{__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 @@ -289,9 +277,9 @@ popd -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} %{SOURCE3} \ +%{__install} -m 0755 %{SOURCE3} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} %{SOURCE7} \ +%{__install} -m 0644 %{SOURCE7} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled @@ -304,11 +292,33 @@ popd -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} %{SOURCE8} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} %{SOURCE9} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} %{SOURCE10} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service -%{__install} %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ +%{__install} -m 0644 %{SOURCE8} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions +%{__install} -m 0755 %{SOURCE9} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble +%{__install} -m 0755 %{SOURCE10} \ + ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server +%{__install} -m 0644 %{SOURCE11} \ + ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service + +%{__install} -m 0644 %{SOURCE12} ${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 @@ -316,13 +326,84 @@ pushd output/build popd pushd ${RPM_BUILD_ROOT}%{libdir} - %{__cp} $(build-classpath ecj/ecj) ecj-x.jar - %{__cp} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration-x.jar + # 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 + %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar + + cp ../../%{name}/bin/tomcat-juli.jar . popd -ln -sr %{confdir} ${RPM_BUILD_ROOT}%{baseconfdir} -ln -sr %{cachedir} ${RPM_BUILD_ROOT}%{workdir} -ln -sr %{logdir} ${RPM_BUILD_ROOT}%{baselogdir} +# 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 *.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_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api +%mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar +%mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant +%mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha +%mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar +%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina +%mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar +%mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar +%mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar +%mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar +%mvn_artifact res/maven/tomcat-i18n-de.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-de.jar +%mvn_artifact res/maven/tomcat-i18n-es.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-es.jar +%mvn_artifact res/maven/tomcat-i18n-fr.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-fr.jar +%mvn_artifact res/maven/tomcat-i18n-ja.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ja.jar +%mvn_artifact res/maven/tomcat-i18n-ko.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ko.jar +%mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar +%mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar +%mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar +%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el +%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar +%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper +%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar +%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api +%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar +%mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar +%mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar +%mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar +%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi +%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar +%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig +%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar +%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes +%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar +%mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar +%mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar +%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api +%mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar +%mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar +%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar +%mvn_artifact res/maven/tomcat.pom + +%mvn_install install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf @@ -338,44 +419,62 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %postun %systemd_postun_with_restart %{name}.service -%files -%doc {LICENSE,NOTICE,RELEASE-NOTES,RUNNING.txt} -%{_bindir}/%{name}-digest -%{_bindir}/%{name}-tool-wrapper -%{_sbindir}/%{name} -%{_unitdir}/%{name}.service -%{_unitdir}/%{name}@.service -%{_libexecdir}/%{name} -%{_localstatedir}/lib/tomcats -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled -%{_sysusersdir}/tomcat.conf -%{homedir} -%{baseconfdir} -%{baselogdir} -%{workdir} -%attr(2770,tomcat,adm) %dir %{logdir} -%attr(750,tomcat,tomcat) %dir %{cachedir} -%attr(0770,root,tomcat) %{tempdir} -%attr(2775,tomcat,tomcat) %dir %{appdir} +%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} -%{confdir}/conf.d +%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/module-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf -# Configuration files should not be modifiable by the tomcat user, as this can be -# a security issue (an attacker may insert code in a webapp and rewrite the tomcat -# configuration) but those files should be readable by tomcat, so we set the group to tomcat. -%attr(640,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml -%attr(640,root,tomcat) %config(noreplace) %{confdir}/web.xml -%attr(640,root,tomcat) %config(noreplace) %{confdir}/server.xml -%attr(640,root,tomcat) %config(noreplace) %{confdir}/logging.properties -%attr(640,root,tomcat) %config(noreplace) %{confdir}/catalina.properties -%attr(640,root,tomcat) %config(noreplace) %{confdir}/context.xml -%attr(640,root,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml -%attr(640,root,tomcat) %config(noreplace) %{confdir}/catalina.policy -%attr(2775,root,tomcat) %dir %{confdir}/Catalina -%attr(2775,root,tomcat) %dir %{confdir}/Catalina/localhost +%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 +%{_sysusersdir}/tomcat.conf %files admin-webapps +%defattr(0664,root,tomcat,0755) %{appdir}/host-manager %{appdir}/manager @@ -383,22 +482,683 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/docs %files lib -f .mfiles -%defattr(644, root, tomcat, 2775) -%{libdir}/jakartaee-migration-x.jar -%{libdir}/ecj-x.jar +%dir %{libdir} +%{libdir}/*.jar +%{_javadir}/*.jar +%{bindir}/tomcat-juli.jar +%exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{libdir}/%{name}-servlet-%{servletspec}*.jar +%exclude %{libdir}/%{name}-jsp-%{jspspec}*.jar +%exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar +%exclude %{_javadir}/%{name}-el-%{elspec}-api.jar +%exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%exclude %{_javadir}/%{name}-servlet-api.jar +%exclude %{_javadir}/%{name}-el-api.jar +%exclude %{_javadir}/%{name}-jsp-api.jar +%exclude %{_jnidir}/* %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api -%doc LICENSE +%{_javadir}/%{name}-jsp-%{jspspec}*.jar +%{libdir}/%{name}-jsp-%{jspspec}*.jar +%{_javadir}/%{name}-jsp-api.jar %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api %doc LICENSE +%{_javadir}/%{name}-servlet-%{servletspec}*.jar +%{libdir}/%{name}-servlet-%{servletspec}*.jar +%{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api %doc LICENSE +%{_javadir}/%{name}-el-%{elspec}-api.jar +%{libdir}/%{name}-el-%{elspec}-api.jar +%{_javadir}/%{name}-el-api.jar %files webapps %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT %changelog -%autochangelog +* Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 +- Update to version 10.1.34 + +* Mon Dec 09 2024 Packit - 1:9.0.98-1 +- Update to version 9.0.98 +- Resolves: rhbz#2331168 + +* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 +- Update to version 9.0.97 +- Resolves: rhbz#2327090 + +* Tue Oct 08 2024 Packit - 1:9.0.96-1 +- Update to version 9.0.96 +- Resolves: rhbz#2317237 + +* Tue Sep 17 2024 Packit - 1:9.0.95-1 +- Update to version 9.0.95 +- Resolves: rhbz#2312858 + +* Tue Sep 10 2024 Packit - 1:9.0.94-1 +- Update to version 9.0.94 +- Resolves: rhbz#2311320 + +* Tue Aug 06 2024 Packit - 1:9.0.93-1 +- Update to version 9.0.93 +- Resolves: rhbz#2303026 + +* Wed Jul 24 2024 Miroslav Suchý - 1:9.0.91-1 +- convert license to SPDX + +* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 +- Update to 9.0.91 + +* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 +- Update to 9.0.90 + +* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 +- Update to 9.0.89 + +* Thu Feb 29 2024 Adam Williamson - 1:9.0.83-4 +- Accept java-21-headless as one of the alternatives for java + +* Tue Feb 27 2024 Jiri Vanek - 1:9.0.83-3 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 01 2023 Hui Wang - 1:9.0.83-1 +- Update to 9.0.83 + +* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 +- Update to 9.0.82 +- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9 + +* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 +- Update to 9.0.80 +- Fix java version + +* Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 +- Fix files permission + +* Wed Jul 26 2023 Hui Wang - 1:9.0.78-3 +- Exclude jnidir in the lib subpackage + +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-2 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage + +* Tue Jul 25 2023 Hui Wang - 1:9.0.78-1 +- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage +- Update to 9.0.78 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:9.0.76-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 20 2023 Hui Wang - 1:9.0.76-2 +- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide +- Remove JDTCompiler patch because ecj has been update +- Update to 9.0.76 +- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java +- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages + +* Thu Jun 08 2023 Hui Wang - 1:9.0.75-1 +- Update to 9.0.75 + +* Fri Mar 17 2023 Hui Wang - 1:9.0.73-1 +- Update to 9.0.73 + +* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 +- Update to 9.0.71 +- Remove osgi-annotations patch +- Add bnd-annotation dependency which is in bndlib package + +* Sat Jan 21 2023 Fedora Release Engineering - 1:9.0.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 +- Update to 9.0.70 + +* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 +- Update to 9.0.68 + +* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 +- Update to 9.0.65 + +* Fri Jul 08 2022 Jiri Vanek - 1:9.0.64-2 +- Rebuilt for Drop i686 JDKs + +* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 +- Update to 9.0.64 +- Add osgi-annotations dependency back + +* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 +- Related: rhbz#2061424 Adjust fix so that it uses the proper env var + +* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 +- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection + +* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 +- Update to 9.0.59 +- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability + +* Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1:9.0.56-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 09 2021 Hui Wang - 1:9.0.56-1 +- Update to 9.0.56 + +* Tue Oct 12 2021 Hui Wang - 1:9.0.55-1 +- Update to 9.0.55 + +* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 +- Update to 9.0.54 + +* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 +- Update to 9.0.53 + +* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 +- Update to 9.0.52 + +* Fri Jul 23 2021 Fedora Release Engineering - 1:9.0.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 06 2021 Hui Wang - 1:9.0.50-1 +- Update to 9.0.50 + +* Sat Jun 05 2021 Coty Sutherland - 1:9.0.45-4 +- Add back logrotate config file per devel list request +- Add mvn virtual provides back for the servlet, el, and jsp spec impls + +* Fri Jun 04 2021 Coty Sutherland - 1:9.0.45-3 +- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused + +* Thu Jun 03 2021 Coty Sutherland - 1:9.0.45-2 +- Remove examples webapps from subpackage +- Updates to javapackages-local removed %%add_maven_depmap which broke the build, + so I removed the maven artifacts as they aren't very useful anyway +- Drop JSVC support as it's not very useful these days +- Drop geronimo-saaj as it's no longer required + +* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 +- Update to 9.0.45 + +* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 +- Update to 9.0.44 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:9.0.43-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 +- Update to 9.0.43 + +* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 +- Update to 9.0.41 + +* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 +- Update to 9.0.40 + +* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 +- Update to 9.0.39 + +* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 +- Update to 9.0.38 + +* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3 +- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars + +* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 +- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar + +* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 +- Update to 9.0.37 + +* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1 +- Upgrade to 9.0.36 + +* Sun May 31 2020 Hui Wang - 1:9.0.35-2 +- Upgrade to 9.0.35 + +* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2 +- Add updated catalina.policy patch to allow ECJ usage under the Security Manager + +* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1 +- Update to 9.0.34 + +* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1 +- Update to 9.0.31 +- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability + +* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1 +- Update to 9.0.30 + +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2 +- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts + +* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1 +- Update to 9.0.26 +- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names +- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user + +* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2 +- Update build-classpath calls to ECJ to specify the JAR we want to use + +* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1 +- Update to 9.0.21 + +* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4 +- Remove javadoc subpackage to drop the jpackage-utils dependency + +* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3 +- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10) +- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit + +* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1 +- Update to 9.0.13 +- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet + +* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2 +- Drop legcy sys-v bits + +* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1 +- Update to 9.0.10 +- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS +- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins +- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client +- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up + +* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1 +- Update to 9.0.7 + +* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1 +- Update to 8.5.29 +- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources +- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users + +* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2 +- Escape macros in %%changelog + +* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1 +- Update to 8.0.49 + +* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3 +- Cleanup spec file conditionals + +* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2 +- Change "zip -u" to "zip" +- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition + +* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1 +- Update to 8.0.47 +- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615 + +* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1 +- Update to 8.0.46 +- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning + +* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1 +- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism + +* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1 +- Update to 8.0.43 + +* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1 +- Update to 8.0.42 + +* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1 +- Update to 8.0.41 +- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing + +* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1 +- Update to 8.0.39 +- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws + +* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1 +- Update to 8.0.38 + +* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3 +- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation +- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service + +* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1 +- Rebase to 8.0.37 +- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header +- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated + +* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2 +- Related: rhbz#1349469 Correct typo in changelog entry + +* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1 +- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) +- Resolves: rhbz#1364056 The command tomcat-digest doesn't work +- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken +- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully +- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) +- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out +- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded +- Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api +- Resolves: asfbz#59960 Building javadocs with java8 fails + +* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 +- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905 +- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 + +* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3 +- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905 +- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381 + +* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2 +- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685 + +* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1 +- Updated to 8.0.32 +- Remove log4j support. It has never been working actually. See rhbz#1236297 +- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636 +- Recommend tomcat-native, resolves: rhbz#1243132 + +* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4 +- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml +- Program /bin/nologin does not exist (#1302718) + +* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2 +- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) + +* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 +- Update to 8.0.26. + +* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 +- Update to 8.0.24. + +* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2 +- Drop javax.el:el-api alias. + +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1 +- Update to 8.0.23. + +* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3 +- Drop jetty alias for servlet. + +* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2 +- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + +* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5 +- Rebuild against tomcat-taglibs-standard. + +* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4 +- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch. +- Drop old provides. + +* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3 +- Bump epoch to maintain upgrade path from Fedora 22 + +* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2 +- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} + +* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1 +- Updated to 8.0.18 + +* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1 +- Updated to 8.0.12 +- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 +- Use CATALINA_OPTS only on start, resolves: rhbz#1051194 + +* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3 +- jsp-api requires el-api + +* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1 +- Update to upstream 7.0.54 - fixes compile with Java 8. + +* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3 +- Drop servlet/el api provides to reduce user machines ending with both. + +* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2 +- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 +- Move log4j support into subpackage, resolves: rhbz#1027716 + +* Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1 +- Updated to 7.0.52 +- Rewrite jsvc implementation, resolves: rhbz#1051743 +- Switch to java-headless R, resolves: rhbz#1068566 +- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741 +- Add pom for tomcat-jdbc, resolves: rhbz#1011003 + +* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3 +- Fix installation of Maven metadata for tomcat-juli.jar +- Resolves: rhbz#1033664 + +* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2 +- Rebuild for bug #1033664 + +* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 +- Updated to 7.0.47 +- Fix java.security.policy + +* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2 +- Remove jpackage-utils R + +* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1 +- Updated to 7.0.42 + +* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3 +- Dropped systemv inits. Bye-bye. +- Updated the systemd wrappers to allow running multiple instances. + Added wrapper scripts to do that, ported the original non-named + service file to work with the same wrappers, updated + /usr/sbin/tomcat to call systemctl. + +* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1 +- Updated to 7.0.40 +- Resolves: rhbz 956569 added missing commons-pool link +- Remove ant-nodeps BR + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2 +- Add depmaps for org.eclipse.jetty.orbit +- Resolves: rhbz#917626 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1 +- Updated to 7.0.39 + +* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1 +- Updated to 7.0.37 + +* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1 +- Updated to 7.0.35 +- systemd SuccessExitStatus=143 for proper stop exit code processing + +* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1 +- Updated to 7.0.34 +- ecj >= 4.2.1 now required +- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME + +* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2 +- Resolves: rhbz 883806 refix logdir ownership + +* Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1 +- Updated to 7.0.33 +- Resolves: rhbz 873620 need chkconfig for update-alternatives + +* Wed Oct 17 2012 Ivan Afonichev 0:7.0.32-1 +- Updated to 7.0.32 +- Resolves: rhbz 842620 symlinks to taglibs + +* Fri Aug 24 2012 Ivan Afonichev 0:7.0.29-1 +- Updated to 7.0.29 +- Add pidfile as tmpfile +- Use systemd for running as unprivileged user +- Resolves: rhbz 847751 upgrade path was broken +- Resolves: rhbz 850343 use new systemd-rpm macros + +* Sat Jul 21 2012 Fedora Release Engineering - 0:7.0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 2 2012 Ivan Afonichev 0:7.0.28-1 +- Updated to 7.0.28 +- Resolves: rhbz 820119 Remove bundled apache-commons-dbcp +- Resolves: rhbz 814900 Added tomcat-coyote POM +- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet +- Remove redhat-lsb R + +* Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2 +- Fixed native download hack + +* Sat Apr 7 2012 Ivan Afonichev 0:7.0.27-1 +- Updated to 7.0.27 +- Fixed jakarta-taglibs-standard BR and R + +* Wed Mar 21 2012 Stanislav Ochotnicky - 0:7.0.26-2 +- Add more depmaps to J2EE apis to help jetty/glassfish updates + +* Wed Mar 14 2012 Juan Hernandez 0:7.0.26-2 +- Added the POM files for tomcat-api and tomcat-util (#803495) + +* Wed Feb 22 2012 Ivan Afonichev 0:7.0.26-1 +- Updated to 7.0.26 +- Bug 790334: Change ownership of logdir for logrotate + +* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4 +- Bug 790694: Priorities of jsp, servlet and el packages updated. + +* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 +- Dropped indirect dependecy to tomcat 5 + +* Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 +- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly + +* Sat Jan 21 2012 Ivan Afonichev 0:7.0.25-1 +- Updated to 7.0.25 +- Removed EntityResolver patch (changes already in upstream sources) +- Place poms and depmaps in the same package as jars +- Added javax.servlet.descriptor to export-package of servlet-api +- Move several chkconfig actions and reqs to systemv subpackage +- New maven depmaps generation method +- Add patch to support java7. (patch sent upstream). +- Require java >= 1:1.6.0 + +* Fri Jan 13 2012 Krzysztof Daniel 0:7.0.23-5 +- Exported javax.servlet.* packages in version 3.0 as 2.6 to make + servlet-api compatible with Eclipse. + +* Thu Jan 12 2012 Ivan Afonichev 0:7.0.23-4 +- Move jsvc support to subpackage + +* Wed Jan 11 2012 Alexander Kurtakov 0:7.0.23-2 +- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream). + +* Mon Dec 12 2011 Joseph D. Wagner 0:7.0.23-3 +- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for + starting 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. Must add USE_JSVC="true" to + /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat. + +* Mon Nov 28 2011 Ivan Afonichev 0:7.0.23-1 +- Updated to 7.0.23 + +* Fri Nov 11 2011 Ivan Afonichev 0:7.0.22-2 +- Move tomcat-juli.jar to lib package +- Drop %%update_maven_depmap as in tomcat6 +- Provide native systemd unit file ported from tomcat6 + +* Thu Oct 6 2011 Ivan Afonichev 0:7.0.22-1 +- Updated to 7.0.22 + +* Mon Oct 03 2011 Rex Dieter - 0:7.0.21-3.1 +- rebuild (java), rel-eng#4932 + +* Mon Sep 26 2011 Ivan Afonichev 0:7.0.21-3 +- Fix basedir mode + +* Tue Sep 20 2011 Roland Grunberg 0:7.0.21-2 +- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli. + +* Thu Sep 8 2011 Ivan Afonichev 0:7.0.21-1 +- Updated to 7.0.21 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-3 +- Require java = 1:1.6.0 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-2 +- Require java < 1.7.0 + +* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-1 +- Updated to 7.0.20 + +* Tue Jul 26 2011 Ivan Afonichev 0:7.0.19-1 +- Updated to 7.0.19 + +* Tue Jun 21 2011 Ivan Afonichev 0:7.0.16-1 +- Updated to 7.0.16 + +* Mon Jun 6 2011 Ivan Afonichev 0:7.0.14-3 +- Added initial systemd service +- Fix some paths + +* Sat May 21 2011 Ivan Afonichev 0:7.0.14-2 +- Fixed http source link +- Securify some permissions +- Added licenses for el-api and servlet-api +- Added dependency on jpackage-utils for the javadoc subpackage + +* Sat May 14 2011 Ivan Afonichev 0:7.0.14-1 +- Updated to 7.0.14 + +* Thu May 5 2011 Ivan Afonichev 0:7.0.12-4 +- Provided local paths for libs +- Fixed dependencies +- Fixed update temp/work cleanup + +* Mon May 2 2011 Ivan Afonichev 0:7.0.12-3 +- Fixed package groups +- Fixed some permissions +- Fixed some links +- Removed old tomcat6 crap + +* Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2 +- Package now named just tomcat instead of tomcat7 +- Removed Provides: %%{name}-log4j +- Switched to apache-commons-* names instead of jakarta-commons-* . +- Remove the old changelog +- BR/R java >= 1:1.6.0 , same for java-devel +- Removed old tomcat6 crap + +* Wed Apr 27 2011 Ivan Afonichev 0:7.0.12-1 +- Tomcat7 From cdf316a2f007364db95a2b1f3dd8f037583442e9 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:12:51 +0300 Subject: [PATCH 343/354] Add obsoletes as temporary solution --- tomcat.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 8689ef0..6941f04 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -137,6 +137,7 @@ The docs web application for Apache Tomcat. Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} Obsoletes: %{name}-jsp-api < %{jspspec} +Obsoletes: %{name}-jsp-2.3-api < %{version} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -159,6 +160,7 @@ Libraries needed to run the Tomcat Web container. Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Obsoletes: %{name}-servlet-api < %{servletspec} +Obsoletes: %{name}-servlet-4.0-api < %{version} %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -167,6 +169,7 @@ Apache Tomcat Servlet API Implementation Classes. Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-api < %{elspec} +Obsoletes: %{name}-el-3.0-api < %{version} %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. From 55ffac79411b689bd9beb683dc25ef1953b48e06 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:13:52 +0300 Subject: [PATCH 344/354] Update to 10.1.43 --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 6941f04..fe2e2ca 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 3.1 %global major_version 10 %global minor_version 1 -%global micro_version 34 +%global micro_version 43 %global packdname apache-tomcat-%{version}-src %global servletspec 6.0 %global elspec 5.0 From 9eae7c317a7c170fa614ba426dadd836fcb4f39b Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:16:04 +0300 Subject: [PATCH 345/354] Update to 10.1.43 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 1bac248..6eba8ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-10.1.34-src.tar.gz) = 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca +SHA512 (apache-tomcat-10.1.43-src.tar.gz) = 24672a4ea4d6e0bfd5e7dbb8694f260216bea47f21c347dd549d3e0851915aa7616695356cbf6714780ff1527f346ad2119f7f52f66779c4d0510ad0f83e9978 From 2dc58c1b4a0919d6ee5044eb5168b41c00d16d64 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 28 Jul 2025 16:37:19 +0300 Subject: [PATCH 346/354] Add required conflicts --- tomcat.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index fe2e2ca..0941de7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -140,6 +140,7 @@ Obsoletes: %{name}-jsp-api < %{jspspec} Obsoletes: %{name}-jsp-2.3-api < %{version} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Conflicts: tomcat-jsp-2.3-api %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -152,6 +153,10 @@ Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj >= 4.20 Recommends: tomcat-jakartaee-migration Requires(preun): coreutils +Conflicts: tomcat-jsp-2.3-api +Conflicts: tomcat-servlet-4.0-api +Conflicts: tomcat-el-3.0-api + %description lib Libraries needed to run the Tomcat Web container. @@ -161,6 +166,7 @@ Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Obsoletes: %{name}-servlet-api < %{servletspec} Obsoletes: %{name}-servlet-4.0-api < %{version} +Conflicts: tomcat-servlet-4.0-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -170,6 +176,7 @@ Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-api < %{elspec} Obsoletes: %{name}-el-3.0-api < %{version} +Conflicts: tomcat-el-3.0-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. From f7115aee66d086719cdc0bcccf7ce3f8aaddda93 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:25:32 +0200 Subject: [PATCH 347/354] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- tomcat.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 0941de7..2eac613 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,17 +86,17 @@ Patch6: rhbz-1857043.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: ant >= 1.10.2 +BuildRequires: ant-openjdk25 >= 1.10.2 BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel >= 17 -BuildRequires: javapackages-local +BuildRequires: java-25-devel >= 17 +BuildRequires: javapackages-local-openjdk25 BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= 11 or java-25 >= 11) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 From 6a5dffd2aa984970586bf059f6a02dbaeea1408b Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 29 Jul 2025 11:59:45 +0300 Subject: [PATCH 348/354] Rebuilt for the side tag f43-build-side-114811 --- tomcat.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 2eac613..5ec5a3b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -529,6 +529,9 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/ROOT %changelog +* Tue Jul 29 2025 Dimitris Soumis - 1:10.1.43-5 +- Rebuilt for the side tag f43-build-side-114811 + * Fri Jan 10 2025 Dimitris Soumis - 1:10.1.34-1 - Update to version 10.1.34 From 6015a7ef86bf72d2e583f408812248235173ccca Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 14 Aug 2025 11:43:33 +0300 Subject: [PATCH 349/354] Rebuilt for the side tag f43-build-side-116701 --- tomcat.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tomcat.spec b/tomcat.spec index 5ec5a3b..9c82f7c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -529,6 +529,9 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/ROOT %changelog +* Wed Aug 14 2025 Dimitris Soumis - 1:10.1.43-6 +- Rebuilt for the side tag f43-build-side-116701 + * Tue Jul 29 2025 Dimitris Soumis - 1:10.1.43-5 - Rebuilt for the side tag f43-build-side-114811 From 35f2755fd19a0883cf048b8052d685fecba90311 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Tue, 19 Aug 2025 14:57:56 +0300 Subject: [PATCH 350/354] Add virtual provides to resolve installability issues --- tomcat.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 9c82f7c..c79da3b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -136,11 +136,11 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Obsoletes: %{name}-jsp-api < %{jspspec} -Obsoletes: %{name}-jsp-2.3-api < %{version} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Conflicts: tomcat-jsp-2.3-api +Obsoletes: %{name}-jsp-2.3-api < 1:9.1 +Provides: %{name}-jsp-2.3-api = %{?epoch:%{epoch}:}%{version}-%{release} + %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -153,10 +153,6 @@ Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj >= 4.20 Recommends: tomcat-jakartaee-migration Requires(preun): coreutils -Conflicts: tomcat-jsp-2.3-api -Conflicts: tomcat-servlet-4.0-api -Conflicts: tomcat-el-3.0-api - %description lib Libraries needed to run the Tomcat Web container. @@ -164,9 +160,8 @@ Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} -Obsoletes: %{name}-servlet-api < %{servletspec} -Obsoletes: %{name}-servlet-4.0-api < %{version} -Conflicts: tomcat-servlet-4.0-api +Obsoletes: %{name}-servlet-4.0-api < 1:9.1 +Provides: %{name}-servlet-4.0-api = %{?epoch:%{epoch}:}%{version}-%{release} %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -174,9 +169,8 @@ Apache Tomcat Servlet API Implementation Classes. %package el-%{elspec}-api Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} -Obsoletes: %{name}-el-api < %{elspec} -Obsoletes: %{name}-el-3.0-api < %{version} -Conflicts: tomcat-el-3.0-api +Obsoletes: %{name}-el-3.0-api < 1:9.1 +Provides: %{name}-el-3.0-api = %{?epoch:%{epoch}:}%{version}-%{release} %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -529,7 +523,10 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/ROOT %changelog -* Wed Aug 14 2025 Dimitris Soumis - 1:10.1.43-6 +* Tue Aug 19 2025 Dimitris Soumis - 1:10.1.43-7 +- Add virtual provides to resolve installability issues + +* Thu Aug 14 2025 Dimitris Soumis - 1:10.1.43-6 - Rebuilt for the side tag f43-build-side-116701 * Tue Jul 29 2025 Dimitris Soumis - 1:10.1.43-5 From cfa0ed06cc95236e1a10cb8fc43c34827c5a4a13 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 20 Aug 2025 17:18:34 -0700 Subject: [PATCH 351/354] Fix gating policy, again I don't know why the previous changes were reverted. We cannot gate on rpmdeplint for non-Rawhide releases because it only runs on Rawhide: https://pagure.io/fedora-ci/general/issue/471 Also, the bodhi_update_push_testing context doesn't really work. It's only very partially hooked up in Bodhi, so defining it does nothing useful but only potentially causes weird things like https://github.com/fedora-infra/bodhi/issues/5660 . --- gating.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index b81b8c4..524dba5 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,12 +1,17 @@ --- !Policy product_versions: - - fedora-* + - fedora-rawhide decision_contexts: - - bodhi_update_push_testing - bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_stable +subject_type: koji_build +rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} From e1a22bc2bfe269fa70f12aa06ee9528eaea2504b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 20 Aug 2025 17:43:44 -0700 Subject: [PATCH 352/354] On second thought, let's keep bodhi_update_push_testing It doesn't really work, but without it, we may have a short time early in an update's life when no gating policy applies for stable push...let's not do that. As long as the policies for stable and testing are the same, things should work right. --- gating.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gating.yaml b/gating.yaml index 524dba5..0553cb6 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,6 +3,7 @@ product_versions: - fedora-rawhide decision_contexts: - bodhi_update_push_stable + - bodhi_update_push_testing subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} @@ -10,6 +11,7 @@ product_versions: - fedora-* decision_contexts: - bodhi_update_push_stable + - bodhi_update_push_testing subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} From 1b2f8ef6d9758b5c17b1196d8fe7dc9a61e24e77 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 12 Sep 2025 17:29:22 +0300 Subject: [PATCH 353/354] Update to 10.1.46 upstream release --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6eba8ed..4027ead 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-10.1.43-src.tar.gz) = 24672a4ea4d6e0bfd5e7dbb8694f260216bea47f21c347dd549d3e0851915aa7616695356cbf6714780ff1527f346ad2119f7f52f66779c4d0510ad0f83e9978 +SHA512 (apache-tomcat-10.1.46-src.tar.gz) = 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682 diff --git a/tomcat.spec b/tomcat.spec index c79da3b..6a1425a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 3.1 %global major_version 10 %global minor_version 1 -%global micro_version 43 +%global micro_version 46 %global packdname apache-tomcat-%{version}-src %global servletspec 6.0 %global elspec 5.0 @@ -523,6 +523,9 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/ROOT %changelog +* Fri Sep 12 2025 Dimitris Soumis - 1:10.1.46-1 +- Update to version 10.1.46 + * Tue Aug 19 2025 Dimitris Soumis - 1:10.1.43-7 - Add virtual provides to resolve installability issues From b6246accae8953d404005d1bb81b8e67a79dabd1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 25 Sep 2025 11:10:06 -0700 Subject: [PATCH 354/354] Fix java requirements (#2398212) With java-latest now being 25, but only java-25 providing the generic 'java' and 'java-headless' etc., we get file conflicts if a transaction includes both things that want 'java-25' or 'java-25-headless' and things that want 'java' or 'java-headless'. This is because dnf prefers java-latest as a provider of the java-25-* provides (it's versioned higher than the java-25 packages), but only the java-25 packages provide the generic requirements. To avoid this making FreeIPA uninstallable, let's get rid of the generic 'java-headless' requirement. I think f7115aee was meant to do this already, but missed it. Also get rid of the now-useless version bounds on requirements where the java version is included in the requirement name. --- tomcat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 6a1425a..77901bc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -89,14 +89,14 @@ ExclusiveArch: %{java_arches} noarch BuildRequires: ant-openjdk25 >= 1.10.2 BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-25-devel >= 17 +BuildRequires: java-25-devel BuildRequires: javapackages-local-openjdk25 BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java-25 >= 11) +Requires: (java-25-headless or java-25) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -523,6 +523,10 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf %{appdir}/ROOT %changelog +* Thu Sep 25 2025 Adam Williamson - 1:10.1.46-2 +- Drop now-unnecessary version bounds in java requirements +- Specify java-25-headless, not java-headless (#2398212) + * Fri Sep 12 2025 Dimitris Soumis - 1:10.1.46-1 - Update to version 10.1.46