[Pkg-ossec-devel] [pkg-ossec] 07/18: Adapting patch #06 to 2.7.1-beta-1 upstream version.

[Jose Antonio Quevedo Muñoz]

This is an automated email from the git hooks/post-receive script.

jaqm-guest pushed a commit to branch debian
in repository pkg-ossec.

commit d23db2b0fb8e18120535fedc4decf93119b06a42
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Tue Aug 13 10:05:47 2013 +0200

    Adapting patch #06 to 2.7.1-beta-1 upstream version.
---
 debian/patches/06-control-return-status-value |   43 ++++++++-----------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/debian/patches/06-control-return-status-value b/debian/patches/06-control-return-status-value
index deef105..a568f5d 100644
--- a/debian/patches/06-control-return-status-value
+++ b/debian/patches/06-control-return-status-value
@@ -1,38 +1,25 @@
-Index: pkg-ossec/src/init/ossec-server.sh
-===================================================================
---- pkg-ossec.orig/src/init/ossec-server.sh	2012-08-29 01:19:58.000000000 +0200
-+++ pkg-ossec/src/init/ossec-server.sh	2012-08-29 01:48:27.000000000 +0200
-@@ -189,14 +189,17 @@
- # Status function
- status()
- {
-+    retvalue=0
-     for i in ${DAEMONS}; do
-         pstatus ${i};
-         if [ $? = 0 ]; then
-             echo "${i} not running..."
-+	    retvalue=1 # We return with error if some of the components is not running
-         else
+--- a/src/init/ossec-server.sh
++++ b/src/init/ossec-server.sh
+@@ -198,7 +198,7 @@
              echo "${i} is running..."
          fi
-     done             
-+    return $retvalue
+     done
+-    exit $RETVAL
++    return $RETVAL
  }
  
  testconfig()
-@@ -322,6 +325,7 @@
- 	;;
+@@ -331,6 +331,7 @@
+         ;;
    status)
      status
 +    exit $?
  	;;
    help)  
      help
-Index: pkg-ossec/src/init/ossec-local.sh
-===================================================================
---- pkg-ossec.orig/src/init/ossec-local.sh	2012-08-29 01:47:14.000000000 +0200
-+++ pkg-ossec/src/init/ossec-local.sh	2012-08-29 01:48:23.000000000 +0200
-@@ -323,6 +327,7 @@
+--- a/src/init/ossec-local.sh
++++ b/src/init/ossec-local.sh
+@@ -342,6 +342,7 @@
  	;;
    status)
      status
@@ -40,11 +27,9 @@ Index: pkg-ossec/src/init/ossec-local.sh
  	;;
    help)  
      help
-Index: pkg-ossec/src/init/ossec-client.sh
-===================================================================
---- pkg-ossec.orig/src/init/ossec-client.sh	2012-08-29 01:49:40.000000000 +0200
-+++ pkg-ossec/src/init/ossec-client.sh	2012-08-29 01:50:20.000000000 +0200
-@@ -242,6 +245,7 @@
+--- a/src/init/ossec-client.sh
++++ b/src/init/ossec-client.sh
+@@ -247,6 +247,7 @@
  	;;
    status)
      status

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git