Date: Wednesday, January 19, 2022 @ 09:28:32 Author: alucryd Revision: 434718
archrelease: copy trunk to extra-any Added: tomcat8/repos/extra-any/PKGBUILD (from rev 434717, tomcat8/trunk/PKGBUILD) tomcat8/repos/extra-any/tomcat8.install (from rev 434717, tomcat8/trunk/tomcat8.install) tomcat8/repos/extra-any/tomcat8.service (from rev 434717, tomcat8/trunk/tomcat8.service) tomcat8/repos/extra-any/tomcat8.sysusers (from rev 434717, tomcat8/trunk/tomcat8.sysusers) tomcat8/repos/extra-any/tomcat8.tmpfiles (from rev 434717, tomcat8/trunk/tomcat8.tmpfiles) Deleted: tomcat8/repos/extra-any/PKGBUILD tomcat8/repos/extra-any/tomcat8.install tomcat8/repos/extra-any/tomcat8.service tomcat8/repos/extra-any/tomcat8.sysusers tomcat8/repos/extra-any/tomcat8.tmpfiles ------------------+ PKGBUILD | 250 ++++++++++++++++++++++++++--------------------------- tomcat8.install | 32 +++--- tomcat8.service | 70 +++++++------- tomcat8.sysusers | 2 tomcat8.tmpfiles | 10 +- 5 files changed, 182 insertions(+), 182 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-01-19 09:28:23 UTC (rev 434717) +++ PKGBUILD 2022-01-19 09:28:32 UTC (rev 434718) @@ -1,125 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Guillaume Alaux <guilla...@archlinux.org> - -pkgname=tomcat8 -pkgver=8.5.74 -pkgrel=1 -pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer Pages 2.3 technologies' -arch=(any) -url=https://tomcat.apache.org/ -license=(APACHE) -depends=( - 'java-runtime>=7' - java-jsvc - java-commons-daemon - eclipse-ecj -) -makedepends=( - ant - git - java-environment=8 -) -optdepends=('tomcat-native: to allow optimal performance in production environments') -backup=( - etc/tomcat8/catalina.policy - etc/tomcat8/catalina.properties - etc/tomcat8/context.xml - etc/tomcat8/logging.properties - etc/tomcat8/server.xml - etc/tomcat8/tomcat-users.xml - etc/tomcat8/web.xml -) -install=tomcat8.install -_tag=2ea50557ae05ccfca7f521ab328c238237aec8b1 -source=( - git+https://github.com/apache/tomcat.git#tag=${_tag} - tomcat8.service - tomcat8.sysusers - tomcat8.tmpfiles -) -b2sums=('SKIP' - 'b573a5c2d081539c57c35655c612108ae5ece6e362d887170fa52888272480f17f4e6637f378e9fbdf9cb992d91ce63f4fb45d2fca62b31fa1c817ae4465e94c' - 'e2b63275530ce7e57756ccf6f3934506245888dbc41005275e039e25712c13d37c2f28fd3af0c1dcace1dabe7a1e33d7f056f4c3c8f4a336f952fd7de46345ef' - 'a0e3052408ad8c64c88fcc7d4c3a883c16e7fd0d89a22fd6e89480b2021fc7fb4acf6f9b2ded78e64ebe9c2afb8bf85742da0299666b22f5cf6f63166ce1b141') - -_gid_log=19 -_gid_tomcat=57 -_uid_tomcat=57 - -pkgver() { - cd tomcat - - _pkgver=$(git describe --tags) - - if [[ ${_pkgver} != 8.* ]]; then - exit 1 - fi - - echo ${_pkgver} -} - -prepare() { - cd tomcat - - cp build.properties.default build.properties - sed "/^base\.path=/c\base\.path=${srcdir}" -i build.properties - sed "/^compile.debug=/c\compile.debug=false" -i build.properties - sed "/^trydownload.httpusecaches=/c\trydownload.httpusecaches=false" -i build.properties -} - -build() { - cd tomcat - - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk - export PATH="$JAVA_HOME/bin:$PATH" - - ant -} - -package() { - cd tomcat/output/build - - # Tomcat general files - install -dm 755 "${pkgdir}"/usr/share/tomcat8/bin - install -m 755 bin/* -t "${pkgdir}"/usr/share/tomcat8/bin/ - # commons-daemon is packaged on its own - rm "${pkgdir}"/usr/share/tomcat8/bin/{*.bat,commons-daemon*} - ln -s /usr/share/java/commons-daemon.jar "${pkgdir}"/usr/share/tomcat8/bin/commons-daemon.jar - - install -dm 755 "${pkgdir}"/usr/share/java/tomcat8 - install -m 644 lib/* -t "${pkgdir}"/usr/share/java/tomcat8/ - # eclipse-ecj is packaged on its own - rm "${pkgdir}"/usr/share/java/tomcat8/ecj-*.jar - ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat8/ecj.jar - - ln -s /usr/share/java/tomcat8 "${pkgdir}"/usr/share/tomcat8/lib - - # We log through systemd but this would still be required for stock Tomcat logging - install -dm 775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/tomcat8 - ln -s /var/log/tomcat8 "${pkgdir}"/usr/share/tomcat8/logs - touch "${pkgdir}"/var/log/tomcat8/catalina.{out,err} - chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat8/catalina.{out,err} - - install -dm 775 "${pkgdir}"/etc/tomcat8 - install -m 640 -g ${_gid_tomcat} conf/* -t "${pkgdir}"/etc/tomcat8/ - - install -dm 775 -g ${_gid_tomcat} "${pkgdir}"/etc/tomcat8/Catalina - ln -s /etc/tomcat8 "${pkgdir}"/usr/share/tomcat8/conf - - install -dm 775 "${pkgdir}"/var/lib/tomcat8 - cp -dr --no-preserve=ownership webapps "${pkgdir}"/var/lib/tomcat8/ - chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat8 - chmod 775 "${pkgdir}"/var/lib/tomcat8/webapps - ln -s /var/lib/tomcat8/webapps "${pkgdir}"/usr/share/tomcat8/webapps - - install -dm 1777 "${pkgdir}"/var/tmp - install -dm 775 -o ${_uid_tomcat} -g ${_gid_tomcat} "${pkgdir}"/var/tmp/tomcat8/{temp,work} - ln -s /var/tmp/tomcat8/temp "${pkgdir}"/usr/share/tomcat8/temp - ln -s /var/tmp/tomcat8/work "${pkgdir}"/usr/share/tomcat8/work - - install -Dm 644 ../../../tomcat8.service "${pkgdir}"/usr/lib/systemd/system/tomcat8.service - install -Dm 644 ../../../tomcat8.sysusers "${pkgdir}"/usr/lib/sysusers.d/tomcat8.conf - install -Dm 644 ../../../tomcat8.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/tomcat8.conf -} - -# vim: ts=2 sw=2 et: Copied: tomcat8/repos/extra-any/PKGBUILD (from rev 434717, tomcat8/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-01-19 09:28:32 UTC (rev 434718) @@ -0,0 +1,125 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Guillaume Alaux <guilla...@archlinux.org> + +pkgname=tomcat8 +pkgver=8.5.75 +pkgrel=1 +pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer Pages 2.3 technologies' +arch=(any) +url=https://tomcat.apache.org/ +license=(APACHE) +depends=( + 'java-runtime>=7' + java-jsvc + java-commons-daemon + eclipse-ecj +) +makedepends=( + ant + git + java-environment=8 +) +optdepends=('tomcat-native: to allow optimal performance in production environments') +backup=( + etc/tomcat8/catalina.policy + etc/tomcat8/catalina.properties + etc/tomcat8/context.xml + etc/tomcat8/logging.properties + etc/tomcat8/server.xml + etc/tomcat8/tomcat-users.xml + etc/tomcat8/web.xml +) +install=tomcat8.install +_tag=b5c9c3a25a17f777989408973013f5312acdb8e2 +source=( + git+https://github.com/apache/tomcat.git#tag=${_tag} + tomcat8.service + tomcat8.sysusers + tomcat8.tmpfiles +) +b2sums=('SKIP' + 'b573a5c2d081539c57c35655c612108ae5ece6e362d887170fa52888272480f17f4e6637f378e9fbdf9cb992d91ce63f4fb45d2fca62b31fa1c817ae4465e94c' + 'e2b63275530ce7e57756ccf6f3934506245888dbc41005275e039e25712c13d37c2f28fd3af0c1dcace1dabe7a1e33d7f056f4c3c8f4a336f952fd7de46345ef' + 'a0e3052408ad8c64c88fcc7d4c3a883c16e7fd0d89a22fd6e89480b2021fc7fb4acf6f9b2ded78e64ebe9c2afb8bf85742da0299666b22f5cf6f63166ce1b141') + +_gid_log=19 +_gid_tomcat=57 +_uid_tomcat=57 + +pkgver() { + cd tomcat + + _pkgver=$(git describe --tags) + + if [[ ${_pkgver} != 8.* ]]; then + exit 1 + fi + + echo ${_pkgver} +} + +prepare() { + cd tomcat + + cp build.properties.default build.properties + sed "/^base\.path=/c\base\.path=${srcdir}" -i build.properties + sed "/^compile.debug=/c\compile.debug=false" -i build.properties + sed "/^trydownload.httpusecaches=/c\trydownload.httpusecaches=false" -i build.properties +} + +build() { + cd tomcat + + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk + export PATH="$JAVA_HOME/bin:$PATH" + + ant +} + +package() { + cd tomcat/output/build + + # Tomcat general files + install -dm 755 "${pkgdir}"/usr/share/tomcat8/bin + install -m 755 bin/* -t "${pkgdir}"/usr/share/tomcat8/bin/ + # commons-daemon is packaged on its own + rm "${pkgdir}"/usr/share/tomcat8/bin/{*.bat,commons-daemon*} + ln -s /usr/share/java/commons-daemon.jar "${pkgdir}"/usr/share/tomcat8/bin/commons-daemon.jar + + install -dm 755 "${pkgdir}"/usr/share/java/tomcat8 + install -m 644 lib/* -t "${pkgdir}"/usr/share/java/tomcat8/ + # eclipse-ecj is packaged on its own + rm "${pkgdir}"/usr/share/java/tomcat8/ecj-*.jar + ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat8/ecj.jar + + ln -s /usr/share/java/tomcat8 "${pkgdir}"/usr/share/tomcat8/lib + + # We log through systemd but this would still be required for stock Tomcat logging + install -dm 775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/tomcat8 + ln -s /var/log/tomcat8 "${pkgdir}"/usr/share/tomcat8/logs + touch "${pkgdir}"/var/log/tomcat8/catalina.{out,err} + chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat8/catalina.{out,err} + + install -dm 775 "${pkgdir}"/etc/tomcat8 + install -m 640 -g ${_gid_tomcat} conf/* -t "${pkgdir}"/etc/tomcat8/ + + install -dm 775 -g ${_gid_tomcat} "${pkgdir}"/etc/tomcat8/Catalina + ln -s /etc/tomcat8 "${pkgdir}"/usr/share/tomcat8/conf + + install -dm 775 "${pkgdir}"/var/lib/tomcat8 + cp -dr --no-preserve=ownership webapps "${pkgdir}"/var/lib/tomcat8/ + chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat8 + chmod 775 "${pkgdir}"/var/lib/tomcat8/webapps + ln -s /var/lib/tomcat8/webapps "${pkgdir}"/usr/share/tomcat8/webapps + + install -dm 1777 "${pkgdir}"/var/tmp + install -dm 775 -o ${_uid_tomcat} -g ${_gid_tomcat} "${pkgdir}"/var/tmp/tomcat8/{temp,work} + ln -s /var/tmp/tomcat8/temp "${pkgdir}"/usr/share/tomcat8/temp + ln -s /var/tmp/tomcat8/work "${pkgdir}"/usr/share/tomcat8/work + + install -Dm 644 ../../../tomcat8.service "${pkgdir}"/usr/lib/systemd/system/tomcat8.service + install -Dm 644 ../../../tomcat8.sysusers "${pkgdir}"/usr/lib/sysusers.d/tomcat8.conf + install -Dm 644 ../../../tomcat8.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/tomcat8.conf +} + +# vim: ts=2 sw=2 et: Deleted: tomcat8.install =================================================================== --- tomcat8.install 2022-01-19 09:28:23 UTC (rev 434717) +++ tomcat8.install 2022-01-19 09:28:32 UTC (rev 434718) @@ -1,16 +0,0 @@ -post_install() { - if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then - echo 'It appears that your current kernel has linux security' - echo 'capabilities built as a module. Tomcat requires this' - echo ' functionality to operate.' - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - echo "Leftover files may reside in /var/{lib,tmp,log}/tomcat8" - echo "If you remove them, you may also want to remove user and group 'tomcat8'" -} Copied: tomcat8/repos/extra-any/tomcat8.install (from rev 434717, tomcat8/trunk/tomcat8.install) =================================================================== --- tomcat8.install (rev 0) +++ tomcat8.install 2022-01-19 09:28:32 UTC (rev 434718) @@ -0,0 +1,16 @@ +post_install() { + if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then + echo 'It appears that your current kernel has linux security' + echo 'capabilities built as a module. Tomcat requires this' + echo ' functionality to operate.' + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + echo "Leftover files may reside in /var/{lib,tmp,log}/tomcat8" + echo "If you remove them, you may also want to remove user and group 'tomcat8'" +} Deleted: tomcat8.service =================================================================== --- tomcat8.service 2022-01-19 09:28:23 UTC (rev 434717) +++ tomcat8.service 2022-01-19 09:28:32 UTC (rev 434718) @@ -1,35 +0,0 @@ -[Unit] -Description=Tomcat 8 servlet container -After=network.target - -[Service] -Type=forking -PIDFile=/var/run/tomcat8.pid -Environment=CATALINA_PID=/var/run/tomcat8.pid -Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime -Environment=CATALINA_HOME=/usr/share/tomcat8 -Environment=CATALINA_BASE=/usr/share/tomcat8 -Environment=CATALINA_OPTS= -Environment=ERRFILE=SYSLOG -Environment=OUTFILE=SYSLOG - -ExecStart=/usr/bin/jsvc \ - -Dcatalina.home=${CATALINA_HOME} \ - -Dcatalina.base=${CATALINA_BASE} \ - -Djava.io.tmpdir=/var/tmp/tomcat8/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 tomcat8 \ - -java-home ${TOMCAT_JAVA_HOME} \ - -pidfile /var/run/tomcat8.pid \ - -errfile ${ERRFILE} \ - -outfile ${OUTFILE} \ - $CATALINA_OPTS \ - org.apache.catalina.startup.Bootstrap - -ExecStop=/usr/bin/jsvc \ - -pidfile /var/run/tomcat8.pid \ - -stop \ - org.apache.catalina.startup.Bootstrap - -[Install] -WantedBy=multi-user.target Copied: tomcat8/repos/extra-any/tomcat8.service (from rev 434717, tomcat8/trunk/tomcat8.service) =================================================================== --- tomcat8.service (rev 0) +++ tomcat8.service 2022-01-19 09:28:32 UTC (rev 434718) @@ -0,0 +1,35 @@ +[Unit] +Description=Tomcat 8 servlet container +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/tomcat8.pid +Environment=CATALINA_PID=/var/run/tomcat8.pid +Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime +Environment=CATALINA_HOME=/usr/share/tomcat8 +Environment=CATALINA_BASE=/usr/share/tomcat8 +Environment=CATALINA_OPTS= +Environment=ERRFILE=SYSLOG +Environment=OUTFILE=SYSLOG + +ExecStart=/usr/bin/jsvc \ + -Dcatalina.home=${CATALINA_HOME} \ + -Dcatalina.base=${CATALINA_BASE} \ + -Djava.io.tmpdir=/var/tmp/tomcat8/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 tomcat8 \ + -java-home ${TOMCAT_JAVA_HOME} \ + -pidfile /var/run/tomcat8.pid \ + -errfile ${ERRFILE} \ + -outfile ${OUTFILE} \ + $CATALINA_OPTS \ + org.apache.catalina.startup.Bootstrap + +ExecStop=/usr/bin/jsvc \ + -pidfile /var/run/tomcat8.pid \ + -stop \ + org.apache.catalina.startup.Bootstrap + +[Install] +WantedBy=multi-user.target Deleted: tomcat8.sysusers =================================================================== --- tomcat8.sysusers 2022-01-19 09:28:23 UTC (rev 434717) +++ tomcat8.sysusers 2022-01-19 09:28:32 UTC (rev 434718) @@ -1 +0,0 @@ -u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8 Copied: tomcat8/repos/extra-any/tomcat8.sysusers (from rev 434717, tomcat8/trunk/tomcat8.sysusers) =================================================================== --- tomcat8.sysusers (rev 0) +++ tomcat8.sysusers 2022-01-19 09:28:32 UTC (rev 434718) @@ -0,0 +1 @@ +u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8 Deleted: tomcat8.tmpfiles =================================================================== --- tomcat8.tmpfiles 2022-01-19 09:28:23 UTC (rev 434717) +++ tomcat8.tmpfiles 2022-01-19 09:28:32 UTC (rev 434718) @@ -1,5 +0,0 @@ -d /var/tmp/tomcat8/temp 0775 tomcat8 tomcat8 -d /var/tmp/tomcat8/work 0775 tomcat8 tomcat8 -d /var/lib/tomcat8 0775 tomcat8 tomcat8 -d /var/lib/tomcat8/webapps 0775 tomcat8 tomcat8 -d /var/log/tomcat8 0775 tomcat8 log Copied: tomcat8/repos/extra-any/tomcat8.tmpfiles (from rev 434717, tomcat8/trunk/tomcat8.tmpfiles) =================================================================== --- tomcat8.tmpfiles (rev 0) +++ tomcat8.tmpfiles 2022-01-19 09:28:32 UTC (rev 434718) @@ -0,0 +1,5 @@ +d /var/tmp/tomcat8/temp 0775 tomcat8 tomcat8 +d /var/tmp/tomcat8/work 0775 tomcat8 tomcat8 +d /var/lib/tomcat8 0775 tomcat8 tomcat8 +d /var/lib/tomcat8/webapps 0775 tomcat8 tomcat8 +d /var/log/tomcat8 0775 tomcat8 log