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

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit e18e9b4849307f7cb778ce0aa14080afa15c8c0b
Merge: bef7c983e49acbc5a0efda4edd7a292801c51b56 4cd86f121714e9bd4316508b910094ba89a9aa50
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Thu Oct 4 00:34:58 2012 +0200

    Merge tag 'upstream/2.7-beta-1'
    
    Upstream version 2.7-beta-1

diff --combined src/Config.Make
index 90b6ee4,460ce6a..34211ff
--- a/src/Config.Make
+++ b/src/Config.Make
@@@ -8,7 -8,7 +8,7 @@@ include ${PT}LOCATIO
  include ${PT}Config.OS
  
  
- CFLAGS = -g -Wall -I${PT} -I${PT}headers ${CPATH} ${CEXTRA} ${DEXTRA} ${EEXTRA} ${FEXTRA} ${GEXTRA} ${HEXTRA} -DARGV0=\"${NAME}\" -DXML_VAR=\"var\" -DOSSECHIDS
+ CFLAGS = -g -Wall -I${PT} -I${PT}headers ${CPATH} ${CEXTRA} ${DEXTRA} ${EEXTRA} ${FEXTRA} ${GEXTRA} ${HEXTRA} ${CGEOIP} -DARGV0=\"${NAME}\" -DXML_VAR=\"var\" -DOSSECHIDS
  
  SOURCES = *.c
  OBJECTS = *.o 
@@@ -22,6 -22,6 +22,6 @@@ OS_CRYPTO = ${PT}os_crypto/os_crypto.
  OS_SHARED = ${PT}shared/lib_shared.a
  OS_ROOTCHECK = ${PT}rootcheck/rootcheck_lib.a
  OS_CONFIG = ${PT}config/lib_config.a
 -OS_ZLIB = ${PT}os_zlib/os_zlib.c ${PT}external/libz.a
 -OS_LINK = ${IEXTRA}
 +OS_ZLIB = ${PT}os_zlib/os_zlib.c
 +OS_LINK = ${IEXTRA} -I/usr/include -lz
  DBS = cdb/cdb.a
diff --combined src/Makeall
index be28e84,94c8a95..054305d
--- 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