Date: Wednesday, February 10, 2016 @ 16:46:12
Author: guillaume
Revision: 259034
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 259033, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 259033, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 259033, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 259033, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 259033, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
---------------------------------+
PKGBUILD | 156 +++++++++++++++++++-------------------
systemd_sysusers.d_tomcat8.conf | 2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 68 ++++++++--------
tomcat8.install | 38 ++++-----
5 files changed, 138 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-10 15:45:39 UTC (rev 259033)
+++ PKGBUILD 2016-02-10 15:46:12 UTC (rev 259034)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX <guilla...@archlinux.org>
-pkgname=tomcat8
-pkgver=8.0.30
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://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/${pkgname}/catalina.policy
- etc/${pkgname}/catalina.properties
- etc/${pkgname}/context.xml
- etc/${pkgname}/logging.properties
- etc/${pkgname}/server.xml
- etc/${pkgname}/tomcat-users.xml
- etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(https://dist.apache.org/repos/dist/release/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- systemd_${pkgname}.service
- systemd_sysusers.d_${pkgname}.conf
- systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('2fc3dde305e08388a12bd2868063ab6829a1d70acd9affe3a8707bd9679e0059'
- 'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
- '02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
- '0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd "${srcdir}/apache-tomcat-${pkgver}"
-
- # Tomcat general files
- install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
- cp -r bin "${pkgdir}"/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
"${pkgdir}"/var/log/${pkgname}
- ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
- touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 "${pkgdir}"/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
-
- install -dm775 "${pkgdir}"/var/lib/${pkgname}
- cp -r webapps "${pkgdir}"/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
- chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
- install -dm1777 "${pkgdir}"/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
"${pkgdir}"/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
-
- install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644 "${srcdir}"/systemd_tmpfiles.d_${pkgname}.conf \
- "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat8/repos/extra-any/PKGBUILD (from rev 259033,
tomcat8/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-02-10 15:46:12 UTC (rev 259034)
@@ -0,0 +1,78 @@
+# Maintainer: Guillaume ALAUX <guilla...@archlinux.org>
+pkgname=tomcat8
+pkgver=8.0.32
+pkgrel=1
+pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
+arch=('any')
+url='http://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/${pkgname}/catalina.policy
+ etc/${pkgname}/catalina.properties
+ etc/${pkgname}/context.xml
+ etc/${pkgname}/logging.properties
+ etc/${pkgname}/server.xml
+ etc/${pkgname}/tomcat-users.xml
+ etc/${pkgname}/web.xml)
+install=${pkgname}.install
+source=(https://dist.apache.org/repos/dist/release/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
+ systemd_${pkgname}.service
+ systemd_sysusers.d_${pkgname}.conf
+ systemd_tmpfiles.d_${pkgname}.conf)
+
+sha256sums=('7e23260f2481aca88f89838e91cb9ff00548a28ba5a19a88ff99388c7ee9a9b8'
+ '01ba022e06d6afa71f6f7d774e48c042c63eca9e06f0c95c92cf8d5a3828a8b2'
+ '02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
+ '0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
+
+_gid_log=19
+_gid_tomcat=57
+_uid_tomcat=57
+
+package() {
+ cd "${srcdir}/apache-tomcat-${pkgver}"
+
+ # Tomcat general files
+ install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
+ cp -r bin "${pkgdir}"/usr/share/${pkgname}
+ # commons-daemon and tomcat-natives are packaged on their own
+ rm
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
+ ln -s /usr/share/java/commons-daemon.jar
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
+
+ install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
+ # eclipse-ecj is packaged on its own
+ rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
+ ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
+
+ ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
+
+ # We log through systemd but this would still be required for stock Tomcat
logging
+ install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
"${pkgdir}"/var/log/${pkgname}
+ ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
+ touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
+ chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
+
+ install -dm775 "${pkgdir}"/etc/${pkgname}
+ install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
+ install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
+ ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
+
+ install -dm775 "${pkgdir}"/var/lib/${pkgname}
+ cp -r webapps "${pkgdir}"/var/lib/${pkgname}
+ chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
+ chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
+ ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
+
+ install -dm1777 "${pkgdir}"/var/tmp
+ install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
"${pkgdir}"/var/tmp/${pkgname}/{temp,work}
+ ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
+ ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
+
+ install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
+ "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
+ install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
+ "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
+ install -Dm644 "${srcdir}"/systemd_tmpfiles.d_${pkgname}.conf \
+ "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+}
Deleted: systemd_sysusers.d_tomcat8.conf
===================================================================
--- systemd_sysusers.d_tomcat8.conf 2016-02-10 15:45:39 UTC (rev 259033)
+++ systemd_sysusers.d_tomcat8.conf 2016-02-10 15:46:12 UTC (rev 259034)
@@ -1 +0,0 @@
-u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8
Copied: tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf (from rev
259033, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
===================================================================
--- systemd_sysusers.d_tomcat8.conf (rev 0)
+++ systemd_sysusers.d_tomcat8.conf 2016-02-10 15:46:12 UTC (rev 259034)
@@ -0,0 +1 @@
+u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8
Deleted: systemd_tmpfiles.d_tomcat8.conf
===================================================================
--- systemd_tmpfiles.d_tomcat8.conf 2016-02-10 15:45:39 UTC (rev 259033)
+++ systemd_tmpfiles.d_tomcat8.conf 2016-02-10 15:46:12 UTC (rev 259034)
@@ -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/systemd_tmpfiles.d_tomcat8.conf (from rev
259033, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat8.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat8.conf 2016-02-10 15:46:12 UTC (rev 259034)
@@ -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
Deleted: systemd_tomcat8.service
===================================================================
--- systemd_tomcat8.service 2016-02-10 15:45:39 UTC (rev 259033)
+++ systemd_tomcat8.service 2016-02-10 15:46:12 UTC (rev 259034)
@@ -1,33 +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=
-
-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 SYSLOG \
- -outfile SYSLOG \
- $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/systemd_tomcat8.service (from rev 259033,
tomcat8/trunk/systemd_tomcat8.service)
===================================================================
--- systemd_tomcat8.service (rev 0)
+++ systemd_tomcat8.service 2016-02-10 15:46:12 UTC (rev 259034)
@@ -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.install
===================================================================
--- tomcat8.install 2016-02-10 15:45:39 UTC (rev 259033)
+++ tomcat8.install 2016-02-10 15:46:12 UTC (rev 259034)
@@ -1,19 +0,0 @@
-post_install() {
- systemd-sysusers tomcat8.conf
- systemd-tmpfiles --create tomcat8.conf
-
- 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 259033,
tomcat8/trunk/tomcat8.install)
===================================================================
--- tomcat8.install (rev 0)
+++ tomcat8.install 2016-02-10 15:46:12 UTC (rev 259034)
@@ -0,0 +1,19 @@
+post_install() {
+ systemd-sysusers tomcat8.conf
+ systemd-tmpfiles --create tomcat8.conf
+
+ 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'"
+}
