[src/trunk]: src/external/bsd/dhcpcd/dist Import dhcpcd-7.0.5a.

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

details:   https://anonhg.NetBSD.org/src/rev/0f112a5b9fc3
branches:  trunk
changeset: 319600:0f112a5b9fc3
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jun 04 09:55:13 2018 +0000

description:
Import dhcpcd-7.0.5a.
Only change is to fix builds without INET6.

diffstat:

 external/bsd/dhcpcd/dist/Makefile     |  3 ++-
 external/bsd/dhcpcd/dist/src/dhcp.h   |  1 -
 external/bsd/dhcpcd/dist/src/dhcp6.h  |  1 -
 external/bsd/dhcpcd/dist/src/ipv4ll.h |  1 -
 external/bsd/dhcpcd/dist/src/ipv6.c   |  2 ++
 external/bsd/dhcpcd/dist/src/ipv6.h   |  1 -
 external/bsd/dhcpcd/dist/src/ipv6nd.h |  1 -
 7 files changed, 4 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/Makefile
--- a/external/bsd/dhcpcd/dist/Makefile Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/Makefile Mon Jun 04 09:55:13 2018 +0000
@@ -8,7 +8,8 @@
 FOSSILID?=     current
 GITREF?=       HEAD
 
-DISTPREFIX?=   dhcpcd-${VERSION}
+DISTSUFFIX=
+DISTPREFIX?=   dhcpcd-${VERSION}${DISTSUFFIX}
 DISTFILEGZ?=   ${DISTPREFIX}.tar.gz
 DISTFILE?=     ${DISTPREFIX}.tar.xz
 DISTINFO=      ${DISTFILE}.distinfo
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/dhcp.h
--- a/external/bsd/dhcpcd/dist/src/dhcp.h       Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.h       Mon Jun 04 09:55:13 2018 +0000
@@ -267,7 +267,6 @@
 void dhcp_free(struct interface *);
 int dhcp_dump(struct interface *);
 #else
-#define dhcp_drop(a, b) {}
 #define dhcp_start(a) {}
 #define dhcp_abort(a) {}
 #define dhcp_renew(a) {}
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/dhcp6.h
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h      Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h      Mon Jun 04 09:55:13 2018 +0000
@@ -245,7 +245,6 @@
 #define dhcp6_renew(a) {}
 #define dhcp6_env(a, b, c, d, e) (0)
 #define dhcp6_free(a) {}
-#define dhcp6_handleifa(a, b) {}
 #define dhcp6_dadcompleted(a) (0)
 #define dhcp6_drop(a, b) {}
 #define dhcp6_dropnondelegates(a) {}
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/ipv4ll.h
--- a/external/bsd/dhcpcd/dist/src/ipv4ll.h     Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv4ll.h     Mon Jun 04 09:55:13 2018 +0000
@@ -75,7 +75,6 @@
 #define        ipv4ll_defaultroute(route, ifp) (0)
 #define        ipv4ll_handlert(a, b, c)        (0)
 #define        ipv4ll_free(a)                  {}
-#define        ipv4ll_drop(a)                  {}
 #endif
 
 #endif
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/ipv6.c
--- a/external/bsd/dhcpcd/dist/src/ipv6.c       Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6.c       Mon Jun 04 09:55:13 2018 +0000
@@ -1183,7 +1183,9 @@
                return;
 
        ipv6nd_handleifa(cmd, ia, pid);
+#ifdef DHCP6
        dhcp6_handleifa(cmd, ia, pid);
+#endif
 
 out:
        /* Done with the ia now, so free it. */
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/ipv6.h
--- a/external/bsd/dhcpcd/dist/src/ipv6.h       Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6.h       Mon Jun 04 09:55:13 2018 +0000
@@ -285,7 +285,6 @@
 #define ipv6_hasaddr(a) (0)
 #define ipv6_free_ll_callbacks(a) {}
 #define ipv6_free(a) {}
-#define ipv6_drop(a) {}
 #define ipv6_ctxfree(a) {}
 #define ipv6_gentempifid(a) {}
 #endif
diff -r 79ae76bd69a8 -r 0f112a5b9fc3 external/bsd/dhcpcd/dist/src/ipv6nd.h
--- a/external/bsd/dhcpcd/dist/src/ipv6nd.h     Mon Jun 04 09:13:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6nd.h     Mon Jun 04 09:55:13 2018 +0000
@@ -107,7 +107,6 @@
 #define ipv6nd_free(a) {}
 #define ipv6nd_hasra(a) (0)
 #define ipv6nd_dadcompleted(a) (0)
-#define ipv6nd_drop(a) {}
 #define ipv6nd_expire(a, b) {}
 #endif