Module Name: src
Committed By: roy
Date: Fri Nov 7 20:32:05 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: arp.c arp.h auth.c auth.h bpf-filter.h
common.c common.h config.h control.c control.h defs.h dev.h
dhcp-common.c dhcp-common.h dhcp.c dhcp.h dhcp6.c dhcp6.h
dhcpcd-definitions.conf dhcpcd-embedded.c dhcpcd-embedded.h
dhcpcd-run-hooks.8.in dhcpcd-run-hooks.in dhcpcd.8.in dhcpcd.c
dhcpcd.conf dhcpcd.conf.5.in dhcpcd.h duid.c duid.h eloop.c eloop.h
if-bsd.c if-options.c if-options.h if.c if.h ipv4.c ipv4.h ipv4ll.c
ipv4ll.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h script.c script.h
src/external/bsd/dhcpcd/dist/crypt: crypt.h hmac_md5.c
src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 01-test 02-dump 10-mtu
10-wpa_supplicant 15-timezone 20-resolv.conf 29-lookup-hostname
30-hostname 50-ntp.conf 50-ypbind
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/arp.c \
src/external/bsd/dhcpcd/dist/arp.h src/external/bsd/dhcpcd/dist/auth.c \
src/external/bsd/dhcpcd/dist/auth.h src/external/bsd/dhcpcd/dist/common.c \
src/external/bsd/dhcpcd/dist/common.h \
src/external/bsd/dhcpcd/dist/config.h \
src/external/bsd/dhcpcd/dist/control.c \
src/external/bsd/dhcpcd/dist/control.h \
src/external/bsd/dhcpcd/dist/defs.h src/external/bsd/dhcpcd/dist/dev.h \
src/external/bsd/dhcpcd/dist/dhcp-common.c \
src/external/bsd/dhcpcd/dist/dhcp-common.h \
src/external/bsd/dhcpcd/dist/dhcp.h src/external/bsd/dhcpcd/dist/dhcp6.c \
src/external/bsd/dhcpcd/dist/dhcp6.h \
src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf \
src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c \
src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h \
src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in \
src/external/bsd/dhcpcd/dist/dhcpcd.h src/external/bsd/dhcpcd/dist/duid.c \
src/external/bsd/dhcpcd/dist/duid.h src/external/bsd/dhcpcd/dist/eloop.c \
src/external/bsd/dhcpcd/dist/eloop.h \
src/external/bsd/dhcpcd/dist/if-options.h \
src/external/bsd/dhcpcd/dist/if.c src/external/bsd/dhcpcd/dist/if.h \
src/external/bsd/dhcpcd/dist/ipv4.c src/external/bsd/dhcpcd/dist/ipv4.h \
src/external/bsd/dhcpcd/dist/ipv4ll.c \
src/external/bsd/dhcpcd/dist/ipv4ll.h src/external/bsd/dhcpcd/dist/ipv6.c \
src/external/bsd/dhcpcd/dist/ipv6.h src/external/bsd/dhcpcd/dist/ipv6nd.h \
src/external/bsd/dhcpcd/dist/script.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/bpf-filter.h
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/dhcpcd.c \
src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/dhcpcd.conf \
src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/if-options.c \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/crypt/crypt.h \
src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/arp.c
diff -u src/external/bsd/dhcpcd/dist/arp.c:1.4 src/external/bsd/dhcpcd/dist/arp.c:1.5
--- src/external/bsd/dhcpcd/dist/arp.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/arp.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: arp.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/arp.h
diff -u src/external/bsd/dhcpcd/dist/arp.h:1.4 src/external/bsd/dhcpcd/dist/arp.h:1.5
--- src/external/bsd/dhcpcd/dist/arp.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/arp.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: arp.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/auth.c
diff -u src/external/bsd/dhcpcd/dist/auth.c:1.4 src/external/bsd/dhcpcd/dist/auth.c:1.5
--- src/external/bsd/dhcpcd/dist/auth.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/auth.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: auth.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/auth.h
diff -u src/external/bsd/dhcpcd/dist/auth.h:1.4 src/external/bsd/dhcpcd/dist/auth.h:1.5
--- src/external/bsd/dhcpcd/dist/auth.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/auth.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: auth.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/common.c
diff -u src/external/bsd/dhcpcd/dist/common.c:1.4 src/external/bsd/dhcpcd/dist/common.c:1.5
--- src/external/bsd/dhcpcd/dist/common.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/common.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: common.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/common.h
diff -u src/external/bsd/dhcpcd/dist/common.h:1.4 src/external/bsd/dhcpcd/dist/common.h:1.5
--- src/external/bsd/dhcpcd/dist/common.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/common.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: common.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/config.h
diff -u src/external/bsd/dhcpcd/dist/config.h:1.4 src/external/bsd/dhcpcd/dist/config.h:1.5
--- src/external/bsd/dhcpcd/dist/config.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/config.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: config.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/* netbsd */
#define SYSCONFDIR "/etc"
#define SBINDIR "/sbin"
Index: src/external/bsd/dhcpcd/dist/control.c
diff -u src/external/bsd/dhcpcd/dist/control.c:1.4 src/external/bsd/dhcpcd/dist/control.c:1.5
--- src/external/bsd/dhcpcd/dist/control.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/control.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: control.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/control.h
diff -u src/external/bsd/dhcpcd/dist/control.h:1.4 src/external/bsd/dhcpcd/dist/control.h:1.5
--- src/external/bsd/dhcpcd/dist/control.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/control.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: control.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.4 src/external/bsd/dhcpcd/dist/defs.h:1.5
--- src/external/bsd/dhcpcd/dist/defs.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/defs.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: defs.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
@@ -30,7 +28,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "6.6.0"
+#define VERSION "6.6.1"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
Index: src/external/bsd/dhcpcd/dist/dev.h
diff -u src/external/bsd/dhcpcd/dist/dev.h:1.4 src/external/bsd/dhcpcd/dist/dev.h:1.5
--- src/external/bsd/dhcpcd/dist/dev.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dev.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dev.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp-common.c
diff -u src/external/bsd/dhcpcd/dist/dhcp-common.c:1.4 src/external/bsd/dhcpcd/dist/dhcp-common.c:1.5
--- src/external/bsd/dhcpcd/dist/dhcp-common.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp-common.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp-common.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp-common.h
diff -u src/external/bsd/dhcpcd/dist/dhcp-common.h:1.4 src/external/bsd/dhcpcd/dist/dhcp-common.h:1.5
--- src/external/bsd/dhcpcd/dist/dhcp-common.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp-common.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dhcp-common.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp.h
diff -u src/external/bsd/dhcpcd/dist/dhcp.h:1.4 src/external/bsd/dhcpcd/dist/dhcp.h:1.5
--- src/external/bsd/dhcpcd/dist/dhcp.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dhcp.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/dhcp6.c:1.4 src/external/bsd/dhcpcd/dist/dhcp6.c:1.5
--- src/external/bsd/dhcpcd/dist/dhcp6.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp6.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp6.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp6.h
diff -u src/external/bsd/dhcpcd/dist/dhcp6.h:1.4 src/external/bsd/dhcpcd/dist/dhcp6.h:1.5
--- src/external/bsd/dhcpcd/dist/dhcp6.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp6.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dhcp6.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf:1.4 src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-# $NetBSD: dhcpcd-definitions.conf,v 1.4 2014/10/29 01:08:31 roy Exp $
-
# Copyright (c) 2006-2014 Roy Marples
# All rights reserved
Index: src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c:1.4 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd-embedded.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* DO NOT EDIT
* Automatically generated from dhcpcd-embedded.conf
Index: src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h:1.4 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dhcpcd-embedded.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.4 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in Fri Nov 7 20:32:05 2014
@@ -1,6 +1,4 @@
#!/bin/sh
-# $NetBSD: dhcpcd-run-hooks.in,v 1.4 2014/10/29 01:08:31 roy Exp $
-
# dhcpcd client configuration script
# Handy variables and functions for our hooks to use
Index: src/external/bsd/dhcpcd/dist/dhcpcd.h
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.h:1.4 src/external/bsd/dhcpcd/dist/dhcpcd.h:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: dhcpcd.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/duid.c
diff -u src/external/bsd/dhcpcd/dist/duid.c:1.4 src/external/bsd/dhcpcd/dist/duid.c:1.5
--- src/external/bsd/dhcpcd/dist/duid.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/duid.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: duid.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/duid.h
diff -u src/external/bsd/dhcpcd/dist/duid.h:1.4 src/external/bsd/dhcpcd/dist/duid.h:1.5
--- src/external/bsd/dhcpcd/dist/duid.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/duid.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: duid.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/eloop.c
diff -u src/external/bsd/dhcpcd/dist/eloop.c:1.4 src/external/bsd/dhcpcd/dist/eloop.c:1.5
--- src/external/bsd/dhcpcd/dist/eloop.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/eloop.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: eloop.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/eloop.h
diff -u src/external/bsd/dhcpcd/dist/eloop.h:1.4 src/external/bsd/dhcpcd/dist/eloop.h:1.5
--- src/external/bsd/dhcpcd/dist/eloop.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/eloop.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: eloop.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/if-options.h
diff -u src/external/bsd/dhcpcd/dist/if-options.h:1.4 src/external/bsd/dhcpcd/dist/if-options.h:1.5
--- src/external/bsd/dhcpcd/dist/if-options.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/if-options.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: if-options.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/if.c
diff -u src/external/bsd/dhcpcd/dist/if.c:1.4 src/external/bsd/dhcpcd/dist/if.c:1.5
--- src/external/bsd/dhcpcd/dist/if.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/if.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: if.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/if.h
diff -u src/external/bsd/dhcpcd/dist/if.h:1.4 src/external/bsd/dhcpcd/dist/if.h:1.5
--- src/external/bsd/dhcpcd/dist/if.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/if.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: if.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv4.c
diff -u src/external/bsd/dhcpcd/dist/ipv4.c:1.4 src/external/bsd/dhcpcd/dist/ipv4.c:1.5
--- src/external/bsd/dhcpcd/dist/ipv4.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv4.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: ipv4.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv4.h
diff -u src/external/bsd/dhcpcd/dist/ipv4.h:1.4 src/external/bsd/dhcpcd/dist/ipv4.h:1.5
--- src/external/bsd/dhcpcd/dist/ipv4.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv4.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: ipv4.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv4ll.c
diff -u src/external/bsd/dhcpcd/dist/ipv4ll.c:1.4 src/external/bsd/dhcpcd/dist/ipv4ll.c:1.5
--- src/external/bsd/dhcpcd/dist/ipv4ll.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv4ll.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: ipv4ll.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv4ll.h
diff -u src/external/bsd/dhcpcd/dist/ipv4ll.h:1.4 src/external/bsd/dhcpcd/dist/ipv4ll.h:1.5
--- src/external/bsd/dhcpcd/dist/ipv4ll.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv4ll.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: ipv4ll.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2012 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv6.c
diff -u src/external/bsd/dhcpcd/dist/ipv6.c:1.4 src/external/bsd/dhcpcd/dist/ipv6.c:1.5
--- src/external/bsd/dhcpcd/dist/ipv6.c:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv6.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: ipv6.c,v 1.4 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
@@ -985,7 +982,7 @@ static int
ipv6_addlinklocal(struct interface *ifp)
{
struct ipv6_state *state;
- struct ipv6_addr *ap;
+ struct ipv6_addr *ap, *ap2;
int dadcounter;
if (ipv6_linklocal(ifp))
@@ -1023,6 +1020,7 @@ ipv6_addlinklocal(struct interface *ifp)
if (ifp->options->options & DHCPCD_SLAACPRIVATE) {
dadcounter = 0;
+nextslaacprivate:
if (ipv6_makestableprivate(&ap->addr,
&ap->prefix, ap->prefix_len, ifp, &dadcounter) == -1)
{
@@ -1057,6 +1055,29 @@ ipv6_addlinklocal(struct interface *ifp)
EUI64_TO_IFID(&ap->addr);
}
+ /* Do we already have this address? */
+ TAILQ_FOREACH(ap2, &state->addrs, next) {
+ if (IN6_ARE_ADDR_EQUAL(&ap->addr, &ap2->addr)) {
+ if (ap2->addr_flags & IN6_IFF_DUPLICATED) {
+ if (ifp->options->options &
+ DHCPCD_SLAACPRIVATE)
+ {
+ dadcounter++;
+ goto nextslaacprivate;
+ }
+ free(ap);
+ errno = EADDRNOTAVAIL;
+ return -1;
+ }
+
+ syslog(LOG_WARNING, "%s: waiting for %s to complete",
+ ap2->iface->name, ap2->saddr);
+ free(ap);
+ errno = EEXIST;
+ return 0;
+ }
+ }
+
inet_ntop(AF_INET6, &ap->addr, ap->saddr, sizeof(ap->saddr));
TAILQ_INSERT_TAIL(&state->addrs, ap, next);
ipv6_addaddr(ap);
Index: src/external/bsd/dhcpcd/dist/ipv6.h
diff -u src/external/bsd/dhcpcd/dist/ipv6.h:1.4 src/external/bsd/dhcpcd/dist/ipv6.h:1.5
--- src/external/bsd/dhcpcd/dist/ipv6.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv6.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: ipv6.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv6nd.h
diff -u src/external/bsd/dhcpcd/dist/ipv6nd.h:1.4 src/external/bsd/dhcpcd/dist/ipv6nd.h:1.5
--- src/external/bsd/dhcpcd/dist/ipv6nd.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv6nd.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: ipv6nd.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/script.h
diff -u src/external/bsd/dhcpcd/dist/script.h:1.4 src/external/bsd/dhcpcd/dist/script.h:1.5
--- src/external/bsd/dhcpcd/dist/script.h:1.4 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/script.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: script.h,v 1.4 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2013 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/bpf-filter.h
diff -u src/external/bsd/dhcpcd/dist/bpf-filter.h:1.7 src/external/bsd/dhcpcd/dist/bpf-filter.h:1.8
--- src/external/bsd/dhcpcd/dist/bpf-filter.h:1.7 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/bpf-filter.h Fri Nov 7 20:32:04 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: bpf-filter.h,v 1.7 2014/10/29 01:08:31 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2008 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.20 src/external/bsd/dhcpcd/dist/dhcp.c:1.21
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.20 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c Fri Nov 7 20:32:04 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp.c,v 1.20 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.10 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.11
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.10 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in Fri Nov 7 20:32:05 2014
@@ -1,4 +1,3 @@
-.\" $NetBSD: dhcpcd-run-hooks.8.in,v 1.10 2014/10/29 01:08:31 roy Exp $
.\" Copyright (c) 2006-2014 Roy Marples
.\" All rights reserved
.\"
Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.34 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.35
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.34 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Fri Nov 7 20:32:05 2014
@@ -1,4 +1,3 @@
-.\" $NetBSD: dhcpcd.8.in,v 1.34 2014/10/29 01:08:31 roy Exp $
.\" Copyright (c) 2006-2014 Roy Marples
.\" All rights reserved
.\"
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.14 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.15
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.14 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd.c,v 1.14 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
@@ -627,7 +624,7 @@ pre_start(struct interface *ifp)
* from under us. */
if (ifp->options->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
- ifp->options->options &= DHCPCD_IPV6;
+ ifp->options->options &= ~DHCPCD_IPV6;
}
}
@@ -804,7 +801,7 @@ dhcpcd_initstate1(struct interface *ifp,
* inadvertently ups the interface. */
if (ifo->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
- ifo->options &= DHCPCD_IPV6;
+ ifo->options &= ~DHCPCD_IPV6;
}
}
@@ -973,18 +970,18 @@ reconf_reboot(struct dhcpcd_ctx *ctx, in
static void
stop_all_interfaces(struct dhcpcd_ctx *ctx, int do_release)
{
- struct interface *ifp, *ifpm;
+ struct interface *ifp;
/* drop_dhcp could change the order, so we do it like this. */
for (;;) {
- /* Be sane and drop the last config first */
- ifp = TAILQ_LAST(ctx->ifaces, if_head);
+ /* Be sane and drop the last config first,
+ * skipping any pseudo interfaces */
+ TAILQ_FOREACH_REVERSE(ifp, ctx->ifaces, if_head, next) {
+ if (!(ifp->options->options & DHCPCD_PFXDLGONLY))
+ break;
+ }
if (ifp == NULL)
break;
- /* Stop the master interface only */
- ifpm = if_find(ifp->ctx, ifp->name);
- if (ifpm)
- ifp = ifpm;
if (do_release) {
ifp->options->options |= DHCPCD_RELEASE;
ifp->options->options &= ~DHCPCD_PERSISTENT;
Index: src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.14 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.15
--- src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.14 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in Fri Nov 7 20:32:05 2014
@@ -1,4 +1,3 @@
-.\" $NetBSD: dhcpcd.conf.5.in,v 1.14 2014/10/29 01:08:31 roy Exp $
.\" Copyright (c) 2006-2014 Roy Marples
.\" All rights reserved
.\"
Index: src/external/bsd/dhcpcd/dist/dhcpcd.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.13 src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.14
--- src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.13 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.conf Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-# $NetBSD: dhcpcd.conf,v 1.13 2014/10/29 01:08:31 roy Exp $
-
# A sample configuration for dhcpcd.
# See dhcpcd.conf(5) for details.
Index: src/external/bsd/dhcpcd/dist/if-bsd.c
diff -u src/external/bsd/dhcpcd/dist/if-bsd.c:1.13 src/external/bsd/dhcpcd/dist/if-bsd.c:1.14
--- src/external/bsd/dhcpcd/dist/if-bsd.c:1.13 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/if-bsd.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: if-bsd.c,v 1.13 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/if-options.c
diff -u src/external/bsd/dhcpcd/dist/if-options.c:1.15 src/external/bsd/dhcpcd/dist/if-options.c:1.16
--- src/external/bsd/dhcpcd/dist/if-options.c:1.15 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/if-options.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: if-options.c,v 1.15 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/ipv6nd.c
diff -u src/external/bsd/dhcpcd/dist/ipv6nd.c:1.15 src/external/bsd/dhcpcd/dist/ipv6nd.c:1.16
--- src/external/bsd/dhcpcd/dist/ipv6nd.c:1.15 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/ipv6nd.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: ipv6nd.c,v 1.15 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/script.c
diff -u src/external/bsd/dhcpcd/dist/script.c:1.12 src/external/bsd/dhcpcd/dist/script.c:1.13
--- src/external/bsd/dhcpcd/dist/script.c:1.12 Wed Oct 29 01:08:31 2014
+++ src/external/bsd/dhcpcd/dist/script.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: script.c,v 1.12 2014/10/29 01:08:31 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/crypt/crypt.h
diff -u src/external/bsd/dhcpcd/dist/crypt/crypt.h:1.3 src/external/bsd/dhcpcd/dist/crypt/crypt.h:1.4
--- src/external/bsd/dhcpcd/dist/crypt/crypt.h:1.3 Fri Oct 17 23:42:24 2014
+++ src/external/bsd/dhcpcd/dist/crypt/crypt.h Fri Nov 7 20:32:05 2014
@@ -1,5 +1,3 @@
-/* $NetBSD: crypt.h,v 1.3 2014/10/17 23:42:24 roy Exp $ */
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
diff -u src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c:1.3 src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c:1.4
--- src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c:1.3 Fri Oct 17 23:42:24 2014
+++ src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c Fri Nov 7 20:32:05 2014
@@ -1,6 +1,3 @@
-#include <sys/cdefs.h>
- __RCSID("$NetBSD: hmac_md5.c,v 1.3 2014/10/17 23:42:24 roy Exp $");
-
/*
* dhcpcd - DHCP client daemon
* Copyright (c) 2006-2014 Roy Marples <[email protected]>
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 01-test,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Just echo our DHCP options we have
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 02-dump,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Just echo our DHCP options we have
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 10-mtu,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Configure the MTU for the interface
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 10-wpa_supplicant,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Start, reconfigure and stop wpa_supplicant per wireless interface.
# This is needed because wpa_supplicant lacks hotplugging of any kind
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 15-timezone,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Configure timezone
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 20-resolv.conf,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Generate /etc/resolv.conf
# Support resolvconf(8) if available
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 29-lookup-hostname,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Lookup the hostname in DNS if not set
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 30-hostname,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Set the hostname from DHCP data if required
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 50-ntp.conf,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Sample dhcpcd hook script for ntp
# Like our resolv.conf hook script, we store a database of ntp.conf files
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind:1.3 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind:1.3 Fri Oct 17 23:42:25 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind Fri Nov 7 20:32:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: 50-ypbind,v 1.3 2014/10/17 23:42:25 roy Exp $
+
# Sample dhcpcd hook for ypbind
# This script is only suitable for the BSD versions.
