Date: Tuesday, September 20, 2016 @ 15:52:58
  Author: guillaume
Revision: 276772

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
    (from rev 276771, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
    (from rev 276771, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
    (from rev 276771, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
    (from rev 276771, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
    (from rev 276771, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

---------------------------------+
 PKGBUILD                        |  156 +++++++++++++++++++-------------------
 systemd_sysusers.d_tomcat7.conf |    2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service         |   70 ++++++++---------
 tomcat7.install                 |   38 ++++-----
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2016-09-20 15:52:14 UTC (rev 276771)
+++ PKGBUILD    2016-09-20 15:52:58 UTC (rev 276772)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX <guilla...@archlinux.org>
-pkgname=tomcat7
-pkgver=7.0.70
-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>=6' '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_sysusers.d_${pkgname}.conf
-        systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74'
-            '51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-            '4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-            'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_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}
-  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: tomcat7/repos/extra-any/PKGBUILD (from rev 276771, 
tomcat7/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2016-09-20 15:52:58 UTC (rev 276772)
@@ -0,0 +1,78 @@
+# Maintainer: Guillaume ALAUX <guilla...@archlinux.org>
+pkgname=tomcat7
+pkgver=7.0.72
+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>=6' '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_sysusers.d_${pkgname}.conf
+        systemd_tmpfiles.d_${pkgname}.conf)
+
+sha256sums=('779c7bba49a9ed3cafc47a87c8f331d2068f2545105fdd1c1076e0357ebda5db'
+            '51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
+            '4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
+            'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
+
+_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}
+  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_tomcat7.conf
===================================================================
--- systemd_sysusers.d_tomcat7.conf     2016-09-20 15:52:14 UTC (rev 276771)
+++ systemd_sysusers.d_tomcat7.conf     2016-09-20 15:52:58 UTC (rev 276772)
@@ -1 +0,0 @@
-u tomcat7 71 "Tomcat 7 user" /usr/share/tomcat7

Copied: tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf (from rev 
276771, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
===================================================================
--- systemd_sysusers.d_tomcat7.conf                             (rev 0)
+++ systemd_sysusers.d_tomcat7.conf     2016-09-20 15:52:58 UTC (rev 276772)
@@ -0,0 +1 @@
+u tomcat7 71 "Tomcat 7 user" /usr/share/tomcat7

Deleted: systemd_tmpfiles.d_tomcat7.conf
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf     2016-09-20 15:52:14 UTC (rev 276771)
+++ systemd_tmpfiles.d_tomcat7.conf     2016-09-20 15:52:58 UTC (rev 276772)
@@ -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

Copied: tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf (from rev 
276771, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf                             (rev 0)
+++ systemd_tmpfiles.d_tomcat7.conf     2016-09-20 15:52:58 UTC (rev 276772)
@@ -0,0 +1,5 @@
+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

Deleted: systemd_tomcat7.service
===================================================================
--- systemd_tomcat7.service     2016-09-20 15:52:14 UTC (rev 276771)
+++ systemd_tomcat7.service     2016-09-20 15:52:58 UTC (rev 276772)
@@ -1,35 +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/default-runtime
-Environment=CATALINA_HOME=/usr/share/tomcat7
-Environment=CATALINA_BASE=/usr/share/tomcat7
-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/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 ${ERRFILE} \
-            -outfile ${OUTFILE} \
-            $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 276771, 
tomcat7/trunk/systemd_tomcat7.service)
===================================================================
--- systemd_tomcat7.service                             (rev 0)
+++ systemd_tomcat7.service     2016-09-20 15:52:58 UTC (rev 276772)
@@ -0,0 +1,35 @@
+[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/default-runtime
+Environment=CATALINA_HOME=/usr/share/tomcat7
+Environment=CATALINA_BASE=/usr/share/tomcat7
+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/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 ${ERRFILE} \
+            -outfile ${OUTFILE} \
+            $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     2016-09-20 15:52:14 UTC (rev 276771)
+++ tomcat7.install     2016-09-20 15:52:58 UTC (rev 276772)
@@ -1,19 +0,0 @@
-post_install() {
-    systemd-sysusers tomcat7.conf
-    systemd-tmpfiles --create tomcat7.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}/tomcat7"
-  echo "If you remove them, you may also want to remove user and group 
'tomcat7'"
-}

Copied: tomcat7/repos/extra-any/tomcat7.install (from rev 276771, 
tomcat7/trunk/tomcat7.install)
===================================================================
--- tomcat7.install                             (rev 0)
+++ tomcat7.install     2016-09-20 15:52:58 UTC (rev 276772)
@@ -0,0 +1,19 @@
+post_install() {
+    systemd-sysusers tomcat7.conf
+    systemd-tmpfiles --create tomcat7.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}/tomcat7"
+  echo "If you remove them, you may also want to remove user and group 
'tomcat7'"
+}

Reply via email to