CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: christos Date: Sat Aug 22 05:45:57 UTC 2015 Modified Files: src/external/bsd/dhcpcd/dist: dhcp.c Log Message: fix bogus gcc unitialized warning To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/dhcp.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/dhcp.c diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.33 src/external/bsd/dhcpcd/dist/dhcp.c:1.34 --- src/external/bsd/dhcpcd/dist/dhcp.c:1.33 Fri Aug 21 06:39:00 2015 +++ src/external/bsd/dhcpcd/dist/dhcp.c Sat Aug 22 01:45:57 2015 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: dhcp.c,v 1.33 2015/08/21 10:39:00 roy Exp $"); + __RCSID("$NetBSD: dhcp.c,v 1.34 2015/08/22 05:45:57 christos Exp $"); /* * dhcpcd - DHCP client daemon @@ -713,7 +713,7 @@ uint16_t dhcp_get_mtu(const struct interface *ifp) { const struct dhcp_message *dhcp; - uint16_t mtu; + uint16_t mtu = 0; // XXX: gcc if ((dhcp = D_CSTATE(ifp)->new) == NULL || has_option_mask(ifp->options->nomask, DHO_MTU) ||
CVS commit: othersrc/external/bsd/arfe
Module Name:othersrc Committed By: dyoung Date: Sat Aug 22 05:08:48 UTC 2015 Modified Files: othersrc/external/bsd/arfe: README othersrc/external/bsd/arfe/dt: Makefile README dt.c testit othersrc/external/bsd/arfe/dt/rr: ifconfig.0-ifconfig.1 ifconfig.0-logger-ifconfig.0 ifconfig.1-ifconfig.0 logger-ifconfig.0-ifconfig.0 wm0-a-wm0-b wm0-b-wm0-a Log Message: Locate in both inputs hexadecimal numbers starting 0x and make them "wild" in the alignments dt computes. In dt, bitwise-AND the 0x-hex numbers. In it, bitwise-OR them. Take care not to match a hexadecimal with a decimal or vice versa! TBD: identify hexadecimals that don't start 0x. Remove a little dead code. Split HB_DEBUG into HB_DEBUG and HB_ASSERT. The latter just enables the assertions. Update old test results for the new treatment of 0x-hexadecimal. Add some new tests. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/README cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/dt/Makefile \ othersrc/external/bsd/arfe/dt/README othersrc/external/bsd/arfe/dt/testit cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/arfe/dt/dt.c cvs rdiff -u -r1.1 -r1.2 \ othersrc/external/bsd/arfe/dt/rr/ifconfig.0-ifconfig.1 \ othersrc/external/bsd/arfe/dt/rr/ifconfig.0-logger-ifconfig.0 \ othersrc/external/bsd/arfe/dt/rr/ifconfig.1-ifconfig.0 \ othersrc/external/bsd/arfe/dt/rr/logger-ifconfig.0-ifconfig.0 \ othersrc/external/bsd/arfe/dt/rr/wm0-a-wm0-b \ othersrc/external/bsd/arfe/dt/rr/wm0-b-wm0-a Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/arfe/README diff -u othersrc/external/bsd/arfe/README:1.1 othersrc/external/bsd/arfe/README:1.2 --- othersrc/external/bsd/arfe/README:1.1 Mon Aug 10 21:10:59 2015 +++ othersrc/external/bsd/arfe/README Sat Aug 22 05:08:48 2015 @@ -1,3 +1,5 @@ +$ARFE: README 216 2015-08-22 05:04:28Z dyoung $ + ARFE is a suite of tools for processing record- and field-oriented digital texts. ARFE strives to make a useful set of automatic text-processing functions available at a level of abstraction that both Index: othersrc/external/bsd/arfe/dt/Makefile diff -u othersrc/external/bsd/arfe/dt/Makefile:1.1 othersrc/external/bsd/arfe/dt/Makefile:1.2 --- othersrc/external/bsd/arfe/dt/Makefile:1.1 Mon Aug 10 21:10:59 2015 +++ othersrc/external/bsd/arfe/dt/Makefile Sat Aug 22 05:08:48 2015 @@ -1,9 +1,11 @@ +# $ARFE: Makefile 216 2015-08-22 05:04:28Z dyoung $ NOMAN= .include PROG=dt SRCS+=dt.c #CPPFLAGS+=-DHB_DEBUG +CPPFLAGS+=-DHB_ASSERT DBG+=-g -O3 #DBG+=-g -O0 #COPTS+=-pg Index: othersrc/external/bsd/arfe/dt/README diff -u othersrc/external/bsd/arfe/dt/README:1.1 othersrc/external/bsd/arfe/dt/README:1.2 --- othersrc/external/bsd/arfe/dt/README:1.1 Mon Aug 10 21:10:59 2015 +++ othersrc/external/bsd/arfe/dt/README Sat Aug 22 05:08:48 2015 @@ -1,3 +1,5 @@ +$ARFE: README 216 2015-08-22 05:04:28Z dyoung $ + DT---(d)ifferentiate (t)ext---finds a longest common subsequence (LCS) of two texts where decimal numbers are "wild": a span of decimal digits in the first text will match a digits span in the second text. Then it Index: othersrc/external/bsd/arfe/dt/testit diff -u othersrc/external/bsd/arfe/dt/testit:1.1 othersrc/external/bsd/arfe/dt/testit:1.2 --- othersrc/external/bsd/arfe/dt/testit:1.1 Mon Aug 10 21:10:59 2015 +++ othersrc/external/bsd/arfe/dt/testit Sat Aug 22 05:08:48 2015 @@ -1,4 +1,5 @@ #!/bin/sh +# $ARFE: testit 216 2015-08-22 05:04:28Z dyoung $ results=rr @@ -34,4 +35,6 @@ quackabequack quackdariaquack quackdariaquack quackabequack wm0-a wm0-b wm0-b wm0-a +if-re0 if-wm0 +if-wm0 if-re0 EOF Index: othersrc/external/bsd/arfe/dt/dt.c diff -u othersrc/external/bsd/arfe/dt/dt.c:1.2 othersrc/external/bsd/arfe/dt/dt.c:1.3 --- othersrc/external/bsd/arfe/dt/dt.c:1.2 Tue Aug 11 21:04:59 2015 +++ othersrc/external/bsd/arfe/dt/dt.c Sat Aug 22 05:08:48 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: dt.c,v 1.2 2015/08/11 21:04:59 dyoung Exp $ */ -/* $Id: dt.c,v 1.2 2015/08/11 21:04:59 dyoung Exp $ */ +/* $NetBSD: dt.c,v 1.3 2015/08/22 05:08:48 dyoung Exp $ */ +/* $ARFE: dt.c 215 2015-08-22 05:02:46Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young @@ -32,6 +32,7 @@ #include #include #include +#include /* for ispunct(), isspace(), isxdigit() */ #include #include #include @@ -44,7 +45,7 @@ #include #include -#if defined(HB_DEBUG) +#if defined(HB_ASSERT) #define dbg_assert assert #else #define dbg_assert(__x) do { } while (false) /* do nothing */ @@ -55,6 +56,90 @@ typedef struct origin { int j; } origin_t; +typedef enum hex_op { + HEX_OP_NONE = 0 + , HEX_OP_PUSH + , HEX_OP_EMIT + , HEX_OP_START +} hex_op_t; + +struct hex_state; +typedef struct hex_state hex_state_t; + +typedef struct hex_transition { + const hex_state_t *t_newstate; + hex_op_t t_op; +} hex_
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Aug 22 02:23:58 UTC 2015 Modified Files: src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB kern.ldscript.Xen src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB kern.ldscript.Xen stand.ldscript Log Message: Don't need to specify OUTPUT_FORMAT/OUTPUT_ARCH in linker scripts. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/kern.ldscript cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/conf/kern.ldscript.2MB cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/kern.ldscript.Xen cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/kern.ldscript cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/conf/kern.ldscript.4MB cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/conf/kern.ldscript.Xen cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/stand.ldscript 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/amd64/conf/kern.ldscript diff -u src/sys/arch/amd64/conf/kern.ldscript:1.12 src/sys/arch/amd64/conf/kern.ldscript:1.13 --- src/sys/arch/amd64/conf/kern.ldscript:1.12 Thu Aug 20 08:51:01 2015 +++ src/sys/arch/amd64/conf/kern.ldscript Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 08:51:01 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.13 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", - "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) ENTRY(_start) SECTIONS { Index: src/sys/arch/amd64/conf/kern.ldscript.2MB diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.8 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.9 --- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.8 Thu Aug 20 08:53:31 2015 +++ src/sys/arch/amd64/conf/kern.ldscript.2MB Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript.2MB,v 1.8 2015/08/20 08:53:31 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.2MB,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", - "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) ENTRY(_start) SECTIONS { Index: src/sys/arch/amd64/conf/kern.ldscript.Xen diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.7 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.8 --- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.7 Thu Aug 20 08:53:31 2015 +++ src/sys/arch/amd64/conf/kern.ldscript.Xen Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 08:53:31 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", - "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) ENTRY(_start) SECTIONS { Index: src/sys/arch/i386/conf/kern.ldscript diff -u src/sys/arch/i386/conf/kern.ldscript:1.13 src/sys/arch/i386/conf/kern.ldscript:1.14 --- src/sys/arch/i386/conf/kern.ldscript:1.13 Thu Aug 20 09:34:54 2015 +++ src/sys/arch/i386/conf/kern.ldscript Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript,v 1.13 2015/08/20 09:34:54 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.14 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", - "elf32-i386") -OUTPUT_ARCH(i386) ENTRY(_start) SECTIONS { Index: src/sys/arch/i386/conf/kern.ldscript.4MB diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.14 src/sys/arch/i386/conf/kern.ldscript.4MB:1.15 --- src/sys/arch/i386/conf/kern.ldscript.4MB:1.14 Thu Aug 20 09:34:54 2015 +++ src/sys/arch/i386/conf/kern.ldscript.4MB Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript.4MB,v 1.14 2015/08/20 09:34:54 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.4MB,v 1.15 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", - "elf32-i386") -OUTPUT_ARCH(i386) ENTRY(_start) SECTIONS { Index: src/sys/arch/i386/conf/kern.ldscript.Xen diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.8 src/sys/arch/i386/conf/kern.ldscript.Xen:1.9 --- src/sys/arch/i386/conf/kern.ldscript.Xen:1.8 Thu Aug 20 09:34:54 2015 +++ src/sys/arch/i386/conf/kern.ldscript.Xen Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/20 09:34:54 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", - "elf32-i386") -OUTPUT_ARCH(i386) SECTIONS { /* Read-only sections, merged into text segment: */ Index: src/sys/arch/i386/conf/stand.ldscript diff -u src/sys/arch/i386/conf/stand.ldscript:1.3 src/sys/arch/i386/conf/stand.ldscript:1.4 --- src/sys/arch/i386/conf/stand.ldscript:1.3 Thu Aug 20 11:42:56 2015 +++ src/sys/arch/i386/conf/stand.ldscript Sat Aug 22 02:23:58 2015 @@ -1,8 +1,5 @@ -/* $NetBSD: stand.ldscript,v 1.3 2015/08/20 11:42:56 uebayasi Exp $ */ +/* $NetBSD: stand.ldscript,v 1.4 2015/08/22 02:23:58 uebayasi Exp $ */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", - "elf32-i386")
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Fri Aug 21 20:52:47 UTC 2015 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: Assert we aren't trying to sync a read-only mbuf as PREREAD. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32/bus_dma.c diff -u src/sys/arch/arm/arm32/bus_dma.c:1.91 src/sys/arch/arm/arm32/bus_dma.c:1.92 --- src/sys/arch/arm/arm32/bus_dma.c:1.91 Wed Feb 25 13:52:42 2015 +++ src/sys/arch/arm/arm32/bus_dma.c Fri Aug 21 20:52:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.91 2015/02/25 13:52:42 joerg Exp $ */ +/* $NetBSD: bus_dma.c,v 1.92 2015/08/21 20:52:47 matt Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include "opt_arm_bus_space.h" #include -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.91 2015/02/25 13:52:42 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.92 2015/08/21 20:52:47 matt Exp $"); #include #include @@ -924,9 +924,15 @@ _bus_dmamap_sync_mbuf(bus_dma_tag_t t, b * cache), this will have to be revisited. */ - if ((ds->_ds_flags & _BUS_DMAMAP_COHERENT) == 0) + if ((ds->_ds_flags & _BUS_DMAMAP_COHERENT) == 0) { + /* + * If we are doing preread (DMAing into the mbuf), + * this mbuf better not be readonly, + */ + KASSERT(!(ops & BUS_DMASYNC_PREREAD) || !M_ROMAP(m)); _bus_dmamap_sync_segment(va, pa, seglen, ops, M_ROMAP(m)); + } voff += seglen; ds_off += seglen; len -= seglen;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Fri Aug 21 20:12:29 UTC 2015 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: No need to BUS_DMASYNC_PREREAD the transmit data buffer. Fixes "NFS writes being corrupted?" issue on ODROID-C1 as seen on port-arm. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/dwc_gmac.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/ic/dwc_gmac.c diff -u src/sys/dev/ic/dwc_gmac.c:1.33 src/sys/dev/ic/dwc_gmac.c:1.34 --- src/sys/dev/ic/dwc_gmac.c:1.33 Fri Jun 12 11:54:39 2015 +++ src/sys/dev/ic/dwc_gmac.c Fri Aug 21 20:12:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac.c,v 1.33 2015/06/12 11:54:39 tnn Exp $ */ +/* $NetBSD: dwc_gmac.c,v 1.34 2015/08/21 20:12:29 jmcneill Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.33 2015/06/12 11:54:39 tnn Exp $"); +__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.34 2015/08/21 20:12:29 jmcneill Exp $"); /* #define DWC_GMAC_DEBUG 1 */ @@ -917,7 +917,7 @@ dwc_gmac_queue(struct dwc_gmac_softc *sc data->td_active = map; bus_dmamap_sync(sc->sc_dmat, map, 0, map->dm_mapsize, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREWRITE); /* Pass first to device */ sc->sc_txq.t_desc[first].ddesc_status =
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Fri Aug 21 17:32:36 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 952, 957 To generate a diff of this commit: cvs rdiff -u -r1.1.2.367 -r1.1.2.368 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.367 src/doc/CHANGES-7.0:1.1.2.368 --- src/doc/CHANGES-7.0:1.1.2.367 Fri Aug 14 05:33:34 2015 +++ src/doc/CHANGES-7.0 Fri Aug 21 17:32:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.367 2015/08/14 05:33:34 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.368 2015/08/21 17:32:36 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -33922,3 +33922,15 @@ crypto/external/bsd/openssh/dist/monitor OpenSSH PAM fix (BFS-SA-2015-002). [christos, ticket #950] + +share/man/man7/hier.71.110 + + Update Lua version. + [mbalmer, ticket #952] + +usr.sbin/postinstall/postinstall 1.200 via patch + + Make postinstall check for the presence of the blacklistd + rc.d script. PR install/50158. + [jnemeth, ticket #957] +
CVS commit: [netbsd-7] src/usr.sbin/postinstall
Module Name:src Committed By: snj Date: Fri Aug 21 17:27:16 UTC 2015 Modified Files: src/usr.sbin/postinstall [netbsd-7]: postinstall Log Message: Pull up following revision(s) (requested by jnemeth in ticket #957): usr.sbin/postinstall/postinstall: revision 1.200 via patch PR/50158 - Simon Burge -- postinstall does not know about blacklistd To generate a diff of this commit: cvs rdiff -u -r1.175.2.8 -r1.175.2.9 src/usr.sbin/postinstall/postinstall 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/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.175.2.8 src/usr.sbin/postinstall/postinstall:1.175.2.9 --- src/usr.sbin/postinstall/postinstall:1.175.2.8 Fri Aug 7 06:22:10 2015 +++ src/usr.sbin/postinstall/postinstall Fri Aug 21 17:27:16 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.175.2.8 2015/08/07 06:22:10 msaitoh Exp $ +# $NetBSD: postinstall,v 1.175.2.9 2015/08/21 17:27:16 snj Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1338,7 +1338,7 @@ do_rc() compare_dir "${op}" "${SRC_DIR}/etc/rc.d" "${DEST_DIR}/etc/rc.d" 555 \ DAEMON DISKS LOGIN NETWORKING SERVERS \ - accounting altqd amd apmd \ + accounting altqd amd apmd blacklistd \ bluetooth bootconf.sh bootparams \ ccd cgd cleartmp cron devpubd \ dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \
CVS commit: [netbsd-7] src/share/man/man7
Module Name:src Committed By: snj Date: Fri Aug 21 17:24:01 UTC 2015 Modified Files: src/share/man/man7 [netbsd-7]: hier.7 Log Message: Pull up following revision(s) (requested by mbalmer in ticket #952): share/man/man7/hier.7: revision 1.110 Lua 5.1 -> Lua 5.3 >From Kamil Rytarowski. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.109.4.1 src/share/man/man7/hier.7 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/man7/hier.7 diff -u src/share/man/man7/hier.7:1.109 src/share/man/man7/hier.7:1.109.4.1 --- src/share/man/man7/hier.7:1.109 Mon Mar 31 11:25:48 2014 +++ src/share/man/man7/hier.7 Fri Aug 21 17:24:01 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.109 2014/03/31 11:25:48 martin Exp $ +.\" $NetBSD: hier.7,v 1.109.4.1 2015/08/21 17:24:01 snj Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)hier.7 8.5 (Berkeley) 6/1/94 .\" -.Dd December 23, 2013 +.Dd May 25, 2015 .Dt HIER 7 .Os .Sh NAME @@ -463,9 +463,9 @@ archive, profiled, position independent .Pp .Bl -tag -width "lua/" -compact .It Sy lua/ -.Bl -tag -width "5.1/" -compact -.It Sy 5.1/ -Lua 5.1 modules +.Bl -tag -width "5.3/" -compact +.It Sy 5.3/ +Lua 5.3 modules .El .El .Pp
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Fri Aug 21 17:08:11 UTC 2015 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Cubieboard2 kernel is named netbsd-CUBIEBOARD.ub not netbsd-CUBIEBOARD2.ub To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/armv7.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/embedded/conf/armv7.conf diff -u src/distrib/utils/embedded/conf/armv7.conf:1.7 src/distrib/utils/embedded/conf/armv7.conf:1.8 --- src/distrib/utils/embedded/conf/armv7.conf:1.7 Sun Aug 2 11:11:32 2015 +++ src/distrib/utils/embedded/conf/armv7.conf Fri Aug 21 17:08:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: armv7.conf,v 1.7 2015/08/02 11:11:32 jmcneill Exp $ +# $NetBSD: armv7.conf,v 1.8 2015/08/21 17:08:11 jmcneill Exp $ # ARMv7 customization script used by mkimage # board=armv7 @@ -45,7 +45,7 @@ EOF populate_awin() { cat >> "${mnt}/boot/uEnv.txt" << EOF bootargs=root=ld0a console=${console} -uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD2.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 8200 \$kernel; bootm 8200 +uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 8200 \$kernel; bootm 8200 EOF }
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jmcneill Date: Fri Aug 21 16:29:48 UTC 2015 Modified Files: src/sys/dev/mii: rgephyreg.h Log Message: add some more RTL8211F bits To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/mii/rgephyreg.h 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/mii/rgephyreg.h diff -u src/sys/dev/mii/rgephyreg.h:1.8 src/sys/dev/mii/rgephyreg.h:1.9 --- src/sys/dev/mii/rgephyreg.h:1.8 Tue Mar 31 21:01:02 2015 +++ src/sys/dev/mii/rgephyreg.h Fri Aug 21 16:29:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rgephyreg.h,v 1.8 2015/03/31 21:01:02 jmcneill Exp $ */ +/* $NetBSD: rgephyreg.h,v 1.9 2015/08/21 16:29:48 jmcneill Exp $ */ /* * Copyright (c) 2003 @@ -58,6 +58,11 @@ /* RTL8211F */ #define RGEPHY_MII_PHYCR1 0x18 /* PHY Specific control register 1 */ #define RGEPHY_PHYCR1_MDI_MMCE __BIT(9) +#define RGEPHY_PHYCR1_ALDPS_EN __BIT(2) +#define RGEPHY_MII_MACR 0x0d /* MMD Access control register */ +#define RGEPHY_MACR_FUNCTION __BITS(15,14) +#define RGEPHY_MACR_DEVAD __BITS(4,0) +#define RGEPHY_MII_MAADR 0x0e /* MMD Access address data register */ #define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */ #define RGEPHY_PHYSR_ALDPS __BIT(14)
CVS commit: src/usr.sbin/rpc.statd
Module Name:src Committed By: christos Date: Fri Aug 21 15:41:38 UTC 2015 Modified Files: src/usr.sbin/rpc.statd: statd.c Log Message: fix bogus %m use EXIT_FAILURE To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/rpc.statd/statd.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/rpc.statd/statd.c diff -u src/usr.sbin/rpc.statd/statd.c:1.29 src/usr.sbin/rpc.statd/statd.c:1.30 --- src/usr.sbin/rpc.statd/statd.c:1.29 Sat Apr 18 09:04:50 2009 +++ src/usr.sbin/rpc.statd/statd.c Fri Aug 21 11:41:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: statd.c,v 1.29 2009/04/18 13:04:50 lukem Exp $ */ +/* $NetBSD: statd.c,v 1.30 2015/08/21 15:41:38 christos Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -37,7 +37,7 @@ #include #ifndef lint -__RCSID("$NetBSD: statd.c,v 1.29 2009/04/18 13:04:50 lukem Exp $"); +__RCSID("$NetBSD: statd.c,v 1.30 2015/08/21 15:41:38 christos Exp $"); #endif /* main() function for status monitor daemon. Some of the code in this */ @@ -119,11 +119,11 @@ main(argc, argv) rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrec); if (!svc_create(sm_prog_1, SM_PROG, SM_VERS, "udp")) { - errx(1, "cannot create udp service."); + errx(EXIT_FAILURE, "cannot create udp service."); /* NOTREACHED */ } if (!svc_create(sm_prog_1, SM_PROG, SM_VERS, "tcp")) { - errx(1, "cannot create udp service."); + errx(EXIT_FAILURE, "cannot create udp service."); /* NOTREACHED */ } @@ -525,7 +525,7 @@ init_file(filename) db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH, NULL); if (db == NULL) - err(1, "Cannot open `%s'", filename); + err(EXIT_FAILURE, "Cannot open `%s'", filename); switch ((*db->get)(db, &undefkey, &data, 0)) { case 1: @@ -535,11 +535,11 @@ init_file(filename) return; case -1: - err(1, "error accessing database (%m)"); + err(EXIT_FAILURE, "error accessing database (%s)", strerror(errno)); case 0: /* Existing database */ if (data.size != sizeof(status_info)) - errx(1, "database corrupted %lu != %lu", + errx(EXIT_FAILURE, "database corrupted %lu != %lu", (u_long)data.size, (u_long)sizeof(status_info)); memcpy(&status_info, data.data, data.size); break;
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src Committed By: christos Date: Fri Aug 21 15:33:04 UTC 2015 Modified Files: src/sys/arch/x68k/stand/boot_ufs: readufs.h readufs_lfs.c Log Message: fix build (dholland) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.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/x68k/stand/boot_ufs/readufs.h diff -u src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.13 --- src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 Tue Jun 18 14:18:58 2013 +++ src/sys/arch/x68k/stand/boot_ufs/readufs.h Fri Aug 21 11:33:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: readufs.h,v 1.12 2013/06/18 18:18:58 christos Exp $ */ +/* $NetBSD: readufs.h,v 1.13 2015/08/21 15:33:04 christos Exp $ */ /* from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp */ /* @@ -26,8 +26,7 @@ union ufs_dinode { struct ufs2_dinode di2; #endif #ifdef USE_LFS - struct ulfs1_dinode dil1; - struct ulfs2_dinode dil2; + struct lfs32_dinode dil32; #endif }; Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.17 --- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 Tue Jul 28 12:51:25 2015 +++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Fri Aug 21 11:33:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: readufs_lfs.c,v 1.16 2015/07/28 16:51:25 christos Exp $ */ +/* $NetBSD: readufs_lfs.c,v 1.17 2015/08/21 15:33:04 christos Exp $ */ /* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */ /* @@ -21,7 +21,7 @@ static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf); -static struct ulfs1_dinode ifile_dinode; +static struct lfs32_dinode ifile_dinode; #define fsi (*ufsinfo) #define fsi_lfs fsi.fs_u.u_lfs @@ -159,7 +159,7 @@ get_lfs_inode(ino32_t ino, union ufs_din struct ufs_info *ufsinfo = &ufs_info; daddr_t daddr; char *buf = alloca(fsi.bsize); - struct ulfs1_dinode *di, *diend; + struct lfs32_dinode *di, *diend; int i; /* Get fs block which contains the specified inode. */ @@ -176,7 +176,7 @@ get_lfs_inode(ino32_t ino, union ufs_din i = ino % fsi_lfs.ifpb; daddr = (fsi_lfs.version == 1) ? ((IFILE_V1 *) buf + i)->if_daddr - : ((IFILE *) buf + i)->if_daddr; + : ((IFILE32 *) buf + i)->if_daddr; } #ifdef DEBUG_WITH_STDIO printf("LFS(%d): daddr: %d\n", ino, (int) daddr); @@ -195,7 +195,7 @@ get_lfs_inode(ino32_t ino, union ufs_din ); /* Search for the inode. */ - di = (struct ulfs1_dinode *) buf; + di = (struct lfs32_dinode *) buf; diend = di + fsi_lfs.inopb; for ( ; di < diend; di++) @@ -219,7 +219,7 @@ found: #endif #endif - dibuf->dil1 = *di; + dibuf->dil32 = *di; return 0; }
CVS commit: src/sys/arch
Module Name:src Committed By: pooka Date: Fri Aug 21 14:22:14 UTC 2015 Modified Files: src/sys/arch/amd64/include: types.h src/sys/arch/i386/include: types.h Log Message: Make it possible to explicitly disable MSI/MSIX with NO_PCI_MSI_MSIX. Some platforms, e.g. linux uio-pci-generic, do not support MSI at all. XXX: does MSI being defined intentionally depend on _KERNEL_OPT on amd64 but not i386? To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amd64/include/types.h cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/include/types.h 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/amd64/include/types.h diff -u src/sys/arch/amd64/include/types.h:1.46 src/sys/arch/amd64/include/types.h:1.47 --- src/sys/arch/amd64/include/types.h:1.46 Mon Apr 27 07:03:57 2015 +++ src/sys/arch/amd64/include/types.h Fri Aug 21 14:22:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.46 2015/04/27 07:03:57 knakahara Exp $ */ +/* $NetBSD: types.h,v 1.47 2015/08/21 14:22:14 pooka Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -103,9 +103,11 @@ typedef volatile unsigned char __cpu_si #define __HAVE_MM_MD_DIRECT_MAPPED_IO #define __HAVE_MM_MD_DIRECT_MAPPED_PHYS #define __HAVE_CPU_UAREA_ROUTINES +#if !defined(NO_PCI_MSI_MSIX) #define __HAVE_PCI_MSI_MSIX #endif #endif +#endif #else /* !__x86_64__ */ Index: src/sys/arch/i386/include/types.h diff -u src/sys/arch/i386/include/types.h:1.81 src/sys/arch/i386/include/types.h:1.82 --- src/sys/arch/i386/include/types.h:1.81 Mon Apr 27 07:03:58 2015 +++ src/sys/arch/i386/include/types.h Fri Aug 21 14:22:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.81 2015/04/27 07:03:58 knakahara Exp $ */ +/* $NetBSD: types.h,v 1.82 2015/08/21 14:22:14 pooka Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -130,7 +130,7 @@ typedef volatile unsigned char __cpu_si #if defined(_KERNEL) #define __HAVE_RAS -#if !defined(XEN) +#if !defined(XEN) && !defined(NO_PCI_MSI_MSIX) #define __HAVE_PCI_MSI_MSIX #endif #endif
CVS commit: src/tests/fs/nfs/nfsservice
Module Name:src Committed By: christos Date: Fri Aug 21 14:19:10 UTC 2015 Modified Files: src/tests/fs/nfs/nfsservice: mountd.c nfsd.c src/tests/fs/nfs/nfsservice/rpcbind: rpcbind.c Log Message: don't abuse %m in printf fix error messages To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/fs/nfs/nfsservice/mountd.c cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nfs/nfsservice/nfsd.c cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/nfs/nfsservice/mountd.c diff -u src/tests/fs/nfs/nfsservice/mountd.c:1.8 src/tests/fs/nfs/nfsservice/mountd.c:1.9 --- src/tests/fs/nfs/nfsservice/mountd.c:1.8 Sat Oct 19 13:45:00 2013 +++ src/tests/fs/nfs/nfsservice/mountd.c Fri Aug 21 10:19:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $ */ +/* $NetBSD: mountd.c,v 1.9 2015/08/21 14:19:10 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $"); +__RCSID("$NetBSD: mountd.c,v 1.9 2015/08/21 14:19:10 christos Exp $"); #endif #endif/* not lint */ @@ -904,14 +904,12 @@ parse_directory(line, lineno, tgrp, got_ struct exportlist **ep; struct statvfs *fsp; { - int error = 0; - if (!check_dirpath(line, lineno, cp)) return 0; if (rump_sys_statvfs1(cp, fsp, ST_WAIT) == -1) { - syslog(LOG_ERR, "\"%s\", line %ld: statvfs for `%s' failed: %m %d", - line, (unsigned long)lineno, cp, error); + syslog(LOG_ERR, "\"%s\", line %ld: statvfs for `%s' failed (%s)", + line, (unsigned long)lineno, cp, strerror(errno)); return 0; } @@ -1011,8 +1009,8 @@ get_exportlist(n) mel.mel_nexports = 0; if (rump_sys_nfssvc(NFSSVC_SETEXPORTSLIST, &mel) == -1 && errno != EOPNOTSUPP) - syslog(LOG_ERR, "Can't delete exports for %s (%m)", - fsp->f_mntonname); + syslog(LOG_ERR, "Can't delete exports for %s (%s)", + fsp->f_mntonname, strerror(errno)); fsp++; } @@ -1997,13 +1995,13 @@ do_nfssvc(line, lineno, ep, grp, exflags if (rump_sys_nfssvc(NFSSVC_SETEXPORTSLIST, &mel) != 0) { syslog(LOG_ERR, - "\"%s\", line %ld: Can't change attributes for %s to %s: %m %d", + "\"%s\", line %ld: Can't change attributes for %s to %s (%s)", line, (unsigned long)lineno, dirp, (grp->gr_type == GT_HOST) ? grp->gr_ptr.gt_addrinfo->ai_canonname : (grp->gr_type == GT_NET) ? grp->gr_ptr.gt_net.nt_name : - "Unknown", errno); + "Unknown", strerror(errno)); return (1); } skip: @@ -2258,7 +2256,8 @@ get_mountlist() FILE *mlfile; if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "r")) == NULL) { - syslog(LOG_ERR, "Can't open %s: %m", _PATH_RMOUNTLIST); + syslog(LOG_ERR, "Can't open %s (%s)", _PATH_RMOUNTLIST, + strerror(errno)); return; } mlpp = &mlhead; @@ -2330,8 +2329,8 @@ cont: } if (fnd) { if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "w")) == NULL) { - syslog(LOG_ERR, "Can't update %s: %m", - _PATH_RMOUNTLIST); + syslog(LOG_ERR, "Can't update %s (%s)", + _PATH_RMOUNTLIST, strerror(errno)); return ret; } mlp = mlhead; @@ -2370,7 +2369,8 @@ add_mlist(hostp, dirp, flags) mlp->ml_next = NULL; *mlpp = mlp; if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "a")) == NULL) { - syslog(LOG_ERR, "Can't update %s: %m", _PATH_RMOUNTLIST); + syslog(LOG_ERR, "Can't update %s (%s)", _PATH_RMOUNTLIST, + strerror(errno)); return; } (void)fprintf(mlfile, "%s %s\n", mlp->ml_host, mlp->ml_dirp); @@ -2520,8 +2520,8 @@ check_dirpath(line, lineno, dirp) bad: syslog(LOG_ERR, - "\"%s\", line %ld: lstat for `%s' failed: %m", - line, (unsigned long)lineno, dirp); + "\"%s\", line %ld: lstat for `%s' failed (%s)", + line, (unsigned long)lineno, dirp, strerror(errno)); if (cp) *cp = '/'; return 0; @@ -2563,7 +2563,8 @@ bind_resv_port(int sock, sa_family_t fam return; } if (bindresvport_sa(sock, sa) == -1) - syslog(LOG_ERR, "Cannot bind to reserved port %d (%m)", port); + syslog(LOG_ERR, "Cannot bind to reserved port %d (%s)", port, + strerror(errno)); } /* ARGSUSED */ Index: src/tests/fs/nfs/nfsservice/nfsd.c diff -u src/tests/fs/nfs/nfsservice/nfsd.c:1.4 src/tests/fs/nfs/nfsservice/nfsd.c:1.5 --- src/tests/fs/nfs/nfsservice/nfsd.c:1.4 Sat Oct 19 13:45:00 2013 +++ src/tests/fs/nfs/nfsservice/nfsd.c Fri Aug 21 10:19:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nfsd.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */ +/* $NetBSD: nfsd.c,v 1.5 2015/08/21 14:19:10 christos Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = "@(#)nfsd.c 8.9 (Berkel
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Aug 21 13:24:47 UTC 2015 Modified Files: src/external/bsd/dhcpcd/dist: if-bsd.c Log Message: Remove unused variable. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/external/bsd/dhcpcd/dist/if-bsd.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/if-bsd.c diff -u src/external/bsd/dhcpcd/dist/if-bsd.c:1.23 src/external/bsd/dhcpcd/dist/if-bsd.c:1.24 --- src/external/bsd/dhcpcd/dist/if-bsd.c:1.23 Fri Aug 21 10:39:00 2015 +++ src/external/bsd/dhcpcd/dist/if-bsd.c Fri Aug 21 13:24:47 2015 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: if-bsd.c,v 1.23 2015/08/21 10:39:00 roy Exp $"); + __RCSID("$NetBSD: if-bsd.c,v 1.24 2015/08/21 13:24:47 roy Exp $"); /* * dhcpcd - DHCP client daemon @@ -1060,12 +1060,10 @@ if_addrflags6(const struct in6_addr *add int if_getlifetime6(struct ipv6_addr *ia) { - int r; struct in6_ifreq ifr6; time_t t; struct in6_addrlifetime *lifetime; - r = -1; memset(&ifr6, 0, sizeof(ifr6)); strlcpy(ifr6.ifr_name, ia->iface->name, sizeof(ifr6.ifr_name)); ifr6.ifr_addr.sin6_family = AF_INET6;
CVS commit: src/sys/rump/fs/lib/libnfs
Module Name:src Committed By: pooka Date: Fri Aug 21 12:45:10 UTC 2015 Removed Files: src/sys/rump/fs/lib/libnfs: opt_nfs.h opt_nfs_boot.h opt_nfsserver.h opt_tftproot.h opt_uvmhist.h Log Message: kill now-unnecessary empty opt files (_KERNEL_OPT'ed probably eons ago) To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/opt_nfs.h \ src/sys/rump/fs/lib/libnfs/opt_nfs_boot.h \ src/sys/rump/fs/lib/libnfs/opt_nfsserver.h \ src/sys/rump/fs/lib/libnfs/opt_tftproot.h \ src/sys/rump/fs/lib/libnfs/opt_uvmhist.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Aug 21 12:39:07 UTC 2015 Modified Files: src/sys/rump: Makefile.rump Added Files: src/sys/rump/include/opt: opt_rumpkernel.h Log Message: Move constant cpp macros from Makefile.rump into opt_rumpkernel.h (makes cc invocation lines a bit shorter) To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/rump/Makefile.rump cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/opt_rumpkernel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/Makefile.rump diff -u src/sys/rump/Makefile.rump:1.113 src/sys/rump/Makefile.rump:1.114 --- src/sys/rump/Makefile.rump:1.113 Wed Jun 3 14:40:11 2015 +++ src/sys/rump/Makefile.rump Fri Aug 21 12:39:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rump,v 1.113 2015/06/03 14:40:11 pooka Exp $ +# $NetBSD: Makefile.rump,v 1.114 2015/08/21 12:39:07 pooka Exp $ # .if !defined(_RUMP_MK) @@ -40,14 +40,13 @@ RUMP_NBCOMPAT= RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g} CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_&/g} -CPPFLAGS+= -DMAXUSERS=32 - CPPFLAGS+= -nostdinc CFLAGS+= -ffreestanding -fno-strict-aliasing CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign -CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR -CPPFLAGS+= -DDEBUGPRINT + +CPPFLAGS+= -imacros ${RUMPTOP}/include/opt/opt_rumpkernel.h + CPPFLAGS+= -I${.CURDIR} -I. CPPFLAGS+= -I${RUMPTOP}/../../common/include CPPFLAGS+= -I${RUMPTOP}/include @@ -118,7 +117,7 @@ CPPFLAGS+= -DKTRACE # make sure __NetBSD__ gets defined (for builds on non-NetBSD) # also, give those builds a way to undef the local compiler's macros -CPPFLAGS+= -D__NetBSD__ ${RUMPKERN_UNDEF} +CPPFLAGS+= ${RUMPKERN_UNDEF} RUMPKERNEL= This is NetBSD and I am the rump. Good evening. @@ -127,8 +126,9 @@ RUMPKERNEL= This is NetBSD and I am the CPPFLAGS+= -DPPC_OEA .endif -# If this file changes, we need a full rebuild +# If any of these files change, we need a full rebuild DPSRCS+= ${RUMPTOP}/Makefile.rump +DPSRCS+= ${RUMPTOP}/include/opt/opt_rumpkernel.h # # Support for component-specific hypercalls Added files: Index: src/sys/rump/include/opt/opt_rumpkernel.h diff -u /dev/null src/sys/rump/include/opt/opt_rumpkernel.h:1.1 --- /dev/null Fri Aug 21 12:39:07 2015 +++ src/sys/rump/include/opt/opt_rumpkernel.h Fri Aug 21 12:39:07 2015 @@ -0,0 +1,14 @@ +/* $NetBSD: opt_rumpkernel.h,v 1.1 2015/08/21 12:39:07 pooka Exp $ */ + +#ifndef __NetBSD__ +#define __NetBSD__ +#endif + +#define _KERNEL 1 +#define _MODULE 1 + +#define MODULAR 1 +#define MULTIPROCESSOR 1 +#define MAXUSERS 32 + +#define DEBUGPRINT
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: jmcneill Date: Fri Aug 21 12:26:54 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: ERLITE Log Message: enable NFSSERVER To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/conf/ERLITE 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/evbmips/conf/ERLITE diff -u src/sys/arch/evbmips/conf/ERLITE:1.11 src/sys/arch/evbmips/conf/ERLITE:1.12 --- src/sys/arch/evbmips/conf/ERLITE:1.11 Tue Jun 16 09:37:48 2015 +++ src/sys/arch/evbmips/conf/ERLITE Fri Aug 21 12:26:54 2015 @@ -1,11 +1,11 @@ -# $NetBSD: ERLITE,v 1.11 2015/06/16 09:37:48 martin Exp $ +# $NetBSD: ERLITE,v 1.12 2015/08/21 12:26:54 jmcneill Exp $ include "arch/mips/conf/std.octeon" include "arch/evbmips/conf/files.octeon" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ERLITE-$Revision: 1.11 $" +#ident "ERLITE-$Revision: 1.12 $" maxusers 32 @@ -75,7 +75,7 @@ file-system MSDOSFS # MS-DOS FAT filesy file-system PTYFS # /dev/pts/N support # File system options -#options NFSSERVER # Sun NFS-compatible filesystem server +options NFSSERVER # Sun NFS-compatible filesystem server #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jmcneill Date: Fri Aug 21 12:22:22 UTC 2015 Modified Files: src/sys/dev/mii: rgephy.c Log Message: Disable link down power save mode and energy efficient ethernet on RTL8211F. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/rgephy.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/mii/rgephy.c diff -u src/sys/dev/mii/rgephy.c:1.39 src/sys/dev/mii/rgephy.c:1.40 --- src/sys/dev/mii/rgephy.c:1.39 Tue Mar 31 21:01:02 2015 +++ src/sys/dev/mii/rgephy.c Fri Aug 21 12:22:22 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $ */ +/* $NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $ */ /* * Copyright (c) 2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $"); /* @@ -637,10 +637,9 @@ rgephy_reset(struct mii_softc *sc) } else if (sc->mii_mpd_rev == 6) { /* RTL8211F */ phycr1 = PHY_READ(sc, RGEPHY_MII_PHYCR1); - if ((phycr1 & RGEPHY_PHYCR1_MDI_MMCE) != 0) { - phycr1 &= ~RGEPHY_PHYCR1_MDI_MMCE; - PHY_WRITE(sc, RGEPHY_MII_PHYCR1, phycr1); - } + phycr1 &= ~RGEPHY_PHYCR1_MDI_MMCE; + phycr1 &= ~RGEPHY_PHYCR1_ALDPS_EN; + PHY_WRITE(sc, RGEPHY_MII_PHYCR1, phycr1); } else { PHY_WRITE(sc, 0x1F, 0x); PHY_WRITE(sc, 0x0e, 0x); @@ -657,4 +656,14 @@ rgephy_reset(struct mii_softc *sc) /* Step2: Restart NWay */ /* NWay enable and Restart NWay */ PHY_WRITE(sc, MII_BMCR, BMCR_RESET | BMCR_AUTOEN | BMCR_STARTNEG); + + if (sc->mii_mpd_rev == 6) { + /* RTL8211F */ + delay(1); + /* disable EEE */ + PHY_WRITE(sc, RGEPHY_MII_MACR, 0x0007); + PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x003c); + PHY_WRITE(sc, RGEPHY_MII_MACR, 0x4007); + PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x); + } }
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Fri Aug 21 12:02:07 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: PR/50158 - Simon Burge -- postinstall does not know about blacklistd To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/usr.sbin/postinstall/postinstall 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/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.199 src/usr.sbin/postinstall/postinstall:1.200 --- src/usr.sbin/postinstall/postinstall:1.199 Sat Aug 15 09:33:55 2015 +++ src/usr.sbin/postinstall/postinstall Fri Aug 21 12:02:07 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.199 2015/08/15 09:33:55 uebayasi Exp $ +# $NetBSD: postinstall,v 1.200 2015/08/21 12:02:07 jnemeth Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1336,6 +1336,7 @@ accounting altqd amd apmd +blacklistd bluetooth bootconf.sh bootparams
CVS commit: src/sys/arch/luna68k
Module Name:src Committed By: christos Date: Fri Aug 21 10:48:06 UTC 2015 Modified Files: src/sys/arch/luna68k/dev: lunaws.c siotty.c src/sys/arch/luna68k/luna68k: machdep.c Added Files: src/sys/arch/luna68k/dev: syscn.h Log Message: - move prototypes to common header file - rename function to avoid confusion with pseudo-device attach To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/dev/lunaws.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/luna68k/dev/siotty.c cvs rdiff -u -r0 -r1.1 src/sys/arch/luna68k/dev/syscn.h cvs rdiff -u -r1.98 -r1.99 src/sys/arch/luna68k/luna68k/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/sys/arch/luna68k/dev/lunaws.c diff -u src/sys/arch/luna68k/dev/lunaws.c:1.30 src/sys/arch/luna68k/dev/lunaws.c:1.31 --- src/sys/arch/luna68k/dev/lunaws.c:1.30 Sun Jul 20 07:14:56 2014 +++ src/sys/arch/luna68k/dev/lunaws.c Fri Aug 21 06:48:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lunaws.c,v 1.30 2014/07/20 11:14:56 tsutsui Exp $ */ +/* $NetBSD: lunaws.c,v 1.31 2015/08/21 10:48:06 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.30 2014/07/20 11:14:56 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.31 2015/08/21 10:48:06 christos Exp $"); #include "opt_wsdisplay_compat.h" #include "wsmouse.h" @@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1 #include #include #include +#include #include "ioconf.h" @@ -128,9 +129,6 @@ static void wsattach(device_t, device_t, CFATTACH_DECL_NEW(ws, sizeof(struct ws_softc), wsmatch, wsattach, NULL, NULL); -extern int syscngetc(dev_t); -extern void syscnputc(dev_t, int); - static int wsmatch(device_t parent, cfdata_t cf, void *aux) { Index: src/sys/arch/luna68k/dev/siotty.c diff -u src/sys/arch/luna68k/dev/siotty.c:1.43 src/sys/arch/luna68k/dev/siotty.c:1.44 --- src/sys/arch/luna68k/dev/siotty.c:1.43 Thu Aug 20 10:40:17 2015 +++ src/sys/arch/luna68k/dev/siotty.c Fri Aug 21 06:48:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $ */ +/* $NetBSD: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $"); #include "opt_ddb.h" @@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1 #include #include +#include #include "ioconf.h" @@ -693,9 +694,6 @@ getsiocsr(struct sioreg *sio) /*- console interface --*/ -int syscngetc(dev_t); -void syscnputc(dev_t, int); - struct consdev syscons = { NULL, NULL, @@ -710,7 +708,7 @@ struct consdev syscons = { }; /* EXPORT */ void -syscnattach(int channel) +syscninit(int channel) { /* * Channel A is immediately initialized with 9600N1 right after cold Index: src/sys/arch/luna68k/luna68k/machdep.c diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.98 src/sys/arch/luna68k/luna68k/machdep.c:1.99 --- src/sys/arch/luna68k/luna68k/machdep.c:1.98 Mon Mar 24 15:46:24 2014 +++ src/sys/arch/luna68k/luna68k/machdep.c Fri Aug 21 06:48:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.98 2014/03/24 19:46:24 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.99 2015/08/21 10:48:06 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2014/03/24 19:46:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2015/08/21 10:48:06 christos Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -84,6 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include /* XXX should be pulled in by sys/kcore.h */ +#include + #include #include @@ -137,7 +139,6 @@ int sysconsole; /* console: 0 for ttya, extern struct consdev syscons; extern void omfb_cnattach(void); extern void ws_cnattach(void); -extern void syscnattach(int); /* * On the 68020/68030, the value of delay_divisor is roughly @@ -248,7 +249,7 @@ consinit(void) { if (sysconsole == 0) - syscnattach(0); + syscninit(0); else { omfb_cnattach(); ws_cnattach(); Added files: Index: src/sys/arch/luna68k/dev/syscn.h diff -u /dev/null src/sys/arch/luna68k/dev/syscn.h:1.1 --- /dev/null Fri Aug 21 06:48:06 2015 +++ src/sys/arch/luna68k/dev/syscn.h Fri Aug 21 06:48:06 2015 @@ -0,0 +1,6 @@ +/* $NetBSD: syscn.h,v 1.1 2015/08/21 10:48:06 christos Exp $ */ + +void syscninit(int); +int syscngetc(dev_t); +void syscnputc(dev_t, int); +
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Aug 21 10:47:53 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.9.2 To generate a diff of this commit: cvs rdiff -u -r1.1247 -r1.1248 src/doc/3RDPARTY cvs rdiff -u -r1.2096 -r1.2097 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.1247 src/doc/3RDPARTY:1.1248 --- src/doc/3RDPARTY:1.1247 Fri Aug 21 08:22:16 2015 +++ src/doc/3RDPARTY Fri Aug 21 10:47:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1247 2015/08/21 08:22:16 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1248 2015/08/21 10:47:53 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -306,8 +306,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.9.1 -Current Vers: 6.9.1 +Version: 6.9.2 +Current Vers: 6.9.2 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.2096 src/doc/CHANGES:1.2097 --- src/doc/CHANGES:1.2096 Fri Aug 21 08:22:16 2015 +++ src/doc/CHANGES Fri Aug 21 10:47:53 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2096 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2097 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -189,3 +189,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: acpi(4): Updated ACPICA to 20150717. [christos 20150818] mcp3kadc(4): Driver for Microchip 3x0x SAR ADC chips. [phx 20150818] OpenSSH: Imported 7.1. [christos 20150821] + dhcpcd: Import dhcpcd 6.9.2. [roy 20150821]
CVS commit: src
Module Name:src Committed By: roy Date: Fri Aug 21 10:44:43 UTC 2015 Modified Files: src/distrib/sets/lists/base: mi src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile Log Message: 10-mtu is no longer used To generate a diff of this commit: cvs rdiff -u -r1.1110 -r1. src/distrib/sets/lists/base/mi cvs rdiff -u -r1.25 -r1.26 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile 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/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1110 src/distrib/sets/lists/base/mi:1. --- src/distrib/sets/lists/base/mi:1.1110 Mon Aug 17 06:42:45 2015 +++ src/distrib/sets/lists/base/mi Fri Aug 21 10:44:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1110 2015/08/17 06:42:45 knakahara Exp $ +# $NetBSD: mi,v 1. 2015/08/21 10:44:43 roy Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -398,7 +398,7 @@ ./libexec/dhcpcd-hooksbase-dhcpcd-root ./libexec/dhcpcd-hooks/01-test base-dhcpcd-root ./libexec/dhcpcd-hooks/02-dump base-dhcpcd-root -./libexec/dhcpcd-hooks/10-mtu base-dhcpcd-root +./libexec/dhcpcd-hooks/10-mtu base-obsolete obsolete ./libexec/dhcpcd-hooks/10-resolv.conf base-obsolete obsolete ./libexec/dhcpcd-hooks/10-wpa_supplicant base-dhcpcd-root ./libexec/dhcpcd-hooks/14-lookup-hostname base-obsolete obsolete Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.25 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.26 --- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.25 Sat May 16 23:33:33 2015 +++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Aug 21 10:44:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/05/16 23:33:33 roy Exp $ +# $NetBSD: Makefile,v 1.26 2015/08/21 10:44:43 roy Exp $ # PROG= dhcpcd @@ -38,7 +38,7 @@ SCRIPTSDIR_dhcpcd-run-hooks= /libexec CONFIGFILES= dhcpcd.conf FILESDIR_dhcpcd.conf= /etc -HOOKS= 01-test 02-dump 10-mtu 10-wpa_supplicant 15-timezone +HOOKS= 01-test 02-dump 10-wpa_supplicant 15-timezone HOOKS+= 20-resolv.conf 29-lookup-hostname 30-hostname HOOKS+= 50-ntp.conf
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Aug 21 10:39:01 UTC 2015 Modified Files: src/external/bsd/dhcpcd/dist: control.c defs.h dhcp.c dhcp.h dhcp6.c dhcpcd-run-hooks.in dhcpcd.8.in dhcpcd.c dhcpcd.conf dhcpcd.conf.5.in dhcpcd.h if-bsd.c if-options.c if-options.h if.c if.h ipv4.c ipv4.h ipv4ll.c ipv4ll.h ipv6.c ipv6nd.c script.c src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 20-resolv.conf 30-hostname Removed Files: src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 10-mtu Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/control.c \ src/external/bsd/dhcpcd/dist/ipv4ll.h cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/defs.h cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/dhcp.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/dhcp.h \ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/dhcp6.c \ src/external/bsd/dhcpcd/dist/if.c cvs rdiff -u -r1.43 -r1.44 src/external/bsd/dhcpcd/dist/dhcpcd.8.in cvs rdiff -u -r1.26 -r1.27 src/external/bsd/dhcpcd/dist/dhcpcd.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/dhcpcd/dist/dhcpcd.conf \ src/external/bsd/dhcpcd/dist/ipv4.c cvs rdiff -u -r1.22 -r1.23 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in \ src/external/bsd/dhcpcd/dist/if-bsd.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/dhcpcd.h \ src/external/bsd/dhcpcd/dist/if-options.h \ src/external/bsd/dhcpcd/dist/ipv4.h cvs rdiff -u -r1.25 -r1.26 src/external/bsd/dhcpcd/dist/if-options.c \ src/external/bsd/dhcpcd/dist/ipv6nd.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/if.h \ src/external/bsd/dhcpcd/dist/ipv4ll.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/ipv6.c cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/script.c cvs rdiff -u -r1.6 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname 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/control.c diff -u src/external/bsd/dhcpcd/dist/control.c:1.9 src/external/bsd/dhcpcd/dist/control.c:1.10 --- src/external/bsd/dhcpcd/dist/control.c:1.9 Sat May 16 23:31:32 2015 +++ src/external/bsd/dhcpcd/dist/control.c Fri Aug 21 10:39:00 2015 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: control.c,v 1.9 2015/05/16 23:31:32 roy Exp $"); + __RCSID("$NetBSD: control.c,v 1.10 2015/08/21 10:39:00 roy Exp $"); /* * dhcpcd - DHCP client daemon @@ -46,6 +46,7 @@ #include "dhcpcd.h" #include "control.h" #include "eloop.h" +#include "if.h" #ifndef SUN_LEN #define SUN_LEN(su) \ @@ -210,28 +211,8 @@ make_sock(struct sockaddr_un *sa, const { int fd; -#ifdef SOCK_CLOEXEC - if ((fd = socket(AF_UNIX, - SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) == -1) + if ((fd = xsocket(AF_UNIX, SOCK_STREAM, 0, O_NONBLOCK|O_CLOEXEC)) == -1) return -1; -#else - int flags; - - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) - return -1; - if ((flags = fcntl(fd, F_GETFD, 0)) == -1 || - fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) - { - close(fd); - return -1; - } - if ((flags = fcntl(fd, F_GETFL, 0)) == -1 || - fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) - { - close(fd); - return -1; - } -#endif memset(sa, 0, sizeof(*sa)); sa->sun_family = AF_UNIX; if (unpriv) Index: src/external/bsd/dhcpcd/dist/ipv4ll.h diff -u src/external/bsd/dhcpcd/dist/ipv4ll.h:1.9 src/external/bsd/dhcpcd/dist/ipv4ll.h:1.10 --- src/external/bsd/dhcpcd/dist/ipv4ll.h:1.9 Thu Jul 9 10:15:34 2015 +++ src/external/bsd/dhcpcd/dist/ipv4ll.h Fri Aug 21 10:39:00 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ipv4ll.h,v 1.9 2015/07/09 10:15:34 roy Exp $ */ +/* $NetBSD: ipv4ll.h,v 1.10 2015/08/21 10:39:00 roy Exp $ */ /* * dhcpcd - DHCP client daemon @@ -32,6 +32,9 @@ #include "arp.h" +extern const struct in_addr inaddr_llmask; +extern const struct in_addr inaddr_llbcast; + #define LINKLOCAL_ADDR 0xa9fe #define LINKLOCAL_MASK IN_CLASSB_NET #define LINKLOCAL_BRDC (LINKLOCAL_ADDR | ~LINKLOCAL_MASK) @@ -58,6 +61,7 @@ struct ipv4ll_state { IN_LINKLOCAL(ntohl(IPV4LL_CSTATE((ifp))->addr.s_addr))) struct rt* ipv4ll_subnet_route(const struct interface *); +struct rt* ipv4ll_default_route(const struct interface *); ssize_t ipv4ll_env(char **, const char *, const struct interface *); void ipv4ll_start(void *); void ipv4ll_claimed(void *); Index: src/external/bsd/dhcpcd/dist/defs.h diff -u src/external/bsd/dhcpcd/dist/defs.h:1.19 src/external/bsd/dhcpcd/dist/defs.h:1.20 --- src/external/bsd/dhcpcd/dist/defs.h:1.19 Thu Jul 9 10:15:34 2015 +++ src/external/bsd/dhcpcd/dist/defs.h Fri Aug 21 10:39:00 2015 @@ -1,4 +1,4 @@ -/
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Aug 21 10:35:53 UTC 2015 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17397 Log Message: Import dhcpcd-6.9.2 with the following changes: * Only run the IPv4LL script and rebuild routes on drop when an address is actually dropped. * Add noup directive to stop master mode bringing an interface up. * If only IPv4LL addresses exist, assign a default route to the interface so that IPv4LL can talk to non IPv4LL on the same link. * Set DHCPv4 MTU on routes instead of the interface. This matches IPv6 behaviour and works around dodgy interfaces where a MTU change can reset the PHY causing an infinite loop. * MTU is now requested by default in dhcpcd.conf again. * noauthrequired also allows unauthenticated FORCERENEW and RECONFIGURE messages. * Simplify the socket code by adding a custom function instead of having the same #ifdef mess for systems without SOCK_CLOEXEC. Thanks to Christos Zoulas. * Don't do platform init or setting interface MTU if too small when testing or dumping leases. * Build new_domain_name from other sources if blank before checking it's blank to remove any prior config. Thanks to Paul Walrath. * Describe adding an IPv6 temporary address. * Don't delete dhcpcd assigned IPv6 link-local addresses when releasing leases. * Reference old DHCPv6 FQDN when processing the hostname. Status: Vendor Tag: roy Release Tags: dhcpcd-6-9-2 U src/external/bsd/dhcpcd/dist/common.c C src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U 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 U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c U 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 U src/external/bsd/dhcpcd/dist/auth.c C 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 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 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 C src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U 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 U 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-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone C src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname C 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 25 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/share/misc
Module Name:src Committed By: pgoyette Date: Fri Aug 21 09:46:43 UTC 2015 Modified Files: src/share/misc: acronyms Log Message: Add a (clean) definition of WTF To generate a diff of this commit: cvs rdiff -u -r1.238 -r1.239 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.238 src/share/misc/acronyms:1.239 --- src/share/misc/acronyms:1.238 Thu Aug 20 07:10:02 2015 +++ src/share/misc/acronyms Fri Aug 21 09:46:43 2015 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.238 2015/08/20 07:10:02 dholland Exp $ +$NetBSD: acronyms,v 1.239 2015/08/21 09:46:43 pgoyette Exp $ 10Q thank you 10X thanks 1337 elite ("leet") @@ -536,6 +536,7 @@ WMNC watch me not care WOMBAT waste of money, brain, and time WRT with respect to WTB {waiting,want,willing} to buy +WTF where's the food WTG way to go WTH {what,when,where,who,why} the hell WTS {waiting,want,willing} to sell
CVS commit: src/sys/dev
Module Name:src Committed By: christos Date: Fri Aug 21 09:33:53 UTC 2015 Modified Files: src/sys/dev: cgd.c Log Message: don't allow STRATEGY if we are not inited. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/dev/cgd.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/cgd.c diff -u src/sys/dev/cgd.c:1.102 src/sys/dev/cgd.c:1.103 --- src/sys/dev/cgd.c:1.102 Thu Aug 20 10:40:17 2015 +++ src/sys/dev/cgd.c Fri Aug 21 05:33:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $ */ +/* $NetBSD: cgd.c,v 1.103 2015/08/21 09:33:53 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.103 2015/08/21 09:33:53 christos Exp $"); #include #include @@ -563,6 +563,11 @@ cgdioctl(dev_t dev, u_long cmd, void *da * We pass this call down to the underlying disk. */ return VOP_IOCTL(cs->sc_tvn, cmd, data, flag, l->l_cred); + case DIOCGSTRATEGY: + case DIOCSSTRATEGY: + if ((dksc->sc_flags & DKF_INITED) == 0) + return ENOENT; + /*FALLTHROUGH*/ default: return dk_ioctl(dksc, dev, cmd, data, flag, l); case CGDIOCGET:
CVS commit: src/sys/arch/ews4800mips/conf
Module Name:src Committed By: christos Date: Fri Aug 21 09:18:17 UTC 2015 Modified Files: src/sys/arch/ews4800mips/conf: RAMDISK Log Message: comment out disabling ksyms To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ews4800mips/conf/RAMDISK 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/ews4800mips/conf/RAMDISK diff -u src/sys/arch/ews4800mips/conf/RAMDISK:1.16 src/sys/arch/ews4800mips/conf/RAMDISK:1.17 --- src/sys/arch/ews4800mips/conf/RAMDISK:1.16 Sat Mar 10 16:51:52 2012 +++ src/sys/arch/ews4800mips/conf/RAMDISK Fri Aug 21 05:18:17 2015 @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.16 2012/03/10 21:51:52 joerg Exp $ +# $NetBSD: RAMDISK,v 1.17 2015/08/21 09:18:17 christos Exp $ # # kernel config file with memory disk for installation # @@ -84,5 +84,6 @@ no pseudo-device agr no pseudo-device accf_data no pseudo-device accf_http no pseudo-device clockctl -no pseudo-device ksyms +# GENERIC has DDB, needs ksyms +#no pseudo-device ksyms no pseudo-device wsmux
CVS commit: src/sys/modules/i915drmkms
Module Name:src Committed By: christos Date: Fri Aug 21 09:10:48 UTC 2015 Modified Files: src/sys/modules/i915drmkms: Makefile Log Message: consistency with: src/sys/external/bsd/drm2/i915drm/files.i915drmkms so that we can build again To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/modules/i915drmkms/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/i915drmkms/Makefile diff -u src/sys/modules/i915drmkms/Makefile:1.7 src/sys/modules/i915drmkms/Makefile:1.8 --- src/sys/modules/i915drmkms/Makefile:1.7 Thu Nov 13 11:37:39 2014 +++ src/sys/modules/i915drmkms/Makefile Fri Aug 21 05:10:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/11/13 16:37:39 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2015/08/21 09:10:48 christos Exp $ .include "../Makefile.inc" .include "../drmkms/Makefile.inc" @@ -77,7 +77,8 @@ COPTS.intel_display.c+= -Wno-shadow -Wno COPTS.intel_panel.c+= -Wno-shadow COPTS.intel_pm.c+= -Wno-shadow -CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV +CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV=1 +CPPFLAGS+= -DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0 CPPFLAGS+= -DNACPICA=1 CPPFLAGS+= -DNVGA=1
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Aug 21 08:22:16 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1246 -r1.1247 src/doc/3RDPARTY cvs rdiff -u -r1.2095 -r1.2096 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.1246 src/doc/3RDPARTY:1.1247 --- src/doc/3RDPARTY:1.1246 Tue Aug 18 06:48:01 2015 +++ src/doc/3RDPARTY Fri Aug 21 04:22:16 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1246 2015/08/18 10:48:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1247 2015/08/21 08:22:16 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -997,8 +997,8 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 7.0 -Current Vers: 7.0 / portable 7.0p1 +Version: 7.1 +Current Vers: 7.1 / portable 7.1p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2095 src/doc/CHANGES:1.2096 --- src/doc/CHANGES:1.2095 Tue Aug 18 11:54:20 2015 +++ src/doc/CHANGES Fri Aug 21 04:22:16 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2095 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2096 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -188,3 +188,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: gdb(1): Updated to 7.9.1. [christos 20150818] acpi(4): Updated ACPICA to 20150717. [christos 20150818] mcp3kadc(4): Driver for Microchip 3x0x SAR ADC chips. [phx 20150818] + OpenSSH: Imported 7.1. [christos 20150821]
CVS commit: src/crypto/external/bsd/openssh/dist
$ +.\" $NetBSD: sshd_config.5,v 1.20 2015/08/21 08:20:59 christos Exp $ .\" -*- nroff -*- .\" .\" Author: Tatu Ylonen @@ -35,8 +35,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.210 2015/08/06 14:53:21 deraadt Exp $ -.Dd August 6 2015 +.\" $OpenBSD: sshd_config.5,v 1.211 2015/08/14 15:32:41 jmc Exp $ +.Dd August 14 2015 .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -479,9 +479,9 @@ chacha20-poly1...@openssh.com .Pp The default is: .Bd -literal -offset indent +chacha20-poly1...@openssh.com, aes128-ctr,aes192-ctr,aes256-ctr, -aes128-...@openssh.com,aes256-...@openssh.com, -chacha20-poly1...@openssh.com +aes128-...@openssh.com,aes256-...@openssh.com .Ed .Pp The list of available ciphers may also be obtained using the @@ -1533,7 +1533,7 @@ If this option is set to .Pa ~/.ssh/known_hosts .Cm from and -.Xr sshd_config 5 +.Nm .Cm Match .Cm Host directives. Index: src/crypto/external/bsd/openssh/dist/sshkey.c diff -u src/crypto/external/bsd/openssh/dist/sshkey.c:1.5 src/crypto/external/bsd/openssh/dist/sshkey.c:1.6 --- src/crypto/external/bsd/openssh/dist/sshkey.c:1.5 Thu Aug 13 06:33:21 2015 +++ src/crypto/external/bsd/openssh/dist/sshkey.c Fri Aug 21 04:20:59 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: sshkey.c,v 1.5 2015/08/13 10:33:21 christos Exp $ */ -/* $OpenBSD: sshkey.c,v 1.20 2015/07/03 03:43:18 djm Exp $ */ +/* $NetBSD: sshkey.c,v 1.6 2015/08/21 08:20:59 christos Exp $ */ +/* $OpenBSD: sshkey.c,v 1.21 2015/08/19 23:19:01 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -__RCSID("$NetBSD: sshkey.c,v 1.5 2015/08/13 10:33:21 christos Exp $"); +__RCSID("$NetBSD: sshkey.c,v 1.6 2015/08/21 08:20:59 christos Exp $"); #include /* MIN MAX */ #include @@ -1531,7 +1531,6 @@ dsa_generate_private_key(u_int bits, DSA *dsap = NULL; if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL, NULL, NULL) || !DSA_generate_key(private)) { - DSA_free(private); ret = SSH_ERR_LIBCRYPTO_ERROR; goto out; } Index: src/crypto/external/bsd/openssh/dist/version.h diff -u src/crypto/external/bsd/openssh/dist/version.h:1.16 src/crypto/external/bsd/openssh/dist/version.h:1.17 --- src/crypto/external/bsd/openssh/dist/version.h:1.16 Thu Aug 13 06:33:21 2015 +++ src/crypto/external/bsd/openssh/dist/version.h Fri Aug 21 04:20:59 2015 @@ -1,8 +1,8 @@ -/* $NetBSD: version.h,v 1.16 2015/08/13 10:33:21 christos Exp $ */ -/* $OpenBSD: version.h,v 1.74 2015/08/02 09:56:42 djm Exp $ */ +/* $NetBSD: version.h,v 1.17 2015/08/21 08:20:59 christos Exp $ */ +/* $OpenBSD: version.h,v 1.75 2015/08/21 03:45:26 djm Exp $ */ -#define __OPENSSH_VERSION "OpenSSH_7.0" -#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20150812" +#define __OPENSSH_VERSION "OpenSSH_7.1" +#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20150821" #define SSH_HPN "-hpn13v14" #define SSH_LPK "-lpk" /*
CVS commit: src/external/gpl3/gdb/lib/libbfd
Module Name:src Committed By: tron Date: Fri Aug 21 08:19:28 UTC 2015 Modified Files: src/external/gpl3/gdb/lib/libbfd: Makefile Log Message: Fix build with "USE_SSP=yes". To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/lib/libbfd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/lib/libbfd/Makefile diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.6 src/external/gpl3/gdb/lib/libbfd/Makefile:1.7 --- src/external/gpl3/gdb/lib/libbfd/Makefile:1.6 Sun Aug 16 09:51:58 2015 +++ src/external/gpl3/gdb/lib/libbfd/Makefile Fri Aug 21 08:19:28 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/08/16 09:51:58 christos Exp $ +# $NetBSD: Makefile,v 1.7 2015/08/21 08:19:28 tron Exp $ .include .include "../Makefile.inc" @@ -27,6 +27,8 @@ CLEANFILES+= elf32-target.h elf64-target .include +COPTS+= -Wno-stack-protector + ${OBJS} ${SOBJS}: elf32-target.h elf64-target.h targets.o targets.pico: targmatch.h Makefile
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Fri Aug 21 08:09:01 UTC 2015 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23003 Log Message: Changes since OpenSSH 7.0 = This is a bugfix release. Security * sshd(8): OpenSSH 7.0 contained a logic error in PermitRootLogin= prohibit-password/without-password that could, depending on compile-time configuration, permit password authentication to root while preventing other forms of authentication. This problem was reported by Mantas Mikulenas. Bugfixes * ssh(1), sshd(8): add compatability workarounds for FuTTY * ssh(1), sshd(8): refine compatability workarounds for WinSCP * Fix a number of memory faults (double-free, free of uninitialised memory, etc) in ssh(1) and ssh-keygen(1). Reported by Mateusz Kocielski. Status: Vendor Tag: OPENSSH Release Tags: v71-20150821 U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/hostfile.c U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/OVERVIEW U src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305 U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/PROTOCOL.key U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux U src/crypto/external/bsd/openssh/dist/README U src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c U src/crypto/external/bsd/openssh/dist/auth-options.c U src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/hmac.c U src/crypto/external/bsd/openssh/dist/auth-passwd.c U src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c U src/crypto/external/bsd/openssh/dist/auth-rhosts.c U src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c U src/crypto/external/bsd/openssh/dist/auth.h U src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c U src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c U src/crypto/external/bsd/openssh/dist/auth2-pubkey.c U src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/authfd.c U src/crypto/external/bsd/openssh/dist/authfd.h U src/crypto/external/bsd/openssh/dist/authfile.c U src/crypto/external/bsd/openssh/dist/authfile.h U src/crypto/external/bsd/openssh/dist/bitmap.c U src/crypto/external/bsd/openssh/dist/bitmap.h U src/crypto/external/bsd/openssh/dist/blocks.c U src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c U src/crypto/external/bsd/openssh/dist/bufec.c U src/crypto/external/bsd/openssh/dist/buffer.c U src/crypto/external/bsd/openssh/dist/buffer.h U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/canohost.h U src/crypto/external/bsd/openssh/dist/chacha.c U src/crypto/external/bsd/openssh/dist/chacha.h U src/crypto/external/bsd/openssh/dist/channels.c U src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c U src/crypto/external/bsd/openssh/dist/cipher-aesctr.c U src/crypto/external/bsd/openssh/dist/cipher-aesctr.h U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/crypto_api.h C src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c U src/crypto/external/bsd/openssh/dist/clientloop.c U src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/digest-libc.c U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h U src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/ge25519_base.data U src/crypto/external/bsd/openssh/dist/digest-openssl.c U src/crypto/external/bsd/openssh/dist/digest.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h C src
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: hannken Date: Fri Aug 21 07:35:56 UTC 2015 Modified Files: src/sys/ufs/lfs: lfs_segment.c Log Message: lfs_writevnodes: replace mnt_vnodelist traversal with vfs_vnode_iterator. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/sys/ufs/lfs/lfs_segment.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/ufs/lfs/lfs_segment.c diff -u src/sys/ufs/lfs/lfs_segment.c:1.257 src/sys/ufs/lfs/lfs_segment.c:1.258 --- src/sys/ufs/lfs/lfs_segment.c:1.257 Wed Aug 19 20:33:29 2015 +++ src/sys/ufs/lfs/lfs_segment.c Fri Aug 21 07:35:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_segment.c,v 1.257 2015/08/19 20:33:29 dholland Exp $ */ +/* $NetBSD: lfs_segment.c,v 1.258 2015/08/21 07:35:56 hannken Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,9 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.257 2015/08/19 20:33:29 dholland Exp $"); - -#define _VFS_VNODE_PRIVATE /* XXX: check for VI_MARKER, this has to go */ +__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.258 2015/08/21 07:35:56 hannken Exp $"); #ifdef DEBUG # define vndebug(vp, str) do { \ @@ -478,131 +476,113 @@ lfs_vflush(struct vnode *vp) return (0); } +struct lfs_writevnodes_ctx { + int op; + struct lfs *fs; +}; +static bool +lfs_writevnodes_selector(void *cl, struct vnode *vp) +{ + struct lfs_writevnodes_ctx *c = cl; + struct inode *ip = VTOI(vp); + int op = c->op; + + if (ip == NULL || vp->v_type == VNON) + return false; + if ((op == VN_DIROP && !(vp->v_uflag & VU_DIROP)) || + (op != VN_DIROP && op != VN_CLEAN && (vp->v_uflag & VU_DIROP))) { + vndebug(vp, "dirop"); + return false; + } + if (op == VN_EMPTY && !VPISEMPTY(vp)) { + vndebug(vp,"empty"); + return false;; + } + if (op == VN_CLEAN && ip->i_number != LFS_IFILE_INUM && + vp != c->fs->lfs_flushvp && !(ip->i_flag & IN_CLEANING)) { + vndebug(vp,"cleaning"); + return false; + } + mutex_enter(&lfs_lock); + if (vp == c->fs->lfs_unlockvp) { + mutex_exit(&lfs_lock); + return false; + } + mutex_exit(&lfs_lock); + + return true; +} + int lfs_writevnodes(struct lfs *fs, struct mount *mp, struct segment *sp, int op) { struct inode *ip; struct vnode *vp; + struct vnode_iterator *marker; + struct lfs_writevnodes_ctx ctx; int inodes_written = 0; int error = 0; - ASSERT_SEGLOCK(fs); - loop: - /* start at last (newest) vnode. */ - mutex_enter(&mntvnode_lock); - TAILQ_FOREACH_REVERSE(vp, &mp->mnt_vnodelist, vnodelst, v_mntvnodes) { - /* - * If the vnode that we are about to sync is no longer - * associated with this mount point, start over. - */ - if (vp->v_mount != mp) { - DLOG((DLOG_VNODE, "lfs_writevnodes: starting over\n")); - /* - * After this, pages might be busy - * due to our own previous putpages. - * Start actual segment write here to avoid deadlock. - * If we were just writing one segment and we've done - * that, break out. - */ - mutex_exit(&mntvnode_lock); - if (lfs_writeseg(fs, sp) && - (sp->seg_flags & SEGM_SINGLE) && - lfs_sb_getcurseg(fs) != fs->lfs_startseg) { -DLOG((DLOG_VNODE, "lfs_writevnodes: breaking out of segment write at daddr 0x%jx\n", (uintmax_t)lfs_sb_getoffset(fs))); -break; - } - goto loop; - } - - mutex_enter(vp->v_interlock); - if (vp->v_type == VNON || (vp->v_iflag & VI_MARKER) || - vdead_check(vp, VDEAD_NOWAIT) != 0) { - mutex_exit(vp->v_interlock); - continue; - } + /* + * XXX This was TAILQ_FOREACH_REVERSE on &mp->mnt_vnodelist. + * XXX The rationale is unclear, the initial commit had no information. + * XXX If the order really matters we have to sort the vnodes first. + */ + ASSERT_SEGLOCK(fs); + vfs_vnode_iterator_init(mp, &marker); + ctx.op = op; + ctx.fs = fs; + while ((vp = vfs_vnode_iterator_next(marker, + lfs_writevnodes_selector, &ctx)) != NULL) { ip = VTOI(vp); - if ((op == VN_DIROP && !(vp->v_uflag & VU_DIROP)) || - (op != VN_DIROP && op != VN_CLEAN && - (vp->v_uflag & VU_DIROP))) { - mutex_exit(vp->v_interlock); - vndebug(vp,"dirop"); - continue; - } - - if (op == VN_EMPTY && !VPISEMPTY(vp)) { - mutex_exit(vp->v_interlock); - vndebug(vp,"empty"); - continue; - } - - if (op == VN_CLEAN && ip->i_number != LFS_IFILE_INUM - && vp != fs->lfs_flushvp - && !(ip->i_flag & IN_CLEANING)) { - mutex_exit(vp->v_interlock); - vndebug(vp,"cleaning"); - continue; - } - - mutex_exit(&mntvnode_lock); - if (vget(vp, LK_NOWAIT, false /* !wait */)) { - vndebug(vp,"vget"); - mutex_enter(&mntvnode_lock); - continue; - } /* * Write the inode/file if dirty and it's not the IFILE. */ - if ((ip->i_flag & IN_ALLMOD) || !VPISEMPTY(vp)) { - if (ip->i_number != LFS_IFILE_INUM) { -error = lfs_writefile(fs, sp, vp); -if (error) { - vrele(vp); - if (error == EAGAIN) { -
CVS commit: src/sys
Module Name:src Committed By: uebayasi Date: Fri Aug 21 07:19:39 UTC 2015 Modified Files: src/sys/conf: files src/sys/sys: syslimits.h Log Message: Define CHILD_MAX/OPEN_MAX as parameters. To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/sys/conf/files cvs rdiff -u -r1.27 -r1.28 src/sys/sys/syslimits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1135 src/sys/conf/files:1.1136 --- src/sys/conf/files:1.1135 Fri Aug 21 02:18:18 2015 +++ src/sys/conf/files Fri Aug 21 07:19:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1135 2015/08/21 02:18:18 uebayasi Exp $ +# $NetBSD: files,v 1.1136 2015/08/21 07:19:39 uebayasi Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150820 @@ -26,6 +26,7 @@ defflagCOREDUMP defflag opt_modular.h MODULAR defflag opt_modular.h MODULAR_DEFAULT_AUTOLOAD defflagKEYLOCK +defparam opt_syslimits.h CHILD_MAX OPEN_MAX defparam DEFCORENAME defparam HZ Index: src/sys/sys/syslimits.h diff -u src/sys/sys/syslimits.h:1.27 src/sys/sys/syslimits.h:1.28 --- src/sys/sys/syslimits.h:1.27 Fri Dec 7 07:06:39 2012 +++ src/sys/sys/syslimits.h Fri Aug 21 07:19:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: syslimits.h,v 1.27 2012/12/07 07:06:39 dholland Exp $ */ +/* $NetBSD: syslimits.h,v 1.28 2015/08/21 07:19:39 uebayasi Exp $ */ /* * Copyright (c) 1988, 1993 @@ -36,6 +36,10 @@ #include +#if defined(_KERNEL_OPT) +#include "opt_syslimits.h" +#endif + #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ defined(_NETBSD_SOURCE) #define ARG_MAX (256 * 1024) /* max bytes for an exec function */