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

2015-02-04 Thread Guillaume Alaux 
Date: Wednesday, February 4, 2015 @ 18:12:06
  Author: guillaume
Revision: 230771

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 230770, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 230770, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 230770, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 230770, 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
===
--- PKGBUILD2015-02-04 17:11:16 UTC (rev 230770)
+++ PKGBUILD2015-02-04 17:12:06 UTC (rev 230771)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.41
-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=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
-'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 230770, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-02-04 17:12:06 UTC (rev 230771)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume

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

2014-09-08 Thread Guillaume Alaux 
Date: Monday, September 8, 2014 @ 22:00:46
  Author: guillaume
Revision: 221199

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 221198, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 221198, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 221198, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 221198, 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
===
--- PKGBUILD2014-09-08 20:00:02 UTC (rev 221198)
+++ PKGBUILD2014-09-08 20:00:46 UTC (rev 221199)
@@ -1,75 +0,0 @@
-# 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
-}

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 221198, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-09-08 20:00:46 UTC (rev 221199)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume

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

2014-09-08 Thread Guillaume Alaux 
Date: Monday, September 8, 2014 @ 22:01:01
  Author: guillaume
Revision: 221200

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 221199, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 221199, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 221199, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 221199, 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
===
--- PKGBUILD2014-09-08 20:00:46 UTC (rev 221199)
+++ PKGBUILD2014-09-08 20:01:01 UTC (rev 221200)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.41
-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=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
-'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 221199, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-09-08 20:01:01 UTC (rev 221200)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume

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

2014-05-27 Thread Guillaume Alaux 
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
===
--- PKGBUILD2014-05-27 13:32:46 UTC (rev 213653)
+++ PKGBUILD2014-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)
+++ PKGBUILD2014-05-27 13:33:40 UTC (rev 213654)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume ALAUX

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

2014-02-15 Thread Guillaume Alaux 
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
===
--- PKGBUILD2014-02-15 15:03:14 UTC (rev 206005)
+++ PKGBUILD2014-02-15 15:06:53 UTC (rev 206006)
@@ -1,134 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@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

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

2014-02-15 Thread Guillaume Alaux 
Date: Saturday, February 15, 2014 @ 17:37:29
  Author: guillaume
Revision: 206023

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 206022, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 206022, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 206022, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 206022, 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 |   60 ---
 4 files changed, 146 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-02-15 16:36:19 UTC (rev 206022)
+++ PKGBUILD2014-02-15 16:37:29 UTC (rev 206023)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@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
-}

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 206022, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-02-15 16:37:29 UTC (rev 206023)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume

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

2012-04-15 Thread Guillaume Alaux 
Date: Sunday, April 15, 2012 @ 10:12:20
  Author: guillaume
Revision: 156187

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 156186, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 156186, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 156186, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 156186, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  264 +++---
 tomcat6 |  154 +++
 tomcat6.conf.d  |   30 +++---
 tomcat6.install |   54 +--
 4 files changed, 252 insertions(+), 250 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-04-15 14:11:55 UTC (rev 156186)
+++ PKGBUILD2012-04-15 14:12:20 UTC (rev 156187)
@@ -1,131 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.33
-pkgrel=4
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon' 
'eclipse-ecj')
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- '5a95b41d320aa455fe9cbf97a80b0953'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
-
-_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 download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package_java-servlet2.5-tomcat() {
-  pkgdesc=Servlet ${_servletver} 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' 
'java-jsp2.1-tomcat' 'eclipse-ecj')
-  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
-  etc/conf.d/tomcat6)
-  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}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  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}/dbcp-${pkgver}.jar \
-

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

2011-11-01 Thread Guillaume Alaux 
Date: Tuesday, November 1, 2011 @ 13:46:21
  Author: guillaume
Revision: 141660

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 141659, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 141659, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 141659, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 141659, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  218 --
 tomcat6 |  154 +++---
 tomcat6.conf.d  |   30 +++
 tomcat6.install |   54 ++---
 4 files changed, 250 insertions(+), 206 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -1,87 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-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
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.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
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 141659, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
+pkgver=6.0.33
+pkgrel=4
+arch=('any')

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

2011-09-14 Thread Guillaume Alaux 
Date: Wednesday, September 14, 2011 @ 12:25:41
  Author: guillaume
Revision: 138025

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 138024, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 138024, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 138024, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 138024, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  173 +++---
 tomcat6 |  154 
 tomcat6.conf.d  |   30 -
 tomcat6.install |   54 
 4 files changed, 206 insertions(+), 205 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-09-14 16:24:46 UTC (rev 138024)
+++ PKGBUILD2011-09-14 16:25:41 UTC (rev 138025)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=2
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-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
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
- '8f2ccc09837577394441d29a03b0e667'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 138024, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-14 16:25:41 UTC (rev 138025)
@@ -0,0 +1,87 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=3
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc'

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

2011-08-21 Thread Guillaume Alaux 
Date: Sunday, August 21, 2011 @ 05:41:12
  Author: guillaume
Revision: 136005

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 136004, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 136004, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136004, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 136004, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  172 +++---
 tomcat6 |  162 +-
 tomcat6.conf.d  |   22 +++---
 tomcat6.install |   54 
 4 files changed, 205 insertions(+), 205 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-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
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136004, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=1
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')

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

2011-08-21 Thread Guillaume Alaux 
Date: Sunday, August 21, 2011 @ 16:28:55
  Author: guillaume
Revision: 136029

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 136028, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 136028, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136028, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 136028, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  172 +++---
 tomcat6 |  158 -
 tomcat6.conf.d  |   26 
 tomcat6.install |   54 
 4 files changed, 205 insertions(+), 205 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=1
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-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
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136028, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=2
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc'