CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Sat Oct 25 10:00:47 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: kern_exec.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #156):
sys/kern/kern_exec.c: revision 1.409
PR/49287: David Holland: Skip the right number of bytes to go over the first
argument in the argv vector. Fixes netbsd32 script execution, where you lost
the first argument because it skipped 8 bytes instead of 4.
To generate a diff of this commit:
cvs rdiff -u -r1.408 -r1.408.2.1 src/sys/kern/kern_exec.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.408 src/sys/kern/kern_exec.c:1.408.2.1
--- src/sys/kern/kern_exec.c:1.408 Sun Jun 22 17:23:34 2014
+++ src/sys/kern/kern_exec.c Sat Oct 25 10:00:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.408 2014/06/22 17:23:34 maxv Exp $ */
+/* $NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.408 2014/06/22 17:23:34 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $);
#include opt_exec.h
#include opt_execfmt.h
@@ -1336,6 +1336,12 @@ execve1(struct lwp *l, const char *path,
}
static size_t
+ptrsz(const struct exec_package *epp)
+{
+ return (epp-ep_flags EXEC_32) ? sizeof(int) : sizeof(char *);
+}
+
+static size_t
calcargs(struct execve_data * restrict data, const size_t argenvstrlen)
{
struct exec_package * const epp = data-ed_pack;
@@ -1348,10 +1354,7 @@ calcargs(struct execve_data * restrict d
1 +/* \0 */
epp-ep_esch-es_arglen; /* auxinfo */
- const size_t ptrsz = (epp-ep_flags EXEC_32) ?
- sizeof(int) : sizeof(char *);
-
- return (nargenvptrs * ptrsz) + argenvstrlen;
+ return (nargenvptrs * ptrsz(epp)) + argenvstrlen;
}
static size_t
@@ -1506,7 +1509,7 @@ copyinargs(struct execve_data * restrict
return EINVAL;
}
if (epp-ep_flags EXEC_SKIPARG)
- args++;
+ args = (const void *)((const char *)args + ptrsz(epp));
i = 0;
error = copyinargstrs(data, args, fetch_element, dp, i, ktr_execarg);
if (error != 0) {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Oct 25 10:02:15 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #156 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 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.65 src/doc/CHANGES-7.0:1.1.2.66 --- src/doc/CHANGES-7.0:1.1.2.65 Fri Oct 24 23:13:22 2014 +++ src/doc/CHANGES-7.0 Sat Oct 25 10:02:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.65 2014/10/24 23:13:22 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.66 2014/10/25 10:02:15 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1826,3 +1826,10 @@ sys/netinet/tcp_output.c 1.177 IPsec outbound policy will not be checked when ipsec_used is false. [hikaru, ticket #154] +sys/kern/kern_exec.c1.409 + + PR/49287: David Holland: Skip the right number of bytes to go over + the first argument in the argv vector. Fixes netbsd32 script + execution, where you lost the first argument because it skipped + 8 bytes instead of 4. + [dholland, ticket #156]
CVS commit: src
Module Name:src
Committed By: skrll
Date: Sat Oct 25 10:58:12 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: ad.aarch64 ad.arm
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/acorn32/podulebus: asc.c cosc.c esc.c if_ie.c netslot.c
podulebus.c sfas.c
src/sys/arch/arm/arm32: arm32_machdep.c db_interface.c fault.c pmap.c
src/sys/arch/arm/include/arm32: Makefile
src/sys/arch/arm/iomd: iomd_irqhandler.c vidc20config.c vidcaudio.c
src/sys/arch/hpcarm/dev: ipaq_lcd.c
Removed Files:
src/sys/arch/arm/include/arm32: katelib.h
Log Message:
Remove katelib.h and references to it.
{Read,Write}{Word,Byte} macros are provided in the files that still use
them. Someone(tm) should convert them to bus_space(9)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn32/podulebus/asc.c \
src/sys/arch/acorn32/podulebus/cosc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/podulebus/esc.c \
src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn32/podulebus/netslot.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/sfas.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm32/db_interface.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.304 -r1.305 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/arm32/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/include/arm32/katelib.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/iomd/iomd_irqhandler.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/iomd/vidc20config.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/iomd/vidcaudio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/dev/ipaq_lcd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.6 src/distrib/sets/lists/comp/ad.aarch64:1.7
--- src/distrib/sets/lists/comp/ad.aarch64:1.6 Wed Oct 22 16:51:31 2014
+++ src/distrib/sets/lists/comp/ad.aarch64 Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2014/10/22 16:51:31 christos Exp $
+# $NetBSD: ad.aarch64,v 1.7 2014/10/25 10:58:12 skrll Exp $
./usr/include/aarch64comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@@ -56,7 +56,7 @@
./usr/include/arm/arm26/types.h comp-c-include
./usr/include/arm/arm32comp-c-include
./usr/include/arm/arm32/frame.h comp-c-include
-./usr/include/arm/arm32/katelib.h comp-c-include
+./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.62 src/distrib/sets/lists/comp/ad.arm:1.63
--- src/distrib/sets/lists/comp/ad.arm:1.62 Wed Oct 22 16:51:31 2014
+++ src/distrib/sets/lists/comp/ad.arm Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.62 2014/10/22 16:51:31 christos Exp $
+# $NetBSD: ad.arm,v 1.63 2014/10/25 10:58:12 skrll Exp $
./usr/include/acorn26comp-c-include
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
@@ -115,7 +115,7 @@
./usr/include/arm/arm32comp-c-include
./usr/include/arm/arm32/bus.h comp-obsolete obsolete
./usr/include/arm/arm32/frame.h comp-c-include
-./usr/include/arm/arm32/katelib.h comp-c-include
+./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.89 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.90
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.89 Sat Sep 13 17:36:41 2014
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include sys/param.h
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Sat Oct 25 11:35:15 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
G/C some unused code.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.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/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.8 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.8 Tue Sep 2 09:55:48 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sat Oct 25 11:35:15 2014
@@ -53,46 +53,6 @@
#define copy_to_user(to, from, n) copyout((from), (to), (n))
/*
- * Bit API
- */
-
-static __inline int
-test_and_set_bit(int nr, volatile void *addr)
-{
- volatile uint32_t *val;
- uint32_t mask, old;
-
- val = (volatile uint32_t *)addr;
- mask = 1 nr;
-
- do {
- old = *val;
- if ((old mask) != 0)
- break;
- } while (atomic_cas_uint(val, old, old | mask) != old);
-
- return old mask;
-}
-
-static __inline__ int
-test_and_clear_bit(int nr, volatile void *addr)
-{
- volatile uint32_t *val;
- uint32_t mask, old;
-
- val = (volatile uint32_t *)addr;
- mask = 1 nr;
-
- do {
- old = *val;
- if ((old mask) == 0)
- break;
- } while (atomic_cas_uint(val, old, old ~mask) != old);
-
- return old mask;
-}
-
-/*
* Atomic API
*/
typedef volatile unsigned int atomic_t;
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Sat Oct 25 12:54:28 UTC 2014
Modified Files:
src/lib: Makefile
Log Message:
Try to future-proof this. Can libasan be built by clang?
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.218 src/lib/Makefile:1.219
--- src/lib/Makefile:1.218 Fri Oct 24 18:42:40 2014
+++ src/lib/Makefile Sat Oct 25 08:54:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2014/10/24 22:42:40 joerg Exp $
+# $NetBSD: Makefile,v 1.219 2014/10/25 12:54:28 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -143,8 +143,9 @@ SUBDIR+= ../external/bsd/libc++
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libsupc++
.endif
-.if (${HAVE_GCC:U} == 48)
-SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libasan
+SANITIZER_DIR=../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libasan
+.if exists(${SANITIZER_DIR})
+SUBDIR+= ${SANITIZER_DIR}
.endif
# 2nd library dependency barrier
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Sat Oct 25 15:02:12 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.riscv md.amd64 md.sparc64 src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.mips ad.riscv md.amd64 md.sparc64 src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.evbmips md.sparc64 Log Message: Consistently tag libasan with gcc=48 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.240 -r1.241 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.226 -r1.227 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.189 -r1.190 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/md.evbmips cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/debug/md.sparc64 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/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.12 src/distrib/sets/lists/base/ad.aarch64:1.13 --- src/distrib/sets/lists/base/ad.aarch64:1.12 Wed Oct 22 16:51:31 2014 +++ src/distrib/sets/lists/base/ad.aarch64 Sat Oct 25 15:02:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.12 2014/10/22 16:51:31 christos Exp $ +# $NetBSD: ad.aarch64,v 1.13 2014/10/25 15:02:12 joerg Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -89,8 +89,8 @@ ./usr/lib/eabi/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/eabi/libarm.so.0 base-compat-shlib compat,pic ./usr/lib/eabi/libarm.so.0.0 base-compat-shlib compat,pic -./usr/lib/eabi/libasan.so.0 base-compat-shlib compat,pic -./usr/lib/eabi/libasan.so.0.0 base-compat-shlib compat,pic, +./usr/lib/eabi/libasan.so.0 base-compat-shlib compat,pic,gcc=48 +./usr/lib/eabi/libasan.so.0.0 base-compat-shlib compat,pic,gcc=48 ./usr/lib/eabi/libasn1.so.9 base-compat-shlib compat,pic,kerberos ./usr/lib/eabi/libasn1.so.9.0 base-compat-shlib compat,pic,kerberos ./usr/lib/eabi/libatf-c++.so.1 base-compat-shlib compat,pic,atf @@ -405,8 +405,8 @@ ./usr/lib/eabihf/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/eabihf/libarm.so.0 base-compat-shlib compat,pic ./usr/lib/eabihf/libarm.so.0.0 base-compat-shlib compat,pic -./usr/lib/eabihf/libasan.so.0 base-compat-shlib compat,pic -./usr/lib/eabihf/libasan.so.0.0 base-compat-shlib compat,pic, +./usr/lib/eabihf/libasan.so.0 base-compat-shlib compat,pic,gcc=48 +./usr/lib/eabihf/libasan.so.0.0 base-compat-shlib compat,pic,gcc=48 ./usr/lib/eabihf/libasn1.so.9 base-compat-shlib compat,pic,kerberos ./usr/lib/eabihf/libasn1.so.9.0 base-compat-shlib compat,pic,kerberos ./usr/lib/eabihf/libatf-c++.so.1 base-compat-shlib compat,pic,atf @@ -721,8 +721,8 @@ ./usr/lib/oabi/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/oabi/libarm.so.0 base-compat-shlib compat,pic ./usr/lib/oabi/libarm.so.0.0 base-compat-shlib compat,pic -./usr/lib/oabi/libasan.so.0 base-compat-shlib compat,pic -./usr/lib/oabi/libasan.so.0.0 base-compat-shlib compat,pic, +./usr/lib/oabi/libasan.so.0 base-compat-shlib compat,pic,gcc=48 +./usr/lib/oabi/libasan.so.0.0 base-compat-shlib compat,pic,gcc=48 ./usr/lib/oabi/libasn1.so.9 base-compat-shlib compat,pic,kerberos ./usr/lib/oabi/libasn1.so.9.0 base-compat-shlib compat,pic,kerberos ./usr/lib/oabi/libatf-c++.so.1 base-compat-shlib compat,pic,atf Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.61 src/distrib/sets/lists/base/ad.arm:1.62 --- src/distrib/sets/lists/base/ad.arm:1.61 Wed Oct 22 16:51:31 2014 +++ src/distrib/sets/lists/base/ad.arm Sat Oct 25 15:02:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.61 2014/10/22 16:51:31 christos Exp $ +# $NetBSD: ad.arm,v 1.62 2014/10/25 15:02:12 joerg Exp $ ./lib/oabi base-compat-shlib compat
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Sat Oct 25 15:07:13 UTC 2014
Modified Files:
src/sys/netinet: tcp_output.c
Log Message:
Avoid stack overflow when SACK and TCP_SIGNATURE are both present. Thanks
to Jonathan Looney for pointing this out.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/netinet/tcp_output.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/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.177 src/sys/netinet/tcp_output.c:1.178
--- src/sys/netinet/tcp_output.c:1.177 Tue Oct 21 09:44:47 2014
+++ src/sys/netinet/tcp_output.c Sat Oct 25 11:07:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.177 2014/10/21 13:44:47 hikaru Exp $ */
+/* $NetBSD: tcp_output.c,v 1.178 2014/10/25 15:07:13 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.177 2014/10/21 13:44:47 hikaru Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.178 2014/10/25 15:07:13 christos Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -557,6 +557,7 @@ tcp_output(struct tcpcb *tp)
#endif
struct tcphdr *th;
u_char opt[MAX_TCPOPTLEN];
+#define OPT_FITS(more) ((optlen + (more)) sizeof(opt))
unsigned optlen, hdrlen, packetlen;
unsigned int sack_numblks;
int idle, sendalot, txsegsize, rxsegsize;
@@ -1123,7 +1124,7 @@ send:
tp-snd_nxt = tp-iss;
tp-t_ourmss = tcp_mss_to_advertise(synrt != NULL ?
synrt-rt_ifp : NULL, af);
- if ((tp-t_flags TF_NOOPT) == 0) {
+ if ((tp-t_flags TF_NOOPT) == 0 OPT_FITS(4)) {
opt[0] = TCPOPT_MAXSEG;
opt[1] = 4;
opt[2] = (tp-t_ourmss 8) 0xff;
@@ -1132,7 +1133,8 @@ send:
if ((tp-t_flags TF_REQ_SCALE)
((flags TH_ACK) == 0 ||
- (tp-t_flags TF_RCVD_SCALE))) {
+ (tp-t_flags TF_RCVD_SCALE))
+ OPT_FITS(4)) {
*((u_int32_t *) (opt + optlen)) = htonl(
TCPOPT_NOP 24 |
TCPOPT_WINDOW 16 |
@@ -1140,7 +1142,7 @@ send:
tp-request_r_scale);
optlen += 4;
}
- if (tcp_do_sack) {
+ if (tcp_do_sack OPT_FITS(4)) {
u_int8_t *cp = (u_int8_t *)(opt + optlen);
cp[0] = TCPOPT_SACK_PERMITTED;
@@ -1160,7 +1162,7 @@ send:
if ((tp-t_flags (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP
(flags TH_RST) == 0
((flags (TH_SYN|TH_ACK)) == TH_SYN ||
- (tp-t_flags TF_RCVD_TSTMP))) {
+ (tp-t_flags TF_RCVD_TSTMP)) OPT_FITS(TCPOLEN_TSTAMP_APPA)) {
u_int32_t *lp = (u_int32_t *)(opt + optlen);
/* Form timestamp option as shown in appendix A of RFC 1323. */
@@ -1184,30 +1186,33 @@ send:
struct ipqent *tiqe;
sack_len = sack_numblks * 8 + 2;
- bp[0] = TCPOPT_NOP;
- bp[1] = TCPOPT_NOP;
- bp[2] = TCPOPT_SACK;
- bp[3] = sack_len;
- if ((tp-rcv_sack_flags TCPSACK_HAVED) != 0) {
- sack_numblks--;
- *lp++ = htonl(tp-rcv_dsack_block.left);
- *lp++ = htonl(tp-rcv_dsack_block.right);
- tp-rcv_sack_flags = ~TCPSACK_HAVED;
- }
- for (tiqe = TAILQ_FIRST(tp-timeq);
- sack_numblks 0; tiqe = TAILQ_NEXT(tiqe, ipqe_timeq)) {
- KASSERT(tiqe != NULL);
- sack_numblks--;
- *lp++ = htonl(tiqe-ipqe_seq);
- *lp++ = htonl(tiqe-ipqe_seq + tiqe-ipqe_len +
- ((tiqe-ipqe_flags TH_FIN) != 0 ? 1 : 0));
+ if (OPT_FITS(sack_len + 2)) {
+ bp[0] = TCPOPT_NOP;
+ bp[1] = TCPOPT_NOP;
+ bp[2] = TCPOPT_SACK;
+ bp[3] = sack_len;
+ if ((tp-rcv_sack_flags TCPSACK_HAVED) != 0) {
+sack_numblks--;
+*lp++ = htonl(tp-rcv_dsack_block.left);
+*lp++ = htonl(tp-rcv_dsack_block.right);
+tp-rcv_sack_flags = ~TCPSACK_HAVED;
+ }
+ for (tiqe = TAILQ_FIRST(tp-timeq);
+ sack_numblks 0;
+ tiqe = TAILQ_NEXT(tiqe, ipqe_timeq)) {
+KASSERT(tiqe != NULL);
+sack_numblks--;
+*lp++ = htonl(tiqe-ipqe_seq);
+*lp++ = htonl(tiqe-ipqe_seq + tiqe-ipqe_len +
+((tiqe-ipqe_flags TH_FIN) != 0 ? 1 : 0));
+ }
+ optlen += sack_len + 2;
}
- optlen += sack_len + 2;
}
TCP_REASS_UNLOCK(tp);
#ifdef TCP_SIGNATURE
- if (tp-t_flags TF_SIGNATURE) {
+ if ((tp-t_flags TF_SIGNATURE) OPT_FITS(TCPOLEN_SIGNATURE + 2)) {
u_char *bp;
/*
* Initialize TCP-MD5 option (RFC2385)
CVS commit: src/sbin/newfs
Module Name:src
Committed By: mlelstv
Date: Sat Oct 25 16:47:24 UTC 2014
Modified Files:
src/sbin/newfs: newfs.c
Log Message:
Support wedge names.
before:
newfs dk1- formats /dev/rdk1
newfs rdk1 - cannot open /dev/rrdk1
newfs /dev/dk1 - /dev/dk1 is a block-device, use raw device
newfs /dev/rdk1 - formats /dev/rdk1
now:
newfs dk1- formats /dev/rdk1
newfs rdk1 - cannot open /dev/rrdk1
newfs /dev/dk1 - formats /dev/rdk1 (*)
newfs /dev/rdk1 - formats /dev/rdk1
newfs NAME=wedge - formats /dev/rdk1
(*) getfsspecname() returns the block device which must be translated.
Passing a block device manually cannot be distinguished from this case.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sbin/newfs/newfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/newfs.c
diff -u src/sbin/newfs/newfs.c:1.111 src/sbin/newfs/newfs.c:1.112
--- src/sbin/newfs/newfs.c:1.111 Sat Jun 30 15:34:01 2012
+++ src/sbin/newfs/newfs.c Sat Oct 25 16:47:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs.c,v 1.111 2012/06/30 15:34:01 tsutsui Exp $ */
+/* $NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $ */
/*
* Copyright (c) 1983, 1989, 1993, 1994
@@ -78,7 +78,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)newfs.c 8.13 (Berkeley) 5/1/95;
#else
-__RCSID($NetBSD: newfs.c,v 1.111 2012/06/30 15:34:01 tsutsui Exp $);
+__RCSID($NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $);
#endif
#endif /* not lint */
@@ -242,7 +242,10 @@ main(int argc, char *argv[])
struct statvfs *mp;
struct stat sb;
int ch, fsi, fso, len, n, Fflag, Iflag, Zflag;
- char *s1, *s2, *special;
+ const char *s1, *special, *raw;
+ char *s2;
+ char specname[MAXPATHLEN];
+ char rawname[MAXPATHLEN];
const char *opstring;
int byte_sized = 0;
#ifdef MFS
@@ -490,6 +493,11 @@ main(int argc, char *argv[])
fso = fsi;
}
} else { /* !Fflag !mfs */
+ special = getfsspecname(specname, sizeof(specname), special);
+ raw = getdiskrawname(rawname, sizeof(rawname), special);
+ if (raw != NULL)
+ special = raw;
+
fsi = opendisk(special, O_RDONLY, device, sizeof(device), 0);
special = device;
if (fsi 0 || fstat(fsi, sb) == -1)
CVS commit: src/sys/dev/ic
Module Name:src Committed By: joerg Date: Sat Oct 25 18:00:25 UTC 2014 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Fix typo. Use format string. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/dev/ic/dwc_gmac.c:1.21 --- src/sys/dev/ic/dwc_gmac.c:1.20 Tue Oct 21 00:01:01 2014 +++ src/sys/dev/ic/dwc_gmac.c Sat Oct 25 18:00:25 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac.c,v 1.20 2014/10/21 00:01:01 jmcneill Exp $ */ +/* $NetBSD: dwc_gmac.c,v 1.21 2014/10/25 18:00:25 joerg Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.20 2014/10/21 00:01:01 jmcneill Exp $); +__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.21 2014/10/25 18:00:25 joerg Exp $); /* #define DWC_GMAC_DEBUG 1 */ @@ -173,7 +173,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s } /* - * Init chip and do intial setup + * Init chip and do initial setup */ if (dwc_gmac_reset(sc) != 0) return; /* not much to cleanup, haven't attached yet */ @@ -1342,6 +1342,6 @@ dwc_dump_and_abort(struct dwc_gmac_softc dwc_gmac_dump_tx_desc(sc); dwc_gmac_dump_rx_desc(sc); - panic(msg); + panic(%s, msg); } #endif
CVS commit: src/sys/dev/ic
Module Name:src Committed By: joerg Date: Sat Oct 25 18:15:18 UTC 2014 Modified Files: src/sys/dev/ic: dwc_gmac_reg.h Log Message: Fix grammar To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/dwc_gmac_reg.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/ic/dwc_gmac_reg.h diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.11 src/sys/dev/ic/dwc_gmac_reg.h:1.12 --- src/sys/dev/ic/dwc_gmac_reg.h:1.11 Tue Oct 21 00:01:01 2014 +++ src/sys/dev/ic/dwc_gmac_reg.h Sat Oct 25 18:15:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac_reg.h,v 1.11 2014/10/21 00:01:01 jmcneill Exp $ */ +/* $NetBSD: dwc_gmac_reg.h,v 1.12 2014/10/25 18:15:18 joerg Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -122,7 +122,7 @@ #define AWIN_GMAC_MII_IRQ __BIT(0) -#define GMAC_DMA_OP_STOREFORWARD __BIT(21) /* start TX with when a +#define GMAC_DMA_OP_STOREFORWARD __BIT(21) /* start TX when a full frame is available */ #define GMAC_DMA_OP_FLUSHTX __BIT(20) /* flush TX fifo */ #define GMAC_DMA_OP_TXSTART __BIT(13) /* start TX DMA engine */
CVS import: src/external/bsd/ppp/dist
Module Name:src Committed By: christos Date: Sat Oct 25 18:43:30 UTC 2014 Update of /cvsroot/src/external/bsd/ppp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv107 Log Message: import new pppd: * Fixed a potential security issue in parsing option files (CVE-2014-3158). * There is a new stop-bits option, which takes an argument of 1 or 2, indicating the number of stop bits to use for async serial ports. * Various bug fixes. Status: Vendor Tag: MACKERRAS Release Tags: PPP2_4_7 U src/external/bsd/ppp/dist/README.MSCHAP80 N src/external/bsd/ppp/dist/.gitignore N src/external/bsd/ppp/dist/Changes-2.3 U src/external/bsd/ppp/dist/FAQ U src/external/bsd/ppp/dist/PLUGINS U src/external/bsd/ppp/dist/README U src/external/bsd/ppp/dist/README.MPPE U src/external/bsd/ppp/dist/README.MSCHAP81 U src/external/bsd/ppp/dist/README.cbcp U src/external/bsd/ppp/dist/README.eap-srp N src/external/bsd/ppp/dist/README.linux N src/external/bsd/ppp/dist/README.pppoe U src/external/bsd/ppp/dist/README.pppol2tp U src/external/bsd/ppp/dist/README.pwfd N src/external/bsd/ppp/dist/README.sol2 U src/external/bsd/ppp/dist/SETUP N src/external/bsd/ppp/dist/configure N src/external/bsd/ppp/dist/chat/Makefile.linux U src/external/bsd/ppp/dist/chat/.gitignore N src/external/bsd/ppp/dist/chat/Makefile.sol2 C src/external/bsd/ppp/dist/chat/chat.8 C src/external/bsd/ppp/dist/chat/chat.c N src/external/bsd/ppp/dist/common/zlib.c N src/external/bsd/ppp/dist/common/zlib.h N src/external/bsd/ppp/dist/contrib/pppgetpass/Makefile.linux N src/external/bsd/ppp/dist/contrib/pppgetpass/pppgetpass.8 N src/external/bsd/ppp/dist/contrib/pppgetpass/pppgetpass.gtk.c N src/external/bsd/ppp/dist/contrib/pppgetpass/pppgetpass.sh N src/external/bsd/ppp/dist/contrib/pppgetpass/pppgetpass.vt.c N src/external/bsd/ppp/dist/pppdump/Makefile.linux U src/external/bsd/ppp/dist/pppdump/.gitignore N src/external/bsd/ppp/dist/pppdump/Makefile.sol2 C src/external/bsd/ppp/dist/pppdump/bsd-comp.c C src/external/bsd/ppp/dist/pppdump/deflate.c N src/external/bsd/ppp/dist/pppdump/ppp-comp.h U src/external/bsd/ppp/dist/pppdump/pppdump.8 U src/external/bsd/ppp/dist/pppdump/pppdump.c N src/external/bsd/ppp/dist/pppdump/zlib.c N src/external/bsd/ppp/dist/pppdump/zlib.h N src/external/bsd/ppp/dist/etc.ppp/chap-secrets N src/external/bsd/ppp/dist/etc.ppp/options N src/external/bsd/ppp/dist/etc.ppp/pap-secrets N src/external/bsd/ppp/dist/include/linux/ppp-comp.h N src/external/bsd/ppp/dist/include/linux/if_ppp.h N src/external/bsd/ppp/dist/include/linux/ppp_defs.h N src/external/bsd/ppp/dist/include/net/ppp-comp.h N src/external/bsd/ppp/dist/include/net/if_ppp.h N src/external/bsd/ppp/dist/include/net/ppp_defs.h N src/external/bsd/ppp/dist/include/net/pppio.h N src/external/bsd/ppp/dist/include/net/slcompress.h N src/external/bsd/ppp/dist/include/net/vjcompress.h N src/external/bsd/ppp/dist/linux/Makefile.top N src/external/bsd/ppp/dist/modules/bsd-comp.c N src/external/bsd/ppp/dist/modules/deflate.c N src/external/bsd/ppp/dist/modules/if_ppp.c N src/external/bsd/ppp/dist/modules/ppp.c N src/external/bsd/ppp/dist/modules/ppp_ahdlc.c N src/external/bsd/ppp/dist/modules/ppp_comp.c N src/external/bsd/ppp/dist/modules/ppp_mod.h N src/external/bsd/ppp/dist/modules/vjcompress.c N src/external/bsd/ppp/dist/pppd/Makefile.linux U src/external/bsd/ppp/dist/pppd/.gitignore U src/external/bsd/ppp/dist/pppd/ppp.pam N src/external/bsd/ppp/dist/pppd/Makefile.sol2 C src/external/bsd/ppp/dist/pppd/auth.c C src/external/bsd/ppp/dist/pppd/cbcp.c U src/external/bsd/ppp/dist/pppd/cbcp.h C src/external/bsd/ppp/dist/pppd/ccp.c C src/external/bsd/ppp/dist/pppd/ccp.h C src/external/bsd/ppp/dist/pppd/chap-md5.c U src/external/bsd/ppp/dist/pppd/chap-md5.h C src/external/bsd/ppp/dist/pppd/chap-new.c U src/external/bsd/ppp/dist/pppd/chap-new.h C src/external/bsd/ppp/dist/pppd/chap_ms.c C src/external/bsd/ppp/dist/pppd/chap_ms.h C src/external/bsd/ppp/dist/pppd/demand.c C src/external/bsd/ppp/dist/pppd/eap.c C src/external/bsd/ppp/dist/pppd/eap.h C src/external/bsd/ppp/dist/pppd/ecp.c C src/external/bsd/ppp/dist/pppd/ecp.h C src/external/bsd/ppp/dist/pppd/eui64.c C src/external/bsd/ppp/dist/pppd/eui64.h C src/external/bsd/ppp/dist/pppd/fsm.c C src/external/bsd/ppp/dist/pppd/fsm.h C src/external/bsd/ppp/dist/pppd/ipcp.c C src/external/bsd/ppp/dist/pppd/ipcp.h C src/external/bsd/ppp/dist/pppd/ipv6cp.c C src/external/bsd/ppp/dist/pppd/ipv6cp.h C src/external/bsd/ppp/dist/pppd/ipxcp.c C src/external/bsd/ppp/dist/pppd/ipxcp.h C src/external/bsd/ppp/dist/pppd/lcp.c C src/external/bsd/ppp/dist/pppd/lcp.h C src/external/bsd/ppp/dist/pppd/magic.c C src/external/bsd/ppp/dist/pppd/magic.h C src/external/bsd/ppp/dist/pppd/main.c N src/external/bsd/ppp/dist/pppd/md4.c N src/external/bsd/ppp/dist/pppd/md4.h N src/external/bsd/ppp/dist/pppd/md5.c N src/external/bsd/ppp/dist/pppd/md5.h U src/external/bsd/ppp/dist/pppd/mppe.h U src/external/bsd/ppp/dist/pppd/multilink.c C
CVS import: src/external/bsd/ppp/dist
Module Name:src Committed By: christos Date: Sat Oct 25 18:47:47 UTC 2014 Update of /cvsroot/src/external/bsd/ppp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29243 Log Message: * Fixed a potential security issue in parsing option files (CVE-2014-3158). * There is a new stop-bits option, which takes an argument of 1 or 2, indicating the number of stop bits to use for async serial ports. * Various bug fixes. Status: Vendor Tag: MACKERRAS Release Tags: PPP2_4_7 U src/external/bsd/ppp/dist/README.MSCHAP80 U src/external/bsd/ppp/dist/PLUGINS U src/external/bsd/ppp/dist/FAQ U src/external/bsd/ppp/dist/README U src/external/bsd/ppp/dist/README.MPPE U src/external/bsd/ppp/dist/README.MSCHAP81 U src/external/bsd/ppp/dist/README.cbcp U src/external/bsd/ppp/dist/README.eap-srp U src/external/bsd/ppp/dist/README.pppol2tp U src/external/bsd/ppp/dist/README.pwfd U src/external/bsd/ppp/dist/SETUP C src/external/bsd/ppp/dist/chat/chat.8 C src/external/bsd/ppp/dist/chat/chat.c C src/external/bsd/ppp/dist/pppdump/deflate.c U src/external/bsd/ppp/dist/pppdump/pppdump.8 U src/external/bsd/ppp/dist/pppdump/pppdump.c C src/external/bsd/ppp/dist/pppd/auth.c C src/external/bsd/ppp/dist/pppd/cbcp.c C src/external/bsd/ppp/dist/pppd/ccp.c U src/external/bsd/ppp/dist/pppd/ppp.pam C src/external/bsd/ppp/dist/pppd/ccp.h C src/external/bsd/ppp/dist/pppd/chap-md5.c C src/external/bsd/ppp/dist/pppd/chap-new.c U src/external/bsd/ppp/dist/pppd/cbcp.h C src/external/bsd/ppp/dist/pppd/chap_ms.c C src/external/bsd/ppp/dist/pppd/chap_ms.h U src/external/bsd/ppp/dist/pppd/chap-md5.h C src/external/bsd/ppp/dist/pppd/demand.c U src/external/bsd/ppp/dist/pppd/chap-new.h C src/external/bsd/ppp/dist/pppd/eap.c C src/external/bsd/ppp/dist/pppd/eap.h C src/external/bsd/ppp/dist/pppd/ecp.c C src/external/bsd/ppp/dist/pppd/ecp.h C src/external/bsd/ppp/dist/pppd/eui64.c C src/external/bsd/ppp/dist/pppd/eui64.h C src/external/bsd/ppp/dist/pppd/fsm.c C src/external/bsd/ppp/dist/pppd/fsm.h C src/external/bsd/ppp/dist/pppd/ipcp.c C src/external/bsd/ppp/dist/pppd/ipcp.h C src/external/bsd/ppp/dist/pppd/ipv6cp.c C src/external/bsd/ppp/dist/pppd/ipv6cp.h C src/external/bsd/ppp/dist/pppd/ipxcp.c C src/external/bsd/ppp/dist/pppd/ipxcp.h C src/external/bsd/ppp/dist/pppd/lcp.c C src/external/bsd/ppp/dist/pppd/lcp.h C src/external/bsd/ppp/dist/pppd/magic.c C src/external/bsd/ppp/dist/pppd/magic.h C src/external/bsd/ppp/dist/pppd/main.c C src/external/bsd/ppp/dist/pppd/options.c C src/external/bsd/ppp/dist/pppd/pathnames.h C src/external/bsd/ppp/dist/pppd/pppd.8 C src/external/bsd/ppp/dist/pppd/pppd.h C src/external/bsd/ppp/dist/pppd/tty.c C src/external/bsd/ppp/dist/pppd/upap.c C src/external/bsd/ppp/dist/pppd/upap.h U src/external/bsd/ppp/dist/pppd/mppe.h U src/external/bsd/ppp/dist/pppd/multilink.c C src/external/bsd/ppp/dist/pppd/utils.c U src/external/bsd/ppp/dist/pppd/patchlevel.h U src/external/bsd/ppp/dist/pppd/pppcrypt.c U src/external/bsd/ppp/dist/pppd/pppcrypt.h U src/external/bsd/ppp/dist/pppd/session.c U src/external/bsd/ppp/dist/pppd/session.h U src/external/bsd/ppp/dist/pppd/plugins/minconn.c U src/external/bsd/ppp/dist/pppd/plugins/passwordfd.c U src/external/bsd/ppp/dist/pppd/plugins/pppol2tp/l2tp_event.h U src/external/bsd/ppp/dist/pppd/plugins/pppol2tp/openl2tp.c U src/external/bsd/ppp/dist/pppd/plugins/pppol2tp/pppol2tp.c U src/external/bsd/ppp/dist/pppstats/pppstats.8 C src/external/bsd/ppp/dist/pppstats/pppstats.c 40 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/external/bsd/ppp/dist
CVS commit: src/external/bsd/ppp
Module Name:src
Committed By: christos
Date: Sat Oct 25 19:06:34 UTC 2014
Modified Files:
src/external/bsd/ppp: ppp2netbsd
src/external/bsd/ppp/dist/chat: chat.8 chat.c
src/external/bsd/ppp/dist/pppd: auth.c cbcp.c cbcp.h ccp.c ccp.h
chap-md5.c chap-md5.h chap-new.c chap-new.h chap_ms.c chap_ms.h
demand.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c fsm.h ipcp.c
ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c
magic.h main.c mppe.h multilink.c options.c patchlevel.h
pathnames.h pppcrypt.c pppcrypt.h pppd.8 pppd.h session.c session.h
tty.c upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppdump: deflate.c
src/external/bsd/ppp/dist/pppstats: pppstats.c
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/ppp2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/chat/chat.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/cbcp.h \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap-md5.c \
src/external/bsd/ppp/dist/pppd/chap-md5.h \
src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/chap_ms.c \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.c src/external/bsd/ppp/dist/pppd/eap.h \
src/external/bsd/ppp/dist/pppd/ecp.c src/external/bsd/ppp/dist/pppd/ecp.h \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
src/external/bsd/ppp/dist/pppd/ipcp.c \
src/external/bsd/ppp/dist/pppd/ipcp.h \
src/external/bsd/ppp/dist/pppd/ipv6cp.c \
src/external/bsd/ppp/dist/pppd/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.h \
src/external/bsd/ppp/dist/pppd/mppe.h \
src/external/bsd/ppp/dist/pppd/multilink.c \
src/external/bsd/ppp/dist/pppd/options.c \
src/external/bsd/ppp/dist/pppd/patchlevel.h \
src/external/bsd/ppp/dist/pppd/pathnames.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h \
src/external/bsd/ppp/dist/pppd/pppd.8 \
src/external/bsd/ppp/dist/pppd/pppd.h \
src/external/bsd/ppp/dist/pppd/session.c \
src/external/bsd/ppp/dist/pppd/session.h \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppstats/pppstats.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppd/sys-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/ppp/ppp2netbsd
diff -u src/external/bsd/ppp/ppp2netbsd:1.1 src/external/bsd/ppp/ppp2netbsd:1.2
--- src/external/bsd/ppp/ppp2netbsd:1.1 Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/ppp2netbsd Sat Oct 25 15:06:33 2014
@@ -38,8 +38,7 @@ UNUSED_DIRS=${UNUSED_DIRS} .git
UNUSED_FILES=Changes-2.3 README.linux README.pppoe README.sol2 configure
UNUSED_FILES=${UNUSED_FILES} pppd/md[45].* pppd/sha1.* pppd/srp-entry.*
UNUSED_FILES=${UNUSED_FILES} pppd/sys-linux.c pppd/sys-solaris.c
-UNUSED_FILES=${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h .gitignore
-UNUSED_FILES=${UNUSED_FILES} pppdump/.gitignore pppdump/bsd-comp.c
+UNUSED_FILES=${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h
# Stuff we don't want
GPL_DIRS=pppd/plugins/pppoatm pppd/plugins/radius pppd/plugins/rp-pppoe
@@ -67,4 +66,10 @@ find . -type f -name 'Makefile*' | while
done
echo; echo
+echo -n Removing .gitignore...
+find . -type f -name '.gitignore' | while read m; do
+ rm -f ${m}
+ echo -n ${m}
+done
+echo; echo
cleantags .
Index: src/external/bsd/ppp/dist/chat/chat.8
diff -u src/external/bsd/ppp/dist/chat/chat.8:1.2 src/external/bsd/ppp/dist/chat/chat.8:1.3
--- src/external/bsd/ppp/dist/chat/chat.8:1.2 Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/dist/chat/chat.8 Sat Oct 25 15:06:34 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: chat.8,v 1.2 2013/11/28 22:33:42 christos Exp $
+.\ NetBSD
.\ manual page [] for chat 1.8
.\ Id: chat.8,v 1.11
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Oct 25 19:08:48 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new pppd To generate a diff of this commit: cvs rdiff -u -r1.1164 -r1.1165 src/doc/3RDPARTY cvs rdiff -u -r1.2001 -r1.2002 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.1164 src/doc/3RDPARTY:1.1165 --- src/doc/3RDPARTY:1.1164 Fri Oct 24 14:29:20 2014 +++ src/doc/3RDPARTY Sat Oct 25 15:08:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1164 2014/10/24 18:29:20 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1165 2014/10/25 19:08:48 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1129,8 +1129,8 @@ directory layout (the easiest way to che set-permissions''). Package: ppp -Version: 2.4.5 -Current Vers: 2.4.6 +Version: 2.4.7 +Current Vers: 2.4.7 Maintainer: Paul Mackerras pau...@samba.org Archive Site: ftp://ftp.samba.org/pub/ppp/ Home Page: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2001 src/doc/CHANGES:1.2002 --- src/doc/CHANGES:1.2001 Fri Oct 24 14:29:20 2014 +++ src/doc/CHANGES Sat Oct 25 15:08:48 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2001 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2002 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -81,3 +81,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: zoneinfo: Import tzdata2014i. [apb 20141023] libc: Update to tzcode2014i. [christos 201401023] openpam(3): update to 20140912 (ourouparia) [christos 20141024] + pppd(8): updated to version 2.4.7. [christos 20141025] +
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Oct 25 20:58:03 UTC 2014 Update of /cvsroot/src/sys/external/bsd/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11027 Log Message: 26 September 2014. Summary of changes for version 20140926: 1) ACPICA kernel-resident subsystem: Updated the GPIO operation region handler interface (GeneralPurposeIo). In order to support GPIO Connection objects with multiple pins, along with the related Field objects, the following changes to the interface have been made: The Address is now defined to be the offset in bits of the field unit from the previous invocation of a Connection. It can be viewed as a Pin Number Index into the connection resource descriptor. The BitWidth is the exact bit width of the field. It is usually one bit, but not always. See the ACPICA reference guide (section 8.8.6.2.1) for additional information and examples. GPE support: During ACPICA/GPE initialization, ensure that all GPEs with corresponding _Lxx/_Exx methods are disabled (they may have been enabled by the firmware), so that they cannot fire until they are enabled via AcpiUpdateAllGpes. Rafael J. Wysocki. Added a new return flag for the Event/GPE status interfaces -- AcpiGetEventStatus and AcpiGetGpeStatus. The new ACPI_EVENT_FLAGS_HAS_HANDLER flag is used to indicate that the event or GPE currently has a handler associated with it, and can thus actually affect the system. Lv Zheng. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of the code includes the debug output trace mechanism and has a much larger code and data size. Current Release: Non-Debug Version: 99.1K Code, 27.3K Data, 126.4K Total Debug Version: 192.8K Code, 79.9K Data, 272.7K Total Previous Release: Non-Debug Version: 98.8K Code, 27.3K Data, 126.1K Total Debug Version: 192.1K Code, 79.8K Data, 271.9K Total 2) iASL Compiler/Disassembler and Tools: iASL: Fixed a memory allocation/free regression introduced in 20140828 that could cause the compiler to crash. This was introduced inadvertently during the effort to eliminate compiler memory leaks. ACPICA BZ , 1113. iASL: Removed two error messages that have been found to create false positives, until they can be fixed and fully validated (ACPICA BZ 1112): 1) Illegal forward reference within a method 2) Illegal reference across two methods iASL: Implemented a new option (-lm) to create a hardware mapping file that summarizes all GPIO, I2C, SPI, and UART connections. This option works for both the compiler and disassembler. See the iASL compiler user guide for additional information and examples (section 6.4.6). AcpiDump: Added support for the version 1 (ACPI 1.0) RSDP in addition to version 2. This corrects the AE_BAD_HEADER exception seen on systems with a version 1 RSDP. Lv Zheng ACPICA BZ 1097. AcpiExec: For Unix versions, don't attempt to put STDIN into raw mode unless STDIN is actually a terminal. Assists with batch-mode processing. ACPICA BZ 1114. Disassembler/AcpiHelp: Added another large group of recognized _HID values. 28 August 2014. Summary of changes for version 20140828: 1) ACPICA kernel-resident subsystem: Fixed a problem related to the internal use of the Timer() operator where a 64-bit divide could cause an attempted link to a double-precision math library. This divide is not actually necessary, so the code was restructured to eliminate it. Lv Zheng. ACPI 5.1: Added support for the runtime validation of the _DSD package (similar to the iASL support). ACPI 5.1/Headers: Added support for the GICC affinity subtable to the SRAT table. Hanjun Guo hanjun@linaro.org. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of the code includes the debug output trace mechanism and has a much larger code and data size. Current Release: Non-Debug Version: 98.8K Code, 27.3K Data, 126.1K Total Debug Version: 192.1K Code, 79.8K Data, 271.9K Total Previous Release: Non-Debug Version: 98.7K Code, 27.3K Data, 126.0K Total1 Debug Version: 192.0K Code, 79.7K Data, 271.7K Total 2) iASL Compiler/Disassembler and Tools: AcpiExec: Fixed a problem on unix systems where the original terminal state was not always properly restored upon exit. Seen when using the -v option. ACPICA BZ 1104. iASL: Fixed a problem with the validation of the ranges/length within the Memory24 resource descriptor. There was a boundary condition when the range was equal to the (length -1) caused by the fact that these values are defined in 256-byte blocks, not bytes. ACPICA BZ 1098 Disassembler: Fixed a problem with the GpioInt descriptor interrupt polarity flags.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Oct 25 21:00:20 UTC 2014 Modified Files: src/sys/dev/acpi: acpi.c Log Message: adjust for newer acpica To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/dev/acpi/acpi.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/acpi/acpi.c diff -u src/sys/dev/acpi/acpi.c:1.258 src/sys/dev/acpi/acpi.c:1.259 --- src/sys/dev/acpi/acpi.c:1.258 Tue Feb 25 13:30:09 2014 +++ src/sys/dev/acpi/acpi.c Sat Oct 25 17:00:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.258 2014/02/25 18:30:09 pooka Exp $ */ +/* $NetBSD: acpi.c,v 1.259 2014/10/25 21:00:20 christos Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.258 2014/02/25 18:30:09 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.259 2014/10/25 21:00:20 christos Exp $); #include opt_acpi.h #include opt_pcifixup.h @@ -253,7 +253,6 @@ acpi_probe(void) /* * Start up ACPICA. */ - AcpiGbl_AllMethodsSerialized = false; AcpiGbl_EnableInterpreterSlack = true; rv = AcpiInitializeSubsystem();
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Oct 25 21:02:31 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new acpica To generate a diff of this commit: cvs rdiff -u -r1.1165 -r1.1166 src/doc/3RDPARTY cvs rdiff -u -r1.2002 -r1.2003 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.1165 src/doc/3RDPARTY:1.1166 --- src/doc/3RDPARTY:1.1165 Sat Oct 25 15:08:48 2014 +++ src/doc/3RDPARTY Sat Oct 25 17:02:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1165 2014/10/25 19:08:48 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1166 2014/10/25 21:02:31 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -40,8 +40,8 @@ # Package: acpica -Version: 20131218 -Current Vers: 20140627 +Version: 20140926 +Current Vers: 20140926 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2002 src/doc/CHANGES:1.2003 --- src/doc/CHANGES:1.2002 Sat Oct 25 15:08:48 2014 +++ src/doc/CHANGES Sat Oct 25 17:02:31 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2002 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2003 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -82,4 +82,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libc: Update to tzcode2014i. [christos 201401023] openpam(3): update to 20140912 (ourouparia) [christos 20141024] pppd(8): updated to version 2.4.7. [christos 20141025] - + acpi(4): Updated ACPICA to 20140926. [christos 20141025]
CVS commit: src/external/bsd/acpica/bin/iasl
Module Name:src
Committed By: christos
Date: Sat Oct 25 21:01:12 UTC 2014
Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile
Log Message:
adjust to new acpica
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/acpica/bin/iasl/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/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.7 src/external/bsd/acpica/bin/iasl/Makefile:1.8
--- src/external/bsd/acpica/bin/iasl/Makefile:1.7 Sat Dec 28 11:03:51 2013
+++ src/external/bsd/acpica/bin/iasl/Makefile Sat Oct 25 17:01:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/28 16:03:51 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/10/25 21:01:12 christos Exp $
.if (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
PROG= iasl
@@ -19,13 +19,14 @@ CPPFLAGS+= -DACPI_REPRO
LDADD+= -ll -ly -lrt -lpthread
DPADD+= ${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
-DPSRCS= aslcompilerparse.c aslcompilerlex.c \
+DPSRCS= aslcompiler.y aslcompilerlex.c aslcompilerparse.c \
dtparserparse.c dtparserlex.c prparserparse.c prparserlex.c
.PATH: ${TOPDIR}
SRCS+= \
adfile.c \
aslanalyze.c \
+ aslascii.c \
aslbtypes.c \
aslcodegen.c \
aslcompile.c \
@@ -43,6 +44,10 @@ SRCS+= \
asllookup.c \
aslmain.c \
aslmap.c \
+ aslmapenter.c \
+ aslmapoutput.c \
+ aslmaputils.c \
+ aslmessages.c \
aslmethod.c \
aslnamesp.c \
asloffset.c \
@@ -90,7 +95,10 @@ SRCS+= \
SRCS+= \
adisasm.c \
adwalk.c \
+ ahids.c \
ahpredef.c \
+ ahuuids.c \
+ cmfsize.c \
dmextern.c \
dmrestag.c \
dmtable.c \
@@ -168,6 +176,7 @@ SRCS+= \
.PATH: ${TOPDIR}/../tables
SRCS+= \
tbfadt.c \
+ tbdata.c \
tbinstal.c \
tbprint.c \
tbutils.c \
@@ -198,7 +207,9 @@ SRCS+= \
utdelete.c \
uterror.c \
utexcep.c \
+ utfileio.c \
utglobal.c \
+ uthex.c \
utinit.c \
utlock.c \
utmath.c \
@@ -208,16 +219,24 @@ SRCS+= \
utosi.c \
utownerid.c \
utpredef.c \
+ utprint.c \
utresrc.c \
utstate.c \
utstring.c \
+ utuuid.c \
utxface.c \
utxferror.c
.PATH: ${TOPDIR}/../os_specific/service_layers
-SRCS+= osunixxf.c
+SRCS+= osunixxf.c oslibcfs.c
-aslcompiler.y.h aslcompilerparse.c: ${TOPDIR}/aslcompiler.y
+
+aslparser.y: asltokens.y asltypes.y aslrules.y aslsupport.y
+
+aslcompiler.y: aslparser.y
+ ${TOOL_M4} -P -I${TOPDIR} ${.ALLSRC} ${.TARGET}
+
+aslcompiler.y.h aslcompilerparse.c: aslcompiler.y
${YACC} -v -d -o${.TARGET} -pAslCompiler ${.ALLSRC}
mv -f ${.PREFIX}.h aslcompiler.y.h
@@ -244,7 +263,8 @@ prparserlex.c: ${TOPDIR}/prparser.l
prparserlex.o: prparser.y.h
-CLEANFILES+= aslcompilerlex.c aslcompilerparse.c \
+CLEANFILES+= aslcompiler.y \
+ aslcompilerlex.c aslcompilerparse.c \
aslcompiler.y.h aslcompilerparse.output \
dtparserlex.c dtparserparse.c \
dtparser.y.h dtparserparse.output \
CVS commit: src/external/bsd/ppp/dist
Module Name:src Committed By: christos Date: Sat Oct 25 21:11:37 UTC 2014 Modified Files: src/external/bsd/ppp/dist/pppd: auth.c cbcp.c cbcp.h ccp.c ccp.h chap-md5.c chap-md5.h chap-new.c chap-new.h chap_ms.c chap_ms.h demand.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c fsm.h ipcp.c ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c magic.h mppe.h multilink.c options.c pathnames.h pppcrypt.c pppcrypt.h pppd.h session.c session.h tty.c upap.c upap.h utils.c src/external/bsd/ppp/dist/pppd/plugins/radius/etc: port-id-map src/external/bsd/ppp/dist/pppdump: deflate.c src/external/bsd/ppp/dist/pppstats: pppstats.c Log Message: fix rcsids. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/auth.c \ src/external/bsd/ppp/dist/pppd/cbcp.c \ src/external/bsd/ppp/dist/pppd/cbcp.h \ src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \ src/external/bsd/ppp/dist/pppd/chap-md5.c \ src/external/bsd/ppp/dist/pppd/chap-md5.h \ src/external/bsd/ppp/dist/pppd/chap-new.c \ src/external/bsd/ppp/dist/pppd/chap-new.h \ src/external/bsd/ppp/dist/pppd/chap_ms.c \ src/external/bsd/ppp/dist/pppd/chap_ms.h \ src/external/bsd/ppp/dist/pppd/demand.c \ src/external/bsd/ppp/dist/pppd/eap.c src/external/bsd/ppp/dist/pppd/eap.h \ src/external/bsd/ppp/dist/pppd/ecp.c src/external/bsd/ppp/dist/pppd/ecp.h \ src/external/bsd/ppp/dist/pppd/eui64.c \ src/external/bsd/ppp/dist/pppd/eui64.h \ src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \ src/external/bsd/ppp/dist/pppd/ipcp.c \ src/external/bsd/ppp/dist/pppd/ipcp.h \ src/external/bsd/ppp/dist/pppd/ipv6cp.c \ src/external/bsd/ppp/dist/pppd/ipv6cp.h \ src/external/bsd/ppp/dist/pppd/ipxcp.c \ src/external/bsd/ppp/dist/pppd/ipxcp.h \ src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \ src/external/bsd/ppp/dist/pppd/magic.c \ src/external/bsd/ppp/dist/pppd/magic.h \ src/external/bsd/ppp/dist/pppd/mppe.h \ src/external/bsd/ppp/dist/pppd/multilink.c \ src/external/bsd/ppp/dist/pppd/options.c \ src/external/bsd/ppp/dist/pppd/pathnames.h \ src/external/bsd/ppp/dist/pppd/pppcrypt.c \ src/external/bsd/ppp/dist/pppd/pppcrypt.h \ src/external/bsd/ppp/dist/pppd/pppd.h \ src/external/bsd/ppp/dist/pppd/session.c \ src/external/bsd/ppp/dist/pppd/session.h \ src/external/bsd/ppp/dist/pppd/tty.c \ src/external/bsd/ppp/dist/pppd/upap.c \ src/external/bsd/ppp/dist/pppd/upap.h \ src/external/bsd/ppp/dist/pppd/utils.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/ppp/dist/pppd/plugins/radius/etc/port-id-map cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppdump/deflate.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppstats/pppstats.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/ppp/dist/pppd/auth.c diff -u src/external/bsd/ppp/dist/pppd/auth.c:1.3 src/external/bsd/ppp/dist/pppd/auth.c:1.4 --- src/external/bsd/ppp/dist/pppd/auth.c:1.3 Sat Oct 25 15:06:34 2014 +++ src/external/bsd/ppp/dist/pppd/auth.c Sat Oct 25 17:11:37 2014 @@ -1,4 +1,4 @@ -/* NetBSD */ +/* $NetBSD: auth.c,v 1.4 2014/10/25 21:11:37 christos Exp $ */ /* * auth.c - PPP authentication and phase control. @@ -75,7 +75,7 @@ #define RCSID Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp static const char rcsid[] = RCSID; #else -__RCSID(NetBSD); +__RCSID($NetBSD: auth.c,v 1.4 2014/10/25 21:11:37 christos Exp $); #endif #include stdio.h Index: src/external/bsd/ppp/dist/pppd/cbcp.c diff -u src/external/bsd/ppp/dist/pppd/cbcp.c:1.3 src/external/bsd/ppp/dist/pppd/cbcp.c:1.4 --- src/external/bsd/ppp/dist/pppd/cbcp.c:1.3 Sat Oct 25 15:06:34 2014 +++ src/external/bsd/ppp/dist/pppd/cbcp.c Sat Oct 25 17:11:37 2014 @@ -1,4 +1,4 @@ -/* NetBSD */ +/* $NetBSD: cbcp.c,v 1.4 2014/10/25 21:11:37 christos Exp $ */ /* * cbcp - Call Back Configuration Protocol. @@ -40,7 +40,7 @@ #define RCSID Id: cbcp.c,v 1.17 2006/05/22 00:04:07 paulus Exp static const char rcsid[] = RCSID; #else -__RCSID(NetBSD); +__RCSID($NetBSD: cbcp.c,v 1.4 2014/10/25 21:11:37 christos Exp $); #endif #include stdio.h Index: src/external/bsd/ppp/dist/pppd/cbcp.h diff -u src/external/bsd/ppp/dist/pppd/cbcp.h:1.3 src/external/bsd/ppp/dist/pppd/cbcp.h:1.4 --- src/external/bsd/ppp/dist/pppd/cbcp.h:1.3 Sat Oct 25 15:06:34 2014 +++ src/external/bsd/ppp/dist/pppd/cbcp.h Sat Oct 25 17:11:37 2014 @@ -1,4 +1,4 @@ -/* NetBSD */ +/* $NetBSD: cbcp.h,v 1.4 2014/10/25 21:11:37 christos Exp $ */ #ifndef CBCP_H #define CBCP_H Index: src/external/bsd/ppp/dist/pppd/ccp.c diff -u src/external/bsd/ppp/dist/pppd/ccp.c:1.3 src/external/bsd/ppp/dist/pppd/ccp.c:1.4 ---
CVS commit: src/sbin/fsck
Module Name:src
Committed By: mlelstv
Date: Sat Oct 25 22:00:19 UTC 2014
Modified Files:
src/sbin/fsck: fsck.c
Log Message:
fix logic that handles command line arguments. Now you can:
fsck /mnt/point
fsck dkX
fsck rdkX
fsck /dev/dkX
fsck /dev/rdkX
fsck NAME=wedge
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sbin/fsck/fsck.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck/fsck.c
diff -u src/sbin/fsck/fsck.c:1.51 src/sbin/fsck/fsck.c:1.52
--- src/sbin/fsck/fsck.c:1.51 Sat Apr 7 04:52:20 2012
+++ src/sbin/fsck/fsck.c Sat Oct 25 22:00:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck.c,v 1.51 2012/04/07 04:52:20 christos Exp $ */
+/* $NetBSD: fsck.c,v 1.52 2014/10/25 22:00:19 mlelstv Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fsck.c,v 1.51 2012/04/07 04:52:20 christos Exp $);
+__RCSID($NetBSD: fsck.c,v 1.52 2014/10/25 22:00:19 mlelstv Exp $);
#endif /* not lint */
#include sys/param.h
@@ -196,23 +196,30 @@ main(int argc, char *argv[])
for (; argc--; argv++) {
- const char *spec, *type, *cp;
+ const char *spec, *spec2, *mntpt, *type, *cp;
char device[MAXPATHLEN];
- spec = *argv;
- cp = strrchr(spec, '/');
+ spec = mntpt = *argv;
+ spec2 = getfsspecname(buf, sizeof(buf), spec);
+ if (spec2 == NULL)
+ spec2 = spec;
+
+ cp = strrchr(spec2, '/');
if (cp == 0) {
(void)snprintf(device, sizeof(device), %s%s,
-_PATH_DEV, spec);
- spec = device;
+_PATH_DEV, spec2);
+ spec2 = device;
}
- if ((fs = getfsfile(spec)) == NULL
- (fs = getfsspec(spec)) == NULL) {
- if (vfstype == NULL)
-vfstype = getfslab(spec);
- type = vfstype;
+
+ fs = getfsfile(spec);
+ if (fs == NULL)
+ fs = getfsspec(spec);
+ if (fs == NULL spec != spec2) {
+ fs = getfsspec(spec2);
+ spec = spec2;
}
- else {
+
+ if (fs) {
spec = getfsspecname(buf, sizeof(buf), fs-fs_spec);
if (spec == NULL)
err(FSCK_EXIT_CHECK_FAILED, %s, buf);
@@ -221,6 +228,10 @@ main(int argc, char *argv[])
errx(FSCK_EXIT_CHECK_FAILED,
%s has unknown file system type.,
spec);
+ } else {
+ if (vfstype == NULL)
+vfstype = getfslab(spec);
+ type = vfstype;
}
rval = checkfs(type, blockcheck(spec), *argv, NULL, NULL);
CVS commit: src/sys/uvm
Module Name:src Committed By: christos Date: Sun Oct 26 01:42:07 UTC 2014 Modified Files: src/sys/uvm: uvm_map.c uvm_pglist.c Log Message: Define UVMDEBUG for expensive debugging operations. Idea from chuq. To generate a diff of this commit: cvs rdiff -u -r1.330 -r1.331 src/sys/uvm/uvm_map.c cvs rdiff -u -r1.66 -r1.67 src/sys/uvm/uvm_pglist.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/uvm/uvm_map.c diff -u src/sys/uvm/uvm_map.c:1.330 src/sys/uvm/uvm_map.c:1.331 --- src/sys/uvm/uvm_map.c:1.330 Fri Jul 18 08:36:57 2014 +++ src/sys/uvm/uvm_map.c Sat Oct 25 21:42:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_map.c,v 1.330 2014/07/18 12:36:57 christos Exp $ */ +/* $NetBSD: uvm_map.c,v 1.331 2014/10/26 01:42:07 christos Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.330 2014/07/18 12:36:57 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.331 2014/10/26 01:42:07 christos Exp $); #include opt_ddb.h #include opt_uvmhist.h @@ -2238,7 +2238,7 @@ uvm_unmap_remove(struct vm_map *map, vad uvm_map_unlock_entry(entry); } -#if defined(DEBUG) +#if defined(UVMDEBUG) /* * check if there's remaining mapping, * which is a bug in caller. @@ -2257,7 +2257,7 @@ uvm_unmap_remove(struct vm_map *map, vad uvm_km_check_empty(map, entry-start, entry-end); } -#endif /* defined(DEBUG) */ +#endif /* defined(UVMDEBUG) */ /* * remove entry from map and put it on our list of entries Index: src/sys/uvm/uvm_pglist.c diff -u src/sys/uvm/uvm_pglist.c:1.66 src/sys/uvm/uvm_pglist.c:1.67 --- src/sys/uvm/uvm_pglist.c:1.66 Fri Sep 5 01:36:21 2014 +++ src/sys/uvm/uvm_pglist.c Sat Oct 25 21:42:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pglist.c,v 1.66 2014/09/05 05:36:21 matt Exp $ */ +/* $NetBSD: uvm_pglist.c,v 1.67 2014/10/26 01:42:07 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.66 2014/09/05 05:36:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.67 2014/10/26 01:42:07 christos Exp $); #include sys/param.h #include sys/systm.h @@ -90,7 +90,7 @@ uvm_pglist_add(struct vm_page *pg, struc free_list = uvm_page_lookup_freelist(pg); color = VM_PGCOLOR_BUCKET(pg); pgflidx = (pg-flags PG_ZERO) ? PGFL_ZEROS : PGFL_UNKNOWN; -#ifdef NOT_DEBUG +#ifdef UVMDEBUG struct vm_page *tp; LIST_FOREACH(tp, uvm.page_free[free_list].pgfl_buckets[color].pgfl_queues[pgflidx],
