Attachment 91457 Details for Bug 128802 – scapy-2.0.0.10.patch

[patch] scapy-2.0.0.10.patch

scapy-2.0.0.10.patch (text/plain), 17.03 KB, created by Yi-Jheng Lin on 2008-11-11 21:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yi-Jheng Lin

Created: 2008-11-11 21:30:02 UTC

Size: 17.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/scapy/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- Makefile	24 Apr 2007 14:24:58 -0000	1.5
>+++ Makefile	11 Nov 2008 21:21:18 -0000
>@@ -7,8 +7,7 @@
> # TODO: - configurable --enable-xxx for various additional dependancies
> 
> PORTNAME=	scapy
>-PORTVERSION=	1.1.1
>-PORTREVISION=	1
>+PORTVERSION=	2.0.0.10
> CATEGORIES=	net
> MASTER_SITES=	http://secdev.org/projects/scapy/files/
> 
>@@ -19,12 +18,10 @@
> 		${PYTHON_SITELIBDIR}/pcap.py:${PORTSDIR}/net/py-pcap
> 
> MAN1=		scapy.1
>-MANCOMPRESSED=	no
>+MANCOMPRESSED=	yes
> 
>-PLIST_FILES=	bin/scapy
>-
>-USE_PYTHON=	yes
>-NO_BUILD=	yes
>+USE_PYTHON=	2.5+
>+USE_PYDISTUTILS=yes
> 
> OPTIONS=	PYX "Support for PostScript and PDF graphs drawing" off \
> 		PYCRYPTO "Support for py-crypto for WEP decoding" off \
>@@ -37,7 +34,7 @@
> .include <bsd.port.pre.mk>
> 
> .if defined(WITH_PYX)
>-RUN_DEPENDS+=	 ${PYTHON_SITELIBDIR}/pyx/__init__.py:${PORTSDIR}/graphics/py-PyX
>+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyx/__init__.py:${PORTSDIR}/graphics/py-PyX
> .endif
> 
> .if defined(WITH_PYCRYPTO)
>@@ -49,23 +46,28 @@
> .endif
> 
> .if defined(WITH_P0F_BASE)
>-RUN_DEPENDS+=	${PREFIX}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f
>+RUN_DEPENDS+=	${LOCALBASE}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f
> .endif
> 
> .if defined(WITH_QUESO_BASE)
>-RUN_DEPENDS+=	${PREFIX}/etc/queso.conf:${PORTSDIR}/net/queso
>+RUN_DEPENDS+=	${LOCALBASE}/etc/queso.conf:${PORTSDIR}/net/queso
> .endif
> 
> .if defined(WITH_NMAP)
>-RUN_DEPENDS+=	${PREFIX}/share/nmap/nmap-os-fingerprints:${PORTSDIR}/security/nmap
>+RUN_DEPENDS+=	${LOCALBASE}/share/nmap/nmap-os-fingerprints:${PORTSDIR}/security/nmap
> .endif
> 
> .if defined(WITH_MANUF)
>-RUN_DEPENDS+=	${PREFIX}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
>+RUN_DEPENDS+=	${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
> .endif
> 
>-do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/scapy.py ${PREFIX}/bin/scapy
>-	${INSTALL_MAN} ${WRKSRC}/scapy.1 ${MAN1PREFIX}/man/man1
>+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
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/net/scapy/distinfo,v
>retrieving revision 1.4
>diff -u -r1.4 distinfo
>--- distinfo	17 Apr 2007 19:41:37 -0000	1.4
>+++ distinfo	11 Nov 2008 21:21:18 -0000
>@@ -1,3 +1,3 @@
>-MD5 (scapy-1.1.1.tar.gz) = 8ac720a1bea4304797c713ef1ed063f1
>-SHA256 (scapy-1.1.1.tar.gz) = 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
>-SIZE (scapy-1.1.1.tar.gz) = 147401
>+MD5 (scapy-2.0.0.10.tar.gz) = 41834e40e531b1b51911e34dafb6049e
>+SHA256 (scapy-2.0.0.10.tar.gz) = 56f18529124331067e2758128a8979cdd106b10adf34f560246cb2bf3900102e
>+SIZE (scapy-2.0.0.10.tar.gz) = 182350
>Index: pkg-plist
>===================================================================
>RCS file: pkg-plist
>diff -N pkg-plist
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ pkg-plist	11 Nov 2008 21:21:18 -0000
>@@ -0,0 +1,233 @@
>+bin/UTscapy
>+bin/scapy
>+%%PYTHON_SITELIBDIR%%/scapy/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/all.py
>+%%PYTHON_SITELIBDIR%%/scapy/all.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/all.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/ansmachine.py
>+%%PYTHON_SITELIBDIR%%/scapy/ansmachine.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/ansmachine.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/bsd.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/bsd.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/bsd.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/linux.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/linux.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/linux.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/pcapdnet.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/pcapdnet.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/pcapdnet.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/solaris.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/solaris.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/solaris.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/arch/unix.py
>+%%PYTHON_SITELIBDIR%%/scapy/arch/unix.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/arch/unix.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/as_resolvers.py
>+%%PYTHON_SITELIBDIR%%/scapy/as_resolvers.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/as_resolvers.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/asn1.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/asn1.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/asn1.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/ber.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/ber.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/ber.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/mib.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/mib.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1/mib.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1fields.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1fields.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1fields.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/asn1packet.py
>+%%PYTHON_SITELIBDIR%%/scapy/asn1packet.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/asn1packet.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/automaton.py
>+%%PYTHON_SITELIBDIR%%/scapy/automaton.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/automaton.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/autorun.py
>+%%PYTHON_SITELIBDIR%%/scapy/autorun.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/autorun.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/base_classes.py
>+%%PYTHON_SITELIBDIR%%/scapy/base_classes.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/base_classes.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/config.py
>+%%PYTHON_SITELIBDIR%%/scapy/config.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/config.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/dadict.py
>+%%PYTHON_SITELIBDIR%%/scapy/dadict.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/dadict.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/data.py
>+%%PYTHON_SITELIBDIR%%/scapy/data.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/data.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/error.py
>+%%PYTHON_SITELIBDIR%%/scapy/error.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/error.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/fields.py
>+%%PYTHON_SITELIBDIR%%/scapy/fields.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/fields.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/all.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/all.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/all.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/bluetooth.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/bluetooth.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/bluetooth.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp6.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp6.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dhcp6.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dns.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dns.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dns.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dot11.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dot11.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/dot11.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/gprs.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/gprs.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/gprs.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/hsrp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/hsrp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/hsrp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet6.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet6.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/inet6.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ir.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ir.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ir.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/isakmp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/isakmp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/isakmp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2tp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2tp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/l2tp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/llmnr.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/llmnr.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/llmnr.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mgcp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mgcp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mgcp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mobileip.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mobileip.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/mobileip.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netbios.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netbios.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netbios.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netflow.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netflow.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/netflow.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ntp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ntp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ntp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ppp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ppp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/ppp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/radius.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/radius.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/radius.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rip.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rip.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rip.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rtp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rtp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/rtp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/sebek.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/sebek.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/sebek.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/skinny.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/skinny.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/skinny.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/smb.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/smb.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/smb.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/snmp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/snmp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/snmp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/tftp.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/tftp.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/tftp.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/layers/x509.py
>+%%PYTHON_SITELIBDIR%%/scapy/layers/x509.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/layers/x509.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/main.py
>+%%PYTHON_SITELIBDIR%%/scapy/main.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/main.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/geoip.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/geoip.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/geoip.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/nmap.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/nmap.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/nmap.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/p0f.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/p0f.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/p0f.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/queso.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/queso.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/queso.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/modules/voip.py
>+%%PYTHON_SITELIBDIR%%/scapy/modules/voip.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/modules/voip.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/packet.py
>+%%PYTHON_SITELIBDIR%%/scapy/packet.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/packet.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/plist.py
>+%%PYTHON_SITELIBDIR%%/scapy/plist.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/plist.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/route.py
>+%%PYTHON_SITELIBDIR%%/scapy/route.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/route.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/route6.py
>+%%PYTHON_SITELIBDIR%%/scapy/route6.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/route6.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/sendrecv.py
>+%%PYTHON_SITELIBDIR%%/scapy/sendrecv.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/sendrecv.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/supersocket.py
>+%%PYTHON_SITELIBDIR%%/scapy/supersocket.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/supersocket.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/themes.py
>+%%PYTHON_SITELIBDIR%%/scapy/themes.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/themes.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/tools/UTscapy.py
>+%%PYTHON_SITELIBDIR%%/scapy/tools/UTscapy.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/tools/UTscapy.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/tools/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/tools/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/tools/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/tools/check_asdis.py
>+%%PYTHON_SITELIBDIR%%/scapy/tools/check_asdis.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/tools/check_asdis.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/utils.py
>+%%PYTHON_SITELIBDIR%%/scapy/utils.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/utils.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/utils6.py
>+%%PYTHON_SITELIBDIR%%/scapy/utils6.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/utils6.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/volatile.py
>+%%PYTHON_SITELIBDIR%%/scapy/volatile.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/volatile.pyo
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/tools
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/modules
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/layers
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/asn1
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/arch
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy
>Index: files/patch-scapy.py
>===================================================================
>RCS file: files/patch-scapy.py
>diff -N files/patch-scapy.py
>--- files/patch-scapy.py	24 Apr 2007 14:24:59 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,24 +0,0 @@
>---- /usr/ports/net/scapy/work/scapy-1.1.1/scapy.py	Mon Apr  9 13:17:35 2007
>-+++ scapy.py	Sat Apr 21 22:24:12 2007
>-@@ -482,7 +482,7 @@
>-         pass
>-     return manufdb
>-     
>--MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf")
>-+MANUFDB = load_manuf("/usr/local/share/wireshark/manuf")
>- 
>- 
>- 
>-@@ -11856,9 +11856,9 @@
>-     BTsocket = BluetoothL2CAPSocket
>-     histfile = os.path.join(os.environ["HOME"], ".scapy_history")
>-     padding = 1
>--    p0f_base ="/etc/p0f/p0f.fp"
>--    queso_base ="/etc/queso.conf"
>--    nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
>-+    p0f_base ="/usr/local/etc/p0f/p0f.fp"
>-+    queso_base ="/usr/local/etc/queso.conf"
>-+    nmap_base ="/usr/local/share/nmap/nmap-os-fingerprints"
>-     IPCountry_base = "GeoIPCountry4Scapy.gz"
>-     countryLoc_base = "countryLoc.csv"
>-     gnuplot_world = "world.dat"
>Index: files/patch-scapy_config.py
>===================================================================
>RCS file: files/patch-scapy_config.py
>diff -N files/patch-scapy_config.py
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-scapy_config.py	11 Nov 2008 21:21:18 -0000
>@@ -0,0 +1,11 @@
>+--- scapy/config.py.orig	2008-11-12 05:01:38.000000000 +0800
>++++ scapy/config.py	2008-11-12 05:01:59.000000000 +0800
>+@@ -308,7 +308,7 @@
>+     services_tcp = TCP_SERVICES
>+     services_udp = UDP_SERVICES
>+     extensions_paths = "."
>+-    manufdb = load_manuf("/usr/share/wireshark/wireshark/manuf")
>++    manufdb = load_manuf("%%LOCALBASE%%/share/wireshark/manuf")
>+     stats_classic_protocols = []
>+     stats_dot11_protocols = []
>+     temp_files = []
>Index: files/patch-scapy_modules
>===================================================================
>RCS file: files/patch-scapy_modules
>diff -N files/patch-scapy_modules
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-scapy_modules	11 Nov 2008 21:21:18 -0000
>@@ -0,0 +1,33 @@
>+--- scapy/modules/nmap.py.orig	2008-11-12 04:11:51.000000000 +0800
>++++ scapy/modules/nmap.py	2008-11-12 04:14:50.000000000 +0800
>+@@ -6,7 +6,7 @@
>+ from scapy.data import KnowledgeBase
>+ from scapy.config import conf
>+ 
>+-conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
>++conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
>+ 
>+ 
>+ ######################
>+--- scapy/modules/p0f.py.orig	2008-11-12 04:12:07.000000000 +0800
>++++ scapy/modules/p0f.py	2008-11-12 04:20:49.000000000 +0800
>+@@ -6,7 +6,7 @@
>+ from scapy.data import KnowledgeBase
>+ from scapy.config import conf
>+ 
>+-conf.p0f_base ="/etc/p0f/p0f.fp"
>++conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp"
>+ 
>+ 
>+ ###############
>+--- scapy/modules/queso.py.orig	2008-11-12 04:12:14.000000000 +0800
>++++ scapy/modules/queso.py	2008-11-12 04:21:04.000000000 +0800
>+@@ -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"
>+ 
>+ 
>+ #################
>Index: files/patch-scapy_utils6.py
>===================================================================
>RCS file: files/patch-scapy_utils6.py
>diff -N files/patch-scapy_utils6.py
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-scapy_utils6.py	11 Nov 2008 21:21:18 -0000
>@@ -0,0 +1,11 @@
>+--- scapy/utils6.py.orig	2008-11-12 05:06:52.000000000 +0800
>++++ scapy/utils6.py	2008-11-12 05:07:08.000000000 +0800
>+@@ -194,7 +194,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/manuf)  None
>+     is returned on error, "UNKNOWN" if the vendor is unknown.
>+     """
>+     mac = in6_addrtomac(addr)

Actions: View | Diff

Attachments on bug 128802: 91457 | 91458