svn commit: r334049 - in head: devel/libhtp www www/libhtp-suricata www/libhtp-suricata/files

[Kubilay Kocak]

Author: koobs
Date: Sun Nov 17 02:51:46 2013
New Revision: 334049
URL: http://svnweb.freebsd.org/changeset/ports/334049

Log:
  www/libhtp-suricata: Copy from devel/libhtp, Update (downgrade) to 0.2.14
  
  Prepare to switch security/suricata to the version of libhtp recommended
  by upstream. This also frees devel/libhtp up for an update, which can be
  used for the Suricata 2.x branch and onward.
  
  www/libhtp-suricata:
  
  - Update (downgrade) to 0.2.14
  - Use the correct and supported libhtp repo from Suricata
  - Enable STAGE support
  - Update pkg-plist
  - Take maintainership
  - Remove unnecessary patch (htp_util.c)
  - qa: Add CONFLICTS
  - qa: Use our AUTOTOOLS framework completely to prepare the build
  - qa: Patch htp.pc.in file for proper pkg-config versioning
  
  devel/libhtp:
  
  - Take maintainership
  - qa: Add CONFLICTS
  
  Reviewed by:	wxs, mva, Johannes Meixner
  Approved by:	wxs (maintainer)

Added:
  head/www/libhtp-suricata/
     - copied from r333363, head/devel/libhtp/
  head/www/libhtp-suricata/files/patch-htp.pc.in   (contents, props changed)
Deleted:
  head/www/libhtp-suricata/files/patch-htp__htp_util.c
Modified:
  head/devel/libhtp/Makefile
  head/www/Makefile
  head/www/libhtp-suricata/Makefile
  head/www/libhtp-suricata/distinfo   (contents, props changed)
  head/www/libhtp-suricata/pkg-plist   (contents, props changed)

Modified: head/devel/libhtp/Makefile
==============================================================================
--- head/devel/libhtp/Makefile	Sun Nov 17 02:30:26 2013	(r334048)
+++ head/devel/libhtp/Makefile	Sun Nov 17 02:51:46 2013	(r334049)
@@ -6,7 +6,7 @@ PORTREVISION=	2
 CATEGORIES=	devel
 #MASTER_SITES=	# This port uses github
 
-MAINTAINER=	wxs at FreeBSD.org
+MAINTAINER=	koobs at FreeBSD.org
 COMMENT=	Security-aware parser for the HTTP protocol
 
 USE_GITHUB=	yes
@@ -22,6 +22,8 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
 		${ICONV_LIB}
 
+CONFLICTS_INSTALL=	libhtp-suricata-*
+
 NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -Ee 's,^(pkgconfigdir = ).*,\1$$(exec_prefix)/libdata/pkgconfig,' ${WRKSRC}/Makefile.am

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Sun Nov 17 02:30:26 2013	(r334048)
+++ head/www/Makefile	Sun Nov 17 02:51:46 2013	(r334049)
@@ -388,6 +388,7 @@
     SUBDIR += libecap
     SUBDIR += libepc
     SUBDIR += libgtkhtml
+    SUBDIR += libhtp-suricata
     SUBDIR += libmicrohttpd
     SUBDIR += libwww
     SUBDIR += libxul

Modified: head/www/libhtp-suricata/Makefile
==============================================================================
--- head/devel/libhtp/Makefile	Sun Nov 10 01:27:27 2013	(r333363)
+++ head/www/libhtp-suricata/Makefile	Sun Nov 17 02:51:46 2013	(r334049)
@@ -1,28 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	libhtp
-PORTVERSION=	0.3.0
-PORTREVISION=	2
-CATEGORIES=	devel
-#MASTER_SITES=	# This port uses github
+PORTVERSION=	0.2.14
+CATEGORIES=	www security
+PKGNAMESUFFIX=	-suricata
 
-MAINTAINER=	wxs at FreeBSD.org
+MAINTAINER=	koobs at FreeBSD.org
 COMMENT=	Security-aware parser for the HTTP protocol
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	ironbee
-GH_COMMIT=	a334539
+GH_ACCOUNT=	inliniac
+GH_COMMIT=	0294c27
 
-USE_AUTOTOOLS=	libtool autoheader aclocal
-ACLOCAL_ARGS=	-Im4
+USES=		pkgconfig pathfix
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake libtoolize
 USE_LDCONFIG=	yes
-USES=		pkgconfig pathfix iconv
 
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
-		${ICONV_LIB}
+CONFLICTS_INSTALL=	libhtp-[0-9]*
+
+PATHFIX_MAKEFILEIN=	Makefile.am
+AUTOMAKE_ARGS+=		--force-missing --add-missing
+LIBTOOLIZE_ARGS+=	--force
 
-NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -Ee 's,^(pkgconfigdir = ).*,\1$$(exec_prefix)/libdata/pkgconfig,' ${WRKSRC}/Makefile.am
 	@cd ${WRKSRC} && ${SH} ./autogen.sh

Modified: head/www/libhtp-suricata/distinfo
==============================================================================
--- head/devel/libhtp/distinfo	Sun Nov 10 01:27:27 2013	(r333363)
+++ head/www/libhtp-suricata/distinfo	Sun Nov 17 02:51:46 2013	(r334049)
@@ -1,2 +1,2 @@
-SHA256 (libhtp-0.3.0.tar.gz) = 5ea1c8c7b230113dd293c8d04a278db2c0ff2d894b158a578dbee15ab6a1d552
-SIZE (libhtp-0.3.0.tar.gz) = 397501
+SHA256 (libhtp-0.2.14.tar.gz) = 208796e883fec748c13e55291b99fa3c70e6ba70e7ea2581368d7563429e22e5
+SIZE (libhtp-0.2.14.tar.gz) = 139398

Added: head/www/libhtp-suricata/files/patch-htp.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/libhtp-suricata/files/patch-htp.pc.in	Sun Nov 17 02:51:46 2013	(r334049)
@@ -0,0 +1,11 @@
+--- ./htp.pc.in.orig	2013-08-31 19:51:21.584289198 +1000
++++ ./htp.pc.in	2013-08-31 19:51:30.724208312 +1000
+@@ -5,7 +5,7 @@
+ 
+ Name: HTP
+ Description: HTTP parser
+-Version: 0.2.X
++Version: 0.2.14
+ Libs: -L${libdir} -lhtp
+ Cflags: -I${includedir}/htp -I${libdir}/htp/include
+ 

Modified: head/www/libhtp-suricata/pkg-plist
==============================================================================
--- head/devel/libhtp/pkg-plist	Sun Nov 10 01:27:27 2013	(r333363)
+++ head/www/libhtp-suricata/pkg-plist	Sun Nov 17 02:51:46 2013	(r334049)
@@ -1,15 +1,11 @@
 include/htp/hooks.h
 include/htp/htp_decompressors.h
 include/htp/bstr.h
-include/htp/bstr_builder.h
 include/htp/utf8_decoder.h
 include/htp/dslib.h
 include/htp/htp.h
-include/htp/htp_base64.h
-include/htp/htp_multipart.h
-include/htp/htp_urlencoded.h
-lib/libhtp-0.3.so
-lib/libhtp-0.3.so.1
+lib/libhtp-0.2.so
+lib/libhtp-0.2.so.1
 lib/libhtp.a
 lib/libhtp.la
 lib/libhtp.so