From sunpoet@sunpoet.net  Mon Jul 12 08:56:00 2010
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31995106566B;
	Mon, 12 Jul 2010 08:56:00 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B0C28FC13;
	Mon, 12 Jul 2010 08:55:59 +0000 (UTC)
Received: by pvh1 with SMTP id 1so1872854pvh.13
        for <multiple recipients>; Mon, 12 Jul 2010 01:55:59 -0700 (PDT)
Received: by 10.114.15.2 with SMTP id 2mr15725033wao.67.1278924959233;
        Mon, 12 Jul 2010 01:55:59 -0700 (PDT)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
        by mx.google.com with ESMTPS id s29sm65121816wak.2.2010.07.12.01.55.57
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Mon, 12 Jul 2010 01:55:58 -0700 (PDT)
Received: by sunpoet.net (Postfix, from userid 1000)
	id D974F2AEC61F; Mon, 12 Jul 2010 16:56:22 +0800 (CST)
Message-Id: <20100712085622.D974F2AEC61F@sunpoet.net>
Date: Mon, 12 Jul 2010 16:56:22 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@FreeBSD.org
Subject: [PATCH] security/snort: fetch the source tarball
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         148516
>Category:       ports
>Synopsis:       [PATCH] security/snort: fetch the source tarball
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    clsung
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 12 09:00:20 UTC 2010
>Closed-Date:    Sat Jul 17 13:09:44 UTC 2010
>Last-Modified:  Sat Jul 17 13:10:04 UTC 2010
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Sun Jun 20 12:49:47 CST 2010
>Description:
As source tarball has been moved to Amazon S3, 'make fetch' fails.
Thus, we download the source in pre-fetch: section.

This PR also includes the patch in PR/148484.

Port maintainer (clsung@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- snort-2.8.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/snort/Makefile /usr/ports/sunpoet/snort/Makefile
--- /usr/ports/security/snort/Makefile	2010-07-10 00:28:37.000000000 +0800
+++ /usr/ports/sunpoet/snort/Makefile	2010-07-12 12:57:15.000000000 +0800
@@ -8,8 +8,7 @@
 PORTNAME=	snort
 PORTVERSION=	2.8.6
 CATEGORIES=	security
-MASTER_SITES=	http://www.snort.org/dl/ \
-		http://dl.snort.org/snort-current/
+MASTER_SITES=	# empty
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Lightweight network intrusion detection system
@@ -126,14 +125,15 @@
 .endif
 
 .if defined(WITH_SNORTSAM)
+BUILD_DEPENDS+=		automake>=1.10.1:${PORTSDIR}/devel/automake110
 PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
 PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
 .endif
 
+pre-fetch:
+	@${FETCH_ENV} ${FETCH_BINARY} -Rr -o ${DISTDIR}/${DISTFILES} http://www.snort.org/downloads/14
+
 post-patch:
-.if defined(WITH_SNORTSAM)
-BUILD_DEPENDS+=		automake>=1.10.1:${PORTSDIR}/devel/automake110
-.endif
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} '/SUBDIRS = /s/doc//' ${WRKSRC}/Makefile.in
 .endif
--- snort-2.8.6.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->clsung 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jul 12 09:00:33 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: bug-followup@FreeBSD.org
Cc: clsung@FreeBSD.org
Subject: Re: ports/148516: [PATCH] security/snort: fetch the source tarball
Date: Tue, 13 Jul 2010 01:02:02 +0800

 Hi,
 
 After discussion with clsung@, he agrees to put the source tarball in his
 MASTER_SITE_LOCAL directory. The updated patch is attached.
 
 BR,
 Sunpoet
 
 --- snort-2.8.6.new.patch begins here ---
 diff -ruN --exclude=CVS /usr/ports/security/snort/Makefile /usr/ports/sunpoet/snort/Makefile
 --- /usr/ports/security/snort/Makefile	2010-07-10 00:28:37.000000000 +0800
 +++ /usr/ports/sunpoet/snort/Makefile	2010-07-12 22:10:30.000000000 +0800
 @@ -8,8 +8,7 @@
  PORTNAME=	snort
  PORTVERSION=	2.8.6
  CATEGORIES=	security
 -MASTER_SITES=	http://www.snort.org/dl/ \
 -		http://dl.snort.org/snort-current/
 +MASTER_SITES=	LOCAL/clsung/
  
  MAINTAINER=	clsung@FreeBSD.org
  COMMENT=	Lightweight network intrusion detection system
 @@ -126,14 +125,12 @@
  .endif
  
  .if defined(WITH_SNORTSAM)
 +BUILD_DEPENDS+=		automake>=1.10.1:${PORTSDIR}/devel/automake110
  PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
  PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
  .endif
  
  post-patch:
 -.if defined(WITH_SNORTSAM)
 -BUILD_DEPENDS+=		automake>=1.10.1:${PORTSDIR}/devel/automake110
 -.endif
  .if defined(NOPORTDOCS)
  	@${REINPLACE_CMD} '/SUBDIRS = /s/doc//' ${WRKSRC}/Makefile.in
  .endif
 --- snort-2.8.6.new.patch ends here ---
State-Changed-From-To: open->closed 
State-Changed-By: clsung 
State-Changed-When: Sat Jul 17 13:09:43 UTC 2010 
State-Changed-Why:  
Committed. Thank You. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148516: commit references a PR
Date: Sat, 17 Jul 2010 13:09:37 +0000 (UTC)

 clsung      2010-07-17 13:09:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/snort       Makefile 
   Log:
   - source tar ball go to LOCAL
   - fix WITH_SNORTSAM knob
   
   PR:             ports/148484, ports/148516
   Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet_AT_sunpoet dot net>
   
   Revision  Changes    Path
   1.122     +3 -5      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:
