[src/trunk]: src/external/bsd/dhcpcd/dist Import dhcpcd-6.4.2 to fix the buil...

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

details:   https://anonhg.NetBSD.org/src/rev/aef4a1622057
branches:  trunk
changeset: 330580:aef4a1622057
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jul 14 14:02:01 2014 +0000

description:
Import dhcpcd-6.4.2 to fix the building of 6.4.1

diffstat:

 external/bsd/dhcpcd/dist/crypt/hmac_md5.c |  3 ++-
 external/bsd/dhcpcd/dist/defs.h           |  4 ++--
 external/bsd/dhcpcd/dist/dhcp6.c          |  9 ++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 17c24d5b15eb -r aef4a1622057 external/bsd/dhcpcd/dist/crypt/hmac_md5.c
--- a/external/bsd/dhcpcd/dist/crypt/hmac_md5.c Mon Jul 14 13:39:18 2014 +0000
+++ b/external/bsd/dhcpcd/dist/crypt/hmac_md5.c Mon Jul 14 14:02:01 2014 +0000
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: hmac_md5.c,v 1.1.1.2 2014/06/14 20:51:09 roy Exp $");
+ __RCSID("$NetBSD: hmac_md5.c,v 1.1.1.3 2014/07/14 14:02:02 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -33,6 +33,7 @@
 
 #include "crypt.h"
 
+#include "../config.h"
 #ifdef HAVE_MD5_H
 #include <md5.h>
 #else
diff -r 17c24d5b15eb -r aef4a1622057 external/bsd/dhcpcd/dist/defs.h
--- a/external/bsd/dhcpcd/dist/defs.h   Mon Jul 14 13:39:18 2014 +0000
+++ b/external/bsd/dhcpcd/dist/defs.h   Mon Jul 14 14:02:01 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.1.1.39 2014/07/14 11:45:06 roy Exp $ */
+/* $NetBSD: defs.h,v 1.1.1.40 2014/07/14 14:02:02 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "6.4.1"
+#define VERSION                        "6.4.2"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 17c24d5b15eb -r aef4a1622057 external/bsd/dhcpcd/dist/dhcp6.c
--- a/external/bsd/dhcpcd/dist/dhcp6.c  Mon Jul 14 13:39:18 2014 +0000
+++ b/external/bsd/dhcpcd/dist/dhcp6.c  Mon Jul 14 14:02:01 2014 +0000
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp6.c,v 1.1.1.11 2014/07/14 11:45:04 roy Exp $");
+ __RCSID("$NetBSD: dhcp6.c,v 1.1.1.12 2014/07/14 14:02:01 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -1631,7 +1631,7 @@
                        continue;
                }
                p = D6_COPTION_DATA(o);
-               iap = (struct dhcp6_ia_addr *)D6_COPTION_DATA(o);
+               iap = (const struct dhcp6_ia_addr *)D6_COPTION_DATA(o);
                p += sizeof(in6);
                a = dhcp6_findaddr(ifp, &iap->addr);
                if (a == NULL) {
@@ -1693,7 +1693,7 @@
        char iabuf[INET6_ADDRSTRLEN];
        const char *ia;
        int i;
-       uint8_t u8, len, *pw;
+       uint8_t u8, *pw;
        size_t off;
        uint16_t ol;
        const struct dhcp6_pd_addr *pdp;
@@ -1754,7 +1754,7 @@
                        state->expire = a->prefix_vltime;
                i++;
 
-               p = D6_OPTION_DATA(o) + sizeof(pdp);
+               p = D6_COPTION_DATA(o) + sizeof(pdp);
                ol -= sizeof(pdp);
                ex = dhcp6_findoption(D6_OPTION_PD_EXCLUDE, p, ol);
                a->prefix_exclude_len = 0;
@@ -1791,7 +1791,6 @@
                        a->prefix_exclude_len = 0;
                        continue;
                }
-               len = a->prefix_len / NBBY;
                u8 = a->prefix_len % NBBY;
                memcpy(&a->prefix_exclude, &a->prefix,
                    sizeof(a->prefix_exclude));