Attachment 101825 Details for Bug 141471 – ports-net-scapy-2.0.1-2.1.0.diff.txt

ports-net-scapy-2.0.1-2.1.0.diff.txt

ports-net-scapy-2.0.1-2.1.0.diff.txt (text/plain; charset=US-ASCII), 11.53 KB, created by Sofian Brabez on 2009-12-15 03:25:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sofian Brabez

Created: 2009-12-15 03:25:37 UTC

Size: 11.53 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net/scapy/Makefile /tmp/scapy/Makefile
>--- /usr/ports/net/scapy/Makefile        2009-07-28 16:11:27.000000000 +0200
>+++ /tmp/scapy/Makefile  2009-12-15 04:06:31.000000000 +0100
>@@ -7,8 +7,7 @@
> # TODO: - configurable --enable-xxx for various additional dependancies
> 
> PORTNAME=       scapy
>-PORTVERSION=    2.0.1
>-PORTREVISION=   2
>+PORTVERSION=    2.1.0
> CATEGORIES=     net
> MASTER_SITES=   http://secdev.org/projects/scapy/files/
> 
>diff -ruN --exclude=CVS /usr/ports/net/scapy/distinfo /tmp/scapy/distinfo
>--- /usr/ports/net/scapy/distinfo        2009-06-25 04:15:46.000000000 +0200
>+++ /tmp/scapy/distinfo  2009-12-15 03:15:34.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb
>-SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1
>-SIZE (scapy-2.0.1.tar.gz) = 864953
>+MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1
>+SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
>+SIZE (scapy-2.1.0.tar.gz) = 956785
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-layers-inet.py /tmp/scapy/files/patch-layers-inet.py
>--- /usr/ports/net/scapy/files/patch-layers-inet.py      2009-07-06 16:33:06.000000000 +0200
>+++ /tmp/scapy/files/patch-layers-inet.py        1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- scapy/layers/inet.py.orig   2009-05-25 14:36:27.000000000 +0200
>-+++ scapy/layers/inet.py        2009-05-25 14:36:30.000000000 +0200
>-@@ -780,7 +780,7 @@
>-                 self.label.visible ^= 1
>- 
>-         visual.scene = visual.display()
>--        visual.scene.exit_on_close(0)
>-+        #visual.scene.exit_on_close(0)
>-         start = visual.box()
>-         rings={}
>-         tr3d = {}
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy-sendrecv.py /tmp/scapy/files/patch-scapy-sendrecv.py
>--- /usr/ports/net/scapy/files/patch-scapy-sendrecv.py   2009-07-28 16:11:27.000000000 +0200
>+++ /tmp/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
>- 
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__data.py /tmp/scapy/files/patch-scapy__data.py
>--- /usr/ports/net/scapy/files/patch-scapy__data.py      1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy__data.py        2009-12-15 04:11:23.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./scapy/data.py.orig        2009-12-15 04:10:42.000000000 +0100
>++++ ./scapy/data.py     2009-12-15 04:11:06.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 -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__nmap.py /tmp/scapy/files/patch-scapy__modules__nmap.py
>--- /usr/ports/net/scapy/files/patch-scapy__modules__nmap.py     1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy__modules__nmap.py       2009-12-15 04:14:34.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./scapy/modules/nmap.py.orig        2009-12-15 04:12:50.000000000 +0100
>++++ ./scapy/modules/nmap.py     2009-12-15 04:13:27.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 -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__p0f.py /tmp/scapy/files/patch-scapy__modules__p0f.py
>--- /usr/ports/net/scapy/files/patch-scapy__modules__p0f.py      1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy__modules__p0f.py        2009-12-15 04:14:34.000000000 +0100
>@@ -0,0 +1,17 @@
>+--- ./scapy/modules/p0f.py.orig 2009-12-15 04:13:01.000000000 +0100
>++++ ./scapy/modules/p0f.py      2009-12-15 04:13:54.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 -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__queso.py /tmp/scapy/files/patch-scapy__modules__queso.py
>--- /usr/ports/net/scapy/files/patch-scapy__modules__queso.py    1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy__modules__queso.py      2009-12-15 04:14:34.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./scapy/modules/queso.py.orig       2009-12-15 04:12:54.000000000 +0100
>++++ ./scapy/modules/queso.py    2009-12-15 04:14:05.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 -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__utils6.py /tmp/scapy/files/patch-scapy__utils6.py
>--- /usr/ports/net/scapy/files/patch-scapy__utils6.py    1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy__utils6.py      2009-12-15 02:47:19.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./scapy/utils6.py.orig      2009-12-15 02:27:31.000000000 +0100
>++++ ./scapy/utils6.py   2009-12-15 02:28:28.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 -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_config.py /tmp/scapy/files/patch-scapy_config.py
>--- /usr/ports/net/scapy/files/patch-scapy_config.py     2009-06-25 04:15:46.000000000 +0200
>+++ /tmp/scapy/files/patch-scapy_config.py       1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- scapy/config.py.orig        2009-02-09 17:41:39.000000000 +0500
>-+++ scapy/config.py     2009-06-24 16:11:35.000000000 +0600
>-@@ -309,7 +309,7 @@
>-     services_tcp = TCP_SERVICES
>-     services_udp = UDP_SERVICES
>-     extensions_paths = "."
>--    manufdb = load_manuf("/usr/share/wireshark/manuf")
>-+    manufdb = load_manuf("%%LOCALBASE%%/share/wireshark/manuf")
>-     stats_classic_protocols = []
>-     stats_dot11_protocols = []
>-     temp_files = []
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_modules /tmp/scapy/files/patch-scapy_modules
>--- /usr/ports/net/scapy/files/patch-scapy_modules       2008-11-19 21:41:56.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy_modules 1970-01-01 01:00:00.000000000 +0100
>@@ -1,33 +0,0 @@
>---- 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"
>- 
>- 
>- #################
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_utils6.py /tmp/scapy/files/patch-scapy_utils6.py
>--- /usr/ports/net/scapy/files/patch-scapy_utils6.py     2008-11-19 21:41:56.000000000 +0100
>+++ /tmp/scapy/files/patch-scapy_utils6.py       1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- 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)
>diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-setup.py /tmp/scapy/files/patch-setup.py
>--- /usr/ports/net/scapy/files/patch-setup.py    1970-01-01 01:00:00.000000000 +0100
>+++ /tmp/scapy/files/patch-setup.py      2009-12-15 04:08:49.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./setup.py.orig     2009-12-15 04:08:08.000000000 +0100
>++++ ./setup.py  2009-12-15 04:08:30.000000000 +0100
>+@@ -42,7 +42,7 @@
>+ setup(
>+     name = 'scapy',
>+     version = '2.1.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,
>+     data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
>+ 
>diff -ruN --exclude=CVS /usr/ports/net/scapy/pkg-plist /tmp/scapy/pkg-plist
>--- /usr/ports/net/scapy/pkg-plist       2009-06-25 04:15:46.000000000 +0200
>+++ /tmp/scapy/pkg-plist 2009-12-15 03:11:33.000000000 +0100
>@@ -60,6 +60,12 @@
> %%PYTHON_SITELIBDIR%%/scapy/config.py
> %%PYTHON_SITELIBDIR%%/scapy/config.pyc
> %%PYTHON_SITELIBDIR%%/scapy/config.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.py
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.py
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.pyo
> %%PYTHON_SITELIBDIR%%/scapy/dadict.py
> %%PYTHON_SITELIBDIR%%/scapy/dadict.pyc
> %%PYTHON_SITELIBDIR%%/scapy/dadict.pyo
>@@ -195,6 +201,9 @@
> %%PYTHON_SITELIBDIR%%/scapy/plist.py
> %%PYTHON_SITELIBDIR%%/scapy/plist.pyc
> %%PYTHON_SITELIBDIR%%/scapy/plist.pyo
>+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.py
>+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.pyc
>+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.pyo
> %%PYTHON_SITELIBDIR%%/scapy/route.py
> %%PYTHON_SITELIBDIR%%/scapy/route.pyc
> %%PYTHON_SITELIBDIR%%/scapy/route.pyo
>@@ -231,6 +240,7 @@
> @dirrm %%PYTHON_SITELIBDIR%%/scapy/tools
> @dirrm %%PYTHON_SITELIBDIR%%/scapy/modules
> @dirrm %%PYTHON_SITELIBDIR%%/scapy/layers
>+@dirrm %%PYTHON_SITELIBDIR%%/scapy/crypto
> @dirrm %%PYTHON_SITELIBDIR%%/scapy/asn1
> @dirrm %%PYTHON_SITELIBDIR%%/scapy/arch
> @dirrm %%PYTHON_SITELIBDIR%%/scapy

Actions: View

Attachments on bug 141471: 101824 | 101825 | 101826