CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Fri Jul 10 03:01:21 UTC 2015
Modified Files:
src/sys/arch/x86/x86: mpbios.c
Log Message:
Fix a problem that "Disable ACPI" doesn't work (PCI interrputs don't occur)
on some machines.
On some machines' MPBIOS table, dest APIC IDs for PCI interrupts are not
IOAPIC's APIC ID. If we couldn't find an IOAPIC with ioapic_find(id), retry
with ioapic_find_bybase(pin). Tested with SuperMicro X10SLX-F.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/x86/x86/mpbios.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/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.63 src/sys/arch/x86/x86/mpbios.c:1.64
--- src/sys/arch/x86/x86/mpbios.c:1.63 Wed Jun 24 11:09:26 2015
+++ src/sys/arch/x86/x86/mpbios.c Fri Jul 10 03:01:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mpbios.c,v 1.63 2015/06/24 11:09:26 msaitoh Exp $ */
+/* $NetBSD: mpbios.c,v 1.64 2015/07/10 03:01:21 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.63 2015/06/24 11:09:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.64 2015/07/10 03:01:21 msaitoh Exp $");
#include "acpica.h"
#include "lapic.h"
@@ -1313,8 +1313,25 @@ mpbios_int(const uint8_t *ent, int entty
sc = NULL;
#endif
if (sc == NULL) {
- printf("mpbios: can't find ioapic %d\n", id);
+#if NIOAPIC > 0
+ /*
+ * If we couldn't find an ioapic by given id, retry to
+ * get it by a pin number.
+ */
+ sc = ioapic_find_bybase(pin);
+ if (sc == NULL) {
+aprint_error("mpbios: can't find ioapic by"
+" neither apid(%d) nor pin number(%d)\n",
+id, pin);
+return;
+ }
+ aprint_verbose("mpbios: use apid %d instead of %d\n",
+ sc->sc_pic.pic_apicid, id);
+ id = sc->sc_pic.pic_apicid;
+#else
+ aprint_error("mpbios: can't find ioapic %d\n", id);
return;
+#endif
}
/*
CVS commit: src/distrib/sets
Module Name:src
Committed By: matt
Date: Thu Jul 9 18:19:34 UTC 2015
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/modules: ad.mips
Log Message:
Add nocompatmodules keyword to stop the expanding of a kmod to compatmodules.
Use for compat_netbsd32 on mips
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/sets.subr
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/ad.mips
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.171 src/distrib/sets/sets.subr:1.172
--- src/distrib/sets/sets.subr:1.171 Sun Jun 28 23:49:33 2015
+++ src/distrib/sets/sets.subr Thu Jul 9 18:19:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
+# $NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
+# # $NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -395,11 +395,13 @@ list_set_files()
iscompatdir = 1
} else if (kw in compatfilekeywords) {
iscompatfile = 1
+} else if (kw == "nocompatmodules") {
+ havekmod = -1
} else if (kw in ignoredkeywords) {
# ignore
} else if (! (kw in wanted)) {
show = 0
-} else if (kw == "kmod") {
+} else if (kw == "kmod" && havekmod == 0) {
havekmod = 1
}
if (kw == "obsolete")
@@ -411,7 +413,7 @@ list_set_files()
next
list[$1] = $0
- if (havekmod && substr($1,1,l_kmodpat) == kmodpat) {
+ if (havekmod > 0 && substr($1,1,l_kmodpat) == kmodpat) {
for (d in kmodarchdirs) {
xd = "./stand/" kmodarchdirs[d]
xfile = xd substr($1, l_kmodpat+1)
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.4 src/distrib/sets/lists/modules/ad.mips:1.5
--- src/distrib/sets/lists/modules/ad.mips:1.4 Sat May 9 14:22:34 2015
+++ src/distrib/sets/lists/modules/ad.mips Thu Jul 9 18:19:34 2015
@@ -1,5 +1,5 @@
-# $NetBSD: ad.mips,v 1.4 2015/05/09 14:22:34 matt Exp $
-./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod,arch64
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod,arch64
+# $NetBSD: ad.mips,v 1.5 2015/07/09 18:19:34 matt Exp $
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod,arch64,nocompatmodules
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
CVS commit: src/doc
Module Name:src Committed By: taca Date: Thu Jul 9 15:58:51 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: Latest ntp is 4.2.8p3 which contains security fix (low risk). Security Fix: * [Sec 2853] Crafted remote config packet can crash some versions of ntpd. Aleksis Kauppinen, Juergen Perlinger, Harlan Stenn. Under specific circumstances an attacker can send a crafted packet to cause a vulnerable ntpd instance to crash. This requires each of the following to be true: 1) ntpd set up to allow remote configuration (not allowed by default), and 2) knowledge of the configuration password, and 3) access to a computer entrusted to perform remote configuration. This vulnerability is considered low-risk. To generate a diff of this commit: cvs rdiff -u -r1.1234 -r1.1235 src/doc/3RDPARTY 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.1234 src/doc/3RDPARTY:1.1235 --- src/doc/3RDPARTY:1.1234 Thu Jul 9 14:32:24 2015 +++ src/doc/3RDPARTY Thu Jul 9 15:58:51 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1234 2015/07/09 14:32:24 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1235 2015/07/09 15:58:51 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -922,7 +922,7 @@ HAVE_STRICT_ALIGNMENT. Fix RCS IDs, imp Package: ntp Version: 4.2.8p2 -Current Vers: 4.2.8p2 +Current Vers: 4.2.8p3 Maintainer: David L. Mills Archive Site: http://www.ntp.org/ Home Page: http://www.ntp.org/, http://support.ntp.org/
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Thu Jul 9 14:50:08 UTC 2015
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Add _MKTARGET_LINK
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.54 src/share/mk/bsd.kmodule.mk:1.55
--- src/share/mk/bsd.kmodule.mk:1.54 Wed Jun 24 13:42:53 2015
+++ src/share/mk/bsd.kmodule.mk Thu Jul 9 14:50:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.54 2015/06/24 13:42:53 matt Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.55 2015/07/09 14:50:08 matt Exp $
# We are not building this with PIE
MKPIE=no
@@ -176,6 +176,7 @@ ${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
.endif
.else
${PROG}: ${OBJS} ${DPADD} ${KMODSCRIPT}
+ ${_MKTARGET_LINK}
${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
-Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${OBJS}
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jul 9 14:41:54 UTC 2015 Modified Files: src/sys/arch/mips/mips: genassym.cf Log Message: More ifndef _MODULE To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mips/mips/genassym.cf 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/mips/mips/genassym.cf diff -u src/sys/arch/mips/mips/genassym.cf:1.63 src/sys/arch/mips/mips/genassym.cf:1.64 --- src/sys/arch/mips/mips/genassym.cf:1.63 Wed Jul 8 15:05:24 2015 +++ src/sys/arch/mips/mips/genassym.cf Thu Jul 9 14:41:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.63 2015/07/08 15:05:24 matt Exp $ +# $NetBSD: genassym.cf,v 1.64 2015/07/09 14:41:54 matt Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -124,12 +124,14 @@ define L_PRIORITY offsetof(struct lwp, define L_PRIVATE offsetof(struct lwp, l_private) define L_PROC offsetof(struct lwp, l_proc) define L_STAT offsetof(struct lwp, l_stat) +ifndef _MODULE define L_MD_UTF offsetof(struct lwp, l_md.md_utf) if USPACE > PAGE_SIZE define L_MD_UPTE_0 offsetof(struct lwp, l_md.md_upte[0]) define L_MD_UPTE_1 offsetof(struct lwp, l_md.md_upte[1]) endif define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending) +endif define L_WCHAN offsetof(struct lwp, l_wchan) define P_RASLIST offsetof(struct proc, p_raslist)
CVS commit: src/sys/modules
Module Name:src
Committed By: matt
Date: Thu Jul 9 14:41:30 UTC 2015
Modified Files:
src/sys/modules: Makefile
Log Message:
Don't build compat_netbsd32 if mips64 && building mips-n32
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.155 src/sys/modules/Makefile:1.156
--- src/sys/modules/Makefile:1.155 Sun May 17 05:21:38 2015
+++ src/sys/modules/Makefile Thu Jul 9 14:41:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2015/05/17 05:21:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.156 2015/07/09 14:41:30 matt Exp $
.include
@@ -206,7 +206,8 @@ SUBDIR+= wmihp
SUBDIR+= wmimsi
.endif
-.if ${MACHINE_CPU} == "arm" || !empty(MACHINE_ARCH:Mmips64*)
+.if ${MACHINE_CPU} == "arm" \
+|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
SUBDIR+= compat_netbsd32
.endif
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src
Committed By: christos
Date: Thu Jul 9 14:31:02 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Makefile NEWS README
openssl.spec
src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h opensslv.h
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/ssl: s3_clnt.c s3_srvr.c
src/crypto/external/bsd/openssl/dist/test: Makefile testssl
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/CHANGES \
src/crypto/external/bsd/openssl/dist/NEWS \
src/crypto/external/bsd/openssl/dist/README \
src/crypto/external/bsd/openssl/dist/openssl.spec
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/test/testssl
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/openssl/dist/CHANGES
diff -u src/crypto/external/bsd/openssl/dist/CHANGES:1.6 src/crypto/external/bsd/openssl/dist/CHANGES:1.7
--- src/crypto/external/bsd/openssl/dist/CHANGES:1.6 Tue Jun 16 16:00:13 2015
+++ src/crypto/external/bsd/openssl/dist/CHANGES Thu Jul 9 10:31:01 2015
@@ -2,6 +2,21 @@
OpenSSL CHANGES
___
+ Changes between 1.0.1o and 1.0.1p [9 Jul 2015]
+
+ *) Alternate chains certificate forgery
+
+ During certificate verfification, OpenSSL will attempt to find an
+ alternative certificate chain if the first attempt to build such a chain
+ fails. An error in the implementation of this logic can mean that an
+ attacker could cause certain checks on untrusted certificates to be
+ bypassed, such as the CA flag, enabling them to use a valid leaf
+ certificate to act as a CA and "issue" an invalid certificate.
+
+ This issue was reported to OpenSSL by Adam Langley/David Benjamin
+ (Google/BoringSSL).
+ [Matt Caswell]
+
Changes between 1.0.1n and 1.0.1o [12 Jun 2015]
*) Fix HMAC ABI incompatibility. The previous version introduced an ABI
Index: src/crypto/external/bsd/openssl/dist/NEWS
diff -u src/crypto/external/bsd/openssl/dist/NEWS:1.6 src/crypto/external/bsd/openssl/dist/NEWS:1.7
--- src/crypto/external/bsd/openssl/dist/NEWS:1.6 Tue Jun 16 16:00:13 2015
+++ src/crypto/external/bsd/openssl/dist/NEWS Thu Jul 9 10:31:01 2015
@@ -5,6 +5,10 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
+ Major changes between OpenSSL 1.0.1o and OpenSSL 1.0.1p [9 Jul 2015]
+
+ o Alternate chains certificate forgery (CVE-2015-1793)
+
Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015]
o Fix HMAC ABI incompatibility
Index: src/crypto/external/bsd/openssl/dist/README
diff -u src/crypto/external/bsd/openssl/dist/README:1.6 src/crypto/external/bsd/openssl/dist/README:1.7
--- src/crypto/external/bsd/openssl/dist/README:1.6 Tue Jun 16 16:00:13 2015
+++ src/crypto/external/bsd/openssl/dist/README Thu Jul 9 10:31:01 2015
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1o 12 Jun 2015
+ OpenSSL 1.0.1p 9 Jul 2015
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
Index: src/crypto/external/bsd/openssl/dist/openssl.spec
diff -u src/crypto/external/bsd/openssl/dist/openssl.spec:1.6 src/crypto/external/bsd/openssl/dist/openssl.spec:1.7
--- src/crypto/external/bsd/openssl/dist/openssl.spec:1.6 Tue Jun 16 16:00:13 2015
+++ src/crypto/external/bsd/openssl/dist/openssl.spec Thu Jul 9 10:31:01 2015
@@ -7,7 +7,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
#Version: %{libmaj}.%{libmin}.%{librel}
-Version: 1.0.1o
+Version: 1.0.1p
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries
Index: src/crypto/external/bsd/openssl/dist/Makefile
diff -u src/crypto/external/bsd/openssl/dist/Makefile:1.7 src/crypto/external/bsd/openssl/dist/
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jul 9 14:32:24 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention openssl To generate a diff of this commit: cvs rdiff -u -r1.1233 -r1.1234 src/doc/3RDPARTY cvs rdiff -u -r1.2083 -r1.2084 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.1233 src/doc/3RDPARTY:1.1234 --- src/doc/3RDPARTY:1.1233 Thu Jul 9 06:17:32 2015 +++ src/doc/3RDPARTY Thu Jul 9 10:32:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1233 2015/07/09 10:17:32 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1234 2015/07/09 14:32:24 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1037,8 +1037,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1o -Current Vers: 1.0.2c +Version: 1.0.1p +Current Vers: 1.0.2d Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2083 src/doc/CHANGES:1.2084 --- src/doc/CHANGES:1.2083 Thu Jul 9 09:39:51 2015 +++ src/doc/CHANGES Thu Jul 9 10:32:24 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2083 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2084 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -168,3 +168,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: bind: Import version 9.10.2-P2. [christos 20150708] dhcpcd: Import dhcpcd 6.9.1. [roy 20150709] iostat(8): Support fnmatch(3) patterns for disknames. [mrg 20150709] + openssl: Import openssl 1.0.1p [christos 20150709]
CVS import: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Thu Jul 9 14:15:45 UTC 2015 Update of /cvsroot/src/crypto/external/bsd/openssl/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16998 Log Message: Import 1.0.1p to fix: *) Alternate chains certificate forgery During certificate verfification, OpenSSL will attempt to find an alternative certificate chain if the first attempt to build such a chain fails. An error in the implementation of this logic can mean that an attacker could cause certain checks on untrusted certificates to be bypassed, such as the CA flag, enabling them to use a valid leaf certificate to act as a CA and "issue" an invalid certificate. This issue was reported to OpenSSL by Adam Langley/David Benjamin (Google/BoringSSL). [Matt Caswell] Status: Vendor Tag: OPENSSL Release Tags: openssl-1-0-1p U src/crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS U src/crypto/external/bsd/openssl/dist/CHANGES.SSLeay C src/crypto/external/bsd/openssl/dist/CHANGES U src/crypto/external/bsd/openssl/dist/Configure U src/crypto/external/bsd/openssl/dist/config U src/crypto/external/bsd/openssl/dist/e_os2.h U src/crypto/external/bsd/openssl/dist/e_os.h U src/crypto/external/bsd/openssl/dist/FAQ U src/crypto/external/bsd/openssl/dist/install.com U src/crypto/external/bsd/openssl/dist/INSTALL U src/crypto/external/bsd/openssl/dist/INSTALL.W64 U src/crypto/external/bsd/openssl/dist/INSTALL.DJGPP U src/crypto/external/bsd/openssl/dist/INSTALL.MacOS U src/crypto/external/bsd/openssl/dist/INSTALL.NW U src/crypto/external/bsd/openssl/dist/INSTALL.OS2 U src/crypto/external/bsd/openssl/dist/INSTALL.VMS U src/crypto/external/bsd/openssl/dist/INSTALL.W32 U src/crypto/external/bsd/openssl/dist/INSTALL.WCE U src/crypto/external/bsd/openssl/dist/LICENSE C src/crypto/external/bsd/openssl/dist/Makefile U src/crypto/external/bsd/openssl/dist/Makefile.shared U src/crypto/external/bsd/openssl/dist/Makefile.org U src/crypto/external/bsd/openssl/dist/makevms.com C src/crypto/external/bsd/openssl/dist/NEWS U src/crypto/external/bsd/openssl/dist/README.ENGINE U src/crypto/external/bsd/openssl/dist/openssl.doxy C src/crypto/external/bsd/openssl/dist/openssl.spec U src/crypto/external/bsd/openssl/dist/PROBLEMS C src/crypto/external/bsd/openssl/dist/README U src/crypto/external/bsd/openssl/dist/README.ASN1 U src/crypto/external/bsd/openssl/dist/apps/app_rand.c U src/crypto/external/bsd/openssl/dist/apps/apps.c U src/crypto/external/bsd/openssl/dist/apps/apps.h U src/crypto/external/bsd/openssl/dist/apps/asn1pars.c U src/crypto/external/bsd/openssl/dist/apps/ca.c U src/crypto/external/bsd/openssl/dist/apps/ca-cert.srl U src/crypto/external/bsd/openssl/dist/apps/CA.com U src/crypto/external/bsd/openssl/dist/apps/ca-key.pem U src/crypto/external/bsd/openssl/dist/apps/CA.pl U src/crypto/external/bsd/openssl/dist/apps/CA.pl.in U src/crypto/external/bsd/openssl/dist/apps/ca-req.pem U src/crypto/external/bsd/openssl/dist/apps/CA.sh U src/crypto/external/bsd/openssl/dist/apps/cert.pem U src/crypto/external/bsd/openssl/dist/apps/ciphers.c U src/crypto/external/bsd/openssl/dist/apps/client.pem U src/crypto/external/bsd/openssl/dist/apps/cms.c U src/crypto/external/bsd/openssl/dist/apps/crl2p7.c U src/crypto/external/bsd/openssl/dist/apps/crl.c U src/crypto/external/bsd/openssl/dist/apps/dh1024.pem U src/crypto/external/bsd/openssl/dist/apps/dgst.c U src/crypto/external/bsd/openssl/dist/apps/install-apps.com U src/crypto/external/bsd/openssl/dist/apps/dh2048.pem U src/crypto/external/bsd/openssl/dist/apps/dh4096.pem U src/crypto/external/bsd/openssl/dist/apps/dh512.pem U src/crypto/external/bsd/openssl/dist/apps/dh.c U src/crypto/external/bsd/openssl/dist/apps/dhparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa1024.pem U src/crypto/external/bsd/openssl/dist/apps/dsa512.pem U src/crypto/external/bsd/openssl/dist/apps/dsa.c U src/crypto/external/bsd/openssl/dist/apps/dsa-ca.pem U src/crypto/external/bsd/openssl/dist/apps/dsaparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa-pca.pem U src/crypto/external/bsd/openssl/dist/apps/dsap.pem U src/crypto/external/bsd/openssl/dist/apps/ec.c U src/crypto/external/bsd/openssl/dist/apps/ecparam.c U src/crypto/external/bsd/openssl/dist/apps/enc.c U src/crypto/external/bsd/openssl/dist/apps/engine.c U src/crypto/external/bsd/openssl/dist/apps/errstr.c U src/crypto/external/bsd/openssl/dist/apps/gendh.c U src/crypto/external/bsd/openssl/dist/apps/gendsa.c U src/crypto/external/bsd/openssl/dist/apps/genpkey.c U src/crypto/external/bsd/openssl/dist/apps/genrsa.c U src/crypto/external/bsd/openssl/dist/apps/makeapps.com U src/crypto/external/bsd/openssl/dist/apps/Makefile U src/crypto/external/bsd/openssl/dist/apps/openssl.c U src/crypto/external/bsd/openssl/dist/apps/nseq.c U src/crypto/external/bsd/openssl/dist/apps/ocsp.c U src/crypto/external/bsd/openssl/dist/apps/oid.cnf U src/crypto/external/bsd/openssl/dist/apps
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Thu Jul 9 13:39:51 UTC 2015 Modified Files: src/doc: CHANGES Log Message: (belatedly) note GCC 4.8.5. To generate a diff of this commit: cvs rdiff -u -r1.2082 -r1.2083 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/CHANGES diff -u src/doc/CHANGES:1.2082 src/doc/CHANGES:1.2083 --- src/doc/CHANGES:1.2082 Thu Jul 9 13:28:11 2015 +++ src/doc/CHANGES Thu Jul 9 13:39:51 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2082 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2083 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -163,6 +163,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0: openssl: Import openssl 1.0.1n [christos 20150612] openssl: Import openssl 1.0.1o [christos 20150616] zoneinfo: Import tzdata2015e. [apb 20150621] + gcc: Import GCC 4.8.5. [mrg 20150624] OpenSSH: Imported 6.9. [christos 20150630] bind: Import version 9.10.2-P2. [christos 20150708] dhcpcd: Import dhcpcd 6.9.1. [roy 20150709]
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Thu Jul 9 13:28:11 UTC 2015 Modified Files: src/doc: CHANGES Log Message: note iostat fnmatch patterns for disknames. To generate a diff of this commit: cvs rdiff -u -r1.2081 -r1.2082 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/CHANGES diff -u src/doc/CHANGES:1.2081 src/doc/CHANGES:1.2082 --- src/doc/CHANGES:1.2081 Thu Jul 9 10:17:32 2015 +++ src/doc/CHANGES Thu Jul 9 13:28:11 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2081 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2082 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -166,3 +166,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: OpenSSH: Imported 6.9. [christos 20150630] bind: Import version 9.10.2-P2. [christos 20150708] dhcpcd: Import dhcpcd 6.9.1. [roy 20150709] + iostat(8): Support fnmatch(3) patterns for disknames. [mrg 20150709]
CVS commit: src/usr.sbin/iostat
Module Name:src
Committed By: mrg
Date: Thu Jul 9 13:26:52 UTC 2015
Modified Files:
src/usr.sbin/iostat: iostat.8 iostat.c
Log Message:
support fnmatch(3) patterns for disknames. eg, "iostat wd*" works now.
update the default disk number selection to note that it uses the current
terminal size to fit disks, not hard coded 4.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/iostat/iostat.8
cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/iostat/iostat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/iostat/iostat.8
diff -u src/usr.sbin/iostat/iostat.8:1.23 src/usr.sbin/iostat/iostat.8:1.24
--- src/usr.sbin/iostat/iostat.8:1.23 Wed Jun 11 17:01:04 2014
+++ src/usr.sbin/iostat/iostat.8 Thu Jul 9 13:26:52 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: iostat.8,v 1.23 2014/06/11 17:01:04 joerg Exp $
+.\" $NetBSD: iostat.8,v 1.24 2015/07/09 13:26:52 mrg Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)iostat.8 8.1 (Berkeley) 6/6/93
.\"
-.Dd June 11, 2014
+.Dd July 9, 2015
.Dt IOSTAT 8
.Os
.Sh NAME
@@ -142,13 +142,16 @@ characters written to terminals
.It disks
Disk operations.
The header of the field is the disk name and unit number.
-If more than four disk drives are configured in the system,
+If more drives are configured in the system that fit across the
+current display,
.Nm
-displays only the first four drives.
+displays only those drives that fit on the display.
To force
.Nm
-to display specific drives, their names may be supplied on the command
-line.
+to display specific drives, they may be supplied on the command
+line, either as names or
+.Fn fnmatch
+patterns.
.Pp
.Bl -tag -width indent -compact
.It KB/t
@@ -189,6 +192,7 @@ Seconds spent in disk activity
.Xr \&ps 1 ,
.Xr systat 1 ,
.Xr vmstat 1 ,
+.Xr fnmatch 3 ,
.Xr pstat 8
.Pp
The sections starting with ``Interpreting system activity'' in
Index: src/usr.sbin/iostat/iostat.c
diff -u src/usr.sbin/iostat/iostat.c:1.61 src/usr.sbin/iostat/iostat.c:1.62
--- src/usr.sbin/iostat/iostat.c:1.61 Wed Jun 11 17:01:04 2014
+++ src/usr.sbin/iostat/iostat.c Thu Jul 9 13:26:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iostat.c,v 1.61 2014/06/11 17:01:04 joerg Exp $ */
+/* $NetBSD: iostat.c,v 1.62 2015/07/09 13:26:52 mrg Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -71,7 +71,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 19
#if 0
static char sccsid[] = "@(#)iostat.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: iostat.c,v 1.61 2014/06/11 17:01:04 joerg Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.62 2015/07/09 13:26:52 mrg Exp $");
#endif
#endif /* not lint */
@@ -88,6 +88,7 @@ __RCSID("$NetBSD: iostat.c,v 1.61 2014/0
#include
#include
#include
+#include
#include "drvstats.h"
@@ -511,7 +512,7 @@ selectdrives(int argc, char *argv[])
#endif
tried++;
for (i = 0; i < (int)ndrive; i++) {
- if (strcmp(cur.name[i], *argv))
+ if (fnmatch(*argv, cur.name[i], 0))
continue;
cur.select[i] = 1;
++ndrives;
CVS commit: src/libexec/httpd
Module Name:src
Committed By: shm
Date: Thu Jul 9 12:32:16 UTC 2015
Modified Files:
src/libexec/httpd: bozohttpd.c
Log Message:
Remove d_namelen as it's an BSD extension. Fix building bozohttpd on SunOS.
OK mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.64 src/libexec/httpd/bozohttpd.c:1.65
--- src/libexec/httpd/bozohttpd.c:1.64 Sat May 2 11:35:48 2015
+++ src/libexec/httpd/bozohttpd.c Thu Jul 9 12:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.64 2015/05/02 11:35:48 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.65 2015/07/09 12:32:16 shm Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1093,8 +1093,7 @@ check_virtual(bozo_httpreq_t *request)
}
debug((httpd, DEBUG_OBESE, "looking at dir``%s''",
d->d_name));
-if (d->d_namlen == len && strcmp(d->d_name,
-request->hr_host) == 0) {
+if (strcmp(d->d_name, request->hr_host) == 0) {
/* found it, punch it */
debug((httpd, DEBUG_OBESE, "found it punch it"));
request->hr_virthostname =
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Thu Jul 9 11:38:05 UTC 2015 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Spelling. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.160 src/share/man/man5/rc.conf.5:1.161 --- src/share/man/man5/rc.conf.5:1.160 Thu Jul 9 10:24:27 2015 +++ src/share/man/man5/rc.conf.5 Thu Jul 9 11:38:05 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.160 2015/07/09 10:24:27 roy Exp $ +.\" $NetBSD: rc.conf.5,v 1.161 2015/07/09 11:38:05 wiz Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -193,7 +193,7 @@ The default is .Pa /etc/rc.d . All directories in .Ev rc_directories -must be located in the root filesystem, otherwise they will be silently +must be located in the root file system, otherwise they will be silently skipped. .It Sy rc_silent Boolean value. @@ -247,7 +247,7 @@ If empty or not set, then the contents o (if it exists) are used. .It Sy force_down_interfaces A space separated list of interface names. -These interfaces will be configured down when going from multiuser to singleuser +These interfaces will be configured down when going from multiuser to single-user mode or on system shutdown. .Pp This is important for some stateful interfaces, for example PPP over ISDN @@ -416,7 +416,7 @@ restored at start-up. Boolean value. Run .Nm newsyslog -to trim logfiles before syslogd starts. +to trim log files before syslogd starts. Intended for laptop users. Passes .Sy newsyslog_flags . @@ -698,7 +698,7 @@ then this should be done in the configur for details. dhcpcd presently ignores the .Sy wpa_supplicant -varaible in rc.conf and will start wpa_supplicant if a suitable +variable in rc.conf and will start wpa_supplicant if a suitable wpa_supplicant.conf is found unless otherwise instructed in .Xr dhcpcd.conf 5 . .It Sy dhcpcd_flags @@ -907,13 +907,13 @@ at network boot time: Load the initial configuration .Xr pf.boot.conf 5 before the network is up. -After the network has been configured, then load the final ruleset +After the network has been configured, then load the final rule set .Xr pf.conf 5 . .It Sy pf_rules A string. The path of the .Xr pf.conf 5 -ruleset that will be used when loading the final ruleset. +rule set that will be used when loading the final rule set. .It Sy pflogd Boolean value. Run
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu Jul 9 11:34:59 UTC 2015 Modified Files: src/share/man/man9: splraiseipl.9 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/splraiseipl.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/splraiseipl.9 diff -u src/share/man/man9/splraiseipl.9:1.7 src/share/man/man9/splraiseipl.9:1.8 --- src/share/man/man9/splraiseipl.9:1.7 Thu Jul 9 10:23:51 2015 +++ src/share/man/man9/splraiseipl.9 Thu Jul 9 11:34:59 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: splraiseipl.9,v 1.7 2015/07/09 10:23:51 kamil Exp $ +.\" $NetBSD: splraiseipl.9,v 1.8 2015/07/09 11:34:59 wiz Exp $ .\" .\" Copyright (c)2006 YAMAMOTO Takashi, .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd February 11, 2007 +.Dd July 9, 2015 .Dt SPLRAISEIPL 9 .Os .\"
CVS commit: src/share/man/man5
Module Name:src Committed By: roy Date: Thu Jul 9 10:24:27 UTC 2015 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Note that dhcpcd will ignore the wpa_supplicant variable in rc.conf To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.159 src/share/man/man5/rc.conf.5:1.160 --- src/share/man/man5/rc.conf.5:1.159 Mon Mar 30 11:01:53 2015 +++ src/share/man/man5/rc.conf.5 Thu Jul 9 10:24:27 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.159 2015/03/30 11:01:53 wiz Exp $ +.\" $NetBSD: rc.conf.5,v 1.160 2015/07/09 10:24:27 roy Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -55,7 +55,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 30, 2015 +.Dd July 9, 2015 .Dt RC.CONF 5 .Os .Sh NAME @@ -696,6 +696,11 @@ or need a separate configuration per int then this should be done in the configuration file - see .Xr dhcpcd.conf 5 for details. +dhcpcd presently ignores the +.Sy wpa_supplicant +varaible in rc.conf and will start wpa_supplicant if a suitable +wpa_supplicant.conf is found unless otherwise instructed in +.Xr dhcpcd.conf 5 . .It Sy dhcpcd_flags Passes .Sy dhcpcd_flags @@ -973,6 +978,9 @@ must be in or .Pa /usr must be on the root file system. +dhcpcd ignores this variable, see the +.Sy dhcpcd +variable for details. .El .Ss Daemons required by other daemons .Bl -tag -width net_interfaces
CVS commit: src/share/man/man9
Module Name:src Committed By: kamil Date: Thu Jul 9 10:23:51 UTC 2015 Modified Files: src/share/man/man9: splraiseipl.9 Log Message: Set proper include file: The header has nothing to do (directly or indirectly) with splraiseipl(9). This issue might be hidden for kernel modules, as includes , which in turn pulls in . Reviewed by To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/splraiseipl.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/splraiseipl.9 diff -u src/share/man/man9/splraiseipl.9:1.6 src/share/man/man9/splraiseipl.9:1.7 --- src/share/man/man9/splraiseipl.9:1.6 Wed Dec 5 04:50:49 2007 +++ src/share/man/man9/splraiseipl.9 Thu Jul 9 10:23:51 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: splraiseipl.9,v 1.6 2007/12/05 04:50:49 ad Exp $ +.\" $NetBSD: splraiseipl.9,v 1.7 2015/07/09 10:23:51 kamil Exp $ .\" .\" Copyright (c)2006 YAMAMOTO Takashi, .\" All rights reserved. @@ -34,7 +34,7 @@ .Nd raise the system priority level .\" .Sh SYNOPSIS -.In sys/param.h +.In sys/intr.h .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Ft int .Fn splraiseipl \
CVS commit: src/doc
Module Name:src Committed By: roy Date: Thu Jul 9 10:17:32 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.9.1 To generate a diff of this commit: cvs rdiff -u -r1.1232 -r1.1233 src/doc/3RDPARTY cvs rdiff -u -r1.2080 -r1.2081 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.1232 src/doc/3RDPARTY:1.1233 --- src/doc/3RDPARTY:1.1232 Wed Jul 8 17:30:46 2015 +++ src/doc/3RDPARTY Thu Jul 9 10:17:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1232 2015/07/08 17:30:46 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1233 2015/07/09 10:17:32 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.9.0 -Current Vers: 6.9.0 +Version: 6.9.1 +Current Vers: 6.9.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.2080 src/doc/CHANGES:1.2081 --- src/doc/CHANGES:1.2080 Wed Jul 8 17:30:46 2015 +++ src/doc/CHANGES Thu Jul 9 10:17:32 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2080 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2081 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -165,3 +165,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: zoneinfo: Import tzdata2015e. [apb 20150621] OpenSSH: Imported 6.9. [christos 20150630] bind: Import version 9.10.2-P2. [christos 20150708] + dhcpcd: Import dhcpcd 6.9.1. [roy 20150709]
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Thu Jul 9 10:08:33 UTC 2015 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13843 Log Message: Import dhcpcd-6.9.1 with the following changes: * Fixed waitip * For Prefix Delegation, servers must now support RFC7550 * Fixed detecting host routes in DHCP messages * Fixed ARP checking that failed in some situations * Fixed static address assignment in dhcpcd.conf * Split IPv4LL state from DHCP and into it's own state * Reject any NA/RA with a hop limit != 255 * Replace if_oneup with if_afwaited and af_waited for hook scripts * Fix a potential buffer overrun if an embedded DHCP option is a zero length or fails to parse - thanks to Paul Stewart * Check fclose for errors - thanks to Bob * wpad_url has been added to dhcpcd-definitions.conf * Fix a double free when failing to send a DHCPv6 RELEASE Thanks to Todd Blanchard. * Correct IPv6 public address test, thanks to Micha? K?pie? * Fix DHCPv6 starting if no public addresses found in the RA but the M or O bit was set * Replaced custom uptime() with clock_gettime(2) * Fix DHCPv6 elapsed time Status: Vendor Tag: roy Release Tags: dhcpcd-6-9-1 C src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c C src/external/bsd/dhcpcd/dist/duid.c U 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 C 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 U 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 U src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h U 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 U src/external/bsd/dhcpcd/dist/duid.h U 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 C 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 U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h C 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 37 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/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jul 9 07:20:57 UTC 2015 Modified Files: src/sys/dev/usb: usb_subr.c Log Message: Fix typo in usbd_attachinterfaces - look for interface drivers when there is no interface (i.e. default) locator To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/dev/usb/usb_subr.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/usb/usb_subr.c diff -u src/sys/dev/usb/usb_subr.c:1.201 src/sys/dev/usb/usb_subr.c:1.202 --- src/sys/dev/usb/usb_subr.c:1.201 Sat Apr 11 10:10:14 2015 +++ src/sys/dev/usb/usb_subr.c Thu Jul 9 07:20:57 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.201 2015/04/11 10:10:14 skrll Exp $ */ +/* $NetBSD: usb_subr.c,v 1.202 2015/07/09 07:20:57 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.201 2015/04/11 10:10:14 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.202 2015/07/09 07:20:57 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -889,7 +889,8 @@ usbd_attachinterfaces(device_t parent, u loc != uiaa.configno) continue; loc = locators[USBIFIFCF_INTERFACE]; - if (loc != USBIFIFCF_INTERFACE && loc != uiaa.ifaceno) + if (loc != USBIFIFCF_INTERFACE_DEFAULT && + loc != uiaa.ifaceno) continue; } dv = config_found_sm_loc(parent, "usbifif", ilocs, &uiaa,
