rpms/apache-tomcat
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 11.0.20; rename paths from tomcat7 to tomcat; add sysusers_create_compat [release 11.0.20-1mamba;Wed Apr 01 2026]

Browse Source
This commit is contained in:
claude
2026-04-01 09:33:49 +02:00
parent 6d207572f0
commit 266cce61fc
6 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apache-tomcat.spec
+74 -73
View File
@@ -1,17 +1,18 @@
Name: apache-tomcat
Version: 7.0.103
Release: 2mamba
Version: 11.0.20
Release: 1mamba
Summary: Apache Servlet/JSP Engine, RI for Servlet 3.0/JSP 2.2 API
Group: System/Servers
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
Packager: Silvan Calarco <silvan@openmamba.org>
URL: http://tomcat.apache.org
Source0: https://archive.apache.org/dist/tomcat/tomcat-7/v%{version}/bin/apache-tomcat-%{version}.tar.gz
Source1: tomcat7.service
Source2: tomcat7.sysusers
Source3: tomcat7.tmpfiles
Source0: https://archive.apache.org/dist/tomcat/tomcat-%{MAJver}/v%{version}/bin/apache-tomcat-%{version}.tar.gz
Source1: tomcat.service
Source2: tomcat.sysusers
Source3: tomcat.tmpfiles
License: Apache License 2.0
BuildArch: noarch
## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END
BuildRequires: jpackage-utils
@@ -20,7 +21,6 @@ Requires: apache-commons-daemon
Requires: apache-commons-daemon-jsvc
Requires: procps
Requires: shadow-common
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -37,99 +37,100 @@ We invite you to participate in this open development project.
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
# Tomcat general files (from Arch Linux)
install -dm 755 %{buildroot}%{_javadir}/tomcat7
install -dm 755 %{buildroot}%{_datadir}/tomcat7
cp -dr --no-preserve=ownership bin %{buildroot}%{_datadir}/tomcat7
install -dm 755 %{buildroot}%{_javadir}/tomcat
install -dm 755 %{buildroot}%{_datadir}/tomcat
cp -dr --no-preserve=ownership bin %{buildroot}%{_datadir}/tomcat
# commons-daemon and tomcat-natives are packaged on their own
rm %{buildroot}%{_datadir}/tomcat7/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
ln -s %{_javadir}/commons-daemon.jar %{buildroot}%{_datadir}/tomcat7/bin/commons-daemon.jar
rm %{buildroot}%{_datadir}/tomcat/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
ln -s %{_javadir}/commons-daemon.jar %{buildroot}%{_datadir}/tomcat/bin/commons-daemon.jar
install -m 644 lib/* %{buildroot}%{_javadir}/tomcat7
install -m 644 lib/* %{buildroot}%{_javadir}/tomcat
# eclipse-ecj is packaged on its own
rm %{buildroot}%{_javadir}/tomcat7/ecj-*.jar
ln -s ../eclipse-ecj.jar %{buildroot}%{_javadir}/tomcat7/ecj.jar
rm %{buildroot}%{_javadir}/tomcat/ecj-*.jar
ln -s ../eclipse-ecj.jar %{buildroot}%{_javadir}/tomcat/ecj.jar
ln -s %{_javadir}/tomcat7 %{buildroot}%{_datadir}/tomcat7/lib
ln -s %{_javadir}/tomcat %{buildroot}%{_datadir}/tomcat/lib
# We log through systemd but this would still be required for stock Tomcat logging
install -dm 775 %{buildroot}/var/log/tomcat7
ln -s /var/log/tomcat7 %{buildroot}%{_datadir}/tomcat7/logs
touch %{buildroot}/var/log/tomcat7/catalina.{out,err}
install -dm 775 %{buildroot}/var/log/tomcat
ln -s /var/log/tomcat %{buildroot}%{_datadir}/tomcat/logs
touch %{buildroot}/var/log/tomcat/catalina.{out,err}
install -dm 775 %{buildroot}%{_sysconfdir}/tomcat7
install -m 640 conf/* %{buildroot}%{_sysconfdir}/tomcat7
install -dm 775 %{buildroot}%{_sysconfdir}/tomcat7/Catalina
ln -s /etc/tomcat7 %{buildroot}%{_datadir}/tomcat7/conf
install -dm 775 %{buildroot}%{_sysconfdir}/tomcat
install -m 640 conf/* %{buildroot}%{_sysconfdir}/tomcat
install -dm 775 %{buildroot}%{_sysconfdir}/tomcat/Catalina
ln -s /etc/tomcat %{buildroot}%{_datadir}/tomcat/conf
install -dm 775 %{buildroot}/var/lib/tomcat7
cp -r webapps %{buildroot}/var/lib/tomcat7
chmod 775 %{buildroot}/var/lib/tomcat7/webapps
ln -s /var/lib/tomcat7/webapps %{buildroot}%{_datadir}/tomcat7/webapps
install -dm 775 %{buildroot}/var/lib/tomcat
cp -r webapps %{buildroot}/var/lib/tomcat
chmod 775 %{buildroot}/var/lib/tomcat/webapps
ln -s /var/lib/tomcat/webapps %{buildroot}%{_datadir}/tomcat/webapps
install -dm 1777 %{buildroot}/var/tmp
install -dm 775 %{buildroot}/var/tmp/tomcat7/{temp,work}
ln -s /var/tmp/tomcat7/temp %{buildroot}%{_datadir}/tomcat7/temp
ln -s /var/tmp/tomcat7/work %{buildroot}%{_datadir}/tomcat7/work
install -dm 775 %{buildroot}/var/tmp/tomcat/{temp,work}
ln -s /var/tmp/tomcat/temp %{buildroot}%{_datadir}/tomcat/temp
ln -s /var/tmp/tomcat/work %{buildroot}%{_datadir}/tomcat/work
install -Dm 644 %{SOURCE1} %{buildroot}%{_unitdir}/tomcat7.service
install -Dm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/tomcat7.conf
install -Dm 644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/tomcat7.conf
install -Dm 644 %{SOURCE1} %{buildroot}%{_unitdir}/tomcat.service
install -Dm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/tomcat.conf
install -Dm 644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/tomcat.conf
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%pre
%sysusers_create_package tomcat %{SOURCE2}
:
%post
%systemd_post tomcat7
%systemd_post tomcat
:
%preun
%systemd_preun tomcat7
%systemd_preun tomcat
:
%postun
%systemd_postun tomcat7
%systemd_postun tomcat
:
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/tomcat7
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/catalina.policy
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/catalina.properties
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/context.xml
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/logging.properties
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/server.xml
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/tomcat-users.xml
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/tomcat-users.xsd
%attr(-,tomcat7,root) %{_sysconfdir}/tomcat7/web.xml
%{_unitdir}/tomcat7.service
%{_sysusersdir}/tomcat7.conf
%{_tmpfilesdir}/tomcat7.conf
%dir %{_datadir}/java/tomcat7
%{_datadir}/java/tomcat7/*.jar
%dir %{_datadir}/tomcat7/bin
%{_datadir}/tomcat7/bin/*
%{_datadir}/tomcat7/conf
%{_datadir}/tomcat7/lib
%{_datadir}/tomcat7/logs
%{_datadir}/tomcat7/temp
%{_datadir}/tomcat7/webapps
%{_datadir}/tomcat7/work
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps/ROOT
%attr(-,tomcat7,root) %{_localstatedir}/lib/tomcat7/webapps/ROOT/*
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps/docs
%attr(-,tomcat7,root) %{_localstatedir}/lib/tomcat7/webapps/docs/*
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps/examples
%attr(-,tomcat7,root) %{_localstatedir}/lib/tomcat7/webapps/examples/*
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps/host-manager
%attr(-,tomcat7,root) %{_localstatedir}/lib/tomcat7/webapps/host-manager/*
%attr(-,tomcat7,root) %dir %{_localstatedir}/lib/tomcat7/webapps/manager
%attr(-,tomcat7,root) %{_localstatedir}/lib/tomcat7/webapps/manager/*
%attr(-,tomcat7,root) %{_localstatedir}/log/tomcat7/catalina.err
%attr(-,tomcat7,root) %{_localstatedir}/log/tomcat7/catalina.out
%dir %{_sysconfdir}/tomcat
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/catalina.properties
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/context.xml
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/logging.properties
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/server.xml
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/tomcat-users.xml
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/tomcat-users.xsd
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/web.xml
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/jaspic-providers.xml
%attr(-,tomcat,root) %{_sysconfdir}/tomcat/jaspic-providers.xsd
%{_unitdir}/tomcat.service
%{_sysusersdir}/tomcat.conf
%{_tmpfilesdir}/tomcat.conf
%{_datadir}/java/tomcat
%{_datadir}/tomcat
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps/ROOT
%attr(-,tomcat,root) %{_localstatedir}/lib/tomcat/webapps/ROOT/*
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps/docs
%attr(-,tomcat,root) %{_localstatedir}/lib/tomcat/webapps/docs/*
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps/examples
%attr(-,tomcat,root) %{_localstatedir}/lib/tomcat/webapps/examples/*
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps/host-manager
%attr(-,tomcat,root) %{_localstatedir}/lib/tomcat/webapps/host-manager/*
%attr(-,tomcat,root) %dir %{_localstatedir}/lib/tomcat/webapps/manager
%attr(-,tomcat,root) %{_localstatedir}/lib/tomcat/webapps/manager/*
%attr(-,tomcat,root) %{_localstatedir}/log/tomcat/catalina.err
%attr(-,tomcat,root) %{_localstatedir}/log/tomcat/catalina.out
%doc LICENSE
%changelog
* Wed Apr 01 2026 Claude <claude@openmamba.org> 11.0.20-1mamba
- update to 11.0.20; rename paths from tomcat7 to tomcat; add sysusers_create_compat
* Thu May 21 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 7.0.103-2mamba
- require apache-commons-daemon and apache-commons-daemon-jsvc
tomcat7.service → tomcat.service
+9 -9
View File
@@ -1,14 +1,14 @@
[Unit]
Description=Tomcat 7 servlet container
Description=Tomcat servlet container
After=network.target
[Service]
Type=forking
PIDFile=/var/run/tomcat7.pid
Environment=CATALINA_PID=/var/run/tomcat7.pid
PIDFile=/var/run/tomcat.pid
Environment=CATALINA_PID=/var/run/tomcat.pid
Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime
Environment=CATALINA_HOME=/usr/share/tomcat7
Environment=CATALINA_BASE=/usr/share/tomcat7
Environment=CATALINA_HOME=/usr/share/tomcat
Environment=CATALINA_BASE=/usr/share/tomcat
Environment=CATALINA_OPTS=
Environment=ERRFILE=SYSLOG
Environment=OUTFILE=SYSLOG
@@ -16,18 +16,18 @@ Environment=OUTFILE=SYSLOG
ExecStart=/usr/bin/jsvc \
-Dcatalina.home=${CATALINA_HOME} \
-Dcatalina.base=${CATALINA_BASE} \
-Djava.io.tmpdir=/var/tmp/tomcat7/temp \
-Djava.io.tmpdir=/var/tmp/tomcat/temp \
-cp /usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
-user tomcat7 \
-user tomcat \
-java-home ${TOMCAT_JAVA_HOME} \
-pidfile /var/run/tomcat7.pid \
-pidfile /var/run/tomcat.pid \
-errfile ${ERRFILE} \
-outfile ${OUTFILE} \
$CATALINA_OPTS \
org.apache.catalina.startup.Bootstrap
ExecStop=/usr/bin/jsvc \
-pidfile /var/run/tomcat7.pid \
-pidfile /var/run/tomcat.pid \
-stop \
org.apache.catalina.startup.Bootstrap
tomcat.sysusers
+1
View File
@@ -0,0 +1 @@
u tomcat 65063 "Tomcat user" /usr/share/tomcat
tomcat.tmpfiles
+5
View File
@@ -0,0 +1,5 @@
d /var/tmp/tomcat/temp 0775 tomcat tomcat
d /var/tmp/tomcat/work 0775 tomcat tomcat
d /var/lib/tomcat 0775 tomcat tomcat
d /var/lib/tomcat/webapps 0775 tomcat tomcat
d /var/log/tomcat 0775 tomcat log
tomcat7.sysusers
-1
View File
@@ -1 +0,0 @@
u tomcat7 65063 "Tomcat 7 user" /usr/share/tomcat7
tomcat7.tmpfiles
-5
View File
@@ -1,5 +0,0 @@
d /var/tmp/tomcat7/temp 0775 tomcat7 tomcat7
d /var/tmp/tomcat7/work 0775 tomcat7 tomcat7
d /var/lib/tomcat7 0775 tomcat7 tomcat7
d /var/lib/tomcat7/webapps 0775 tomcat7 tomcat7
d /var/log/tomcat7 0775 tomcat7 log