Changes 2.2.0:

This release adds a contrib section filled with old contributions that were not distributed with Scapy yet: CDP, IGMP, MPLS, CHDLC, SLARP, WPA EAPOL, DTP, EIGRP, VQP, BGP, OSPF, VTP RSVP, EtherIP, RIPng, and IKEv2. It fixes some bugs.

7 files changed, 34 insertions, 34 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index a585831fa28..8fba3c7d117 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.14 2012/10/23 17:19:07 asau Exp $
-#
+# $NetBSD: Makefile,v 1.15 2013/06/15 20:24:19 adam Exp $
 
-DISTNAME=		scapy-2.1.1
-PKGREVISION=		2
-CATEGORIES=		net
-MASTER_SITES=		http://www.secdev.org/projects/scapy/files/
+DISTNAME=	scapy-2.2.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.secdev.org/projects/scapy/files/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.secdev.org/projects/scapy/
-COMMENT=		Interactive packet manipulation program
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.secdev.org/projects/scapy/
+COMMENT=	Interactive packet manipulation program
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-libpcap-[0-9]*:../../net/py-libpcap
 DEPENDS+=	${PYPKGPREFIX}-libdnet-[0-9]*:../../net/py-libdnet
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 
-NO_BUILD=			yes
+NO_BUILD=	yes
+
+INSTALLATION_DIRS+=	share/examples/scapy
 
 .include "options.mk"
 
@@ -31,7 +32,6 @@ post-extract:
 	${CP} ${FILESDIR}/ethertypes ${WRKSRC}
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/scapy
 	${INSTALL_DATA} ${WRKSRC}/ethertypes ${DESTDIR}${PREFIX}/share/examples/scapy/
 
 do-test:
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index 4f4ffb194f1..63555dc7021 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: distinfo,v 1.5 2013/06/15 20:24:19 adam Exp $
 
-SHA1 (scapy-2.1.1.tar.gz) = c82236970bf93e00d0f5d4d165f410745e648d95
-RMD160 (scapy-2.1.1.tar.gz) = d368795789458344ad771834de7188974a4db252
-Size (scapy-2.1.1.tar.gz) = 1924541 bytes
-SHA1 (patch-aa) = 5a54f2878848cb66511282719d7f941fc4da6700
-SHA1 (patch-ab) = 3d32f4e010180ebe9f9309877c1822f53c247151
-SHA1 (patch-ac) = 8dd118db16e8c86803ac715475b5e962314d2034
-SHA1 (patch-ad) = e4e41ea79d90121c068e475fdd6fcd0968407071
-SHA1 (patch-ae) = c9e4728e158b02244c50f053fa2a6c64562b4c83
+SHA1 (scapy-2.2.0.tar.gz) = ae0a9947a08a01a84abde9db12fed074ac888e47
+RMD160 (scapy-2.2.0.tar.gz) = 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e
+Size (scapy-2.2.0.tar.gz) = 972996 bytes
+SHA1 (patch-aa) = 37bb1d60a04604c26a518dc0d13d5df601fd295c
+SHA1 (patch-ab) = 12f7c4d0ae505d357692c05de658e393a0526ba1
+SHA1 (patch-ac) = d8ad1882d9b31e65dc3f7636e4caac9377805daf
+SHA1 (patch-ad) = f3647e471ba1168e054a5160d47fb0870243fb4b
+SHA1 (patch-ae) = bedc1c849c53648f394ebf843435c675729e69e7
 SHA1 (patch-af) = 7dbdecbdfbc5348d0e0f2276113cac88ff766580
diff --git a/net/scapy/patches/patch-aa b/net/scapy/patches/patch-aa
index e0889e5dd2a..84f8268bc44 100644
--- a/net/scapy/patches/patch-aa
+++ b/net/scapy/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2013/06/15 20:24:19 adam Exp $
 
---- scapy/arch/__init__.py.orig	2009-09-23 14:27:36.000000000 +0000
+--- scapy/arch/__init__.py.orig	2010-08-10 23:09:39.000000000 +0000
 +++ scapy/arch/__init__.py
-@@ -46,6 +46,7 @@ NETBSD = sys.platform.startswith("netbsd
+@@ -50,6 +50,7 @@ NETBSD = sys.platform.startswith("netbsd
  DARWIN=sys.platform.startswith("darwin")
  SOLARIS=sys.platform.startswith("sunos")
  WINDOWS=sys.platform.startswith("win32")
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2011/02/25 15:43:51 drochner Exp $
  
  X86_64 = not WINDOWS and (os.uname()[4] == 'x86_64')
  
-@@ -67,7 +68,7 @@ if LINUX:
+@@ -71,7 +72,7 @@ if LINUX:
      from linux import *
      if scapy.config.conf.use_pcap or scapy.config.conf.use_dnet:
          from pcapdnet import *
diff --git a/net/scapy/patches/patch-ab b/net/scapy/patches/patch-ab
index c2936f7c572..5528bc76a2d 100644
--- a/net/scapy/patches/patch-ab
+++ b/net/scapy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-ab,v 1.2 2013/06/15 20:24:19 adam Exp $
 
 --- scapy/arch/unix.py.orig	2009-02-01 22:30:20 +0200
 +++ scapy/arch/unix.py	2009-06-09 14:33:21 +0300
-@@ -160,7 +160,7 @@ def read_routes6():
+@@ -163,7 +163,7 @@ def read_routes6():
              lspl = l.split()
              d,nh,fl = lspl[:3]
              dev = lspl[5+mtu_present+prio_present]
diff --git a/net/scapy/patches/patch-ac b/net/scapy/patches/patch-ac
index fecc7e1410c..101a7b16cdd 100644
--- a/net/scapy/patches/patch-ac
+++ b/net/scapy/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2013/06/15 20:24:19 adam Exp $
 
 --- scapy/sendrecv.py.orig	2009-12-30 22:21:13.000000000 +0000
 +++ scapy/sendrecv.py
-@@ -117,7 +117,7 @@ def sndrcv(pks, pkt, timeout = None, int
+@@ -121,7 +121,7 @@ def sndrcv(pks, pkt, timeout = None, int
                                  if remaintime <= 0:
                                      break
                              r = None
diff --git a/net/scapy/patches/patch-ad b/net/scapy/patches/patch-ad
index 7f71a699681..5e2fa802870 100644
--- a/net/scapy/patches/patch-ad
+++ b/net/scapy/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2013/06/15 20:24:19 adam Exp $
 
 --- scapy/data.py.orig	2009-09-23 14:27:36.000000000 +0000
 +++ scapy/data.py
-@@ -176,7 +176,7 @@ if WINDOWS:
+@@ -180,7 +180,7 @@ if WINDOWS:
      MANUFDB = load_manuf(os.environ["ProgramFiles"] + "\\wireshark\\manuf")
  else:
      IP_PROTOS=load_protocols("/etc/protocols")
diff --git a/net/scapy/patches/patch-ae b/net/scapy/patches/patch-ae
index b5202b1b990..ae0c2380146 100644
--- a/net/scapy/patches/patch-ae
+++ b/net/scapy/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2013/06/15 20:24:19 adam Exp $
 
---- setup.py.orig	2010-04-09 22:42:04.000000000 +0000
+--- setup.py.orig	2011-02-28 02:11:55.000000000 +0000
 +++ setup.py
-@@ -44,7 +44,7 @@ setup(
-     version = '2.1.1',
+@@ -49,7 +49,7 @@ setup(
+     version = '2.2.0',
      packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
      scripts = SCRIPTS,
 -    data_files = [('share/man/man1', ["doc/scapy.1.gz"])],