Réparation de tomcat#5.5.28-1

3 files changed, 52 insertions, 15 deletions

diff --git a/test/tomcat/.footprint b/test/tomcat/.footprint
index 2f5382a05..683d49a19 100644
--- a/test/tomcat/.footprint
+++ b/test/tomcat/.footprint
@@ -59,19 +59,19 @@ drwxr-xr-x	root/root	opt/tomcat/common/lib/
 -rw-r--r--	root/root	opt/tomcat/common/lib/naming-factory.jar
 -rw-r--r--	root/root	opt/tomcat/common/lib/naming-resources.jar
 -rw-r--r--	root/root	opt/tomcat/common/lib/servlet-api.jar
-drwxrwxr-x	root/66	opt/tomcat/conf/
-drwxr-xr-x	root/66	opt/tomcat/conf/Catalina/
-drwxr-xr-x	root/66	opt/tomcat/conf/Catalina/localhost/
--rw-rw----	root/66	opt/tomcat/conf/Catalina/localhost/host-manager.xml
--rw-rw----	root/66	opt/tomcat/conf/Catalina/localhost/manager.xml
--rw-rw----	root/66	opt/tomcat/conf/catalina.policy
--rw-rw----	root/66	opt/tomcat/conf/catalina.properties
--rw-rw----	root/66	opt/tomcat/conf/context.xml
--rw-rw----	root/66	opt/tomcat/conf/logging.properties
--rw-rw----	root/66	opt/tomcat/conf/server-minimal.xml
--rw-rw----	root/66	opt/tomcat/conf/server.xml
--rw-rw----	root/66	opt/tomcat/conf/tomcat-users.xml
--rw-rw----	root/66	opt/tomcat/conf/web.xml
+drwxrwxr-x	root/tomcat	opt/tomcat/conf/
+drwxr-xr-x	root/tomcat	opt/tomcat/conf/Catalina/
+drwxr-xr-x	root/tomcat	opt/tomcat/conf/Catalina/localhost/
+-rw-rw----	root/tomcat	opt/tomcat/conf/Catalina/localhost/host-manager.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/Catalina/localhost/manager.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/catalina.policy
+-rw-rw----	root/tomcat	opt/tomcat/conf/catalina.properties
+-rw-rw----	root/tomcat	opt/tomcat/conf/context.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/logging.properties
+-rw-rw----	root/tomcat	opt/tomcat/conf/server-minimal.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/server.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/tomcat-users.xml
+-rw-rw----	root/tomcat	opt/tomcat/conf/web.xml
 drwxr-xr-x	root/root	opt/tomcat/logs/
 drwxr-xr-x	root/root	opt/tomcat/server/
 drwxr-xr-x	root/root	opt/tomcat/server/classes/
@@ -1018,4 +1018,4 @@ drwxr-xr-x	root/root	opt/tomcat/webapps/webdav/WEB-INF/
 -rw-r--r--	root/root	opt/tomcat/webapps/webdav/index.html
 -rw-r--r--	root/root	opt/tomcat/webapps/webdav/tomcat-power.gif
 -rw-r--r--	root/root	opt/tomcat/webapps/webdav/tomcat.gif
-drwxrwxr-x	root/66	opt/tomcat/work/
+drwxrwxr-x	root/tomcat	opt/tomcat/work/
diff --git a/test/tomcat/Pkgfile b/test/tomcat/Pkgfile
index 86f79d706..140d015d8 100755
--- a/test/tomcat/Pkgfile
+++ b/test/tomcat/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://tomcat.apache.org/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: java-environement
+# Depends on: jdk
 name=tomcat
 version=5.5.28
 release=1
diff --git a/test/tomcat/tomcat.install b/test/tomcat/tomcat.install
new file mode 100755
index 000000000..3ed956226
--- /dev/null
+++ b/test/tomcat/tomcat.install
@@ -0,0 +1,37 @@
+post_install() {
+  if [ ! `grep tomcat /etc/group` ]; then
+    groupadd -g 66 tomcat &>/dev/null;
+  fi
+
+  id tomcat &>/dev/null || \
+    useradd -u 66 -g tomcat -d /opt/tomcat -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"
+    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)."
+    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
+    echo ">>> it will be activated automatically at boot-up."
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  userdel tomcat &> /dev/null
+  groupdel tomcat &> /dev/null
+}
+
+post_remove() {
+  /bin/true
+}
+
+op=$1
+shift
+
+$op $*
+# vim: ts=2 sw=2 et ft=sh