[src/trunk]: src/external/bsd/dhcpcd/dist Sync

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa3d418d97f5
branches:  trunk
changeset: 334981:fa3d418d97f5
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Dec 19 10:54:08 2014 +0000

description:
Sync

diffstat:

 external/bsd/dhcpcd/dist/arp.h    |  6 +++++-
 external/bsd/dhcpcd/dist/defs.h   |  4 ++--
 external/bsd/dhcpcd/dist/dhcpcd.c |  5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 6726cfc52dab -r fa3d418d97f5 external/bsd/dhcpcd/dist/arp.h
--- a/external/bsd/dhcpcd/dist/arp.h    Fri Dec 19 07:04:52 2014 +0000
+++ b/external/bsd/dhcpcd/dist/arp.h    Fri Dec 19 10:54:08 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: arp.h,v 1.7 2014/12/19 10:54:08 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
@@ -67,6 +67,7 @@
 };
 TAILQ_HEAD(arp_statehead, arp_state);
 
+#ifdef INET
 void arp_report_conflicted(const struct arp_state *, const struct arp_msg *);
 void arp_announce(struct arp_state *);
 void arp_probe(struct arp_state *);
@@ -75,4 +76,7 @@
 void arp_free(struct arp_state *);
 void arp_free_but(struct arp_state *);
 void arp_close(struct interface *);
+#else
+#define arp_close(a)
 #endif
+#endif
diff -r 6726cfc52dab -r fa3d418d97f5 external/bsd/dhcpcd/dist/defs.h
--- a/external/bsd/dhcpcd/dist/defs.h   Fri Dec 19 07:04:52 2014 +0000
+++ b/external/bsd/dhcpcd/dist/defs.h   Fri Dec 19 10:54:08 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.11 2014/12/17 20:50:08 roy Exp $ */
+/* $NetBSD: defs.h,v 1.12 2014/12/19 10:54:08 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "6.6.6"
+#define VERSION                        "6.6.7"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 6726cfc52dab -r fa3d418d97f5 external/bsd/dhcpcd/dist/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/dhcpcd.c Fri Dec 19 07:04:52 2014 +0000
+++ b/external/bsd/dhcpcd/dist/dhcpcd.c Fri Dec 19 10:54:08 2014 +0000
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd.c,v 1.19 2014/12/09 20:21:05 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.20 2014/12/19 10:54:08 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -373,7 +373,8 @@
        if (!(ifo->options & DHCPCD_IPV6))
                ifo->options &= ~(DHCPCD_IPV6RS | DHCPCD_DHCP6);
 
-       if (ifo->options & DHCPCD_SLAACPRIVATE)
+       if (ifo->options & DHCPCD_SLAACPRIVATE &&
+           !(ifp->ctx->options & DHCPCD_TEST))
                ifo->options |= DHCPCD_IPV6RA_OWN;
 
        /* We want to disable kernel interface RA as early as possible. */