[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Maxime Gauduin
alucryd at archlinux.org
Mon Feb 17 07:39:22 UTC 2020
Date: Monday, February 17, 2020 @ 07:39:21
Author: alucryd
Revision: 375728
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 375727, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/tomcat8.install
(from rev 375727, tomcat8/trunk/tomcat8.install)
tomcat8/repos/extra-any/tomcat8.service
(from rev 375727, tomcat8/trunk/tomcat8.service)
tomcat8/repos/extra-any/tomcat8.sysusers
(from rev 375727, tomcat8/trunk/tomcat8.sysusers)
tomcat8/repos/extra-any/tomcat8.tmpfiles
(from rev 375727, 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 | 182 +++++++++++++++++++++++++++--------------------------
tomcat8.install | 32 ++++-----
tomcat8.service | 70 ++++++++++----------
tomcat8.sysusers | 2
tomcat8.tmpfiles | 10 +-
5 files changed, 152 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-17 07:39:12 UTC (rev 375727)
+++ PKGBUILD 2020-02-17 07:39:21 UTC (rev 375728)
@@ -1,87 +0,0 @@
-# Maintainer: Guillaume Alaux <guillaume at archlinux.org>
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-
-pkgname=tomcat8
-pkgver=8.5.50
-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
-)
-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
-source=(
- https://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- tomcat8.service
- tomcat8.sysusers
- tomcat8.tmpfiles
-)
-sha256sums=('ea762293e889f85d40f5ec14ac4474e133a379522d623f4ba5993da6260bf06e'
- '01ba022e06d6afa71f6f7d774e48c042c63eca9e06f0c95c92cf8d5a3828a8b2'
- '02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
- '0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm 755 "${pkgdir}"/usr/share/{,java/}tomcat8
- cp -dr --no-preserve=ownership bin "${pkgdir}"/usr/share/tomcat8
- # commons-daemon and tomcat-natives are packaged on their own
- rm "${pkgdir}"/usr/share/tomcat8/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar "${pkgdir}"/usr/share/tomcat8/bin/commons-daemon.jar
-
- install -m 644 lib/* "${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/* "${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 -r 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 -dm1777 "${pkgdir}"/var/tmp
- install -dm775 -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 -t "${pkgdir}"/usr/lib/systemd/system/
- 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 375727, tomcat8/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-17 07:39:21 UTC (rev 375728)
@@ -0,0 +1,95 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Guillaume Alaux <guillaume at archlinux.org>
+
+pkgname=tomcat8
+pkgver=8.5.51
+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
+)
+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
+source=(
+ https://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
+ tomcat8.service
+ tomcat8.sysusers
+ tomcat8.tmpfiles
+)
+validpgpkeys=(
+ A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 # Mark E D Thomas
+ 713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
+)
+
+sha256sums=(
+ 836ecd816605e281636cae78c5b494ccaeb168c24f8266a72e9e704b2204affe
+ SKIP
+ 01ba022e06d6afa71f6f7d774e48c042c63eca9e06f0c95c92cf8d5a3828a8b2
+ 02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216
+ 0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2
+)
+
+_gid_log=19
+_gid_tomcat=57
+_uid_tomcat=57
+
+package() {
+ cd apache-tomcat-${pkgver}
+
+ # Tomcat general files
+ install -dm 755 "${pkgdir}"/usr/share/{,java/}tomcat8
+ cp -dr --no-preserve=ownership bin "${pkgdir}"/usr/share/tomcat8
+ # commons-daemon and tomcat-natives are packaged on their own
+ rm "${pkgdir}"/usr/share/tomcat8/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
+ ln -s /usr/share/java/commons-daemon.jar "${pkgdir}"/usr/share/tomcat8/bin/commons-daemon.jar
+
+ install -m 644 lib/* "${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/* "${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 -r 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 2020-02-17 07:39:12 UTC (rev 375727)
+++ tomcat8.install 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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 375727, tomcat8/trunk/tomcat8.install)
===================================================================
--- tomcat8.install (rev 0)
+++ tomcat8.install 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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 2020-02-17 07:39:12 UTC (rev 375727)
+++ tomcat8.service 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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 375727, tomcat8/trunk/tomcat8.service)
===================================================================
--- tomcat8.service (rev 0)
+++ tomcat8.service 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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 2020-02-17 07:39:12 UTC (rev 375727)
+++ tomcat8.sysusers 2020-02-17 07:39:21 UTC (rev 375728)
@@ -1 +0,0 @@
-u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8
Copied: tomcat8/repos/extra-any/tomcat8.sysusers (from rev 375727, tomcat8/trunk/tomcat8.sysusers)
===================================================================
--- tomcat8.sysusers (rev 0)
+++ tomcat8.sysusers 2020-02-17 07:39:21 UTC (rev 375728)
@@ -0,0 +1 @@
+u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8
Deleted: tomcat8.tmpfiles
===================================================================
--- tomcat8.tmpfiles 2020-02-17 07:39:12 UTC (rev 375727)
+++ tomcat8.tmpfiles 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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 375727, tomcat8/trunk/tomcat8.tmpfiles)
===================================================================
--- tomcat8.tmpfiles (rev 0)
+++ tomcat8.tmpfiles 2020-02-17 07:39:21 UTC (rev 375728)
@@ -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
More information about the arch-commits
mailing list