Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support AIX 7 #1958

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Support AIX 7 #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
346afbf
support aix7
ngarratt Mar 23, 2021
da2f4ec
Merge branch 'master' into aix7
atomicturtle Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ Install()
fi

${MAKEBIN} PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install
if [ $? != 0 ]; then
cd ../
catError "0x5-build"
fi

cd ../

Expand Down
11 changes: 9 additions & 2 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/addagent/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/analysisd/output/prelude.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading