From scheidell@secnap.net  Mon Nov 21 22:24:06 2011
Return-Path: <scheidell@secnap.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40D3F1065670;
	Mon, 21 Nov 2011 22:24:06 +0000 (UTC)
	(envelope-from scheidell@secnap.net)
Received: from mx1.secnap.com.ionspam.net (mx1.secnap.com.ionspam.net [204.89.241.253])
	by mx1.freebsd.org (Postfix) with ESMTP id F3F588FC08;
	Mon, 21 Nov 2011 22:24:05 +0000 (UTC)
Received: from mx1.secnap.com.ionspam.net (mx1.secnap.com.ionspam.net [10.70.1.253])
	by mx1.secnap.com.ionspam.net (Postfix) with ESMTP id 681BF621C0E;
	Mon, 21 Nov 2011 17:04:39 -0500 (EST)
Received: from scanner.secnap.net (unknown [10.70.1.4])
	by mx1.secnap.com.ionspam.net (Postfix) with ESMTP id 77569621C0C;
	Mon, 21 Nov 2011 17:04:38 -0500 (EST)
Received: by scanner.secnap.net (Postfix, from userid 1001)
	id 708641D3A9; Mon, 21 Nov 2011 17:04:38 -0500 (EST)
Message-Id: <20111121220438.708641D3A9@scanner.secnap.net>
Date: Mon, 21 Nov 2011 17:04:38 -0500 (EST)
From: Michael Scheidell <scheidell@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: zi@freebsd.org
Subject: [UPDATE] security/snort: add snortsam patches
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         162740
>Category:       ports
>Synopsis:       [UPDATE] security/snort: add snortsam patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 21 22:30:09 UTC 2011
>Closed-Date:    Wed Dec 14 00:59:49 UTC 2011
>Last-Modified:  Wed Dec 14 01:00:24 UTC 2011
>Originator:     Michael Scheidell
>Release:        FreeBSD 6.4-RELEASE-p3 i386
>Organization:
SECNAP Network Security Corp
>Environment:
System: FreeBSD scanner.secnap.net 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #1: Thu May 7 14:59:07 EDT 2009 jscheidell@scanner.secnap.net:/usr/obj/usr/src/sys/IONHACKER i386

>Description:
	patch adds snortsam back into snort 2.9.1.2.
	Currently, snortsam patch resides on an unoffical site, but first site in list is official one
	for when it is updated.  tested on amd64/7.4 in production envirnoment. builds, package builds
	package uninstalls.

>How-To-Repeat:
	select snortsam in make.conf
>Fix:
	patches, based on unofficial snortsam patches for 2.9.1


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/snort/Makefile,v
retrieving revision 1.141
diff -u -r1.141 Makefile
--- Makefile	25 Oct 2011 20:11:35 -0000	1.141
+++ Makefile	21 Nov 2011 21:58:04 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.9.1.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/snort/snort \
 		http://people.rit.edu/rpsfa/distfiles/
@@ -175,10 +176,10 @@
 .endif
 
 .if defined(WITH_SNORTSAM)
-BROKEN=		snortsam patches not available for 2.9.1 yet
 USE_AUTOTOOLS+=	automake
-PATCH_SITES+=	http://www.snortsam.net/files/snort-plugin/:snortsam
-PATCHFILES+=	snortsam-2.9.1.diff.gz:snortsam
+PATCH_SITES+=	http://www.snortsam.net/files/snort-plugin/:snortsam \
+		http://www.secnap.com/downloads/:snortsam
+PATCHFILES+=	snortsam-2.9.1.2.diff.gz:snortsam
 .endif
 
 post-patch:
@@ -227,6 +228,7 @@
 	@cd ${LOCALBASE}/lib && ${MV} snort_dynamicpreprocessor/* snort/dynamicpreprocessor
 	@cd ${LOCALBASE}/lib && ${RMDIR} snort_dynamic*
 	@${MKDIR} ${LOCALBASE}/libdata/pkgconfig/ && ${MV} ${LOCALBASE}/lib/pkgconfig/snort.pc ${LOCALBASE}/libdata/pkgconfig/snort.pc
+	${MV} ${LOCALBASE}/lib/pkgconfig/snort_preproc.pc ${LOCALBASE}/libdata/pkgconfig/
 	@${RMDIR} ${LOCALBASE}/lib/pkgconfig
 .endif
 	@${LIBTOOL} --finish ${LOCALBASE}/lib/snort/dynamicpreprocessor
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/snort/distinfo,v
retrieving revision 1.74
diff -u -r1.74 distinfo
--- distinfo	21 Nov 2011 18:27:00 -0000	1.74
+++ distinfo	21 Nov 2011 21:58:04 -0000
@@ -1,2 +1,4 @@
-SHA256 (snort-2.9.1.2.tar.gz) = 04727150f7cd85719d62ce87f9792582d641adf9d7d4b357bb362c8322095d25
+SHA256 (snort-2.9.1.2.tar.gz) = eac98be8138f9debdcc8f77061dab1950e88fa40c18311ddbab0a329852375f5
 SIZE (snort-2.9.1.2.tar.gz) = 6282888
+SHA256 (snortsam-2.9.1.2.diff.gz) = 712017ee8155c28469de81d7a579899034b2965617fd3c29bac03c1a1484067e
+SIZE  (snortsam-2.9.1.2.diff.gz) = 28902
______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.spammertrap.com/
______________________________________________________________________  
  
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->zi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 21 22:30:52 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162740 
State-Changed-From-To: open->suspended 
State-Changed-By: linimon 
State-Changed-When: Wed Nov 23 00:21:23 UTC 2011 
State-Changed-Why:  
From misfiled PR ports/162742: 

Date: Mon, 21 Nov 2011 17:59:38 -0500 
From: Ryan Steinmetz <zi@freebsd.org> 
To: Michael Scheidell <scheidell@freebsd.org> 
Cc: FreeBSD-gnats-submit@freebsd.org 
Subject: Re: [UPDATE] security/snort: add snortsam patches 

Waiting for upstream acceptance of the snortsam patch. 

-r 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162740 
State-Changed-From-To: suspended->closed 
State-Changed-By: zi 
State-Changed-When: Wed Dec 14 00:59:48 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162740 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/162740: commit references a PR
Date: Wed, 14 Dec 2011 00:58:37 +0000 (UTC)

 zi          2011-12-14 00:58:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/snort       Makefile distinfo 
   Log:
   - Bring back snortsam patches
   - Do not bump PORTREVISION
   
   PR:             ports/162740
   Submitted by:   Michael Scheidell <scheidell@freebsd.org>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.142     +1 -2      ports/security/snort/Makefile
   1.76      +2 -0      ports/security/snort/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
