From scheidell@secnap.net  Mon Apr  9 19:12:39 2012
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 045CF106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Apr 2012 19:12:39 +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 C748A8FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Apr 2012 19:12:38 +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 B5635621C2D;
	Mon,  9 Apr 2012 15:12:32 -0400 (EDT)
Received: from scanner.secnap.net (unknown [10.70.1.4])
	by mx1.secnap.com.ionspam.net (Postfix) with ESMTP id BBD6A621C09;
	Mon,  9 Apr 2012 15:12:31 -0400 (EDT)
Received: by scanner.secnap.net (Postfix, from userid 1001)
	id A07211D434; Mon,  9 Apr 2012 15:12:31 -0400 (EDT)
Message-Id: <20120409191231.A07211D434@scanner.secnap.net>
Date: Mon,  9 Apr 2012 15:12:31 -0400 (EDT)
From: Michael Scheidell <scheidell@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Frank@snortsam.net
Subject: [PATCH] unbreak snort WITH_SNORTSAM
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166798
>Category:       ports
>Synopsis:       [PATCH] unbreak security/snort WITH_SNORTSAM
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 09 19:20:14 UTC 2012
>Closed-Date:    Fri Apr 20 21:58:22 UTC 2012
>Last-Modified:  Fri Apr 20 22:00:14 UTC 2012
>Originator:     Michael Scheidell
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
SECNAP Network Security
>Environment:

>Description:

- Unbreak snort when WITH_SNORTSAM defined
- No PORTREVISION bump

>How-To-Repeat:

make -DWITH_SNORTSAM.

>Fix:

this patch.
patch is currenty hosted in my public freebsd directory for testing but does call official source first.
patch has been looked at, and tested in house, and published on several email lists as well.
tinderbox logs show no leftovers, all compiled just fine.
(Frank: location and checksum below, please put into usual place. Thanks)

--- snortsam.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/snort/Makefile,v
retrieving revision 1.153
diff -u -r1.153 Makefile
--- Makefile	30 Mar 2012 15:26:53 -0000	1.153
+++ Makefile	9 Apr 2012 19:02:51 -0000
@@ -175,11 +175,11 @@
 .endif
 
 .if defined(WITH_SNORTSAM)
-BROKEN=		current snortsam patch results in build failures
 USE_AUTOTOOLS+=	automake
 USE_GNOME=	pkgconfig
-PATCH_SITES+=	http://www.snortsam.net/files/snort-plugin/:snortsam
-PATCHFILES+=	snortsam-2.9.1.2.diff.gz:snortsam
+PATCH_SITES+=	http://www.snortsam.net/files/snort-plugin/:snortsam \
+		http://people.freebsd.org/~scheidell/:snortsam
+PATCHFILES+=	snortsam-2.9.2.2.diff.gz:snortsam
 .endif
 
 post-patch:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/snort/distinfo,v
retrieving revision 1.79
diff -u -r1.79 distinfo
--- distinfo	27 Mar 2012 23:14:20 -0000	1.79
+++ distinfo	9 Apr 2012 19:02:51 -0000
@@ -1,4 +1,4 @@
 SHA256 (snort-2.9.2.2.tar.gz) = 63f4eeee24d79e4a4e4b573e085d0d2fd78fcf3b7ea730c37eab7b47fcd9b954
 SIZE (snort-2.9.2.2.tar.gz) = 6529966
-SHA256 (snortsam-2.9.1.2.diff.gz) = 712017ee8155c28469de81d7a579899034b2965617fd3c29bac03c1a1484067e
-SIZE (snortsam-2.9.1.2.diff.gz) = 28902
+SHA256 (snortsam-2.9.2.2.diff.gz) = 61c6104778a1cd2d0795be0a7b3d67460955e5ffab392852a930b167c1fe27f2
+SIZE (snortsam-2.9.2.2.diff.gz) = 28987
--- snortsam.patch ends here ---

______________________________________________________________________
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: zi 
Responsible-Changed-When: Mon Apr 9 22:34:37 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166798 
State-Changed-From-To: open->analyzed 
State-Changed-By: zi 
State-Changed-When: Thu Apr 12 11:19:45 UTC 2012 
State-Changed-Why:  
Waiting for upstream acceptance of patch.

http://www.freebsd.org/cgi/query-pr.cgi?pr=166798 
State-Changed-From-To: analyzed->closed 
State-Changed-By: zi 
State-Changed-When: Fri Apr 20 21:58:21 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166798: commit references a PR
Date: Fri, 20 Apr 2012 21:58:04 +0000 (UTC)

 zi          2012-04-20 21:57:56 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/snort       Makefile distinfo 
   Log:
   - Unbreak SNORTSAM support
   - Do not bump PORTREVISION for non-default OPTION
   
   PR:             ports/166798
   Submitted by:   scheidell@
   Obtained from:  snortsam.net
   
   Revision  Changes    Path
   1.154     +2 -3      ports/security/snort/Makefile
   1.80      +2 -2      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:
