[src/netbsd-9]: src Apply patch, requested by roy in ticket #830:

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

details:   https://anonhg.NetBSD.org/src/rev/bdaebf7fcc21
branches:  netbsd-9
changeset: 963778:bdaebf7fcc21
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 12 17:33:24 2020 +0000

description:
Apply patch, requested by roy in ticket #830:

        external/bsd/dhcpcd/dist/src/dhcp6.c            (apply patch)
        external/bsd/dhcpcd/dist/src/defs.h             (apply patch)
        doc/3RDPARTY                                    (apply patch)

Update to dhcpcd-8.1.8 which fixes a compile issue.

diffstat:

 doc/3RDPARTY                         |  8 ++++----
 external/bsd/dhcpcd/dist/src/defs.h  |  2 +-
 external/bsd/dhcpcd/dist/src/dhcp6.c |  5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 86e1c30d4c91 -r bdaebf7fcc21 doc/3RDPARTY
--- a/doc/3RDPARTY      Sun Apr 12 08:50:25 2020 +0000
+++ b/doc/3RDPARTY      Sun Apr 12 17:33:24 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1640.2.13 2020/04/12 08:29:40 martin Exp $
+#      $NetBSD: 3RDPARTY,v 1.1640.2.14 2020/04/12 17:33:24 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -341,12 +341,12 @@
 Use the dhcp2netbsd script.
 
 Package:       dhcpcd
-Version:       8.1.7
-Current Vers:  8.1.7
+Version:       8.1.8
+Current Vers:  8.1.8
 Maintainer:    roy
 Archive Site:  ftp://roy.marples.name/pub/dhcpcd/
 Home Page:     http://roy.marples.name/projects/dhcpcd/
-Date:          2020-04-10
+Date:          2020-04-12
 Mailing List:  dhcpcd-discuss%marples.name@localhost
 License:       BSD (2-clause)
 Location:      external/bsd/dhcpcd/dist
diff -r 86e1c30d4c91 -r bdaebf7fcc21 external/bsd/dhcpcd/dist/src/defs.h
--- a/external/bsd/dhcpcd/dist/src/defs.h       Sun Apr 12 08:50:25 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/defs.h       Sun Apr 12 17:33:24 2020 +0000
@@ -29,7 +29,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "8.1.7"
+#define VERSION                        "8.1.8"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 86e1c30d4c91 -r bdaebf7fcc21 external/bsd/dhcpcd/dist/src/dhcp6.c
--- a/external/bsd/dhcpcd/dist/src/dhcp6.c      Sun Apr 12 08:50:25 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.c      Sun Apr 12 17:33:24 2020 +0000
@@ -3943,16 +3943,17 @@
 void
 dhcp6_abort(struct interface *ifp)
 {
+       struct dhcp6_state *state;
 #ifdef ND6_ADVERTISE
-       struct dhcp6_state *state;
        struct ipv6_addr *ia;
 #endif
 
        eloop_timeout_delete(ifp->ctx->eloop, dhcp6_start1, ifp);
-#ifdef ND6_ADVERTISE
        state = D6_STATE(ifp);
        if (state == NULL)
                return;
+
+#ifdef ND6_ADVERTISE
        TAILQ_FOREACH(ia, &state->addrs, next) {
                ipv6nd_advertise(ia);
        }