[arch-commits] Commit in (tomcat6)

[Guillaume Alaux]

Date: Sunday, February 5, 2017 @ 10:23:38
  Author: guillaume
Revision: 288062

Kill package tomcat6

Deleted:
  tomcat6/

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

[Guillaume Alaux]

Date: Wednesday, November 23, 2016 @ 12:47:40
  Author: guillaume
Revision: 281967

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  158 +++---
 systemd_sysusers.d_tomcat6.conf |2 
 systemd_tmpfiles.d_tomcat6.conf |6 -
 systemd_tomcat6.service |   66 +++
 tomcat6.install |   38 -
 5 files changed, 136 insertions(+), 134 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-11-23 12:47:02 UTC (rev 281966)
+++ PKGBUILD2016-11-23 12:47:40 UTC (rev 281967)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat6
-pkgver=6.0.47
-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_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('e7bcdf2037d813f487f4d98459dafdd55995ddb2f177c75ca1a3564aca309b77'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
-
-  install -dm775 "${pkgdir}"/var/lib/${pkgname}
-  cp -r webapps "${pkgdir}"/var/lib/${pkgname}
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${pkgdir}"/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Wednesday, November 23, 2016 @ 12:47:02
  Author: guillaume
Revision: 281966

Upstream release 6.0.48

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-23 00:19:58 UTC (rev 281965)
+++ PKGBUILD2016-11-23 12:47:02 UTC (rev 281966)
@@ -1,6 +1,6 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat6
-pkgver=6.0.47
+pkgver=6.0.48
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
 arch=('any')
@@ -22,7 +22,7 @@
 systemd_tmpfiles.d_${pkgname}.conf)
 validpgpkeys=('713DA88BE50911535FE716F5208B0AB1D63011C7')
 
-sha256sums=('e7bcdf2037d813f487f4d98459dafdd55995ddb2f177c75ca1a3564aca309b77'
+sha256sums=('6c2db06620e36f08921dfe94bcb3f04f511c055886f7286375455cf4907092f0'
 'SKIP'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Wednesday, October 26, 2016 @ 16:22:02
  Author: guillaume
Revision: 279280

Add source file signature check

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-26 16:15:01 UTC (rev 279279)
+++ PKGBUILD2016-10-26 16:22:02 UTC (rev 279280)
@@ -16,12 +16,14 @@
 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
+source=(https://www.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
 systemd_${pkgname}.service
 systemd_sysusers.d_${pkgname}.conf
 systemd_tmpfiles.d_${pkgname}.conf)
+validpgpkeys=('713DA88BE50911535FE716F5208B0AB1D63011C7')
 
 sha256sums=('e7bcdf2037d813f487f4d98459dafdd55995ddb2f177c75ca1a3564aca309b77'
+'SKIP'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

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

[Guillaume Alaux]

Date: Monday, October 24, 2016 @ 18:46:31
  Author: guillaume
Revision: 279214

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat6.conf |2 
 systemd_tmpfiles.d_tomcat6.conf |6 -
 systemd_tomcat6.service |   66 
 tomcat6.install |   38 -
 5 files changed, 134 insertions(+), 134 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-10-24 18:45:40 UTC (rev 279213)
+++ PKGBUILD2016-10-24 18:46:31 UTC (rev 279214)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat6
-pkgver=6.0.45
-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_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('8f9bd3e02f1e7798ca8f99f3254594688307ced3e7325dfb10f336750d82482d'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
-
-  install -dm775 "${pkgdir}"/var/lib/${pkgname}
-  cp -r webapps "${pkgdir}"/var/lib/${pkgname}
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${pkgdir}"/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Monday, October 24, 2016 @ 18:45:40
  Author: guillaume
Revision: 279213

Upstream release 6.0.47

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-24 18:36:22 UTC (rev 279212)
+++ PKGBUILD2016-10-24 18:45:40 UTC (rev 279213)
@@ -1,6 +1,6 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat6
-pkgver=6.0.45
+pkgver=6.0.47
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
 arch=('any')
@@ -21,7 +21,7 @@
 systemd_sysusers.d_${pkgname}.conf
 systemd_tmpfiles.d_${pkgname}.conf)
 
-sha256sums=('8f9bd3e02f1e7798ca8f99f3254594688307ced3e7325dfb10f336750d82482d'
+sha256sums=('e7bcdf2037d813f487f4d98459dafdd55995ddb2f177c75ca1a3564aca309b77'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

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

[Guillaume Alaux]

Date: Monday, February 22, 2016 @ 13:10:53
  Author: guillaume
Revision: 260140

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat6.conf |2 
 systemd_tmpfiles.d_tomcat6.conf |6 -
 systemd_tomcat6.service |   66 
 tomcat6.install |   38 -
 5 files changed, 134 insertions(+), 134 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-02-22 12:10:20 UTC (rev 260139)
+++ PKGBUILD2016-02-22 12:10:53 UTC (rev 260140)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat6
-pkgver=6.0.44
-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_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
-
-  install -dm775 "${pkgdir}"/var/lib/${pkgname}
-  cp -r webapps "${pkgdir}"/var/lib/${pkgname}
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${pkgdir}"/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Monday, February 22, 2016 @ 13:10:20
  Author: guillaume
Revision: 260139

Upstream release 6.0.45

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-22 11:03:27 UTC (rev 260138)
+++ PKGBUILD2016-02-22 12:10:20 UTC (rev 260139)
@@ -1,6 +1,6 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat6
-pkgver=6.0.44
+pkgver=6.0.45
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
 arch=('any')
@@ -21,7 +21,7 @@
 systemd_sysusers.d_${pkgname}.conf
 systemd_tmpfiles.d_${pkgname}.conf)
 
-sha256sums=('aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224'
+sha256sums=('8f9bd3e02f1e7798ca8f99f3254594688307ced3e7325dfb10f336750d82482d'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

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

[Guillaume Alaux]

Date: Wednesday, May 13, 2015 @ 12:52:13
  Author: guillaume
Revision: 239286

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  160 ++
 systemd_sysusers.d_tomcat6.conf |2 
 systemd_tmpfiles.d_tomcat6.conf |6 -
 systemd_tomcat6.service |   66 +++
 tomcat6.install |   38 -
 5 files changed, 134 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-05-13 10:51:32 UTC (rev 239285)
+++ PKGBUILD2015-05-13 10:52:13 UTC (rev 239286)
@@ -1,82 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
-  install -Dm644 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Wednesday, May 13, 2015 @ 12:51:32
  Author: guillaume
Revision: 239285

Upstream release 6.0.44

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-13 04:19:53 UTC (rev 239284)
+++ PKGBUILD2015-05-13 10:51:32 UTC (rev 239285)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=2
+pkgver=6.0.44
+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/'
@@ -21,10 +21,10 @@
 systemd_sysusers.d_${pkgname}.conf
 systemd_tmpfiles.d_${pkgname}.conf)
 
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+sha256sums=('aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
+'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
+'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
 
 _gid_log=19
 _gid_tomcat=66
@@ -76,7 +76,3 @@
   install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
  ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
 }
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

[arch-commits] Commit in tomcat6/trunk (3 files)

[Guillaume Alaux]

Date: Saturday, February 14, 2015 @ 12:19:10
  Author: guillaume
Revision: 231389

Report latest changes from tomcat7/8

- Create 'tomcat' user throught systemd
- Do not remove 'tomcat' user after package removal
- Fix /var/tmp/tomcat6 rights

Added:
  tomcat6/trunk/systemd_sysusers.d_tomcat6.conf
Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install

-+
 PKGBUILD|   13 ++---
 systemd_sysusers.d_tomcat6.conf |1 +
 tomcat6.install |   24 
 3 files changed, 15 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-14 06:06:25 UTC (rev 231388)
+++ PKGBUILD2015-02-14 11:19:10 UTC (rev 231389)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.43
-pkgrel=1
+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/'
@@ -18,8 +18,8 @@
 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)
+systemd_sysusers.d_${pkgname}.conf
+systemd_tmpfiles.d_${pkgname}.conf)
 
 sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
@@ -61,6 +61,7 @@
   install -dm775 ${pkgdir}/var/lib/${pkgname}
   cp -r webapps ${pkgdir}/var/lib/${pkgname}
   chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
+  chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
   ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
 
   install -dm1777 ${pkgdir}/var/tmp
@@ -70,6 +71,12 @@
 
   install -Dm644 ${srcdir}/systemd_${pkgname}.service \
  ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+  install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
+ ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
   install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
  ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
 }
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
+'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
+'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')

Added: systemd_sysusers.d_tomcat6.conf
===
--- systemd_sysusers.d_tomcat6.conf (rev 0)
+++ systemd_sysusers.d_tomcat6.conf 2015-02-14 11:19:10 UTC (rev 231389)
@@ -0,0 +1 @@
+u tomcat 66 Tomcat 6 user /usr/share/tomcat6

Modified: tomcat6.install
===
--- tomcat6.install 2015-02-14 06:06:25 UTC (rev 231388)
+++ tomcat6.install 2015-02-14 11:19:10 UTC (rev 231389)
@@ -1,16 +1,6 @@
-_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 21; then
-groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
-  fi
-  if ! getent passwd ${_uid_tomcat_name} /dev/null 21; then
-useradd  -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d 
/usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
-  fi
+systemd-sysusers tomcat6.conf
+systemd-tmpfiles --create tomcat6.conf
 
   if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
 echo 'It appears that your current kernel has linux security'
@@ -24,12 +14,6 @@
 }
 
 pre_remove() {
-  if getent passwd ${_uid_tomcat_name}  /dev/null 21; then
-userdel ${_uid_tomcat_name}
-  fi
-  if getent group ${_gid_tomcat_name}  /dev/null 21; then
-groupdel ${_gid_tomcat_name}
-  fi
-
-  echo To fully clean Tomcat's file, consider removing directories 
/var/{lib,tmp,log}/${_pkgname}
+  echo Leftover files may reside in /var/{lib,tmp,log}/tomcat6
+  echo If you remove them, you may also want to remove user and group 
'tomcat'
 }

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

