From nobody@FreeBSD.org  Mon Jul 20 08:30:34 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86F1D1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Jul 2009 08:30:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 74B1D8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Jul 2009 08:30:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6K8UXVx008921
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Jul 2009 08:30:33 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n6K8UX8S008920;
	Mon, 20 Jul 2009 08:30:33 GMT
	(envelope-from nobody)
Message-Id: <200907200830.n6K8UX8S008920@www.freebsd.org>
Date: Mon, 20 Jul 2009 08:30:33 GMT
From: Aurlien Ansel <aurelien.ansel@netasq.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [scapy] cleaner patch for http://www.freebsd.org/cgi/query-pr.cgi?pr=136798
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         136924
>Category:       ports
>Synopsis:       net/scapy: cleaner patch for http://www.freebsd.org/cgi/query-pr.cgi?pr=136798
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 20 08:40:05 UTC 2009
>Closed-Date:    Tue Jul 28 14:12:00 UTC 2009
>Last-Modified:  Tue Jul 28 14:20:04 UTC 2009
>Originator:     Aurlien Ansel
>Release:        7.2-STABLE
>Organization:
NETASQ
>Environment:
FreeBSD aureliena2.netasq.com 7.2-STABLE FreeBSD 7.2-STABLE #13: Thu Jul  2 18:18:32 CEST 2009     root@aureliena2.netasq.com:/usr/obj/usr/src/sys/NOYAU  i386
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rNu ./Makefile /usr/ports/net/scapy/Makefile
--- ./Makefile	2009-07-15 18:20:19.000000000 +0200
+++ /usr/ports/net/scapy/Makefile	2009-07-06 16:33:06.000000000 +0200
@@ -8,7 +8,7 @@
 
 PORTNAME=	scapy
 PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
diff -rNu ./files/patch-scapy-sendrecv.py /usr/ports/net/scapy/files/patch-scapy-sendrecv.py
--- ./files/patch-scapy-sendrecv.py	2009-07-15 18:22:54.000000000 +0200
+++ /usr/ports/net/scapy/files/patch-scapy-sendrecv.py	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- scapy/sendrecv.py.orig	2009-07-15 18:19:31.000000000 +0200
-+++ scapy/sendrecv.py	2009-07-15 18:19:46.000000000 +0200
-@@ -9,7 +9,7 @@
- from arch import *
- from config import conf
- from packet import Gen
--from utils import warning
-+from utils import warning,PcapReader
- import plist
- from error import log_runtime,log_interactive
- 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Mon Jul 20 14:58:03 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136924 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Tue Jul 28 14:11:59 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/136924: commit references a PR
Date: Tue, 28 Jul 2009 14:11:38 +0000 (UTC)

 amdmi3      2009-07-28 14:11:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/scapy            Makefile 
   Added files:
     net/scapy/files      patch-scapy-sendrecv.py 
   Log:
   - Fix a Python import when importing of a pcap file in scapy
   
   PR:             136798, 136924
   Submitted by:   Aurélien Ansel <aurelien.ansel@netasq.com>
   Approved by:    VANHULLEBUS Yvan <vanhu@netasq.com> (maintainer via private email)
   
   Revision  Changes    Path
   1.9       +1 -1      ports/net/scapy/Makefile
   1.1       +11 -0     ports/net/scapy/files/patch-scapy-sendrecv.py (new)
 _______________________________________________
 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:
