Date: Tue, 1 Mar 2011 12:07:59 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155151: [UPDATE] net/scapy: update to 2.2.0 Message-ID: <201103011207.p21C7xPb028717@red.freebsd.org> Resent-Message-ID: <201103011210.p21CA4ZT077075@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155151 >Category: ports >Synopsis: [UPDATE] net/scapy: update to 2.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 01 12:10:04 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 8.2-STABLE >Organization: >Environment: 8.2-STABLE i386 with python2.7 tested with bundled scapy test framework and custom scripts >Description: - update to 2.2.0 - replace patches in files/ with REINPLACE_CMD equivalents to save couple of inodes >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa scapy.orig/Makefile scapy/Makefile --- scapy.orig/Makefile 2010-07-28 19:44:07.000000000 +0400 +++ scapy/Makefile 2011-03-01 14:21:05.000000000 +0300 @@ -7,7 +7,7 @@ # TODO: - configurable --enable-xxx for various additional dependancies PORTNAME= scapy -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= net MASTER_SITES= http://secdev.org/projects/scapy/files/ @@ -77,13 +77,12 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox .endif -SCAPY_MODULES= nmap.py p0f.py queso.py - post-patch: @${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py - @${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \ - ${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \ - ${WRKSRC}/scapy/config.py \ - ${WRKSRC}/scapy/utils6.py + @${REINPLACE_CMD} "s,/usr/share/,${LOCALBASE}/share/," \ + ${WRKSRC}/scapy/data.py ${WRKSRC}/scapy/utils6.py \ + ${WRKSRC}/scapy/modules/nmap.py + @${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \ + ${WRKSRC}/scapy/modules/p0f.py ${WRKSRC}/scapy/modules/queso.py .include <bsd.port.post.mk> diff -ruNa scapy.orig/distinfo scapy/distinfo --- scapy.orig/distinfo 2010-07-28 19:44:07.000000000 +0400 +++ scapy/distinfo 2011-03-01 13:07:36.000000000 +0300 @@ -1,3 +1,2 @@ -MD5 (scapy-2.1.1.tar.gz) = 7b4452786788cb75ade841c30276a2d3 -SHA256 (scapy-2.1.1.tar.gz) = 7fb576e16c3f05c9be726475382cdbd4c91cdb4277029e92a5cdccf479c2f3eb -SIZE (scapy-2.1.1.tar.gz) = 1924541 +SHA256 (scapy-2.2.0.tar.gz) = c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af +SIZE (scapy-2.2.0.tar.gz) = 972996 diff -ruNa scapy.orig/files/patch-scapy__data.py scapy/files/patch-scapy__data.py --- scapy.orig/files/patch-scapy__data.py 2010-01-06 03:25:50.000000000 +0300 +++ scapy/files/patch-scapy__data.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- ./scapy/data.py.orig 2010-01-05 11:34:28.000000000 +0100 -+++ ./scapy/data.py 2010-01-05 11:35:09.000000000 +0100 -@@ -178,7 +178,7 @@ - IP_PROTOS=load_protocols("/etc/protocols") - ETHER_TYPES=load_ethertypes("/etc/ethertypes") - TCP_SERVICES,UDP_SERVICES=load_services("/etc/services") -- MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf") -+ MANUFDB = load_manuf("%%LOCALBASE%%/share/wireshark/wireshark/manuf") - - - diff -ruNa scapy.orig/files/patch-scapy__modules__nmap.py scapy/files/patch-scapy__modules__nmap.py --- scapy.orig/files/patch-scapy__modules__nmap.py 2010-01-06 03:25:50.000000000 +0300 +++ scapy/files/patch-scapy__modules__nmap.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- ./scapy/modules/nmap.py.orig 2010-01-05 11:35:33.000000000 +0100 -+++ ./scapy/modules/nmap.py 2010-01-05 11:36:28.000000000 +0100 -@@ -13,7 +13,7 @@ - if WINDOWS: - conf.nmap_base=os.environ["ProgramFiles"] + "\\nmap\\nmap-os-fingerprints" - else: -- conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints" -+ conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints" - - - ###################### diff -ruNa scapy.orig/files/patch-scapy__modules__p0f.py scapy/files/patch-scapy__modules__p0f.py --- scapy.orig/files/patch-scapy__modules__p0f.py 2010-01-06 03:25:50.000000000 +0300 +++ scapy/files/patch-scapy__modules__p0f.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,17 +0,0 @@ ---- ./scapy/modules/p0f.py.orig 2010-01-05 11:36:56.000000000 +0100 -+++ ./scapy/modules/p0f.py 2010-01-05 11:37:50.000000000 +0100 -@@ -8,10 +8,10 @@ - from scapy.layers.inet import IP, TCP, TCPOptions - from scapy.packet import NoPayload - --conf.p0f_base ="/etc/p0f/p0f.fp" --conf.p0fa_base ="/etc/p0f/p0fa.fp" --conf.p0fr_base ="/etc/p0f/p0fr.fp" --conf.p0fo_base ="/etc/p0f/p0fo.fp" -+conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp" -+conf.p0fa_base ="%%LOCALBASE%%/etc/p0f/p0fa.fp" -+conf.p0fr_base ="%%LOCALBASE%%/etc/p0f/p0fr.fp" -+conf.p0fo_base ="%%LOCALBASE%%/etc/p0f/p0fo.fp" - - - ############### diff -ruNa scapy.orig/files/patch-scapy__modules__queso.py scapy/files/patch-scapy__modules__queso.py --- scapy.orig/files/patch-scapy__modules__queso.py 2010-01-06 03:25:50.000000000 +0300 +++ scapy/files/patch-scapy__modules__queso.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- ./scapy/modules/queso.py.orig 2010-01-05 11:38:01.000000000 +0100 -+++ ./scapy/modules/queso.py 2010-01-05 11:38:14.000000000 +0100 -@@ -8,7 +8,7 @@ - from scapy.layers.inet import IP,TCP - #from - --conf.queso_base ="/etc/queso.conf" -+conf.queso_base ="%%LOCALBASE%%/etc/queso.conf" - - - ################# diff -ruNa scapy.orig/files/patch-scapy__utils6.py scapy/files/patch-scapy__utils6.py --- scapy.orig/files/patch-scapy__utils6.py 2010-01-06 03:25:50.000000000 +0300 +++ scapy/files/patch-scapy__utils6.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- ./scapy/utils6.py.orig 2010-01-05 11:38:37.000000000 +0100 -+++ ./scapy/utils6.py 2010-01-05 11:39:13.000000000 +0100 -@@ -267,7 +267,7 @@ - Extract the MAC address from a modified EUI-64 constructed IPv6 - address provided and use the IANA oui.txt file to get the vendor. - The database used for the conversion is the one loaded by Scapy, -- based on Wireshark (/usr/share/wireshark/wireshark/manuf) None -+ based on Wireshark (%%LOCALBASE%%/share/wireshark/wireshark/manuf) None - is returned on error, "UNKNOWN" if the vendor is unknown. - """ - mac = in6_addrtomac(addr) diff -ruNa scapy.orig/files/patch-setup.py scapy/files/patch-setup.py --- scapy.orig/files/patch-setup.py 2010-07-28 19:44:07.000000000 +0400 +++ scapy/files/patch-setup.py 2011-03-01 13:11:48.000000000 +0300 @@ -1,9 +1,9 @@ ---- setup.py 2010-04-10 02:42:04.000000000 +0400 -+++ setup.py 2010-07-22 21:17:18.000000000 +0400 -@@ -42,7 +42,7 @@ +--- setup.py.orig 2011-02-28 05:11:55.000000000 +0300 ++++ setup.py 2011-03-01 13:11:36.000000000 +0300 +@@ -47,7 +47,7 @@ setup( name = 'scapy', - version = '2.1.1', + version = '2.2.0', - packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'], + packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'], scripts = SCRIPTS, >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103011207.p21C7xPb028717>