[Guillaume Alaux]

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

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2015-02-14 11:19:10 UTC (rev 231389)
+++ PKGBUILD2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 231389, 
tomcat6/trunk/PKGBUILD)

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

[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/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Wednesday, February 4, 2015 @ 18:11:16
  Author: guillaume
Revision: 230770

Upstream release 6.0.43

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-04 16:27:56 UTC (rev 230769)
+++ PKGBUILD2015-02-04 17:11:16 UTC (rev 230770)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
-pkgver=6.0.41
-pkgrel=2
+pkgver=6.0.43
+pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer 
Pages 2.1 technologies'
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -21,7 +21,7 @@
 systemd_tmpfiles.d_${pkgname}.conf
 ${pkgname}.install)
 
-sha256sums=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
 'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')

[arch-commits] Commit in tomcat6/trunk (PKGBUILD systemd_tomcat6.service)

[Guillaume Alaux]

Date: Monday, September 8, 2014 @ 21:59:14
  Author: guillaume
Revision: 221196

Use new default link for JRE

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/systemd_tomcat6.service

-+
 PKGBUILD|4 ++--
 systemd_tomcat6.service |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-08 19:59:08 UTC (rev 221195)
+++ PKGBUILD2014-09-08 19:59:14 UTC (rev 221196)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.41
-pkgrel=1
+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/'
@@ -22,7 +22,7 @@
 ${pkgname}.install)
 
 sha256sums=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
-'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
+'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
 

Modified: systemd_tomcat6.service
===
--- systemd_tomcat6.service 2014-09-08 19:59:08 UTC (rev 221195)
+++ systemd_tomcat6.service 2014-09-08 19:59:14 UTC (rev 221196)
@@ -6,7 +6,7 @@
 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=TOMCAT_JAVA_HOME=/usr/lib/jvm/default-runtime
 Environment=CATALINA_HOME=/usr/share/tomcat6
 Environment=CATALINA_BASE=/usr/share/tomcat6
 Environment=CATALINA_OPTS=

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

[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)

[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/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Tuesday, May 27, 2014 @ 15:32:46
  Author: guillaume
Revision: 213653

Upstream release 6.0.41

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-27 13:31:40 UTC (rev 213652)
+++ PKGBUILD2014-05-27 13:32:46 UTC (rev 213653)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
-pkgver=6.0.39
-pkgrel=2
+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/'
@@ -21,7 +21,7 @@
 systemd_tmpfiles.d_${pkgname}.conf
 ${pkgname}.install)
 
-sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
+sha256sums=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')

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

[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/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 13:55:04
  Author: guillaume
Revision: 205983

Set to be built from binary version

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   31 +--
 1 file changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 12:47:11 UTC (rev 205982)
+++ PKGBUILD2014-02-15 12:55:04 UTC (rev 205983)
@@ -7,14 +7,12 @@
 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
+source=(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'
+sha256sums=('3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
 '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
@@ -22,25 +20,11 @@
 _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
+  cd ${srcdir}/apache-tomcat-${pkgver}/lib
 
   install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
   install -m644 servlet-api.jar \
@@ -53,7 +37,7 @@
   pkgdesc='JSP 2.1 java library implementation by Apache Tomcat'
   depends=('java-environment=5')
 
-  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+  cd ${srcdir}/apache-tomcat-${pkgver}/lib
 
   install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
   for j in el-api jsp-api; do
@@ -77,7 +61,7 @@
   etc/tomcat6/web.xml)
   install=tomcat6.install
 
-  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
+  cd ${srcdir}/apache-tomcat-${pkgver}
 
   # Tomcat general files
   install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
@@ -98,11 +82,6 @@
   ${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

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 13:55:42
  Author: guillaume
Revision: 205984

Fixed permissions on 'work' dir

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 12:55:04 UTC (rev 205983)
+++ PKGBUILD2014-02-15 12:55:42 UTC (rev 205984)
@@ -101,7 +101,7 @@
   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}
+  install -dm775 -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-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 14:19:15
  Author: guillaume
Revision: 205989

Merged back java-jsp2.1 and java-servlet2.5 into tomcat6

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   74 -
 1 file changed, 15 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 13:03:24 UTC (rev 205988)
+++ PKGBUILD2014-02-15 13:19:15 UTC (rev 205989)
@@ -1,66 +1,33 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.37
-pkgrel=2
+pkgname=tomcat6
+pkgver=6.0.39
+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')
 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)
+install=tomcat6.install
 
source=(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=('3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
+sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
 '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
-_servletver=2.5
-_jspver=2.1
-
-package_java-servlet2.5-tomcat() {
-  pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat'
-  depends=('java-environment=5')
-
-  cd ${srcdir}/apache-tomcat-${pkgver}/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}/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}
 
   # Tomcat general files
@@ -71,17 +38,6 @@
 
   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
-
   ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
 
   # 66=tomcat / 19=log

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 14:20:12
  Author: guillaume
Revision: 205990

Added dependency to java-commons-daemon

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 13:19:15 UTC (rev 205989)
+++ PKGBUILD2014-02-15 13:20:12 UTC (rev 205990)
@@ -6,7 +6,7 @@
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc')
+depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon')
 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

[arch-commits] Commit in tomcat6/trunk (PKGBUILD systemd_tomcat6.service)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 14:23:00
  Author: guillaume
Revision: 205991

Removed systemd 'syslog.target' from service file

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/systemd_tomcat6.service

-+
 PKGBUILD|2 +-
 systemd_tomcat6.service |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 13:20:12 UTC (rev 205990)
+++ PKGBUILD2014-02-15 13:23:00 UTC (rev 205991)
@@ -23,7 +23,7 @@
 tomcat6.install)
 
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
-'8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
+'425c802bc66600cef7a26e9a418057a0b850f6e6c5001dbab175a85af220f5e8'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 

Modified: systemd_tomcat6.service
===
--- systemd_tomcat6.service 2014-02-15 13:20:12 UTC (rev 205990)
+++ systemd_tomcat6.service 2014-02-15 13:23:00 UTC (rev 205991)
@@ -1,6 +1,6 @@
 [Unit]
 Description=Tomcat 6 servlet container
-After=syslog.target network.target
+After=network.target
 
 [Service]
 Type=forking

[arch-commits] Commit in tomcat6/trunk (PKGBUILD systemd_tomcat6.service)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 14:57:58
  Author: guillaume
Revision: 205994

Set use of systemd logging to fix #37978

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/systemd_tomcat6.service

-+
 PKGBUILD|2 +-
 systemd_tomcat6.service |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 13:37:46 UTC (rev 205993)
+++ PKGBUILD2014-02-15 13:57:58 UTC (rev 205994)
@@ -23,7 +23,7 @@
 tomcat6.install)
 
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
-'425c802bc66600cef7a26e9a418057a0b850f6e6c5001dbab175a85af220f5e8'
+'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 

Modified: systemd_tomcat6.service
===
--- systemd_tomcat6.service 2014-02-15 13:37:46 UTC (rev 205993)
+++ systemd_tomcat6.service 2014-02-15 13:57:58 UTC (rev 205994)
@@ -19,8 +19,8 @@
 -user tomcat \
 -java-home ${TOMCAT_JAVA_HOME} \
 -pidfile /var/run/tomcat6.pid \
--errfile /var/log/tomcat6/catalina.err \
--outfile /var/log/tomcat6/catalina.out \
+-errfile SYSLOG \
+-outfile SYSLOG \
 $CATALINA_OPTS \
 org.apache.catalina.startup.Bootstrap
 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 15:00:38
  Author: guillaume
Revision: 205995

Cleaned some leftovers from previous commits

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 13:57:58 UTC (rev 205994)
+++ PKGBUILD2014-02-15 14:00:38 UTC (rev 205995)
@@ -7,7 +7,6 @@
 url='http://tomcat.apache.org/'
 license=('APACHE')
 depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon')
-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
@@ -27,7 +26,7 @@
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
-package_tomcat6() {
+package() {
   cd ${srcdir}/apache-tomcat-${pkgver}
 
   # Tomcat general files

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 15:11:30
  Author: guillaume
Revision: 205996

Added dependency to eclipse-ecj

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 14:00:38 UTC (rev 205995)
+++ PKGBUILD2014-02-15 14:11:30 UTC (rev 205996)
@@ -6,7 +6,7 @@
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon')
+depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
 optdepends=('tomcat-native: to allow optimal performance in production 
environments')
 backup=(etc/tomcat6/catalina.policy
 etc/tomcat6/catalina.properties
@@ -35,6 +35,10 @@
   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/ecj-*.jar
+  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
+
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
 
   ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 15:18:04
  Author: guillaume
Revision: 205997

Used variables for uid and gid in PKGBUILD

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 14:11:30 UTC (rev 205996)
+++ PKGBUILD2014-02-15 14:18:04 UTC (rev 205997)
@@ -25,6 +25,9 @@
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+_gid_log=19
+_gid_tomcat6=66
+_uid_tomcat6=66
 
 package() {
   cd ${srcdir}/apache-tomcat-${pkgver}
@@ -43,24 +46,23 @@
 
   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}
+  install -dm775 -o ${_uid_tomcat6} -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 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
+  chgrp ${_gid_log} ${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
+  install -g ${_gid_tomcat6} -m640 conf/* ${pkgdir}/etc/${pkgname}
+  install -d -g ${_gid_tomcat6} -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}
+  chown -R ${_uid_tomcat6}:${_gid_tomcat6} ${pkgdir}/var/lib/${pkgname}
   ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
 
   install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
+  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} 
${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-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 15:25:50
  Author: guillaume
Revision: 205999

Set double quotes around pkgdir and srcdir

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   54 +++---
 1 file changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 14:20:25 UTC (rev 205998)
+++ PKGBUILD2014-02-15 14:25:50 UTC (rev 205999)
@@ -2,7 +2,7 @@
 pkgname=tomcat6
 pkgver=6.0.39
 pkgrel=1
-pkgdesc='Servlet-2.5/JSP-2.1 Container'
+pkgdesc='Open source software implementation of the Java Servlet and 
JavaServer Pages technologies'
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -25,6 +25,7 @@
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+
 _gid_log=19
 _gid_tomcat6=66
 _uid_tomcat6=66
@@ -33,42 +34,41 @@
   cd ${srcdir}/apache-tomcat-${pkgver}
 
   # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
+  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}
+  cp -r bin ${pkgdir}/usr/share/${pkgname}
 
   # eclipse-ecj is packaged on its own
   rm lib/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
+  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
 
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
 
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
+  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
 
-  install -dm775 -o ${_uid_tomcat6} -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 -o ${_uid_tomcat6} -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_tomcat6} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat6} -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
+  install -dm775 ${pkgdir}/etc/${pkgname}
+  install -g ${_gid_tomcat6} -m640 conf/* ${pkgdir}/etc/${pkgname}
+  install -d -g ${_gid_tomcat6} -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_tomcat6}:${_gid_tomcat6} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
+  install -dm775 ${pkgdir}/var/lib/${pkgname}
+  cp -r webapps ${pkgdir}/var/lib/${pkgname}
+  chown -R ${_uid_tomcat6}:${_gid_tomcat6} ${pkgdir}/var/lib/${pkgname}
+  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
 
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} 
${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 -dm1777 ${pkgdir}/var/tmp
+  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} 
${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
+  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
 }
-

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 15:41:48
  Author: guillaume
Revision: 206002

Reconciliated PKGBUILD with tomcat8 (1/2)

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 14:29:32 UTC (rev 206001)
+++ PKGBUILD2014-02-15 14:41:48 UTC (rev 206002)
@@ -35,18 +35,19 @@
 
   # 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 bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
+  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 lib/ecj-*.jar
+  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
   ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
 
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-
   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_tomcat6} -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}

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 16:01:08
  Author: guillaume
Revision: 206004

Reconciliate PKGBUILD with tomcat8 (2/2)

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 14:51:41 UTC (rev 206003)
+++ PKGBUILD2014-02-15 15:01:08 UTC (rev 206004)
@@ -2,24 +2,24 @@
 pkgname=tomcat6
 pkgver=6.0.39
 pkgrel=1
-pkgdesc='Open source software implementation of the Java Servlet and 
JavaServer Pages technologies'
+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/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
+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_tomcat6.service
-systemd_tmpfiles.d_tomcat6.conf
-tomcat6.install)
+systemd_${pkgname}.service
+systemd_tmpfiles.d_${pkgname}.conf
+${pkgname}.install)
 
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
@@ -27,8 +27,8 @@
 '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
 _gid_log=19
-_gid_tomcat6=66
-_uid_tomcat6=66
+_gid_tomcat=66
+_uid_tomcat=66
 
 package() {
   cd ${srcdir}/apache-tomcat-${pkgver}
@@ -48,28 +48,28 @@
   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_tomcat6} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
+  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_tomcat6} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat6} -m775 ${pkgdir}/etc/${pkgname}/Catalina
+  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_tomcat6}:${_gid_tomcat6} ${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_tomcat6} -g ${_gid_tomcat6} 
${pkgdir}/var/tmp/${pkgname}/{temp,work}
+  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_tomcat6.service \
+  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
  ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \
+  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
  ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
 }

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

[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/trunk (tomcat6.install)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 16:21:48
  Author: guillaume
Revision: 206010

Added after remove message to cleanup files

Modified:
  tomcat6/trunk/tomcat6.install

-+
 tomcat6.install |2 ++
 1 file changed, 2 insertions(+)

Modified: tomcat6.install
===
--- tomcat6.install 2014-02-15 15:19:07 UTC (rev 206009)
+++ tomcat6.install 2014-02-15 15:21:48 UTC (rev 206010)
@@ -22,4 +22,6 @@
   if getent group tomcat /dev/null 21; then
   groupdel tomcat
   fi
+
+  echo 'To fully clean Tomcat''s file, consider removing directories 
/var/{lib,tmp,log}/tomcat6'
 }

[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.install)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 17:18:27
  Author: guillaume
Revision: 206019

Rewrote install scripts

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install

-+
 PKGBUILD|2 +-
 tomcat6.install |   34 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 16:15:55 UTC (rev 206018)
+++ PKGBUILD2014-02-15 16:18:27 UTC (rev 206019)
@@ -24,7 +24,7 @@
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+'35c9607502237febba2e588185b8eed4936a061c8926bbb86c3b99e0b67f6e0e')
 
 _gid_log=19
 _gid_tomcat=66

Modified: tomcat6.install
===
--- tomcat6.install 2014-02-15 16:15:55 UTC (rev 206018)
+++ tomcat6.install 2014-02-15 16:18:27 UTC (rev 206019)
@@ -1,13 +1,21 @@
+_pkgname='tomcat6'
+_gid_tomcat_name='tomcat6'
+_gid_tomcat=66
+_uid_tomcat_name='tomcat6'
+_uid_tomcat=66
+
 post_install() {
-  getent group tomcat /dev/null 21 || groupadd -g 66 tomcat
-  getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d 
/usr/share/tomcat6 -s /bin/false tomcat
+  if ! getent group ${_gid_tomcat_name} /dev/null 21; then
+groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
+  fi
+  if ! getent passwd ${_uid_tomcat_name} /dev/null 21; 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.
-echo 
-echo  To activate the module, please load it now (modprobe 
capability).
+  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
 }
 
@@ -16,12 +24,12 @@
 }
 
 pre_remove() {
-  if getent passwd tomcat /dev/null 21; then
-  userdel tomcat
+  if getent passwd ${_uid_tomcat_name}  /dev/null 21; then
+userdel ${_uid_tomcat_name}
   fi
-  if getent group tomcat /dev/null 21; then
-  groupdel tomcat
+  if getent group ${_gid_tomcat_name}  /dev/null 21; then
+groupdel ${_gid_tomcat_name}
   fi
 
-  echo 'To fully clean Tomcat''s file, consider removing directories 
/var/{lib,tmp,log}/tomcat6'
+  echo To fully clean Tomcat's file, consider removing directories 
/var/{lib,tmp,log}/${_pkgname}
 }

[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.install)

[Guillaume Alaux]

Date: Saturday, February 15, 2014 @ 17:36:19
  Author: guillaume
Revision: 206022

Fix typo on pkg name and pkgrel bump

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install

-+
 PKGBUILD|4 ++--
 tomcat6.install |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 16:35:54 UTC (rev 206021)
+++ PKGBUILD2014-02-15 16:36:19 UTC (rev 206022)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.39
-pkgrel=1
+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/'
@@ -24,7 +24,7 @@
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
 'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'35c9607502237febba2e588185b8eed4936a061c8926bbb86c3b99e0b67f6e0e')
+'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
 
 _gid_log=19
 _gid_tomcat=66

Modified: tomcat6.install
===
--- tomcat6.install 2014-02-15 16:35:54 UTC (rev 206021)
+++ tomcat6.install 2014-02-15 16:36:19 UTC (rev 206022)
@@ -1,7 +1,7 @@
 _pkgname='tomcat6'
-_gid_tomcat_name='tomcat6'
+_gid_tomcat_name='tomcat'
 _gid_tomcat=66
-_uid_tomcat_name='tomcat6'
+_uid_tomcat_name='tomcat'
 _uid_tomcat=66
 
 post_install() {

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

[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/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Tuesday, July 16, 2013 @ 20:51:42
  Author: guillaume
Revision: 190353

Rebuilt to remove rc.d files

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-16 18:51:42 UTC (rev 190352)
+++ PKGBUILD2013-07-16 18:51:42 UTC (rev 190353)
@@ -2,7 +2,7 @@
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.37
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -15,9 +15,9 @@
 
 sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
 '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
-'13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
+'8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
+'53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
 _servletver=2.5
 _jspver=2.1

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

[Guillaume Alaux]

Date: Tuesday, July 16, 2013 @ 20:53:51
  Author: guillaume
Revision: 190374

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  277 ++
 conf.d_tomcat6  |   19 --
 rc.d_tomcat6|   76 --
 systemd_tmpfiles.d_tomcat6.conf |6 
 systemd_tomcat6.service |   66 -
 tomcat6.install |   52 +++
 6 files changed, 195 insertions(+), 301 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-07-16 18:53:49 UTC (rev 190373)
+++ PKGBUILD2013-07-16 18:53:51 UTC (rev 190374)
@@ -1,143 +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=1
-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
-conf.d_tomcat6
-rc.d_tomcat6
-systemd_tomcat6.service
-systemd_tmpfiles.d_tomcat6.conf
-tomcat6.install)
-
-sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
-'3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
-'13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf'
-'8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
-
-_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
-  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}
-
-  install -m644 lib/* 

[arch-commits] Commit in tomcat6/trunk (4 files)

[Guillaume Alaux]

Date: Thursday, May 23, 2013 @ 22:56:18
  Author: guillaume
Revision: 186287

Removed rc.d script  Al for next release

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install
Deleted:
  tomcat6/trunk/conf.d_tomcat6
  tomcat6/trunk/rc.d_tomcat6

-+
 PKGBUILD|   11 ---
 conf.d_tomcat6  |   19 -
 rc.d_tomcat6|   76 --
 tomcat6.install |2 -
 4 files changed, 1 insertion(+), 107 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-23 20:40:14 UTC (rev 186286)
+++ PKGBUILD2013-05-23 20:56:18 UTC (rev 186287)
@@ -9,8 +9,6 @@
 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
-conf.d_tomcat6
-rc.d_tomcat6
 systemd_tomcat6.service
 systemd_tmpfiles.d_tomcat6.conf
 tomcat6.install)
@@ -18,8 +16,6 @@
 sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
 '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
 '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf'
-'8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
 
@@ -78,8 +74,7 @@
   etc/tomcat6/logging.properties
   etc/tomcat6/server.xml
   etc/tomcat6/tomcat-users.xml
-  etc/tomcat6/web.xml
-  etc/conf.d/tomcat6)
+  etc/tomcat6/web.xml)
   install=tomcat6.install
 
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
@@ -131,10 +126,6 @@
   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}/conf.d_tomcat6 ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/rc.d_tomcat6 ${pkgdir}/etc/rc.d/${pkgname}
-
   install -Dm644 ${srcdir}/systemd_tomcat6.service \
  ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
   install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \

Deleted: conf.d_tomcat6
===
--- conf.d_tomcat6  2013-05-23 20:40:14 UTC (rev 186286)
+++ conf.d_tomcat6  2013-05-23 20:56:18 UTC (rev 186287)
@@ -1,19 +0,0 @@
-# Configuration file for Tomcat 6 when started with 'initscripts'
-# This file is NOT used when tomcat is started with systemd
-# Have a look at /usr/share/tomcat6/bin/catalina.sh for a complete list of 
environment variables
-
-# The JAVA_HOME of the JVM for Tomcat to use
-# (compulsory to enable tomcat to start at boot)
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# Tomcat home directory
-CATALINA_HOME=/usr/share/tomcat6
-
-# In many circumstances, it is desirable to have a single copy of a Tomcat
-# binary distribution shared among multiple users on the same server.  To make
-# this possible, you can set the $CATALINA_BASE environment variable to the
-# directory that contains the files for your 'personal' Tomcat instance.
-CATALINA_BASE=/usr/share/tomcat6
-
-# Tomcat additional commandline options
-CATALINA_OPTS=

Deleted: rc.d_tomcat6
===
--- rc.d_tomcat62013-05-23 20:40:14 UTC (rev 186286)
+++ rc.d_tomcat62013-05-23 20:56:18 UTC (rev 186287)
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-daemon_name=tomcat6
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${daemon_name}
-
-case $1 in
-  start)
-stat_busy Starting ${daemon_name} daemon
-
-PID=$(get_pid 'jsvc.exec')
-if [ -z $PID ]; then
-  [ -f /var/run/${daemon_name}.pid ]  rm -f /var/run/${daemon_name}.pid
-  # RUN
-  /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/${daemon_name}.pid \
--errfile /var/log/tomcat6/catalina.err \
--outfile /var/log/tomcat6/catalina.out \
-${CATALINA_OPTS} \
-org.apache.catalina.startup.Bootstrap
-
-  if [ $? -gt 0 ]; then
-stat_fail
-exit 1
-  else
-add_daemon ${daemon_name}
-stat_done
-  fi
-else
-  stat_fail
-  exit 1
-fi
-;;
-
-  stop)
-stat_busy Stopping 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Sunday, May 12, 2013 @ 12:15:12
  Author: guillaume
Revision: 185232

Implemented FS#35209

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-12 10:12:27 UTC (rev 185231)
+++ PKGBUILD2013-05-12 10:15:12 UTC (rev 185232)
@@ -138,6 +138,6 @@
   install -Dm644 ${srcdir}/systemd_tomcat6.service \
  ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
   install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \
- ${pkgdir}/lib/tmpfiles.d/${pkgname}.conf
+ ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
 }
 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD rc.d_tomcat6 systemd_tomcat6.service)

[Guillaume Alaux]

Date: Monday, May 6, 2013 @ 21:20:35
  Author: guillaume
Revision: 184355

'Upstream release + removed '-wait 10' from start script

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/rc.d_tomcat6
  tomcat6/trunk/systemd_tomcat6.service

-+
 PKGBUILD|   12 ++--
 rc.d_tomcat6|1 -
 systemd_tomcat6.service |1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-06 19:19:52 UTC (rev 184354)
+++ PKGBUILD2013-05-06 19:20:35 UTC (rev 184355)
@@ -1,8 +1,8 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.36
-pkgrel=3
+pkgver=6.0.37
+pkgrel=1
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -15,11 +15,11 @@
 systemd_tmpfiles.d_tomcat6.conf
 tomcat6.install)
 
-sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
-'bc1be532d48a239a6945b028bf8f253087d3405f659226c484bf8ae4d45e'
+sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
+'3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
 '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
-'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599'
+'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf'
+'8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
 '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
 '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
 

Modified: rc.d_tomcat6
===
--- rc.d_tomcat62013-05-06 19:19:52 UTC (rev 184354)
+++ rc.d_tomcat62013-05-06 19:20:35 UTC (rev 184355)
@@ -21,7 +21,6 @@
 -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} \
--wait 10 \
 -pidfile /var/run/${daemon_name}.pid \
 -errfile /var/log/tomcat6/catalina.err \
 -outfile /var/log/tomcat6/catalina.out \

Modified: systemd_tomcat6.service
===
--- systemd_tomcat6.service 2013-05-06 19:19:52 UTC (rev 184354)
+++ systemd_tomcat6.service 2013-05-06 19:20:35 UTC (rev 184355)
@@ -18,7 +18,6 @@
 -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} \
--wait 10 \
 -pidfile /var/run/tomcat6.pid \
 -errfile /var/log/tomcat6/catalina.err \
 -outfile /var/log/tomcat6/catalina.out \

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Monday, May 6, 2013 @ 21:21:01
  Author: guillaume
Revision: 184357

upgpkg: tomcat6 6.0.37-1

Upstream release + removed '-wait 10' from start script

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-06 19:20:44 UTC (rev 184356)
+++ PKGBUILD2013-05-06 19:21:01 UTC (rev 184357)
@@ -32,7 +32,7 @@
 
   . /etc/profile.d/apache-ant.sh
 
-  ant download deploy\
+  ant clean download deploy\
 -Dbase.path=${srcdir}/DOWN_LIBS \
 -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
 -Dno.build.dbcp=true

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

[Guillaume Alaux]

Date: Monday, May 6, 2013 @ 21:21:18
  Author: guillaume
Revision: 184358

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  286 +++---
 conf.d_tomcat6  |   38 ++---
 rc.d_tomcat6|  153 ++--
 systemd_tmpfiles.d_tomcat6.conf |6 
 systemd_tomcat6.service |   67 
 tomcat6.install |   54 +++
 6 files changed, 301 insertions(+), 303 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-05-06 19:21:01 UTC (rev 184357)
+++ PKGBUILD2013-05-06 19:21:18 UTC (rev 184358)
@@ -1,143 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.36
-pkgrel=3
-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
-conf.d_tomcat6
-rc.d_tomcat6
-systemd_tomcat6.service
-systemd_tmpfiles.d_tomcat6.conf
-tomcat6.install)
-
-sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
-'bc1be532d48a239a6945b028bf8f253087d3405f659226c484bf8ae4d45e'
-'13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
-'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
-
-_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 \
--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
-  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}
-  # 

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

[Guillaume Alaux]

Date: Thursday, January 10, 2013 @ 06:15:49
  Author: guillaume
Revision: 174999

Added systemd tmpfile FS#33163 and cleaned sources files

Added:
  tomcat6/trunk/conf.d_tomcat6
(from rev 174998, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/trunk/rc.d_tomcat6
(from rev 174998, tomcat6/trunk/tomcat6)
  tomcat6/trunk/systemd_tomcat6.service
(from rev 174998, tomcat6/trunk/systemd.tomcat6.service)
Modified:
  tomcat6/trunk/PKGBUILD
Deleted:
  tomcat6/trunk/systemd.tomcat6.service
  tomcat6/trunk/tomcat6
  tomcat6/trunk/tomcat6.conf.d

-+
 PKGBUILD|   31 ++
 conf.d_tomcat6  |   19 +++
 rc.d_tomcat6|   77 ++
 systemd.tomcat6.service |   34 
 systemd_tomcat6.service |   34 
 tomcat6 |   77 --
 tomcat6.conf.d  |   19 ---
 7 files changed, 148 insertions(+), 143 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-10 09:44:00 UTC (rev 174998)
+++ PKGBUILD2013-01-10 11:15:49 UTC (rev 174999)
@@ -2,24 +2,26 @@
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.36
-pkgrel=2
+pkgrel=3
 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
-tomcat6.conf.d
-tomcat6
-tomcat6.install
-systemd.tomcat6.service)
+conf.d_tomcat6
+rc.d_tomcat6
+systemd_tomcat6.service
+systemd_tmpfiles.d_tomcat6.conf
+tomcat6.install)
 
 sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
 'bc1be532d48a239a6945b028bf8f253087d3405f659226c484bf8ae4d45e'
 '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
 'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
-'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2'
-'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599')
+'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599'
+'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
+'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
 
 _servletver=2.5
 _jspver=2.1
@@ -39,7 +41,7 @@
 #TODO add test ant test
 
 package_java-servlet2.5-tomcat() {
-  pkgdesc=Servlet 2.5 java library implementation by Apache Tomcat
+  pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat'
   depends=('java-environment=5')
 
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
@@ -52,7 +54,7 @@
 }
 
 package_java-jsp2.1-tomcat() {
-  pkgdesc=JSP 2.1 java library implementation by Apache Tomcat
+  pkgdesc='JSP 2.1 java library implementation by Apache Tomcat'
   depends=('java-environment=5')
 
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
@@ -66,7 +68,7 @@
 }
 
 package_tomcat6() {
-  pkgdesc=Servlet-2.5/JSP-2.1 Container
+  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')
@@ -130,9 +132,12 @@
   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}
-  install -Dm644 ${srcdir}/systemd.${pkgname}.service \
+  install -Dm644 ${srcdir}/conf.d_tomcat6 ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/rc.d_tomcat6 ${pkgdir}/etc/rc.d/${pkgname}
+
+  install -Dm644 ${srcdir}/systemd_tomcat6.service \
  ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+  install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \
+ ${pkgdir}/lib/tmpfiles.d/${pkgname}.conf
 }
 

Copied: tomcat6/trunk/conf.d_tomcat6 (from rev 174998, 
tomcat6/trunk/tomcat6.conf.d)
===
--- conf.d_tomcat6  (rev 0)
+++ conf.d_tomcat6  2013-01-10 11:15:49 UTC (rev 174999)
@@ -0,0 +1,19 @@
+# Configuration file for Tomcat 6 when started with 'initscripts'
+# This file is NOT used when tomcat is started with systemd
+# Have a look at /usr/share/tomcat6/bin/catalina.sh for a complete list of 
environment variables
+
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)

[arch-commits] Commit in tomcat6/trunk (systemd_tmpfiles.d_tomcat6.conf)

[Guillaume Alaux]

Date: Thursday, January 10, 2013 @ 06:17:23
  Author: guillaume
Revision: 175000

Added systemd_tmpfiles.d_tomcat6.conf to SVN files

Added:
  tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf

-+
 systemd_tmpfiles.d_tomcat6.conf |3 +++
 1 file changed, 3 insertions(+)

Added: systemd_tmpfiles.d_tomcat6.conf
===
--- systemd_tmpfiles.d_tomcat6.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat6.conf 2013-01-10 11:17:23 UTC (rev 175000)
@@ -0,0 +1,3 @@
+d   /var/tmp/tomcat6
+d   /var/tmp/tomcat6/temp   0775tomcat  tomcat
+d   /var/tmp/tomcat6/work   0775tomcat  tomcat

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

[Guillaume Alaux]

Date: Thursday, January 10, 2013 @ 06:18:18
  Author: guillaume
Revision: 175001

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 175000, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/conf.d_tomcat6
(from rev 175000, tomcat6/trunk/conf.d_tomcat6)
  tomcat6/repos/extra-any/rc.d_tomcat6
(from rev 175000, tomcat6/trunk/rc.d_tomcat6)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 175000, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 175000, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 175000, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/systemd.tomcat6.service
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  281 +++---
 conf.d_tomcat6  |   19 ++
 rc.d_tomcat6|   77 ++
 systemd.tomcat6.service |   34 
 systemd_tmpfiles.d_tomcat6.conf |3 
 systemd_tomcat6.service |   34 
 tomcat6 |   77 --
 tomcat6.conf.d  |   19 --
 tomcat6.install |   54 +++
 9 files changed, 303 insertions(+), 295 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-01-10 11:17:23 UTC (rev 175000)
+++ PKGBUILD2013-01-10 11:18:18 UTC (rev 175001)
@@ -1,138 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.36
-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
-tomcat6.conf.d
-tomcat6
-tomcat6.install
-systemd.tomcat6.service)
-
-sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
-'bc1be532d48a239a6945b028bf8f253087d3405f659226c484bf8ae4d45e'
-'13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
-'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2'
-'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599')
-
-_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 \
--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
-  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 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD systemd.tomcat6.service tomcat6)

[Guillaume Alaux]

Date: Saturday, December 15, 2012 @ 13:15:33
  Author: guillaume
Revision: 173234

Rebuild without ecj dur to version incompatibility - sources

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/systemd.tomcat6.service
  tomcat6/trunk/tomcat6

-+
 PKGBUILD|   22 +-
 systemd.tomcat6.service |2 +-
 tomcat6 |2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-15 17:19:51 UTC (rev 173233)
+++ PKGBUILD2012-12-15 18:15:33 UTC (rev 173234)
@@ -2,11 +2,11 @@
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.36
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon' 
'eclipse-ecj')
+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
 tomcat6.conf.d
@@ -14,12 +14,12 @@
 tomcat6.install
 systemd.tomcat6.service)
 
-md5sums=('654318c1e88fdc8b7b5182c4479612b1'
- '3dde098fd0b3a08d3f2867e4a95591ba'
- '8692b87cf2d003e6805c6de4409bc851'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3'
- 'fcb7a0e5a5dec517dda77ee430289f38')
+sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
+'bc1be532d48a239a6945b028bf8f253087d3405f659226c484bf8ae4d45e'
+'13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
+'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
+'9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2'
+'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599')
 
 _servletver=2.5
 _jspver=2.1
@@ -33,7 +33,6 @@
   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 \
 -Dno.build.dbcp=true
 }
 
@@ -68,7 +67,7 @@
 
 package_tomcat6() {
   pkgdesc=Servlet-2.5/JSP-2.1 Container
-  depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj'
+  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
@@ -89,10 +88,7 @@
   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}
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
 
   # Provided by previous packages
   rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar

Modified: systemd.tomcat6.service
===
--- systemd.tomcat6.service 2012-12-15 17:19:51 UTC (rev 173233)
+++ systemd.tomcat6.service 2012-12-15 18:15:33 UTC (rev 173234)
@@ -15,7 +15,7 @@
 -Dcatalina.home=${CATALINA_HOME} \
 -Dcatalina.base=${CATALINA_BASE} \
 -Djava.io.tmpdir=/var/tmp/tomcat6/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
 \
+-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} \
 -wait 10 \

Modified: tomcat6
===
--- tomcat6 2012-12-15 17:19:51 UTC (rev 173233)
+++ tomcat6 2012-12-15 18:15:33 UTC (rev 173234)
@@ -18,7 +18,7 @@
 -Dcatalina.home=${CATALINA_HOME} \
 -Dcatalina.base=${CATALINA_BASE} \
 -Djava.io.tmpdir=/var/tmp/tomcat6/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
 \
+-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} \
 -wait 10 \

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

[Guillaume Alaux]

Date: Saturday, December 15, 2012 @ 13:16:38
  Author: guillaume
Revision: 173235

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  280 ++
 systemd.tomcat6.service |   68 +--
 tomcat6 |  154 -
 tomcat6.conf.d  |   38 +++---
 tomcat6.install |   54 
 5 files changed, 295 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-12-15 18:15:33 UTC (rev 173234)
+++ PKGBUILD2012-12-15 18:16:38 UTC (rev 173235)
@@ -1,142 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.36
-pkgrel=1
-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://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-tomcat6.conf.d
-tomcat6
-tomcat6.install
-systemd.tomcat6.service)
-
-md5sums=('654318c1e88fdc8b7b5182c4479612b1'
- '3dde098fd0b3a08d3f2867e4a95591ba'
- '8692b87cf2d003e6805c6de4409bc851'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3'
- 'fcb7a0e5a5dec517dda77ee430289f38')
-
-_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 \
--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' 'eclipse-ecj'
-   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
-  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}
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
-
-  # Provided by previous packages
-  rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-  ln -s 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Wednesday, November 7, 2012 @ 10:45:29
  Author: guillaume
Revision: 170417

Upstream release - source

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 15:21:45 UTC (rev 170416)
+++ PKGBUILD2012-11-07 15:45:29 UTC (rev 170417)
@@ -1,8 +1,8 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.35
-pkgrel=2
+pkgver=6.0.36
+pkgrel=1
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -14,8 +14,8 @@
 tomcat6.install
 systemd.tomcat6.service)
 
-md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
- '171d255cd60894b29a41684ce0ff93a8'
+md5sums=('654318c1e88fdc8b7b5182c4479612b1'
+ '3dde098fd0b3a08d3f2867e4a95591ba'
  '8692b87cf2d003e6805c6de4409bc851'
  '8f2ccc09837577394441d29a03b0e667'
  'afdb7edc5c7a7b5fa85ad110d021cad3'

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

[Guillaume Alaux]

Date: Wednesday, November 7, 2012 @ 10:47:16
  Author: guillaume
Revision: 170418

archrelease: copy trunk to extra-any

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

-+
 PKGBUILD|  284 +++---
 systemd.tomcat6.service |   68 +--
 tomcat6 |  154 
 tomcat6.conf.d  |   38 +++---
 tomcat6.install |   54 
 5 files changed, 299 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-11-07 15:45:29 UTC (rev 170417)
+++ PKGBUILD2012-11-07 15:47:16 UTC (rev 170418)
@@ -1,142 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.35
-pkgrel=2
-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://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-tomcat6.conf.d
-tomcat6
-tomcat6.install
-systemd.tomcat6.service)
-
-md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
- '171d255cd60894b29a41684ce0ff93a8'
- '8692b87cf2d003e6805c6de4409bc851'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3'
- 'fcb7a0e5a5dec517dda77ee430289f38')
-
-_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 \
--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' 'eclipse-ecj'
-   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
-  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}
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
-
-  # Provided by previous packages
-  rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-  ln -s 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.conf.d)

[Guillaume Alaux]

Date: Saturday, September 1, 2012 @ 13:27:38
  Author: guillaume
Revision: 165855

Added systemd service file support

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.conf.d

+
 PKGBUILD   |   25 +
 tomcat6.conf.d |6 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-01 15:27:36 UTC (rev 165854)
+++ PKGBUILD2012-09-01 17:27:38 UTC (rev 165855)
@@ -2,7 +2,7 @@
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.35
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -11,14 +11,15 @@
 
http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
 tomcat6.conf.d
 tomcat6
-tomcat6.install)
+tomcat6.install
+systemd.tomcat6.service)
 
-#noextract=(dbcp-${pkgver}.jar)
 md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
  '171d255cd60894b29a41684ce0ff93a8'
- '5a95b41d320aa455fe9cbf97a80b0953'
+ '8692b87cf2d003e6805c6de4409bc851'
  '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
+ 'afdb7edc5c7a7b5fa85ad110d021cad3'
+ 'fcb7a0e5a5dec517dda77ee430289f38')
 
 _servletver=2.5
 _jspver=2.1
@@ -28,14 +29,18 @@
   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
+-Djdt.jar=/usr/share/java/eclipse-ecj.jar \
+-Dno.build.dbcp=true
 }
 
+#TODO add test ant test
+
 package_java-servlet2.5-tomcat() {
-  pkgdesc=Servlet ${_servletver} java library implementation by Apache Tomcat
+  pkgdesc=Servlet 2.5 java library implementation by Apache Tomcat
   depends=('java-environment=5')
 
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
@@ -87,7 +92,7 @@
   # eclipse-ecj is packaged on its own
   rm lib/eclipse-ecj.jar
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/eclipse-ecj.jar 
${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
+  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
 
   # Provided by previous packages
   rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
@@ -104,6 +109,7 @@
 ${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
@@ -130,4 +136,7 @@
   # Arch scripts
   install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
   install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
+  install -Dm644 ${srcdir}/systemd.${pkgname}.service \
+ ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
 }
+

Modified: tomcat6.conf.d
===
--- tomcat6.conf.d  2012-09-01 15:27:36 UTC (rev 165854)
+++ tomcat6.conf.d  2012-09-01 17:27:38 UTC (rev 165855)
@@ -1,3 +1,7 @@
+# Configuration file for Tomcat 6 when started with 'initscripts'
+# This file is NOT used when tomcat is started with systemd
+# Have a look at /usr/share/tomcat6/bin/catalina.sh for a complete list of 
environment variables
+
 # The JAVA_HOME of the JVM for Tomcat to use
 # (compulsory to enable tomcat to start at boot)
 TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
@@ -9,7 +13,7 @@
 # binary distribution shared among multiple users on the same server.  To make
 # this possible, you can set the $CATALINA_BASE environment variable to the
 # directory that contains the files for your 'personal' Tomcat instance.
-CATALINA_BASE=${CATALINA_HOME}
+CATALINA_BASE=/usr/share/tomcat6
 
 # Tomcat additional commandline options
 CATALINA_OPTS=

[arch-commits] Commit in tomcat6/trunk (systemd.tomcat6.service)

[Guillaume Alaux]

Date: Saturday, September 1, 2012 @ 13:31:05
  Author: guillaume
Revision: 165856

Added systemd service file to svn tree

Added:
  tomcat6/trunk/systemd.tomcat6.service

-+
 systemd.tomcat6.service |   34 ++
 1 file changed, 34 insertions(+)

Added: systemd.tomcat6.service
===
--- systemd.tomcat6.service (rev 0)
+++ systemd.tomcat6.service 2012-09-01 17:31:05 UTC (rev 165856)
@@ -0,0 +1,34 @@
+[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:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar
 \
+-user tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
+-wait 10 \
+-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

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

[Guillaume Alaux]

Date: Saturday, September 1, 2012 @ 13:31:43
  Author: guillaume
Revision: 165857

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 165856, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/systemd.tomcat6.service
(from rev 165856, tomcat6/trunk/systemd.tomcat6.service)
  tomcat6/repos/extra-any/tomcat6
(from rev 165856, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 165856, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 165856, 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|  275 +++---
 systemd.tomcat6.service |   34 +
 tomcat6 |  154 -
 tomcat6.conf.d  |   34 +++--
 tomcat6.install |   54 -
 5 files changed, 299 insertions(+), 252 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-09-01 17:31:05 UTC (rev 165856)
+++ PKGBUILD2012-09-01 17:31:43 UTC (rev 165857)
@@ -1,133 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.35
-pkgrel=1
-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://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-#noextract=(dbcp-${pkgver}.jar)
-md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
- '171d255cd60894b29a41684ce0ff93a8'
- '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' 'eclipse-ecj'
-   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
-  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}
-  ln -s /usr/share/java/eclipse-ecj.jar 
${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
-
-  # 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 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Sunday, April 15, 2012 @ 10:11:55
  Author: guillaume
Revision: 156186

upgpkg: tomcat6 6.0.35-1

Upstream release and added binary tomcat-dbcp.jar

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 13:55:12 UTC (rev 156185)
+++ PKGBUILD2012-04-15 14:11:55 UTC (rev 156186)
@@ -1,21 +1,21 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.33
-pkgrel=4
+pkgver=6.0.35
+pkgrel=1
 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
+
http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
 tomcat6.conf.d
 tomcat6
 tomcat6.install)
 
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
+#noextract=(dbcp-${pkgver}.jar)
+md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
+ '171d255cd60894b29a41684ce0ff93a8'
  '5a95b41d320aa455fe9cbf97a80b0953'
  '8f2ccc09837577394441d29a03b0e667'
  'afdb7edc5c7a7b5fa85ad110d021cad3')
@@ -63,7 +63,8 @@
 
 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')
+  depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj'
+   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
@@ -86,6 +87,7 @@
   # eclipse-ecj is packaged on its own
   rm lib/eclipse-ecj.jar
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+  ln -s /usr/share/java/eclipse-ecj.jar 
${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
 
   # Provided by previous packages
   rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
@@ -98,7 +100,7 @@
   ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
   done
 
-  install -m644 ${srcdir}/dbcp-${pkgver}.jar \
+  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

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

[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/trunk (PKGBUILD tomcat6.conf.d)

[Guillaume Alaux]

Date: Tuesday, November 1, 2011 @ 13:45:21
  Author: guillaume
Revision: 141659

upgpkg: tomcat6 6.0.33-4

Extract servlet.jar and jsp jars into their own packages and change conf for 
OpenJDK7

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.conf.d

+
 PKGBUILD   |   86 +--
 tomcat6.conf.d |2 -
 2 files changed, 66 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 14:32:15 UTC (rev 141658)
+++ PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
@@ -1,23 +1,12 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
+pkgrel=4
 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
+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
@@ -27,10 +16,14 @@
 noextract=(dbcp-${pkgver}.jar)
 md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
  'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
+ '5a95b41d320aa455fe9cbf97a80b0953'
  '8f2ccc09837577394441d29a03b0e667'
  'afdb7edc5c7a7b5fa85ad110d021cad3')
 
+_servletver=2.5
+_jspver=2.1
+
+#FIXME ant target 'download' should not be called
 build() {
   cd ${srcdir}/apache-tomcat-${pkgver}-src
 
@@ -41,7 +34,47 @@
 -Djdt.jar=/usr/share/java/eclipse-ecj.jar
 }
 
-package() {
+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
@@ -52,9 +85,21 @@
 
   # 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
+  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 \
+${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
   ln -s 

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

[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/trunk (PKGBUILD tomcat6.install)

[Guillaume Alaux]

Date: Wednesday, September 14, 2011 @ 12:24:46
  Author: guillaume
Revision: 138024

upgpkg: tomcat6 6.0.33-3

Fixed owner of /etc/tomcat6 and tomcat user dir

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install

-+
 PKGBUILD|9 +
 tomcat6.install |2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-14 13:39:16 UTC (rev 138023)
+++ PKGBUILD2011-09-14 16:24:46 UTC (rev 138024)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.33
-pkgrel=2
+pkgrel=3
 pkgdesc=Servlet-2.5/JSP-2.1 Container
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -29,7 +29,7 @@
  'a6ff671562c9ac91e8cc2812760df49d'
  'b9f482437de11587d72b53ddaa2a'
  '8f2ccc09837577394441d29a03b0e667'
- '1be39071bd27781c352b2d73b765e29d')
+ 'afdb7edc5c7a7b5fa85ad110d021cad3')
 
 build() {
   cd ${srcdir}/apache-tomcat-${pkgver}-src
@@ -65,8 +65,9 @@
   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}
+  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}

Modified: tomcat6.install
===
--- tomcat6.install 2011-09-14 13:39:16 UTC (rev 138023)
+++ tomcat6.install 2011-09-14 16:24:46 UTC (rev 138024)
@@ -1,6 +1,6 @@
 post_install() {
   getent group tomcat /dev/null 21 || groupadd -g 66 tomcat
-  getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d 
/usr/share/tomcat -s /bin/false tomcat
+  getent passwd tomcat /dev/null 21 || 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

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

[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/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Sunday, August 21, 2011 @ 05:40:04
  Author: guillaume
Revision: 136004

upgpkg: tomcat6 6.0.33-1

Upstream release

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 09:18:58 UTC (rev 136003)
+++ PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
+pkgver=6.0.33
+pkgrel=1
 pkgdesc=Servlet-2.5/JSP-2.1 Container
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -25,8 +25,8 @@
 tomcat6.install)
 
 noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
+md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
+ 'a6ff671562c9ac91e8cc2812760df49d'
  '84e819ababbc8e1ac5c325d8af7febf8'
  '50de34665d96f8e12d0a0d3d9a15fc1a'
  '1be39071bd27781c352b2d73b765e29d')

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

[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/trunk (tomcat6)

[Guillaume Alaux]

Date: Sunday, August 21, 2011 @ 13:34:31
  Author: guillaume
Revision: 136024

Fixed erroneous pid retrieval

Modified:
  tomcat6/trunk/tomcat6

-+
 tomcat6 |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: tomcat6
===
--- tomcat6 2011-08-21 16:23:28 UTC (rev 136023)
+++ tomcat6 2011-08-21 17:34:31 UTC (rev 136024)
@@ -6,15 +6,11 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${daemon_name}
 
-get_pid() {
-   pidof -o %PPID ${daemon_name}
-}
-
 case $1 in
   start)
 stat_busy Starting ${daemon_name} daemon
 
-PID=$(get_pid)
+PID=$(get_pid 'jsvc.exec')
 if [ -z $PID ]; then
   [ -f /var/run/${daemon_name}.pid ]  rm -f /var/run/${daemon_name}.pid
   # RUN
@@ -46,7 +42,6 @@
 
   stop)
 stat_busy Stopping ${daemon_name} daemon
-PID=$(get_pid)
 # STOP
 /usr/bin/jsvc \
   -pidfile /var/run/${daemon_name}.pid \

[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6 tomcat6.conf.d)

[Guillaume Alaux]

Date: Sunday, August 21, 2011 @ 16:27:55
  Author: guillaume
Revision: 136028

upgpkg: tomcat6 6.0.33-2

Fixed start at boot and pid number retrieval

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6
  tomcat6/trunk/tomcat6.conf.d

+
 PKGBUILD   |6 +++---
 tomcat6|1 +
 tomcat6.conf.d |4 
 3 files changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 18:06:36 UTC (rev 136027)
+++ PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.33
-pkgrel=1
+pkgrel=2
 pkgdesc=Servlet-2.5/JSP-2.1 Container
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -27,8 +27,8 @@
 noextract=(dbcp-${pkgver}.jar)
 md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
  'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
+ 'b9f482437de11587d72b53ddaa2a'
+ '8f2ccc09837577394441d29a03b0e667'
  '1be39071bd27781c352b2d73b765e29d')
 
 build() {

Modified: tomcat6
===
--- tomcat6 2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6 2011-08-21 20:27:55 UTC (rev 136028)
@@ -20,6 +20,7 @@
 -Djava.io.tmpdir=/var/tmp/tomcat6/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 tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
 -wait 10 \
 -pidfile /var/run/${daemon_name}.pid \
 -errfile /var/log/tomcat6/catalina.err \

Modified: tomcat6.conf.d
===
--- tomcat6.conf.d  2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6.conf.d  2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,3 +1,7 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
 # Tomcat home directory
 CATALINA_HOME=/usr/share/tomcat6
 

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

[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' 

[arch-commits] Commit in tomcat6/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Monday, June 27, 2011 @ 07:22:38
  Author: guillaume
Revision: 129404

upgpkg: tomcat6 6.0.32-2
Added etc/conf.d/tomcat6 to backup array

Modified:
  tomcat6/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-27 11:10:06 UTC (rev 129403)
+++ PKGBUILD2011-06-27 11:22:38 UTC (rev 129404)
@@ -1,13 +1,13 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=tomcat6
 pkgver=6.0.32
-pkgrel=1
+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' 
'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
@@ -15,7 +15,8 @@
 etc/tomcat6/logging.properties
 etc/tomcat6/server.xml
 etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.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
@@ -79,7 +80,7 @@
   ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
 
   # Arch scripts
-  install -Dm644 ${srcdir}/tomcat6.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat6 ${pkgdir}/etc/rc.d/${pkgname}
+  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
 }
 

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

[Guillaume Alaux]

Date: Monday, June 27, 2011 @ 07:22:44
  Author: guillaume
Revision: 129405

archrelease: remove extra-any

Deleted:
  tomcat6/repos/extra-any/

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

[Guillaume Alaux]

Date: Monday, June 27, 2011 @ 07:23:00
  Author: guillaume
Revision: 129406

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/

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

[Guillaume Alaux]

Date: Thursday, May 19, 2011 @ 07:56:52
  Author: guillaume
Revision: 124321

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/