[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit 798c83a537fd7c16810dcdbc720e478b4b55d09d
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Wed Aug 29 02:23:28 2012 +0200

    Add the /var/ossec/queue/ossec/queue directory required by some of the
    components.

diff --git a/debian/ossec-hids-local.dirs b/debian/ossec-hids-local.dirs
index 34d921a..672ffe2 100644
--- a/debian/ossec-hids-local.dirs
+++ b/debian/ossec-hids-local.dirs
@@ -12,7 +12,7 @@ var/ossec/queue/agentless
 var/ossec/queue/alerts 
 var/ossec/queue/diff
 var/ossec/queue/fts
-var/ossec/queue/ossec
+var/ossec/queue/ossec/queue
 var/ossec/queue/rids 
 var/ossec/queue/rootcheck
 var/ossec/queue/syscheck
diff --git a/debian/ossec-hids-local.postinst b/debian/ossec-hids-local.postinst
index 06f1a02..6db48de 100644
--- a/debian/ossec-hids-local.postinst
+++ b/debian/ossec-hids-local.postinst
@@ -69,6 +69,7 @@ case "$1" in
         cat <<EOF
 queue/alerts     $OSSECUSER:$OSSECGROUP 770
 queue/ossec      $OSSECUSER:$OSSECGROUP 770
+queue/ossec/queue      $OSSECUSER:$OSSECGROUP 770
 queue/fts        $OSSECUSER:$OSSECGROUP 750
 queue/syscheck   $OSSECUSER:$OSSECGROUP 750
 queue/rootcheck  $OSSECUSER:$OSSECGROUP 750
@@ -80,17 +81,17 @@ stats            $OSSECUSER:$OSSECGROUP 750
 EOF
         } | while read dir owner mode; do
                 if ! echo "$dir" | grep -q "^/" ; then
-                    location=${HOMEDIR}$dir
+                    location=${HOMEDIR}/${dir}
                 else
                     location=$dir
                 fi
-	        if ! dpkg-statoverride --list ${HOMEDIR}$dir  >/dev/null
+	        if ! dpkg-statoverride --list ${HOMEDIR}/${dir}  >/dev/null
                 then
-                    if [ -e "${HOMEDIR}$dir" ] ; then
-                        chown $owner ${HOMEDIR}$dir
-                        chmod $mode ${HOMEDIR}$dir
+                    if [ -e "${HOMEDIR}/${dir}" ] ; then
+                        chown $owner ${HOMEDIR}/${dir}
+                        chmod $mode ${HOMEDIR}/${dir}
                     else
-                        echo "ERROR: Could not find ${HOMEDIR}$dir, please send a bug the maintainer of ossec" >&2
+                        echo "ERROR: Could not find ${HOMEDIR}/${dir}, please send a bug the maintainer of ossec" >&2
                     fi
                 fi
         done
diff --git a/debian/ossec-hids-server.dirs b/debian/ossec-hids-server.dirs
index 34d921a..672ffe2 100644
--- a/debian/ossec-hids-server.dirs
+++ b/debian/ossec-hids-server.dirs
@@ -12,7 +12,7 @@ var/ossec/queue/agentless
 var/ossec/queue/alerts 
 var/ossec/queue/diff
 var/ossec/queue/fts
-var/ossec/queue/ossec
+var/ossec/queue/ossec/queue
 var/ossec/queue/rids 
 var/ossec/queue/rootcheck
 var/ossec/queue/syscheck
diff --git a/debian/ossec-hids-server.postinst b/debian/ossec-hids-server.postinst
index da94645..8c3fd4a 100644
--- a/debian/ossec-hids-server.postinst
+++ b/debian/ossec-hids-server.postinst
@@ -69,6 +69,7 @@ case "$1" in
         cat <<EOF
 queue/alerts     ossec:ossec 770
 queue/ossec      ossec:ossec 770
+queue/ossec/queue      ossec:ossec 770
 queue/fts        ossec:ossec 750
 queue/syscheck   ossec:ossec 750
 queue/rootcheck  ossec:ossec 750
@@ -80,17 +81,17 @@ stats            ossec:ossec 750
 EOF
         } | while read dir owner mode; do
                 if ! echo "$dir" | grep -q "^/" ; then
-                    location=${HOMEDIR}$dir
+                    location=${HOMEDIR}/${dir}
                 else
                     location=$dir
                 fi
-	        if ! dpkg-statoverride --list ${HOMEDIR}$dir  >/dev/null
+	        if ! dpkg-statoverride --list ${HOMEDIR}/${dir}  >/dev/null
                 then
-                    if [ -e "${HOMEDIR}$dir" ] ; then
-                        chown $owner ${HOMEDIR}$dir
-                        chmod $mode ${HOMEDIR}$dir
+                    if [ -e "${HOMEDIR}/${dir}" ] ; then
+                        chown $owner ${HOMEDIR}/${dir}
+                        chmod $mode ${HOMEDIR}/${dir}
                     else
-                        echo "ERROR: Could not find ${HOMEDIR}$dir, please send a bug the maintainer of ossec" >&2
+                        echo "ERROR: Could not find ${HOMEDIR}/${dir}, please send a bug the maintainer of ossec" >&2
                     fi
                 fi
         done
diff --git a/debian/rules b/debian/rules
index 1638281..f5c1cc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,6 +106,7 @@ install-local:
 	chmod -R 550 debian/ossec-hids-local/var/ossec
 	chmod 770 debian/ossec-hids-local/var/ossec/queue/alerts
 	chmod 770 debian/ossec-hids-local/var/ossec/queue/ossec
+	chmod 770 debian/ossec-hids-local/var/ossec/queue/ossec/queue
 	chmod 750 debian/ossec-hids-local/var/ossec/queue/fts
 	chmod 750 debian/ossec-hids-local/var/ossec/queue/syscheck
 	chmod 750 debian/ossec-hids-local/var/ossec/queue/rootcheck

-- 
Git repository for pkg-ossec