[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
===================================================================
--- PKGBUILD	2011-09-14 13:39:16 UTC (rev 138023)
+++ PKGBUILD	2011-09-14 16:24:46 UTC (rev 138024)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX <guillaume at 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'
          'b9aaaaf482437de11587d72b53ddaa2a'
          '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 2>&1 || groupadd -g 66 tomcat
-  getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat -s /bin/false tomcat
+  getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat6 -s /bin/false tomcat
 
   if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
     echo ">>> It appears that your current kernel has linux security"