git: b1d0b5eecdb0 - main - security/ossec-hids* : Fix build

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b1d0b5eecdb0aef92f8c37fa94ebad66dda141d6

commit b1d0b5eecdb0aef92f8c37fa94ebad66dda141d6
Author:     Dominik Lisiak <dominik.lisiak@bemsoft.pl>
AuthorDate: 2022-08-12 07:08:57 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-08-12 07:13:02 +0000

    security/ossec-hids* : Fix build
    
    Remove unwanted patches from previous commit
    
    PR:     265688
    Fixes:  2b0855d security/ossec-hids: Update to 3.7.0
---
 .../ossec-hids-local/files/patch-src_addagent_main.c  | 18 ------------------
 .../files/patch-src_addagent_manage__agents.h         |  8 --------
 .../files/patch-src_client-agent_agentd.c             | 19 -------------------
 .../files/patch-src_client-agent_agentd.h             | 11 -----------
 .../files/patch-src_client-agent_config.c             | 12 ------------
 .../files/patch-src_os__net_os__net.c                 | 10 ----------
 6 files changed, 78 deletions(-)

diff --git a/security/ossec-hids-local/files/patch-src_addagent_main.c b/security/ossec-hids-local/files/patch-src_addagent_main.c
deleted file mode 100644
index 130872b255ad..000000000000
--- a/security/ossec-hids-local/files/patch-src_addagent_main.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 */
diff --git a/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h b/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h
deleted file mode 100644
index 1e1f32d65088..000000000000
--- a/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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;
diff --git a/security/ossec-hids-local/files/patch-src_client-agent_agentd.c b/security/ossec-hids-local/files/patch-src_client-agent_agentd.c
deleted file mode 100644
index ab6530725444..000000000000
--- a/security/ossec-hids-local/files/patch-src_client-agent_agentd.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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()");
diff --git a/security/ossec-hids-local/files/patch-src_client-agent_agentd.h b/security/ossec-hids-local/files/patch-src_client-agent_agentd.h
deleted file mode 100644
index 61846975c01a..000000000000
--- a/security/ossec-hids-local/files/patch-src_client-agent_agentd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 */
diff --git a/security/ossec-hids-local/files/patch-src_client-agent_config.c b/security/ossec-hids-local/files/patch-src_client-agent_config.c
deleted file mode 100644
index 74765c6d70af..000000000000
--- a/security/ossec-hids-local/files/patch-src_client-agent_config.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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)
diff --git a/security/ossec-hids-local/files/patch-src_os__net_os__net.c b/security/ossec-hids-local/files/patch-src_os__net_os__net.c
deleted file mode 100644
index 0cc169681836..000000000000
--- a/security/ossec-hids-local/files/patch-src_os__net_os__net.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 */