[arch-commits] Commit in tomcat8/trunk (7 files)

Maxime Gauduin alucryd at archlinux.org
Mon Jun 3 19:36:25 UTC 2019


    Date: Monday, June 3, 2019 @ 19:36:25
  Author: alucryd
Revision: 354755

upgpkg: tomcat8 8.5.41-1

Added:
  tomcat8/trunk/tomcat8.service
  tomcat8/trunk/tomcat8.sysusers
  tomcat8/trunk/tomcat8.tmpfiles
Modified:
  tomcat8/trunk/PKGBUILD
Deleted:
  tomcat8/trunk/systemd_sysusers.d_tomcat8.conf
  tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf
  tomcat8/trunk/systemd_tomcat8.service

---------------------------------+
 PKGBUILD                        |  117 ++++++++++++++++++++------------------
 systemd_sysusers.d_tomcat8.conf |    1 
 systemd_tmpfiles.d_tomcat8.conf |    5 -
 systemd_tomcat8.service         |   35 -----------
 tomcat8.service                 |   35 +++++++++++
 tomcat8.sysusers                |    1 
 tomcat8.tmpfiles                |    5 +
 7 files changed, 104 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-03 19:21:39 UTC (rev 354754)
+++ PKGBUILD	2019-06-03 19:36:25 UTC (rev 354755)
@@ -1,78 +1,87 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Maintainer: Guillaume Alaux <guillaume at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+
 pkgname=tomcat8
-pkgver=8.5.38
+pkgver=8.5.41
 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')
+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/${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://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-        systemd_${pkgname}.service
-        systemd_sysusers.d_${pkgname}.conf
-        systemd_tmpfiles.d_${pkgname}.conf)
+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=('4f6b88d0c07ba3dc68779a01c3da6da0e4e8889df0c93000659d6da6166de293'
+            '01ba022e06d6afa71f6f7d774e48c042c63eca9e06f0c95c92cf8d5a3828a8b2'
+            '02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
+            '0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
 
-sha512sums=('3a3e624014faf87091e6dbb8bad13c68240955d62301d22cf3d75a1766859dd97500d6850fbd5d3dc012f08f9301eb24c24fa7175bcca616767fa5c18875072d'
-            '114c62af0adf4243d210b2f3d7a9a51ca448a7105d38ef4a6587903eac716ad552989bfee76af933cf0022bad374a8dcb1b932abb8e902a93f72dec0aadd7ab7'
-            '7b505c79e495c35f787f300cd786e9f474ba2df61f8a50e21d2480de6a4c27a409b627447d1e4cb2fb543f81c107cbb30adbbc31a29754d0fe8e6908ea61cd7a'
-            'f5d819afa9b01adbe1f09267a64d1d35f994db48c7af9c49b1731305e82e0306561a24d6b6d4a33116dcd4990989d8a7a9c52532b003d480c0522e63b976c815')
-
 _gid_log=19
 _gid_tomcat=57
 _uid_tomcat=57
 
 package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
+  cd apache-tomcat-${pkgver}
 
   # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
+  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/${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
+  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 -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
+  install -m 644 lib/* "${pkgdir}"/usr/share/java/tomcat8
   # 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
+  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/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
+  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 -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 -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 -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 -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 -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 -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/${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 -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 -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
+  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:

Deleted: systemd_sysusers.d_tomcat8.conf
===================================================================
--- systemd_sysusers.d_tomcat8.conf	2019-06-03 19:21:39 UTC (rev 354754)
+++ systemd_sysusers.d_tomcat8.conf	2019-06-03 19:36:25 UTC (rev 354755)
@@ -1 +0,0 @@
-u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8

Deleted: systemd_tmpfiles.d_tomcat8.conf
===================================================================
--- systemd_tmpfiles.d_tomcat8.conf	2019-06-03 19:21:39 UTC (rev 354754)
+++ systemd_tmpfiles.d_tomcat8.conf	2019-06-03 19:36:25 UTC (rev 354755)
@@ -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

Deleted: systemd_tomcat8.service
===================================================================
--- systemd_tomcat8.service	2019-06-03 19:21:39 UTC (rev 354754)
+++ systemd_tomcat8.service	2019-06-03 19:36:25 UTC (rev 354755)
@@ -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

Added: tomcat8.service
===================================================================
--- tomcat8.service	                        (rev 0)
+++ tomcat8.service	2019-06-03 19:36:25 UTC (rev 354755)
@@ -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

Added: tomcat8.sysusers
===================================================================
--- tomcat8.sysusers	                        (rev 0)
+++ tomcat8.sysusers	2019-06-03 19:36:25 UTC (rev 354755)
@@ -0,0 +1 @@
+u tomcat8 57 "Tomcat 8 user" /usr/share/tomcat8

Added: tomcat8.tmpfiles
===================================================================
--- tomcat8.tmpfiles	                        (rev 0)
+++ tomcat8.tmpfiles	2019-06-03 19:36:25 UTC (rev 354755)
@@ -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