Date: Mon, 21 Sep 2020 18:57:18 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549478 - in head/security: ossec-hids ossec-hids-local/files Message-ID: <202009211857.08LIvIti024610@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Mon Sep 21 18:57:18 2020 New Revision: 549478 URL: https://svnweb.freebsd.org/changeset/ports/549478 Log: Fix build of ossec-hids-agent with -fno-common Update the referenced master port and included version.mk file. The patches are not relevant for ossec-hids-local, but have to be added there to become effective in ossec-hids-agents. Added: head/security/ossec-hids-local/files/patch-src_addagent_main.c (contents, props changed) head/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h (contents, props changed) head/security/ossec-hids-local/files/patch-src_client-agent_agentd.c (contents, props changed) head/security/ossec-hids-local/files/patch-src_client-agent_agentd.h (contents, props changed) head/security/ossec-hids-local/files/patch-src_client-agent_config.c (contents, props changed) head/security/ossec-hids-local/files/patch-src_os__net_os__net.c (contents, props changed) Modified: head/security/ossec-hids/version.mk Added: head/security/ossec-hids-local/files/patch-src_addagent_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_addagent_main.c Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,18 @@ +--- src/addagent/main.c.orig 2020-02-14 19:46:22 UTC ++++ src/addagent/main.c +@@ -17,6 +17,7 @@ static void print_banner(void); + static void manage_shutdown(int sig) __attribute__((noreturn)); + #endif + ++int willchroot; + + #if defined(__MINGW32__) + static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite) +@@ -104,7 +105,6 @@ int main(int argc, char **argv) + int ret; + #endif + +- extern int willchroot; + willchroot = 1; + + /* Set the name */ Added: head/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,8 @@ +--- src/addagent/manage_agents.h.orig 2020-02-14 19:46:22 UTC ++++ src/addagent/manage_agents.h +@@ -147,4 +147,4 @@ extern fpos_t fp_pos; + #define GMF_UNKN_ERROR ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n" + + +-int willchroot; ++extern int willchroot; Added: head/security/ossec-hids-local/files/patch-src_client-agent_agentd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_client-agent_agentd.c Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,19 @@ +--- src/client-agent/agentd.c.orig 2020-02-14 19:46:22 UTC ++++ src/client-agent/agentd.c +@@ -15,6 +15,8 @@ + #include "os_dns/os_dns.h" + #endif //WIN32 + ++struct imsgbuf server_ibuf; ++ + /* Start the agent daemon */ + void AgentdStart(const char *dir, int uid, int gid, const char *user, const char *group) + { +@@ -39,7 +41,6 @@ void AgentdStart(const char *dir, int uid, int gid, co + merror("starting imsg stuff"); + /* Prepare for os_dns */ + struct imsgbuf osdns_ibuf; +- extern struct imsgbuf server_ibuf; + //struct imsgbuf osdns_ibuf; + int imsg_fds[2]; + merror("Creating socketpair()"); Added: head/security/ossec-hids-local/files/patch-src_client-agent_agentd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_client-agent_agentd.h Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,11 @@ +--- src/client-agent/agentd.h.orig 2020-02-14 19:46:22 UTC ++++ src/client-agent/agentd.h +@@ -83,7 +83,7 @@ extern int run_foreground; + extern keystore keys; + extern agent *agt; + #ifndef WIN32 +-struct imsgbuf server_ibuf; ++extern struct imsgbuf server_ibuf; + #endif //WIN32 + + #endif /* __AGENTD_H */ Added: head/security/ossec-hids-local/files/patch-src_client-agent_config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_client-agent_config.c Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,12 @@ +--- src/client-agent/config.c.orig 2020-02-14 19:46:22 UTC ++++ src/client-agent/config.c +@@ -17,8 +17,8 @@ + time_t available_server; + int run_foreground; + keystore keys; +-agent *agt; + ++extern agent *agt; + + /* Read the config file (for the remote client) */ + int ClientConf(const char *cfgfile) Added: head/security/ossec-hids-local/files/patch-src_os__net_os__net.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ossec-hids-local/files/patch-src_os__net_os__net.c Mon Sep 21 18:57:18 2020 (r549478) @@ -0,0 +1,10 @@ +--- src/os_net/os_net.c.orig 2020-02-14 19:46:22 UTC ++++ src/os_net/os_net.c +@@ -14,6 +14,7 @@ + #include <errno.h> + #include "shared.h" + #include "os_net.h" ++ + agent *agt; + + /* Prototypes */ Modified: head/security/ossec-hids/version.mk ============================================================================== --- head/security/ossec-hids/version.mk Mon Sep 21 18:41:39 2020 (r549477) +++ head/security/ossec-hids/version.mk Mon Sep 21 18:57:18 2020 (r549478) @@ -1,6 +1,6 @@ PORTNAME= ossec-hids PORTVERSION= 3.6.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security MAINTAINER= dominik.lisiak@bemsoft.pl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009211857.08LIvIti024610>