Mon Apr 18 08:34:35 2016 UTC ()
Fix security/dsniff* build on NetBSD-current due recent route(4) change
(due the deprecation of RTF_LLINFO).

Bump PKGREVISION.

Reviewed by <ozaki-r>.


(leot)
diff -r1.40 -r1.41 pkgsrc/security/dsniff/Makefile
diff -r1.11 -r1.12 pkgsrc/security/dsniff/distinfo
diff -r1.15 -r1.16 pkgsrc/security/dsniff-nox11/Makefile
diff -r1.1 -r1.2 pkgsrc/security/dsniff/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/security/dsniff/patches/patch-ac
cvs diff -r1.40 -r1.41 pkgsrc/security/dsniff/Makefile (expand / switch to unified diff)

--- pkgsrc/security/dsniff/Makefile 2016/03/05 11:29:19 1.40
+++ pkgsrc/security/dsniff/Makefile 2016/04/18 08:34:35 1.41
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.40 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.41 2016/04/18 08:34:35 leot Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGREVISION= 14 5PKGREVISION= 15
6COMMENT= Password sniffer (webspy) 6COMMENT= Password sniffer (webspy)
7 7
8DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11 8DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11
9 9
10BUILD_TARGET= libmissing.a webspy 10BUILD_TARGET= libmissing.a webspy
11 11
12INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 12INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8
13 13
14do-install: 14do-install:
15 ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${DESTDIR}${PREFIX}/sbin 15 ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${DESTDIR}${PREFIX}/sbin
16 ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 16 ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
17 17
18BUILDLINK_DEPMETHOD.libXt?= build 18BUILDLINK_DEPMETHOD.libXt?= build
cvs diff -r1.11 -r1.12 pkgsrc/security/dsniff/distinfo (expand / switch to unified diff)

--- pkgsrc/security/dsniff/distinfo 2015/11/04 01:17:44 1.11
+++ pkgsrc/security/dsniff/distinfo 2016/04/18 08:34:35 1.12
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.11 2015/11/04 01:17:44 agc Exp $ 1$NetBSD: distinfo,v 1.12 2016/04/18 08:34:35 leot Exp $
2 2
3SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b 3SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
4RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147 4RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
5SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d 5SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d
6Size (dsniff-2.3.tar.gz) = 126797 bytes 6Size (dsniff-2.3.tar.gz) = 126797 bytes
7SHA1 (patch-aa) = b50347c772c13abd6b62a80315c7bfecc139ba60 7SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364
8SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44 8SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
9SHA1 (patch-ac) = da25b9c7d6c06a18308ae8739bc5483341121dee 9SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992
10SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e 10SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
11SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b 11SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b
12SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6 12SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6
13SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5 13SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5
14SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef 14SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef
15SHA1 (patch-bd) = dc0f17dd287327ff5105e91c5bfa8b2390841fe2 15SHA1 (patch-bd) = dc0f17dd287327ff5105e91c5bfa8b2390841fe2
16SHA1 (patch-be) = 878d5e81909790d852db442ec0bb57fb161a73a4 16SHA1 (patch-be) = 878d5e81909790d852db442ec0bb57fb161a73a4
17SHA1 (patch-bf) = c1bd7f1794d6f8b9fec6cf1d6b24e75ed32c0616 17SHA1 (patch-bf) = c1bd7f1794d6f8b9fec6cf1d6b24e75ed32c0616
18SHA1 (patch-bg) = 6888b68ae38b32a2fd635f5b08c7c637033a28b5 18SHA1 (patch-bg) = 6888b68ae38b32a2fd635f5b08c7c637033a28b5
19SHA1 (patch-bh) = 1e4bee85e6d289c011632ef84d460e46746287c9 19SHA1 (patch-bh) = 1e4bee85e6d289c011632ef84d460e46746287c9
20SHA1 (patch-bi) = 47c6b0e3682af9ee3b212b0d0800d9a74037df30 20SHA1 (patch-bi) = 47c6b0e3682af9ee3b212b0d0800d9a74037df30
21SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0 21SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0
22SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18 22SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18
cvs diff -r1.15 -r1.16 pkgsrc/security/dsniff-nox11/Makefile (expand / switch to unified diff)

