Module Name: src
Committed By: roy
Date: Wed Nov 26 16:05:14 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: defs.h dhcpcd-run-hooks.in ipv4.c
script.c
src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 01-test
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/defs.h \
src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
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/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.8 src/external/bsd/dhcpcd/dist/defs.h:1.9
--- src/external/bsd/dhcpcd/dist/defs.h:1.8 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/defs.h Wed Nov 26 16:05:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.8 2014/11/26 13:43:06 roy Exp $ */
+/* $NetBSD: defs.h,v 1.9 2014/11/26 16:05:14 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "6.6.3"
+#define VERSION "6.6.4"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
Index: src/external/bsd/dhcpcd/dist/ipv4.c
diff -u src/external/bsd/dhcpcd/dist/ipv4.c:1.8 src/external/bsd/dhcpcd/dist/ipv4.c:1.9
--- src/external/bsd/dhcpcd/dist/ipv4.c:1.8 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/ipv4.c Wed Nov 26 16:05:14 2014
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
- __RCSID("$NetBSD: ipv4.c,v 1.8 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: ipv4.c,v 1.9 2014/11/26 16:05:14 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -598,7 +598,7 @@ ipv4_buildroutes(struct dhcpcd_ctx *ctx)
struct rt_head *nrs, *dnr;
struct rt *or, *rt, *rtn;
struct interface *ifp;
- const struct dhcp_state *state, *ostate;
+ const struct dhcp_state *state;
nrs = malloc(sizeof(*nrs));
if (nrs == NULL) {
Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.6 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.7
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.6 Fri Nov 7 20:51:02 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in Wed Nov 26 16:05:14 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: dhcpcd-run-hooks.in,v 1.6 2014/11/07 20:51:02 roy Exp $
+# $NetBSD: dhcpcd-run-hooks.in,v 1.7 2014/11/26 16:05:14 roy Exp $
# dhcpcd client configuration script
@@ -26,6 +26,7 @@ _detected_init=false
: ${if_up:=false}
: ${if_down:=false}
+: ${syslog_debug:=false}
# Ensure that all arguments are unique
uniqify()
@@ -191,6 +192,9 @@ syslog()
{
local lvl="$1"
+ if [ "$lvl" = debug ]; then
+ ${syslog_debug} || return 0
+ fi
[ -n "$lvl" ] && shift
if [ -n "$*" ]; then
if type logger >/dev/null 2>&1; then
Index: src/external/bsd/dhcpcd/dist/script.c
diff -u src/external/bsd/dhcpcd/dist/script.c:1.14 src/external/bsd/dhcpcd/dist/script.c:1.15
--- src/external/bsd/dhcpcd/dist/script.c:1.14 Fri Nov 7 20:51:03 2014
+++ src/external/bsd/dhcpcd/dist/script.c Wed Nov 26 16:05:14 2014
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
- __RCSID("$NetBSD: script.c,v 1.14 2014/11/07 20:51:03 roy Exp $");
+ __RCSID("$NetBSD: script.c,v 1.15 2014/11/26 16:05:14 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -291,8 +291,8 @@ make_env(const struct interface *ifp, co
elen = 13;
#define EMALLOC(i, l) if ((env[(i)] = malloc((l))) == NULL) goto eexit;
- /* Make our env */
- env = calloc(1, sizeof(char *) * (elen + 1));
+ /* Make our env + space for profile, wireless and debug */
+ env = calloc(1, sizeof(char *) * (elen + 3 + 1));
if (env == NULL)
goto eexit;
e = strlen("interface") + strlen(ifp->name) + 2;
@@ -375,8 +375,13 @@ make_env(const struct interface *ifp, co
env[12] = strdup("if_ipwaited=false");
if (env[12] == NULL)
goto eexit;
+ if (ifo->options & DHCPCD_DEBUG) {
+ e = strlen("syslog_debug=true") + 1;
+ EMALLOC(elen, e);
+ snprintf(env[elen++], e, "syslog_debug=true");
+ }
if (*ifp->profile) {
- e = strlen("profile=") + strlen(ifp->profile) + 2;
+ e = strlen("profile=") + strlen(ifp->profile) + 1;
EMALLOC(elen, e);
snprintf(env[elen++], e, "profile=%s", ifp->profile);
}
Index: src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.6 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.7
--- src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test:1.6 Fri Nov 7 20:51:03 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test Wed Nov 26 16:05:14 2014
@@ -1,9 +1,9 @@
-# $NetBSD: 01-test,v 1.6 2014/11/07 20:51:03 roy Exp $
+# $NetBSD: 01-test,v 1.7 2014/11/26 16:05:14 roy Exp $
# Just echo our DHCP options we have
if [ "$reason" = "TEST" ]; then
- set | grep "^\(interface\|pid\|reason\|skip_hooks\)=" | sort
+ set | grep "^\(interface\|pid\|reason\|profile\|skip_hooks\)=" | sort
set | grep "^if\(carrier\|flags\|mtu\|wireless\|ssid\)=" | sort
set | grep "^\(new_\|old_\|ra_count=\|ra[0-9]*_\)" | sort
exit 0
