[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. 58821e0bc7b9c1a6782c901dcd31ccb865a49893

[Jose Antonio Quevedo]

The following commit has been merged in the debian branch:
commit a66584ef8369b0eba2749c1c037d5bbc1df15813
Merge: 83fa0890c0104f8c3cb97f089dcac4053c6750fe ee8dcdd416f3e45f7226c6dcfee3e4ccd78a40ec
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Fri Jul 29 19:34:27 2011 +0200

    Merge branch 'upstream'

diff --combined src/Makeall
index 054305d,db852cb..be28e84
--- a/src/Makeall
+++ b/src/Makeall
@@@ -60,11 -60,11 +60,11 @@@ if [ "X${ARGV}" = "Xall" -o "X${ARGV}" 
      fi
  
      # Checking for OpenSSLconf.h
-     ls /usr/include/openssl/opensslconf.h > /dev/null 2>&1
-     if [ $? = 0 ]; then
-         echo "DEXTRA=-DUSE_OPENSSL" >> Config.OS
-         echo "OPENSSLCMD=-lssl -lcrypto" >> Config.OS
-     fi    
+     # ls /usr/include/openssl/opensslconf.h > /dev/null 2>&1
+     # if [ $? = 0 ]; then
+     #     echo "DEXTRA=-DUSE_OPENSSL" >> Config.OS
+     #     echo "OPENSSLCMD=-lssl -lcrypto" >> Config.OS
+     # fi    
  
      # Checking for inotify
      if [ "X$OS" = "XLinux" ]; then
@@@ -129,10 -129,10 +129,10 @@@ f
  # Getting values for each action
  if [ "X${ARGV}" = "Xall" ]; then
      DIRECTORIES="${LIBS} ${SOURCES} ${BINARIES}" 
 -    DOZLIB="x"
 +    DOZLIB=""
  elif [ "X${ARGV}" = "Xlibs" ]; then
      DIRECTORIES="${LIBS} ${SOURCES}"
 -    DOZLIB="x"
 +    DOZLIB=""
  elif [ "X${ARGV}" = "Xrootcheck" ]; then
      DIRECTORIES="os_xml os_regex os_net ${SOURCES} ${ROOTCHECKBIN}"    
  elif [ "X${ARGV}" = "Xbuild" ]; then

-- 
Git repository for pkg-ossec