--- pkgsrc/security/dsniff-nox11/Makefile 2016/03/05 11:29:20 1.15
+++ pkgsrc/security/dsniff-nox11/Makefile 2016/04/18 08:34:35 1.16
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.15 2016/03/05 11:29:20 jperkin Exp $ 1# $NetBSD: Makefile,v 1.16 2016/04/18 08:34:35 leot Exp $
2 2
3.include "../../security/dsniff/Makefile.common" 3.include "../../security/dsniff/Makefile.common"
4 4
5PKGNAME= dsniff-nox11-${VERS} 5PKGNAME= dsniff-nox11-${VERS}
6PKGREVISION= 8 6PKGREVISION= 9
7COMMENT= Password sniffer 7COMMENT= Password sniffer
8 8
9CONFIGURE_ARGS+= --without-x 9CONFIGURE_ARGS+= --without-x
10 10
11INSTALLATION_DIRS+= ${PKGMANDIR}/man8 11INSTALLATION_DIRS+= ${PKGMANDIR}/man8
12INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR} 12INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR}
13 13
14CFLAGS.Darwin+= -DBIND_8_COMPAT 14CFLAGS.Darwin+= -DBIND_8_COMPAT
15 15
16post-configure: 16post-configure:
17 ( cd ${WRKSRC} \ 17 ( cd ${WRKSRC} \
18 && grep '#define.*HAVE_SYS_QUEUE_H' config.h >/dev/null \ 18 && grep '#define.*HAVE_SYS_QUEUE_H' config.h >/dev/null \
19 && mv missing/sys/queue.h missing/sys/queue.h.fake ) 19 && mv missing/sys/queue.h missing/sys/queue.h.fake )
cvs diff -r1.1 -r1.2 pkgsrc/security/dsniff/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/dsniff/patches/patch-aa 2000/12/18 08:49:39 1.1
+++ pkgsrc/security/dsniff/patches/patch-aa 2016/04/18 08:34:35 1.2
@@ -1,8 +1,12 @@ @@ -1,8 +1,12 @@
1$NetBSD: patch-aa,v 1.1 2000/12/18 08:49:39 itojun Exp $ 1$NetBSD: patch-aa,v 1.2 2016/04/18 08:34:35 leot Exp $
2 2
3--- pcaputil.c- Mon Dec 18 17:40:54 2000 3--- pcaputil.c.orig 2000-11-14 15:51:08.000000000 +0000
4+++ pcaputil.c Mon Dec 18 17:41:03 2000 4+++ pcaputil.c
5@@ -16,2 +16,3 @@ 5@@ -14,6 +14,7 @@
 6 #include <string.h>
 7 #include <err.h>
6 #include <pcap.h> 8 #include <pcap.h>
7+#undef BSD 9+#undef BSD
8 #ifdef BSD 10 #ifdef BSD
 11 #include <pcap-int.h>
 12 #endif
cvs diff -r1.2 -r1.3 pkgsrc/security/dsniff/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/dsniff/patches/patch-ac 2008/10/01 08:43:09 1.2
+++ pkgsrc/security/dsniff/patches/patch-ac 2016/04/18 08:34:35 1.3
@@ -1,21 +1,33 @@ @@ -1,21 +1,33 @@
1$NetBSD: patch-ac,v 1.2 2008/10/01 08:43:09 apb Exp $ 1$NetBSD: patch-ac,v 1.3 2016/04/18 08:34:35 leot Exp $
2 2
3--- arp.c.orig 2000-11-14 17:51:03.000000000 +0200 3--- arp.c.orig 2000-11-14 15:51:03.000000000 +0000
4+++ arp.c 4+++ arp.c
5@@ -17,7 +17,7 @@ 5@@ -17,7 +17,7 @@
6 #include <sys/sysctl.h> 6 #include <sys/sysctl.h>
7 #include <net/if_dl.h> 7 #include <net/if_dl.h>
8 #include <net/route.h> 8 #include <net/route.h>
9-#ifdef __FreeBSD__ /* XXX */ 9-#ifdef __FreeBSD__ /* XXX */
10+#if defined(__FreeBSD__) || defined(__DragonFly__) /* XXX */ 10+#if defined(__FreeBSD__) || defined(__DragonFly__) /* XXX */
11 #define ether_addr_octet octet 11 #define ether_addr_octet octet
12 #endif 12 #endif
13 #else /* !BSD */ 13 #else /* !BSD */
14@@ -32,6 +32,7 @@ 14@@ -32,6 +32,7 @@
15 #include <netinet/if_ether.h> 15 #include <netinet/if_ether.h>
16 #include <stdio.h> 16 #include <stdio.h>
17 #include <stdlib.h> 17 #include <stdlib.h>
18+#include <string.h> 18+#include <string.h>
19 #include <unistd.h> 19 #include <unistd.h>
20  20
21 #ifdef BSD 21 #ifdef BSD
 22@@ -51,7 +52,11 @@ arp_cache_lookup(in_addr_t ip, struct et
 23 mib[2] = 0;
 24 mib[3] = AF_INET;
 25 mib[4] = NET_RT_FLAGS;
 26+#ifdef RTF_LLDATA
 27+ mib[5] = RTF_LLDATA;
 28+#else
 29 mib[5] = RTF_LLINFO;
 30+#endif
 31
 32 if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
 33 return (-1);