From owner-svn-ports-all@FreeBSD.ORG Wed Oct 10 11:42:05 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A157FCD; Wed, 10 Oct 2012 11:42:05 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 579548FC0A; Wed, 10 Oct 2012 11:42:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9ABg5Tm019167; Wed, 10 Oct 2012 11:42:05 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9ABg5nt019162; Wed, 10 Oct 2012 11:42:05 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201210101142.q9ABg5nt019162@svn.freebsd.org> From: Ryan Steinmetz Date: Wed, 10 Oct 2012 11:42:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305642 - in head/security/suricata: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 11:42:05 -0000 X-List-Received-Date: Wed, 10 Oct 2012 11:42:05 -0000 Author: zi Date: Wed Oct 10 11:42:04 2012 New Revision: 305642 URL: http://svn.freebsd.org/changeset/ports/305642 Log: - Update to 1.3.2 Added: head/security/suricata/files/patch-src__app-layer-htp.c (contents, props changed) Modified: head/security/suricata/Makefile head/security/suricata/distinfo head/security/suricata/files/patch-src__suricata-common.h Modified: head/security/suricata/Makefile ============================================================================== --- head/security/suricata/Makefile Wed Oct 10 11:41:35 2012 (r305641) +++ head/security/suricata/Makefile Wed Oct 10 11:42:04 2012 (r305642) @@ -6,7 +6,7 @@ # PORTNAME= suricata -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ \ http://mirrors.rit.edu/zi/ Modified: head/security/suricata/distinfo ============================================================================== --- head/security/suricata/distinfo Wed Oct 10 11:41:35 2012 (r305641) +++ head/security/suricata/distinfo Wed Oct 10 11:42:04 2012 (r305642) @@ -1,2 +1,2 @@ -SHA256 (suricata-1.3.1.tar.gz) = 6fe35cca4e3eba34c95ed972ab1157e95c9f3d6ac9c9bb0996344db5a7107e8d -SIZE (suricata-1.3.1.tar.gz) = 2345619 +SHA256 (suricata-1.3.2.tar.gz) = 6fc3b417368069bc8e7901967600c66c8324fdd5bb4cd5bc684e8063e0164b5a +SIZE (suricata-1.3.2.tar.gz) = 2346849 Added: head/security/suricata/files/patch-src__app-layer-htp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/suricata/files/patch-src__app-layer-htp.c Wed Oct 10 11:42:04 2012 (r305642) @@ -0,0 +1,50 @@ +--- ./src/app-layer-htp.c.orig 2012-10-03 09:44:25.000000000 -0400 ++++ ./src/app-layer-htp.c 2012-10-09 18:57:24.000000000 -0400 +@@ -657,14 +657,15 @@ + if (!(hstate->flags & HTP_FLAG_STATE_OPEN)) { + SCLogDebug("opening htp handle at %p", hstate->connp); + +- htp_connp_open(hstate->connp, NULL, f->sp, NULL, f->dp, 0); ++ htp_connp_open(hstate->connp, NULL, f->sp, NULL, f->dp, &f->startts); + hstate->flags |= HTP_FLAG_STATE_OPEN; + } else { + SCLogDebug("using existing htp handle at %p", hstate->connp); + } + ++ htp_time_t ts = { f->lastts_sec, 0 }; + /* pass the new data to the htp parser */ +- r = htp_connp_req_data(hstate->connp, 0, input, input_len); ++ r = htp_connp_req_data(hstate->connp, &ts, input, input_len); + + switch(r) { + case STREAM_STATE_ERROR: +@@ -693,7 +694,8 @@ + hstate->connp->in_status = STREAM_STATE_CLOSED; + // Call the parsers one last time, which will allow them + // to process the events that depend on stream closure +- htp_connp_req_data(hstate->connp, 0, NULL, 0); ++ htp_time_t ts = { f->lastts_sec, 0 }; ++ htp_connp_req_data(hstate->connp, &ts, NULL, 0); + hstate->flags |= HTP_FLAG_STATE_CLOSED_TS; + SCLogDebug("stream eof encountered, closing htp handle for ts"); + } +@@ -747,7 +749,8 @@ + * reactivate it if necessary) */ + hstate->flags &=~ HTP_FLAG_NEW_BODY_SET; + +- r = htp_connp_res_data(hstate->connp, 0, input, input_len); ++ htp_time_t ts = { f->lastts_sec, 0 }; ++ r = htp_connp_res_data(hstate->connp, &ts, input, input_len); + switch(r) { + case STREAM_STATE_ERROR: + HTPHandleError(hstate); +@@ -774,7 +777,8 @@ + hstate->connp->out_status = STREAM_STATE_CLOSED; + // Call the parsers one last time, which will allow them + // to process the events that depend on stream closure +- htp_connp_res_data(hstate->connp, 0, NULL, 0); ++ htp_time_t ts = { f->lastts_sec, 0 }; ++ htp_connp_res_data(hstate->connp, &ts, NULL, 0); + hstate->flags |= HTP_FLAG_STATE_CLOSED_TC; + } + Modified: head/security/suricata/files/patch-src__suricata-common.h ============================================================================== --- head/security/suricata/files/patch-src__suricata-common.h Wed Oct 10 11:41:35 2012 (r305641) +++ head/security/suricata/files/patch-src__suricata-common.h Wed Oct 10 11:42:04 2012 (r305642) @@ -1,10 +1,12 @@ ---- ./src/suricata-common.h.orig 2012-09-05 21:43:08.000000000 -0400 -+++ ./src/suricata-common.h 2012-09-05 21:46:28.000000000 -0400 -@@ -131,6 +131,8 @@ +--- ./src/suricata-common.h.orig 2012-08-21 02:35:15.000000000 -0400 ++++ ./src/suricata-common.h 2012-09-29 08:41:39.000000000 -0400 +@@ -131,6 +131,10 @@ #include #define BUG_ON(x) assert(!(x)) +#define table_getc(x, y) table_get_c(x, y) ++#define bstr_cmpc(x, y) bstr_cmp_c(x, y) ++#define bstr_tocstr(x) bstr_util_strdup_to_c(x) + /* we need this to stringify the defines which are supplied at compiletime see: http://gcc.gnu.org/onlinedocs/gcc-3.4.1/cpp/Stringification.html#Stringification */