Upgrade to 3.3.0.

10 files changed, 29 insertions, 16 deletions

diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile
index 7b8390d..54b00ad 100644
--- a/security/ossec-hids-local-config/Makefile
+++ b/security/ossec-hids-local-config/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD: head/security/ossec-hids-local-config/Makefile 485977 2018-11-27 01:58:02Z swills $
 
 PORTNAME=	ossec-hids
-PORTVERSION=	3.2.0
-PORTREVISION=
+PORTVERSION=	3.3.0
+PORTREVISION=	0
 CATEGORIES=	security
 PKGNAMESUFFIX=	-${OSSEC_TYPE}-config
 
diff --git a/security/ossec-hids-local-config/distinfo b/security/ossec-hids-local-config/distinfo
index 78bdadd..b6779af 100644
--- a/security/ossec-hids-local-config/distinfo
+++ b/security/ossec-hids-local-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553010491
-SHA256 (ossec-ossec-hids-3.2.0_GH0.tar.gz) = b36cc4db73c265f5fd65f2b5450d69e332316612b5602a3e310ae8907e9d2548
-SIZE (ossec-ossec-hids-3.2.0_GH0.tar.gz) = 1896977
+TIMESTAMP = 1555773476
+SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
+SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070
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 511d551..2ae7bc2 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
@@ -52,8 +52,10 @@
     <include>vmware_rules.xml</include>
     <include>ids_rules.xml</include>
     <include>ms_powershell_rules.xml</include>
+    <include>last_rootlogin_rules.xml</include>
     <include>apache_rules.xml</include>
     <include>web_rules.xml</include>
+    <include>topleveldomain_rules.xml</include>
     <include>zeus_rules.xml</include>
     <include>nginx_rules.xml</include>
     <include>php_rules.xml</include>
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index b14b845..54433b3 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD: head/security/ossec-hids-local/Makefile 490211 2019-01-13 20:58:36Z adamw $
 
 PORTNAME=	ossec-hids
-PORTVERSION=	3.2.0
-PORTREVISION=
+PORTVERSION=	3.3.0
+PORTREVISION=	0
 CATEGORIES=	security
 PKGNAMESUFFIX=	-${OSSEC_TYPE}
 
@@ -30,6 +30,7 @@ CONFLICTS_INSTALL=	ossec-hids-client-* \
 			ossec-hids-local-*
 .endif
 
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 .if ${OSSEC_TYPE} != agent
 RUN_DEPENDS=	expect:lang/expect
 .endif
@@ -182,7 +183,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 INOTIFY_CFLAGS=	$$(${PKG_CONFIG} --cflags libinotify)
 INOTIFY_LDFLAGS=$$(${PKG_CONFIG} --libs libinotify)
 
-OSSEC_ARGS+=	TARGET=${OSSEC_TYPE} INSTALL_LOCALTIME=no
+OSSEC_ARGS+=	TARGET=${OSSEC_TYPE} PCRE2_SYSTEM=yes INSTALL_LOCALTIME=no INSTALL_RESOLVCONF=no
 .if !defined(MAINTAINER_MODE)
 OSSEC_ARGS+=	INSTALL_CMD=install
 .endif
diff --git a/security/ossec-hids-local/distinfo b/security/ossec-hids-local/distinfo
index f129b2e..2e3c7db 100644
--- a/security/ossec-hids-local/distinfo
+++ b/security/ossec-hids-local/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553010288
-SHA256 (ossec-ossec-hids-3.2.0_GH0.tar.gz) = b36cc4db73c265f5fd65f2b5450d69e332316612b5602a3e310ae8907e9d2548
-SIZE (ossec-ossec-hids-3.2.0_GH0.tar.gz) = 1896977
+TIMESTAMP = 1555773447
+SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
+SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070
diff --git a/security/ossec-hids-local/files/ossec-hids.in b/security/ossec-hids-local/files/ossec-hids.in
index f7449e7..56573ea 100644
--- a/security/ossec-hids-local/files/ossec-hids.in
+++ b/security/ossec-hids-local/files/ossec-hids.in
@@ -53,6 +53,7 @@ ossec_ar_log="${ossec_home}/logs/active-responses.log"
 ossec_merged="${ossec_home}/etc/shared/merged.mg"
 
 ossec_local_time="/etc/localtime"
+ossec_resolv_conf="/etc/resolv.conf"
 
 extra_commands="help status reload ossec_conf"
 case ${ossec_type} in
@@ -382,7 +383,13 @@ ossec_hids_create_env() {
         echo
         return 1
     fi
+    if [ ! -e "${ossec_resolv_conf}" ]; then
+        echo "ERROR: Missing \"${ossec_resolv_conf}\"."
+        echo
+        return 1
+    fi
     install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}"
+    install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_resolv_conf}" "${ossec_home}${ossec_resolv_conf}"
 
     return 0
 }
diff --git a/security/ossec-hids-local/files/pkg-deinstall.in b/security/ossec-hids-local/files/pkg-deinstall.in
index 969238b..24479ff 100644
--- a/security/ossec-hids-local/files/pkg-deinstall.in
+++ b/security/ossec-hids-local/files/pkg-deinstall.in
@@ -5,12 +5,11 @@ ar_conf="${ossec_home}/etc/shared/ar.conf"
 merged_mg="${ossec_home}/etc/shared/merged.mg"
 client_keys="${ossec_home}/etc/client.keys"
 local_time="${ossec_home}/etc/localtime"
+resolv_conf="${ossec_home}/etc/resolv.conf"
 
 if [ "$2" == "DEINSTALL"  ]; then
-    rm -f "${ar_conf}"
-    rm -f "${merged_mg}"
     if [ ! -s "${client_keys}" ]; then
         rm -f "${client_keys}"
     fi
-    rm -f "${local_time}"
+    rm -f "${ar_conf}" "${merged_mg}" "${local_time}" "${resolv_conf}"
 fi
diff --git a/security/ossec-hids-local/pkg-plist-local b/security/ossec-hids-local/pkg-plist-local
index cd799e9..068d976 100644
--- a/security/ossec-hids-local/pkg-plist-local
+++ b/security/ossec-hids-local/pkg-plist-local
@@ -113,6 +113,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
 @(,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/linux_usbdetect_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
@@ -164,6 +165,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
+@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml
diff --git a/security/ossec-hids-local/pkg-plist-server b/security/ossec-hids-local/pkg-plist-server
index cd799e9..068d976 100644
--- a/security/ossec-hids-local/pkg-plist-server
+++ b/security/ossec-hids-local/pkg-plist-server
@@ -113,6 +113,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
 @(,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/linux_usbdetect_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
@@ -164,6 +165,7 @@
 @(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
+@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
 @(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml
diff --git a/security/ossec-hids/Makefile b/security/ossec-hids/Makefile
index 50d7429..34dedb9 100644
--- a/security/ossec-hids/Makefile
+++ b/security/ossec-hids/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD: head/security/ossec-hids/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 PORTNAME=	ossec-hids
-PORTVERSION=	3.2.0
-PORTREVISION=
+PORTVERSION=	3.3.0
+PORTREVISION=	0
 CATEGORIES=	security
 
 MAINTAINER=	dominik.lisiak@bemsoft.pl