Index: head/devel/libhtp/files/patch-htp__htp_util.c =================================================================== --- head/devel/libhtp/files/patch-htp__htp_util.c (revision 334656) +++ head/devel/libhtp/files/patch-htp__htp_util.c (nonexistent) @@ -1,22 +0,0 @@ ---- ./htp/htp_util.c.orig 2012-10-09 18:53:48.000000000 -0400 -+++ ./htp/htp_util.c 2012-10-09 18:54:31.000000000 -0400 -@@ -2099,7 +2099,8 @@ - len += bstr_len(hl->line); - } - -- len += bstr_len(tx->request_headers_sep); -+ if (tx->request_headers_sep) -+ len += bstr_len(tx->request_headers_sep); - - request_headers_raw = bstr_alloc(len); - if (request_headers_raw == NULL) { -@@ -2112,7 +2113,8 @@ - bstr_add_noex(request_headers_raw, hl->line); - } - -- bstr_add_noex(request_headers_raw, tx->request_headers_sep); -+ if (tx->request_headers_sep) -+ bstr_add_noex(request_headers_raw, tx->request_headers_sep); - - return request_headers_raw; - } Property changes on: head/devel/libhtp/files/patch-htp__htp_util.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libhtp/Makefile =================================================================== --- head/devel/libhtp/Makefile (revision 334656) +++ head/devel/libhtp/Makefile (revision 334657) @@ -1,32 +1,34 @@ # $FreeBSD$ PORTNAME= libhtp -PORTVERSION= 0.3.0 -PORTREVISION= 2 +PORTVERSION= 0.5.9 CATEGORIES= devel -#MASTER_SITES= # This port uses github MAINTAINER= koobs@FreeBSD.org COMMENT= Security-aware parser for the HTTP protocol +LICENSE= BSD + USE_GITHUB= yes GH_ACCOUNT= ironbee -GH_COMMIT= a334539 +GH_COMMIT= f5f3c5c +USES= pkgconfig pathfix iconv USE_AUTOTOOLS= libtool autoheader aclocal ACLOCAL_ARGS= -Im4 USE_LDCONFIG= yes -USES= pkgconfig pathfix iconv 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 @cd ${WRKSRC} && ${SH} ./autogen.sh + +regression-test: build + @cd ${WRKSRC} && ${MAKE} check .include Index: head/devel/libhtp/distinfo =================================================================== --- head/devel/libhtp/distinfo (revision 334656) +++ head/devel/libhtp/distinfo (revision 334657) @@ -1,2 +1,2 @@ -SHA256 (libhtp-0.3.0.tar.gz) = 5ea1c8c7b230113dd293c8d04a278db2c0ff2d894b158a578dbee15ab6a1d552 -SIZE (libhtp-0.3.0.tar.gz) = 397501 +SHA256 (libhtp-0.5.9.tar.gz) = b67f236a25abc197069260d454c7a1b16198be21338068ab57a0a156ec18198d +SIZE (libhtp-0.5.9.tar.gz) = 5764911 Property changes on: head/devel/libhtp/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/devel/libhtp/pkg-plist =================================================================== --- head/devel/libhtp/pkg-plist (revision 334656) +++ head/devel/libhtp/pkg-plist (revision 334657) @@ -1,17 +1,23 @@ -include/htp/hooks.h +include/htp/htp_config.h +include/htp/htp_connection_parser.h +include/htp/htp_core.h +include/htp/htp_list.h +include/htp/htp_table.h +include/htp/htp_transaction.h +include/htp/htp_version.h +include/htp/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_utf8_decoder.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.5.9.so +lib/libhtp-0.5.9.so.1 lib/libhtp.a lib/libhtp.la lib/libhtp.so libdata/pkgconfig/htp.pc @dirrm include/htp Property changes on: head/devel/libhtp/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property