Upgrade to 3.7.0.

14 files changed, 19 insertions, 84 deletions

diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile
index fa4509d..452770e 100644
--- a/security/ossec-hids-local-config/Makefile
+++ b/security/ossec-hids-local-config/Makefile
@@ -1,10 +1,12 @@
-PORTREVISION?=	2
 PKGNAMESUFFIX?=	-${OSSEC_TYPE}-config
 COMMENT?=	Configuration manager for ossec-hids-${OSSEC_TYPE}
 OSSEC_TYPE?=	local
 
 .include "${.CURDIR}/../ossec-hids/version.mk"
 
+PORTVERSION=	3.7.0
+PORTREVISION=	0
+
 MASTERDIR?=	${.CURDIR}
 DISTINFO_FILE?=	${MASTERDIR}/../ossec-hids-local/distinfo
 
diff --git a/security/ossec-hids-local-config/files/template-rules-default.xml.in b/security/ossec-hids-local-config/files/template-rules-default.xml.in
index 2ae7bc2..2f9502c 100644
--- a/security/ossec-hids-local-config/files/template-rules-default.xml.in
+++ b/security/ossec-hids-local-config/files/template-rules-default.xml.in
@@ -84,6 +84,7 @@
     <include>kesl_rules.xml</include>
     <include>mhn_dionaea_rules.xml</include>
     <include>mhn_cowrie_rules.xml</include>
+    <include>lighttpd_rules.xml</include>
     <include>local_rules.xml</include>
 
     <!-- Files not included by default -->
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index 0ba7039..71bcd09 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -4,6 +4,9 @@ OSSEC_TYPE?=	local
 
 .include "${.CURDIR}/../ossec-hids/version.mk"
 
+PORTVERSION=	3.7.0
+PORTREVISION=	0
+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to compile: rootcheck/os_string.c:186:20: use of undeclared identifier '__LDPGSZ'
diff --git a/security/ossec-hids-local/distinfo b/security/ossec-hids-local/distinfo
index 90baa65..279c79e 100644
--- a/security/ossec-hids-local/distinfo
+++ b/security/ossec-hids-local/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581720780
-SHA256 (ossec-ossec-hids-3.6.0_GH0.tar.gz) = 653828a19137b8a7e98af65e873318f7bb48137fe1e61b80577e13c316e04708
-SIZE (ossec-ossec-hids-3.6.0_GH0.tar.gz) = 1921753
+TIMESTAMP = 1656551293
+SHA256 (ossec-ossec-hids-3.7.0_GH0.tar.gz) = 23f5ede50f5de449db0a571fc453977f7079b4b47ce90b0ef31feed20df100e9
+SIZE (ossec-ossec-hids-3.7.0_GH0.tar.gz) = 2518737
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 130872b..0000000
--- 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 1e1f32d..0000000
--- 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 ab65307..0000000
--- 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 6184697..0000000
--- 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 74765c6..0000000
--- 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 0cc1696..0000000
--- 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 */
diff --git a/security/ossec-hids-local/pkg-plist-agent b/security/ossec-hids-local/pkg-plist-agent
index 6bef7a7..97b644d 100644
--- a/security/ossec-hids-local/pkg-plist-agent
+++ b/security/ossec-hids-local/pkg-plist-agent
@@ -9,7 +9,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfilter.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/nftables-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-aws-waf.sh
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
diff --git a/security/ossec-hids-local/pkg-plist-local b/security/ossec-hids-local/pkg-plist-local
index eb687d3..a2fe62c 100644
--- a/security/ossec-hids-local/pkg-plist-local
+++ b/security/ossec-hids-local/pkg-plist-local
@@ -9,7 +9,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfilter.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/nftables-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-aws-waf.sh
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
@@ -115,6 +117,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
+@(,ossec,0640) %%OSSEC_HOME%%/rules/lighttpd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
diff --git a/security/ossec-hids-local/pkg-plist-server b/security/ossec-hids-local/pkg-plist-server
index eb687d3..a2fe62c 100644
--- a/security/ossec-hids-local/pkg-plist-server
+++ b/security/ossec-hids-local/pkg-plist-server
@@ -9,7 +9,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfilter.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/nftables-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
+@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-aws-waf.sh
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
 @sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
@@ -115,6 +117,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
+@(,ossec,0640) %%OSSEC_HOME%%/rules/lighttpd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
diff --git a/security/ossec-hids/version.mk b/security/ossec-hids/version.mk
index 5d3591f..305273a 100644
--- a/security/ossec-hids/version.mk
+++ b/security/ossec-hids/version.mk
@@ -1,6 +1,5 @@
 PORTNAME=	ossec-hids
-PORTVERSION=	3.6.0
-PORTREVISION?=	1
+PORTVERSION=	3.7.0
 CATEGORIES=	security
 
 MAINTAINER=	dominik.lisiak@bemsoft.pl