[arch-commits] Commit in tomcat6/repos/extra-any (9 files)

Guillaume Alaux guillaume at archlinux.org
Sat Feb 14 11:22:12 UTC 2015


    Date: Saturday, February 14, 2015 @ 12:22:12
  Author: guillaume
Revision: 231390

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
    (from rev 231389, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd_sysusers.d_tomcat6.conf
    (from rev 231389, tomcat6/trunk/systemd_sysusers.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
    (from rev 231389, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
    (from rev 231389, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
    (from rev 231389, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
  tomcat6/repos/extra-any/systemd_tomcat6.service
  tomcat6/repos/extra-any/tomcat6.install

---------------------------------+
 PKGBUILD                        |  157 +++++++++++++++++++-------------------
 systemd_sysusers.d_tomcat6.conf |    1 
 systemd_tmpfiles.d_tomcat6.conf |    6 -
 systemd_tomcat6.service         |   66 +++++++--------
 tomcat6.install                 |   54 ++++---------
 5 files changed, 138 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-14 11:19:10 UTC (rev 231389)
+++ PKGBUILD	2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=5' '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-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-        systemd_${pkgname}.service
-        systemd_tmpfiles.d_${pkgname}.conf
-        ${pkgname}.install)
-
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-            'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-            '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-            '16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-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: tomcat6/repos/extra-any/PKGBUILD (from rev 231389, tomcat6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-02-14 11:22:12 UTC (rev 231390)
@@ -0,0 +1,82 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=tomcat6
+pkgver=6.0.43
+pkgrel=2
+pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer Pages 2.1 technologies'
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime>=5' '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-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
+        systemd_${pkgname}.service
+        systemd_sysusers.d_${pkgname}.conf
+        systemd_tmpfiles.d_${pkgname}.conf)
+
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+            'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
+            '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
+            '16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
+
+_gid_log=19
+_gid_tomcat=66
+_uid_tomcat=66
+
+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
+}
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+            'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
+            '59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
+            '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

Copied: tomcat6/repos/extra-any/systemd_sysusers.d_tomcat6.conf (from rev 231389, tomcat6/trunk/systemd_sysusers.d_tomcat6.conf)
===================================================================
--- systemd_sysusers.d_tomcat6.conf	                        (rev 0)
+++ systemd_sysusers.d_tomcat6.conf	2015-02-14 11:22:12 UTC (rev 231390)
@@ -0,0 +1 @@
+u tomcat 66 "Tomcat 6 user" /usr/share/tomcat6

Deleted: systemd_tmpfiles.d_tomcat6.conf
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf	2015-02-14 11:19:10 UTC (rev 231389)
+++ systemd_tmpfiles.d_tomcat6.conf	2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,3 +0,0 @@
-d   /var/tmp/tomcat6
-d   /var/tmp/tomcat6/temp   0775    tomcat  tomcat
-d   /var/tmp/tomcat6/work   0775    tomcat  tomcat

Copied: tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf (from rev 231389, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf	                        (rev 0)
+++ systemd_tmpfiles.d_tomcat6.conf	2015-02-14 11:22:12 UTC (rev 231390)
@@ -0,0 +1,3 @@
+d   /var/tmp/tomcat6
+d   /var/tmp/tomcat6/temp   0775    tomcat  tomcat
+d   /var/tmp/tomcat6/work   0775    tomcat  tomcat

Deleted: systemd_tomcat6.service
===================================================================
--- systemd_tomcat6.service	2015-02-14 11:19:10 UTC (rev 231389)
+++ systemd_tomcat6.service	2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,33 +0,0 @@
-[Unit]
-Description=Tomcat 6 servlet container
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/tomcat6.pid
-Environment=CATALINA_PID=/var/run/tomcat6.pid
-Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime
-Environment=CATALINA_HOME=/usr/share/tomcat6
-Environment=CATALINA_BASE=/usr/share/tomcat6
-Environment=CATALINA_OPTS=
-
-ExecStart=/usr/bin/jsvc \
-            -Dcatalina.home=${CATALINA_HOME} \
-            -Dcatalina.base=${CATALINA_BASE} \
-            -Djava.io.tmpdir=/var/tmp/tomcat6/temp \
-            -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
-            -user tomcat \
-            -java-home ${TOMCAT_JAVA_HOME} \
-            -pidfile /var/run/tomcat6.pid \
-            -errfile SYSLOG \
-            -outfile SYSLOG \
-            $CATALINA_OPTS \
-            org.apache.catalina.startup.Bootstrap
-
-ExecStop=/usr/bin/jsvc \
-            -pidfile /var/run/tomcat6.pid \
-            -stop \
-            org.apache.catalina.startup.Bootstrap
-
-[Install]
-WantedBy=multi-user.target

Copied: tomcat6/repos/extra-any/systemd_tomcat6.service (from rev 231389, tomcat6/trunk/systemd_tomcat6.service)
===================================================================
--- systemd_tomcat6.service	                        (rev 0)
+++ systemd_tomcat6.service	2015-02-14 11:22:12 UTC (rev 231390)
@@ -0,0 +1,33 @@
+[Unit]
+Description=Tomcat 6 servlet container
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/tomcat6.pid
+Environment=CATALINA_PID=/var/run/tomcat6.pid
+Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime
+Environment=CATALINA_HOME=/usr/share/tomcat6
+Environment=CATALINA_BASE=/usr/share/tomcat6
+Environment=CATALINA_OPTS=
+
+ExecStart=/usr/bin/jsvc \
+            -Dcatalina.home=${CATALINA_HOME} \
+            -Dcatalina.base=${CATALINA_BASE} \
+            -Djava.io.tmpdir=/var/tmp/tomcat6/temp \
+            -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
+            -user tomcat \
+            -java-home ${TOMCAT_JAVA_HOME} \
+            -pidfile /var/run/tomcat6.pid \
+            -errfile SYSLOG \
+            -outfile SYSLOG \
+            $CATALINA_OPTS \
+            org.apache.catalina.startup.Bootstrap
+
+ExecStop=/usr/bin/jsvc \
+            -pidfile /var/run/tomcat6.pid \
+            -stop \
+            org.apache.catalina.startup.Bootstrap
+
+[Install]
+WantedBy=multi-user.target

Deleted: tomcat6.install
===================================================================
--- tomcat6.install	2015-02-14 11:19:10 UTC (rev 231389)
+++ tomcat6.install	2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,35 +0,0 @@
-_pkgname='tomcat6'
-_gid_tomcat_name='tomcat'
-_gid_tomcat=66
-_uid_tomcat_name='tomcat'
-_uid_tomcat=66
-
-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: tomcat6/repos/extra-any/tomcat6.install (from rev 231389, tomcat6/trunk/tomcat6.install)
===================================================================
--- tomcat6.install	                        (rev 0)
+++ tomcat6.install	2015-02-14 11:22:12 UTC (rev 231390)
@@ -0,0 +1,19 @@
+post_install() {
+    systemd-sysusers tomcat6.conf
+    systemd-tmpfiles --create tomcat6.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}/tomcat6"
+  echo "If you remove them, you may also want to remove user and group 'tomcat'"
+}



More information about the arch-commits mailing list