Merge pull request #1958 from ngarratt/aix7

Support AIX 7

install.sh

@@ -115,6 +115,10 @@ Install()
     fi
 
     ${MAKEBIN} PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install
+    if [ $? != 0 ]; then
+        cd ../
+        catError "0x5-build"
+    fi
 
     cd ../
 

src/Makefile

@@ -21,7 +21,6 @@ OSSEC_USER?=ossec
 OSSEC_USER_MAIL?=ossecm
 OSSEC_USER_REM?=ossecr
 
-INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
 INSTALL_LOCALTIME?=yes
 INSTALL_RESOLVCONF?=yes
 
@@ -77,6 +76,8 @@ else
 ifeq (${uname_S},AIX)
 		DEFINES+=-DAIX
 		DEFINES+=-DHIGHFIRST
+		CFLAGS+=-I./external/compat/aix
+		OSSEC_LDFLAGS+=-lpthread
 		PATH:=${PATH}:/usr/vac/bin
 else
 ifeq (${uname_S},SunOS)
@@ -140,6 +141,12 @@ ifneq (${uname_S},OpenBSD)
         COMPAT_FILES+=./external/compat/imsg.c ./external/compat/imsg-buffer.c
 endif
 
+ifeq (${uname_S},AIX)
+        INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3)
+else
+        INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
+endif
+
 ifdef DEBUGAD
 	DEFINES+=-DDEBUGAD
 endif
@@ -211,7 +218,7 @@ endif #winagent
 
 OSSEC_CC      =${QUIET_CC}${MING_BASE}${CC}
 OSSEC_CCBIN   =${QUIET_CCBIN}${MING_BASE}${CC}
-OSSEC_LINK    =${QUIET_LINK}${MING_BASE}ar -crs
+OSSEC_LINK    =${QUIET_LINK}${MING_BASE}ar ${AR_FLAGS} -crs
 OSSEC_RANLIB  =${QUIET_RANLIB}${MING_BASE}ranlib
 OSSEC_WINDRES =${QUIET_CCBIN}${MING_BASE}windres
 

src/addagent/main.c

@@ -58,7 +58,7 @@ static void helpmsg()
 static void print_banner()
 {
     printf("\n");
-    printf(BANNER, __ossec_name, __version);
+    printf(BANNER, __ossec_name, __ossec_version);
 
 #ifdef CLIENT
     printf(BANNER_CLIENT);

src/analysisd/output/prelude.c

@@ -26,7 +26,7 @@
 #define ANALYZER_CLASS "Host IDS, File Integrity Checker, Log Analyzer"
 #define ANALYZER_MODEL "Ossec"
 #define ANALYZER_MANUFACTURER __site
-#define ANALYZER_VERSION __version
+#define ANALYZER_VERSION __ossec_version
 
 /** OSSEC to prelude severity mapping. **/
 static const char *(ossec2prelude_sev[]) = {"info", "info", "info", "info",