From toxa@ank-pki.ru  Sat Oct 21 11:12:09 2006
Return-Path: <toxa@ank-pki.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 453D116A407
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Oct 2006 11:12:09 +0000 (UTC)
	(envelope-from toxa@ank-pki.ru)
Received: from mail.ank-pki.ru (mercury.ank-pki.ru [213.170.76.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6BC3743D73
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Oct 2006 11:12:03 +0000 (GMT)
	(envelope-from toxa@ank-pki.ru)
Message-Id: <20061021111202.7724F78F79@mail.ank-pki.ru>
Date: Sat, 21 Oct 2006 15:12:02 +0400 (MSD)
From: Anton Karpov <toxa@toxahost.ru>
Reply-To: Anton Karpov <toxa@toxahost.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: vanhu@netasq.com
Subject: PORT UPDATE: net/scapy (+features)
X-Send-Pr-Version: 3.113
X-GNATS-Notify: vanhu@netasq.com

>Number:         104649
>Category:       ports
>Synopsis:       PORT UPDATE: net/scapy (+features)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 21 11:20:25 GMT 2006
>Closed-Date:    Sun Nov 05 08:22:59 CET 2006
>Last-Modified:  Sun Nov  5 07:30:22 GMT 2006
>Originator:     Anton Karpov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD laptoxa.toxa.lan 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Wed Oct 18 15:11:10 MSD 2006     root@laptoxa.toxa.lan:/usr/obj/usr/src/sys/LAPTOXA  i386


>Description:
Current net/scapy port is outdated, and missing some nice features. With this patch, you are able not only to install scapy itself, but also install all third-party modules which scapy may depend on to use some of its features, like pdf graphs drawing, WEP decrypting, and so on. With new OPTIONS you can install a full-featured scapy port.
>How-To-Repeat:
>Fix:

please see the following patch

ps: maintainer is CC'ed

--- scapy.diff begins here ---
diff -Naur scapy.orig/Makefile scapy/Makefile
--- scapy.orig/Makefile	Sat Oct 21 14:15:55 2006
+++ scapy/Makefile	Sat Oct 21 14:49:17 2006
@@ -7,7 +7,7 @@
 # TODO: - configurable --enable-xxx for various additional dependancies
 
 PORTNAME=	scapy
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
@@ -18,15 +18,33 @@
 		${PYTHON_SITELIBDIR}/pcap.py:${PORTSDIR}/net/py-pcap
 
 MAN1=		scapy.1
-MANCOMPRESSED=	yes
+MANCOMPRESSED=	no
 
 PLIST_FILES=	bin/scapy
 
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
+OPTIONS=	PYX "Support for PostScript and PDF graphs drawing" off \
+		PYCRYPTO "Support for py-crypto for WEP decoding" off \
+		PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PYX)
+RUN_DEPENDS+=	 ${PYTHON_SITELIBDIR}/pyx/__init__.py:${PORTSDIR}/graphics/py-PyX
+.endif
+
+.if defined(WITH_PYCRYPTO)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
+.endif
+
+.if defined(WITH_PYGNUPLOT)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot
+.endif
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scapy.py ${PREFIX}/bin/scapy
-	${INSTALL_MAN} ${WRKSRC}/scapy.1.gz ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/scapy.1 ${MAN1PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Naur scapy.orig/distinfo scapy/distinfo
--- scapy.orig/distinfo	Sat Oct 21 14:15:55 2006
+++ scapy/distinfo	Sat Oct 21 14:17:59 2006
@@ -1,3 +1,3 @@
-MD5 (scapy-1.0.4.tar.gz) = c156668cfab4c1fde276f81e0b85b5d9
-SHA256 (scapy-1.0.4.tar.gz) = 340bebb26bbf8cb37bdbcfb7b8df9225ad384a0b3f0b33b55ca0b8ba6c9a3b02
-SIZE (scapy-1.0.4.tar.gz) = 132677
+MD5 (scapy-1.0.5.tar.gz) = b094a03472375c3add5415345b8d79d6
+SHA256 (scapy-1.0.5.tar.gz) = a8a77854dfdc6cee71344527510e64d1985222d20637c08f0b46b8d709c2e766
+SIZE (scapy-1.0.5.tar.gz) = 144746
--- scapy.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Oct 21 11:20:37 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: VANHULLEBUS Yvan <vanhu@netasq.com>
To: Anton Karpov <toxa@toxahost.ru>
Cc: bug-followup@FreeBSD.org
Subject: Re:  ports/104649: PORT UPDATE: net/scapy (+features)
Date: Mon, 23 Oct 2006 10:49:52 +0200

 On Sat, Oct 21, 2006 at 11:20:30AM +0000, Edwin Groothuis wrote:
 > Maintainer of net/scapy,
 > 
 > Please note that PR ports/104649 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/104649
 
 The patch is ok for me, thanks for it !
 
 
 Yvan.
 
 -- 
 NETASQ
 http://www.netasq.com
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Mon Oct 23 13:40:33 UTC 2006 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104649 
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: dinoex 
Responsible-Changed-When: Sun Nov 5 08:12:02 CET 2006 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104649 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Sun Nov 5 08:22:29 CET 2006 
State-Changed-Why:  
committed, thanks. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104649: commit references a PR
Date: Sun,  5 Nov 2006 07:22:11 +0000 (UTC)

 dinoex      2006-11-05 07:22:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/scapy            Makefile distinfo 
   Log:
   - update to 1.0.5
   - new OPTIONS
   PR:             104649
   Submitted by:   Anton Karpov
   Approved by:    VANHULLEBUS Yvan (maintainer)
   
   Revision  Changes    Path
   1.3       +22 -4     ports/net/scapy/Makefile
   1.3       +3 -3      ports/net/scapy/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:
