[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Guillaume Alaux
guillaume at nymeria.archlinux.org
Wed Apr 2 21:45:37 UTC 2014
Date: Wednesday, April 2, 2014 @ 23:45:37
Author: guillaume
Revision: 209759
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 209758, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 209758, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 209758, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 209758, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
---------------------------------+
PKGBUILD | 150 +++++++++++++++++++-------------------
systemd_tmpfiles.d_tomcat7.conf | 6 -
systemd_tomcat7.service | 66 ++++++++--------
tomcat7.install | 70 ++++++++---------
4 files changed, 146 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-02 21:45:03 UTC (rev 209758)
+++ PKGBUILD 2014-04-02 21:45:37 UTC (rev 209759)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgname=tomcat7
-pkgver=7.0.52
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer Pages 2.2 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=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- systemd_${pkgname}.service
- systemd_tmpfiles.d_${pkgname}.conf
- ${pkgname}.install)
-
-sha256sums=('f5f3c2c8f9946bf24445d2da14b3c2b8dc848622ef07c3cda14f486435d27fb0'
- '7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
- '4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
- '13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-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}
- 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_tmpfiles.d_${pkgname}.conf \
- "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 209758, tomcat7/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-04-02 21:45:37 UTC (rev 209759)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=tomcat7
+pkgver=7.0.53
+pkgrel=1
+pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer Pages 2.2 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=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
+ systemd_${pkgname}.service
+ systemd_tmpfiles.d_${pkgname}.conf
+ ${pkgname}.install)
+
+sha256sums=('f5e79d70ca7962d11abfc753e47b68a11fdfb4a409e76e2b7bd0a945f80f87c9'
+ '7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
+ '4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
+ '13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
+
+_gid_log=19
+_gid_tomcat=71
+_uid_tomcat=71
+
+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}
+ 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_tmpfiles.d_${pkgname}.conf \
+ "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+}
Deleted: systemd_tmpfiles.d_tomcat7.conf
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf 2014-04-02 21:45:03 UTC (rev 209758)
+++ systemd_tmpfiles.d_tomcat7.conf 2014-04-02 21:45:37 UTC (rev 209759)
@@ -1,3 +0,0 @@
-d /var/tmp/tomcat7
-d /var/tmp/tomcat7/temp 0775 tomcat7 tomcat7
-d /var/tmp/tomcat7/work 0775 tomcat7 tomcat7
Copied: tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf (from rev 209758, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat7.conf 2014-04-02 21:45:37 UTC (rev 209759)
@@ -0,0 +1,3 @@
+d /var/tmp/tomcat7
+d /var/tmp/tomcat7/temp 0775 tomcat7 tomcat7
+d /var/tmp/tomcat7/work 0775 tomcat7 tomcat7
Deleted: systemd_tomcat7.service
===================================================================
--- systemd_tomcat7.service 2014-04-02 21:45:03 UTC (rev 209758)
+++ systemd_tomcat7.service 2014-04-02 21:45:37 UTC (rev 209759)
@@ -1,33 +0,0 @@
-[Unit]
-Description=Tomcat 7 servlet container
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/tomcat7.pid
-Environment=CATALINA_PID=/var/run/tomcat7.pid
-Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-Environment=CATALINA_HOME=/usr/share/tomcat7
-Environment=CATALINA_BASE=/usr/share/tomcat7
-Environment=CATALINA_OPTS=
-
-ExecStart=/usr/bin/jsvc \
- -Dcatalina.home=${CATALINA_HOME} \
- -Dcatalina.base=${CATALINA_BASE} \
- -Djava.io.tmpdir=/var/tmp/tomcat7/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 \
- -java-home ${TOMCAT_JAVA_HOME} \
- -pidfile /var/run/tomcat7.pid \
- -errfile SYSLOG \
- -outfile SYSLOG \
- $CATALINA_OPTS \
- org.apache.catalina.startup.Bootstrap
-
-ExecStop=/usr/bin/jsvc \
- -pidfile /var/run/tomcat7.pid \
- -stop \
- org.apache.catalina.startup.Bootstrap
-
-[Install]
-WantedBy=multi-user.target
Copied: tomcat7/repos/extra-any/systemd_tomcat7.service (from rev 209758, tomcat7/trunk/systemd_tomcat7.service)
===================================================================
--- systemd_tomcat7.service (rev 0)
+++ systemd_tomcat7.service 2014-04-02 21:45:37 UTC (rev 209759)
@@ -0,0 +1,33 @@
+[Unit]
+Description=Tomcat 7 servlet container
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/tomcat7.pid
+Environment=CATALINA_PID=/var/run/tomcat7.pid
+Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
+Environment=CATALINA_HOME=/usr/share/tomcat7
+Environment=CATALINA_BASE=/usr/share/tomcat7
+Environment=CATALINA_OPTS=
+
+ExecStart=/usr/bin/jsvc \
+ -Dcatalina.home=${CATALINA_HOME} \
+ -Dcatalina.base=${CATALINA_BASE} \
+ -Djava.io.tmpdir=/var/tmp/tomcat7/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 \
+ -java-home ${TOMCAT_JAVA_HOME} \
+ -pidfile /var/run/tomcat7.pid \
+ -errfile SYSLOG \
+ -outfile SYSLOG \
+ $CATALINA_OPTS \
+ org.apache.catalina.startup.Bootstrap
+
+ExecStop=/usr/bin/jsvc \
+ -pidfile /var/run/tomcat7.pid \
+ -stop \
+ org.apache.catalina.startup.Bootstrap
+
+[Install]
+WantedBy=multi-user.target
Deleted: tomcat7.install
===================================================================
--- tomcat7.install 2014-04-02 21:45:03 UTC (rev 209758)
+++ tomcat7.install 2014-04-02 21:45:37 UTC (rev 209759)
@@ -1,35 +0,0 @@
-_pkgname='tomcat7'
-_gid_tomcat_name='tomcat7'
-_gid_tomcat=71
-_uid_tomcat_name='tomcat7'
-_uid_tomcat=71
-
-post_install() {
- if ! getent group ${_gid_tomcat_name} >/dev/null 2>&1; then
- groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
- fi
- if ! getent passwd ${_uid_tomcat_name} >/dev/null 2>&1; then
- useradd -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d /usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
- fi
-
- 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() {
- if getent passwd ${_uid_tomcat_name} > /dev/null 2>&1; then
- userdel ${_uid_tomcat_name}
- fi
- if getent group ${_gid_tomcat_name} > /dev/null 2>&1; then
- groupdel ${_gid_tomcat_name}
- fi
-
- echo "To fully clean Tomcat's file, consider removing directories /var/{lib,tmp,log}/${_pkgname}"
-}
Copied: tomcat7/repos/extra-any/tomcat7.install (from rev 209758, tomcat7/trunk/tomcat7.install)
===================================================================
--- tomcat7.install (rev 0)
+++ tomcat7.install 2014-04-02 21:45:37 UTC (rev 209759)
@@ -0,0 +1,35 @@
+_pkgname='tomcat7'
+_gid_tomcat_name='tomcat7'
+_gid_tomcat=71
+_uid_tomcat_name='tomcat7'
+_uid_tomcat=71
+
+post_install() {
+ if ! getent group ${_gid_tomcat_name} >/dev/null 2>&1; then
+ groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
+ fi
+ if ! getent passwd ${_uid_tomcat_name} >/dev/null 2>&1; then
+ useradd -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d /usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
+ fi
+
+ 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() {
+ if getent passwd ${_uid_tomcat_name} > /dev/null 2>&1; then
+ userdel ${_uid_tomcat_name}
+ fi
+ if getent group ${_gid_tomcat_name} > /dev/null 2>&1; then
+ groupdel ${_gid_tomcat_name}
+ fi
+
+ echo "To fully clean Tomcat's file, consider removing directories /var/{lib,tmp,log}/${_pkgname}"
+}
More information about the arch-commits
mailing list