From tom@tomjudge.com  Fri Nov 12 15:31:46 2010
Return-Path: <tom@tomjudge.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 894F0106566C;
	Fri, 12 Nov 2010 15:31:46 +0000 (UTC)
	(envelope-from tom@tomjudge.com)
Received: from tomjudge.vm.bytemark.co.uk (tomjudge.vm.bytemark.co.uk [80.68.91.100])
	by mx1.freebsd.org (Postfix) with ESMTP id 492008FC13;
	Fri, 12 Nov 2010 15:31:46 +0000 (UTC)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by tomjudge.vm.bytemark.co.uk (Postfix) with ESMTP id CDD42DCB3B;
	Fri, 12 Nov 2010 15:31:44 +0000 (GMT)
Received: from tomjudge.vm.bytemark.co.uk ([127.0.0.1])
	by localhost (tomjudge.vm.bytemark.co.uk [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id wGOSl2FRnJjE; Fri, 12 Nov 2010 15:31:37 +0000 (GMT)
Received: from tinderbox.home.tomjudge.com (unknown [192.168.200.5])
	by tomjudge.vm.bytemark.co.uk (Postfix) with SMTP id 8CF34DCB3C;
	Fri, 12 Nov 2010 15:31:36 +0000 (GMT)
Received: by tinderbox.home.tomjudge.com (sSMTP sendmail emulation); Fri, 12 Nov 2010 15:31:42 +0000
Message-Id: <20101112153136.8CF34DCB3C@tomjudge.vm.bytemark.co.uk>
Date: Fri, 12 Nov 2010 15:31:42 +0000
From: "Tom Judge" <tom@tomjudge.com>
Reply-To: Tom Judge <tom@tomjudge.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [patch] Fix build of security/snort when SNORTSAM is enabled.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152171
>Category:       ports
>Synopsis:       [patch] Fix build of security/snort when SNORTSAM is enabled.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    clsung
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 12 15:40:14 UTC 2010
>Closed-Date:    Fri Dec 03 18:55:11 UTC 2010
>Last-Modified:  Fri Dec  3 19:00:19 UTC 2010
>Originator:     Tom Judge
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tinderbox.home.tomjudge.com 8.1-STABLE FreeBSD 8.1-STABLE #0 r213720: Tue Oct 12 14:02:02 UTC 2010 tj@tinderbox.home.tomjudge.com:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

Snort currently depends on autotools110 when Snort Sam output is enabled.

Attached patch fixes the issue.


>How-To-Repeat:
>Fix:

--- security-snort.txt begins here ---
--- Makefile.orig	2010-11-12 14:28:35.000000000 +0000
+++ Makefile	2010-11-12 14:28:49.000000000 +0000
@@ -126,7 +126,7 @@
 .endif
 
 .if defined(WITH_SNORTSAM)
-BUILD_DEPENDS+=		automake>=1.10.3:${PORTSDIR}/devel/automake110
+BUILD_DEPENDS+=		automake>=1.10.3:${PORTSDIR}/devel/automake111
 PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
 PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
 .endif
--- security-snort.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->clsung 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Nov 12 15:40:22 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Koop Mast <kwm@rainbow-runner.nl>
To: bug-followup@FreeBSD.org, tom@tomjudge.com
Cc:  
Subject: Re: ports/152171: [patch] Fix build of security/snort when SNORTSAM
 is enabled.
Date: Fri, 12 Nov 2010 17:21:56 +0100

 --MP_/LZye2IlGsi1eP/Z5UQ4je6Y
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Use autotools macro instead of hard depend on automake.
 Define autotools macro before bsd.port.pre.mk.
 
 --MP_/LZye2IlGsi1eP/Z5UQ4je6Y
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=snort-autofoo.diff
 
 Index: security/snort/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/security/snort/Makefile,v
 retrieving revision 1.124
 diff -a -u -r1.124 Makefile
 --- security/snort/Makefile	15 Sep 2010 18:35:10 -0000	1.124
 +++ security/snort/Makefile	12 Nov 2010 16:10:26 -0000
 @@ -31,6 +31,7 @@
  USE_RC_SUBR=	snort.sh
  SUB_FILES=	pkg-message
  GNU_CONFIGURE=	yes
 +USE_AUTOTOOLS=	# empty
  CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
  PATCH_DIST_STRIP=	-p1
  MAKE_JOBS_UNSAFE=	yes
 @@ -61,7 +62,7 @@
  .endif
  
  .if !defined(WITHOUT_DYNAMIC)
 -USE_AUTOTOOLS=	libtool:22
 +USE_AUTOTOOLS+=	libtool:22
  USE_LDCONFIG=	yes
  CONFIGURE_ARGS+=	--enable-dynamicplugin
  PLIST_SUB+=	DYNAMIC=""
 @@ -126,7 +127,7 @@
  .endif
  
  .if defined(WITH_SNORTSAM)
 -BUILD_DEPENDS+=		automake>=1.10.3:${PORTSDIR}/devel/automake110
 +USE_AUTOTOOLS+=	automake:111
  PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
  PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
  .endif
 
 --MP_/LZye2IlGsi1eP/Z5UQ4je6Y--
State-Changed-From-To: open->closed 
State-Changed-By: kwm 
State-Changed-When: Fri Dec 3 18:54:48 UTC 2010 
State-Changed-Why:  
Committed with maintainer timeout. Thanks. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152171: commit references a PR
Date: Fri,  3 Dec 2010 18:54:38 +0000 (UTC)

 kwm         2010-12-03 18:54:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/snort       Makefile 
   Log:
   Unbreak the build when the SNORTSAM option is selected.
   Change a manual build depend line on automake110 (which is dead)
   to a autotools line.
   
   PR:             ports/152171
   Submitted by:   "Tom Judge" <tom@tomjudge.com>
   Approved by:    maintainer timeout (clsung, 21 days)
   
   Revision  Changes    Path
   1.125     +2 -2      ports/security/snort/Makefile
 _______________________________________________
 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:
