CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Sat Jan 31 07:47:49 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 469 To generate a diff of this commit: cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.189 src/doc/CHANGES-7.0:1.1.2.190 --- src/doc/CHANGES-7.0:1.1.2.189 Fri Jan 30 07:54:13 2015 +++ src/doc/CHANGES-7.0 Sat Jan 31 07:47:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.189 2015/01/30 07:54:13 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.190 2015/01/31 07:47:49 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -15263,3 +15263,8 @@ external/bsd/atf/dist/atf-c/macros_test. reference to PR toolchain/49187. [gson, ticket #471] +sys/dev/pci/if_fpa.c1.60 + + Fix missing "sc->sc_dev = self" initialization. PR port-i386/49602. + [martin, ticket #469] +
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Sat Jan 31 07:44:13 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: if_fpa.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #469):
sys/dev/pci/if_fpa.c: revision 1.60
Fix obviously missing "sc->sc_dev = self" initialization.
Might help PR port-i386/49602.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 src/sys/dev/pci/if_fpa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_fpa.c
diff -u src/sys/dev/pci/if_fpa.c:1.59 src/sys/dev/pci/if_fpa.c:1.59.4.1
--- src/sys/dev/pci/if_fpa.c:1.59 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_fpa.c Sat Jan 31 07:44:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_fpa.c,v 1.59.4.1 2015/01/31 07:44:13 snj Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.59.4.1 2015/01/31 07:44:13 snj Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -410,6 +410,8 @@ pdq_pci_attach(device_t const parent, de
aprint_naive(": FDDI controller\n");
+sc->sc_dev = self;
+
data = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CFLT);
if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
data &= ~0xFF00;
CVS commit: src/doc
Module Name:src Committed By: spz Date: Fri Jan 30 23:00:06 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: note the libevent update To generate a diff of this commit: cvs rdiff -u -r1.1198 -r1.1199 src/doc/3RDPARTY cvs rdiff -u -r1.2042 -r1.2043 src/doc/CHANGES 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.1198 src/doc/3RDPARTY:1.1199 --- src/doc/3RDPARTY:1.1198 Fri Jan 30 10:21:23 2015 +++ src/doc/3RDPARTY Fri Jan 30 23:00:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1198 2015/01/30 10:21:23 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1199 2015/01/30 23:00:06 spz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -677,12 +677,12 @@ The lvm2tools and the libdevmapper are n repository. See the lvm2tools Notes for more information. Package: libevent -Version: 2.0.21-stable -Current Vers: 2.0.21-stable +Version: 2.0.22-stable +Current Vers: 2.0.22-stable Maintainer: Niels Provos Archive Site: http://www.monkey.org/~provos/libevent/ Home Page: http://www.monkey.org/~provos/libevent/ -Responsible: provos +Responsible: License: BSD (3/4-clause) Location: external/bsd/libevent/dist Notes: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2042 src/doc/CHANGES:1.2043 --- src/doc/CHANGES:1.2042 Fri Jan 30 10:21:23 2015 +++ src/doc/CHANGES Fri Jan 30 23:00:06 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2042 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2043 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -127,4 +127,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: arm: Add support for Zynq SoC. [hkenken 20150123] evbarm: Add support for the PARALLELLA (Zynq). [hkenken 20150123] blacklist: Added daemon and library [christos 20150125] + libevent: Import libevent 2.0.22 [spz 20150129] dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130]
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Fri Jan 30 18:58:59 UTC 2015
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
chk.sh libverify.c main.c misc.c misc.h netpgpverify.1 verify.h
Log Message:
catch up with pkgsrc, update netpgpverify to 20150115:
+ add '-c dump' command to do a packet dump of the input
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.2 Fri Dec 5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd Fri Jan 30 18:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.2 2014/12/05 04:42:36 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.3 2015/01/30 18:58:59 agc Exp $
PROG=netpgpverify
@@ -30,3 +30,10 @@ tst:
./${PROG} -S sshtest-20140202.pub data.sig
@echo "expected failure, to check bad signatures fail to verify"
-sed -e 's|A|B|' data.gpg | ./${PROG} -S sshtest-20140202.pub
+ @echo ""
+ @echo "expected failure, no valid key for verification"
+ -./${PROG} -k /dev/null NetBSD-6.0_RC1_hashes.gpg
+ @echo "dumping now"
+ ./${PROG} -c dump -k pubring.gpg NetBSD-6.0_RC1_hashes.asc
+ @echo "dumping ssh now"
+ ./${PROG} -c dump -S sshtest-20140202.pub data.gpg
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.2 Fri Dec 5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c Fri Jan 30 18:58:59 2015
@@ -65,3 +65,48 @@ netpgp_deallocate(void *ptr, size_t size
free(ptr);
#endif
}
+
+#define HEXDUMP_LINELEN 16
+
+#ifndef PRIsize
+#define PRIsize "z"
+#endif
+
+/* show hexadecimal/ascii dump */
+ssize_t
+netpgp_hexdump(const void *vin, const size_t len, void *outvp, size_t size)
+{
+ const char *in = (const char *)vin;
+ size_t i;
+ char line[HEXDUMP_LINELEN + 1];
+ char *out = (char *)outvp;
+ int o;
+
+ for (i = 0, o = 0 ; i < len ; i++) {
+ if (i % HEXDUMP_LINELEN == 0) {
+ o += snprintf(&out[o], size - o,
+ "%.5" PRIsize "u | ", i);
+ } else if (i % (HEXDUMP_LINELEN / 2) == 0) {
+ o += snprintf(&out[o], size - o, " ");
+ }
+ o += snprintf(&out[o], size - o, "%.02x ", (uint8_t)in[i]);
+ line[i % HEXDUMP_LINELEN] =
+ (isprint((uint8_t)in[i])) ? in[i] : '.';
+ if (i % HEXDUMP_LINELEN == HEXDUMP_LINELEN - 1) {
+ line[HEXDUMP_LINELEN] = 0x0;
+ o += snprintf(&out[o], size - o, " | %s\n", line);
+ }
+ }
+ if (i % HEXDUMP_LINELEN != 0) {
+ for ( ; i % HEXDUMP_LINELEN != 0 ; i++) {
+ o += snprintf(&out[o], size - o, " ");
+ if (i % (HEXDUMP_LINELEN / 2) == 0) {
+o += snprintf(&out[o], size - o, " ");
+ }
+ line[i % HEXDUMP_LINELEN] = ' ';
+ }
+ line[HEXDUMP_LINELEN] = 0x0;
+ o += snprintf(&out[o], size - o, " | %s\n", line);
+ }
+ return (ssize_t)o;
+}
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh Fri Jan 30 18:58:59 2015
@@ -1,8 +1,8 @@
#! /bin/sh
-# $NetBSD: chk.sh,v 1.1 2014/03/09 00:15:45 agc Exp $
+# $NetBSD: chk.sh,v 1.2 2015/01/30 18:58:59 agc Exp $
-# Copyright (c) 2013,2014 Alistair Crooks
+# Copyright (c) 2013,2014,2015 Alistair Crooks
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,10 @@ die() {
os=EdgeBSD
osrev=6
arch=amd64
-pkgsrc=pkgsrc-2013Q2
-keyring=""
+pkgsrc=pkgsrc-2013Q1
while [ $# -gt 0 ]; do
case "$1" in
--arch|-a) arch=$2; shift ;;
- --keyring|-k) keyring=$2; shift ;;
--os|-o) os=$2; shift ;;
--pkgsrc) pkgsrc=$2; shift ;;
-v) set
CVS commit: src
Module Name:src
Committed By: nonaka
Date: Fri Jan 30 15:04:35 UTC 2015
Modified Files:
src/distrib/evbppc/md-kernel: Makefile
src/etc/etc.evbppc: Makefile.inc
src/sys/arch/evbppc/mpc85xx: machdep.c
Added Files:
src/sys/arch/evbppc/conf: INSTALL_RB850GX2 RB850GX2
Log Message:
Added RouterBOARD RB850Gx2 config. md root only.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbppc/md-kernel/Makefile
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbppc/conf/INSTALL_RB850GX2 \
src/sys/arch/evbppc/conf/RB850GX2
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/md-kernel/Makefile
diff -u src/distrib/evbppc/md-kernel/Makefile:1.5 src/distrib/evbppc/md-kernel/Makefile:1.6
--- src/distrib/evbppc/md-kernel/Makefile:1.5 Sat Aug 2 15:51:18 2014
+++ src/distrib/evbppc/md-kernel/Makefile Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/08/02 15:51:18 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/30 15:04:35 nonaka Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,7 @@ RAMDISKDIR!= cd ${.CURDIR}/../ramdisk &&
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= INSTALL_OPENBLOCKS266 ${RAMDISK} - \
+ INSTALL_RB850GX2 ${RAMDISK} - \
INSTALL_TWRP1025 ${RAMDISK} - \
INSTALL_WALNUT ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
Index: src/etc/etc.evbppc/Makefile.inc
diff -u src/etc/etc.evbppc/Makefile.inc:1.12 src/etc/etc.evbppc/Makefile.inc:1.13
--- src/etc/etc.evbppc/Makefile.inc:1.12 Fri Feb 28 06:10:54 2014
+++ src/etc/etc.evbppc/Makefile.inc Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2014/02/28 06:10:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2015/01/30 15:04:35 nonaka Exp $
#
# etc.evbppc/Makefile.inc -- evbppc-specific etc Makefile targets
#
@@ -9,9 +9,11 @@
.if ${MACHINE_ARCH} == "powerpc"
KERNEL_SETS= WALNUT EXPLORA451 OPENBLOCKS200 OPENBLOCKS266
KERNEL_SETS+= EV64260 PMPPC
-KERNEL_SETS+= MPC8536DS MPC8548CDS P2020DS P2020RDB RB800 TWRP1025
+KERNEL_SETS+= MPC8536DS MPC8548CDS P2020DS P2020RDB RB800 RB850GX2
+KERNEL_SETS+= TWRP1025
KERNEL_SUFFIXES= img
BUILD_KERNELS= INSTALL_WALNUT INSTALL_OPENBLOCKS266 INSTALL_PMPPC
-BUILD_KERNELS+= INSTALL_P2020DS INSTALL_P2020RDB INSTALL_TWRP1025
+BUILD_KERNELS+= INSTALL_P2020DS INSTALL_P2020RDB INSTALL_RB850GX2
+BUILD_KERNELS+= INSTALL_TWRP1025
.endif
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.40 src/sys/arch/evbppc/mpc85xx/machdep.c:1.41
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.40 Fri Jan 23 07:27:05 2015
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.40 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: machdep.c,v 1.41 2015/01/30 15:04:35 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1082,6 +1082,7 @@ calltozero(void)
panic("call to 0 from %p", __builtin_return_address(0));
}
+#if !defined(ROUTERBOOT)
static void
parse_cmdline(char *cp)
{
@@ -1117,6 +1118,7 @@ parse_cmdline(char *cp)
if (root_string[0])
printf(" root=%s", root_string);
}
+#endif /* !ROUTERBOOT */
void
initppc(vaddr_t startkernel, vaddr_t endkernel,
@@ -1129,12 +1131,14 @@ initppc(vaddr_t startkernel, vaddr_t end
printf(" initppc(%#"PRIxVADDR", %#"PRIxVADDR", %p, %p, %p, %p)",
startkernel, endkernel, a0, a1, a2, a3);
+#if !defined(ROUTERBOOT)
if (a2[0] != '\0')
printf(" consdev=<%s>", a2);
if (a3[0] != '\0') {
printf(" cmdline=<%s>", a3);
parse_cmdline(a3);
}
+#endif /* !ROUTERBOOT */
/*
* Make sure we don't enter NAP or SLEEP if PSL_POW (MSR[WE]) is set.
Added files:
Index: src/sys/arch/evbppc/conf/INSTALL_RB850GX2
diff -u /dev/null src/sys/arch/evbppc/conf/INSTALL_RB850GX2:1.1
--- /dev/null Fri Jan 30 15:04:35 2015
+++ src/sys/arch/evbppc/conf/INSTALL_RB850GX2 Fri Jan 30 15:04:35 2015
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL_RB850GX2,v 1.1 2015/01/30 15:04:35 nonaka Exp $
+
+include "arch/evbppc/conf/RB850GX2"
+
+#ident "INSTALL_RB850GX2-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
Index: src/sys/arch/evbppc/conf/RB850GX2
diff -u /dev/null src/sys/arch/evbppc/conf/RB850GX2:1.1
--- /dev/null Fri Jan 30 15:04:35 2015
+++ src/sys/arch/evbppc/conf/RB850GX2 Fri Jan 30 15:04:35 2015
@@ -0,0 +1,167 @@
+# $NetBSD: RB850GX2,v 1.1 2015/01/30 15:04:35 nonaka Exp $
+#
+# RouterBOARD RB850Gx2
+#
+
+include "arch/evbppc/conf/std.mpc85xx"
+
+options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+ident "RB850GX2-$Revision: 1.1 $"
+
+maxusers 32
+
+#options UVMHIST
+#options UVMHIST_PRINT
+
+options P1023
+options SYS_CLK=6667
+#options HZ=1000
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: nonaka Date: Fri Jan 30 14:54:46 UTC 2015 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Added lockstat To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.19 src/sys/arch/evbppc/conf/TWRP1025:1.20 --- src/sys/arch/evbppc/conf/TWRP1025:1.19 Fri Dec 26 11:56:14 2014 +++ src/sys/arch/evbppc/conf/TWRP1025 Fri Jan 30 14:54:46 2015 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.19 2014/12/26 11:56:14 nonaka Exp $ +# $NetBSD: TWRP1025,v 1.20 2015/01/30 14:54:46 nonaka Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "TWRP1025-$Revision: 1.19 $" +ident "TWRP1025-$Revision: 1.20 $" maxusers 32 @@ -230,3 +230,4 @@ pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp pseudo-device vlan # 802.1Q VLANs +pseudo-device lockstat # lock profiling
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: joerg Date: Fri Jan 30 14:32:19 UTC 2015 Modified Files: src/sys/arch/arm/conf: std.arm Log Message: Disable ARM's CPU_IN_CKSUM until the bugs are fixed. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/conf/std.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/conf/std.arm diff -u src/sys/arch/arm/conf/std.arm:1.1 src/sys/arch/arm/conf/std.arm:1.2 --- src/sys/arch/arm/conf/std.arm:1.1 Sun Jan 27 12:37:10 2008 +++ src/sys/arch/arm/conf/std.arm Fri Jan 30 14:32:19 2015 @@ -1,5 +1,5 @@ -# $NetBSD: std.arm,v 1.1 2008/01/27 12:37:10 chris Exp $ +# $NetBSD: std.arm,v 1.2 2015/01/30 14:32:19 joerg Exp $ # # standard NetBSD/arm options -options CPU_IN_CKSUM +#options CPU_IN_CKSUM
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Jan 30 12:23:47 UTC 2015
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
canonicalise the src dir to /usr/src, so it doesn't matter
where we run mknative.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.79 src/tools/gcc/mknative-gcc:1.80
--- src/tools/gcc/mknative-gcc:1.79 Thu May 29 16:27:50 2014
+++ src/tools/gcc/mknative-gcc Fri Jan 30 12:23:47 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp $
+# $NetBSD: mknative-gcc,v 1.80 2015/01/30 12:23:47 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -331,7 +331,7 @@ get_gcc () {
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
if [ "${MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
then
- ex <<__EOF__ $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
+ ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
/configuration_arguments/ s/$//
ya
i
@@ -355,6 +355,14 @@ a
wq
__EOF__
fi
+ if [ "${f}" = "configargs" ]
+ then
+ _srcquoted=$(echo "$_SRC" | sed 's/\//\\\//g')
+ ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
+/static const char configuration_arguments/ s/$_srcquoted/\/usr\/src/g
+wq
+__EOF__
+ fi
done
# keep identical
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jan 30 10:21:23 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.7.1 To generate a diff of this commit: cvs rdiff -u -r1.1197 -r1.1198 src/doc/3RDPARTY cvs rdiff -u -r1.2041 -r1.2042 src/doc/CHANGES 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.1197 src/doc/3RDPARTY:1.1198 --- src/doc/3RDPARTY:1.1197 Fri Jan 30 09:49:50 2015 +++ src/doc/3RDPARTY Fri Jan 30 10:21:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1197 2015/01/30 09:49:50 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1198 2015/01/30 10:21:23 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.7.0 -Current Vers: 6.7.0 +Version: 6.7.1 +Current Vers: 6.7.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2041 src/doc/CHANGES:1.2042 --- src/doc/CHANGES:1.2041 Fri Jan 30 09:49:50 2015 +++ src/doc/CHANGES Fri Jan 30 10:21:23 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2041 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2042 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -127,4 +127,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: arm: Add support for Zynq SoC. [hkenken 20150123] evbarm: Add support for the PARALLELLA (Zynq). [hkenken 20150123] blacklist: Added daemon and library [christos 20150125] - dhcpcd(8): Import dhcpcd-6.7.0. [roy 20150130] + dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri Jan 30 10:20:43 UTC 2015
Modified Files:
src/external/bsd/dhcpcd/dist: defs.h ipv6.h
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/ipv6.h
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.13 src/external/bsd/dhcpcd/dist/defs.h:1.14
--- src/external/bsd/dhcpcd/dist/defs.h:1.13 Fri Jan 30 09:47:05 2015
+++ src/external/bsd/dhcpcd/dist/defs.h Fri Jan 30 10:20:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.13 2015/01/30 09:47:05 roy Exp $ */
+/* $NetBSD: defs.h,v 1.14 2015/01/30 10:20:43 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "6.7.0"
+#define VERSION "6.7.1"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
Index: src/external/bsd/dhcpcd/dist/ipv6.h
diff -u src/external/bsd/dhcpcd/dist/ipv6.h:1.9 src/external/bsd/dhcpcd/dist/ipv6.h:1.10
--- src/external/bsd/dhcpcd/dist/ipv6.h:1.9 Fri Jan 30 09:47:05 2015
+++ src/external/bsd/dhcpcd/dist/ipv6.h Fri Jan 30 10:20:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipv6.h,v 1.9 2015/01/30 09:47:05 roy Exp $ */
+/* $NetBSD: ipv6.h,v 1.10 2015/01/30 10:20:43 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -266,6 +266,7 @@ void ipv6_buildroutes(struct dhcpcd_ctx
#define ipv6_free(a) {}
#define ipv6_drop(a) {}
#define ipv6_ctxfree(a) {}
+#define ipv6_gentempifid(a) {}
#endif
#endif
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Jan 30 10:18:46 UTC 2015 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24366 Log Message: Import dhcpcd-6.7.1 to fix a compile issue building without IPv6 support. Status: Vendor Tag: roy Release Tags: dhcpcd-6-7-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h C src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jan 30 09:49:50 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.7.0 To generate a diff of this commit: cvs rdiff -u -r1.1196 -r1.1197 src/doc/3RDPARTY cvs rdiff -u -r1.2040 -r1.2041 src/doc/CHANGES 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.1196 src/doc/3RDPARTY:1.1197 --- src/doc/3RDPARTY:1.1196 Sun Jan 25 22:58:23 2015 +++ src/doc/3RDPARTY Fri Jan 30 09:49:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1196 2015/01/25 22:58:23 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1197 2015/01/30 09:49:50 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.6.7 -Current Vers: 6.6.7 +Version: 6.7.0 +Current Vers: 6.7.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2040 src/doc/CHANGES:1.2041 --- src/doc/CHANGES:1.2040 Tue Jan 27 18:20:56 2015 +++ src/doc/CHANGES Fri Jan 30 09:49:50 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2040 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2041 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -127,3 +127,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: arm: Add support for Zynq SoC. [hkenken 20150123] evbarm: Add support for the PARALLELLA (Zynq). [hkenken 20150123] blacklist: Added daemon and library [christos 20150125] + dhcpcd(8): Import dhcpcd-6.7.0. [roy 20150130]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri Jan 30 09:47:05 UTC 2015
Modified Files:
src/external/bsd/dhcpcd/dist: arp.c arp.h auth.c auth.h common.c
common.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.8.in dhcpcd.c 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 ipv6.c ipv6.h ipv6nd.c ipv6nd.h script.c
src/external/bsd/dhcpcd/dist/crypt: crypt.h hmac_md5.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/arp.c \
src/external/bsd/dhcpcd/dist/dhcp6.c \
src/external/bsd/dhcpcd/dist/dhcpcd.h src/external/bsd/dhcpcd/dist/ipv6.h \
src/external/bsd/dhcpcd/dist/ipv6nd.h
cvs rdiff -u -r1.7 -r1.8 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/eloop.c \
src/external/bsd/dhcpcd/dist/if-options.h \
src/external/bsd/dhcpcd/dist/if.h src/external/bsd/dhcpcd/dist/ipv4.h \
src/external/bsd/dhcpcd/dist/ipv4ll.c src/external/bsd/dhcpcd/dist/ipv6.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/common.h \
src/external/bsd/dhcpcd/dist/control.c \
src/external/bsd/dhcpcd/dist/control.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.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/duid.c src/external/bsd/dhcpcd/dist/duid.h \
src/external/bsd/dhcpcd/dist/eloop.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/defs.h \
src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.39 -r1.40 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/dhcpcd/dist/if-bsd.c \
src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/if-options.c \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/if.c \
src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/crypt/crypt.h \
src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
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.8 src/external/bsd/dhcpcd/dist/arp.c:1.9
--- src/external/bsd/dhcpcd/dist/arp.c:1.8 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/arp.c Fri Jan 30 09:47:05 2015
@@ -1,9 +1,9 @@
#include
- __RCSID("$NetBSD: arp.c,v 1.8 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: arp.c,v 1.9 2015/01/30 09:47:05 roy Exp $");
/*
* dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples
+ * Copyright (c) 2006-2015 Roy Marples
* All rights reserved
* Redistribution and use in source and binary forms, with or without
Index: src/external/bsd/dhcpcd/dist/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/dhcp6.c:1.8 src/external/bsd/dhcpcd/dist/dhcp6.c:1.9
--- src/external/bsd/dhcpcd/dist/dhcp6.c:1.8 Wed Dec 17 20:50:08 2014
+++ src/external/bsd/dhcpcd/dist/dhcp6.c Fri Jan 30 09:47:05 2015
@@ -1,9 +1,9 @@
#include
- __RCSID("$NetBSD: dhcp6.c,v 1.8 2014/12/17 20:50:08 roy Exp $");
+ __RCSID("$NetBSD: dhcp6.c,v 1.9 2015/01/30 09:47:05 roy Exp $");
/*
* dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples
+ * Copyright (c) 2006-2015 Roy Marples
* All rights reserved
* Redistribution and use in source and binary forms, with or without
@@ -1739,6 +1739,7 @@ dhcp6_findna(struct interface *ifp, uint
a->ia_type = ot;
memcpy(a->iaid, iaid, sizeof(a->iaid));
a->addr = iap->addr;
+ a->created = *acquired;
/*
* RFC 5942 Section 5
@@ -1821,6 +1822,7 @@ dhcp6_findpd(struct interface *ifp, cons
}
a->iface = ifp;
a->flags = IPV6_AF_NEW | IPV6_AF_DELEGATEDPFX;
+ a->created = *acquired;
a->dadcallback = dhcp6_dadcallback;
a->ia_type = D6_OPTION_IA_PD;
memcpy(a->iaid, iaid, sizeof(a->iaid));
@@ -2287,7 +2289,7 @@ dhcp6_ifdelegateaddr(struct interface *i
a->dadcallback = dhcp6_dadcallback;
a->delegating_iface = ifs;
memcpy(&a->iaid, &prefix->iaid, sizeof(a->iaid));
- a->acquired = prefix->acqu
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Jan 30 09:40:26 UTC 2015 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3667 Log Message: Import dhcpcd-6.7.0 with the following changes: * Only release the DHCPv6 lease when dropping it. * Fix handling of ND6_IFF_OVERRIDE_RTADV on BSD. * Include paths.h to get _PATH_BPF. Thanks to Joerg Sonnenberger. * Report a better error of the kernel lacks a BPF equivalent filter. * Implement RFC4941, Privacy Extensions for Stateless Address Autoconfiguration in IPv6 when dhcpcd is overriding the in-kernel RA support. For BSD, this is a full userland implementation. * reject will now reject any DHCP message that contains that option. * Ignore RA's from ourself for very badly configured stations. Status: Vendor Tag: roy Release Tags: dhcpcd-6-7-0 C src/external/bsd/dhcpcd/dist/common.c C src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c C src/external/bsd/dhcpcd/dist/duid.c C src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if.c C src/external/bsd/dhcpcd/dist/if-options.c C src/external/bsd/dhcpcd/dist/script.c C src/external/bsd/dhcpcd/dist/dhcp-common.c C src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c C src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c C src/external/bsd/dhcpcd/dist/ipv4.c C src/external/bsd/dhcpcd/dist/ipv4ll.c C src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c C src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf C src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in C src/external/bsd/dhcpcd/dist/arp.h C src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h C src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h C src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h C src/external/bsd/dhcpcd/dist/dev.h C src/external/bsd/dhcpcd/dist/dhcp-common.h C src/external/bsd/dhcpcd/dist/dhcp.h C src/external/bsd/dhcpcd/dist/dhcp6.h C src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h C src/external/bsd/dhcpcd/dist/dhcpcd.h C src/external/bsd/dhcpcd/dist/duid.h C src/external/bsd/dhcpcd/dist/eloop.h C src/external/bsd/dhcpcd/dist/if-options.h C src/external/bsd/dhcpcd/dist/if.h C src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h C src/external/bsd/dhcpcd/dist/ipv6.h C src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h C src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c C src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 43 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
