[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Guillaume Alaux
guillaume at nymeria.archlinux.org
Sat Feb 15 15:06:53 UTC 2014
Date: Saturday, February 15, 2014 @ 16:06:53
Author: guillaume
Revision: 206006
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 206005, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 206005, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 206005, tomcat6/trunk/systemd_tomcat6.service)
tomcat6/repos/extra-any/tomcat6.install
(from rev 206005, 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 | 209 +++++++++++++-------------------------
systemd_tmpfiles.d_tomcat6.conf | 6 -
systemd_tomcat6.service | 66 ++++++------
tomcat6.install | 50 ++++-----
4 files changed, 136 insertions(+), 195 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-15 15:03:14 UTC (rev 206005)
+++ PKGBUILD 2014-02-15 15:06:53 UTC (rev 206006)
@@ -1,134 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.37
-pkgrel=2
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon')
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
- http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- systemd_tomcat6.service
- systemd_tmpfiles.d_tomcat6.conf
- tomcat6.install)
-
-sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
- '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
- '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
- '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
- '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
-
-_servletver=2.5
-_jspver=2.1
-
-#FIXME ant target 'download' should not be called
-build() {
- cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
- . /etc/profile.d/apache-ant.sh
-
- ant clean download deploy\
- -Dbase.path=${srcdir}/DOWN_LIBS \
- -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
- -Dno.build.dbcp=true
-}
-
-#TODO add test "ant test"
-
-package_java-servlet2.5-tomcat() {
- pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat'
- depends=('java-environment>=5')
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
-
- install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
- install -m644 servlet-api.jar \
- ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
-# ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
-# ${pkgdir}/usr/share/java/servlet-api.jar
-}
-
-package_java-jsp2.1-tomcat() {
- pkgdesc='JSP 2.1 java library implementation by Apache Tomcat'
- depends=('java-environment>=5')
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
-
- install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
- for j in el-api jsp-api; do
- install -m644 ${j}.jar \
- ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
-# ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar ${pkgdir}/usr/share/java/${j}.jar
- done
-}
-
-package_tomcat6() {
- pkgdesc='Servlet-2.5/JSP-2.1 Container'
- depends=('java-runtime>=5' 'java-jsvc'
- "java-servlet2.5-tomcat=${pkgver}" "java-jsp2.1-tomcat=${pkgver}")
- optdepends=('tomcat-native: to allow optimal performance in production environments')
- backup=(etc/tomcat6/catalina.policy
- etc/tomcat6/catalina.properties
- etc/tomcat6/context.xml
- etc/tomcat6/logging.properties
- etc/tomcat6/server.xml
- etc/tomcat6/tomcat-users.xml
- etc/tomcat6/web.xml)
- install=tomcat6.install
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-
- # Provided by previous packages
- rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
- ln -s /usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-
- for j in el-api jsp-api; do
- rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
- ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
- done
-
- install -m644 "${srcdir}/apache-tomcat-${pkgver}/lib/tomcat-dbcp.jar" \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
- ln -s tomcat-dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -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 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${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_tomcat6.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
-
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 206005, tomcat6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-02-15 15:06:53 UTC (rev 206006)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=tomcat6
+pkgver=6.0.39
+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=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
+ 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
+ '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
+ '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+
+_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
+}
Deleted: systemd_tmpfiles.d_tomcat6.conf
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf 2014-02-15 15:03:14 UTC (rev 206005)
+++ systemd_tmpfiles.d_tomcat6.conf 2014-02-15 15:06:53 UTC (rev 206006)
@@ -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 206005, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat6.conf 2014-02-15 15:06:53 UTC (rev 206006)
@@ -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 2014-02-15 15:03:14 UTC (rev 206005)
+++ systemd_tomcat6.service 2014-02-15 15:06:53 UTC (rev 206006)
@@ -1,33 +0,0 @@
-[Unit]
-Description=Tomcat 6 servlet container
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/tomcat6.pid
-Environment=CATALINA_PID=/var/run/tomcat6.pid
-Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-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 /var/log/tomcat6/catalina.err \
- -outfile /var/log/tomcat6/catalina.out \
- $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 206005, tomcat6/trunk/systemd_tomcat6.service)
===================================================================
--- systemd_tomcat6.service (rev 0)
+++ systemd_tomcat6.service 2014-02-15 15:06:53 UTC (rev 206006)
@@ -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/java-7-openjdk
+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 2014-02-15 15:03:14 UTC (rev 206005)
+++ tomcat6.install 2014-02-15 15:06:53 UTC (rev 206006)
@@ -1,25 +0,0 @@
-post_install() {
- getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
- getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat6 -s /bin/false tomcat
-
- 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."
- echo ">>>"
- echo ">>> To activate the module, please load it now (modprobe capability)."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if getent passwd tomcat >/dev/null 2>&1; then
- userdel tomcat
- fi
- if getent group tomcat >/dev/null 2>&1; then
- groupdel tomcat
- fi
-}
Copied: tomcat6/repos/extra-any/tomcat6.install (from rev 206005, tomcat6/trunk/tomcat6.install)
===================================================================
--- tomcat6.install (rev 0)
+++ tomcat6.install 2014-02-15 15:06:53 UTC (rev 206006)
@@ -0,0 +1,25 @@
+post_install() {
+ getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
+ getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat6 -s /bin/false tomcat
+
+ 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."
+ echo ">>>"
+ echo ">>> To activate the module, please load it now (modprobe capability)."
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ if getent passwd tomcat >/dev/null 2>&1; then
+ userdel tomcat
+ fi
+ if getent group tomcat >/dev/null 2>&1; then
+ groupdel tomcat
+ fi
+}
More information about the arch-commits
mailing list