Fix security/dsniff* build on NetBSD-current due recent route(4) change

(due the deprecation of RTF_LLINFO).

Bump PKGREVISION.

Reviewed by <ozaki-r>.

5 files changed, 29 insertions, 13 deletions

diff --git a/security/dsniff-nox11/Makefile b/security/dsniff-nox11/Makefile
index 60d20389634..fcd4b25e68b 100644
--- a/security/dsniff-nox11/Makefile
+++ b/security/dsniff-nox11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2016/03/05 11:29:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2016/04/18 08:34:35 leot Exp $
 
 .include "../../security/dsniff/Makefile.common"
 
 PKGNAME=	dsniff-nox11-${VERS}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	Password sniffer
 
 CONFIGURE_ARGS+=	--without-x
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 82006c1e95f..647aee87f10 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2016/04/18 08:34:35 leot Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	14
+PKGREVISION=	15
 COMMENT=	Password sniffer (webspy)
 
 DEPENDS+=	dsniff-nox11-[0-9]*:../../security/dsniff-nox11
diff --git a/security/dsniff/distinfo b/security/dsniff/distinfo
index ad85f683281..dd67a47a24f 100644
--- a/security/dsniff/distinfo
+++ b/security/dsniff/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 01:17:44 agc Exp $
+$NetBSD: distinfo,v 1.12 2016/04/18 08:34:35 leot Exp $
 
 SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
 RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
 SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d
 Size (dsniff-2.3.tar.gz) = 126797 bytes
-SHA1 (patch-aa) = b50347c772c13abd6b62a80315c7bfecc139ba60
+SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364
 SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
-SHA1 (patch-ac) = da25b9c7d6c06a18308ae8739bc5483341121dee
+SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992
 SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
 SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b
 SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6
diff --git a/security/dsniff/patches/patch-aa b/security/dsniff/patches/patch-aa
index 5ae44cd3f0f..868852d229d 100644
--- a/security/dsniff/patches/patch-aa
+++ b/security/dsniff/patches/patch-aa
@@ -1,8 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2000/12/18 08:49:39 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2016/04/18 08:34:35 leot Exp $
 
---- pcaputil.c-	Mon Dec 18 17:40:54 2000
-+++ pcaputil.c	Mon Dec 18 17:41:03 2000
-@@ -16,2 +16,3 @@
+--- pcaputil.c.orig	2000-11-14 15:51:08.000000000 +0000
++++ pcaputil.c
+@@ -14,6 +14,7 @@
+ #include <string.h>
+ #include <err.h>
  #include <pcap.h>
 +#undef BSD
  #ifdef BSD
+ #include <pcap-int.h>
+ #endif
diff --git a/security/dsniff/patches/patch-ac b/security/dsniff/patches/patch-ac
index 745c1dc6077..5a897e09582 100644
--- a/security/dsniff/patches/patch-ac
+++ b/security/dsniff/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2008/10/01 08:43:09 apb Exp $
+$NetBSD: patch-ac,v 1.3 2016/04/18 08:34:35 leot Exp $
 
---- arp.c.orig	2000-11-14 17:51:03.000000000 +0200
+--- arp.c.orig	2000-11-14 15:51:03.000000000 +0000
 +++ arp.c
 @@ -17,7 +17,7 @@
  #include <sys/sysctl.h>
@@ -19,3 +19,15 @@ $NetBSD: patch-ac,v 1.2 2008/10/01 08:43:09 apb Exp $
  #include <unistd.h>
  
  #ifdef BSD
+@@ -51,7 +52,11 @@ arp_cache_lookup(in_addr_t ip, struct et
+ 	mib[2] = 0;
+ 	mib[3] = AF_INET;
+ 	mib[4] = NET_RT_FLAGS;
++#ifdef RTF_LLDATA
++	mib[5] = RTF_LLDATA;
++#else
+ 	mib[5] = RTF_LLINFO;
++#endif
+ 	
+ 	if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
+ 		return (-1);