Date: Wednesday, September 7, 2011 @ 09:57:25 Author: guillaume Revision: 137348
upgpkg: tomcat7 7.0.21-2 Fixed owner of /etc/tomcat7 and tomcat user dir Modified: tomcat7/trunk/PKGBUILD tomcat7/trunk/tomcat7.install -----------------+ PKGBUILD | 9 +++++---- tomcat7.install | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-07 13:23:24 UTC (rev 137347) +++ PKGBUILD 2011-09-07 13:57:25 UTC (rev 137348) @@ -1,7 +1,7 @@ # Maintainer: Guillaume ALAUX <guilla...@archlinux.org> pkgname=tomcat7 pkgver=7.0.21 -pkgrel=1 +pkgrel=2 pkgdesc="Servlet-3.0/JSP-2.2 Container" arch=('any') url='http://tomcat.apache.org/' @@ -26,7 +26,7 @@ md5sums=('40d71249a54526ab0145fd5b41008518' '0fa46eae1746d6cd564905bfb0072776' '361a41c02930a4e43245ab7379a617e9' - '1be39071bd27781c352b2d73b765e29d') + '6c5b4ed6d71b227f305b751c349fa31b') build() { cd "${srcdir}/apache-tomcat-${pkgver}-src" @@ -58,8 +58,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: tomcat7.install =================================================================== --- tomcat7.install 2011-09-07 13:23:24 UTC (rev 137347) +++ tomcat7.install 2011-09-07 13:57:25 UTC (rev 137348) @@ -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/tomcat7 -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"