ports/163603: [PATCH]: Update security/suricata

[Wesley Shields]

>Number:         163603
>Category:       ports
>Synopsis:       [PATCH]: Update security/suricata
>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:   Sun Dec 25 03:00:29 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 8.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #4: Fri Sep 30 09:39:27 EDT 2011 root at syn.csh.rit.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
Update security/suricata to the latest release. This patch switches to using
devel/libhtp (I'm committing it shortly), which should make important updates
easier in the future.

>How-To-Repeat:
N/A

>Fix:

Index: Makefile
===================================================================
RCS file: /ncvs/ports/security/suricata/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	19 Jul 2011 21:14:30 -0000	1.8
+++ Makefile	20 Dec 2011 15:38:03 -0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	suricata
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.1
 CATEGORIES=	security
-MASTER_SITES=	http://openinfosecfoundation.org/download/ \
-		http://www6.freebsdbrasil.com.br/~eksffa/l/dev/suricata/
+MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
 MAINTAINER=	eksffa at freebsdbrasil.com.br
 COMMENT=	Open Source next generation IDS/IPS engine by OISF
@@ -19,7 +18,8 @@
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		yaml:${PORTSDIR}/textproc/libyaml \
-		pcap.1:${PORTSDIR}/net/libpcap
+		pcap.1:${PORTSDIR}/net/libpcap \
+		htp-0.2.1:${PORTSDIR}/devel/libhtp
 
 BUILD_DEPENDS+=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
 		pkg-config:${PORTSDIR}/devel/pkg-config
@@ -48,9 +48,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
@@ -69,6 +66,9 @@
 CONFIGURE_ARGS+=	--enable-dag
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -Ee 's|^(install-data-am: )install-pkgconfigDATA|\1|' ${WRKSRC}/libhtp/Makefile.in
+
 pre-install:
 	@${REINPLACE_CMD} -e 's|/etc/suricata|${PREFIX}/etc/suricata|g' ${WRKSRC}/suricata.yaml
 
@@ -82,7 +82,6 @@
 		${CP} -p ${CONFIG_DIR}/${f}-sample ${CONFIG_DIR}/${f} ; \
 	fi
 .endfor
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /ncvs/ports/security/suricata/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	22 Jun 2011 00:29:16 -0000	1.2
+++ distinfo	20 Dec 2011 01:36:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-1.0.3.tar.gz) = df0245181057603a8dc37c937816adecbd8468cc2531d7431525df8205995d92
-SIZE (suricata-1.0.3.tar.gz) = 1639825
+SHA256 (suricata-1.1.1.tar.gz) = 6ff337ca71ca015d50e73a2bb90e02d894b617935482802102648d51b3876fac
+SIZE (suricata-1.1.1.tar.gz) = 2018055
Index: pkg-plist
===================================================================
RCS file: /ncvs/ports/security/suricata/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	1 Sep 2010 15:31:51 -0000	1.1
+++ pkg-plist	20 Dec 2011 14:17:04 -0000
@@ -1,9 +1,3 @@
-lib/libhtp.a
-lib/libhtp-0.2.so
-lib/libhtp-0.2.so.1
-libdata/pkgconfig/htp.pc
-lib/libhtp.la
-lib/libhtp.so
 bin/suricata
 etc/suricata/suricata.yaml
 etc/suricata/suricata.yaml-sample
@@ -11,5 +5,3 @@
 etc/suricata/classification.config
 @unexec /bin/rmdir %D/etc/suricata/rules 2>/dev/null || true
 @unexec /bin/rmdir %D/etc/suricata 2>/dev/null || true
- at unexec echo "completely uninstalling %D/include/htp"
- at unexec /bin/rm -rf %D/include/htp 2>/dev/null || true
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- files/patch-Makefile.in	1 Sep 2010 15:31:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libhtp/Makefile.in.dist	2010-08-30 22:01:03.000000000 -0300
-+++ libhtp/Makefile.in	2010-08-30 22:02:08.000000000 -0300
-@@ -250,7 +250,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = $(GENERIC_LIBRARY_NAME) test
- EXTRA_DIST = ChangeLog COPYING LICENSE LIBHTP_LICENSING_EXCEPTION docs/doxygen.conf docs/QUICK_START
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
- pkgconfig_DATA = htp.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
>Release-Note:
>Audit-Trail:
>Unformatted: