MFH r389271

Update security/ossec-hids-* to 2.8.2. Approved by: portmgr (erwin) Approved by: swills (mentor) Security: c470db07-1098-11e5-b6a8-002590263bf5
freebsd · Jun 12, 2015 · 905e167 · 905e167
1 parent 3088881
commit 905e167
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 52 deletions.
diff --git a/security/ossec-hids-client/Makefile b/security/ossec-hids-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: Valerio Daelli <valerio.daelli@gmail.com>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 COMMENT=	The client port of ossec-hids
 
 CLIENT_ONLY=	yes

diff --git a/security/ossec-hids-client/pkg-plist.client b/security/ossec-hids-client/pkg-plist.client
@@ -45,24 +45,25 @@
 %%PORTNAME%%/agentless/ssh.exp
 %%PORTNAME%%/agentless/register_host.sh
 %%PORTNAME%%/agentless/su.exp
-@dirrmtry %%PORTNAME%%/agentless
-@dirrmtry %%PORTNAME%%/active-response/bin
-@dirrmtry %%PORTNAME%%/active-response
-@dirrmtry %%PORTNAME%%/etc/shared
-@dirrmtry %%PORTNAME%%/etc/
-@dirrmtry %%PORTNAME%%/var/run
-@dirrmtry %%PORTNAME%%/var
-@dirrmtry %%PORTNAME%%/queue/syscheck
-@dirrmtry %%PORTNAME%%/queue/rids
+@dir %%PORTNAME%%/agentless
+@dir %%PORTNAME%%/active-response/bin
+@dir %%PORTNAME%%/active-response
+@dir %%PORTNAME%%/etc/shared
+@dir %%PORTNAME%%/etc
+@dir %%PORTNAME%%/tmp
+@dir %%PORTNAME%%/var/run
+@dir %%PORTNAME%%/var
+@dir %%PORTNAME%%/queue/syscheck
+@dir %%PORTNAME%%/queue/rids
 @owner ossec
-@dirrmtry %%PORTNAME%%/queue/ossec
-@dirrmtry %%PORTNAME%%/queue/diff
+@dir %%PORTNAME%%/queue/ossec
+@dir %%PORTNAME%%/queue/diff
 @owner
-@dirrmtry %%PORTNAME%%/queue/alerts
-@dirrmtry %%PORTNAME%%/queue
-@dirrmtry %%PORTNAME%%/logs
-@dirrmtry %%PORTNAME%%/bin
+@dir %%PORTNAME%%/queue/alerts
+@dir %%PORTNAME%%/queue
+@dir %%PORTNAME%%/logs
+@dir %%PORTNAME%%/bin
 @owner ossec
-@dirrmtry %%PORTNAME%%/.ssh
+@dir %%PORTNAME%%/.ssh
 @owner
-@dirrmtry %%PORTNAME%%
+@dir %%PORTNAME%%
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
@@ -1,7 +1,7 @@
 # Created by: Valerio Daelli <valerio.daelli@gmail.com>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 COMMENT=	The client and server (local) port of ossec-hids
 
 LOCAL_ONLY=	yes

diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	ossec-hids
-PORTVERSION=	2.8.1
-PORTREVISION?=	1
+PORTVERSION=	2.8.2
+PORTREVISION?=	0
 CATEGORIES=	security
-MASTER_SITES=	http://www.ossec.net/files/ \
-		http://www.ossec.net/files/old/
+USE_GITHUB=	yes
+GH_ACCOUNT=	ossec
 PKGNAMESUFFIX=	-server
 
 MAINTAINER=	brd@FreeBSD.org
@@ -54,10 +54,12 @@ USES+=		pgsql
 .endif
 .endif
 
+STRIP_FILES=	ossec-luac agent_control ossec-lua ossec-dbd ossec-regex ossec-monitord ossec-makelists verify-agent-conf ossec-analysisd ossec-agentlessd syscheck_control ossec-execd manage_agents ossec-csyslogd ossec-syscheckd ossec-logtest ossec-authd ossec-logcollector list_agents ossec-maild clear_stats ossec-remoted ossec-reportd rootcheck_control syscheck_update
 .if defined(CLIENT_ONLY)
 SUB_LIST+=	PRECMD=:
 PKGNAMESUFFIX=	-client
 CONFLICTS=	ossec-hids-server-[0-9]* ossec-hids-local-[0-9]*
+STRIP_FILES=	agent-auth manage_agents ossec-agentd ossec-execd ossec-logcollector ossec-lua ossec-luac ossec-syscheckd
 .elif defined(LOCAL_ONLY)
 SUB_LIST+=	PRECMD=ossechids_start_precmd
 PKGNAMESUFFIX=	-local
@@ -106,6 +108,9 @@ do-install:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/etc
+.for file in ${STRIP_FILES}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/ossec-hids/bin/${file}
+.endfor
 
 .if defined(CLIENT_ONLY)
 	@${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/ossec.conf.sample

diff --git a/security/ossec-hids-server/distinfo b/security/ossec-hids-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ossec-hids-2.8.1.tar.gz) = 03c073761aa484fe21a9fcc0ea318ba132ff2466c64360408046a4b8e527b529
-SIZE (ossec-hids-2.8.1.tar.gz) = 1634812
+SHA256 (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 61e0892175a79fe119c8bab886cd41fcc3be9b84526600b06c18fa178a59cb34
+SIZE (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 1635142
diff --git a/security/ossec-hids-server/pkg-plist b/security/ossec-hids-server/pkg-plist
@@ -131,40 +131,40 @@
 @owner root
 @group ossec
 @mode 550
-@dirrmtry %%PORTNAME%%/.ssh
-@dirrmtry %%PORTNAME%%/active-response/bin
-@dirrmtry %%PORTNAME%%/active-response
-@dirrmtry %%PORTNAME%%/agentless
-@dirrmtry %%PORTNAME%%/bin
-@dirrmtry %%PORTNAME%%/etc/shared
-@dirrmtry %%PORTNAME%%/etc
-@dirrmtry %%PORTNAME%%/queue/rootcheck
-@dirrmtry %%PORTNAME%%/rules
-@dirrmtry %%PORTNAME%%/tmp
+@dir %%PORTNAME%%/.ssh
+@dir %%PORTNAME%%/active-response/bin
+@dir %%PORTNAME%%/active-response
+@dir %%PORTNAME%%/agentless
+@dir %%PORTNAME%%/bin
+@dir %%PORTNAME%%/etc/shared
+@dir %%PORTNAME%%/etc
+@dir %%PORTNAME%%/queue/rootcheck
+@dir %%PORTNAME%%/rules
+@dir %%PORTNAME%%/tmp
 @mode 770
-@dirrmtry %%PORTNAME%%/var/run
+@dir %%PORTNAME%%/var/run
 @mode 550
-@dirrmtry %%PORTNAME%%/var
+@dir %%PORTNAME%%/var
 @owner ossec
 @mode 770
-@dirrmtry %%PORTNAME%%/queue/alerts
-@dirrmtry %%PORTNAME%%/queue/ossec
+@dir %%PORTNAME%%/queue/alerts
+@dir %%PORTNAME%%/queue/ossec
 @mode 750
-@dirrmtry %%PORTNAME%%/queue/fts
-@dirrmtry %%PORTNAME%%/queue/syscheck
-@dirrmtry %%PORTNAME%%/queue/diff
-@dirrmtry %%PORTNAME%%/queue/agentless
-@dirrmtry %%PORTNAME%%/stats
-@dirrmtry %%PORTNAME%%/logs/alerts
-@dirrmtry %%PORTNAME%%/logs/archives
-@dirrmtry %%PORTNAME%%/logs/firewall
-@dirrmtry %%PORTNAME%%/logs
+@dir %%PORTNAME%%/queue/fts
+@dir %%PORTNAME%%/queue/syscheck
+@dir %%PORTNAME%%/queue/diff
+@dir %%PORTNAME%%/queue/agentless
+@dir %%PORTNAME%%/stats
+@dir %%PORTNAME%%/logs/alerts
+@dir %%PORTNAME%%/logs/archives
+@dir %%PORTNAME%%/logs/firewall
+@dir %%PORTNAME%%/logs
 @owner ossecr
-@dirrmtry %%PORTNAME%%/queue/agent-info
-@dirrmtry %%PORTNAME%%/queue/rids
+@dir %%PORTNAME%%/queue/agent-info
+@dir %%PORTNAME%%/queue/rids
 @owner ossec
 @mode 550
-@dirrmtry %%PORTNAME%%/queue
+@dir %%PORTNAME%%/queue
 @owner root
 @mode 550
-@dirrmtry %%PORTNAME%%
+@dir %%PORTNAME%%