Date: Tuesday, May 27, 2014 @ 15:33:40 Author: guillaume Revision: 213654
archrelease: copy trunk to extra-any Added: tomcat6/repos/extra-any/PKGBUILD (from rev 213653, tomcat6/trunk/PKGBUILD) tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf (from rev 213653, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf) tomcat6/repos/extra-any/systemd_tomcat6.service (from rev 213653, tomcat6/trunk/systemd_tomcat6.service) tomcat6/repos/extra-any/tomcat6.install (from rev 213653, 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 | 150 +++++++++++++++++++------------------- systemd_tmpfiles.d_tomcat6.conf | 6 - systemd_tomcat6.service | 66 ++++++++-------- tomcat6.install | 70 ++++++++--------- 4 files changed, 146 insertions(+), 146 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-05-27 13:32:46 UTC (rev 213653) +++ PKGBUILD 2014-05-27 13:33:40 UTC (rev 213654) @@ -1,75 +0,0 @@ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -pkgname=tomcat6 -pkgver=6.0.39 -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_tmpfiles.d_${pkgname}.conf - ${pkgname}.install) - -sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7' - 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68' - '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 213653, tomcat6/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-05-27 13:33:40 UTC (rev 213654) @@ -0,0 +1,75 @@ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +pkgname=tomcat6 +pkgver=6.0.41 +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=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953' + 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68' + '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 +} Deleted: systemd_tmpfiles.d_tomcat6.conf =================================================================== --- systemd_tmpfiles.d_tomcat6.conf 2014-05-27 13:32:46 UTC (rev 213653) +++ systemd_tmpfiles.d_tomcat6.conf 2014-05-27 13:33:40 UTC (rev 213654) @@ -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 213653, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf) =================================================================== --- systemd_tmpfiles.d_tomcat6.conf (rev 0) +++ systemd_tmpfiles.d_tomcat6.conf 2014-05-27 13:33:40 UTC (rev 213654) @@ -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-05-27 13:32:46 UTC (rev 213653) +++ systemd_tomcat6.service 2014-05-27 13:33:40 UTC (rev 213654) @@ -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/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 Copied: tomcat6/repos/extra-any/systemd_tomcat6.service (from rev 213653, tomcat6/trunk/systemd_tomcat6.service) =================================================================== --- systemd_tomcat6.service (rev 0) +++ systemd_tomcat6.service 2014-05-27 13:33:40 UTC (rev 213654) @@ -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-05-27 13:32:46 UTC (rev 213653) +++ tomcat6.install 2014-05-27 13:33:40 UTC (rev 213654) @@ -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 213653, tomcat6/trunk/tomcat6.install) =================================================================== --- tomcat6.install (rev 0) +++ tomcat6.install 2014-05-27 13:33:40 UTC (rev 213654) @@ -0,0 +1,35 @@ +_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}" +}