ports/159786: [patch] upgrade of security/ossec-hids-server and security/ossec-hids-client to last release (2.6)

[Jake Smith]

>Number:         159786
>Category:       ports
>Synopsis:       [patch] upgrade of security/ossec-hids-server and security/ossec-hids-client to last release (2.6)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 15 10:10:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jake Smith
>Release:        FreeBSD 8.2-STABLE
>Organization:
>Environment:
FreeBSD xxx 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Aug  8 12:54:39 BST 2011     root at xxx:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
upgrade to last released version: 2.6
http://www.ossec.net/main/ossec-v2-6-released

options menu added to compile with database support.
>How-To-Repeat:

>Fix:
apply the following patch.

Patch attached with submission follows:

diff -ruN ossec-hids-client.bak/pkg-plist.client ossec-hids-client/pkg-plist.client
--- ossec-hids-client.bak/pkg-plist.client	2011-08-15 10:04:21.859266000 +0100
+++ ossec-hids-client/pkg-plist.client	2011-08-08 16:46:00.101873081 +0100
@@ -1,3 +1,4 @@
+%%PORTNAME%%/active-response/bin/default-firewall-drop.sh
 %%PORTNAME%%/active-response/bin/disable-account.sh
 %%PORTNAME%%/active-response/bin/firewall-drop.sh
 %%PORTNAME%%/active-response/bin/host-deny.sh
@@ -7,6 +8,7 @@
 %%PORTNAME%%/active-response/bin/pf.sh
 %%PORTNAME%%/active-response/bin/restart-ossec.sh
 %%PORTNAME%%/active-response/bin/route-null.sh
+%%PORTNAME%%/bin/agent-auth
 %%PORTNAME%%/bin/manage_agents
 %%PORTNAME%%/bin/ossec-agentd
 %%PORTNAME%%/bin/ossec-control
diff -ruN ossec-hids-server.bak/Makefile ossec-hids-server/Makefile
--- ossec-hids-server.bak/Makefile	2011-03-19 13:15:29.000000000 +0000
+++ ossec-hids-server/Makefile	2011-08-08 16:55:11.734157451 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ossec-hids
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ossec.net/files/ \
@@ -18,10 +18,10 @@
 
 USE_RC_SUBR=	ossec-hids
 
-.if defined(WITH_DB)
-USE_MYSQL=	yes
-USE_PGSQL=	yes
-USE_BDB=	yes
+.if !defined(CLIENT_ONLY)
+OPTIONS=	MYSQL "Enable MySQL support" off \
+		PGSQL "Enable PostgreSQL support" off \
+		BDB "Enable with Berkeley DB" off
 .endif
 
 SUB_LIST=	PORTNAME=${PORTNAME}
@@ -31,6 +31,23 @@
 
 .include <bsd.port.pre.mk>
 
+.if !defined(CLIENT_ONLY)
+.if defined(WITH_MYSQL)
+WITH_DB=	yes
+USE_MYSQL=	yes
+.endif
+
+.if defined(WITH_PGSQL)
+WITH_DB=	yes
+USE_PGSQL=	yes
+.endif
+
+.if defined(WITH_BDB)
+WITH_DB=	yes
+USE_BDB=	yes
+.endif
+.endif
+
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=	-client
 CONFLICTS=	ossec-hids-server-[0-9]* ossec-hids-local-[0-9]*
diff -ruN ossec-hids-server.bak/distinfo ossec-hids-server/distinfo
--- ossec-hids-server.bak/distinfo	2010-12-14 00:41:09.000000000 +0000
+++ ossec-hids-server/distinfo	2011-08-08 15:30:27.165325589 +0100
@@ -1,2 +1,2 @@
-SHA256 (ossec-hids-2.5.1.tar.gz) = e7bb4701a6b9a40f76d4e2c3c39106ded3c37f13ccc3ce476029da1f0e9c9f9e
-SIZE (ossec-hids-2.5.1.tar.gz) = 740470
+SHA256 (ossec-hids-2.6.tar.gz) = 37a6b14a0c41252852b51fd06cc186a8b66bd9e01821efd70305a6dd782a2b4c
+SIZE (ossec-hids-2.6.tar.gz) = 758125
diff -ruN ossec-hids-server.bak/pkg-plist ossec-hids-server/pkg-plist
--- ossec-hids-server.bak/pkg-plist	2010-12-14 00:41:09.000000000 +0000
+++ ossec-hids-server/pkg-plist	2011-08-15 10:47:52.084066503 +0100
@@ -1,3 +1,4 @@
+%%PORTNAME%%/active-response/bin/default-firewall-drop.sh
 %%PORTNAME%%/active-response/bin/disable-account.sh
 %%PORTNAME%%/active-response/bin/firewall-drop.sh
 %%PORTNAME%%/active-response/bin/host-deny.sh
@@ -14,6 +15,7 @@
 %%PORTNAME%%/bin/ossec-agentd
 %%PORTNAME%%/bin/ossec-agentlessd
 %%PORTNAME%%/bin/ossec-analysisd
+%%PORTNAME%%/bin/ossec-authd
 %%PORTNAME%%/bin/ossec-control
 %%PORTNAME%%/bin/ossec-csyslogd
 %%PORTNAME%%/bin/ossec-dbd
@@ -49,10 +51,13 @@
 %%PORTNAME%%/rules/arpwatch_rules.xml
 %%PORTNAME%%/rules/asterisk_rules.xml
 %%PORTNAME%%/rules/attack_rules.xml
+%%PORTNAME%%/rules/bro-ids_rules.xml
 %%PORTNAME%%/rules/cimserver_rules.xml
 %%PORTNAME%%/rules/cisco-ios_rules.xml
+%%PORTNAME%%/rules/clam_av_rules.xml
 %%PORTNAME%%/rules/courier_rules.xml
 %%PORTNAME%%/rules/dovecot_rules.xml
+%%PORTNAME%%/rules/dropbear_rules.xml
 %%PORTNAME%%/rules/firewall_rules.xml
 %%PORTNAME%%/rules/ftpd_rules.xml
 %%PORTNAME%%/rules/hordeimp_rules.xml
@@ -70,6 +75,7 @@
 %%PORTNAME%%/rules/named_rules.xml
 %%PORTNAME%%/rules/netscreenfw_rules.xml
 %%PORTNAME%%/rules/nginx_rules.xml
+%%PORTNAME%%/rules/openbsd_rules.xml
 %%PORTNAME%%/rules/ossec_rules.xml
 %%PORTNAME%%/rules/pam_rules.xml
 %%PORTNAME%%/rules/php_rules.xml


>Release-Note:
>Audit-Trail:
>Unformatted: