From 659cfe1c1701f916f11ee5f56af410c82046a152 Mon Sep 17 00:00:00 2001 From: ramonn Date: Wed, 19 May 2010 15:21:10 +0000 Subject: [PATCH] 2010-05-19 Ramon Novoa * pandora_strutils.h, modules/pandora_module_odbc.h, modules/pandora_data.h, build.sh, pandora.h, udp_server/udp_server.h, Makefile.am: Small fixes so the agent builds under newer versions of MinGW. * installer/pandora.mpi: Updated build. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2752 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 9 +++++++++ pandora_agents/win32/Makefile.am | 1 + pandora_agents/win32/build.sh | 8 +++++++- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/modules/pandora_data.h | 1 + pandora_agents/win32/modules/pandora_module_odbc.h | 1 + pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/pandora.h | 1 + pandora_agents/win32/pandora_strutils.h | 1 + pandora_agents/win32/udp_server/udp_server.h | 1 + 10 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index e3972c1366..79fae615c3 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,12 @@ +2010-05-19 Ramon Novoa + + * pandora_strutils.h, modules/pandora_module_odbc.h, + modules/pandora_data.h, build.sh, pandora.h, + udp_server/udp_server.h, Makefile.am: Small fixes so the agent + builds under newer versions of MinGW. + + * installer/pandora.mpi: Updated build. + 2010-05-13 Ramon Novoa * pandora_windows_service.cc: Check the return codee of the tentacle diff --git a/pandora_agents/win32/Makefile.am b/pandora_agents/win32/Makefile.am index 1b7326a531..5a80b49a5a 100644 --- a/pandora_agents/win32/Makefile.am +++ b/pandora_agents/win32/Makefile.am @@ -6,3 +6,4 @@ else PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_odbc.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c windows/wmi/disphelper.c ssh/libssh2/channel.c ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc PandoraAgent_CXXFLAGS=-O2 -DCURL_STATICLIB endif +PandoraAgent_LDFLAGS=-enable-auto-import diff --git a/pandora_agents/win32/build.sh b/pandora_agents/win32/build.sh index db06ccc7dc..e8fe370400 100755 --- a/pandora_agents/win32/build.sh +++ b/pandora_agents/win32/build.sh @@ -3,5 +3,11 @@ # The installer will be placed in ./installer/output/. # InstallJammer must be installed and in the PATH. -./autogen.sh && ./configure --host=i586-mingw32msvc && make clean && make && cp PandoraAgent.exe bin/ && installjammer --build installer/pandora.mpi +DIST=`lsb_release -i | awk '{print $3}'` +HOST="i586-mingw32msvc" +if [ "$DIST" == "SUSE" ]; then + HOST="i686-pc-mingw32" +fi + +./autogen.sh && ./configure --host=$HOST && make clean && make && cp PandoraAgent.exe bin/ && installjammer --build installer/pandora.mpi diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ab164ddf02..36a95434de 100755 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{100421} +{100519} ViewReadme {Yes} diff --git a/pandora_agents/win32/modules/pandora_data.h b/pandora_agents/win32/modules/pandora_data.h index 255c6629fd..493acacbdc 100644 --- a/pandora_agents/win32/modules/pandora_data.h +++ b/pandora_agents/win32/modules/pandora_data.h @@ -22,6 +22,7 @@ #ifndef __PANDORA_DATA_H__ #define __PANDORA_DATA_H__ +#include #include #include diff --git a/pandora_agents/win32/modules/pandora_module_odbc.h b/pandora_agents/win32/modules/pandora_module_odbc.h index 68031a132e..3855b1a498 100755 --- a/pandora_agents/win32/modules/pandora_module_odbc.h +++ b/pandora_agents/win32/modules/pandora_module_odbc.h @@ -23,6 +23,7 @@ #define __PANDORA_MODULE_ODBC_H__ #include "pandora_module.h" +#include #include using namespace odbc; diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 00f09cb1d8..ccd3ab48bc 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("3.1RC1(Build 100421)") +#define PANDORA_VERSION ("3.1RC1(Build 100519)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/pandora.h b/pandora_agents/win32/pandora.h index 18e715ba54..96f4c5fab5 100644 --- a/pandora_agents/win32/pandora.h +++ b/pandora_agents/win32/pandora.h @@ -21,6 +21,7 @@ #define __PANDORA__ #include +#include #include #undef WINVER diff --git a/pandora_agents/win32/pandora_strutils.h b/pandora_agents/win32/pandora_strutils.h index 19f713af82..8f9408431b 100644 --- a/pandora_agents/win32/pandora_strutils.h +++ b/pandora_agents/win32/pandora_strutils.h @@ -22,6 +22,7 @@ #ifndef __STRUTILS_H__ #define __STRUTILS_H__ +#include #include #include diff --git a/pandora_agents/win32/udp_server/udp_server.h b/pandora_agents/win32/udp_server/udp_server.h index 467d862630..32631d997b 100644 --- a/pandora_agents/win32/udp_server/udp_server.h +++ b/pandora_agents/win32/udp_server/udp_server.h @@ -24,6 +24,7 @@ #define MAX_PACKET_SIZE 1024 +#include #include "../pandora_windows_service.h" namespace Pandora {