Import of pkgsrc-2016Q3

net/scapy/patches/patch-aa

@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2013/06/15 20:24:19 adam Exp $
+$NetBSD: patch-aa,v 1.6 2016/05/09 11:07:51 adam Exp $
 
---- scapy/arch/__init__.py.orig	2010-08-10 23:09:39.000000000 +0000
+--- scapy/arch/__init__.py.orig	2016-01-15 13:10:59.000000000 +0000
 +++ scapy/arch/__init__.py
-@@ -50,6 +50,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")
 +DRAGONFLY=sys.platform.startswith("dragonfly")
  
  X86_64 = not WINDOWS and (os.uname()[4] == 'x86_64')
- 
-@@ -71,7 +72,7 @@ if LINUX:
+ ARM_64 = not WINDOWS and (os.uname()[4] == 'aarch64')
+@@ -72,7 +73,7 @@ if LINUX:
      from linux import *
      if scapy.config.conf.use_pcap or scapy.config.conf.use_dnet:
          from pcapdnet import *

net/scapy/patches/patch-ae

@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2013/06/15 20:24:19 adam Exp $
-
---- setup.py.orig	2011-02-28 02:11:55.000000000 +0000
-+++ setup.py
-@@ -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"])],
-+    data_files = [('man/man1', ["doc/scapy.1.gz"])],
- 
-     # Metadata
-     author = 'Philippe BIONDI',

net/scapy/patches/patch-af

@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.2 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-af,v 1.3 2016/05/09 11:07:51 adam Exp $
 
---- test/run_tests.orig	2009-04-13 23:10:43.000000000 +0000
+--- test/run_tests.orig	2016-01-15 13:10:59.000000000 +0000
 +++ test/run_tests
 @@ -1,8 +1,8 @@
- #! /bin/sh
+ #! /bin/bash
  DIR=$(dirname $0)/..
 -if [ "$*" == "" ]
 +if [ "$*" = "" ]
  then
--PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
-+PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
+-PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -l -o /tmp/scapy_regression_test_$(date +%Y%m%d-%H%M%S).html
++PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -l -o /tmp/scapy_regression_test_$(date +%Y%m%d-%H%M%S).html
  else
 -PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py "$@"
 +PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py "$@"