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

[Jose Antonio Quevedo]

The following commit has been merged in the master branch:
commit edd3486f4f989b94b968b7fb38cb3aa5150dcf2c
Merge: bef7c983e49acbc5a0efda4edd7a292801c51b56 52462134fc51106bae4f5046455676c355faefa9
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Tue Aug 2 02:19:59 2011 +0200

    Merge branch 'debian'

diff --combined install.sh
index d552ba5,648cb56..a98084e
--- a/install.sh
+++ b/install.sh
@@@ -11,8 -11,10 +11,9 @@@
  # Changelog 15/07/2006 - Rafael M. Capovilla <under at underlinux.com.br>
  # New function AddTable to add support for OpenBSD pf rules in firewall-drop active response
  
 -# Uncomment the next line for debug mode.
 -set -x
 +
  
+ 
  ### Looking up for the execution directory
  cd `dirname $0`
  
@@@ -77,6 -79,9 +78,6 @@@ Install(
  
      echo "CEXTRA=${CEXTRA}" >> ./src/Config.OS
  
 -  # If only-building
 -  if [ "X${BUILD}" = "Xyes" ]; then
 -
      # Makefile
  	echo " - ${runningmake}"
      cd ./src
@@@ -97,6 -102,11 +98,6 @@@
          fi
      fi
  
 -    exit 0
 -
 -  else # End of building
 -
 -
      # If update, stop ossec
      if [ "X${update_only}" = "Xyes" ]; then
          UpdateStopOSSEC
@@@ -147,7 -157,7 +148,7 @@@
              notmodified="yes"
          fi
      fi
 -  fi
 +
  }
  
  
@@@ -926,10 -936,12 +927,10 @@@ main(
          catError "0x1-location";
      fi
  
 -    # Must be root only in the case of not only-building.
 -  if [ ! "X$BUILD" = "Xyes" ]; then
 +    # Must be root
      if [ ! "X$ME" = "Xroot" ]; then
          catError "0x2-beroot";
      fi
 -  fi
  
      # Checking dependencies
      checkDependencies

-- 
Git repository for pkg-ossec