Upgrade to 3.4.0.3.4.0

9 files changed, 40 insertions, 23 deletions

diff --git a/security/ossec-hids-local-config/distinfo b/security/ossec-hids-local-config/distinfo
index b6779af..519c429 100644
--- a/security/ossec-hids-local-config/distinfo
+++ b/security/ossec-hids-local-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555773476
-SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
-SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070
+TIMESTAMP = 1571488581
+SHA256 (ossec-ossec-hids-3.4.0_GH0.tar.gz) = 48b7898993778a106555921d308fecf88a69adf0d162f4f412b85a77d3299d31
+SIZE (ossec-ossec-hids-3.4.0_GH0.tar.gz) = 1919827
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index 2c98523..f17eee2 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -24,7 +24,7 @@ CONFLICTS_INSTALL=	ossec-hids-client-* \
 			ossec-hids-local-*
 .endif
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 libevent.so:devel/libevent
 .if ${OSSEC_TYPE} != agent
 RUN_DEPENDS=	expect:lang/expect
 .endif
@@ -129,7 +129,12 @@ FIREWALL_DROP_BIN=	${OSSEC_HOME}/active-response/bin/firewall-drop.sh
 IPFILTER_BIN=		${OSSEC_HOME}/active-response/bin/ipfilter.sh
 RESTART_OSSEC_BIN=	${OSSEC_HOME}/active-response/bin/restart-ossec.sh
 SHARED_DIR=		${OSSEC_HOME}/etc/shared
-INTERNAL_OPTS_CONF=	${OSSEC_HOME}/etc/local_internal_options.conf
+
+SAMPLE_FILES=		${OSSEC_HOME}/etc/local_internal_options.conf \
+			${OSSEC_HOME}/active-response/bin/cloudflare-ban.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-pagerduty.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-slack.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-tweeter.sh
 
 .if empty(USER)
 USER=$$(${ID} -un)
@@ -181,6 +186,9 @@ INOTIFY_CFLAGS=	$$(${PKG_CONFIG} --cflags libinotify)
 INOTIFY_LDFLAGS=$$(${PKG_CONFIG} --libs libinotify)
 
 OSSEC_ARGS+=	TARGET=${OSSEC_TYPE} PCRE2_SYSTEM=yes INSTALL_LOCALTIME=no INSTALL_RESOLVCONF=no
+.if defined(OSSEC_MAX_AGENTS)
+OSSEC_ARGS+=	MAXAGENTS=${OSSEC_MAX_AGENTS}
+.endif
 .if !defined(MAINTAINER_MODE)
 OSSEC_ARGS+=	INSTALL_CMD=install
 .endif
@@ -206,7 +214,9 @@ do-install:
 	@cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_ARGS} install
 
 post-install:
-	@${MV} -f ${STAGEDIR}${INTERNAL_OPTS_CONF} ${STAGEDIR}${INTERNAL_OPTS_CONF}.sample
+.for file_path in ${SAMPLE_FILES}
+	@${MV} -f ${STAGEDIR}${file_path} ${STAGEDIR}${file_path}.sample
+.endfor
 	@${MV} -f ${STAGEDIR}${FIREWALL_DROP_BIN} ${STAGEDIR}${IPFILTER_BIN}
 	@${CP} ${WRKDIR}/restart-ossec.sh ${STAGEDIR}${RESTART_OSSEC_BIN}
 	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}
diff --git a/security/ossec-hids-local/distinfo b/security/ossec-hids-local/distinfo
index 2e3c7db..519c429 100644
--- a/security/ossec-hids-local/distinfo
+++ b/security/ossec-hids-local/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555773447
-SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
-SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070
+TIMESTAMP = 1571488581
+SHA256 (ossec-ossec-hids-3.4.0_GH0.tar.gz) = 48b7898993778a106555921d308fecf88a69adf0d162f4f412b85a77d3299d31
+SIZE (ossec-ossec-hids-3.4.0_GH0.tar.gz) = 1919827
diff --git a/security/ossec-hids-local/files/ossec-hids.in b/security/ossec-hids-local/files/ossec-hids.in
index 56573ea..6c580f2 100644
--- a/security/ossec-hids-local/files/ossec-hids.in
+++ b/security/ossec-hids-local/files/ossec-hids.in
@@ -13,7 +13,7 @@
 #                                       Default: NO
 # ossec_hids_fetch_connect_time (int):  Time in seconds to wait for the download of the shared configuration to start.
 #                                       Used only by agent installation.
-#                                       Default: 30
+#                                       Default: 40
 # ossec_hids_fetch_read_time (int):     Time in seconds to wait for subsequent download chunks of the shared configuration.
 #                                       Used only by agent installation.
 #                                       Default: 10
@@ -28,7 +28,7 @@ load_rc_config $name
 : ${ossec_hids_enable="NO"}
 : ${ossec_hids_clear_log="NO"}
 : ${ossec_hids_clear_ar_log="NO"}
-: ${ossec_hids_fetch_connect_time=30}
+: ${ossec_hids_fetch_connect_time=40}
 : ${ossec_hids_fetch_read_time=10}
 
 ossec_type="%%OSSEC_TYPE%%"
diff --git a/security/ossec-hids-local/pkg-plist-agent b/security/ossec-hids-local/pkg-plist-agent
index 8b8bd2a..a9d9433 100644
--- a/security/ossec-hids-local/pkg-plist-agent
+++ b/security/ossec-hids-local/pkg-plist-agent
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,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/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.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
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
diff --git a/security/ossec-hids-local/pkg-plist-local b/security/ossec-hids-local/pkg-plist-local
index 068d976..7659408 100644
--- a/security/ossec-hids-local/pkg-plist-local
+++ b/security/ossec-hids-local/pkg-plist-local
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,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/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.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
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
diff --git a/security/ossec-hids-local/pkg-plist-server b/security/ossec-hids-local/pkg-plist-server
index 068d976..7659408 100644
--- a/security/ossec-hids-local/pkg-plist-server
+++ b/security/ossec-hids-local/pkg-plist-server
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,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/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.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
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
diff --git a/security/ossec-hids-local/scripts/plist.conf b/security/ossec-hids-local/scripts/plist.conf
index 847f6a8..c32d04d 100644
--- a/security/ossec-hids-local/scripts/plist.conf
+++ b/security/ossec-hids-local/scripts/plist.conf
@@ -27,4 +27,8 @@ if [ "${OSSEC_TYPE}" = "agent" ]; then
 fi
 
 sample_paths="
-/etc/local_internal_options.conf.sample"
+/etc/local_internal_options.conf.sample
+/active-response/bin/cloudflare-ban.sh.sample
+/active-response/bin/ossec-pagerduty.sh.sample
+/active-response/bin/ossec-slack.sh.sample
+/active-response/bin/ossec-tweeter.sh.sample"
diff --git a/security/ossec-hids/version.mk b/security/ossec-hids/version.mk
index 8d989d1..f7eb135 100644
--- a/security/ossec-hids/version.mk
+++ b/security/ossec-hids/version.mk
@@ -1,6 +1,6 @@
 PORTNAME=	ossec-hids
-PORTVERSION=	3.3.0
-PORTREVISION?=	1
+PORTVERSION=	3.4.0
+PORTREVISION?=	0
 CATEGORIES=	security
 
 MAINTAINER=	dominik.lisiak@bemsoft.pl