Module Name: src
Committed By: martin
Date: Sun Apr 12 17:33:24 UTC 2020
Modified Files:
src/doc [netbsd-9]: 3RDPARTY
src/external/bsd/dhcpcd/dist/src [netbsd-9]: defs.h dhcp6.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1640.2.13 -r1.1640.2.14 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.25.2.7 -r1.1.1.25.2.8 \
src/external/bsd/dhcpcd/dist/src/defs.h
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/external/bsd/dhcpcd/dist/src/dhcp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1640.2.13 src/doc/3RDPARTY:1.1640.2.14
--- src/doc/3RDPARTY:1.1640.2.13 Sun Apr 12 08:29:40 2020
+++ src/doc/3RDPARTY Sun Apr 12 17:33:24 2020
@@ -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 @@ Notes:
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: [email protected]
License: BSD (2-clause)
Location: external/bsd/dhcpcd/dist
Index: src/external/bsd/dhcpcd/dist/src/defs.h
diff -u src/external/bsd/dhcpcd/dist/src/defs.h:1.1.1.25.2.7 src/external/bsd/dhcpcd/dist/src/defs.h:1.1.1.25.2.8
--- src/external/bsd/dhcpcd/dist/src/defs.h:1.1.1.25.2.7 Sun Apr 12 08:29:40 2020
+++ src/external/bsd/dhcpcd/dist/src/defs.h Sun Apr 12 17:33:24 2020
@@ -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"
Index: src/external/bsd/dhcpcd/dist/src/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.11.2.5 src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.11.2.6
--- src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.11.2.5 Sun Apr 12 08:29:40 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcp6.c Sun Apr 12 17:33:24 2020
@@ -3943,16 +3943,17 @@ dhcp6_free(struct interface *ifp)
void
dhcp6_abort(struct interface *ifp)
{
-#ifdef ND6_ADVERTISE
struct dhcp6_state *state;
+#ifdef ND6_ADVERTISE
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);
}
