CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: matt Date: Sun Aug 10 06:22:06 UTC 2014 Modified Files: src/sys/miscfs/procfs: procfs_linux.c Log Message: #include sys/cpu.h To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/miscfs/procfs/procfs_linux.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/miscfs/procfs/procfs_linux.c diff -u src/sys/miscfs/procfs/procfs_linux.c:1.69 src/sys/miscfs/procfs/procfs_linux.c:1.70 --- src/sys/miscfs/procfs/procfs_linux.c:1.69 Sat Jul 12 09:58:39 2014 +++ src/sys/miscfs/procfs/procfs_linux.c Sun Aug 10 06:22:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_linux.c,v 1.69 2014/07/12 09:58:39 njoly Exp $ */ +/* $NetBSD: procfs_linux.c,v 1.70 2014/08/10 06:22:06 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,11 +36,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: procfs_linux.c,v 1.69 2014/07/12 09:58:39 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: procfs_linux.c,v 1.70 2014/08/10 06:22:06 matt Exp $); #include sys/param.h #include sys/systm.h #include sys/time.h +#include sys/cpu.h #include sys/kernel.h #include sys/proc.h #include sys/vnode.h
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Sun Aug 10 06:23:13 UTC 2014
Modified Files:
src/sys/arch/arm/include: lock.h
Log Message:
Correct _ARM_ARCH_8 instructions
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/lock.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/arm/include/lock.h
diff -u src/sys/arch/arm/include/lock.h:1.27 src/sys/arch/arm/include/lock.h:1.28
--- src/sys/arch/arm/include/lock.h:1.27 Thu Mar 13 12:59:08 2014
+++ src/sys/arch/arm/include/lock.h Sun Aug 10 06:23:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.27 2014/03/13 12:59:08 matt Exp $ */
+/* $NetBSD: lock.h,v 1.28 2014/08/10 06:23:13 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -214,10 +214,10 @@ __cpu_simple_unlock(__cpu_simple_lock_t
#ifdef _ARM_ARCH_8
if (sizeof(*__alp) == 1) {
- __asm __volatile(stab\t%0, [%1]
+ __asm __volatile(stlb\t%0, [%1]
:: r(__SIMPLELOCK_UNLOCKED), r(__alp) : memory);
} else {
- __asm __volatile(sta\t%0, [%1]
+ __asm __volatile(stl\t%0, [%1]
:: r(__SIMPLELOCK_UNLOCKED), r(__alp) : memory);
}
#else
CVS commit: src
Module Name:src
Committed By: isaki
Date: Sun Aug 10 06:35:57 UTC 2014
Modified Files:
src/distrib/x68k/floppies/ramdisk: Makefile
src/sys/arch/x68k/conf: INSTALL
Log Message:
Increase the image size to 1700KB.
At this point, the build succeeds if the build path is short,
but may fail if long. Thanks for martin@ and tsutsui@.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/x68k/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.45 src/distrib/x68k/floppies/ramdisk/Makefile:1.46
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.45 Thu Feb 27 09:13:20 2014
+++ src/distrib/x68k/floppies/ramdisk/Makefile Sun Aug 10 06:35:56 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2014/02/27 09:13:20 isaki Exp $
+# $NetBSD: Makefile,v 1.46 2014/08/10 06:35:56 isaki Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= inst.fs
-IMAGESIZE= 1600k
+IMAGESIZE= 1700k
# `floppy-root' cannot be used now, due to size issue.
#IMAGE_RELEASEDIR= installation/floppy
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.105 src/sys/arch/x68k/conf/INSTALL:1.106
--- src/sys/arch/x68k/conf/INSTALL:1.105 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/x68k/conf/INSTALL Sun Aug 10 06:35:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.105 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: INSTALL,v 1.106 2014/08/10 06:35:56 isaki Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include arch/x68k/conf/std.x68k
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident INSTALL-$Revision: 1.105 $
+#ident INSTALL-$Revision: 1.106 $
makeoptions COPTS=-Os # Optimise for space. Implies -O2
@@ -18,7 +18,7 @@ maxusers 4
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks
-options MEMORY_DISK_ROOT_SIZE=3200
+options MEMORY_DISK_ROOT_SIZE=3400
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
## System kernel configuration. See options(4) for more detail.
CVS commit: [tls-earlyentropy] src/bin
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:41:18 UTC 2014
Modified Files:
src/bin/cat [tls-earlyentropy]: cat.1
src/bin/csh [tls-earlyentropy]: Makefile
src/bin/csh/USD.doc [tls-earlyentropy]: Makefile
src/bin/ls [tls-earlyentropy]: print.c
src/bin/pax [tls-earlyentropy]: ar_io.c
src/bin/ps [tls-earlyentropy]: extern.h print.c ps.c ps.h
src/bin/sh [tls-earlyentropy]: Makefile alias.c alias.h eval.c eval.h
histedit.c jobs.c main.c sh.1
src/bin/sh/USD.doc [tls-earlyentropy]: Makefile
Added Files:
src/bin/sh/USD.doc [tls-earlyentropy]: referargs
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.8.1 src/bin/cat/cat.1
cvs rdiff -u -r1.39 -r1.39.4.1 src/bin/csh/Makefile
cvs rdiff -u -r1.7 -r1.7.48.1 src/bin/csh/USD.doc/Makefile
cvs rdiff -u -r1.54 -r1.54.2.1 src/bin/ls/print.c
cvs rdiff -u -r1.54 -r1.54.10.1 src/bin/pax/ar_io.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/bin/ps/extern.h
cvs rdiff -u -r1.121 -r1.121.2.1 src/bin/ps/print.c
cvs rdiff -u -r1.80 -r1.80.2.1 src/bin/ps/ps.c
cvs rdiff -u -r1.26 -r1.26.60.1 src/bin/ps/ps.h
cvs rdiff -u -r1.99 -r1.99.8.1 src/bin/sh/Makefile
cvs rdiff -u -r1.14 -r1.14.20.1 src/bin/sh/alias.c
cvs rdiff -u -r1.7 -r1.7.20.1 src/bin/sh/alias.h
cvs rdiff -u -r1.108 -r1.108.2.1 src/bin/sh/eval.c
cvs rdiff -u -r1.15 -r1.15.46.1 src/bin/sh/eval.h
cvs rdiff -u -r1.46 -r1.46.2.1 src/bin/sh/histedit.c
cvs rdiff -u -r1.72 -r1.72.2.1 src/bin/sh/jobs.c
cvs rdiff -u -r1.57 -r1.57.20.1 src/bin/sh/main.c
cvs rdiff -u -r1.112 -r1.112.2.1 src/bin/sh/sh.1
cvs rdiff -u -r1.1 -r1.1.24.1 src/bin/sh/USD.doc/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/bin/sh/USD.doc/referargs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/cat/cat.1
diff -u src/bin/cat/cat.1:1.36 src/bin/cat/cat.1:1.36.8.1
--- src/bin/cat/cat.1:1.36 Sat Nov 10 18:41:10 2012
+++ src/bin/cat/cat.1 Sun Aug 10 06:41:18 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: cat.1,v 1.36 2012/11/10 18:41:10 wiz Exp $
+.\ $NetBSD: cat.1,v 1.36.8.1 2014/08/10 06:41:18 tls Exp $
.\
.\ Copyright (c) 1989, 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ @(#)cat.1 8.3 (Berkeley) 5/2/95
.\
-.Dd November 10, 2012
+.Dd June 15, 2014
.Dt CAT 1
.Os
.Sh NAME
@@ -198,7 +198,7 @@ utility is expected to conform to the
specification.
.Pp
The flags
-.Op Fl belnstv
+.Op Fl Bbeflnstv
are extensions to the specification.
.Sh HISTORY
A
Index: src/bin/csh/Makefile
diff -u src/bin/csh/Makefile:1.39 src/bin/csh/Makefile:1.39.4.1
--- src/bin/csh/Makefile:1.39 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/Makefile Sun Aug 10 06:41:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/07/16 17:47:43 christos Exp $
+# $NetBSD: Makefile,v 1.39.4.1 2014/08/10 06:41:18 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -52,14 +52,8 @@ const.h: const.c
${TOOL_SED} -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort ${.TARGET}
-.if make(install)
SUBDIR+=USD.doc
-.endif
-# XXX Only GCC 4.1 problem
-.if defined(HAVE_GCC) ${HAVE_GCC} == 4 ${MACHINE_ARCH} == vax
-COPTS.parse.c+= -O0
-.endif
COPTS.err.c = -Wno-format-nonliteral
COPTS.printf.c = -Wno-format-nonliteral
COPTS.proc.c = -Wno-format-nonliteral
Index: src/bin/csh/USD.doc/Makefile
diff -u src/bin/csh/USD.doc/Makefile:1.7 src/bin/csh/USD.doc/Makefile:1.7.48.1
--- src/bin/csh/USD.doc/Makefile:1.7 Thu Oct 18 18:26:31 2007
+++ src/bin/csh/USD.doc/Makefile Sun Aug 10 06:41:18 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2007/10/18 18:26:31 tls Exp $
+# $NetBSD: Makefile,v 1.7.48.1 2014/08/10 06:41:18 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-DIR= usd/04.csh
+SECTION=reference/ref1
+ARTICLE=csh
SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.ap csh.g
MACROS= -ms
-
-paper.ps: ${SRCS}
- ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | \
- ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+EXTRAHTMLFILES=\
+ csh1.png csh2.png csh3.png csh4.png csh5.png csh6.png csh7.png \
+ csh8.png csh9.png
.include bsd.doc.mk
Index: src/bin/ls/print.c
diff -u src/bin/ls/print.c:1.54 src/bin/ls/print.c:1.54.2.1
--- src/bin/ls/print.c:1.54 Sat Feb 22 13:11:42 2014
+++ src/bin/ls/print.c Sun Aug 10 06:41:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $ */
+/* $NetBSD: print.c,v 1.54.2.1 2014/08/10 06:41:18 tls Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)print.c 8.5 (Berkeley) 7/28/94;
#else
-__RCSID($NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $);
+__RCSID($NetBSD: print.c,v 1.54.2.1 2014/08/10 06:41:18 tls Exp $);
#endif
#endif /* not lint */
@@ -46,6 +46,7 @@ __RCSID($NetBSD: print.c,v 1.54 2014/02
#include err.h
#include errno.h
CVS commit: [tls-earlyentropy] src/distrib/alpha
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:47:47 UTC 2014
Modified Files:
src/distrib/alpha/floppy-GENERIC [tls-earlyentropy]: Makefile
src/distrib/alpha/instkernel/ramdisk [tls-earlyentropy]: list
src/distrib/alpha/rz25dist [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/alpha/floppy-GENERIC/Makefile
cvs rdiff -u -r1.44 -r1.44.20.1 src/distrib/alpha/instkernel/ramdisk/list
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/alpha/rz25dist/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/alpha/floppy-GENERIC/Makefile
diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.21 src/distrib/alpha/floppy-GENERIC/Makefile:1.21.2.1
--- src/distrib/alpha/floppy-GENERIC/Makefile:1.21 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/floppy-GENERIC/Makefile Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2014/08/10 06:47:47 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL}
@rm -f ${.TARGET} ${.TARGET}.tmp
cp ${.ALLSRC} ${.TARGET}.tmp
${STRIP} ${.TARGET}.tmp
- ${TOOL_GZIP} -9nf ${.TARGET}.tmp
+ ${TOOL_GZIP_N} -9f ${.TARGET}.tmp
mv ${.TARGET}.tmp.gz ${.TARGET}
CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz
Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.44 src/distrib/alpha/instkernel/ramdisk/list:1.44.20.1
--- src/distrib/alpha/instkernel/ramdisk/list:1.44 Sun Jul 3 23:11:31 2011
+++ src/distrib/alpha/instkernel/ramdisk/list Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.44 2011/07/03 23:11:31 tron Exp $
+# $NetBSD: list,v 1.44.20.1 2014/08/10 06:47:47 tls Exp $
SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
@@ -35,6 +35,7 @@ PROG sbin/mount_msdos
PROG sbin/mount_nfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
+PROG sbin/raidctl
PROG sbin/reboot sbin/halt
PROG sbin/restore sbin/rrestore
PROG sbin/route
Index: src/distrib/alpha/rz25dist/Makefile
diff -u src/distrib/alpha/rz25dist/Makefile:1.30 src/distrib/alpha/rz25dist/Makefile:1.30.2.1
--- src/distrib/alpha/rz25dist/Makefile:1.30 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/rz25dist/Makefile Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2014/08/10 06:47:47 tls Exp $
.include ../../../Makefile.inc
@@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount-
umount ${DESTDIR}/usr ${DESTDIR}
/bin/rm -f $@
dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \
- count=${CYLS} | ${TOOL_GZIP} -9n $@
+ count=${CYLS} | ${TOOL_GZIP_N} -9 $@
bin.tar.gz: mount-fs build-fs
/bin/rm -f $@
(cd ${DESTDIR} ; find . | grep -v '^./etc' | \
grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
- grep -v '^./boot' | pax -w -d | ${TOOL_GZIP} -9n) $@
+ grep -v '^./boot' | pax -w -d | ${TOOL_GZIP_N} -9) $@
etc.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9n) $@
+ (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP_N} -9) $@
x11.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP} -9n) $@
+ (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP_N} -9) $@
.endif
CVS commit: [tls-earlyentropy] src/distrib/bebox/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:47:52 UTC 2014
Modified Files:
src/distrib/bebox/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/bebox/ramdisk/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/bebox/ramdisk/Makefile
diff -u src/distrib/bebox/ramdisk/Makefile:1.1 src/distrib/bebox/ramdisk/Makefile:1.1.24.1
--- src/distrib/bebox/ramdisk/Makefile:1.1 Sun Oct 17 11:05:18 2010
+++ src/distrib/bebox/ramdisk/Makefile Sun Aug 10 06:47:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/17 11:05:18 kiyohara Exp $
+# $NetBSD: Makefile,v 1.1.24.1 2014/08/10 06:47:52 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
CVS commit: [tls-earlyentropy] src/common/lib
Module Name:src Committed By: tls Date: Sun Aug 10 06:47:06 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic [tls-earlyentropy]: Makefile.inc atomic_add_16.S atomic_add_32.S atomic_add_8.S atomic_and_16.S atomic_and_32.S atomic_and_8.S atomic_or_16.S atomic_or_32.S atomic_or_8.S atomic_swap.S atomic_swap_16.S atomic_swap_64.S atomic_xor_16.S atomic_xor_32.S atomic_xor_8.S sync_fetch_and_add_8.S sync_fetch_and_and_8.S sync_fetch_and_or_8.S sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S src/common/lib/libc/arch/arm/quad [tls-earlyentropy]: __aeabi_ldivmod.S __aeabi_uldivmod.S src/common/lib/libc/arch/arm/string [tls-earlyentropy]: strcat_arm.S strlcat_arm.S strlen_arm.S src/common/lib/libc/arch/i386/atomic [tls-earlyentropy]: atomic.S src/common/lib/libc/arch/i386/gen [tls-earlyentropy]: byte_swap_2.S byte_swap_4.S src/common/lib/libc/arch/i386/string [tls-earlyentropy]: memset.S src/common/lib/libc/arch/i386/string/small [tls-earlyentropy]: memcpy.S src/common/lib/libc/arch/m68k/atomic [tls-earlyentropy]: atomic_add.S atomic_and.S atomic_or.S atomic_sub.S atomic_swap.S atomic_xor.S src/common/lib/libc/arch/x86_64/atomic [tls-earlyentropy]: atomic.S src/common/lib/libc/arch/x86_64/gen [tls-earlyentropy]: byte_swap_2.S byte_swap_4.S byte_swap_8.S src/common/lib/libc/arch/x86_64/string [tls-earlyentropy]: memset.S src/common/lib/libc/atomic [tls-earlyentropy]: atomic_add_16_cas.c atomic_add_32_cas.c atomic_add_64_cas.c atomic_add_8_cas.c atomic_and_16_cas.c atomic_and_32_cas.c atomic_and_64_cas.c atomic_and_8_cas.c atomic_or_16_cas.c atomic_or_32_cas.c atomic_or_64_cas.c atomic_or_8_cas.c atomic_sub_16_cas.c atomic_sub_32_cas.c atomic_sub_64_cas.c atomic_sub_8_cas.c atomic_swap_16_cas.c atomic_swap_32_cas.c atomic_swap_64_cas.c atomic_swap_8_cas.c atomic_xor_16_cas.c atomic_xor_32_cas.c atomic_xor_64_cas.c atomic_xor_8_cas.c src/common/lib/libc/stdlib [tls-earlyentropy]: random.c src/common/lib/libc/string [tls-earlyentropy]: bcopy.c consttime_memequal.c explicit_memset.c src/common/lib/libutil [tls-earlyentropy]: snprintb.c src/common/lib/libx86emu [tls-earlyentropy]: x86emu.c Added Files: src/common/lib/libc/atomic [tls-earlyentropy]: atomic_load.c atomic_store.c src/common/lib/libc/string [tls-earlyentropy]: strcspn.c strpbrk.c strspn.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 \ src/common/lib/libc/arch/arm/atomic/Makefile.inc cvs rdiff -u -r1.2 -r1.2.2.1 \ src/common/lib/libc/arch/arm/atomic/atomic_add_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_add_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S cvs rdiff -u -r1.7 -r1.7.2.1 \ src/common/lib/libc/arch/arm/atomic/atomic_add_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_32.S cvs rdiff -u -r1.10 -r1.10.2.1 \ src/common/lib/libc/arch/arm/atomic/atomic_swap.S cvs rdiff -u -r1.8 -r1.8.2.1 \ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S cvs rdiff -u -r1.12 -r1.12.2.1 \ src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S cvs rdiff -u -r1.8 -r1.8.2.1 \ src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S cvs rdiff -u -r1.5 -r1.5.2.1 src/common/lib/libc/arch/arm/string/strcat_arm.S \ src/common/lib/libc/arch/arm/string/strlcat_arm.S cvs rdiff -u -r1.8 -r1.8.2.1 src/common/lib/libc/arch/arm/string/strlen_arm.S cvs rdiff -u -r1.20 -r1.20.2.1 src/common/lib/libc/arch/i386/atomic/atomic.S cvs rdiff -u -r1.3 -r1.3.48.1 src/common/lib/libc/arch/i386/gen/byte_swap_2.S \ src/common/lib/libc/arch/i386/gen/byte_swap_4.S cvs rdiff -u -r1.4 -r1.4.40.1 src/common/lib/libc/arch/i386/string/memset.S cvs rdiff -u -r1.1 -r1.1.20.1 \ src/common/lib/libc/arch/i386/string/small/memcpy.S cvs rdiff -u -r1.9 -r1.9.2.1 \
CVS commit: [tls-earlyentropy] src/distrib/amd64
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:47:49 UTC 2014
Modified Files:
src/distrib/amd64/cdroms [tls-earlyentropy]: Makefile.cdrom etc.rc
src/distrib/amd64/installimage [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/amd64/cdroms/etc.rc
cvs rdiff -u -r1.3 -r1.3.8.1 src/distrib/amd64/installimage/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.8 src/distrib/amd64/cdroms/Makefile.cdrom:1.8.8.1
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.8 Fri Dec 21 18:11:10 2012
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Aug 10 06:47:49 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.cdrom,v 1.8 2012/12/21 18:11:10 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.8.8.1 2014/08/10 06:47:49 tls Exp $
.include bsd.own.mk
-SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
@@ -35,6 +35,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
Index: src/distrib/amd64/cdroms/etc.rc
diff -u src/distrib/amd64/cdroms/etc.rc:1.1 src/distrib/amd64/cdroms/etc.rc:1.1.24.1
--- src/distrib/amd64/cdroms/etc.rc:1.1 Tue Jan 18 00:16:13 2011
+++ src/distrib/amd64/cdroms/etc.rc Sun Aug 10 06:47:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: etc.rc,v 1.1 2011/01/18 00:16:13 jym Exp $
+# $NetBSD: etc.rc,v 1.1.24.1 2014/08/10 06:47:49 tls Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -44,8 +44,8 @@ mount -t tmpfs tmpfs /tmp
mount -t tmpfs tmpfs /var
mount -t tmpfs -o union tmpfs /etc
-# prepare important directories in the tmpfses, so dhcpcd will work
-mkdir -p /var/run /var/db
+# prepare important directories in the tmpfses, so dhcpcd and vi will work
+mkdir -p /var/run /var/db /var/tmp
# create a gettytab to autologin and run sysinst (etc/gettytab is a symlink
# to /tmp/gettytab)
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.3 src/distrib/amd64/installimage/Makefile:1.3.8.1
--- src/distrib/amd64/installimage/Makefile:1.3 Sat Nov 3 14:25:32 2012
+++ src/distrib/amd64/installimage/Makefile Sun Aug 10 06:47:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2014/08/10 06:47:49 tls Exp $
.include bsd.own.mk
@@ -22,7 +22,7 @@ prepare_md_post:
${.CURDIR}/boot.cfg.in boot.cfg
DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA=\
CVS commit: [tls-earlyentropy] src/distrib/cobalt
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:47:54 UTC 2014
Modified Files:
src/distrib/cobalt [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/distrib/cobalt/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/cobalt/Makefile
diff -u src/distrib/cobalt/Makefile:1.4 src/distrib/cobalt/Makefile:1.4.2.1
--- src/distrib/cobalt/Makefile:1.4 Mon Jan 27 08:18:07 2014
+++ src/distrib/cobalt/Makefile Sun Aug 10 06:47:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2014/08/10 06:47:54 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -9,7 +9,7 @@ SUBDIR= ramdisk .WAIT instkernel .WAIT
TARGETS+= release
release: check_RELEASEDIR .WAIT ${BOOT}
- ${TOOL_GZIP} -9nc ${BOOT} \
+ ${TOOL_GZIP_N} -9c ${BOOT} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz
iso_image:
CVS commit: [tls-earlyentropy] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tls Date: Sun Aug 10 06:47:09 UTC 2014 Modified Files: src/crypto/dist/ipsec-tools/src/racoon [tls-earlyentropy]: grabmyaddr.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.2.1 \ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.33 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.33.2.1 --- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.33 Tue Mar 18 18:20:35 2014 +++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Sun Aug 10 06:47:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: grabmyaddr.c,v 1.33 2014/03/18 18:20:35 riastradh Exp $ */ +/* $NetBSD: grabmyaddr.c,v 1.33.2.1 2014/08/10 06:47:09 tls Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 2008 Timo Teras timo.te...@iki.fi. @@ -783,6 +783,9 @@ kernel_handle_message(msg) #ifdef RTM_IFANNOUNCE case RTM_IFANNOUNCE: #endif +#ifdef RTM_IEEE80211 + case RTM_IEEE80211: +#endif break; default: plog(LLV_WARNING, LOCATION, NULL,
CVS commit: [tls-earlyentropy] src/distrib/i386
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:09 UTC 2014
Modified Files:
src/distrib/i386/cdroms [tls-earlyentropy]: Makefile.cdrom etc.rc
src/distrib/i386/installimage [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.8.1 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/i386/cdroms/etc.rc
cvs rdiff -u -r1.3 -r1.3.8.1 src/distrib/i386/installimage/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/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.28 src/distrib/i386/cdroms/Makefile.cdrom:1.28.8.1
--- src/distrib/i386/cdroms/Makefile.cdrom:1.28 Fri Dec 21 18:13:22 2012
+++ src/distrib/i386/cdroms/Makefile.cdrom Sun Aug 10 06:48:09 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.cdrom,v 1.28 2012/12/21 18:13:22 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.28.8.1 2014/08/10 06:48:09 tls Exp $
.include bsd.own.mk
-SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
@@ -35,6 +35,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
Index: src/distrib/i386/cdroms/etc.rc
diff -u src/distrib/i386/cdroms/etc.rc:1.1 src/distrib/i386/cdroms/etc.rc:1.1.24.1
--- src/distrib/i386/cdroms/etc.rc:1.1 Mon Apr 19 04:41:36 2010
+++ src/distrib/i386/cdroms/etc.rc Sun Aug 10 06:48:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: etc.rc,v 1.1 2010/04/19 04:41:36 martin Exp $
+# $NetBSD: etc.rc,v 1.1.24.1 2014/08/10 06:48:09 tls Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -44,8 +44,8 @@ mount -t tmpfs tmpfs /tmp
mount -t tmpfs tmpfs /var
mount -t tmpfs -o union tmpfs /etc
-# prepare important directories in the tmpfses, so dhcpcd will work
-mkdir -p /var/run /var/db
+# prepare important directories in the tmpfses, so dhcpcd and vi will work
+mkdir -p /var/run /var/db /var/tmp
# create a gettytab to autologin and run sysinst (etc/gettytab is a symlink
# to /tmp/gettytab)
Index: src/distrib/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.3 src/distrib/i386/installimage/Makefile:1.3.8.1
--- src/distrib/i386/installimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/i386/installimage/Makefile Sun Aug 10 06:48:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2014/08/10 06:48:09 tls Exp $
.include bsd.own.mk
@@ -22,7 +22,7 @@ prepare_md_post:
${.CURDIR}/boot.cfg.in boot.cfg
DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA=\
CVS commit: [tls-earlyentropy] src/distrib/evbarm/gzboot/gzimg
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:00 UTC 2014
Modified Files:
src/distrib/evbarm/gzboot/gzimg [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/distrib/evbarm/gzboot/gzimg/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/evbarm/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.26 src/distrib/evbarm/gzboot/gzimg/Makefile:1.26.2.1
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.26 Sat Mar 1 01:52:13 2014
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Sun Aug 10 06:48:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/03/01 01:52:13 matt Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2014/08/10 06:48:00 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -76,12 +76,12 @@ GZIMGS+= gzimg_${I}_flash_${R}.gz
gzimg_${I}_flash_${R}: .NOTMAIN ${GZB${G}} ${KERNOBJDIR}/${K}/${W}.bin
@echo Populating ${.TARGET}
-rm -f ${.TARGET}.kern.gz
- ${TOOL_GZIP} -9nc ${KERNOBJDIR}/${K}/${W}.bin ${.TARGET}.kern.gz
+ ${TOOL_GZIP_N} -9c ${KERNOBJDIR}/${K}/${W}.bin ${.TARGET}.kern.gz
${TOOL_CAT} ${GZB${G}} ${.TARGET}.kern.gz ${.TARGET}
gzimg_${I}_flash_${R}.gz: .NOTMAIN gzimg_${I}_flash_${R}
-rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${.ALLSRC} ${.TARGET}
CLEANFILES+= gzimg_${I}_flash_${R}.kern gzimg_${I}_flash_${R}.kern.gz \
gzimg_${I}_flash_${R}
CVS commit: [tls-earlyentropy] src/distrib/evbppc
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:02 UTC 2014
Modified Files:
src/distrib/evbppc/md-kernel [tls-earlyentropy]: Makefile
src/distrib/evbppc/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/distrib/evbppc/md-kernel/Makefile
cvs rdiff -u -r1.16 -r1.16.10.1 src/distrib/evbppc/ramdisk/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/evbppc/md-kernel/Makefile
diff -u src/distrib/evbppc/md-kernel/Makefile:1.4 src/distrib/evbppc/md-kernel/Makefile:1.4.2.1
--- src/distrib/evbppc/md-kernel/Makefile:1.4 Mon Mar 3 19:14:00 2014
+++ src/distrib/evbppc/md-kernel/Makefile Sun Aug 10 06:48:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/03 19:14:00 joerg Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2014/08/10 06:48:02 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,8 +8,9 @@ MKIMG?= ${HOST_SH} ${NETBSDSRCDIR}/sys/a
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-MDSETTARGETS= INSTALL_WALNUT ${RAMDISK} - \
- INSTALL_OPENBLOCKS266 ${RAMDISK} -
+MDSETTARGETS= INSTALL_OPENBLOCKS266 ${RAMDISK} - \
+ INSTALL_TWRP1025 ${RAMDISK} - \
+ INSTALL_WALNUT ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.-= img create-img
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.16 src/distrib/evbppc/ramdisk/Makefile:1.16.10.1
--- src/distrib/evbppc/ramdisk/Makefile:1.16 Tue Aug 14 07:24:40 2012
+++ src/distrib/evbppc/ramdisk/Makefile Sun Aug 10 06:48:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/08/14 07:24:40 martin Exp $
+# $NetBSD: Makefile,v 1.16.10.1 2014/08/10 06:48:02 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2880k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mno-string -fno-pie -fno-pic
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/ibmnws/netboot/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:11 UTC 2014
Modified Files:
src/distrib/ibmnws/netboot/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.10.1 src/distrib/ibmnws/netboot/ramdisk/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/ibmnws/netboot/ramdisk/Makefile
diff -u src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11.10.1
--- src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 Tue Aug 14 07:24:41 2012
+++ src/distrib/ibmnws/netboot/ramdisk/Makefile Sun Aug 10 06:48:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/08/14 07:24:41 martin Exp $
+# $NetBSD: Makefile,v 1.11.10.1 2014/08/10 06:48:11 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,6 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-# DBG= -Os -mmultiple -mstring
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/common
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:47:57 UTC 2014
Modified Files:
src/distrib/common [tls-earlyentropy]: Makefile.bootcd Makefile.image
Makefile.mdset Makefile.minirootkmod Makefile.tarfloppy
list.sysinst list.sysinst.en
src/distrib/common/bootimage [tls-earlyentropy]: Makefile.bootimage
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.33 -r1.33.2.1 src/distrib/common/Makefile.image
cvs rdiff -u -r1.39 -r1.39.2.1 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/common/Makefile.minirootkmod
cvs rdiff -u -r1.17 -r1.17.2.1 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.12 -r1.12.64.1 src/distrib/common/list.sysinst
cvs rdiff -u -r1.1 -r1.1.72.1 src/distrib/common/list.sysinst.en
cvs rdiff -u -r1.8 -r1.8.2.1 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.24 src/distrib/common/Makefile.bootcd:1.24.2.1
--- src/distrib/common/Makefile.bootcd:1.24 Sat Feb 15 09:43:02 2014
+++ src/distrib/common/Makefile.bootcd Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.24 2014/02/15 09:43:02 dsl Exp $
+# $NetBSD: Makefile.bootcd,v 1.24.2.1 2014/08/10 06:47:57 tls Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -25,6 +25,7 @@
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
# CDMAKEFSOPTIONS Options for makefs, eg bootimage=i386;bootxx,no-emul-boot
+# CDMAKEFSEXTRAOPTS additional options for makefs, e.g. -F specfile
# CDROMS_RELEASEDIR Where to install ${CDBASE}.iso
# CDINSTKERNEL instkernel directory (relative to ${.CURDIR})
# CDKERNELS couples of the form:
@@ -206,7 +207,7 @@ copy-releasedir:
fi
image:
- ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.33 src/distrib/common/Makefile.image:1.33.2.1
--- src/distrib/common/Makefile.image:1.33 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.image Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.33 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.image,v 1.33.2.1 2014/08/10 06:47:57 tls Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -38,6 +38,7 @@ WORKBUILT?= work.built
PARSELISTENV+= TARGETDIR=${.OBJDIR}/${WORKDIR:Q}
+GZIP_FLAGS= -9 ${GZIP_N_FLAG}
.if !target(${WORKBUILT}) # {
${WORKBUILT}: ${IMAGEDEPENDS} ${WORKSPEC} ${PARSELISTDEP} ${LISTS}
@@ -103,7 +104,7 @@ fsimage: ${IMAGE}
${IMAGE}.gz: ${IMAGE}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP} ${GZIP_FLAGS} -c ${.ALLSRC} ${.TARGET}
realall: ${IMAGE}
@@ -121,7 +122,9 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAG
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
- GZIP=-9n ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM ${.OBJDIR}/${WORKSPEC} \
+ GZIP=${GZIP_FLAGS:Q} \
+ ${TOOL_PAX} --use-compress-program=${TOOL_GZIP:Q} \
+ -ON ${NETBSDSRCDIR}/etc -wdM ${.OBJDIR}/${WORKSPEC} \
) ${.TARGET}.tmp \
mv ${.TARGET}.tmp ${.TARGET}
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.39 src/distrib/common/Makefile.mdset:1.39.2.1
--- src/distrib/common/Makefile.mdset:1.39 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.mdset Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.39 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.mdset,v 1.39.2.1 2014/08/10 06:47:57 tls Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -110,7 +110,7 @@ KERNELS+= ${_KERNEL.${_K}.${_F}}.${_S}.g
${_KERNEL.${_K}.${_F}}.${_S}.gz: ${_KERNEL.${_K}.${_F}}.${_S}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${.ALLSRC} ${.TARGET}
.endif # }
.endfor # }
@@ -150,7 +150,7 @@ ${_KERNEL.${_K}.${_F}}: .NOTMAIN ${_KERN
${TOOL_MDSETIMAGE} ${MDSETIMAGEFLAGS} ${.TARGET}.tmp ${_I}
.endif
.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) !defined(MDSET_NOSYMBOLS)
- ${NM} ${.TARGET}.tmp | ${TOOL_GZIP} -9n ${.TARGET}.symbols.gz
+ ${NM} ${.TARGET}.tmp | ${TOOL_GZIP_N} -9 ${.TARGET}.symbols.gz
.endif
.if !defined(MDSET_NOSTRIP.${_FILENAME}) !defined(MDSET_NOSTRIP)
${STRIP} -R .eh_frame -R
CVS commit: [tls-earlyentropy] src/distrib/hppa/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:07 UTC 2014
Modified Files:
src/distrib/hppa/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/hppa/ramdisk/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/hppa/ramdisk/Makefile
diff -u src/distrib/hppa/ramdisk/Makefile:1.2 src/distrib/hppa/ramdisk/Makefile:1.2.2.1
--- src/distrib/hppa/ramdisk/Makefile:1.2 Fri Feb 28 09:50:48 2014
+++ src/distrib/hppa/ramdisk/Makefile Sun Aug 10 06:48:07 2014
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2014/02/28 09:50:48 skrll Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:48:07 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2600k
+IMAGESIZE= 3000k
MAKEFS_FLAGS= -f 15
WARNS= 1
-# DBG= -Os -mmultiple -mstring
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/ews4800mips/floppies/instkernel
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:04 UTC 2014
Modified Files:
src/distrib/ews4800mips/floppies/instkernel [tls-earlyentropy]:
Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/distrib/ews4800mips/floppies/instkernel/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/ews4800mips/floppies/instkernel/Makefile
diff -u src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5 src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5.2.1
--- src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5 Mon Jan 27 08:18:07 2014
+++ src/distrib/ews4800mips/floppies/instkernel/Makefile Sun Aug 10 06:48:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2014/08/10 06:48:04 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -20,7 +20,7 @@ ${BOOT_RAMDISK}.gz: netbsd-RAMDISK.gz ${
gunzip -c ${DESTDIR}/usr/mdec/boot_kernel.gz ${BOOT_RAMDISK}.tmp
${TOOL_MDSETIMAGE} ${BOOT_RAMDISK}.tmp netbsd-RAMDISK.gz
${ELF2ECOFF} ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff
- ${TOOL_GZIP} -9nc ${BOOT_RAMDISK}.coff ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${BOOT_RAMDISK}.coff ${.TARGET}
CLEANFILES+= ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff ${BOOT_RAMDISK}.gz
CVS commit: [tls-earlyentropy] src/distrib/rs6000
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:27 UTC 2014
Modified Files:
src/distrib/rs6000/bootfs [tls-earlyentropy]: Makefile
src/distrib/rs6000/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/rs6000/bootfs/Makefile
cvs rdiff -u -r1.6 -r1.6.24.1 src/distrib/rs6000/ramdisk/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/rs6000/bootfs/Makefile
diff -u src/distrib/rs6000/bootfs/Makefile:1.2 src/distrib/rs6000/bootfs/Makefile:1.2.2.1
--- src/distrib/rs6000/bootfs/Makefile:1.2 Mon Jan 27 08:18:07 2014
+++ src/distrib/rs6000/bootfs/Makefile Sun Aug 10 06:48:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:48:27 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -16,10 +16,10 @@ TMPKERNEL= ${.OBJDIR}/netbsd
BOOT_RELEASEDIR= installation/bootfs
${IMAGE}.gz: ${KERNEL} ${BOOTLOADER}
- ${TOOL_GZIP} -cd ${KERNEL} ${TMPKERNEL}
+ ${TOOL_GZIP_N} -cd ${KERNEL} ${TMPKERNEL}
${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} \
-b ${BOOTLOADER} -k ${TMPKERNEL} ${IMAGE}
- ${TOOL_GZIP} -9nc ${IMAGE} ${IMAGE}.tmp
+ ${TOOL_GZIP_N} -9c ${IMAGE} ${IMAGE}.tmp
mv ${IMAGE}.tmp ${.TARGET}
CLEANFILES+= ${IMAGE} ${IMAGE}.tmp ${IMAGE}.gz
Index: src/distrib/rs6000/ramdisk/Makefile
diff -u src/distrib/rs6000/ramdisk/Makefile:1.6 src/distrib/rs6000/ramdisk/Makefile:1.6.24.1
--- src/distrib/rs6000/ramdisk/Makefile:1.6 Thu Feb 11 09:06:50 2010
+++ src/distrib/rs6000/ramdisk/Makefile Sun Aug 10 06:48:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.6.24.1 2014/08/10 06:48:27 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/prep/floppies
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:25 UTC 2014
Modified Files:
src/distrib/prep/floppies/kernel-generic [tls-earlyentropy]: Makefile
src/distrib/prep/floppies/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/distrib/prep/floppies/kernel-generic/Makefile
cvs rdiff -u -r1.20 -r1.20.24.1 src/distrib/prep/floppies/ramdisk/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/prep/floppies/kernel-generic/Makefile
diff -u src/distrib/prep/floppies/kernel-generic/Makefile:1.10 src/distrib/prep/floppies/kernel-generic/Makefile:1.10.2.1
--- src/distrib/prep/floppies/kernel-generic/Makefile:1.10 Mon Jan 27 08:18:07 2014
+++ src/distrib/prep/floppies/kernel-generic/Makefile Sun Aug 10 06:48:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2014/08/10 06:48:25 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -12,7 +12,7 @@ CLEANFILES+= ${KERNEL}
${KERNEL}: ${KERN}
-rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${.ALLSRC} ${.TARGET}
realall: ${KERNEL}
Index: src/distrib/prep/floppies/ramdisk/Makefile
diff -u src/distrib/prep/floppies/ramdisk/Makefile:1.20 src/distrib/prep/floppies/ramdisk/Makefile:1.20.24.1
--- src/distrib/prep/floppies/ramdisk/Makefile:1.20 Thu Feb 11 09:06:50 2010
+++ src/distrib/prep/floppies/ramdisk/Makefile Sun Aug 10 06:48:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.20.24.1 2014/08/10 06:48:25 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/luna68k/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:13 UTC 2014
Modified Files:
src/distrib/luna68k/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/luna68k/ramdisk/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/luna68k/ramdisk/Makefile
diff -u src/distrib/luna68k/ramdisk/Makefile:1.2 src/distrib/luna68k/ramdisk/Makefile:1.2.2.1
--- src/distrib/luna68k/ramdisk/Makefile:1.2 Thu Feb 20 14:30:23 2014
+++ src/distrib/luna68k/ramdisk/Makefile Sun Aug 10 06:48:13 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/02/20 14:30:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:48:13 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 1700k
+IMAGESIZE= 1800k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: [tls-earlyentropy] src/distrib/sandpoint/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:29 UTC 2014
Modified Files:
src/distrib/sandpoint/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.10.1 src/distrib/sandpoint/ramdisk/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/sandpoint/ramdisk/Makefile
diff -u src/distrib/sandpoint/ramdisk/Makefile:1.10 src/distrib/sandpoint/ramdisk/Makefile:1.10.10.1
--- src/distrib/sandpoint/ramdisk/Makefile:1.10 Tue Aug 14 07:24:41 2012
+++ src/distrib/sandpoint/ramdisk/Makefile Sun Aug 10 06:48:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/08/14 07:24:41 martin Exp $
+# $NetBSD: Makefile,v 1.10.10.1 2014/08/10 06:48:29 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/ofppc/ramdisks/common
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:23 UTC 2014
Modified Files:
src/distrib/ofppc/ramdisks/common [tls-earlyentropy]: list.sysinst
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.50.1 src/distrib/ofppc/ramdisks/common/list.sysinst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/ofppc/ramdisks/common/list.sysinst
diff -u src/distrib/ofppc/ramdisks/common/list.sysinst:1.1 src/distrib/ofppc/ramdisks/common/list.sysinst:1.1.50.1
--- src/distrib/ofppc/ramdisks/common/list.sysinst:1.1 Wed Jan 2 11:39:03 2008
+++ src/distrib/ofppc/ramdisks/common/list.sysinst Sun Aug 10 06:48:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list.sysinst,v 1.1 2008/01/02 11:39:03 mrg Exp $
+# $NetBSD: list.sysinst,v 1.1.50.1 2014/08/10 06:48:23 tls Exp $
#
# list file (c.f. parselist.awk) for sysinst-using install media.
#
@@ -8,7 +8,7 @@
PROG sysinst
PROG usr/bin/progress
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE}
+SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE}
# XXX missing fr and es; otherwise could use MI common list.sysinst.
# Foreign texts for sysinst
CVS commit: [tls-earlyentropy] src/distrib/macppc/floppies/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:17 UTC 2014
Modified Files:
src/distrib/macppc/floppies/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.10.1 src/distrib/macppc/floppies/ramdisk/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/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.40 src/distrib/macppc/floppies/ramdisk/Makefile:1.40.10.1
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.40 Fri Mar 23 18:37:42 2012
+++ src/distrib/macppc/floppies/ramdisk/Makefile Sun Aug 10 06:48:17 2014
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.40 2012/03/23 18:37:42 he Exp $
+# $NetBSD: Makefile,v 1.40.10.1 2014/08/10 06:48:17 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2212k
+# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE
+# in both
+# src/sys/arch/macppc/conf/INSTALL
+# src/sys/arch/macppc/conf/GENERIC_MD
+IMAGESIZE= 2248k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: [tls-earlyentropy] src/distrib/notes/common
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:19 UTC 2014
Modified Files:
src/distrib/notes/common [tls-earlyentropy]: postinstall
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.2.1 src/distrib/notes/common/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.78 src/distrib/notes/common/postinstall:1.78.2.1
--- src/distrib/notes/common/postinstall:1.78 Mon Feb 24 07:23:39 2014
+++ src/distrib/notes/common/postinstall Sun Aug 10 06:48:19 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: postinstall,v 1.78 2014/02/24 07:23:39 skrll Exp $
+.\ $NetBSD: postinstall,v 1.78.2.1 2014/08/10 06:48:19 tls Exp $
.\
.\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -300,7 +300,7 @@ The X Window System
.Pp
If you installed the X Window System, you may want to read the
chapter about X in the NetBSD Guide:
-.Lk http://netbsd.org/docs/guide/en/chap-x.html
+.Lk http://www.NetBSD.org/docs/guide/en/chap-x.html
.if \n[hp300] \{\
Also, you may want to read through the
.Nx*M
CVS commit: [tls-earlyentropy] src/crypto/external/bsd
Module Name:src Committed By: tls Date: Sun Aug 10 06:47:41 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal [tls-earlyentropy]: heimdal2netbsd src/crypto/external/bsd/heimdal/bin/krb5-config [tls-earlyentropy]: Makefile src/crypto/external/bsd/heimdal/dist [tls-earlyentropy]: Makefile.am NEWS autogen.sh configure.ac src/crypto/external/bsd/heimdal/dist/admin [tls-earlyentropy]: Makefile.am add.c change.c copy.c get.c ktutil.8 ktutil.c list.c purge.c remove.c rename.c src/crypto/external/bsd/heimdal/dist/base [tls-earlyentropy]: Makefile.am array.c baselocl.h dict.c heimbase.c heimbase.h json.c test_base.c src/crypto/external/bsd/heimdal/dist/cf [tls-earlyentropy]: check-compile-et.m4 check-getpwnam_r-posix.m4 check-man.m4 db.m4 install-catman.sh make-proto.pl pthreads.m4 roken-frag.m4 src/crypto/external/bsd/heimdal/dist/doc [tls-earlyentropy]: Makefile.am ack.texi copyright.texi heimdal.texi hx509.texi intro.texi kerberos4.texi setup.texi whatis.texi win2k.texi src/crypto/external/bsd/heimdal/dist/etc [tls-earlyentropy]: Makefile.am src/crypto/external/bsd/heimdal/dist/include [tls-earlyentropy]: Makefile.am NTMakefile bits.c heim_threads.h krb5-types.cross src/crypto/external/bsd/heimdal/dist/include/gssapi [tls-earlyentropy]: Makefile.am src/crypto/external/bsd/heimdal/dist/include/hcrypto [tls-earlyentropy]: Makefile.am src/crypto/external/bsd/heimdal/dist/include/kadm5 [tls-earlyentropy]: Makefile.am src/crypto/external/bsd/heimdal/dist/kadmin [tls-earlyentropy]: Makefile.am ank.c check.c cpw.c get.c kadm_conn.c kadmin.8 kadmin.c kadmind.8 kadmind.c load.c mod.c rpc.c server.c stash.c util.c src/crypto/external/bsd/heimdal/dist/kcm [tls-earlyentropy]: Makefile.am acquire.c cache.c client.c config.c connect.c events.c glue.c kcm.8 log.c main.c protocol.c renew.c sessions.c src/crypto/external/bsd/heimdal/dist/kdc [tls-earlyentropy]: Makefile.am announce.c config.c connect.c default_config.c digest-service.c digest.c hprop.8 hprop.c hpropd.8 hpropd.c kdc-replay.c kdc.8 kdc.h kerberos5.c krb5tgs.c kstash.8 kstash.c kx509.c log.c main.c misc.c mit_dump.c pkinit.c process.c set_dbinfo.c string2key.8 string2key.c windc.c windc_plugin.h src/crypto/external/bsd/heimdal/dist/kpasswd [tls-earlyentropy]: Makefile.am kpasswd-generator.c kpasswd.1 kpasswd.c kpasswdd.8 kpasswdd.c src/crypto/external/bsd/heimdal/dist/kuser [tls-earlyentropy]: Makefile.am copy_cred_cache.1 copy_cred_cache.c kcc.c kcpytkt.c kdeltkt.c kdestroy.1 kdestroy.c kdigest.8 kdigest.c kgetcred.1 kgetcred.c kimpersonate.8 kimpersonate.c kinit.1 kinit.c klist.1 klist.c kswitch.1 kswitch.c kverify.c kvno.c src/crypto/external/bsd/heimdal/dist/lib [tls-earlyentropy]: Makefile.am NTMakefile src/crypto/external/bsd/heimdal/dist/lib/asn1 [tls-earlyentropy]: Makefile.am asn1-common.h asn1_gen.c asn1_print.c asn1parse.y check-ber.c check-common.c check-der.c check-gen.c check-timegm.c der.c der_cmp.c der_copy.c der_format.c der_free.c der_get.c der_length.c der_put.c extra.c gen.c gen_copy.c gen_decode.c gen_encode.c gen_free.c gen_glue.c gen_length.c gen_seq.c gen_template.c hash.c krb5.asn1 lex.l main.c rfc2459.asn1 template.c test.asn1 timegm.c src/crypto/external/bsd/heimdal/dist/lib/com_err [tls-earlyentropy]: Makefile.am com_err.3 compile_et.c error.c parse.y src/crypto/external/bsd/heimdal/dist/lib/gssapi [tls-earlyentropy]: Makefile.am NTMakefile gen-oid.pl gss_acquire_cred.3 gssapi.3 gssapi_mech.h gsstool.c libgssapi-exports.def oid.txt test_acquire_cred.c test_common.c test_context.c test_cred.c test_kcred.c version-script.map src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi [tls-earlyentropy]: gssapi.h gssapi_oid.h src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5 [tls-earlyentropy]: 8003.c accept_sec_context.c acquire_cred.c add_cred.c aeap.c arcfour.c cfx.c compat.c context_time.c copy_ccache.c creds.c encapsulate.c external.c import_name.c init_sec_context.c inquire_cred.c inquire_names_for_mech.c inquire_sec_context_by_oid.c prf.c process_context_token.c sequence.c set_cred_option.c set_sec_context_option.c store_cred.c test_acquire_cred.c test_cfx.c test_cred.c test_kcred.c unwrap.c verify_mic.c wrap.c
CVS commit: [tls-earlyentropy] src/distrib/sparc/miniroot
Module Name:src Committed By: tls Date: Sun Aug 10 06:48:42 UTC 2014 Modified Files: src/distrib/sparc/miniroot [tls-earlyentropy]: Makefile.inc Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/distrib/sparc/miniroot/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sparc/miniroot/Makefile.inc diff -u src/distrib/sparc/miniroot/Makefile.inc:1.20 src/distrib/sparc/miniroot/Makefile.inc:1.20.2.1 --- src/distrib/sparc/miniroot/Makefile.inc:1.20 Mon Aug 12 16:31:28 2013 +++ src/distrib/sparc/miniroot/Makefile.inc Sun Aug 10 06:48:41 2014 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.20 2013/08/12 16:31:28 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.20.2.1 2014/08/10 06:48:41 tls Exp $ -IMAGESIZE= 8192k +IMAGESIZE= 9216k DBG= -Os -fno-unwind-tables MAKEFS_FLAGS= -o density=4k IMAGEENDIAN= be
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: apb
Date: Sun Aug 10 06:48:51 UTC 2014
Modified Files:
src/sbin/disklabel: main.c
Log Message:
Fix typo in dreamcast port name.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sbin/disklabel/main.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/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.40 src/sbin/disklabel/main.c:1.41
--- src/sbin/disklabel/main.c:1.40 Sun Aug 10 05:57:31 2014
+++ src/sbin/disklabel/main.c Sun Aug 10 06:48:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.40 2014/08/10 05:57:31 matt Exp $ */
+/* $NetBSD: main.c,v 1.41 2014/08/10 06:48:51 apb Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
static char sccsid[] = @(#)disklabel.c 8.4 (Berkeley) 5/4/95;
/* from static char sccsid[] = @(#)disklabel.c 1.2 (Symmetric) 11/28/85; */
#else
-__RCSID($NetBSD: main.c,v 1.40 2014/08/10 05:57:31 matt Exp $);
+__RCSID($NetBSD: main.c,v 1.41 2014/08/10 06:48:51 apb Exp $);
#endif
#endif /* not lint */
@@ -258,7 +258,7 @@ static const struct disklabel_params {
{ prep, 1, 1, 0, 8, 2, 0, BIG_ENDIAN }, /* powerpc */
- { dreadmcast, 1, 1, 0, 16, 2, 0, LITTLE_ENDIAN }, /* sh3 */
+ { dreamcast, 1, 1, 0, 16, 2, 0, LITTLE_ENDIAN }, /* sh3 */
{ evbarm64, 1, 1, 0, 16, 2, 0, 0 }, /* aarch64 */
{ evbsh3, 1, 1, 0, 16, 2, 0, 0 }, /* sh3 */
{ evbcf, 1, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* coldfire */
CVS commit: [tls-earlyentropy] src/distrib/x68k/floppies/bootfloppy.generic
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:57 UTC 2014
Modified Files:
src/distrib/x68k/floppies/bootfloppy.generic [tls-earlyentropy]:
Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 \
src/distrib/x68k/floppies/bootfloppy.generic/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/x68k/floppies/bootfloppy.generic/Makefile
diff -u src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8 src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8.2.1
--- src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8 Mon Jan 27 08:18:07 2014
+++ src/distrib/x68k/floppies/bootfloppy.generic/Makefile Sun Aug 10 06:48:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2014/08/10 06:48:56 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -28,7 +28,7 @@ ${BOOTNAME}: ${MDEC}/boot
netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd
@rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${.ALLSRC} ${.TARGET}
.include ${DISTRIBDIR}/common/Makefile.tarfloppy
CVS commit: [tls-earlyentropy] src/distrib/zaurus/ramdisk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:49:01 UTC 2014
Modified Files:
src/distrib/zaurus/ramdisk [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/distrib/zaurus/ramdisk/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/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.16 src/distrib/zaurus/ramdisk/Makefile:1.16.4.1
--- src/distrib/zaurus/ramdisk/Makefile:1.16 Fri Jun 28 19:24:29 2013
+++ src/distrib/zaurus/ramdisk/Makefile Sun Aug 10 06:49:01 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2013/06/28 19:24:29 he Exp $
+# $NetBSD: Makefile,v 1.16.4.1 2014/08/10 06:49:01 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2212k
+IMAGESIZE= 2256k
MAKEFS_FLAGS= -f 14
WARNS= 1
CVS commit: [tls-earlyentropy] src/distrib/sparc64
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:45 UTC 2014
Modified Files:
src/distrib/sparc64/bootfs [tls-earlyentropy]: boot.cfg
src/distrib/sparc64/cdroms/installcd [tls-earlyentropy]: Makefile
etc.rc
src/distrib/sparc64/xminiroot [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/sparc64/bootfs/boot.cfg
cvs rdiff -u -r1.16 -r1.16.8.1 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/sparc64/cdroms/installcd/etc.rc
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/sparc64/xminiroot/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/sparc64/bootfs/boot.cfg
diff -u src/distrib/sparc64/bootfs/boot.cfg:1.1 src/distrib/sparc64/bootfs/boot.cfg:1.1.24.1
--- src/distrib/sparc64/bootfs/boot.cfg:1.1 Fri Apr 2 21:29:30 2010
+++ src/distrib/sparc64/bootfs/boot.cfg Sun Aug 10 06:48:45 2014
@@ -1 +1 @@
-bootpartition :a
+bootpartition=:a
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.16 src/distrib/sparc64/cdroms/installcd/Makefile:1.16.8.1
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.16 Sat Dec 22 17:51:19 2012
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Aug 10 06:48:45 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2012/12/22 17:51:19 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16.8.1 2014/08/10 06:48:45 tls Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
# for PRINTOBJDIR
.include bsd.own.mk
-SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
CDRELEASE_NOISOS= true
CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs ${PRINTOBJDIR}
@@ -36,6 +36,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
Index: src/distrib/sparc64/cdroms/installcd/etc.rc
diff -u src/distrib/sparc64/cdroms/installcd/etc.rc:1.1 src/distrib/sparc64/cdroms/installcd/etc.rc:1.1.24.1
--- src/distrib/sparc64/cdroms/installcd/etc.rc:1.1 Sun Apr 18 12:58:57 2010
+++ src/distrib/sparc64/cdroms/installcd/etc.rc Sun Aug 10 06:48:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: etc.rc,v 1.1 2010/04/18 12:58:57 martin Exp $
+# $NetBSD: etc.rc,v 1.1.24.1 2014/08/10 06:48:45 tls Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -44,8 +44,8 @@ mount -t tmpfs tmpfs /tmp
mount -t tmpfs tmpfs /var
mount -t tmpfs -o union tmpfs /etc
-# prepare important directories in the tmpfses, so dhcpcd will work
-mkdir -p /var/run /var/db
+# prepare important directories in the tmpfses, so dhcpcd and vi will work
+mkdir -p /var/run /var/db /var/tmp
# create a gettytab to autologin and run sysinst (etc/gettytab is a symlink
# to /tmp/gettytab)
Index: src/distrib/sparc64/xminiroot/Makefile
diff -u src/distrib/sparc64/xminiroot/Makefile:1.30 src/distrib/sparc64/xminiroot/Makefile:1.30.2.1
--- src/distrib/sparc64/xminiroot/Makefile:1.30 Mon Jan 27 08:18:07 2014
+++ src/distrib/sparc64/xminiroot/Makefile Sun Aug 10 06:48:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2014/08/10 06:48:45 tls Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -6,10 +6,19 @@
.include bsd.kernobj.mk
.include ${.CURDIR}/../instfs/Makefile.instfs
-IMAGE= miniroot.fs
-IMAGESIZE= 12m
-IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \
- ${DESTDIR}/usr/mdec/bootblk
+IMAGE= miniroot.fs
+NUMCYLS= 12 # size of image in MB, tune this if we need more space
+SECSPERCYL= 2048
+CYLSIZE= $$(( ${SECSPERCYL} * 512 ))
+IMAGESIZE= $$(( ${NUMCYLS} * ${CYLSIZE} ))
+IMAGEPOSTBUILD= \
+ ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \
+ ${DESTDIR}/usr/mdec/bootblk \
+ echo Creating disklabel \
+ printf 'V nsect %d\nV nhead 1\nV rpm 7200\nV pcyl %d\nV ncyl %d\na 0 %d/0/0\nc 0 %d/0/0\nd 0 %d/0/0\nW\nL\nP\n' \
+ ${SECSPERCYL} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} | \
+ ${TOOL_SUNLABEL} -nq ${IMAGE}
+
IMAGE_RELEASEDIR= installation/miniroot
CRUNCHBINDIR!= cd ${INSTFSDIR} ${PRINTOBJDIR}
@@ -23,7 +32,7 @@ ${CRUNCHBIN}: ${CRUNCHBINDIR}/${CRUNCHBI
netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd
-rm -f ${.TARGET}
- ${TOOL_GZIP} -9nc ${.ALLSRC} ${.TARGET}
+ ${TOOL_GZIP_N} -9c ${.ALLSRC} ${.TARGET}
clean: localclean
CVS commit: [tls-earlyentropy] src/distrib/vax/cdroms/installcd
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:48:55 UTC 2014
Modified Files:
src/distrib/vax/cdroms/installcd [tls-earlyentropy]: Makefile
Added Files:
src/distrib/vax/cdroms/installcd [tls-earlyentropy]: etc.rc etc.ttys
install.sh
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r0 -r1.3.2.2 src/distrib/vax/cdroms/installcd/etc.rc
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/vax/cdroms/installcd/etc.ttys \
src/distrib/vax/cdroms/installcd/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.2 src/distrib/vax/cdroms/installcd/Makefile:1.2.18.1
--- src/distrib/vax/cdroms/installcd/Makefile:1.2 Sun Jan 15 22:34:34 2012
+++ src/distrib/vax/cdroms/installcd/Makefile Sun Aug 10 06:48:55 2014
@@ -1,17 +1,97 @@
-# $NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2.18.1 2014/08/10 06:48:55 tls Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
-CDKERNELS= install.ram.gz netbsd
-CDINSTKERNEL= ../../ramdisk-kernel
+CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
+CDRELEASE_NOISOS=true
+CDMAKEFSEXTRAOPTS+=-F ./fs.spec
-#make the CD bootable
-prepare_md_post:
+CLEANFILES+= fs.spec
+
+# for PRINTOBJDIR
+.include bsd.own.mk
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+
+# prepare mutliuser install environment
+image_md_pre:
${RM} -f cdrom/boot
${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
+ ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
+ ${MKDIR} -p cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+ ${MKDIR} cdrom/etc
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+ ${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
+ ${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
+ ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
+ ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
+ for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
+ ${INSTALL} ${COPY} $$f cdrom; \
+ done
+ ${TOOL_GZIP} -d -f cdrom/netbsd.gz
+ echo '. type=dir optional' ./fs.spec
+ echo './dev type=dir optional' ./fs.spec
+ ${HOST_SH} cdrom/dev/MAKEDEV -s all | ${TOOL_SED} -e '1d' -e 's:^\./:./dev/:' ./fs.spec
+ ${MKDIR} cdrom/var
+ ${MKDIR} cdrom/kern
+# make the CD bootable
image_md_post:
${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
+CDRUNTIME+= ./bin
+CDRUNTIME+= ./dev/MAKEDEV
+CDRUNTIME+= ./etc
+CDRUNTIME+= ./lib
+CDRUNTIME+= ./libdata
+CDRUNTIME+= ./libexec
+CDRUNTIME+= ./mnt
+CDRUNTIME+= ./sbin
+# CDRUNTIME+= ./stand
+CDRUNTIME+= ./tmp
+CDRUNTIME+= ./usr/bin/ftp
+CDRUNTIME+= ./usr/bin/getopt
+CDRUNTIME+= ./usr/bin/gunzip
+CDRUNTIME+= ./usr/bin/gzcat
+CDRUNTIME+= ./usr/bin/gzip
+CDRUNTIME+= ./usr/bin/grep
+CDRUNTIME+= ./usr/bin/less
+CDRUNTIME+= ./usr/bin/more
+CDRUNTIME+= ./usr/bin/netstat
+CDRUNTIME+= ./usr/bin/progress
+CDRUNTIME+= ./usr/bin/sed
+CDRUNTIME+= ./usr/bin/sort
+CDRUNTIME+= ./usr/bin/tip
+CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
+CDRUNTIME+= ./usr/bin/vmstat
+CDRUNTIME+= ./usr/lib/libbz2.so*
+CDRUNTIME+= ./usr/lib/libc.so*
+CDRUNTIME+= ./usr/lib/libcurses.so*
+CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libgcc_s.so*
+CDRUNTIME+= ./usr/lib/libintl.so*
+CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/liblzma.so*
+CDRUNTIME+= ./usr/lib/libterminfo.so*
+CDRUNTIME+= ./usr/lib/libutil.so*
+CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != no)
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
+CDRUNTIME+= ./usr/libexec/ld.elf_so
+CDRUNTIME+= ./usr/libexec/getty
+CDRUNTIME+= ./usr/mdec
+CDRUNTIME+= ./usr/sbin/chat
+CDRUNTIME+= ./usr/sbin/chroot
+CDRUNTIME+= ./usr/sbin/installboot
+CDRUNTIME+= ./usr/sbin/pppd
+CDRUNTIME+= ./usr/sbin/wiconfig
+CDRUNTIME+= ./usr/share/misc/terminfo.cdb
+CDRUNTIME+= ./usr/share/locale
+
.include ${.CURDIR}/../../../common/Makefile.bootcd
Added files:
Index: src/distrib/vax/cdroms/installcd/etc.rc
diff -u /dev/null src/distrib/vax/cdroms/installcd/etc.rc:1.3.2.2
--- /dev/null Sun Aug 10 06:48:55 2014
+++ src/distrib/vax/cdroms/installcd/etc.rc Sun Aug 10 06:48:55 2014
@@ -0,0 +1,79 @@
+# $NetBSD: etc.rc,v 1.3.2.2 2014/08/10 06:48:55 tls Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following
CVS commit: [tls-earlyentropy] src/distrib/utils
Module Name:src Committed By: tls Date: Sun Aug 10 06:48:53 UTC 2014 Modified Files: src/distrib/utils [tls-earlyentropy]: Makefile Removed Files: src/distrib/utils/sysinst [tls-earlyentropy]: Makefile Makefile.inc SPELLING.en TODO aout2elf.c bsddisklabel.c checkrc.c configmenu.c defs.h disks.c disks_lfs.c endian.h factor.c geom.c install.c label.c main.c mbr.c mbr.h menus.mbr menus.mi msg.mbr.de msg.mbr.en msg.mbr.es msg.mbr.fr msg.mbr.pl msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl msg_xlat.sh net.c run.c savenewlabel.c sizemultname.c target.c txtwalk.c txtwalk.h unif.awk upgrade.c util.c wskbd.c src/distrib/utils/sysinst/arch/acorn26 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/acorn32 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/alpha [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/amd64 [tls-earlyentropy]: Makefile md.c md.h src/distrib/utils/sysinst/arch/amiga [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr msg.md.de msg.md.en msg.md.es msg.md.fr src/distrib/utils/sysinst/arch/arc [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/atari [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es msg.md.de msg.md.en msg.md.es src/distrib/utils/sysinst/arch/bebox [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/cats [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/cobalt [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/emips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/evbarm [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/evbmips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/evbppc [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/evbsh3 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/ews4800mips [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/hp300 [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/hpcarm [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/hpcmips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/hpcsh [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/hppa [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/i386 [tls-earlyentropy]: Makefile md.c md.h menus.md msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/landisk [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/luna68k [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/distrib/utils/sysinst/arch/mac68k [tls-earlyentropy]: Makefile md.c
CVS commit: [tls-earlyentropy] src/etc/etc.mac68k
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:08 UTC 2014 Modified Files: src/etc/etc.mac68k [tls-earlyentropy]: Makefile.inc Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.42.1 src/etc/etc.mac68k/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.mac68k/Makefile.inc diff -u src/etc/etc.mac68k/Makefile.inc:1.20 src/etc/etc.mac68k/Makefile.inc:1.20.42.1 --- src/etc/etc.mac68k/Makefile.inc:1.20 Tue Mar 18 04:20:37 2008 +++ src/etc/etc.mac68k/Makefile.inc Sun Aug 10 06:49:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.20 2008/03/18 04:20:37 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.20.42.1 2014/08/10 06:49:08 tls Exp $ # # etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets #
CVS commit: [tls-earlyentropy] src/etc/etc.evbarm
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:49:05 UTC 2014
Modified Files:
src/etc/etc.evbarm [tls-earlyentropy]: Makefile.inc
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.2.1 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.62 src/etc/etc.evbarm/Makefile.inc:1.62.2.1
--- src/etc/etc.evbarm/Makefile.inc:1.62 Sun Mar 30 16:00:48 2014
+++ src/etc/etc.evbarm/Makefile.inc Sun Aug 10 06:49:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.62 2014/03/30 16:00:48 matt Exp $
+# $NetBSD: Makefile.inc,v 1.62.2.1 2014/08/10 06:49:05 tls Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -91,6 +91,8 @@ EVBARM_BOARDS.armv7hf+= OMAP5EVM
#EVBARM_BOARDS.armv7+= OVERO
EVBARM_BOARDS.armv7+= PANDABOARD
EVBARM_BOARDS.armv7hf+= PANDABOARD
+EVBARM_BOARDS.armv7+= KOBO
+EVBARM_BOARDS.armv7hf+= KOBO
.endif
IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR}
CVS commit: [tls-earlyentropy] src/etc/defaults
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:03 UTC 2014 Modified Files: src/etc/defaults [tls-earlyentropy]: rc.conf Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.122.8.1 src/etc/defaults/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.122 src/etc/defaults/rc.conf:1.122.8.1 --- src/etc/defaults/rc.conf:1.122 Sun Jan 13 18:47:57 2013 +++ src/etc/defaults/rc.conf Sun Aug 10 06:49:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $ +# $NetBSD: rc.conf,v 1.122.8.1 2014/08/10 06:49:03 tls Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -42,7 +42,7 @@ rc_silent_cmd=twiddle rc_rcorder_flags= # The directories searched for rc scripts. -# These directories must be part of the root filesystem. +# These directories must be part of the root file system. rc_directories=/etc/rc.d # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown. @@ -140,7 +140,7 @@ rtclocaltime=NO # NOTE: default coredump name now set in /etc/sysctl.conf # -# File system check flags; default to preen mode, checking filesystems +# File system check flags; default to preen mode, checking file systems # that are listed in /etc/fstab in parallel as the fsck pass number # permits. Fix minor faults automatically, and exit with non 0 only # when major errors occur.
CVS commit: [tls-earlyentropy] src/etc/etc.macppc
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:15 UTC 2014 Modified Files: src/etc/etc.macppc [tls-earlyentropy]: Makefile.inc Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.56.1 src/etc/etc.macppc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.macppc/Makefile.inc diff -u src/etc/etc.macppc/Makefile.inc:1.8 src/etc/etc.macppc/Makefile.inc:1.8.56.1 --- src/etc/etc.macppc/Makefile.inc:1.8 Tue Jul 24 10:49:26 2007 +++ src/etc/etc.macppc/Makefile.inc Sun Aug 10 06:49:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2007/07/24 10:49:26 pavel Exp $ +# $NetBSD: Makefile.inc,v 1.8.56.1 2014/08/10 06:49:15 tls Exp $ # # etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets # @@ -6,7 +6,7 @@ # If you change the list of distributed kernels, don't forget # to update the release documentation in distrib/notes/common/contents -KERNEL_SETS= GENERIC GENERIC.MP +KERNEL_SETS= GENERIC GENERIC.MP GENERIC_601 BUILD_KERNELS+= INSTALL GENERIC_MD
CVS commit: [tls-earlyentropy] src/etc/namedb
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:21 UTC 2014 Modified Files: src/etc/namedb [tls-earlyentropy]: root.cache Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.8.1 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.17 src/etc/namedb/root.cache:1.17.8.1 --- src/etc/namedb/root.cache:1.17 Tue Jan 8 11:15:49 2013 +++ src/etc/namedb/root.cache Sun Aug 10 06:49:21 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.17 2013/01/08 11:15:49 taca Exp $ +; $NetBSD: root.cache,v 1.17.8.1 2014/08/10 06:49:21 tls Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the cache . file @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [tls-earlyentropy] src/etc/rc.d
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:49:24 UTC 2014
Modified Files:
src/etc/rc.d [tls-earlyentropy]: dhcpcd dhcpd mountall mountcritlocal
mountcritremote named network random_seed
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/etc/rc.d/dhcpcd
cvs rdiff -u -r1.6 -r1.6.70.1 src/etc/rc.d/dhcpd
cvs rdiff -u -r1.8 -r1.8.24.1 src/etc/rc.d/mountall
cvs rdiff -u -r1.13 -r1.13.24.1 src/etc/rc.d/mountcritlocal
cvs rdiff -u -r1.8 -r1.8.70.1 src/etc/rc.d/mountcritremote
cvs rdiff -u -r1.23 -r1.23.8.1 src/etc/rc.d/named
cvs rdiff -u -r1.63 -r1.63.6.1 src/etc/rc.d/network
cvs rdiff -u -r1.6 -r1.6.8.1 src/etc/rc.d/random_seed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/dhcpcd
diff -u src/etc/rc.d/dhcpcd:1.2 src/etc/rc.d/dhcpcd:1.2.4.1
--- src/etc/rc.d/dhcpcd:1.2 Tue Jun 25 13:02:53 2013
+++ src/etc/rc.d/dhcpcd Sun Aug 10 06:49:24 2014
@@ -9,6 +9,7 @@ $_rc_subr_loaded . /etc/rc.subr
name=dhcpcd
rcvar=$name
command=/sbin/$name
+extra_commands=reload
load_rc_config $name
Index: src/etc/rc.d/dhcpd
diff -u src/etc/rc.d/dhcpd:1.6 src/etc/rc.d/dhcpd:1.6.70.1
--- src/etc/rc.d/dhcpd:1.6 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/dhcpd Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: dhcpd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: dhcpd,v 1.6.70.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: dhcpd
@@ -12,8 +12,17 @@ $_rc_subr_loaded . /etc/rc.subr
name=dhcpd
rcvar=$name
command=/usr/sbin/${name}
+start_precmd=dhcpd_precmd
pidfile=/var/run/${name}.pid
-required_files=/etc/${name}.conf /var/db/${name}.leases
+required_files=/etc/${name}.conf
+
+dhcpd_precmd()
+{
+if [ ! -e /var/db/${name}.leases ]; then
+echo Creating /var/db/${name}.leases
+touch /var/db/${name}.leases
+fi
+}
load_rc_config $name
run_rc_command $1
Index: src/etc/rc.d/mountall
diff -u src/etc/rc.d/mountall:1.8 src/etc/rc.d/mountall:1.8.24.1
--- src/etc/rc.d/mountall:1.8 Sun Oct 18 21:58:37 2009
+++ src/etc/rc.d/mountall Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.8 2009/10/18 21:58:37 haad Exp $
+# $NetBSD: mountall,v 1.8.24.1 2014/08/10 06:49:24 tls Exp $
#
# REQUIRE: mountcritremote named ypbind
@@ -14,7 +14,7 @@ stop_cmd=mountall_stop
mountall_start()
{
- echo 'Mounting all filesystems...'
+ echo 'Mounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Get ZFS module loaded (and thereby, zvols created).
zfs list /dev/null 21
@@ -32,7 +32,7 @@ mountall_start()
mountall_stop()
{
- echo 'Unmounting all filesystems...'
+ echo 'Unmounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Unmount ZFS file systems.
zfs unmount -a
Index: src/etc/rc.d/mountcritlocal
diff -u src/etc/rc.d/mountcritlocal:1.13 src/etc/rc.d/mountcritlocal:1.13.24.1
--- src/etc/rc.d/mountcritlocal:1.13 Thu Jan 13 22:30:09 2011
+++ src/etc/rc.d/mountcritlocal Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.13 2011/01/13 22:30:09 haad Exp $
+# $NetBSD: mountcritlocal,v 1.13.24.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: mountcritlocal
@@ -14,7 +14,7 @@ stop_cmd=:
mountcritlocal_start()
{
- # Mount critical filesystems that are `local'
+ # Mount critical file systems that are `local'
# (as specified in $critical_filesystems_local)
# This usually includes /var.
#
Index: src/etc/rc.d/mountcritremote
diff -u src/etc/rc.d/mountcritremote:1.8 src/etc/rc.d/mountcritremote:1.8.70.1
--- src/etc/rc.d/mountcritremote:1.8 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/mountcritremote Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.8 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: mountcritremote,v 1.8.70.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: mountcritremote
@@ -14,7 +14,7 @@ stop_cmd=:
mountcritremote_start()
{
- # Mount critical filesystems that may be `remote'.
+ # Mount critical file systems that may be `remote'.
# (as specified in $critical_filesystems_remote)
# This usually includes /usr.
#
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.23 src/etc/rc.d/named:1.23.8.1
--- src/etc/rc.d/named:1.23 Mon Oct 1 18:46:43 2012
+++ src/etc/rc.d/named Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named,v 1.23 2012/10/01 18:46:43 christos Exp $
+# $NetBSD: named,v 1.23.8.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: named
@@ -63,6 +63,11 @@ named_migrate()
named_precmd()
{
+ if [ ! -e /etc/rndc.key ]; then
+ echo Generating rndc.key
+ /usr/sbin/rndc-confgen -a
+ fi
+
if [ -z $named_chrootdir ]; then
if [ ! -d /etc/namedb/keys ]; then
mkdir -m 775 /etc/namedb/keys
@@ -96,7 +101,7 @@ named_precmd()
;;
esac
- for i in null random; do
+ for i in null random urandom; do
if [
CVS commit: [tls-earlyentropy] src/external/broadcom/rpi-firmware/dist
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:28 UTC 2014 Modified Files: src/external/broadcom/rpi-firmware/dist [tls-earlyentropy]: bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 \ src/external/broadcom/rpi-firmware/dist/bootcode.bin \ src/external/broadcom/rpi-firmware/dist/fixup.dat \ src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \ src/external/broadcom/rpi-firmware/dist/start.elf \ src/external/broadcom/rpi-firmware/dist/start_cd.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/broadcom/rpi-firmware/dist/bootcode.bin Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup_cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start_cd.elf Binary files are different
CVS commit: [tls-earlyentropy] src/etc/mtree
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:17 UTC 2014 Modified Files: src/etc/mtree [tls-earlyentropy]: NetBSD.dist.base NetBSD.dist.earm NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.powerpc64 NetBSD.dist.sparc64 NetBSD.dist.tests NetBSD.dist.x86_64 special Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.135.2.1 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.1.8.1 src/etc/mtree/NetBSD.dist.earm cvs rdiff -u -r1.7 -r1.7.4.1 src/etc/mtree/NetBSD.dist.mips64eb cvs rdiff -u -r1.8 -r1.8.4.1 src/etc/mtree/NetBSD.dist.mips64el cvs rdiff -u -r1.1 -r1.1.2.1 src/etc/mtree/NetBSD.dist.powerpc64 cvs rdiff -u -r1.8 -r1.8.2.1 src/etc/mtree/NetBSD.dist.sparc64 cvs rdiff -u -r1.103 -r1.103.2.1 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.7 -r1.7.2.1 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.146 -r1.146.4.1 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.135 src/etc/mtree/NetBSD.dist.base:1.135.2.1 --- src/etc/mtree/NetBSD.dist.base:1.135 Mon Mar 31 11:25:48 2014 +++ src/etc/mtree/NetBSD.dist.base Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.135 2014/03/31 11:25:48 martin Exp $ +# $NetBSD: NetBSD.dist.base,v 1.135.2.1 2014/08/10 06:49:17 tls Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -231,7 +231,7 @@ ./usr/lib ./usr/lib/i18n ./usr/lib/lua -./usr/lib/lua/5.1 +./usr/lib/lua/5.3 ./usr/lib/pkgconfig ./usr/lib/security ./usr/libdata @@ -271,95 +271,67 @@ ./usr/share/dict/papers ./usr/share/dict/special ./usr/share/doc -./usr/share/doc/atf -./usr/share/doc/groff -./usr/share/doc/groff/mom -./usr/share/doc/html -./usr/share/doc/html/bind9 -./usr/share/doc/html/bind9/arm -./usr/share/doc/html/bzip2 -./usr/share/doc/html/groff -./usr/share/doc/html/groff/mom -./usr/share/doc/html/ntp -./usr/share/doc/html/ntp/build -./usr/share/doc/html/ntp/drivers -./usr/share/doc/html/ntp/drivers/icons -./usr/share/doc/html/ntp/drivers/scripts -./usr/share/doc/html/ntp/icons -./usr/share/doc/html/ntp/scripts -./usr/share/doc/html/postfix -./usr/share/doc/kyua-atf-compat -./usr/share/doc/kyua-cli -./usr/share/doc/kyua-testers +./usr/share/doc/papers +./usr/share/doc/papers/mckusick84-ffs +./usr/share/doc/papers/mckusick85-fsck +./usr/share/doc/papers/morris78-password ./usr/share/doc/psd -./usr/share/doc/psd/01.cacm -./usr/share/doc/psd/02.implement -./usr/share/doc/psd/03.iosys -./usr/share/doc/psd/04.uprog -./usr/share/doc/psd/05.sysman -./usr/share/doc/psd/06.Clang -./usr/share/doc/psd/07.pascal -./usr/share/doc/psd/08.f77 -./usr/share/doc/psd/09.f77io -./usr/share/doc/psd/10.gdb -./usr/share/doc/psd/11.adb -./usr/share/doc/psd/12.make -./usr/share/doc/psd/13.rcs -./usr/share/doc/psd/14.sccs -./usr/share/doc/psd/15.yacc -./usr/share/doc/psd/16.lex -./usr/share/doc/psd/17.m4 -./usr/share/doc/psd/18.gprof -./usr/share/doc/psd/19.curses -./usr/share/doc/psd/20.ipctut -./usr/share/doc/psd/21.ipc +./usr/share/doc/reference +./usr/share/doc/reference/ref1 +./usr/share/doc/reference/ref1/atf +./usr/share/doc/reference/ref1/bzip2 +./usr/share/doc/reference/ref1/config +./usr/share/doc/reference/ref1/csh +./usr/share/doc/reference/ref1/ex +./usr/share/doc/reference/ref1/gprof +./usr/share/doc/reference/ref1/kyua +./usr/share/doc/reference/ref1/kyua/kyua-atf-compat +./usr/share/doc/reference/ref1/kyua/kyua-cli +./usr/share/doc/reference/ref1/kyua/kyua-testers +./usr/share/doc/reference/ref1/mail +./usr/share/doc/reference/ref1/make +./usr/share/doc/reference/ref1/roff +./usr/share/doc/reference/ref1/roff/memacros +./usr/share/doc/reference/ref1/roff/meref +./usr/share/doc/reference/ref1/roff/msdiffs +./usr/share/doc/reference/ref1/roff/msmacros +./usr/share/doc/reference/ref1/roff/mom +./usr/share/doc/reference/ref1/roff/mom_examples +./usr/share/doc/reference/ref1/sh +./usr/share/doc/reference/ref1/vi +./usr/share/doc/reference/ref2 +./usr/share/doc/reference/ref3 +./usr/share/doc/reference/ref3/curses +./usr/share/doc/reference/ref3/sockets +./usr/share/doc/reference/ref3/sockets-advanced +./usr/share/doc/reference/ref3/sysman +./usr/share/doc/reference/ref4 +./usr/share/doc/reference/ref5 +./usr/share/doc/reference/ref5/timed +./usr/share/doc/reference/ref6 +./usr/share/doc/reference/ref6/rogue +./usr/share/doc/reference/ref6/trek +./usr/share/doc/reference/ref7 +./usr/share/doc/reference/ref7/quotas +./usr/share/doc/reference/ref8 +./usr/share/doc/reference/ref8/bind9 +./usr/share/doc/reference/ref8/bind9/arm +./usr/share/doc/reference/ref8/lpd +./usr/share/doc/reference/ref8/ntp +./usr/share/doc/reference/ref8/ntp/drivers +./usr/share/doc/reference/ref8/ntp/drivers/scripts +./usr/share/doc/reference/ref8/ntp/scripts
CVS commit: [tls-earlyentropy] src/external/cddl/osnet
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:50:29 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/fbt [tls-earlyentropy]: fbt.c
src/external/cddl/osnet/dev/sdt [tls-earlyentropy]: sdt.c
src/external/cddl/osnet/dist/tools/ctf/cvt [tls-earlyentropy]: dwarf.c
src/external/cddl/osnet/dist/uts/common/dtrace [tls-earlyentropy]:
dtrace.c
src/external/cddl/osnet/dist/uts/common/fs/zfs [tls-earlyentropy]:
zfs_vfsops.c zfs_vnops.c zvol.c
src/external/cddl/osnet/lib/libzpool [tls-earlyentropy]: Makefile
atomic.c
src/external/cddl/osnet/usr.bin/ctfdump [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.8 -r1.8.18.1 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.9 -r1.9.2.1 \
src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
cvs rdiff -u -r1.27 -r1.27.2.1 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
cvs rdiff -u -r1.17 -r1.17.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r1.1 -r1.1.6.1 src/external/cddl/osnet/lib/libzpool/atomic.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/external/cddl/osnet/usr.bin/ctfdump/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/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.15 src/external/cddl/osnet/dev/fbt/fbt.c:1.15.2.1
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.15 Wed Mar 19 11:14:12 2014
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sun Aug 10 06:50:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.15 2014/03/19 11:14:12 ozaki-r Exp $ */
+/* $NetBSD: fbt.c,v 1.15.2.1 2014/08/10 06:50:28 tls Exp $ */
/*
* CDDL HEADER START
@@ -153,7 +153,7 @@ static void fbt_resume(void *, dtrace_id
static const struct cdevsw fbt_cdevsw = {
fbt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter,
+ nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
D_OTHER
};
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.8 src/external/cddl/osnet/dev/sdt/sdt.c:1.8.18.1
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.8 Sat Jul 30 10:12:14 2011
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sun Aug 10 06:50:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.c,v 1.8 2011/07/30 10:12:14 uebayasi Exp $ */
+/* $NetBSD: sdt.c,v 1.8.18.1 2014/08/10 06:50:28 tls Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ static void sdt_load(void *);
static const struct cdevsw sdt_cdevsw = {
sdt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter,
+ nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
D_OTHER
};
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.9 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.9.2.1
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.9 Sun Mar 9 20:48:01 2014
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Sun Aug 10 06:50:28 2014
@@ -1924,7 +1924,6 @@ should_have_dwarf(Elf *elf)
char *name;
name = elf_strptr(elf, shdr.sh_link, sym.st_name);
-fprintf(stderr, name = %s\n, name);
/* Studio emits these local symbols regardless */
if ((strcmp(name, Bbss.bss) != 0)
@@ -1995,15 +1994,29 @@ dw_read(tdata_t *td, Elf *elf, char *fil
addrsz, offsz, NULL, nxthdr, dw.dw_err)) != DW_DLV_OK)
terminate(rc = %d %s\n, rc, dwarf_errmsg(dw.dw_err));
- if ((cu = die_sibling(dw, NULL)) == NULL ||
- (((child = die_child(dw, cu)) == NULL)
- should_have_dwarf(elf))) {
- terminate(file does not contain dwarf type data
- (try compiling with -g)\n);
- } else if (child == NULL) {
- return (0);
+ if ((cu = die_sibling(dw, NULL)) == NULL)
+ goto out;
+
+ if ((child = die_child(dw, cu)) == NULL) {
+ Dwarf_Unsigned lang;
+ if (die_unsigned(dw, cu, DW_AT_language, lang, 0)) {
+ debug(1, DWARF language: %u\n, lang);
+ /*
+ * Assembly languages are typically that.
+ * They have some dwarf info, but not what
+ * we expect. They have local symbols for
+ * example, but they are missing the child info.
+ */
+ if (lang = DW_LANG_lo_user)
+return 0;
+ }
+ if (should_have_dwarf(elf))
+ goto out;
}
+ if (child == NULL)
+ return (0);
+
dw.dw_maxoff = nxthdr - 1;
if (dw.dw_maxoff TID_FILEMAX)
@@ -2044,4 +2057,7 @@ dw_read(tdata_t *td, Elf *elf, char *fil
/* leak the dwarf_t */
return (0);
+out:
+ terminate(file does not
CVS commit: [tls-earlyentropy] src/external/lgpl3/gmp
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:50:49 UTC 2014
Modified Files:
src/external/lgpl3/gmp/dist [tls-earlyentropy]: configfsf.guess
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb [tls-earlyentropy]:
Makefile.inc config.h
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el [tls-earlyentropy]:
Makefile.inc config.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
src/external/lgpl3/gmp/dist/configfsf.guess
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
cvs rdiff -u -r1.4 -r1.4.2.1 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc
cvs rdiff -u -r1.4 -r1.4.2.1 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/dist/configfsf.guess
diff -u src/external/lgpl3/gmp/dist/configfsf.guess:1.1.1.2 src/external/lgpl3/gmp/dist/configfsf.guess:1.1.1.2.2.1
--- src/external/lgpl3/gmp/dist/configfsf.guess:1.1.1.2 Fri Nov 29 07:49:47 2013
+++ src/external/lgpl3/gmp/dist/configfsf.guess Sun Aug 10 06:50:49 2014
@@ -158,14 +158,28 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
case ${UNAME_MACHINE_ARCH} in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
+ coldfire) machine=m5407-unknown ;;
+ earm*eb*) machine=armeb-unknown ;;
+ earm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
+ # to ELF recently, or will in the future and ABI.
case ${UNAME_MACHINE_ARCH} in
+ coldfire) os=netbsdelf ;;
+ earm*)
+ eval $set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ os=netbsdelf-eabi
+ else
+ os=netbsdelf-eabihf
+ fi
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2/dev/null \
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.5 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.5.2.1
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.5 Wed Dec 4 00:49:18 2013
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc Sun Aug 10 06:50:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2013/12/04 00:49:18 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5.2.1 2014/08/10 06:50:49 tls Exp $
SRCS+= \
random.c \
@@ -174,6 +174,24 @@ C_SRCS_LIST= \
sbpi1_div_r_sec.c mpn/generic/sbpi1_div_sec.c \
andn_n.c mpn/generic/logops_n.c \
+.if (defined(CPUFLAGS) !empty(CPUFLAGS:M-mabi=64))
+GMP_LIMB_BITS=64
+C_SRCS_LIST= \
+ xor_n.c mpn/generic/logops_n.c \
+ sb_div_r_sec.c mpn/generic/sb_div_sec.c \
+ nand_n.c mpn/generic/logops_n.c \
+ nior_n.c mpn/generic/logops_n.c \
+ hamdist.c mpn/generic/popham.c \
+ popcount.c mpn/generic/popham.c \
+ sbpi1_div_qr_sec.c mpn/generic/sbpi1_div_sec.c \
+ and_n.c mpn/generic/logops_n.c \
+ ior_n.c mpn/generic/logops_n.c \
+ sb_div_qr_sec.c mpn/generic/sb_div_sec.c \
+ xnor_n.c mpn/generic/logops_n.c \
+ iorn_n.c mpn/generic/logops_n.c \
+ sbpi1_div_r_sec.c mpn/generic/sbpi1_div_sec.c \
+ andn_n.c mpn/generic/logops_n.c \
+
ASM_SRCS_LIST= \
sqr_diagonal.asm mpn/mips64/sqr_diagonal.asm \
add_n.asm mpn/mips64/add_n.asm \
@@ -185,10 +203,35 @@ ASM_SRCS_LIST= \
addmul_1.asm mpn/mips64/addmul_1.asm \
sub_n.asm mpn/mips64/sub_n.asm \
-.if (defined(CPUFLAGS) !empty(CPUFLAGS:M-mabi=64))
-GMP_LIMB_BITS=64
.else
GMP_LIMB_BITS=32
+C_SRCS_LIST= \
+ xor_n.c mpn/generic/logops_n.c \
+ sb_div_r_sec.c mpn/generic/sb_div_sec.c \
+ nand_n.c mpn/generic/logops_n.c \
+ nior_n.c mpn/generic/logops_n.c \
+ hamdist.c mpn/generic/popham.c \
+ popcount.c mpn/generic/popham.c \
+ sbpi1_div_qr_sec.c mpn/generic/sbpi1_div_sec.c \
+ and_n.c mpn/generic/logops_n.c \
+ ior_n.c mpn/generic/logops_n.c \
+ sb_div_qr_sec.c mpn/generic/sb_div_sec.c \
+ xnor_n.c mpn/generic/logops_n.c \
+ iorn_n.c mpn/generic/logops_n.c \
+ sbpi1_div_r_sec.c mpn/generic/sbpi1_div_sec.c \
+ andn_n.c mpn/generic/logops_n.c \
+ addn_n.c mpn/generic/add_n.c \
+ submul_1.c mpn/generic/submul_1.c \
+ lshift.c mpn/generic/lshift.c \
+ mul_1.c mpn/generic/mul_1.c \
+ rshift.c mpn/generic/rshift.c \
+ sub_n.c mpn/generic/sub_n.c \
+ addmul_1.c mpn/generic/addmul_1.c \
+
+ASM_SRCS_LIST=
+
.endif
COPTS+= -Wno-error
+
+COPTS+= -Wno-error
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h
CVS commit: [tls-earlyentropy] src/external/realtek/urtwn
Module Name:src Committed By: tls Date: Sun Aug 10 06:51:04 UTC 2014 Modified Files: src/external/realtek/urtwn [tls-earlyentropy]: Makefile Added Files: src/external/realtek/urtwn/dist [tls-earlyentropy]: rtl8188eufw.bin Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.12.1 src/external/realtek/urtwn/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/external/realtek/urtwn/dist/rtl8188eufw.bin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/realtek/urtwn/Makefile diff -u src/external/realtek/urtwn/Makefile:1.1 src/external/realtek/urtwn/Makefile:1.1.12.1 --- src/external/realtek/urtwn/Makefile:1.1 Thu Jun 14 04:14:36 2012 +++ src/external/realtek/urtwn/Makefile Sun Aug 10 06:51:04 2014 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2012/06/14 04:14:36 riz Exp $ +# $NetBSD: Makefile,v 1.1.12.1 2014/08/10 06:51:04 tls Exp $ NOMAN= # define -FILES= dist/Realtek-Firmware-License.txt dist/rtl8192cfw.bin +FILES= dist/Realtek-Firmware-License.txt +FILES+= dist/rtl8188eufw.bin +FILES+= dist/rtl8192cfw.bin FILES+= dist/rtl8192cfwU.bin FILESDIR= /libdata/firmware/if_urtwn Added files: Index: src/external/realtek/urtwn/dist/rtl8188eufw.bin Binary files are different
CVS commit: [tls-earlyentropy] src/external/mit
Module Name:src Committed By: tls Date: Sun Aug 10 06:50:58 UTC 2014 Modified Files: src/external/mit/lua/dist [tls-earlyentropy]: Makefile README src/external/mit/lua/dist/doc [tls-earlyentropy]: contents.html lua.1 lua.css luac.1 manual.css manual.html readme.html src/external/mit/lua/dist/src [tls-earlyentropy]: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lvm.c lvm.h lzio.c lzio.h src/external/mit/lua/lib/liblua [tls-earlyentropy]: Makefile shlib_version src/external/mit/lua/usr.bin/luac [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/glxgears [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/glxinfo [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xauth [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xkill [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xlsclients [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xrdb [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xset [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xterm [tls-earlyentropy]: Makefile src/external/mit/xorg/bin/xvinfo [tls-earlyentropy]: Makefile src/external/mit/xorg/etc/etc.dreamcast [tls-earlyentropy]: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc [tls-earlyentropy]: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm [tls-earlyentropy]: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh src/external/mit/xorg/etc/etc.zaurus [tls-earlyentropy]: xorg.conf.C3x00 xorg.conf.C7x0 src/external/mit/xorg/lib [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri [tls-earlyentropy]: dri.mk src/external/mit/xorg/lib/dri/i915 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/i965 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/libmesa [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/r128 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/r200 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/r300 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/r600 [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/radeon [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/s3v [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/swrast [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/dri/tdfx [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/fontconfig/etc [tls-earlyentropy]: fonts.conf src/external/mit/xorg/lib/fontconfig/src [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libGL [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libGLU [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libIntelXvMC [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libOSMesa [tls-earlyentropy]: Makefile libmesa.mk src/external/mit/xorg/lib/libX11 [tls-earlyentropy]: Makefile.libx11 src/external/mit/xorg/lib/libXi [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libdrm_intel [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/libdrm_radeon [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/pixman [tls-earlyentropy]: Makefile src/external/mit/xorg/lib/xkeyboard-config/rules [tls-earlyentropy]: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols [tls-earlyentropy]: Makefile src/external/mit/xorg/server/drivers/xf86-video-ati [tls-earlyentropy]: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel [tls-earlyentropy]: Makefile src/external/mit/xorg/server/drivers/xf86-video-radeon [tls-earlyentropy]: Makefile src/external/mit/xorg/share/fonts [tls-earlyentropy]: Makefile.bdf src/external/mit/xorg/share/fonts/encodings [tls-earlyentropy]: Makefile.enc src/external/mit/xorg/tools [tls-earlyentropy]: Makefile src/external/mit/xorg/tools/glsl [tls-earlyentropy]: Makefile.glslsrcs Added Files: src/external/mit/lua/dist/doc [tls-earlyentropy]: alert.png
CVS commit: [tls-earlyentropy] src/games/rogue
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:12 UTC 2014
Modified Files:
src/games/rogue [tls-earlyentropy]: Makefile
src/games/rogue/USD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/games/rogue/Makefile
cvs rdiff -u -r1.5 -r1.5.6.1 src/games/rogue/USD.doc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rogue/Makefile
diff -u src/games/rogue/Makefile:1.18 src/games/rogue/Makefile:1.18.2.1
--- src/games/rogue/Makefile:1.18 Sun Aug 11 03:44:27 2013
+++ src/games/rogue/Makefile Sun Aug 10 06:51:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/08/11 03:44:27 dholland Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2014/08/10 06:51:12 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= rogue
@@ -12,9 +12,7 @@ HIDEGAME=hidegame
SETGIDGAME=yes
MAN= rogue.6
-.if make(install)
SUBDIR+=USD.doc
-.endif
.include bsd.prog.mk
.include bsd.subdir.mk
Index: src/games/rogue/USD.doc/Makefile
diff -u src/games/rogue/USD.doc/Makefile:1.5 src/games/rogue/USD.doc/Makefile:1.5.6.1
--- src/games/rogue/USD.doc/Makefile:1.5 Sun Feb 17 12:17:40 2013
+++ src/games/rogue/USD.doc/Makefile Sun Aug 10 06:51:12 2014
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2013/02/17 12:17:40 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2014/08/10 06:51:12 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= usd/30.rogue
+SECTION=reference/ref6
+ARTICLE=rogue
SRCS= rogue.me
MACROS= -me
-
-paper.ps: ${SRCS}
- ${TOOL_TBL} ${SRCS} | ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_TBL=yes
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/games/phantasia
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:10 UTC 2014
Modified Files:
src/games/phantasia [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.6.1 src/games/phantasia/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/phantasia/Makefile
diff -u src/games/phantasia/Makefile:1.36 src/games/phantasia/Makefile:1.36.6.1
--- src/games/phantasia/Makefile:1.36 Sat Feb 16 17:00:21 2013
+++ src/games/phantasia/Makefile Sun Aug 10 06:51:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/02/16 17:00:21 jmcneill Exp $
+# $NetBSD: Makefile,v 1.36.6.1 2014/08/10 06:51:10 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include bsd.own.mk
@@ -53,6 +53,6 @@ map: map.c
.include bsd.prog.mk
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45 ${MACHINE_ARCH} == vax
+.if defined(HAVE_GCC) ${MACHINE_ARCH} == vax
COPTS.misc.c+= -O0
.endif
CVS commit: [tls-earlyentropy] src/games/tetris
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:14 UTC 2014
Modified Files:
src/games/tetris [tls-earlyentropy]: screen.c shapes.c tetris.6
tetris.c tetris.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.18.1 src/games/tetris/screen.c
cvs rdiff -u -r1.8 -r1.8.22.1 src/games/tetris/shapes.c
cvs rdiff -u -r1.11 -r1.11.60.1 src/games/tetris/tetris.6
cvs rdiff -u -r1.24 -r1.24.18.1 src/games/tetris/tetris.c
cvs rdiff -u -r1.12 -r1.12.22.1 src/games/tetris/tetris.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/tetris/screen.c
diff -u src/games/tetris/screen.c:1.27 src/games/tetris/screen.c:1.27.18.1
--- src/games/tetris/screen.c:1.27 Mon Oct 3 12:32:28 2011
+++ src/games/tetris/screen.c Sun Aug 10 06:51:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.27 2011/10/03 12:32:28 roy Exp $ */
+/* $NetBSD: screen.c,v 1.27.18.1 2014/08/10 06:51:14 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -94,6 +94,20 @@ moveto(int r, int c)
putpad(buf);
}
+static void
+setcolor(int c)
+{
+ char *buf;
+ if (nocolor == 1)
+ return;
+ if (set_a_foreground == NULL)
+ return;
+
+ buf = tiparm(set_a_foreground, c == 7 ? 0 : c);
+ if (buf != NULL)
+ putpad(buf);
+}
+
/*
* Set up from termcap.
*/
@@ -312,6 +326,7 @@ scr_update(void)
/* draw */
putpad(enter_standout_mode);
+ setcolor(nextshape-color);
moveto(r, 2*c);
putstr( );
for(i=0; i3; i++) {
@@ -349,7 +364,14 @@ scr_update(void)
exit_standout_mode);
cur_so = so;
}
+setcolor(so);
+#ifdef DEBUG
+char buf[3];
+snprintf(buf, sizeof(buf), %d%d, so, so);
+putstr(buf);
+#else
putstr( );
+#endif
} else
putstr(so ? XX : );
ccol = i + 1;
Index: src/games/tetris/shapes.c
diff -u src/games/tetris/shapes.c:1.8 src/games/tetris/shapes.c:1.8.22.1
--- src/games/tetris/shapes.c:1.8 Mon May 25 04:33:53 2009
+++ src/games/tetris/shapes.c Sun Aug 10 06:51:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shapes.c,v 1.8 2009/05/25 04:33:53 dholland Exp $ */
+/* $NetBSD: shapes.c,v 1.8.22.1 2014/08/10 06:51:14 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -53,25 +53,25 @@
#define BR B_COLS+1 /* bottom right */
const struct shape shapes[] = {
- /* 0*/ { 7, { TL, TC, MR, } },
- /* 1*/ { 8, { TC, TR, ML, } },
- /* 2*/ { 9, { ML, MR, BC, } },
- /* 3*/ { 3, { TL, TC, ML, } },
- /* 4*/ { 12, { ML, BL, MR, } },
- /* 5*/ { 15, { ML, BR, MR, } },
- /* 6*/ { 18, { ML, MR, 2 } }, /* sticks out */
- /* 7*/ { 0, { TC, ML, BL, } },
- /* 8*/ { 1, { TC, MR, BR, } },
- /* 9*/ { 10, { TC, MR, BC, } },
- /*10*/ { 11, { TC, ML, MR, } },
- /*11*/ { 2, { TC, ML, BC, } },
- /*12*/ { 13, { TC, BC, BR, } },
- /*13*/ { 14, { TR, ML, MR, } },
- /*14*/ { 4, { TL, TC, BC, } },
- /*15*/ { 16, { TR, TC, BC, } },
- /*16*/ { 17, { TL, MR, ML, } },
- /*17*/ { 5, { TC, BC, BL, } },
- /*18*/ { 6, { TC, BC, 2*B_COLS } } /* sticks out */
+ /* 0*/ { 7, 7, { TL, TC, MR, } },
+ /* 1*/ { 1, 8, { TC, TR, ML, } },
+ /* 2*/ { 2, 9, { ML, MR, BC, } },
+ /* 3*/ { 3, 3, { TL, TC, ML, } },
+ /* 4*/ { 4, 12, { ML, BL, MR, } },
+ /* 5*/ { 5, 15, { ML, BR, MR, } },
+ /* 6*/ { 6, 18, { ML, MR, 2 } }, /* sticks out */
+ /* 7*/ { 7, 0, { TC, ML, BL, } },
+ /* 8*/ { 1, 1, { TC, MR, BR, } },
+ /* 9*/ { 2, 10, { TC, MR, BC, } },
+ /*10*/ { 2, 11, { TC, ML, MR, } },
+ /*11*/ { 2, 2, { TC, ML, BC, } },
+ /*12*/ { 4, 13, { TC, BC, BR, } },
+ /*13*/ { 4, 14, { TR, ML, MR, } },
+ /*14*/ { 4, 4, { TL, TC, BC, } },
+ /*15*/ { 5, 16, { TR, TC, BC, } },
+ /*16*/ { 5, 17, { TL, MR, ML, } },
+ /*17*/ { 5, 5, { TC, BC, BL, } },
+ /*18*/ { 6, 6, { TC, BC, 2*B_COLS } } /* sticks out */
};
/*
@@ -97,6 +97,7 @@ void
place(const struct shape *shape, int pos, int onoff)
{
const int *o = shape-off;
+ onoff = onoff ? shape-color : 0;
board[pos] = onoff;
board[pos + *o++] = onoff;
Index: src/games/tetris/tetris.6
diff -u src/games/tetris/tetris.6:1.11 src/games/tetris/tetris.6:1.11.60.1
--- src/games/tetris/tetris.6:1.11 Thu Sep 15 02:09:42 2005
+++ src/games/tetris/tetris.6 Sun Aug 10 06:51:14 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: tetris.6,v 1.11 2005/09/15 02:09:42 wiz Exp $
+.\ $NetBSD: tetris.6,v 1.11.60.1 2014/08/10 06:51:14 tls Exp $
.\
.\ Copyright (c) 1992, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ @(#)tetris.6 8.1 (Berkeley) 5/31/93
.\
-.Dd May 31, 1993
+.Dd July 13, 2014
.Dt TETRIS 6
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd the game of tetris
.Sh SYNOPSIS
.Nm
-.Op Fl ps
+.Op Fl bps
.Op Fl k Ar keys
.Op Fl l Ar level
.Sh DESCRIPTION
@@ -73,6 +73,11 @@ quit
.Pp
The options are as follows:
.Bl -tag -width indent
+.It Fl b
+By default, shapes are displayed colorfully if the user's CRT supports color.
+The
+.Fl b
+option can be used to restore the traditional black-and-white behavior.
.It Fl k
The
CVS commit: [tls-earlyentropy] src/games/trek
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:17 UTC 2014
Modified Files:
src/games/trek [tls-earlyentropy]: Makefile
src/games/trek/USD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.18.1 src/games/trek/Makefile
cvs rdiff -u -r1.4 -r1.4.72.1 src/games/trek/USD.doc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/trek/Makefile
diff -u src/games/trek/Makefile:1.14 src/games/trek/Makefile:1.14.18.1
--- src/games/trek/Makefile:1.14 Tue Aug 16 11:28:18 2011
+++ src/games/trek/Makefile Sun Aug 10 06:51:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/08/16 11:28:18 christos Exp $
+# $NetBSD: Makefile,v 1.14.18.1 2014/08/10 06:51:17 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= trek
@@ -15,9 +15,7 @@ DPADD= ${LIBM}
LDADD= -lm
HIDEGAME=hidegame
-.if make(install)
SUBDIR+=USD.doc
-.endif
COPTS.getpar.c += -Wno-format-nonliteral
Index: src/games/trek/USD.doc/Makefile
diff -u src/games/trek/USD.doc/Makefile:1.4 src/games/trek/USD.doc/Makefile:1.4.72.1
--- src/games/trek/USD.doc/Makefile:1.4 Thu Jul 10 10:34:20 2003
+++ src/games/trek/USD.doc/Makefile Sun Aug 10 06:51:17 2014
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/07/10 10:34:20 lukem Exp $
+# $NetBSD: Makefile,v 1.4.72.1 2014/08/10 06:51:17 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= usd/31.trek
+SECTION=reference/ref6
+ARTICLE=trek
SRCS= trek.me
MACROS= -me
-
-paper.ps: ${SRCS}
- ${TOOL_TBL} ${SRCS} | ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_TBL=yes
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/gnu/usr.bin
Module Name:src Committed By: tls Date: Sun Aug 10 06:51:36 UTC 2014 Modified Files: src/gnu/usr.bin [tls-earlyentropy]: Makefile src/gnu/usr.bin/groff/contrib/mom/examples [tls-earlyentropy]: Makefile src/gnu/usr.bin/groff/contrib/mom/momdoc [tls-earlyentropy]: Makefile Removed Files: src/gnu/usr.bin/gcc4 [tls-earlyentropy]: Makefile Makefile.backend Makefile.frontend Makefile.inc Makefile.libcpp src/gnu/usr.bin/gcc4/arch/alpha [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/arm [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/armeb [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/hppa [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/i386 [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/m68000 [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/m68k [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/mips64eb [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/mips64el [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/mipseb [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/mipsel [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/powerpc [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/powerpc64 [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/sh3eb [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/sh3el [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/sparc [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/sparc64 [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/vax [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/arch/x86_64 [tls-earlyentropy]: auto-host.h bconfig.h config.h configargs.h defs.mk gencheck.h gthr-default.h multilib.h tm.h src/gnu/usr.bin/gcc4/backend [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/cc1 [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/cc1obj [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/cc1plus [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/cpp [tls-earlyentropy]: Makefile cpp-contrib.1 cpp.1 src/gnu/usr.bin/gcc4/frontend [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/g++ [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/gcc [tls-earlyentropy]: Makefile gcc-contrib.1 gcc.1 src/gnu/usr.bin/gcc4/gcov [tls-earlyentropy]: Makefile gcov-contrib.1 gcov.1 src/gnu/usr.bin/gcc4/host-libiberty [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/include [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/libcpp [tls-earlyentropy]: Makefile src/gnu/usr.bin/gcc4/libcpp/arch/alpha [tls-earlyentropy]: config.h src/gnu/usr.bin/gcc4/libcpp/arch/arm [tls-earlyentropy]: config.h src/gnu/usr.bin/gcc4/libcpp/arch/armeb [tls-earlyentropy]: config.h
CVS commit: [tls-earlyentropy] src/gnu/lib
Module Name:src Committed By: tls Date: Sun Aug 10 06:51:28 UTC 2014 Removed Files: src/gnu/lib/crtstuff4 [tls-earlyentropy]: Makefile crtbegin.c crtbeginS.c crtbeginT.c crtend.c crtendS.c src/gnu/lib/crtstuff4/arch [tls-earlyentropy]: alpha.mk arm.mk armeb.mk hppa.mk i386.mk ia64.mk m68000.mk m68k.mk mips64eb.mk mips64el.mk mipseb.mk mipsel.mk powerpc.mk powerpc64.mk sh3eb.mk sh3el.mk sparc.mk sparc64.mk vax.mk x86_64.mk src/gnu/lib/libgcc4 [tls-earlyentropy]: Makefile Makefile.inc Makefile.srcs Makefile.wrapper src/gnu/lib/libgcc4/arch [tls-earlyentropy]: alpha.mk arm.mk armeb.mk hppa.mk i386.mk ia64.mk m68000.mk m68k.mk mips64eb.mk mips64el.mk mipseb.mk mipsel.mk powerpc.mk powerpc64.mk sh3eb.mk sh3el.mk sparc.mk sparc64.mk vax.mk x86_64.mk src/gnu/lib/libgcc4/arch/mips64eb [tls-earlyentropy]: dp-bit.c fp-bit.c libs.libgcc.srcs.mk libs.libgcc.tmplsrcs.tmplasmsrcs.mk libs.libgcc.tmplsrcs.tmplfpsrcs.mk libs.libgcc.tmplsrcs.tmplsrcs.mk libs.libgcc_eh.srcs.mk libs.libgcc_eh.tmplsrcs.tmplasmsrcs.mk libs.libgcc_eh.tmplsrcs.tmplfpsrcs.mk libs.libgcc_eh.tmplsrcs.tmplsrcs.mk libs.libgcc_s.srcs.mk libs.libgcc_s.tmplsrcs.tmplasmsrcs.mk libs.libgcc_s.tmplsrcs.tmplfpsrcs.mk libs.libgcc_s.tmplsrcs.tmplsrcs.mk libs.libgcov.srcs.mk libs.libgcov.tmplsrcs.tmplasmsrcs.mk libs.libgcov.tmplsrcs.tmplfpsrcs.mk libs.libgcov.tmplsrcs.tmplsrcs.mk srcs.copts.mk srcs.cppflags.mk srcs.tmplsrcs.mk tp-bit.c src/gnu/lib/libgcc4/libgcc [tls-earlyentropy]: Makefile src/gnu/lib/libgcc4/libgcc_eh [tls-earlyentropy]: Makefile src/gnu/lib/libgcc4/libgcc_s [tls-earlyentropy]: Makefile src/gnu/lib/libgcc4/libgcov [tls-earlyentropy]: Makefile src/gnu/lib/libgcc4/libgcov/arch/alpha [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/arm [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/armeb [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/hppa [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/i386 [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/m68000 [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/m68k [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/mips64eb [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/mips64el [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/mipseb [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/mipsel [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/powerpc [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/powerpc64 [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/sh3eb [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/sh3el [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/sparc [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/sparc64 [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/vax [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libgcc4/libgcov/arch/x86_64 [tls-earlyentropy]: defs.mk gcov-iov.h src/gnu/lib/libobjc4 [tls-earlyentropy]: Makefile defs.mk src/gnu/lib/libobjc4/arch/alpha [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/arm [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/armeb [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/hppa [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/i386 [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/m68000 [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/m68k [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/mips64eb [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/mips64el [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/mipseb [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/mipsel [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/powerpc [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/powerpc64 [tls-earlyentropy]: config.h defs.mk src/gnu/lib/libobjc4/arch/sh3eb [tls-earlyentropy]: config.h
CVS commit: [tls-earlyentropy] src/include/rpc
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:38 UTC 2014
Modified Files:
src/include/rpc [tls-earlyentropy]: clnt.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.18.1 src/include/rpc/clnt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/rpc/clnt.h
diff -u src/include/rpc/clnt.h:1.21 src/include/rpc/clnt.h:1.21.18.1
--- src/include/rpc/clnt.h:1.21 Tue Aug 30 17:06:20 2011
+++ src/include/rpc/clnt.h Sun Aug 10 06:51:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt.h,v 1.21 2011/08/30 17:06:20 plunky Exp $ */
+/* $NetBSD: clnt.h,v 1.21.18.1 2014/08/10 06:51:38 tls Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -451,14 +451,10 @@ struct rpc_createerr {
struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
};
-#ifdef _REENTRANT
__BEGIN_DECLS
extern struct rpc_createerr *__rpc_createerr(void);
__END_DECLS
#define rpc_createerr (*(__rpc_createerr()))
-#else
-extern struct rpc_createerr rpc_createerr;
-#endif /* _REENTRANT */
/*
* The simplified interface:
CVS commit: [tls-earlyentropy] src/lib/csu
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:43 UTC 2014
Modified Files:
src/lib/csu [tls-earlyentropy]: Makefile README
src/lib/csu/arch/earm [tls-earlyentropy]: crtbegin.h
src/lib/csu/common [tls-earlyentropy]: compident.S crtbegin.c
sysident.S
Removed Files:
src/lib/csu/common_elf [tls-earlyentropy]: Makefile.inc common.c
common.h crti.c crtn.c dot_init.h dwarf2_eh.h
src/lib/csu/ia64 [tls-earlyentropy]: Makefile crt0.c dot_init.h
src/lib/csu/m68k_elf [tls-earlyentropy]: Makefile crt0.c dot_init.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/lib/csu/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/csu/README
cvs rdiff -u -r1.1 -r1.1.4.1 src/lib/csu/arch/earm/crtbegin.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/lib/csu/common/compident.S \
src/lib/csu/common/sysident.S
cvs rdiff -u -r1.8 -r1.8.2.1 src/lib/csu/common/crtbegin.c
cvs rdiff -u -r1.35 -r0 src/lib/csu/common_elf/Makefile.inc
cvs rdiff -u -r1.17 -r0 src/lib/csu/common_elf/common.c
cvs rdiff -u -r1.16 -r0 src/lib/csu/common_elf/common.h
cvs rdiff -u -r1.6 -r0 src/lib/csu/common_elf/crti.c
cvs rdiff -u -r1.3 -r0 src/lib/csu/common_elf/crtn.c \
src/lib/csu/common_elf/dot_init.h src/lib/csu/common_elf/dwarf2_eh.h
cvs rdiff -u -r1.2 -r0 src/lib/csu/ia64/Makefile
cvs rdiff -u -r1.4 -r0 src/lib/csu/ia64/crt0.c
cvs rdiff -u -r1.6 -r0 src/lib/csu/ia64/dot_init.h
cvs rdiff -u -r1.7 -r0 src/lib/csu/m68k_elf/Makefile
cvs rdiff -u -r1.13 -r0 src/lib/csu/m68k_elf/crt0.c
cvs rdiff -u -r1.6 -r0 src/lib/csu/m68k_elf/dot_init.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/Makefile
diff -u src/lib/csu/Makefile:1.33 src/lib/csu/Makefile:1.33.2.1
--- src/lib/csu/Makefile:1.33 Tue Sep 10 16:45:33 2013
+++ src/lib/csu/Makefile Sun Aug 10 06:51:42 2014
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/09/10 16:45:33 matt Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2014/08/10 06:51:42 tls Exp $
.include bsd.own.mk
-.if ${USE_COMPILERCRTSTUFF} != yes
-
CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
.if !empty(CSU_MACHINE_ARCH:Mearm*)
@@ -18,28 +16,5 @@ ARCHDIR:= ${.CURDIR}/arch/${MACHINE_CPU}
.PATH: ${ARCHDIR}
-. include ${ARCHDIR}/Makefile.inc
-
-. include ${.CURDIR}/common/Makefile.inc
-
-.else
-
-CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
-
-. if exists(${CSU_MACHINE_ARCH}_elf/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}_elf
-. elif exists(${CSU_MACHINE_ARCH}/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}
-. elif exists(${MACHINE_CPU}_elf/Makefile)
-SUBDIR= ${MACHINE_CPU}_elf
-. elif exists(${MACHINE_CPU}/Makefile)
-SUBDIR= ${MACHINE_CPU}
-. else
-.BEGIN:
- @echo no SUBDIR for ${MACHINE_ARCH}_elf, ${MACHINE_ARCH} nor \
- ${MACHINE_CPU}
- @false
-. endif
-
-. include bsd.subdir.mk
-.endif
+.include ${ARCHDIR}/Makefile.inc
+.include ${.CURDIR}/common/Makefile.inc
Index: src/lib/csu/README
diff -u src/lib/csu/README:1.5 src/lib/csu/README:1.5.4.1
--- src/lib/csu/README:1.5 Sat Jul 13 09:48:26 2013
+++ src/lib/csu/README Sun Aug 10 06:51:42 2014
@@ -1,8 +1,6 @@
Introduction
-This document covers the native NetBSD compiler runtime. The full support
-for the native runtime is enabled by setting USE_COMPILERCRTSTUFF to no
-in bsd.own.mk.
+This document covers the native NetBSD compiler runtime.
Machine independent sources can be found in common. The crtbegin.c in
that directory is a useful template for deriving compact assembler
Index: src/lib/csu/arch/earm/crtbegin.h
diff -u src/lib/csu/arch/earm/crtbegin.h:1.1 src/lib/csu/arch/earm/crtbegin.h:1.1.4.1
--- src/lib/csu/arch/earm/crtbegin.h:1.1 Thu Jun 27 21:24:39 2013
+++ src/lib/csu/arch/earm/crtbegin.h Sun Aug 10 06:51:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/06/27 21:24:39 matt Exp $ */
+/* $NetBSD: crtbegin.h,v 1.1.4.1 2014/08/10 06:51:42 tls Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@ static void __do_global_ctors_aux(void)
static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
#endif
-#ifndef SHARED
+#if !defined(SHARED) !defined(__ARM_DWARF_EH__)
static const void *find_exidx(void *, int *) __used;
static const void *
@@ -47,4 +47,4 @@ find_exidx(void * pc, int * pcount)
}
__weak_alias(__gnu_Uwind_find_exidx,find_exidx)
-#endif /* !SHARED */
+#endif /* !SHARED !__ARM_DWARF_EH__ */
Index: src/lib/csu/common/compident.S
diff -u src/lib/csu/common/compident.S:1.2 src/lib/csu/common/compident.S:1.2.2.1
--- src/lib/csu/common/compident.S:1.2 Wed Feb 26 14:54:50 2014
+++ src/lib/csu/common/compident.S Sun Aug 10 06:51:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compident.S,v 1.2 2014/02/26 14:54:50 martin Exp $ */
+/* $NetBSD: compident.S,v 1.2.2.1 2014/08/10 06:51:42 tls Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -63,3 +63,4 @@
.long
CVS commit: [tls-earlyentropy] src/include/ssp
Module Name:src Committed By: tls Date: Sun Aug 10 06:51:40 UTC 2014 Modified Files: src/include/ssp [tls-earlyentropy]: string.h Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.2.1 src/include/ssp/string.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/ssp/string.h diff -u src/include/ssp/string.h:1.9 src/include/ssp/string.h:1.9.2.1 --- src/include/ssp/string.h:1.9 Thu Nov 7 02:00:54 2013 +++ src/include/ssp/string.h Sun Aug 10 06:51:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: string.h,v 1.9 2013/11/07 02:00:54 christos Exp $ */ +/* $NetBSD: string.h,v 1.9.2.1 2014/08/10 06:51:40 tls Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -31,6 +31,7 @@ #ifndef _SSP_STRING_H_ #define _SSP_STRING_H_ +#include sys/cdefs.h #include ssp/ssp.h __BEGIN_DECLS @@ -82,6 +83,7 @@ __ssp_bos_icheck3_restrict(memcpy, void __ssp_bos_icheck3(memmove, void *, const void *) __ssp_bos_icheck3(memset, void *, int) __ssp_bos_icheck2_restrict(stpcpy, char *, const char *) +__ssp_bos_icheck3_restrict(stpncpy, char *, const char *) __ssp_bos_icheck2_restrict(strcpy, char *, const char *) __ssp_bos_icheck2_restrict(strcat, char *, const char *) __ssp_bos_icheck3_restrict(strncpy, char *, const char *) @@ -92,6 +94,9 @@ __END_DECLS #define memmove(dst, src, len) __ssp_bos_check3(memmove, dst, src, len) #define memset(dst, val, len) __ssp_bos_check3(memset, dst, val, len) #define stpcpy(dst, src) __ssp_bos_check2(stpcpy, dst, src) +#if __GNUC_PREREQ__(4,8) || defined(__clang__) +#define stpncpy(dst, src, len) __ssp_bos_check3(stpncpy, dst, src, len) +#endif #define strcpy(dst, src) __ssp_bos_check2(strcpy, dst, src) #define strcat(dst, src) __ssp_bos_check2(strcat, dst, src) #define strncpy(dst, src, len) __ssp_bos_check3(strncpy, dst, src, len)
CVS commit: [tls-earlyentropy] src/lib/libbz2
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:45 UTC 2014
Modified Files:
src/lib/libbz2 [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.8.1 src/lib/libbz2/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/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.17 src/lib/libbz2/Makefile:1.17.8.1
--- src/lib/libbz2/Makefile:1.17 Mon May 7 08:51:47 2012
+++ src/lib/libbz2/Makefile Sun Aug 10 06:51:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/05/07 08:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17.8.1 2014/08/10 06:51:45 tls Exp $
USE_FORT?= yes # data driven bugs?
@@ -27,7 +27,7 @@ COPTS.blocksort.c+= -fno-loop-optimize
.endif
.if ${MKSHARE} != no
-FILESDIR= ${HTMLDOCDIR}/bzip2
+FILESDIR= /usr/share/doc/reference/ref1/bzip2
FILES= manual.html
.endif
CVS commit: [tls-earlyentropy] src/lib/libcurses
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:54 UTC 2014
Modified Files:
src/lib/libcurses [tls-earlyentropy]: Makefile addnstr.c
src/lib/libcurses/PSD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.8.1 src/lib/libcurses/Makefile
cvs rdiff -u -r1.13 -r1.13.6.1 src/lib/libcurses/addnstr.c
cvs rdiff -u -r1.10 -r1.10.74.1 src/lib/libcurses/PSD.doc/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/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.68 src/lib/libcurses/Makefile:1.68.8.1
--- src/lib/libcurses/Makefile:1.68 Sat Apr 21 14:39:35 2012
+++ src/lib/libcurses/Makefile Sun Aug 10 06:51:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2012/04/21 14:39:35 roy Exp $
+# $NetBSD: Makefile,v 1.68.8.1 2014/08/10 06:51:54 tls Exp $
# @(#)Makefile 8.2 (Berkeley) 1/2/94
.include bsd.own.mk
@@ -176,9 +176,7 @@ MLINKS+= curses_addch.3 addch.3 curses_a
curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \
curses_underscore.3 wunderscore.3 curses_line.3 wvline.3
-.if make(install)
SUBDIR+= PSD.doc
-.endif
fileio.h: shlib_version genfileioh.awk
${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk ${.CURDIR}/shlib_version ${.CURDIR}/fileio.h
Index: src/lib/libcurses/addnstr.c
diff -u src/lib/libcurses/addnstr.c:1.13 src/lib/libcurses/addnstr.c:1.13.6.1
--- src/lib/libcurses/addnstr.c:1.13 Fri Sep 28 06:07:05 2012
+++ src/lib/libcurses/addnstr.c Sun Aug 10 06:51:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: addnstr.c,v 1.13 2012/09/28 06:07:05 blymn Exp $ */
+/* $NetBSD: addnstr.c,v 1.13.6.1 2014/08/10 06:51:54 tls Exp $ */
/*
* Copyright (c) 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)addnstr.c 8.2 (Berkeley) 5/4/94;
#else
-__RCSID($NetBSD: addnstr.c,v 1.13 2012/09/28 06:07:05 blymn Exp $);
+__RCSID($NetBSD: addnstr.c,v 1.13.6.1 2014/08/10 06:51:54 tls Exp $);
#endif
#endif/* not lint */
@@ -147,16 +147,11 @@ waddnstr(WINDOW *win, const char *s, int
* ncurses: if (n = 0) then at most n, else len = strlen(s)
* XCURSES: if (n != -1) then at most n, else len = strlen(s)
*
- * Also SUSv2 says these functions do not wrap nor change the
- * cursor position.
*/
if (n = 0)
for (p = s, len = 0; n-- *p++; ++len);
else
len = strlen(s);
- if (len (win-maxx - win-curx))
- len = win-maxx - win-curx;
-
return(waddbytes(win, s, (int) len));
}
Index: src/lib/libcurses/PSD.doc/Makefile
diff -u src/lib/libcurses/PSD.doc/Makefile:1.10 src/lib/libcurses/PSD.doc/Makefile:1.10.74.1
--- src/lib/libcurses/PSD.doc/Makefile:1.10 Thu Jul 10 10:34:22 2003
+++ src/lib/libcurses/PSD.doc/Makefile Sun Aug 10 06:51:54 2014
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2003/07/10 10:34:22 lukem Exp $
+# $NetBSD: Makefile,v 1.10.74.1 2014/08/10 06:51:54 tls Exp $
# from: @(#)Makefile 8.2 (Berkeley) 5/23/94
-DIR= psd/19.curses
+SECTION=reference/ref3
+ARTICLE=curses
SRCS= Master
-MACROS= -me
-OTHER= appen.A appen.B appen.C doc.I doc.II doc.III doc.IV fns.doc \
- intro.0 intro.1 intro.3 intro.4 intro.5 intro.6 \
- macros c_macros
CEXAMPLES= ex1.gr ex2.gr life.gr twinkle1.gr twinkle2.gr win_st.gr
-TBLFILES= intro.2.tbl
-EXTRA= ${OTHER} ${CEXAMPLES:R:S/$/.c/g} ${TBLFILES:R}
-
-CLEANFILES+= ${CEXAMPLES} ${TBLFILES}
+DEPSRCS=appen.A appen.B appen.C doc.I doc.II doc.III doc.IV fns.doc \
+ intro.0 intro.1 intro.2.tbl intro.3 intro.4 intro.5 intro.6 \
+ macros c_macros $(CEXAMPLES)
+MACROS= -me
+CLEANFILES+= ${CEXAMPLES} intro.2.tbl
.SUFFIXES:
.SUFFIXES: .c .gr
@@ -22,16 +20,10 @@ CLEANFILES+= ${CEXAMPLES} ${TBLFILES}
# bold font, and comments in italics.
#
-
# Don't re-run vgrind unless you want to patch the output files.
-# XXXBUILDSH: can we use TOOL_VGRIND here ?
-VFONT= /usr/libexec/vfontedpr
-.c.gr:
- ${VFONT} ${.IMPSRC} | grep -v ^'wh ${.TARGET}
-paper.ps: ${SRCS} ${OTHER} ${CEXAMPLES} ${TBLFILES}
- ${TOOL_SOELIM} -I${.CURDIR} Master | \
- ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+.c.gr:
+ ${TOOL_VFONTEDPR} ${.IMPSRC} | grep -v ^'wh ${.TARGET}
# Unfortunately our make doesn't handle single-suffix rules.
intro.2.tbl: intro.2
CVS commit: [tls-earlyentropy] src/lib/libedit
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:51:57 UTC 2014
Modified Files:
src/lib/libedit [tls-earlyentropy]: Makefile chared.c chared.h
editline.3 el.c eln.c filecomplete.c hist.h histedit.h history.c
map.c map.h parse.c read.c readline.c tty.c tty.h vi.c
src/lib/libedit/TEST [tls-earlyentropy]: tc1.c wtc1.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.8.1 src/lib/libedit/Makefile
cvs rdiff -u -r1.39 -r1.39.4.1 src/lib/libedit/chared.c
cvs rdiff -u -r1.21 -r1.21.22.1 src/lib/libedit/chared.h
cvs rdiff -u -r1.80 -r1.80.4.1 src/lib/libedit/editline.3
cvs rdiff -u -r1.72 -r1.72.6.1 src/lib/libedit/el.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/lib/libedit/eln.c
cvs rdiff -u -r1.31 -r1.31.18.1 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.13 -r1.13.18.1 src/lib/libedit/hist.h
cvs rdiff -u -r1.51 -r1.51.4.1 src/lib/libedit/histedit.h
cvs rdiff -u -r1.46 -r1.46.16.1 src/lib/libedit/history.c
cvs rdiff -u -r1.33 -r1.33.6.1 src/lib/libedit/map.c
cvs rdiff -u -r1.9 -r1.9.22.1 src/lib/libedit/map.h
cvs rdiff -u -r1.26 -r1.26.18.1 src/lib/libedit/parse.c
cvs rdiff -u -r1.70 -r1.70.4.1 src/lib/libedit/read.c
cvs rdiff -u -r1.110 -r1.110.2.1 src/lib/libedit/readline.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/lib/libedit/tty.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/lib/libedit/tty.h
cvs rdiff -u -r1.43 -r1.43.16.1 src/lib/libedit/vi.c
cvs rdiff -u -r1.5 -r1.5.22.1 src/lib/libedit/TEST/tc1.c
cvs rdiff -u -r1.6 -r1.6.16.1 src/lib/libedit/TEST/wtc1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.51 src/lib/libedit/Makefile:1.51.8.1
--- src/lib/libedit/Makefile:1.51 Fri Aug 10 12:20:10 2012
+++ src/lib/libedit/Makefile Sun Aug 10 06:51:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/08/10 12:20:10 joerg Exp $
+# $NetBSD: Makefile,v 1.51.8.1 2014/08/10 06:51:57 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -127,7 +127,7 @@ tc1: libedit.a tc1.o
.include bsd.subdir.mk
# XXX
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+.if defined(HAVE_GCC)
COPTS.editline.c+= -Wno-cast-qual
COPTS.tokenizer.c+= -Wno-cast-qual
COPTS.tokenizern.c+= -Wno-cast-qual
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.39 src/lib/libedit/chared.c:1.39.4.1
--- src/lib/libedit/chared.c:1.39 Fri Jul 12 22:39:50 2013
+++ src/lib/libedit/chared.c Sun Aug 10 06:51:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $ */
+/* $NetBSD: chared.c,v 1.39.4.1 2014/08/10 06:51:57 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)chared.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $);
+__RCSID($NetBSD: chared.c,v 1.39.4.1 2014/08/10 06:51:57 tls Exp $);
#endif
#endif /* not lint not SCCSID */
@@ -434,6 +434,8 @@ ch_init(EditLine *el)
el-el_chared.c_kill.last = el-el_chared.c_kill.buf;
el-el_chared.c_resizefun = NULL;
el-el_chared.c_resizearg = NULL;
+ el-el_chared.c_aliasfun = NULL;
+ el-el_chared.c_aliasarg = NULL;
el-el_map.current = el-el_map.key;
@@ -757,3 +759,11 @@ ch_resizefun(EditLine *el, el_zfunc_t f,
el-el_chared.c_resizearg = a;
return 0;
}
+
+protected int
+ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
+{
+ el-el_chared.c_aliasfun = f;
+ el-el_chared.c_aliasarg = a;
+ return 0;
+}
Index: src/lib/libedit/chared.h
diff -u src/lib/libedit/chared.h:1.21 src/lib/libedit/chared.h:1.21.22.1
--- src/lib/libedit/chared.h:1.21 Sat Aug 28 15:44:59 2010
+++ src/lib/libedit/chared.h Sun Aug 10 06:51:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.21 2010/08/28 15:44:59 christos Exp $ */
+/* $NetBSD: chared.h,v 1.21.22.1 2014/08/10 06:51:57 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -104,6 +104,7 @@ typedef struct c_kill_t {
} c_kill_t;
typedef void (*el_zfunc_t)(EditLine *, void *);
+typedef const char *(*el_afunc_t)(void *, const char *);
/*
* Note that we use both data structures because the user can bind
@@ -116,7 +117,9 @@ typedef struct el_chared_t {
c_vcmd_t c_vcmd;
c_macro_t c_macro;
el_zfunc_t c_resizefun;
+ el_afunc_t c_aliasfun;
void * c_resizearg;
+ void * c_aliasarg;
} el_chared_t;
@@ -165,6 +168,7 @@ protected int c_hpos(EditLine *);
protected int ch_init(EditLine *);
protected void ch_reset(EditLine *, int);
protected int ch_resizefun(EditLine *, el_zfunc_t, void *);
+protected int ch_aliasfun(EditLine *, el_afunc_t, void *);
protected int ch_enlargebufs(EditLine *, size_t);
protected void ch_end(EditLine *);
Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.80 src/lib/libedit/editline.3:1.80.4.1
--- src/lib/libedit/editline.3:1.80 Fri Jul 12 17:48:29 2013
+++ src/lib/libedit/editline.3 Sun Aug 10 06:51:57 2014
@@ -1,6
CVS commit: [tls-earlyentropy] src/lib/libexecinfo
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:00 UTC 2014 Modified Files: src/lib/libexecinfo [tls-earlyentropy]: unwind_arm_ehabi_stub.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.6.1 src/lib/libexecinfo/unwind_arm_ehabi_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libexecinfo/unwind_arm_ehabi_stub.c diff -u src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.1 src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.1.6.1 --- src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.1 Thu Apr 25 14:47:30 2013 +++ src/lib/libexecinfo/unwind_arm_ehabi_stub.c Sun Aug 10 06:52:00 2014 @@ -23,6 +23,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ + +#ifndef __ARM_DWARF_EH__ #include sys/cdefs.h #include sys/types.h #include unwind.h @@ -59,3 +61,5 @@ _Unwind_SetGR(struct _Unwind_Context *co _Unwind_VRS_Set(context, 0 /*_UVRSC_CORE*/, reg, 0 /*_UVRSD_UINT32*/, val); } + +#endif /* __ARM_DWARF_EH__ */
CVS commit: [tls-earlyentropy] src/lib/libm
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:02 UTC 2014
Modified Files:
src/lib/libm [tls-earlyentropy]: Makefile
src/lib/libm/compiler_rt [tls-earlyentropy]: Makefile.inc
src/lib/libm/src [tls-earlyentropy]: namespace.h s_modf.c
Added Files:
src/lib/libm/src [tls-earlyentropy]: s_modfl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.156.2.1 src/lib/libm/Makefile
cvs rdiff -u -r1.5 -r1.5.2.1 src/lib/libm/compiler_rt/Makefile.inc
cvs rdiff -u -r1.10 -r1.10.2.1 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.14 -r1.14.22.1 src/lib/libm/src/s_modf.c
cvs rdiff -u -r0 -r1.1.2.2 src/lib/libm/src/s_modfl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.156 src/lib/libm/Makefile:1.156.2.1
--- src/lib/libm/Makefile:1.156 Tue Apr 1 19:12:37 2014
+++ src/lib/libm/Makefile Sun Aug 10 06:52:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2014/04/01 19:12:37 christos Exp $
+# $NetBSD: Makefile,v 1.156.2.1 2014/08/10 06:52:02 tls Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -53,6 +53,7 @@ LINTFLAGS += -g
.if (${MACHINE_ARCH} == alpha)
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
+COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.elif (${MACHINE_CPU} == arm)
.PATH: ${.CURDIR}/arch/arm
COMMON_SRCS+= fenv.c s_nexttowardf.c \
@@ -177,7 +178,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
s_ilogb.c s_ilogbf.c s_ilogbl.c \
s_isinff.c s_isnanf.c s_lib_version.c s_log1p.c \
s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
- s_matherr.c s_modff.c s_nextafter.c s_nextafterl.c \
+ s_matherr.c s_modff.c s_modfl.c s_nextafter.c s_nextafterl.c \
s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
s_round.c s_roundf.c s_roundl.c s_scalbn.c \
s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
@@ -310,6 +311,8 @@ MLINKS+=j0.3 j0f.3 j0.3 j1.3 j0.3 j1f.3
MLINKS+=lgamma.3 lgammaf.3 lgamma.3 lgamma_r.3 lgamma.3 lgammaf_r.3 \
lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 gamma_r.3 \
lgamma.3 gammaf_r.3 lgamma.3 tgamma.3 lgamma.3 tgammaf.3
+MLINKS+=modf.3 modff.3 \
+ modf.3 modfl.3
MLINKS+=nextafter.3 nextafterf.3 \
nextafter.3 nextafterl.3 \
nextafter.3 nexttoward.3
Index: src/lib/libm/compiler_rt/Makefile.inc
diff -u src/lib/libm/compiler_rt/Makefile.inc:1.5 src/lib/libm/compiler_rt/Makefile.inc:1.5.2.1
--- src/lib/libm/compiler_rt/Makefile.inc:1.5 Wed Feb 26 22:37:56 2014
+++ src/lib/libm/compiler_rt/Makefile.inc Sun Aug 10 06:52:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/02/26 22:37:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5.2.1 2014/08/10 06:52:02 tls Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -28,10 +28,6 @@ GENERIC_SRCS+= \
SRCS+= ${src:R}.S
. else
SRCS+= ${src}
-.if ${HAVE_GCC:U} != 4
COPTS.${src}+= -Wno-error=missing-prototypes
-.else
-COPTS.${src}+= -Wno-missing-prototypes
-.endif
. endif
.endfor
Index: src/lib/libm/src/namespace.h
diff -u src/lib/libm/src/namespace.h:1.10 src/lib/libm/src/namespace.h:1.10.2.1
--- src/lib/libm/src/namespace.h:1.10 Tue Nov 19 19:24:34 2013
+++ src/lib/libm/src/namespace.h Sun Aug 10 06:52:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.10 2013/11/19 19:24:34 joerg Exp $ */
+/* $NetBSD: namespace.h,v 1.10.2.1 2014/08/10 06:52:02 tls Exp $ */
#define atan2 _atan2
#define atan2f _atan2f
@@ -52,6 +52,7 @@
#define floorl _floorl
#define roundl _roundl
#define fmodl _fmodl
+#define modfl _modfl
#define truncl _truncl
#define exp2l _exp2l
Index: src/lib/libm/src/s_modf.c
diff -u src/lib/libm/src/s_modf.c:1.14 src/lib/libm/src/s_modf.c:1.14.22.1
--- src/lib/libm/src/s_modf.c:1.14 Wed Jan 27 14:07:41 2010
+++ src/lib/libm/src/s_modf.c Sun Aug 10 06:52:02 2014
@@ -12,7 +12,7 @@
#include sys/cdefs.h
#if defined(LIBM_SCCS) !defined(lint)
-__RCSID($NetBSD: s_modf.c,v 1.14 2010/01/27 14:07:41 drochner Exp $);
+__RCSID($NetBSD: s_modf.c,v 1.14.22.1 2014/08/10 06:52:02 tls Exp $);
#endif
/*
@@ -30,6 +30,11 @@ __RCSID($NetBSD: s_modf.c,v 1.14 2010/0
static const double one = 1.0;
+#ifndef __HAVE_LONG_DOUBLE
+__strong_alias(_modfl, modf)
+__weak_alias(modfl, modf)
+#endif
+
double
modf(double x, double *iptr)
{
Added files:
Index: src/lib/libm/src/s_modfl.c
diff -u /dev/null src/lib/libm/src/s_modfl.c:1.1.2.2
--- /dev/null Sun Aug 10 06:52:02 2014
+++ src/lib/libm/src/s_modfl.c Sun Aug 10 06:52:02 2014
@@ -0,0 +1,109 @@
+/*-
+ * Copyright (c) 2007 David Schultz d...@freebsd.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *
CVS commit: [tls-earlyentropy] src/lib/libnpf
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:05 UTC 2014
Modified Files:
src/lib/libnpf [tls-earlyentropy]: Makefile npf.c npf.h
Added Files:
src/lib/libnpf [tls-earlyentropy]: libnpf.3
Removed Files:
src/lib/libnpf [tls-earlyentropy]: npf.3
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/lib/libnpf/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/lib/libnpf/libnpf.3
cvs rdiff -u -r1.15 -r0 src/lib/libnpf/npf.3
cvs rdiff -u -r1.28 -r1.28.2.1 src/lib/libnpf/npf.c
cvs rdiff -u -r1.25 -r1.25.2.1 src/lib/libnpf/npf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/Makefile
diff -u src/lib/libnpf/Makefile:1.4 src/lib/libnpf/Makefile:1.4.6.1
--- src/lib/libnpf/Makefile:1.4 Thu Nov 29 16:17:14 2012
+++ src/lib/libnpf/Makefile Sun Aug 10 06:52:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2012/11/29 16:17:14 christos Exp $
+# $NetBSD: Makefile,v 1.4.6.1 2014/08/10 06:52:04 tls Exp $
.include bsd.own.mk
USE_SHLIBDIR= yes
LIB= npf
-MAN= npf.3
+MAN= libnpf.3
SRCS= npf.c
Index: src/lib/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.28 src/lib/libnpf/npf.c:1.28.2.1
--- src/lib/libnpf/npf.c:1.28 Thu Feb 13 03:34:41 2014
+++ src/lib/libnpf/npf.c Sun Aug 10 06:52:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.28 2014/02/13 03:34:41 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.28.2.1 2014/08/10 06:52:04 tls Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.28 2014/02/13 03:34:41 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.28.2.1 2014/08/10 06:52:04 tls Exp $);
#include sys/types.h
#include netinet/in_systm.h
@@ -167,7 +167,7 @@ npf_config_submit(nl_config_t *ncf, int
}
if (fd) {
error = prop_dictionary_sendrecv_ioctl(npf_dict, fd,
- IOC_NPF_RELOAD, ncf-ncf_err);
+ IOC_NPF_LOAD, ncf-ncf_err);
if (error) {
prop_object_release(npf_dict);
assert(ncf-ncf_err == NULL);
@@ -179,20 +179,13 @@ npf_config_submit(nl_config_t *ncf, int
return error;
}
-nl_config_t *
-npf_config_retrieve(int fd, bool *active, bool *loaded)
+static nl_config_t *
+_npf_config_consdict(prop_dictionary_t npf_dict)
{
- prop_dictionary_t npf_dict;
nl_config_t *ncf;
- int error;
- error = prop_dictionary_recv_ioctl(fd, IOC_NPF_GETCONF, npf_dict);
- if (error) {
- return NULL;
- }
ncf = calloc(1, sizeof(*ncf));
if (ncf == NULL) {
- prop_object_release(npf_dict);
return NULL;
}
ncf-ncf_dict = npf_dict;
@@ -201,13 +194,61 @@ npf_config_retrieve(int fd, bool *active
ncf-ncf_rproc_list = prop_dictionary_get(npf_dict, rprocs);
ncf-ncf_table_list = prop_dictionary_get(npf_dict, tables);
ncf-ncf_nat_list = prop_dictionary_get(npf_dict, translation);
+ return ncf;
+}
+nl_config_t *
+npf_config_retrieve(int fd, bool *active, bool *loaded)
+{
+ prop_dictionary_t npf_dict;
+ nl_config_t *ncf;
+ int error;
+
+ error = prop_dictionary_recv_ioctl(fd, IOC_NPF_SAVE, npf_dict);
+ if (error) {
+ return NULL;
+ }
+ ncf = _npf_config_consdict(npf_dict);
+ if (ncf == NULL) {
+ prop_object_release(npf_dict);
+ return NULL;
+ }
prop_dictionary_get_bool(npf_dict, active, active);
*loaded = (ncf-ncf_rules_list != NULL);
return ncf;
}
int
+npf_config_export(const nl_config_t *ncf, const char *path)
+{
+ prop_dictionary_t npf_dict = ncf-ncf_dict;
+ int error = 0;
+
+ if (!prop_dictionary_externalize_to_file(npf_dict, path)) {
+ error = errno;
+ }
+ return error;
+}
+
+nl_config_t *
+npf_config_import(const char *path)
+{
+ prop_dictionary_t npf_dict;
+ nl_config_t *ncf;
+
+ npf_dict = prop_dictionary_internalize_from_file(path);
+ if (npf_dict) {
+ return NULL;
+ }
+ ncf = _npf_config_consdict(npf_dict);
+ if (ncf == NULL) {
+ prop_object_release(npf_dict);
+ return NULL;
+ }
+ return ncf;
+}
+
+int
npf_config_flush(int fd)
{
nl_config_t *ncf;
@@ -432,6 +473,13 @@ npf_ext_param_bool(nl_ext_t *ext, const
prop_dictionary_set_bool(extdict, key, val);
}
+void
+npf_ext_param_string(nl_ext_t *ext, const char *key, const char *val)
+{
+ prop_dictionary_t extdict = ext-nxt_dict;
+ prop_dictionary_set_cstring(extdict, key, val);
+}
+
/*
* RULE INTERFACE.
*/
@@ -1129,46 +1177,6 @@ _npf_alg_unload(nl_config_t *ncf, const
* MISC.
*/
-int
-npf_sessions_recv(int fd, const char *fpath)
-{
- prop_dictionary_t sdict;
- int error;
-
- error = prop_dictionary_recv_ioctl(fd, IOC_NPF_SESSIONS_SAVE, sdict);
- if (error) {
- return error;
- }
- if (!prop_dictionary_externalize_to_file(sdict, fpath)) {
- error = errno;
- }
- prop_object_release(sdict);
- return error;
-}
-
-int
-npf_sessions_send(int fd, const char *fpath)
-{
- prop_dictionary_t sdict;
- int error;
-
- if (fpath) {
- sdict = prop_dictionary_internalize_from_file(fpath);
- if (sdict == NULL) {
- return errno;
- }
-
CVS commit: [tls-earlyentropy] src/lib/libossaudio
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:07 UTC 2014
Modified Files:
src/lib/libossaudio [tls-earlyentropy]: ossaudio.c shlib_version
soundcard.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.8.1 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.6 -r1.6.24.1 src/lib/libossaudio/shlib_version
cvs rdiff -u -r1.22 -r1.22.8.1 src/lib/libossaudio/soundcard.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.28 src/lib/libossaudio/ossaudio.c:1.28.8.1
--- src/lib/libossaudio/ossaudio.c:1.28 Sat May 5 15:57:45 2012
+++ src/lib/libossaudio/ossaudio.c Sun Aug 10 06:52:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $ */
+/* $NetBSD: ossaudio.c,v 1.28.8.1 2014/08/10 06:52:06 tls Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $);
+__RCSID($NetBSD: ossaudio.c,v 1.28.8.1 2014/08/10 06:52:06 tls Exp $);
/*
* This is an OSS (Linux) sound API emulator.
@@ -44,6 +44,9 @@ __RCSID($NetBSD: ossaudio.c,v 1.28 2012
#include sys/audioio.h
#include sys/stat.h
#include errno.h
+#include fcntl.h
+#include stdio.h
+#include unistd.h
#include stdarg.h
#include soundcard.h
@@ -93,9 +96,17 @@ audio_ioctl(int fd, unsigned long com, v
struct audio_buf_info bufinfo;
struct count_info cntinfo;
struct audio_encoding tmpenc;
+ struct oss_sysinfo tmpsysinfo;
+ struct oss_audioinfo *tmpaudioinfo;
+ audio_device_t tmpaudiodev;
+ struct stat tmpstat;
+ dev_t devno;
+ char version[32] = 4.01;
+ char license[16] = NetBSD;
u_int u;
int idat, idata;
int retval;
+ int i;
idat = 0;
@@ -316,13 +327,21 @@ audio_ioctl(int fd, unsigned long com, v
idat |= AFMT_S8;
break;
case AUDIO_ENCODING_SLINEAR_LE:
-if (tmpenc.precision == 16)
+if (tmpenc.precision == 32)
+ idat |= AFMT_S32_LE;
+else if (tmpenc.precision == 24)
+ idat |= AFMT_S24_LE;
+else if (tmpenc.precision == 16)
idat |= AFMT_S16_LE;
else
idat |= AFMT_S8;
break;
case AUDIO_ENCODING_SLINEAR_BE:
-if (tmpenc.precision == 16)
+if (tmpenc.precision == 32)
+ idat |= AFMT_S32_BE;
+else if (tmpenc.precision == 24)
+ idat |= AFMT_S24_BE;
+else if (tmpenc.precision == 16)
idat |= AFMT_S16_BE;
else
idat |= AFMT_S8;
@@ -445,6 +464,130 @@ audio_ioctl(int fd, unsigned long com, v
cntinfo.ptr = tmpoffs.offset;
*(struct count_info *)argp = cntinfo;
break;
+ case SNDCTL_SYSINFO:
+ strncpy(tmpsysinfo.product, OSS/NetBSD, 31);
+ tmpsysinfo.product[31] = 0;
+ strncpy(tmpsysinfo.version, version, 31);
+ tmpsysinfo.version[31] = 0;
+ strncpy(tmpsysinfo.license, license, 15);
+ tmpsysinfo.license[15] = 0;
+ tmpsysinfo.versionnum = SOUND_VERSION;
+ memset(tmpsysinfo.options, 0, 8);
+ tmpsysinfo.numaudios = OSS_MAX_AUDIO_DEVS;
+ tmpsysinfo.numaudioengines = 1;
+ memset(tmpsysinfo.openedaudio, 0, 8);
+ tmpsysinfo.numsynths = 1;
+ tmpsysinfo.nummidis = -1;
+ tmpsysinfo.numtimers = -1;
+ tmpsysinfo.nummixers = 1;
+ tmpsysinfo.numcards = 1;
+ memset(tmpsysinfo.openedmidi, 0, 8);
+ *(struct oss_sysinfo *)argp = tmpsysinfo;
+ break;
+ case SNDCTL_ENGINEINFO:
+ case SNDCTL_AUDIOINFO:
+ devno = 0;
+ tmpaudioinfo = (struct oss_audioinfo*)argp;
+ if (tmpaudioinfo == NULL)
+ return EINVAL;
+ if (tmpaudioinfo-dev 0) {
+ fstat(fd, tmpstat);
+ if ((tmpstat.st_rdev 0xff00) == 0x2a00)
+devno = tmpstat.st_rdev 0xff;
+ if (devno = 0x80)
+tmpaudioinfo-dev = devno 0x7f;
+ }
+ if (tmpaudioinfo-dev 0)
+ tmpaudioinfo-dev = 0;
+
+ snprintf(tmpaudioinfo-devnode, OSS_DEVNODE_SIZE,
+ /dev/audio%d, tmpaudioinfo-dev);
+
+ retval = ioctl(fd, AUDIO_GETDEV, tmpaudiodev);
+ if (retval 0)
+ return retval;
+ retval = ioctl(fd, AUDIO_GETINFO, tmpinfo);
+ if (retval 0)
+ return retval;
+ retval = ioctl(fd, AUDIO_GETPROPS, idata);
+ if (retval 0)
+ return retval;
+ idat = DSP_CAP_TRIGGER; /* pretend we have trigger */
+ if (idata AUDIO_PROP_FULLDUPLEX)
+ idat |= DSP_CAP_DUPLEX;
+ if (idata AUDIO_PROP_MMAP)
+ idat |= DSP_CAP_MMAP;
+ idat = PCM_CAP_INPUT | PCM_CAP_OUTPUT;
+ strncpy(tmpaudioinfo-name, tmpaudiodev.name, 64);
+ tmpaudioinfo-name[63] = 0;
+ tmpaudioinfo-busy = tmpinfo.play.open;
+ tmpaudioinfo-pid = -1;
+ tmpaudioinfo-caps = idat;
+ ioctl(fd, SNDCTL_DSP_GETFMTS, tmpaudioinfo-iformats);
+ tmpaudioinfo-oformats = tmpaudioinfo-iformats;
+ tmpaudioinfo-magic = -1;
+ memset(tmpaudioinfo-cmd, 0, 64);
+ tmpaudioinfo-card_number = -1;
+ memset(tmpaudioinfo-song_name, 0, 64);
+ memset(tmpaudioinfo-label, 0, 16);
+ tmpaudioinfo-port_number = tmpinfo.play.port;
+ tmpaudioinfo-mixer_dev =
CVS commit: [tls-earlyentropy] src/lib/libpci
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:09 UTC 2014
Modified Files:
src/lib/libpci [tls-earlyentropy]: Makefile pci.3 pci.h shlib_version
Added Files:
src/lib/libpci [tls-earlyentropy]: pci_drvname.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.22.1 src/lib/libpci/Makefile
cvs rdiff -u -r1.7 -r1.7.22.1 src/lib/libpci/pci.3
cvs rdiff -u -r1.4 -r1.4.22.1 src/lib/libpci/pci.h
cvs rdiff -u -r0 -r1.1.2.2 src/lib/libpci/pci_drvname.c
cvs rdiff -u -r1.3 -r1.3.24.1 src/lib/libpci/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpci/Makefile
diff -u src/lib/libpci/Makefile:1.3 src/lib/libpci/Makefile:1.3.22.1
--- src/lib/libpci/Makefile:1.3 Mon May 24 20:31:17 2010
+++ src/lib/libpci/Makefile Sun Aug 10 06:52:09 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/05/24 20:31:17 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:52:09 tls Exp $
.include bsd.own.mk
LIB= pci
-SRCS= pci_bus.c pci_device.c pci_subr.c pci_verbose.c
+SRCS= pci_bus.c pci_device.c pci_drvname.c pci_subr.c pci_verbose.c
.PATH.c: ${NETBSDSRCDIR}/sys/dev/pci
Index: src/lib/libpci/pci.3
diff -u src/lib/libpci/pci.3:1.7 src/lib/libpci/pci.3:1.7.22.1
--- src/lib/libpci/pci.3:1.7 Fri Oct 23 15:41:58 2009
+++ src/lib/libpci/pci.3 Sun Aug 10 06:52:09 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: pci.3,v 1.7 2009/10/23 15:41:58 cegger Exp $
+.\ $NetBSD: pci.3,v 1.7.22.1 2014/08/10 06:52:09 tls Exp $
.\
.\ Copyright 2001 Wasabi Systems, Inc.
.\ All rights reserved.
@@ -33,7 +33,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd April 24, 2004
+.Dd July 24, 2014
.Dt PCI 3
.Os
.Sh NAME
@@ -59,6 +59,8 @@
.Fn pci_devinfo pcireg_t id_reg pcireg_t class_reg char *devinfo size_t len
.Ft void
.Fn pci_conf_print int pcifd u_int bus u_int dev u_int func
+.Ft int
+.Fn pci_drvname int pcifd u_int dev u_int func char *drvname size_t len
.Sh DESCRIPTION
The
.Nm
@@ -134,20 +136,35 @@ at
.Fa func .
.Fa pcifd
must be an open file descriptor to a PCI bus within the target PCI domain.
+.It Fn pci_drvname
+For the PCI bus opened on
+.Fa pcifd ,
+return the driver name for
+.Fa dev
+and
+.Fa func
+into
+.Fa drvname
+using
+.Fa len
+as the buffer length.
.El
.Sh RETURN VALUES
The
.Fn pcibus_conf_read ,
.Fn pcibus_conf_write ,
.Fn pcidev_conf_read ,
+.Fn pcidev_conf_write ,
+.Fn pci_devinfo ,
and
-.Fn pcidev_conf_write
-functions return 0 on success and -1 on failure.
+.Fn pci_drvname
+functions return 0 on success and \-1 on failure.
.Pp
The
.Fn pci_findvendor
-function returns NULL if the PCI vendor description cannot be
-found.
+function returns
+.Dv NULL
+if the PCI vendor description cannot be found.
.Sh SEE ALSO
.Xr pci 4
.Sh HISTORY
@@ -162,3 +179,7 @@ and
.Fn pci_conf_print
functions first appeared in
.Nx 1.6 .
+The
+.Fn pci_drvname
+function first appeared in
+.Nx 7.0 .
Index: src/lib/libpci/pci.h
diff -u src/lib/libpci/pci.h:1.4 src/lib/libpci/pci.h:1.4.22.1
--- src/lib/libpci/pci.h:1.4 Tue May 25 08:35:47 2010
+++ src/lib/libpci/pci.h Sun Aug 10 06:52:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.4 2010/05/25 08:35:47 pgoyette Exp $ */
+/* $NetBSD: pci.h,v 1.4.22.1 2014/08/10 06:52:09 tls Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -52,6 +52,9 @@ int pcibus_conf_write(int, u_int, u_int,
int pcidev_conf_read(int, u_int, pcireg_t *);
int pcidev_conf_write(int, u_int, pcireg_t);
+/* pci_drvname.c */
+int pci_drvname(int, u_int, u_int, char *, size_t);
+
/* pci_subr.c */
const char *pci_findvendor_real(pcireg_t);
const char *pci_findproduct_real(pcireg_t);
Index: src/lib/libpci/shlib_version
diff -u src/lib/libpci/shlib_version:1.3 src/lib/libpci/shlib_version:1.3.24.1
--- src/lib/libpci/shlib_version:1.3 Sun Jan 11 03:07:49 2009
+++ src/lib/libpci/shlib_version Sun Aug 10 06:52:09 2014
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.3 2009/01/11 03:07:49 christos Exp $
+# $NetBSD: shlib_version,v 1.3.24.1 2014/08/10 06:52:09 tls Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=2
-minor=0
+minor=1
Added files:
Index: src/lib/libpci/pci_drvname.c
diff -u /dev/null src/lib/libpci/pci_drvname.c:1.1.2.2
--- /dev/null Sun Aug 10 06:52:10 2014
+++ src/lib/libpci/pci_drvname.c Sun Aug 10 06:52:09 2014
@@ -0,0 +1,62 @@
+/* $NetBSD: pci_drvname.c,v 1.1.2.2 2014/08/10 06:52:09 tls Exp $ */
+
+/*
+ * Copyright (c) 2014 Matthew R. Green
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce
CVS commit: [tls-earlyentropy] src/lib/libquota
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:15 UTC 2014
Modified Files:
src/lib/libquota [tls-earlyentropy]: quota_kernel.c quota_nfs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.18.1 src/lib/libquota/quota_kernel.c
cvs rdiff -u -r1.2 -r1.2.18.1 src/lib/libquota/quota_nfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libquota/quota_kernel.c
diff -u src/lib/libquota/quota_kernel.c:1.4 src/lib/libquota/quota_kernel.c:1.4.18.1
--- src/lib/libquota/quota_kernel.c:1.4 Wed Feb 1 06:19:05 2012
+++ src/lib/libquota/quota_kernel.c Sun Aug 10 06:52:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_kernel.c,v 1.4 2012/02/01 06:19:05 dholland Exp $ */
+/* $NetBSD: quota_kernel.c,v 1.4.18.1 2014/08/10 06:52:15 tls Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: quota_kernel.c,v 1.4 2012/02/01 06:19:05 dholland Exp $);
+__RCSID($NetBSD: quota_kernel.c,v 1.4.18.1 2014/08/10 06:52:15 tls Exp $);
#include stdlib.h
#include err.h
@@ -220,8 +220,8 @@ __quota_kernel_delete(struct quotahandle
{
struct quotactl_args args;
- args.qc_op = QUOTACTL_DELETE;
- args.u.delete.qc_key = qk;
+ args.qc_op = QUOTACTL_DEL;
+ args.u.del.qc_key = qk;
return __quotactl(qh-qh_mountpoint, args);
}
Index: src/lib/libquota/quota_nfs.c
diff -u src/lib/libquota/quota_nfs.c:1.2 src/lib/libquota/quota_nfs.c:1.2.18.1
--- src/lib/libquota/quota_nfs.c:1.2 Mon Jan 30 06:39:26 2012
+++ src/lib/libquota/quota_nfs.c Sun Aug 10 06:52:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_nfs.c,v 1.2 2012/01/30 06:39:26 dholland Exp $ */
+/* $NetBSD: quota_nfs.c,v 1.2.18.1 2014/08/10 06:52:15 tls Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: quota_nfs.c,v 1.2 2012/01/30 06:39:26 dholland Exp $);
+__RCSID($NetBSD: quota_nfs.c,v 1.2.18.1 2014/08/10 06:52:15 tls Exp $);
#include sys/types.h
#include sys/param.h /* XXX for DEV_BSIZE */
@@ -191,6 +191,20 @@ __quota_nfs_get(struct quotahandle *qh,
free(host);
if (ret != RPC_SUCCESS) {
+ /*
+ * Remap some error codes for callers convenience:
+ * - if the file server does not support any quotas at all,
+ *return ENOENT
+ * - if the server can not be reached something is very
+ *wrong - or we are run inside a virtual rump network
+ *but querying an NFS mount from the host. Make sure
+ *to fail silently and return ENOENT as well.
+ */
+ if (ret == RPC_SYSTEMERROR
+ rpc_createerr.cf_error.re_errno == EHOSTUNREACH)
+ sverrno = ENOENT;
+ else if (sverrno == ENOTCONN)
+ sverrno = ENOENT;
errno = sverrno;
return -1;
}
CVS commit: [tls-earlyentropy] src/lib/libperfuse
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:13 UTC 2014 Modified Files: src/lib/libperfuse [tls-earlyentropy]: ops.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.2.1 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.63 src/lib/libperfuse/ops.c:1.63.2.1 --- src/lib/libperfuse/ops.c:1.63 Mon Jan 6 08:56:34 2014 +++ src/lib/libperfuse/ops.c Sun Aug 10 06:52:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.63 2014/01/06 08:56:34 manu Exp $ */ +/* $NetBSD: ops.c,v 1.63.2.1 2014/08/10 06:52:12 tls Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -1554,7 +1554,7 @@ perfuse_node_getattr_ttl(struct puffs_us struct fuse_attr_out *fao; int error = 0; - if (pnd-pnd_flags PND_REMOVED) + if ((pnd-pnd_flags PND_REMOVED) !(pnd-pnd_flags PND_OPEN)) return ENOENT; node_ref(opc);
CVS commit: [tls-earlyentropy] src/lib/librumpclient
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:20 UTC 2014
Modified Files:
src/lib/librumpclient [tls-earlyentropy]: rumpclient.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.2.1 src/lib/librumpclient/rumpclient.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.61 src/lib/librumpclient/rumpclient.c:1.61.2.1
--- src/lib/librumpclient/rumpclient.c:1.61 Thu Apr 3 17:11:35 2014
+++ src/lib/librumpclient/rumpclient.c Sun Aug 10 06:52:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.61 2014/04/03 17:11:35 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.61.2.1 2014/08/10 06:52:20 tls Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -50,7 +50,7 @@
#define USE_SIGNALFD
#endif
-__RCSID($NetBSD: rumpclient.c,v 1.61 2014/04/03 17:11:35 pooka Exp $);
+__RCSID($NetBSD: rumpclient.c,v 1.61.2.1 2014/08/10 06:52:20 tls Exp $);
#include sys/param.h
#include sys/mman.h
@@ -292,7 +292,7 @@ cliwaitresp(struct spclient *spc, struct
pfd[1].events = POLLIN;
rv = host_poll(pfd, 2, -1);
-if (pfd[1].revents POLLIN) {
+if (rv = 1 pfd[1].revents POLLIN) {
dosig = 1;
goto cleanup;
}
CVS commit: [tls-earlyentropy] src/lib/librumpvfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:29 UTC 2014
Modified Files:
src/lib/librumpvfs [tls-earlyentropy]: rump_etfs.3
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/librumpvfs/rump_etfs.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpvfs/rump_etfs.3
diff -u src/lib/librumpvfs/rump_etfs.3:1.6 src/lib/librumpvfs/rump_etfs.3:1.6.2.1
--- src/lib/librumpvfs/rump_etfs.3:1.6 Thu Dec 19 15:51:39 2013
+++ src/lib/librumpvfs/rump_etfs.3 Sun Aug 10 06:52:29 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: rump_etfs.3,v 1.6 2013/12/19 15:51:39 pooka Exp $
+.\ $NetBSD: rump_etfs.3,v 1.6.2.1 2014/08/10 06:52:29 tls Exp $
.\
.\ Copyright (c) 2010 Antti Kantee. All rights reserved.
.\
@@ -23,7 +23,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd December 19, 2013
+.Dd June 13, 2014
.Dt RUMP_ETFS 3
.Os
.Sh NAME
@@ -42,6 +42,8 @@ rump kernel (librump, \-lrump)
.Fa const char *key const char *hostpath enum rump_etfs_type ftype
.Fa uint64_t begin uint64_t size
.Fc
+.Ft void
+.Fn rump_boot_etfs_register struct rump_boot_etfs *eb
.Ft int
.Fn rump_pub_etfs_remove const char *key
.Sh DESCRIPTION
@@ -128,6 +130,56 @@ is given the special value
the underlying file is mapped from
.Ar begin
to the end of the file.
+.It Fn rump_boot_etfs_register eb
+Unlike the above interfaces,
+.Fn rump_boot_etfs_register
+can and must be called before
+.Fn rump_init .
+It causes an etfs key to be available immediately when the root file
+system is mounted as part of
+.Fn rump_init .
+The intended use is for example for firmware images to be available
+immediately when device driver autoconfiguration is run as part of
+.Fn rump_init .
+.Pp
+To use
+.Fn rump_boot_etfs_register ,
+the client fills out
+.Fa eb .
+The layout of
+.Fa eb
+is as follows:
+.Bd -literal
+struct rump_boot_etfs {
+ /* client initializes */
+ const char *eb_key;
+ const char *eb_hostpath;
+ enum rump_etfs_type eb_type;
+ uint64_t eb_begin;
+ uint64_t eb_size;
+
+ /* rump kernel initializes */
+ struct rump_boot_etfs *_eb_next;
+ int eb_status;
+};
+.Ed
+.Pp
+All of the client fields must be initialized before the call.
+See
+.Fn rump_pub_etfs_register_withsize
+for descriptions of the fields.
+After the function has been called, the client may not touch the
+structure memory or the pathname pointers.
+After
+.Fn rump_init
+returns, the client may check the status of the registration from
+.Fa eb_status
+and free the structure.
+A value of \-1 designates that the etfs registration was not
+performed, 0 designates success and a value larger than 0 designates
+an errno.
+The client must serialize calls to
+.Fn rump_boot_etfs_register .
.It Fn rump_pub_etfs_remove key
Remove etfs mapping for
.Fa key .
CVS commit: [tls-earlyentropy] src/lib/librumphijack
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:22 UTC 2014
Modified Files:
src/lib/librumphijack [tls-earlyentropy]: hijack.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.2.1 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.107 src/lib/librumphijack/hijack.c:1.107.2.1
--- src/lib/librumphijack/hijack.c:1.107 Wed Apr 2 17:09:23 2014
+++ src/lib/librumphijack/hijack.c Sun Aug 10 06:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.107 2014/04/02 17:09:23 justin Exp $ */
+/* $NetBSD: hijack.c,v 1.107.2.1 2014/08/10 06:52:22 tls Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rump/rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.107 2014/04/02 17:09:23 justin Exp $);
+__RCSID($NetBSD: hijack.c,v 1.107.2.1 2014/08/10 06:52:22 tls Exp $);
#endif
#include sys/param.h
@@ -2069,14 +2069,10 @@ REALPOLLTS(struct pollfd *fds, nfds_t nf
errno_host = parg.errnum;
/* strip cross-thread notification from real results */
- if (pfd_host[nfds].revents POLLIN) {
- assert((pfd_rump[nfds].revents POLLIN) == 0);
- assert(rv_host 0);
+ if (rv_host 0 pfd_host[nfds].revents POLLIN) {
rv_host--;
}
- if (pfd_rump[nfds].revents POLLIN) {
- assert((pfd_host[nfds].revents POLLIN) == 0);
- assert(rv_rump 0);
+ if (rv_rump 0 pfd_rump[nfds].revents POLLIN) {
rv_rump--;
}
CVS commit: [tls-earlyentropy] src/lib/libtelnet
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:32 UTC 2014 Modified Files: src/lib/libtelnet [tls-earlyentropy]: kerberos5.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.16.1 src/lib/libtelnet/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libtelnet/kerberos5.c diff -u src/lib/libtelnet/kerberos5.c:1.19 src/lib/libtelnet/kerberos5.c:1.19.16.1 --- src/lib/libtelnet/kerberos5.c:1.19 Mon Jan 9 15:25:33 2012 +++ src/lib/libtelnet/kerberos5.c Sun Aug 10 06:52:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.19 2012/01/09 15:25:33 christos Exp $ */ +/* $NetBSD: kerberos5.c,v 1.19.16.1 2014/08/10 06:52:32 tls Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -227,7 +227,8 @@ kerberos5_send(Authenticator *ap) } return (0); } - krb5_auth_con_setkeytype(telnet_context, auth_context, KEYTYPE_DES); + krb5_auth_con_setkeytype(telnet_context, auth_context, + ETYPE_DES_CBC_CRC); foo[0] = ap-type; foo[1] = ap-way;
CVS commit: [tls-earlyentropy] src/lib/libutil
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:34 UTC 2014
Modified Files:
src/lib/libutil [tls-earlyentropy]: getfsspecname.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/lib/libutil/getfsspecname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/getfsspecname.c
diff -u src/lib/libutil/getfsspecname.c:1.4 src/lib/libutil/getfsspecname.c:1.4.6.1
--- src/lib/libutil/getfsspecname.c:1.4 Tue Jan 1 18:32:17 2013
+++ src/lib/libutil/getfsspecname.c Sun Aug 10 06:52:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getfsspecname.c,v 1.4 2013/01/01 18:32:17 dsl Exp $ */
+/* $NetBSD: getfsspecname.c,v 1.4.6.1 2014/08/10 06:52:34 tls Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: getfsspecname.c,v 1.4 2013/01/01 18:32:17 dsl Exp $);
+__RCSID($NetBSD: getfsspecname.c,v 1.4.6.1 2014/08/10 06:52:34 tls Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -53,13 +53,12 @@ getfsspecname(char *buf, size_t bufsiz,
{
static const int mib[] = { CTL_HW, HW_DISKNAMES };
static const unsigned int miblen = __arraycount(mib);
- char *drives, *dk;
+ char *drives, *dk, *p;
size_t len;
- int fd, savee;
+ int fd, savee = errno;
char *vname;
- drives = NULL;
- vname = NULL;
+ p = drives = vname = NULL;
if (strncasecmp(name, NAME=, 5) != 0) {
#ifdef COMPAT_DKWEDGE
/*
@@ -129,20 +128,28 @@ search:
}
(void)close(fd);
if (strcmp(vname, (char *)dkw.dkw_wname) == 0) {
- char *p = strstr(buf, /rdk);
- if (p++ == NULL)
-return buf;
- strcpy(p, p + 1);
- free(drives);
- free(vname);
- return buf;
+ p = strstr(buf, /rdk);
+ goto good;
}
}
+#ifdef COMPAT_DKWEDGE
+ /* Last ditch effort assuming NAME=label, and label is a disk name */
+ fd = opendisk(name, O_RDONLY, buf, bufsiz, 0);
+ if (fd != -1) {
+ close(fd);
+ p = strstr(buf, /r);
+ goto good;
+ }
+#endif
savee = ESRCH;
snprintf(buf, bufsiz, no match for `%s', vname);
out:
+ buf = NULL;
+good:
+ if (p++ != NULL)
+ strcpy(p, p + 1);
free(drives);
free(vname);
errno = savee;
- return NULL;
+ return buf;
}
CVS commit: [tls-earlyentropy] src/lib/librumpuser
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:26 UTC 2014
Modified Files:
src/lib/librumpuser [tls-earlyentropy]: Makefile rumpuser.c
rumpuser_bio.c rumpuser_dl.c rumpuser_int.h rumpuser_port.h
rumpuser_pth.c rumpuser_pth_dummy.c rumpuser_sp.c
Added Files:
src/lib/librumpuser [tls-earlyentropy]: rumpfiber.c rumpfiber.h
rumpfiber_bio.c rumpfiber_sp.c rumpuser_file.c rumpuser_mem.c
rumpuser_random.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 src/lib/librumpuser/Makefile
cvs rdiff -u -r0 -r1.3.2.2 src/lib/librumpuser/rumpfiber.c
cvs rdiff -u -r0 -r1.1.2.2 src/lib/librumpuser/rumpfiber.h \
src/lib/librumpuser/rumpfiber_bio.c src/lib/librumpuser/rumpfiber_sp.c \
src/lib/librumpuser/rumpuser_file.c src/lib/librumpuser/rumpuser_mem.c
cvs rdiff -u -r1.59 -r1.59.2.1 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.7 -r1.7.6.1 src/lib/librumpuser/rumpuser_bio.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/lib/librumpuser/rumpuser_int.h
cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.40 -r1.40.2.1 src/lib/librumpuser/rumpuser_pth.c
cvs rdiff -u -r1.16 -r1.16.4.1 src/lib/librumpuser/rumpuser_pth_dummy.c
cvs rdiff -u -r0 -r1.2.2.2 src/lib/librumpuser/rumpuser_random.c
cvs rdiff -u -r1.63 -r1.63.2.1 src/lib/librumpuser/rumpuser_sp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.16 src/lib/librumpuser/Makefile:1.16.2.1
--- src/lib/librumpuser/Makefile:1.16 Thu Feb 20 00:42:27 2014
+++ src/lib/librumpuser/Makefile Sun Aug 10 06:52:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/02/20 00:42:27 pooka Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2014/08/10 06:52:25 tls Exp $
#
.include bsd.own.mk
@@ -8,8 +8,13 @@ WARNS?= 5
# rumpuser.h is in sys/rump for inclusion by kernel components
.PATH: ${.CURDIR}/../../sys/rump/include/rump
+RUMPUSER_THREADS?=pthread
+
LIB= rumpuser
+
+.if ${RUMPUSER_THREADS} == pthread
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+.endif
.for lib in ${RUMPUSER_EXTERNAL_DPLIBS}
LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
@@ -17,14 +22,32 @@ LIBDPLIBS+= ${lib} lib
CPPFLAGS+= -DLIBRUMPUSER
#CPPFLAGS+= -D_DIAGNOSTIC
-SRCS= rumpuser.c
-SRCS+= rumpuser_pth.c
-SRCS+= rumpuser_component.c rumpuser_bio.c
+
+.if ${RUMPUSER_THREADS} == pthread
+SRCS= rumpuser.c rumpuser_pth.c rumpuser_bio.c
+SRCS+= rumpuser_sp.c
+.elif ${RUMPUSER_THREADS} == none
+SRCS= rumpuser.c rumpuser_pth_dummy.c rumpuser_bio.c
+SRCS+= rumpuser_sp.c
+.elif ${RUMPUSER_THREADS} == fiber
+.if defined(RUMP_CURLWP)
+.if ${RUMP_CURLWP} != hypercall
+.error Unsupported curlwp scheme for thread model: ${RUMP_CURLWP}
+.endif
+.endif
+SRCS= rumpfiber.c rumpfiber_bio.c
+SRCS+= rumpfiber_sp.c
+.else
+.error Unsupported rumpuser threading type: ${RUMPUSER_THREADS}
+.endif
+
+SRCS+= rumpuser_component.c rumpuser_random.c
+SRCS+= rumpuser_file.c rumpuser_mem.c
SRCS+= rumpuser_errtrans.c rumpuser_sigtrans.c
# optional
-SRCS+= rumpuser_dl.c rumpuser_sp.c rumpuser_daemonize.c
+SRCS+= rumpuser_dl.c rumpuser_daemonize.c
INCSDIR= /usr/include/rump
INCS= rumpuser.h rumpuser_component.h rumpuser_port.h
@@ -33,5 +56,4 @@ MAN= rumpuser.3
CPPFLAGS+= -D_REENTRANT
-
.include bsd.lib.mk
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.59 src/lib/librumpuser/rumpuser.c:1.59.2.1
--- src/lib/librumpuser/rumpuser.c:1.59 Wed Apr 2 13:54:42 2014
+++ src/lib/librumpuser/rumpuser.c Sun Aug 10 06:52:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.59 2014/04/02 13:54:42 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.59.2.1 2014/08/10 06:52:26 tls Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,29 +28,12 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.59 2014/04/02 13:54:42 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.59.2.1 2014/08/10 06:52:26 tls Exp $);
#endif /* !lint */
-#include sys/ioctl.h
-#include sys/mman.h
-#include sys/uio.h
#include sys/stat.h
#include sys/time.h
-
-#ifdef __NetBSD__
-#include sys/disk.h
-#include sys/disklabel.h
-#include sys/dkio.h
-#endif
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || \
-defined(__DragonFly__) || defined(__APPLE__)
-#define __BSD__
-#endif
-
-#if defined(__BSD__)
-#include sys/sysctl.h
-#endif
+#include sys/types.h
#include assert.h
#include errno.h
@@ -74,27 +57,18 @@ struct rumpuser_hyperup rumpuser__hyp;
int
rumpuser_init(int version, const struct rumpuser_hyperup *hyp)
{
+ int rv;
if (version != RUMPUSER_VERSION) {
fprintf(stderr, rumpuser mismatch, kern: %d, hypervisor %d\n,
version, RUMPUSER_VERSION);
- return 1;
+ abort();
}
CVS commit: [tls-earlyentropy] src/lib/lua
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:37 UTC 2014
Modified Files:
src/lib/lua/gpio [tls-earlyentropy]: gpio.c
src/lib/lua/sqlite [tls-earlyentropy]: sqlite.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/lib/lua/gpio/gpio.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/lua/sqlite/sqlite.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/lua/gpio/gpio.c
diff -u src/lib/lua/gpio/gpio.c:1.8 src/lib/lua/gpio/gpio.c:1.8.2.1
--- src/lib/lua/gpio/gpio.c:1.8 Sat Oct 26 09:18:00 2013
+++ src/lib/lua/gpio/gpio.c Sun Aug 10 06:52:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.8 2013/10/26 09:18:00 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.8.2.1 2014/08/10 06:52:36 tls Exp $ */
/*
* Copyright (c) 2011 Marc Balmer m...@msys.ch
@@ -288,13 +288,13 @@ luaopen_gpio(lua_State* L)
};
int n;
- luaL_register(L, gpio, methods);
- luaL_register(L, NULL, gpio_methods);
+ luaL_newlib(L, methods);
+ luaL_setfuncs(L, gpio_methods, 0);
gpio_set_info(L);
/* The gpio metatable */
if (luaL_newmetatable(L, GPIO_METATABLE)) {
- luaL_register(L, NULL, gpio_methods);
+ luaL_setfuncs(L, gpio_methods, 0);
lua_pushliteral(L, __gc);
lua_pushcfunction(L, gpio_close);
Index: src/lib/lua/sqlite/sqlite.c
diff -u src/lib/lua/sqlite/sqlite.c:1.6 src/lib/lua/sqlite/sqlite.c:1.6.2.1
--- src/lib/lua/sqlite/sqlite.c:1.6 Sun Oct 27 12:38:08 2013
+++ src/lib/lua/sqlite/sqlite.c Sun Aug 10 06:52:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sqlite.c,v 1.6 2013/10/27 12:38:08 mbalmer Exp $ */
+/* $NetBSD: sqlite.c,v 1.6.2.1 2014/08/10 06:52:36 tls Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer m...@msys.ch
@@ -446,14 +446,14 @@ luaopen_sqlite(lua_State* L)
sqlite3_initialize();
- luaL_register(L, sqlite, sqlite_methods);
- luaL_register(L, NULL, db_methods);
- luaL_register(L, NULL, stmt_methods);
+ luaL_newlib(L, sqlite_methods);
+ luaL_setfuncs(L, db_methods, 0);
+ luaL_setfuncs(L, stmt_methods, 0);
gpio_set_info(L);
/* The database connection metatable */
if (luaL_newmetatable(L, SQLITE_DB_METATABLE)) {
- luaL_register(L, NULL, db_methods);
+ luaL_setfuncs(L, db_methods, 0);
lua_pushliteral(L, __gc);
lua_pushcfunction(L, db_close);
@@ -471,7 +471,7 @@ luaopen_sqlite(lua_State* L)
/* The statement metatable */
if (luaL_newmetatable(L, SQLITE_STMT_METATABLE)) {
- luaL_register(L, NULL, stmt_methods);
+ luaL_setfuncs(L, stmt_methods, 0);
lua_pushliteral(L, __gc);
lua_pushcfunction(L, stmt_finalize);
CVS commit: [tls-earlyentropy] src/libexec/httpd
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:40 UTC 2014
Modified Files:
src/libexec/httpd [tls-earlyentropy]: CHANGES Makefile auth-bozo.c
bozohttpd.c bozohttpd.h cgi-bozo.c content-bozo.c lua-bozo.c main.c
ssl-bozo.c
src/libexec/httpd/small [tls-earlyentropy]: Makefile
src/libexec/httpd/testsuite [tls-earlyentropy]: t10.out
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.21 -r1.21.2.1 src/libexec/httpd/Makefile
cvs rdiff -u -r1.12 -r1.12.2.1 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.49 -r1.49.2.1 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.32 -r1.32.2.1 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.24 -r1.24.2.1 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/libexec/httpd/content-bozo.c \
src/libexec/httpd/lua-bozo.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/libexec/httpd/main.c
cvs rdiff -u -r1.16 -r1.16.2.1 src/libexec/httpd/ssl-bozo.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/libexec/httpd/small/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.24.1 src/libexec/httpd/testsuite/t10.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.15 src/libexec/httpd/CHANGES:1.15.2.1
--- src/libexec/httpd/CHANGES:1.15 Sun Feb 2 03:13:31 2014
+++ src/libexec/httpd/CHANGES Sun Aug 10 06:52:40 2014
@@ -1,6 +1,16 @@
$eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
+changes in bozohttpd 20140717:
+ o properly handle SSL errors.
+
+changes in bozohttpd 20140708:
+ o fixes for virtual host support, from rajeev_v_pil...@yahoo.com
+ o avoid printing double errors, from s...@netbsd.org
+ o fix a security issue in basic HTTP authentication which would allow
+ authentication to be bypassed, from s...@netbsd.org
+
changes in bozohttpd 20140201:
+ o support .svg files
o fix a core dump when requests timeout
changes in bozohttpd 20140102:
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.21 src/libexec/httpd/Makefile:1.21.2.1
--- src/libexec/httpd/Makefile:1.21 Sun Feb 2 03:20:57 2014
+++ src/libexec/httpd/Makefile Sun Aug 10 06:52:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/02/02 03:20:57 mrg Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2014/08/10 06:52:40 tls Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -84,9 +84,9 @@ export-distfile:
); \
pax -wf ${TAR} ${BASE}; \
gzip -nc9 ${TAR} ${TAR}.gz; \
- bzip2 -9 ${TAR}
- @echo Exported two files in ${dir}:
- @echo ${TAR}.gz
- @echo ${TAR}.bz2
+ bzip2 -9 ${TAR}; \
+ echo Exported two files in $${dir}:; \
+ echo ${TAR}.gz; \
+ echo ${TAR}.bz2
.include bsd.prog.mk
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.12 src/libexec/httpd/auth-bozo.c:1.12.2.1
--- src/libexec/httpd/auth-bozo.c:1.12 Thu Jan 2 08:21:38 2014
+++ src/libexec/httpd/auth-bozo.c Sun Aug 10 06:52:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bozo.c,v 1.12 2014/01/02 08:21:38 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.12.2.1 2014/08/10 06:52:40 tls Exp $ */
/* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
@@ -74,7 +74,11 @@ bozo_auth_check(bozo_httpreq_t *request,
}
request-hr_authrealm = bozostrdup(httpd, dir);
- snprintf(authfile, sizeof(authfile), %s/%s, dir, AUTH_FILE);
+ if ((size_t)snprintf(authfile, sizeof(authfile), %s/%s, dir, AUTH_FILE) =
+ sizeof(authfile)) {
+ return bozo_http_error(httpd, 404, request,
+ authfile path too long);
+ }
if (stat(authfile, sb) 0) {
debug((httpd, DEBUG_NORMAL,
bozo_auth_check realm `%s' dir `%s' authfile `%s' missing,
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.49 src/libexec/httpd/bozohttpd.c:1.49.2.1
--- src/libexec/httpd/bozohttpd.c:1.49 Sun Feb 9 12:32:32 2014
+++ src/libexec/httpd/bozohttpd.c Sun Aug 10 06:52:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.49 2014/02/09 12:32:32 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.49.2.1 2014/08/10 06:52:40 tls Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -109,7 +109,7 @@
#define INDEX_HTML index.html
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE bozohttpd/20140201
+#define SERVER_SOFTWARE bozohttpd/20140717
#endif
#ifndef DIRECT_ACCESS_FILE
#define DIRECT_ACCESS_FILE .bzdirect
@@ -333,16 +333,14 @@ bozo_clean_request(bozo_httpreq_t *reque
bozo_ssl_destroy(request-hr_httpd);
/* clean up request */
-#define MF(x) if (request-x) free(request-x)
- MF(hr_remotehost);
- MF(hr_remoteaddr);
- MF(hr_serverport);
- MF(hr_virthostname);
- MF(hr_file);
- MF(hr_oldfile);
- MF(hr_query);
- MF(hr_host);
-#undef MF
+ free(request-hr_remotehost);
+ free(request-hr_remoteaddr);
+ free(request-hr_serverport);
+ free(request-hr_virthostname);
+ free(request-hr_file);
+
CVS commit: [tls-earlyentropy] src/libexec/ld.elf_so/arch/powerpc
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:42 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/powerpc [tls-earlyentropy]: ppc_reloc.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.51.2.1 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.51 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.51.2.1 --- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.51 Thu Mar 6 19:19:40 2014 +++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Sun Aug 10 06:52:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ppc_reloc.c,v 1.51 2014/03/06 19:19:40 matt Exp $ */ +/* $NetBSD: ppc_reloc.c,v 1.51.2.1 2014/08/10 06:52:42 tls Exp $ */ /*- * Copyright (C) 1998 Tsubai Masanari @@ -30,7 +30,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ppc_reloc.c,v 1.51 2014/03/06 19:19:40 matt Exp $); +__RCSID($NetBSD: ppc_reloc.c,v 1.51.2.1 2014/08/10 06:52:42 tls Exp $); #endif /* not lint */ #include stdarg.h @@ -51,7 +51,7 @@ void _rtld_powerpc_pltresolve(Elf_Word, #define __ha48 __u64(0x8000) #define __ha32 __u64(0x8000) #define __ha16 __u32(0x8000) -#define __ha(x,n) x) (n)) + ((x) __ha##n) == __ha##n) 0x) +#define __ha(x,n) x) (n)) + (((x) __ha##n) == __ha##n)) 0x) #define __hi(x,n) (((x) (n)) 0x) #ifdef __LP64 #define highesta(x) __ha(__u64(x), 48)
CVS commit: [tls-earlyentropy] src/sbin/disklabel
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:47 UTC 2014
Modified Files:
src/sbin/disklabel [tls-earlyentropy]: main.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sbin/disklabel/main.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/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.38 src/sbin/disklabel/main.c:1.38.2.1
--- src/sbin/disklabel/main.c:1.38 Mon Feb 24 07:23:40 2014
+++ src/sbin/disklabel/main.c Sun Aug 10 06:52:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $ */
+/* $NetBSD: main.c,v 1.38.2.1 2014/08/10 06:52:47 tls Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
static char sccsid[] = @(#)disklabel.c 8.4 (Berkeley) 5/4/95;
/* from static char sccsid[] = @(#)disklabel.c 1.2 (Symmetric) 11/28/85; */
#else
-__RCSID($NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $);
+__RCSID($NetBSD: main.c,v 1.38.2.1 2014/08/10 06:52:47 tls Exp $);
#endif
#endif /* not lint */
@@ -1384,7 +1384,7 @@ makedisktab(FILE *f, struct disklabel *l
did = ;
}
if (lp-d_headswitch != 0) {
- (void) fprintf(f, %shs#% PRIu16 :, did, lp-d_headswitch);
+ (void) fprintf(f, %shs#% PRIu32 :, did, lp-d_headswitch);
did = ;
}
if (lp-d_trkseek != 0) {
CVS commit: [tls-earlyentropy] src/sbin/iscsid
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:56 UTC 2014 Modified Files: src/sbin/iscsid [tls-earlyentropy]: iscsid.8 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsid/iscsid.8 diff -u src/sbin/iscsid/iscsid.8:1.10 src/sbin/iscsid/iscsid.8:1.10.2.1 --- src/sbin/iscsid/iscsid.8:1.10 Tue Mar 18 18:20:38 2014 +++ src/sbin/iscsid/iscsid.8 Sun Aug 10 06:52:56 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: iscsid.8,v 1.10 2014/03/18 18:20:38 riastradh Exp $ +.\ $NetBSD: iscsid.8,v 1.10.2.1 2014/08/10 06:52:56 tls Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 27, 2012 +.Dd July 6, 2014 .Dt ISCSID 8 .Os .Sh NAME @@ -77,6 +77,13 @@ utility, rather than directly over its c An example of setting up the in-kernel iSCSI initiator is shown in .Xr iscsictl 8 . +.Pp +.Nm +requires +.Xr scsibus 4 +and +.Xr sd 4 +compiled in the kernel to load the iscsi kernel module. .Sh SEE ALSO .Xr daemon 3 , .Xr isns 3 ,
CVS commit: [tls-earlyentropy] src/sbin/fsck_ffs
Module Name:src Committed By: tls Date: Sun Aug 10 06:52:49 UTC 2014 Modified Files: src/sbin/fsck_ffs [tls-earlyentropy]: Makefile src/sbin/fsck_ffs/SMM.doc [tls-earlyentropy]: Makefile Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.8.1 src/sbin/fsck_ffs/Makefile cvs rdiff -u -r1.3 -r1.3.94.1 src/sbin/fsck_ffs/SMM.doc/Makefile 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_ffs/Makefile diff -u src/sbin/fsck_ffs/Makefile:1.44 src/sbin/fsck_ffs/Makefile:1.44.8.1 --- src/sbin/fsck_ffs/Makefile:1.44 Fri Aug 10 12:20:11 2012 +++ src/sbin/fsck_ffs/Makefile Sun Aug 10 06:52:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2012/08/10 12:20:11 joerg Exp $ +# $NetBSD: Makefile,v 1.44.8.1 2014/08/10 06:52:49 tls Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include bsd.own.mk @@ -36,9 +36,7 @@ COPTS.ffs_appleufs.c+= -Wno-pointer-sign COPTS.pass1.c+= -fno-tree-fre -fno-tree-lrs .endif -.if make(install) SUBDIR+=SMM.doc -.endif .include bsd.prog.mk .include bsd.subdir.mk Index: src/sbin/fsck_ffs/SMM.doc/Makefile diff -u src/sbin/fsck_ffs/SMM.doc/Makefile:1.3 src/sbin/fsck_ffs/SMM.doc/Makefile:1.3.94.1 --- src/sbin/fsck_ffs/SMM.doc/Makefile:1.3 Fri Apr 5 01:45:49 1996 +++ src/sbin/fsck_ffs/SMM.doc/Makefile Sun Aug 10 06:52:49 2014 @@ -1,8 +1,12 @@ -# $NetBSD: Makefile,v 1.3 1996/04/05 01:45:49 cgd Exp $ +# $NetBSD: Makefile,v 1.3.94.1 2014/08/10 06:52:49 tls Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -DIR= smm/03.fsck_ffs +SECTION=papers +ARTICLE=mckusick85-fsck SRCS= 0.t 1.t 2.t 3.t 4.t MACROS= -ms +EXTRAHTMLFILES=\ + mckusick85-fsck1.png mckusick85-fsck2.png \ + mckusick85-fsck3.png mckusick85-fsck4.png .include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/libexec/rpc.rstatd
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:44 UTC 2014
Modified Files:
src/libexec/rpc.rstatd [tls-earlyentropy]: Makefile rstat_proc.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.60.1 src/libexec/rpc.rstatd/Makefile
cvs rdiff -u -r1.47 -r1.47.8.1 src/libexec/rpc.rstatd/rstat_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/rpc.rstatd/Makefile
diff -u src/libexec/rpc.rstatd/Makefile:1.20 src/libexec/rpc.rstatd/Makefile:1.20.60.1
--- src/libexec/rpc.rstatd/Makefile:1.20 Fri Apr 14 13:19:03 2006
+++ src/libexec/rpc.rstatd/Makefile Sun Aug 10 06:52:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/14 13:19:03 blymn Exp $
+# $NetBSD: Makefile,v 1.20.60.1 2014/08/10 06:52:44 tls Exp $
.include bsd.own.mk
@@ -10,7 +10,7 @@ SRCS = drvstats.c rstatd.c rstat_proc.c
MAN = rpc.rstatd.8
MLINKS= rpc.rstatd.8 rstatd.8
-DPADD= ${LIBRPCSVC} ${LIBKVM}
-LDADD= -lrpcsvc -lkvm
+DPADD= ${LIBRPCSVC}
+LDADD= -lrpcsvc
.include bsd.prog.mk
Index: src/libexec/rpc.rstatd/rstat_proc.c
diff -u src/libexec/rpc.rstatd/rstat_proc.c:1.47 src/libexec/rpc.rstatd/rstat_proc.c:1.47.8.1
--- src/libexec/rpc.rstatd/rstat_proc.c:1.47 Tue Jun 19 06:09:36 2012
+++ src/libexec/rpc.rstatd/rstat_proc.c Sun Aug 10 06:52:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rstat_proc.c,v 1.47 2012/06/19 06:09:36 dholland Exp $ */
+/* $NetBSD: rstat_proc.c,v 1.47.8.1 2014/08/10 06:52:44 tls Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,14 +30,13 @@
*/
#include sys/cdefs.h
-#ifndef lint
#if 0
-static char sccsid[] = from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro;
-static char sccsid[] = from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC;
-#else
-__RCSID($NetBSD: rstat_proc.c,v 1.47 2012/06/19 06:09:36 dholland Exp $);
-#endif
+static char sccsid[] =
+ from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro;
+static char sccsid[] =
+ from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC;
#endif
+__RCSID($NetBSD: rstat_proc.c,v 1.47.8.1 2014/08/10 06:52:44 tls Exp $);
/*
* rstat service: built with rstat.x and derived from rpc.rstatd.c
@@ -48,6 +47,7 @@ __RCSID($NetBSD: rstat_proc.c,v 1.47 20
#include sys/param.h
#include sys/sched.h
#include sys/socket.h
+#include sys/ioctl.h
#include errno.h
#include stdio.h
@@ -55,18 +55,11 @@ __RCSID($NetBSD: rstat_proc.c,v 1.47 20
#include string.h
#include signal.h
#include fcntl.h
-#include kvm.h
#include limits.h
-#include nlist.h
#include syslog.h
-#ifdef BSD
#include sys/sysctl.h
#include uvm/uvm_extern.h
#include drvstats.h
-#else
-#include sys/dk.h
-#endif
-
#include net/if.h
/*
@@ -89,27 +82,14 @@ __RCSID($NetBSD: rstat_proc.c,v 1.47 20
#undef if_collisions
#include rpcsvc/rstat.h
-#ifdef BSD
#define BSD_CPUSTATES 5 /* Use protocol's idea of CPU states */
int cp_xlat[CPUSTATES] = { CP_USER, CP_NICE, CP_SYS, CP_IDLE };
-#endif
-
-struct nlist nl[] = {
-#define X_IFNET 0
- { _ifnet, 0, 0, 0, 0 },
- { NULL, 0, 0, 0, 0 },
-};
int hz;
-char *memf = NULL, *nlistf = NULL;
-
-struct ifnet_head ifnetq; /* chain of ethernet interfaces */
-unsigned int numintfs;
extern int from_inetd;
int sincelastreq = 0; /* number of alarms since last request */
extern int closedown;
-kvm_t *kfd;
union {
struct stats s1;
@@ -118,8 +98,6 @@ union {
} stats_all;
void updatestat(int);
-void setup(void);
-void setup_kd_once(void);
void stat_init(void);
int havedisk(void);
void rstat_service(struct svc_req *, SVCXPRT *);
@@ -134,7 +112,7 @@ void
stat_init(void)
{
stat_is_init = 1;
- setup();
+ drvinit(0);
updatestat(0);
(void) signal(SIGALRM, updatestat);
alarm(1);
@@ -196,12 +174,11 @@ rstatproc_havedisk_1_svc(void *arg, stru
void
updatestat(int dummy)
{
- long off;
- unsigned int i;
- size_t len;
- int mib[2];
+ struct if_nameindex *ifps;
+ struct ifdatareq ifdr;
+ size_t i, len;
+ int mib[2], s;
struct uvmexp_sysctl uvmexp;
- struct ifnet ifnet;
double avrun[3];
struct timeval tm, btm;
@@ -230,21 +207,9 @@ updatestat(int dummy)
for (i = 0; i ndrive i DK_NDRIVE; i++)
stats_all.s3.dk_xfer[i] = cur.rxfer[i] + cur.wxfer[i];
-#ifdef BSD
for (i = 0; i CPUSTATES; i++)
stats_all.s3.cp_time[i] = cur.cp_time[cp_xlat[i]];
-#else
- if (kvm_read(kfd, (long)nl[X_CPTIME].n_value,
- (char *)stats_all.s3.cp_time,
- sizeof (stats_all.s3.cp_time))
- != sizeof (stats_all.s3.cp_time)) {
- syslog(LOG_ERR, can't read cp_time from kmem);
- exit(1);
- }
-#endif
-#ifdef BSD
(void)getloadavg(avrun, sizeof(avrun) / sizeof(avrun[0]));
-#endif
stats_all.s3.avenrun[0] = avrun[0] * FSCALE;
stats_all.s3.avenrun[1] = avrun[1] * FSCALE;
stats_all.s3.avenrun[2] = avrun[2] * FSCALE;
@@ -287,76 +252,32 @@ updatestat(int dummy)
stats_all.s3.if_ierrors = 0;
stats_all.s3.if_oerrors = 0;
CVS commit: [tls-earlyentropy] src/sbin/mount_tmpfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:59 UTC 2014
Modified Files:
src/sbin/mount_tmpfs [tls-earlyentropy]: mount_tmpfs.8 mount_tmpfs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/sbin/mount_tmpfs/mount_tmpfs.8
cvs rdiff -u -r1.27 -r1.27.2.1 src/sbin/mount_tmpfs/mount_tmpfs.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/mount_tmpfs/mount_tmpfs.8
diff -u src/sbin/mount_tmpfs/mount_tmpfs.8:1.17 src/sbin/mount_tmpfs/mount_tmpfs.8:1.17.2.1
--- src/sbin/mount_tmpfs/mount_tmpfs.8:1.17 Wed Dec 4 18:05:21 2013
+++ src/sbin/mount_tmpfs/mount_tmpfs.8 Sun Aug 10 06:52:59 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: mount_tmpfs.8,v 1.17 2013/12/04 18:05:21 wiz Exp $
+.\ $NetBSD: mount_tmpfs.8,v 1.17.2.1 2014/08/10 06:52:59 tls Exp $
.\
.\ Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -28,7 +28,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd December 4, 2013
+.Dd June 7, 2014
.Dt MOUNT_TMPFS 8
.Os
.Sh NAME
@@ -83,8 +83,10 @@ man page for possible options and their
Specifies the total file system size in bytes.
If zero is given (the default), the available amount of memory (including
main memory and swap space) will be used.
-Note that four megabytes are always reserved for the system and cannot
+Note that some memory is always reserved for the system and cannot
be assigned to the file system.
+The exact amount depends on the available memory and details of the
+kernel memory usage, it might even change slightly during runtime.
.Ar Size
can alternatively be specified as a percentage of the available
system ram by using the notation
Index: src/sbin/mount_tmpfs/mount_tmpfs.c
diff -u src/sbin/mount_tmpfs/mount_tmpfs.c:1.27 src/sbin/mount_tmpfs/mount_tmpfs.c:1.27.2.1
--- src/sbin/mount_tmpfs/mount_tmpfs.c:1.27 Wed Dec 4 15:10:11 2013
+++ src/sbin/mount_tmpfs/mount_tmpfs.c Sun Aug 10 06:52:59 2014
@@ -1,5 +1,5 @@
-/* $NetBSD: mount_tmpfs.c,v 1.27 2013/12/04 15:10:11 martin Exp $ */
+/* $NetBSD: mount_tmpfs.c,v 1.27.2.1 2014/08/10 06:52:59 tls Exp $ */
/*
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: mount_tmpfs.c,v 1.27 2013/12/04 15:10:11 martin Exp $);
+__RCSID($NetBSD: mount_tmpfs.c,v 1.27.2.1 2014/08/10 06:52:59 tls Exp $);
#endif /* not lint */
#include sys/param.h
@@ -60,6 +60,7 @@ __RCSID($NetBSD: mount_tmpfs.c,v 1.27 2
/* - */
static const struct mntopt mopts[] = {
+ MOPT_UPDATE,
MOPT_STDOPTS,
MOPT_GETARGS,
MOPT_NULL,
CVS commit: [tls-earlyentropy] src/sbin/fsck_lfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:52 UTC 2014
Modified Files:
src/sbin/fsck_lfs [tls-earlyentropy]: fsck_lfs.8 lfs.c lfs_user.h
main.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sbin/fsck_lfs/fsck_lfs.8
cvs rdiff -u -r1.41 -r1.41.2.1 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sbin/fsck_lfs/lfs_user.h
cvs rdiff -u -r1.45 -r1.45.4.1 src/sbin/fsck_lfs/main.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_lfs/fsck_lfs.8
diff -u src/sbin/fsck_lfs/fsck_lfs.8:1.24 src/sbin/fsck_lfs/fsck_lfs.8:1.24.2.1
--- src/sbin/fsck_lfs/fsck_lfs.8:1.24 Tue Mar 18 18:20:38 2014
+++ src/sbin/fsck_lfs/fsck_lfs.8 Sun Aug 10 06:52:52 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: fsck_lfs.8,v 1.24 2014/03/18 18:20:38 riastradh Exp $
+.\ $NetBSD: fsck_lfs.8,v 1.24.2.1 2014/08/10 06:52:52 tls Exp $
.\
.\ Copyright (c) 1980, 1989, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)fsck.8 8.3 (Berkeley) 11/29/94
.\
-.Dd October 9, 2008
+.Dd July 12, 2014
.Dt FSCK_LFS 8
.Os
.Sh NAME
@@ -134,7 +134,8 @@ Specify
mode.
Currently, in this mode
.Nm
-rolls forward from the older checkpoint, and performs no other action.
+does nothing.
+.\ rolls forward from the older checkpoint, and performs no other action.
.It Fl q
Quiet mode, do not output any messages for clean filesystems.
.It Fl U
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.41 src/sbin/fsck_lfs/lfs.c:1.41.2.1
--- src/sbin/fsck_lfs/lfs.c:1.41 Sat Oct 19 01:09:58 2013
+++ src/sbin/fsck_lfs/lfs.c Sun Aug 10 06:52:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.41 2013/10/19 01:09:58 christos Exp $ */
+/* $NetBSD: lfs.c,v 1.41.2.1 2014/08/10 06:52:52 tls Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
Index: src/sbin/fsck_lfs/lfs_user.h
diff -u src/sbin/fsck_lfs/lfs_user.h:1.5 src/sbin/fsck_lfs/lfs_user.h:1.5.4.1
--- src/sbin/fsck_lfs/lfs_user.h:1.5 Sat Jun 8 21:13:19 2013
+++ src/sbin/fsck_lfs/lfs_user.h Sun Aug 10 06:52:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_user.h,v 1.5 2013/06/08 21:13:19 dholland Exp $ */
+/* $NetBSD: lfs_user.h,v 1.5.4.1 2014/08/10 06:52:52 tls Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.45 src/sbin/fsck_lfs/main.c:1.45.4.1
--- src/sbin/fsck_lfs/main.c:1.45 Sat Jun 8 02:16:03 2013
+++ src/sbin/fsck_lfs/main.c Sun Aug 10 06:52:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.45 2013/06/08 02:16:03 dholland Exp $ */
+/* $NetBSD: main.c,v 1.45.4.1 2014/08/10 06:52:52 tls Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -35,6 +35,7 @@
#include ufs/lfs/lfs.h
#include fstab.h
+#include stdbool.h
#include stdarg.h
#include stdlib.h
#include string.h
@@ -73,7 +74,9 @@ main(int argc, char **argv)
int ch;
int ret = FSCK_EXIT_OK;
const char *optstring = b:dfi:m:npPqUy;
+ bool reallypreen;
+ reallypreen = false;
ckfinish = ckfini;
skipclean = 1;
exitonfail = 0;
@@ -95,6 +98,7 @@ main(int argc, char **argv)
break;
case 'f':
skipclean = 0;
+ reallypreen = true;
break;
case 'i':
idaddr = strtol(optarg, NULL, 0);
@@ -142,6 +146,29 @@ main(int argc, char **argv)
if (!argc)
usage();
+ /*
+ * Don't do anything in preen mode. This is a replacement for
+ * version 1.111 of src/distrib/utils/sysinst/disks.c, which
+ * disabled fsck on installer-generated lfs partitions. That
+ * isn't the right way to do it; better to run fsck but have
+ * it not do anything, so that when the issues in fsck get
+ * resolved it can be turned back on.
+ *
+ * If you really want to run fsck in preen mode you can do:
+ *fsck_lfs -p -f image
+ *
+ * This was prompted by
+ * http://mail-index.netbsd.org/tech-kern/2010/02/09/msg007306.html.
+ *
+ * It would be nice if someone prepared a more detailed report
+ * of the problems.
+ *
+ * XXX.
+ */
+ if (preen !reallypreen) {
+ return ret;
+ }
+
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
(void) signal(SIGINT, catch);
if (preen)
CVS commit: [tls-earlyentropy] src/sbin/fsck_msdos
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:52:54 UTC 2014
Modified Files:
src/sbin/fsck_msdos [tls-earlyentropy]: boot.c check.c dir.c fat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.22.1 src/sbin/fsck_msdos/boot.c
cvs rdiff -u -r1.18 -r1.18.22.1 src/sbin/fsck_msdos/check.c
cvs rdiff -u -r1.25 -r1.25.20.1 src/sbin/fsck_msdos/dir.c
cvs rdiff -u -r1.24 -r1.24.6.1 src/sbin/fsck_msdos/fat.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_msdos/boot.c
diff -u src/sbin/fsck_msdos/boot.c:1.15 src/sbin/fsck_msdos/boot.c:1.15.22.1
--- src/sbin/fsck_msdos/boot.c:1.15 Sat Apr 11 07:14:50 2009
+++ src/sbin/fsck_msdos/boot.c Sun Aug 10 06:52:54 2014
@@ -1,4 +1,3 @@
-/* $NetBSD: boot.c,v 1.15 2009/04/11 07:14:50 lukem Exp $ */
/*
* Copyright (C) 1995, 1997 Wolfgang Solfrank
@@ -28,11 +27,12 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: boot.c,v 1.15 2009/04/11 07:14:50 lukem Exp $);
+__RCSID($NetBSD: boot.c,v 1.15.22.1 2014/08/10 06:52:54 tls Exp $);
#endif /* not lint */
#include stdlib.h
#include string.h
+#include strings.h
#include stdio.h
#include unistd.h
@@ -64,8 +64,16 @@ readboot(int dosfs, struct bootblock *bo
/* decode bios parameter block */
boot-BytesPerSec = block[11] + (block[12] 8);
boot-SecPerClust = block[13];
+ if (boot-SecPerClust == 0 || popcount(boot-SecPerClust) != 1) {
+ pfatal(Invalid cluster size: %u\n, boot-SecPerClust);
+ return FSFATAL;
+ }
boot-ResSectors = block[14] + (block[15] 8);
boot-FATs = block[16];
+ if (boot-FATs == 0) {
+ pfatal(Invalid number of FATs: %u\n, boot-FATs);
+ return FSFATAL;
+ }
boot-RootDirEnts = block[17] + (block[18] 8);
boot-Sectors = block[19] + (block[20] 8);
boot-Media = block[21];
@@ -171,6 +179,10 @@ readboot(int dosfs, struct bootblock *bo
}
/* Check backup FSInfo? XXX */
}
+ if (boot-FATsecs == 0) {
+ pfatal(Invalid number of FAT sectors: %u\n, boot-FATsecs);
+ return FSFATAL;
+ }
boot-ClusterOffset = (boot-RootDirEnts * 32 + boot-BytesPerSec - 1)
/ boot-BytesPerSec
@@ -193,6 +205,12 @@ readboot(int dosfs, struct bootblock *bo
boot-NumSectors = boot-HugeSectors;
boot-NumClusters = (boot-NumSectors - boot-ClusterOffset) / boot-SecPerClust;
+ if (boot-ClusterOffset boot-NumSectors) {
+ pfatal(Cluster offset too large (%u clusters)\n,
+ boot-ClusterOffset);
+ return FSFATAL;
+ }
+
if (boot-flagsFAT32)
boot-ClustMask = CLUST32_MASK;
else if (boot-NumClusters (CLUST_RSRVDCLUST12_MASK))
Index: src/sbin/fsck_msdos/check.c
diff -u src/sbin/fsck_msdos/check.c:1.18 src/sbin/fsck_msdos/check.c:1.18.22.1
--- src/sbin/fsck_msdos/check.c:1.18 Sat Apr 11 07:14:50 2009
+++ src/sbin/fsck_msdos/check.c Sun Aug 10 06:52:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.18 2009/04/11 07:14:50 lukem Exp $ */
+/* $NetBSD: check.c,v 1.18.22.1 2014/08/10 06:52:54 tls Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: check.c,v 1.18 2009/04/11 07:14:50 lukem Exp $);
+__RCSID($NetBSD: check.c,v 1.18.22.1 2014/08/10 06:52:54 tls Exp $);
#endif /* not lint */
#include stdlib.h
@@ -135,7 +135,7 @@ checkfilesys(const char *filename)
goto out;
/* now write the FATs */
- if (mod FSFATMOD) {
+ if (mod (FSFATMOD|FSFIXFAT)) {
if (ask(1, Update FATs)) {
mod |= writefat(dosfs, boot, fat, mod FSFIXFAT);
if (mod FSFATAL)
Index: src/sbin/fsck_msdos/dir.c
diff -u src/sbin/fsck_msdos/dir.c:1.25 src/sbin/fsck_msdos/dir.c:1.25.20.1
--- src/sbin/fsck_msdos/dir.c:1.25 Sun Feb 20 21:42:50 2011
+++ src/sbin/fsck_msdos/dir.c Sun Aug 10 06:52:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.25 2011/02/20 21:42:50 christos Exp $ */
+/* $NetBSD: dir.c,v 1.25.20.1 2014/08/10 06:52:54 tls Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -30,7 +30,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: dir.c,v 1.25 2011/02/20 21:42:50 christos Exp $);
+__RCSID($NetBSD: dir.c,v 1.25.20.1 2014/08/10 06:52:54 tls Exp $);
#endif /* not lint */
#include stdio.h
@@ -420,12 +420,14 @@ checksize(struct bootblock *boot, struct
fullpath(dir));
if (ask(1, Drop superfluous clusters)) {
cl_t cl;
- u_int32_t sz = 0;
+ u_int32_t sz, len;
- for (cl = dir-head; (sz += boot-ClusterSize) dir-size;)
+ for (cl = dir-head, len = sz = 0;
+ (sz += boot-ClusterSize) dir-size; len++)
cl = fat[cl].next;
clearchain(boot, fat, fat[cl].next);
fat[cl].next = CLUST_EOF;
+ fat[dir-head].length = len;
return FSFATMOD;
} else
return FSERROR;
Index: src/sbin/fsck_msdos/fat.c
diff -u src/sbin/fsck_msdos/fat.c:1.24 src/sbin/fsck_msdos/fat.c:1.24.6.1
--- src/sbin/fsck_msdos/fat.c:1.24 Thu Jan 17 16:45:48 2013
+++ src/sbin/fsck_msdos/fat.c Sun Aug 10 06:52:54 2014
@@
CVS commit: [tls-earlyentropy] src/sbin/newfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:01 UTC 2014
Modified Files:
src/sbin/newfs [tls-earlyentropy]: mkfs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.121.2.1 src/sbin/newfs/mkfs.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/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.121 src/sbin/newfs/mkfs.c:1.121.2.1
--- src/sbin/newfs/mkfs.c:1.121 Sat Apr 5 12:32:27 2014
+++ src/sbin/newfs/mkfs.c Sun Aug 10 06:53:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $ */
+/* $NetBSD: mkfs.c,v 1.121.2.1 2014/08/10 06:53:01 tls Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.121.2.1 2014/08/10 06:53:01 tls Exp $);
#endif
#endif /* not lint */
@@ -131,10 +131,15 @@ static void *mkfs_malloc(size_t size);
union {
struct fs fs;
- char pad[SBLOCKSIZE];
+ char data[SBLOCKSIZE];
} fsun;
#define sblock fsun.fs
+union {
+ struct quota2_header q2h;
+ char data[MAXBSIZE];
+} buf;
+
struct csum *fscs_0; /* first block of cylinder summaries */
struct csum *fscs_next; /* place for next summary */
struct csum *fscs_end; /* end of summary buffer */
@@ -1012,7 +1017,7 @@ struct odirect olost_found_dir[] = {
{ 0, DIRBLKSIZ, 0, 0 },
};
#endif
-char buf[MAXBSIZE];
+
static void copy_dir(struct direct *, struct direct *);
int
@@ -1124,7 +1129,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp1.di_blocks = btodb(ffs_fragroundup(sblock,
node.dp1.di_size));
qblocks += node.dp1.di_blocks;
- wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]), sblock.fs_fsize, buf);
+ wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]), sblock.fs_fsize, buf);
} else {
if (mfs) {
node.dp2.di_mode = IFDIR | mfsmode;
@@ -1151,7 +1156,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp2.di_blocks = btodb(ffs_fragroundup(sblock,
node.dp2.di_size));
qblocks += node.dp2.di_blocks;
- wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]), sblock.fs_fsize, buf);
+ wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]), sblock.fs_fsize, buf);
}
qinos++;
iput(node, UFS_ROOTINO);
@@ -1177,12 +1182,12 @@ fsinit(const struct timeval *tv, mode_t
if ((quotas FS_Q2_DO_TYPE(i)) == 0)
continue;
- quota2_create_blk0(sblock.fs_bsize, buf, q2h_hash_shift,
+ quota2_create_blk0(sblock.fs_bsize, buf, q2h_hash_shift,
i, needswap);
/* grab an entry from header for root dir */
- q2h = (void *)buf;
+ q2h = buf.q2h;
offset = ufs_rw64(q2h-q2h_free, needswap);
- q2e = (void *)((char *)buf + offset);
+ q2e = (void *)((char *)buf + offset);
q2h-q2h_free = q2e-q2e_next;
memcpy(q2e, q2h-q2h_defentry, sizeof(*q2e));
q2e-q2e_uid = ufs_rw32(uid, needswap);
@@ -1213,7 +1218,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp1.di_uid = geteuid();
node.dp1.di_gid = getegid();
wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]),
- node.dp1.di_size, buf);
+ node.dp1.di_size, buf);
} else {
node.dp2.di_atime = tv-tv_sec;
node.dp2.di_atimensec = tv-tv_usec * 1000;
@@ -1235,7 +1240,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp2.di_uid = geteuid();
node.dp2.di_gid = getegid();
wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]),
- node.dp2.di_size, buf);
+ node.dp2.di_size, buf);
}
iput(node, nextino);
sblock.fs_quotafile[i] = nextino;
@@ -1257,9 +1262,9 @@ makedir(struct direct *protodir, int ent
if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ;
- memset(buf, 0, UFS_DIRBLKSIZ);
+ memset(buf, 0, UFS_DIRBLKSIZ);
spcleft = dirblksiz;
- for (cp = buf, i = 0; i entries - 1; i++) {
+ for (cp = buf.data, i = 0; i entries - 1; i++) {
protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, protodir[i], 0);
copy_dir(protodir[i], (struct direct*)cp);
cp += protodir[i].d_reclen;
CVS commit: [tls-earlyentropy] src/sbin/veriexecctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:11 UTC 2014
Modified Files:
src/sbin/veriexecctl [tls-earlyentropy]: veriexecctl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sbin/veriexecctl/veriexecctl.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/veriexecctl/veriexecctl.c
diff -u src/sbin/veriexecctl/veriexecctl.c:1.36 src/sbin/veriexecctl/veriexecctl.c:1.36.2.1
--- src/sbin/veriexecctl/veriexecctl.c:1.36 Sun Feb 9 13:40:59 2014
+++ src/sbin/veriexecctl/veriexecctl.c Sun Aug 10 06:53:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: veriexecctl.c,v 1.36 2014/02/09 13:40:59 maxv Exp $ */
+/* $NetBSD: veriexecctl.c,v 1.36.2.1 2014/08/10 06:53:11 tls Exp $ */
/*-
* Copyright 2005 Elad Efrat e...@netbsd.org
@@ -181,11 +181,11 @@ print_entry(prop_dictionary_t entry)
/* Get fingerprint in ASCII. */
len = prop_data_size(prop_dictionary_get(entry, fp));
- len *= 2;
- fp = calloc(1, len + 1);
+ fp = calloc(1, len*2 + 1);
v = dict_getd(entry, fp);
- for (i = 0; i len; i++)
- snprintf(fp, len + 1, %s%02x, fp, v[i] 0xff);
+ for (i = 0; i len; i++) {
+ snprintf(fp[i*2], 3, %02x, v[i] 0xff);
+ }
/* Get flags. */
memset(flags, 0, sizeof(flags));
CVS commit: [tls-earlyentropy] src/sbin/ttyflags
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:07 UTC 2014
Modified Files:
src/sbin/ttyflags [tls-earlyentropy]: ttyflags.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.18.1 src/sbin/ttyflags/ttyflags.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/ttyflags/ttyflags.c
diff -u src/sbin/ttyflags/ttyflags.c:1.18 src/sbin/ttyflags/ttyflags.c:1.18.18.1
--- src/sbin/ttyflags/ttyflags.c:1.18 Sat Aug 27 18:58:51 2011
+++ src/sbin/ttyflags/ttyflags.c Sun Aug 10 06:53:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttyflags.c,v 1.18 2011/08/27 18:58:51 joerg Exp $ */
+/* $NetBSD: ttyflags.c,v 1.18.18.1 2014/08/10 06:53:07 tls Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -41,7 +41,7 @@ __COPYRIGHT(@(#) Copyright (c) 1994\
#endif /* not lint */
#ifndef lint
-__RCSID($NetBSD: ttyflags.c,v 1.18 2011/08/27 18:58:51 joerg Exp $);
+__RCSID($NetBSD: ttyflags.c,v 1.18.18.1 2014/08/10 06:53:07 tls Exp $);
#endif /* not lint */
#include sys/types.h
@@ -214,7 +214,7 @@ change_ttyflags(struct ttyent *tep)
return (0);
/* Open the device NON-BLOCKING, set the flags, and close it. */
- if ((fd = open(path, O_RDONLY | O_NONBLOCK, 0)) == -1) {
+ if ((fd = open(path, O_RDWR | O_NONBLOCK, 0)) == -1) {
if (!(errno == ENXIO ||
(errno == ENOENT (st TTY_ON) == 0)))
rval = 1;
CVS commit: [tls-earlyentropy] src/sbin/sysctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:05 UTC 2014
Modified Files:
src/sbin/sysctl [tls-earlyentropy]: sysctl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.151.2.1 src/sbin/sysctl/sysctl.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/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.151 src/sbin/sysctl/sysctl.c:1.151.2.1
--- src/sbin/sysctl/sysctl.c:1.151 Fri Jan 10 18:37:18 2014
+++ src/sbin/sysctl/sysctl.c Sun Aug 10 06:53:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.151 2014/01/10 18:37:18 christos Exp $ */
+/* $NetBSD: sysctl.c,v 1.151.2.1 2014/08/10 06:53:05 tls Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT(@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = @(#)sysctl.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: sysctl.c,v 1.151 2014/01/10 18:37:18 christos Exp $);
+__RCSID($NetBSD: sysctl.c,v 1.151.2.1 2014/08/10 06:53:05 tls Exp $);
#endif
#endif /* not lint */
@@ -242,7 +242,7 @@ static const struct handlespec {
struct sysctlnode my_root = {
.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
.sysctl_num = 0,
.sysctl_name = (prog_root),
};
@@ -1616,7 +1616,7 @@ getdesc(int *name, u_int namelen, struct
struct sysctlnode *node = pnode-sysctl_child;
struct sysctldesc *d, *p, *plim;
char *desc;
- size_t i, sz;
+ size_t i, sz, child_cnt;
int rc;
sz = 128 * pnode-sysctl_clen;
@@ -1647,7 +1647,9 @@ getdesc(int *name, u_int namelen, struct
* suffice for now
*/
plim = /*LINTED ptr cast*/(struct sysctldesc *)((char*)d + sz);
- for (i = 0; i pnode-sysctl_clen; i++) {
+ child_cnt = (pnode-sysctl_flags CTLTYPE_NODE) ? pnode-sysctl_clen
+ : 0;
+ for (i = 0; i child_cnt; i++) {
node = pnode-sysctl_child[i];
for (p = d; p plim; p = NEXT_DESCR(p))
if (node-sysctl_num == p-descr_num)
CVS commit: [tls-earlyentropy] src/sbin/tunefs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:09 UTC 2014
Modified Files:
src/sbin/tunefs [tls-earlyentropy]: tunefs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.4.1 src/sbin/tunefs/tunefs.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/tunefs/tunefs.c
diff -u src/sbin/tunefs/tunefs.c:1.46 src/sbin/tunefs/tunefs.c:1.46.4.1
--- src/sbin/tunefs/tunefs.c:1.46 Sun Jun 23 02:06:05 2013
+++ src/sbin/tunefs/tunefs.c Sun Aug 10 06:53:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tunefs.c,v 1.46 2013/06/23 02:06:05 dholland Exp $ */
+/* $NetBSD: tunefs.c,v 1.46.4.1 2014/08/10 06:53:09 tls Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tunefs.c 8.3 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: tunefs.c,v 1.46 2013/06/23 02:06:05 dholland Exp $);
+__RCSID($NetBSD: tunefs.c,v 1.46.4.1 2014/08/10 06:53:09 tls Exp $);
#endif
#endif /* not lint */
@@ -71,10 +71,9 @@ __RCSID($NetBSD: tunefs.c,v 1.46 2013/0
union {
struct fs sb;
- char pad[MAXBSIZE];
-} sbun;
+ char data[MAXBSIZE];
+} sbun, buf;
#define sblock sbun.sb
-char buf[MAXBSIZE];
int fi;
long dev_bsize = 512;
@@ -326,14 +325,14 @@ main(int argc, char *argv[])
exit(0);
}
- memcpy(buf, (char *)sblock, SBLOCKSIZE);
+ memcpy(buf, (char *)sblock, SBLOCKSIZE);
if (needswap)
- ffs_sb_swap((struct fs*)buf, (struct fs*)buf);
- bwrite(sblockloc, buf, SBLOCKSIZE, special);
+ ffs_sb_swap((struct fs*)buf, (struct fs*)buf);
+ bwrite(sblockloc, buf.data, SBLOCKSIZE, special);
if (Aflag)
for (i = 0; i sblock.fs_ncg; i++)
bwrite(FFS_FSBTODB(sblock, cgsblock(sblock, i)),
- buf, SBLOCKSIZE, special);
+ buf.data, SBLOCKSIZE, special);
close(fi);
exit(0);
}
CVS commit: [tls-earlyentropy] src/sbin/newfs_msdos
Module Name:src Committed By: tls Date: Sun Aug 10 06:53:03 UTC 2014 Modified Files: src/sbin/newfs_msdos [tls-earlyentropy]: newfs_msdos.8 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.2.1 src/sbin/newfs_msdos/newfs_msdos.8 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_msdos/newfs_msdos.8 diff -u src/sbin/newfs_msdos/newfs_msdos.8:1.19 src/sbin/newfs_msdos/newfs_msdos.8:1.19.2.1 --- src/sbin/newfs_msdos/newfs_msdos.8:1.19 Tue Mar 18 18:20:39 2014 +++ src/sbin/newfs_msdos/newfs_msdos.8 Sun Aug 10 06:53:02 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: newfs_msdos.8,v 1.19 2014/03/18 18:20:39 riastradh Exp $ +.\ $NetBSD: newfs_msdos.8,v 1.19.2.1 2014/08/10 06:53:02 tls Exp $ .\ .\ Copyright (c) 1998 Robert Nordier .\ All rights reserved. @@ -27,7 +27,7 @@ .\ .\ From: $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.13 2001/08/14 10:01:48 ru Exp $ .\ -.Dd March 26, 2009 +.Dd April 24, 2014 .Dt NEWFS_MSDOS 8 .Os .Sh NAME @@ -101,7 +101,7 @@ Volume label (up to 11 characters). The label should consist of only those characters permitted in regular DOS (8+3) filenames. The default is -.Qq Li NO_NAME . +.Qq Li NO NAME . .It Fl O Ar OEM OEM string (up to 8 characters). The default is
CVS commit: [tls-earlyentropy] src/share/misc
Module Name:src Committed By: tls Date: Sun Aug 10 06:53:28 UTC 2014 Modified Files: src/share/misc [tls-earlyentropy]: acronyms acronyms.comp airport bsd-family-tree inter.phone Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.223.2.1 src/share/misc/acronyms cvs rdiff -u -r1.141 -r1.141.2.1 src/share/misc/acronyms.comp cvs rdiff -u -r1.52 -r1.52.2.1 src/share/misc/airport cvs rdiff -u -r1.54 -r1.54.2.1 src/share/misc/bsd-family-tree cvs rdiff -u -r1.27 -r1.27.8.1 src/share/misc/inter.phone 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.223 src/share/misc/acronyms:1.223.2.1 --- src/share/misc/acronyms:1.223 Mon Mar 10 17:56:21 2014 +++ src/share/misc/acronyms Sun Aug 10 06:53:28 2014 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.223 2014/03/10 17:56:21 mbalmer Exp $ +$NetBSD: acronyms,v 1.223.2.1 2014/08/10 06:53:28 tls Exp $ 10Q thank you 10X thanks 1337 elite (leet) @@ -480,6 +480,7 @@ TBOMK the best of my knowledge TCB taking care of business TCO taken care of TCO total cost of ownership +TFOA things falling off aircraft THNX thanks THX thanks TIA thanks in advance Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.141 src/share/misc/acronyms.comp:1.141.2.1 --- src/share/misc/acronyms.comp:1.141 Sat Sep 28 18:01:49 2013 +++ src/share/misc/acronyms.comp Sun Aug 10 06:53:28 2014 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.141 2013/09/28 18:01:49 dholland Exp $ +$NetBSD: acronyms.comp,v 1.141.2.1 2014/08/10 06:53:28 tls Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1353,6 +1353,7 @@ XIP execute in place XML Extensible Markup Language XOR exclusive or XP extreme programming +XSI X/Open System Interface XSL extensible stylesheet language XSS cross site scripting XT extended technology Index: src/share/misc/airport diff -u src/share/misc/airport:1.52 src/share/misc/airport:1.52.2.1 --- src/share/misc/airport:1.52 Fri Mar 28 10:16:28 2014 +++ src/share/misc/airport Sun Aug 10 06:53:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.52 2014/03/28 10:16:28 apb Exp $ +# $NetBSD: airport,v 1.52.2.1 2014/08/10 06:53:28 tls Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -2837,6 +2837,7 @@ HBZ:Heber Springs Municipal Airport, AR, HCA:Big Spring, TX, USA HCB:Shoal Cove, AK, USA HCD:Hutchinson (Butler Field), MN, USA +HCJ:Hechi Jinchengjiang Airport, China HCM:Ell, Somalia HCQ:Halls Creek, Western Australia, Australia HCR:Holy Cross Airport, AK, USA @@ -3729,7 +3730,7 @@ KGX:Grayling Airport, AK, USA KGY:Kingaroy, Queensland, Australia KGZ:Glacier Creek Airport, AK, USA KHA:Khaneh, Iran -KHC:Kerch, Krym (Crimea), Ukraine +KHC:Kerch, Ukraine KHE:Kherson, Mykolayiv, Ukraine KHG:Kashi, China KHH:Kaohsiung International, Taiwan @@ -7028,7 +7029,7 @@ SIL:Sila, Papua New Guinea SIM:Simbai, Papua New Guinea SIN:Singapore SIO:Smithton, Tasmania, Australia -SIP:Simferopol, Adygea, Ukraine +SIP:Simferopol, Ukraine SIQ:Singkep (Dabo Airport), Indonesia SIR:Sion (Sitten), Switzerland SIS:Sishen, South Africa @@ -7319,7 +7320,7 @@ SUE:Sturgeon Bay (Door County), WI, USA SUF:Lamezia Terme, Italy SUG:Surigao, Philippines SUH:Sur, Oman -SUI:Sokhumi, Abkhazia, Georgia +SUI:Sukhum, Abkhazia SUJ:Satu Mare, Romania SUK:Samchok, South Korea SUL:Sui, Pakistan @@ -8171,7 +8172,7 @@ VIH:Rolla/Vichy (Rolla National Airport) VIJ:Virgin Gorda (Valley), British Virgin Islands VIK:Kavik, AK, USA VIL:Dakhla (Villa Cisneros), Western Sahara -VIN:Vinnytsya, Russia +VIN:Vinnytsya, Ukraine VIQ:Viqueque, Indonesia VIS:Visalia Municipal Airport, CA, USA VIT:Vitoria, Spain Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.54 src/share/misc/bsd-family-tree:1.54.2.1 --- src/share/misc/bsd-family-tree:1.54 Mon Sep 30 03:48:51 2013 +++ src/share/misc/bsd-family-tree Sun Aug 10 06:53:28 2014 @@ -256,6 +256,9 @@ FreeBSD 5.2 | | | | 8.3 | | | || | | | | | | | NetBSD | | | | | | | |5.1.3 | | + | | | | | | || | + | | | | | | NetBSD | | + | | | | | |5.1.4 | | | | | | | | OpenBSD 5.1 | | | | Mac OS X | `. | | | | | 10.8| \ | | @@ -263,26 +266,43 @@ FreeBSD 5.2 | | | | | | | | ||OpenBSD 5.2
CVS commit: [tls-earlyentropy] src/share/mk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:30 UTC 2014
Modified Files:
src/share/mk [tls-earlyentropy]: bsd.README bsd.dep.mk bsd.doc.mk
bsd.host.mk bsd.hostlib.mk bsd.hostprog.mk bsd.lib.mk bsd.lua.mk
bsd.man.mk bsd.own.mk bsd.sys.mk bsd.x11.mk sys.mk
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.329.2.1 src/share/mk/bsd.README
cvs rdiff -u -r1.80 -r1.80.2.1 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.64 -r1.64.60.1 src/share/mk/bsd.doc.mk
cvs rdiff -u -r1.1 -r1.1.2.1 src/share/mk/bsd.host.mk
cvs rdiff -u -r1.17 -r1.17.2.1 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.72 -r1.72.2.1 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.349 -r1.349.2.1 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.6 -r1.6.2.1 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.114 -r1.114.2.1 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.796 -r1.796.2.1 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.237 -r1.237.2.1 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.112 -r1.112.2.1 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.123 -r1.123.2.1 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.329 src/share/mk/bsd.README:1.329.2.1
--- src/share/mk/bsd.README:1.329 Tue Mar 25 09:52:55 2014
+++ src/share/mk/bsd.README Sun Aug 10 06:53:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.329 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: bsd.README,v 1.329.2.1 2014/08/10 06:53:30 tls Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -198,6 +198,12 @@ MKGCCCMDS If no, don't build gcc(1), b
MKGDB If no, don't build gdb(1).
Default: yes
+MKGROFFHTMLDOC If no, avoid trying to use groff to generate html for
+ miscellaneous articles, as this seems to sometimes want
+ to run software not in base. Does not affect html man
+ pages.
+ Default: no
+
MKHESIOD If no, disables building of Hesiod infrastructure
(libraries and support programs).
Default: yes
@@ -234,6 +240,10 @@ MKISCSI If no, don't build or install
(depends on libpthread.)
Default: yes
+MKKDEBUG If yes, force building of kernel symbol info and creation
+ of netbsd.gdb in all kernel builds, independently of the
+ settings for makeoptions DEBUG in the kernel config file.
+
MKKERBEROS If no, disables building of Kerberos v5
infrastructure (libraries and support programs).
Default: yes
@@ -605,15 +615,16 @@ LIBMODE Library mode. [${NONBINMODE}]
DOCDIR Base path for system documentation (e.g. PSD, USD, etc.)
installation. [/usr/share/doc]
-HTMLDOCDIR Base path for html system documentation installation.
- [/usr/share/doc/html]
-
DOCGRP Documentation group. [wheel]
DOCOWN Documentation owner. [root]
DOCMODE Documentation mode. [${NONBINMODE}]
+GZIP_N_FLAG Flags to pass to TOOL_GZIP to prevent it from inserting
+ file names or timestamps in the compressed output.
+ [-n, or -nT when TOOL_GZIP is really TOOL_PIGZ]
+
NLSDIR Base path for Native Language Support files installation.
[/usr/share/nls]
@@ -793,6 +804,11 @@ TOOL_GROFF Front end for groff document
TOOL_GZIP Compression/decompression tool. [gzip]
+TOOL_GZIP_N Same as TOOL_GZIP, plus a command line option to
+ prevent it from inserting file names or timestamps
+ into the compressed output.
+ [${TOOL_GZIP} ${GZIP_N_FLAG}]
+
TOOL_HEXDUMP Ascii, decimal, hexadecimal, octal dump. [hexdump]
TOOL_HP300MKBOOT Make bootable image for hp300. [hp300-mkboot]
@@ -840,6 +856,8 @@ TOOL_MSGC Simple message list compiler.
TOOL_MTREE Map a directory hierarchy. [mtree]
+TOOL_NCDCS Turn ELF kernel into a NCD firmware image. [ncdcs]
+
TOOL_PAX Manipulate file archives and copy directories. [pax]
TOOL_PIC Compile pictures for groff. [pic]
@@ -1889,7 +1907,7 @@ LDFLAGS Options to ${CC} during the lin
LINT C program verifier. [lint]
-LINTFLAGS Options to ${LINT}. [-chapbxzFS]
+LINTFLAGS Options to ${LINT}. [-chapbxzgFS]
LORDER List dependencies for object files. [lorder]
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.80 src/share/mk/bsd.dep.mk:1.80.2.1
--- src/share/mk/bsd.dep.mk:1.80 Thu Dec 5 22:49:33 2013
+++ src/share/mk/bsd.dep.mk Sun Aug 10 06:53:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.80 2013/12/05 22:49:33 matt Exp $
+# $NetBSD: bsd.dep.mk,v 1.80.2.1 2014/08/10 06:53:30 tls Exp $
# Basic targets
realdepend: beforedepend .depend afterdepend
@@ -61,7 +61,7 @@ _MKDEP_FILEFLAGS=
.c.d:
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
- ${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
+ ${CFLAGS:M-std=*} ${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} \
CVS commit: [tls-earlyentropy] src/share/examples
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:22 UTC 2014
Modified Files:
src/share/examples/lua [tls-earlyentropy]: gpio.lua sqlite.lua
src/share/examples/npf [tls-earlyentropy]: host-npf.conf
l2tp_gw-npf.conf
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/share/examples/lua/gpio.lua
cvs rdiff -u -r1.1 -r1.1.18.1 src/share/examples/lua/sqlite.lua
cvs rdiff -u -r1.6 -r1.6.2.1 src/share/examples/npf/host-npf.conf
cvs rdiff -u -r1.2 -r1.2.2.1 src/share/examples/npf/l2tp_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/lua/gpio.lua
diff -u src/share/examples/lua/gpio.lua:1.2 src/share/examples/lua/gpio.lua:1.2.8.1
--- src/share/examples/lua/gpio.lua:1.2 Sat Feb 25 09:13:38 2012
+++ src/share/examples/lua/gpio.lua Sun Aug 10 06:53:22 2014
@@ -1,6 +1,6 @@
--- $NetBSD: gpio.lua,v 1.2 2012/02/25 09:13:38 mbalmer Exp $
+-- $NetBSD: gpio.lua,v 1.2.8.1 2014/08/10 06:53:22 tls Exp $
-require 'gpio'
+local gpio = require 'gpio'
print(gpio._VERSION .. ' - ' .. gpio._DESCRIPTION)
print(gpio._COPYRIGHT)
Index: src/share/examples/lua/sqlite.lua
diff -u src/share/examples/lua/sqlite.lua:1.1 src/share/examples/lua/sqlite.lua:1.1.18.1
--- src/share/examples/lua/sqlite.lua:1.1 Sat Oct 15 12:58:43 2011
+++ src/share/examples/lua/sqlite.lua Sun Aug 10 06:53:22 2014
@@ -1,6 +1,6 @@
--- $NetBSD: sqlite.lua,v 1.1 2011/10/15 12:58:43 mbalmer Exp $
+-- $NetBSD: sqlite.lua,v 1.1.18.1 2014/08/10 06:53:22 tls Exp $
-require 'sqlite'
+local sqlite = require 'sqlite'
print(sqlite._VERSION .. ' - ' .. sqlite._DESCRIPTION)
print(sqlite._COPYRIGHT)
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.6 src/share/examples/npf/host-npf.conf:1.6.2.1
--- src/share/examples/npf/host-npf.conf:1.6 Sat Feb 8 01:32:19 2014
+++ src/share/examples/npf/host-npf.conf Sun Aug 10 06:53:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.6 2014/02/08 01:32:19 rmind Exp $
+# $NetBSD: host-npf.conf,v 1.6.2.1 2014/08/10 06:53:22 tls Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
@@ -31,6 +31,10 @@ procedure log {
log: npflog0
}
+# make a service running on a high port on 127.0.0.1 available on $wired_if
+# see also the pass rules below
+map $wired_if dynamic 127.0.0.1 port 8080 - $wired_v4 port 80
+
group wired on $wired_if {
# not being picky about our own address here
@@ -45,6 +49,11 @@ group wired on $wired_if {
pass in final family inet6 proto tcp to $wired_v6 port ssh
+ # the port mapping
+ # Note the filter sees packets before translation
+ pass in final family inet4 proto tcp from any to $wired_v4 port 80
+ pass out final family inet4 proto tcp from 127.0.0.1 port 8080 to any
+
pass in final family inet4 proto tcp flags S/SA \
from $backupsrv_v4 to $wired_v4 port $backup_port
pass in final family inet4 proto udp \
@@ -56,7 +65,7 @@ group wired on $wired_if {
pass stateful in final family inet6 proto udp to $wired_v6 \
port $services_udp
- pass stateful in final family inet4 proto udp to $wired_v6 \
+ pass stateful in final family inet4 proto udp to $wired_v4 \
port $services_udp
# only SYN packets need to generate state
@@ -84,7 +93,7 @@ group wifi on $wifi_if {
pass out final family inet6 proto ipv6-icmp from ff00::/10
pass in final family inet6 proto ipv6-icmp to $wifi_v6
- pass in final family inet4 proto icmp to $wifi_v6
+ pass in final family inet4 proto icmp to $wifi_v4
pass in final family inet4 proto tcp \
from any port bootps to $wifi_v4 port bootpc
Index: src/share/examples/npf/l2tp_gw-npf.conf
diff -u src/share/examples/npf/l2tp_gw-npf.conf:1.2 src/share/examples/npf/l2tp_gw-npf.conf:1.2.2.1
--- src/share/examples/npf/l2tp_gw-npf.conf:1.2 Fri Sep 20 17:51:04 2013
+++ src/share/examples/npf/l2tp_gw-npf.conf Sun Aug 10 06:53:22 2014
@@ -1,17 +1,19 @@
# ex0 - (internal) network interface
-# 192.168.2.254/24
-# hme0 - (external) connection to Two Sigma
-# 74.66.0.142/24
+# 192.0.2.254/24
+# hme0 - (external) connection to Peer
+# 198.51.100.142/24
-$int_if = sk0
-$ext_if = bge0
+$int_if = ex0
+$ext_if = hme0
+
+$private_addr = { 10.0.0.0/8, 172.16.0.0/14, 192.168.0.0/16 }
alg icmp
#
# NAT for all.
#
-map $ext_if dynamic 192.168.1.0/24 - inet4($ext_if)
+map $ext_if dynamic 192.0.2.0/24 - inet4($ext_if)
#table 1 type tree file /etc/npf_problem_sites
@@ -37,20 +39,15 @@ group external on $ext_if {
#
# Block IANA-reserved addresses from entering or exiting
#
- block in final from 10.0.0.0/8 apply log
- block in final from 172.16.0.0/12 apply log
- block in final from 192.168.0.0/16 apply log
- #
- block out final to 10.0.0.0/8 apply log
- block out final to 172.16.0.0/12 apply log
- block out final to
CVS commit: [tls-earlyentropy] src/share/wscons/keymaps
Module Name:src Committed By: tls Date: Sun Aug 10 06:53:33 UTC 2014 Modified Files: src/share/wscons/keymaps [tls-earlyentropy]: Makefile Added Files: src/share/wscons/keymaps [tls-earlyentropy]: pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5 pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5 pckbd.bg.qwerty.koi8-r Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.22.1 src/share/wscons/keymaps/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/share/wscons/keymaps/pckbd.bg.bds.cp1251 \ src/share/wscons/keymaps/pckbd.bg.bds.iso8859-5 \ src/share/wscons/keymaps/pckbd.bg.qwerty.cp1251 \ src/share/wscons/keymaps/pckbd.bg.qwerty.iso8859-5 \ src/share/wscons/keymaps/pckbd.bg.qwerty.koi8-r Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/wscons/keymaps/Makefile diff -u src/share/wscons/keymaps/Makefile:1.18 src/share/wscons/keymaps/Makefile:1.18.22.1 --- src/share/wscons/keymaps/Makefile:1.18 Mon Dec 6 18:26:29 2010 +++ src/share/wscons/keymaps/Makefile Sun Aug 10 06:53:32 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/12/06 18:26:29 phx Exp $ +# $NetBSD: Makefile,v 1.18.22.1 2014/08/10 06:53:32 tls Exp $ NOOBJ= # defined @@ -6,6 +6,11 @@ FILES= \ amikbd.pl.qwertz.iso8859-2 \ mkbd.pt.iso8859-1 \ pckbd.be.azerty pckbd.br.abnt2 \ + pckbd.bg.bds.cp1251 \ + pckbd.bg.bds.iso8859-5 \ + pckbd.bg.qwerty.cp1251 \ + pckbd.bg.qwerty.iso8859-5 \ + pckbd.bg.qwerty.koi8-r \ pckbd.de_CH.iso8859-1 \ pckbd.fr_CA.iso8859-1 \ pckbd.fr_CH.iso8859-1 \ Added files: Index: src/share/wscons/keymaps/pckbd.bg.bds.cp1251 diff -u /dev/null src/share/wscons/keymaps/pckbd.bg.bds.cp1251:1.1.2.2 --- /dev/null Sun Aug 10 06:53:33 2014 +++ src/share/wscons/keymaps/pckbd.bg.bds.cp1251 Sun Aug 10 06:53:32 2014 @@ -0,0 +1,111 @@ +# $NetBSD: pckbd.bg.bds.cp1251,v 1.1.2.2 2014/08/10 06:53:32 tls Exp $ +# +# This is a BDS (typewriter) CP1251 keymap. Cyrillic input is toggled +# by pressing the AltGr key. +# From M. K. mark...@gmail.com per PR misc/37713. + +keycode 1 = Cmd_Debugger Escape +keycode 2 = 1 exclam 1 exclam +keycode 3 = 2 at 2 question +keycode 4 = 3 numbersign 3 plus +keycode 5 = 4 dollar 4 quotedbl +keycode 6 = 5 percent 5 percent +keycode 7 = 6 asciicircum 6 equal +keycode 8 = 7 ampersand 7 colon +keycode 9 = 8 asterisk 8 slash +keycode 10 = 9 parenleft 9 minus +keycode 11 = 0 parenright 0 onesuperior +keycode 12 = minus underscore minus I +keycode 13 = equal plus period V +keycode 14 = Cmd_ResetEmul Delete +keycode 15 = Tab +keycode 16 = q Q comma ucircumflex +keycode 17 = w W oacute Oacute +keycode 18 = e E aring Aring +keycode 19 = r R egrave Egrave +keycode 20 = t T oslash Ooblique +keycode 21 = y Y ugrave Ugrave +keycode 22 = u U ecircumflex Ecircumflex +keycode 23 = i I ntilde Ntilde +keycode 24 = o O adiaeresis Adiaeresis +keycode 25 = p P ccedilla Ccedilla +keycode 26 = bracketleft braceleft odiaeresis Odiaeresis +keycode 27 = bracketright braceright semicolon section +keycode 28 = Return +keycode 29 = Cmd1 Control_L +keycode 30 = a A udiaeresis Udiaeresis +keycode 31 = s S ydiaeresis ssharp +keycode 32 = d D agrave Agrave +keycode 33 = f F icircumflex Icircumflex +keycode 34 = g G ae AE +keycode 35 = h H atilde Atilde +keycode 36 = j J ograve Ograve +keycode 37 = k K iacute Iacute +keycode 38 = l L acircumflex Acircumflex +keycode 39 = semicolon colon igrave Igrave +keycode 40 = apostrophe quotedbl division multiply +keycode 41 = grave asciitilde +keycode 42 = Shift_L +keycode 43 = backslash bar parenleft parenright +keycode 44 = z Z thorn THORN +keycode 45 = x X eacute Eacute +keycode 46 = c C uacute Uacute +keycode 47 = v V yacute Yacute +keycode 48 = b B ocircumflex Ocircumflex +keycode 49 = n N otilde Otilde +keycode 50 = m M idiaeresis Idiaeresis +keycode 51 = comma less eth ETH +keycode 52 = period greater ediaeresis Ediaeresis +keycode 53 = slash question aacute Aacute +keycode 54 = Shift_R +keycode 55 = KP_Multiply +keycode 56 = Cmd2 Alt_L +keycode 57 = space +keycode 58 = Caps_Lock +keycode 59 = Cmd_Screen0 f1 F1 +keycode 60 = Cmd_Screen1 f2 F2 +keycode 61 = Cmd_Screen2 f3 F3 +keycode 62 = Cmd_Screen3 f4 F4 +keycode 63 = Cmd_Screen4 f5 F5 +keycode 64 = Cmd_Screen5 f6 F6 +keycode 65 = Cmd_Screen6 f7 F7 +keycode 66 = Cmd_Screen7 f8 F8 +keycode 67 = Cmd_Screen8 f9 F9 +keycode 68 = Cmd_Screen9 f10 F10 +keycode 69 = Num_Lock +keycode 70 = Hold_Screen +keycode 71 = KP_Home KP_7 +keycode 72 = KP_Up KP_8 +keycode 73 = KP_Prior KP_9 +keycode 74 = KP_Subtract +keycode 75 = KP_Left KP_4 +keycode 76 = KP_Begin KP_5 +keycode 77 = KP_Right KP_6 +keycode 78 = KP_Add +keycode 79 = KP_End KP_1 +keycode 80 = KP_Down KP_2 +keycode 81 = KP_Next KP_3 +keycode 82 = KP_Insert KP_0 +keycode 83 = KP_Delete KP_Decimal +keycode 87 = f11 F11 +keycode 88 = f12 F12 +keycode 127 = Pause +keycode 156 = KP_Enter +keycode 157 = Control_R
CVS commit: [tls-earlyentropy] src/share/doc
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:14 UTC 2014
Modified Files:
src/share/doc [tls-earlyentropy]: Makefile
src/share/doc/psd [tls-earlyentropy]: Makefile
src/share/doc/psd/05.sysman [tls-earlyentropy]: Makefile
src/share/doc/psd/20.ipctut [tls-earlyentropy]: Makefile
src/share/doc/psd/21.ipc [tls-earlyentropy]: Makefile
src/share/doc/smm [tls-earlyentropy]: Makefile
src/share/doc/smm/01.setup [tls-earlyentropy]: Makefile
src/share/doc/smm/04.quotas [tls-earlyentropy]: Makefile
src/share/doc/smm/05.fastfs [tls-earlyentropy]: Makefile
src/share/doc/smm/06.nfs [tls-earlyentropy]: Makefile
src/share/doc/smm/17.password [tls-earlyentropy]: Makefile
src/share/doc/smm/18.net [tls-earlyentropy]: Makefile
src/share/doc/smm/config [tls-earlyentropy]: 0.t 1.t 2.t 3.t 4.t 5.t
6.t Makefile a.t b.t d.t
src/share/doc/usd [tls-earlyentropy]: Makefile
src/share/doc/usd/01.begin [tls-earlyentropy]: Makefile
src/share/doc/usd/17.msmacros [tls-earlyentropy]: Makefile
src/share/doc/usd/18.msdiffs [tls-earlyentropy]: Makefile
src/share/doc/usd/19.memacros [tls-earlyentropy]: Makefile
src/share/doc/usd/20.meref [tls-earlyentropy]: Makefile
Added Files:
src/share/doc [tls-earlyentropy]: README.docdirs
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.24.1 src/share/doc/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/share/doc/README.docdirs
cvs rdiff -u -r1.13 -r1.13.72.1 src/share/doc/psd/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 src/share/doc/psd/05.sysman/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/share/doc/psd/20.ipctut/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/share/doc/psd/21.ipc/Makefile
cvs rdiff -u -r1.20 -r1.20.46.1 src/share/doc/smm/Makefile
cvs rdiff -u -r1.12 -r1.12.72.1 src/share/doc/smm/01.setup/Makefile
cvs rdiff -u -r1.7 -r1.7.84.1 src/share/doc/smm/04.quotas/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/share/doc/smm/05.fastfs/Makefile
cvs rdiff -u -r1.2 -r1.2.84.1 src/share/doc/smm/06.nfs/Makefile
cvs rdiff -u -r1.1 -r1.1.48.1 src/share/doc/smm/17.password/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/share/doc/smm/18.net/Makefile
cvs rdiff -u -r1.1 -r1.1.46.1 src/share/doc/smm/config/0.t \
src/share/doc/smm/config/1.t src/share/doc/smm/config/2.t \
src/share/doc/smm/config/3.t src/share/doc/smm/config/4.t \
src/share/doc/smm/config/5.t src/share/doc/smm/config/6.t \
src/share/doc/smm/config/Makefile src/share/doc/smm/config/a.t \
src/share/doc/smm/config/b.t src/share/doc/smm/config/d.t
cvs rdiff -u -r1.24 -r1.24.46.1 src/share/doc/usd/Makefile
cvs rdiff -u -r1.1 -r1.1.48.1 src/share/doc/usd/01.begin/Makefile
cvs rdiff -u -r1.1 -r1.1.48.1 src/share/doc/usd/17.msmacros/Makefile
cvs rdiff -u -r1.3 -r1.3.84.1 src/share/doc/usd/18.msdiffs/Makefile
cvs rdiff -u -r1.2 -r1.2.84.1 src/share/doc/usd/19.memacros/Makefile
cvs rdiff -u -r1.2 -r1.2.84.1 src/share/doc/usd/20.meref/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/doc/Makefile
diff -u src/share/doc/Makefile:1.10 src/share/doc/Makefile:1.10.24.1
--- src/share/doc/Makefile:1.10 Mon Jan 19 07:50:20 2009
+++ src/share/doc/Makefile Sun Aug 10 06:53:13 2014
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/01/19 07:50:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.10.24.1 2014/08/10 06:53:13 tls Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-.if make(install)
SUBDIR+= psd smm usd
-.endif
.include bsd.subdir.mk
Index: src/share/doc/psd/Makefile
diff -u src/share/doc/psd/Makefile:1.13 src/share/doc/psd/Makefile:1.13.72.1
--- src/share/doc/psd/Makefile:1.13 Sun Jan 11 16:11:52 2004
+++ src/share/doc/psd/Makefile Sun Aug 10 06:53:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/11 16:11:52 lukem Exp $
+# $NetBSD: Makefile,v 1.13.72.1 2014/08/10 06:53:13 tls Exp $
# @(#)Makefile 8.2 (Berkeley) 5/23/94
.include bsd.own.mk
@@ -13,10 +13,6 @@
# 01.cacm 02.implement 03.iosys 04.uprog 06.Clang 08.f77 09.f77io
# 11.adb 15.yacc 16.lex
-BINDIR= /usr/share/doc/psd
-.if ${MKDOC} != no
-FILES= 00.contents Makefile Title
-.endif
SUBDIR= 05.sysman 20.ipctut 21.ipc
.if exists(12.make)
SUBDIR+= 12.make
@@ -31,8 +27,11 @@ SUBDIR+= 19.curses
# 07.pascal 08.f77 09.f77io 11.adb 12.make 14.sccs 15.yacc \
# 16.lex 17.m4 18.gprof 19.curses 20.ipctut 21.ipc
-Title.ps: ${FILES}
- ${TOOL_ROFF_PS} -ms Title ${.TARGET}
+SECTION=psd
+SUBARTICLES=title contents
+SRCS.title=Title
+SRCS.contents=00.contents
+MACROS=-ms
-.include bsd.prog.mk
+.include bsd.doc.mk
.include bsd.subdir.mk
Index: src/share/doc/psd/05.sysman/Makefile
diff -u src/share/doc/psd/05.sysman/Makefile:1.8 src/share/doc/psd/05.sysman/Makefile:1.8.2.1
--- src/share/doc/psd/05.sysman/Makefile:1.8 Sun Oct 6 05:45:19 2013
+++
CVS commit: [tls-earlyentropy] src/share/man
Module Name:src Committed By: tls Date: Sun Aug 10 06:53:26 UTC 2014 Modified Files: src/share/man/man3 [tls-earlyentropy]: attribute.3 queue.3 src/share/man/man4 [tls-earlyentropy]: Makefile acpi.4 athn.4 bpf.4 ddb.4 lua.4 netintro.4 options.4 ubsec.4 ucom.4 uhso.4 uplcom.4 urtwn.4 wm.4 src/share/man/man4/man4.evbarm [tls-earlyentropy]: Makefile src/share/man/man4/man4.x86 [tls-earlyentropy]: Makefile src/share/man/man7 [tls-earlyentropy]: signal.7 sysctl.7 tests.atf.7 tests.kyua.7 src/share/man/man8 [tls-earlyentropy]: wizd.8 src/share/man/man9 [tls-earlyentropy]: Makefile audio.9 callout.9 cardbus.9 malloc.9 namei.9 pcu.9 uvm_km.9 uvm_map.9 vfssubr.9 vnodeops.9 Added Files: src/share/man/man4 [tls-earlyentropy]: asus.4 bpfjit.4 hythygtemp.4 mcp23s17gpio.4 src/share/man/man4/man4.evbarm [tls-earlyentropy]: bcmgpio.4 src/share/man/man4/man4.x86 [tls-earlyentropy]: vmx.4 src/share/man/man9 [tls-earlyentropy]: ipi.9 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.2.1 src/share/man/man3/attribute.3 cvs rdiff -u -r1.47 -r1.47.2.1 src/share/man/man3/queue.3 cvs rdiff -u -r1.611 -r1.611.2.1 src/share/man/man4/Makefile cvs rdiff -u -r1.75 -r1.75.8.1 src/share/man/man4/acpi.4 cvs rdiff -u -r0 -r1.3.2.2 src/share/man/man4/asus.4 cvs rdiff -u -r1.6 -r1.6.2.1 src/share/man/man4/athn.4 cvs rdiff -u -r1.53 -r1.53.2.1 src/share/man/man4/bpf.4 cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/bpfjit.4 \ src/share/man/man4/hythygtemp.4 cvs rdiff -u -r1.155 -r1.155.2.1 src/share/man/man4/ddb.4 cvs rdiff -u -r1.3 -r1.3.2.1 src/share/man/man4/lua.4 cvs rdiff -u -r0 -r1.2.4.2 src/share/man/man4/mcp23s17gpio.4 cvs rdiff -u -r1.27 -r1.27.2.1 src/share/man/man4/netintro.4 cvs rdiff -u -r1.437 -r1.437.2.1 src/share/man/man4/options.4 cvs rdiff -u -r1.4 -r1.4.72.1 src/share/man/man4/ubsec.4 cvs rdiff -u -r1.22 -r1.22.2.1 src/share/man/man4/ucom.4 cvs rdiff -u -r1.3 -r1.3.18.1 src/share/man/man4/uhso.4 cvs rdiff -u -r1.18 -r1.18.40.1 src/share/man/man4/uplcom.4 cvs rdiff -u -r1.10 -r1.10.2.1 src/share/man/man4/urtwn.4 cvs rdiff -u -r1.29 -r1.29.2.1 src/share/man/man4/wm.4 cvs rdiff -u -r1.5 -r1.5.6.1 src/share/man/man4/man4.evbarm/Makefile cvs rdiff -u -r0 -r1.1.4.2 src/share/man/man4/man4.evbarm/bcmgpio.4 cvs rdiff -u -r1.14 -r1.14.4.1 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/man4.x86/vmx.4 cvs rdiff -u -r1.16 -r1.16.22.1 src/share/man/man7/signal.7 cvs rdiff -u -r1.79 -r1.79.2.1 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.3 -r1.3.2.1 src/share/man/man7/tests.atf.7 \ src/share/man/man7/tests.kyua.7 cvs rdiff -u -r1.6 -r1.6.38.1 src/share/man/man8/wizd.8 cvs rdiff -u -r1.377 -r1.377.2.1 src/share/man/man9/Makefile cvs rdiff -u -r1.43 -r1.43.16.1 src/share/man/man9/audio.9 cvs rdiff -u -r1.26 -r1.26.6.1 src/share/man/man9/callout.9 cvs rdiff -u -r1.18 -r1.18.2.1 src/share/man/man9/cardbus.9 cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man9/ipi.9 cvs rdiff -u -r1.47 -r1.47.24.1 src/share/man/man9/malloc.9 cvs rdiff -u -r1.31 -r1.31.4.1 src/share/man/man9/namei.9 cvs rdiff -u -r1.4 -r1.4.2.1 src/share/man/man9/pcu.9 cvs rdiff -u -r1.2 -r1.2.18.1 src/share/man/man9/uvm_km.9 \ src/share/man/man9/uvm_map.9 cvs rdiff -u -r1.23 -r1.23.2.1 src/share/man/man9/vfssubr.9 cvs rdiff -u -r1.93 -r1.93.2.1 src/share/man/man9/vnodeops.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.15 src/share/man/man3/attribute.3:1.15.2.1 --- src/share/man/man3/attribute.3:1.15 Fri Oct 25 22:19:41 2013 +++ src/share/man/man3/attribute.3 Sun Aug 10 06:53:25 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.15 2013/10/25 22:19:41 wiz Exp $ +.\ $NetBSD: attribute.3,v 1.15.2.1 2014/08/10 06:53:25 tls Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -344,7 +344,7 @@ Semantically .Ic __predict_true expects that the integral expression .Fa exp -equals 1. +yields nonzero. .It Ic __predict_false The .Ic __predict_false Index: src/share/man/man3/queue.3 diff -u src/share/man/man3/queue.3:1.47 src/share/man/man3/queue.3:1.47.2.1 --- src/share/man/man3/queue.3:1.47 Thu Nov 28 16:45:36 2013 +++ src/share/man/man3/queue.3 Sun Aug 10 06:53:25 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: queue.3,v 1.47 2013/11/28 16:45:36 wiz Exp $ +.\ $NetBSD: queue.3,v 1.47.2.1 2014/08/10 06:53:25 tls Exp $ .\ .\ Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -53,7 +53,7 @@ .\ .\ @(#)queue.3 8.1 (Berkeley) 12/13/93 .\ -.Dd November 27, 2013 +.Dd May 17, 2014 .Dt QUEUE 3 .Os .Sh NAME @@ -85,6 +85,7 @@ .Nm LIST_INSERT_HEAD , .Nm LIST_REMOVE , .Nm LIST_REPLACE , +.Nm LIST_MOVE , .Nm SIMPLEQ_HEAD ,
CVS commit: [tls-earlyentropy] src/sys/coda
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:54:29 UTC 2014
Modified Files:
src/sys/coda [tls-earlyentropy]: coda_psdev.c coda_vfsops.c
coda_vnops.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.80 -r1.80.2.1 src/sys/coda/coda_vfsops.c
cvs rdiff -u -r1.96 -r1.96.2.1 src/sys/coda/coda_vnops.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/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.52 src/sys/coda/coda_psdev.c:1.52.2.1
--- src/sys/coda/coda_psdev.c:1.52 Sun Mar 16 05:20:26 2014
+++ src/sys/coda/coda_psdev.c Sun Aug 10 06:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.52 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.52.2.1 2014/08/10 06:54:29 tls Exp $ */
/*
*
@@ -54,7 +54,7 @@
/* These routines are the device entry points for Venus. */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coda_psdev.c,v 1.52 2014/03/16 05:20:26 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: coda_psdev.c,v 1.52.2.1 2014/08/10 06:54:29 tls Exp $);
extern int coda_nc_initialized;/* Set if cache has been initialized */
@@ -121,6 +121,7 @@ const struct cdevsw vcoda_cdevsw = {
.d_poll = vc_nb_poll,
.d_mmap = nommap,
.d_kqfilter = vc_nb_kqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER,
};
Index: src/sys/coda/coda_vfsops.c
diff -u src/sys/coda/coda_vfsops.c:1.80 src/sys/coda/coda_vfsops.c:1.80.2.1
--- src/sys/coda/coda_vfsops.c:1.80 Sun Mar 23 15:21:15 2014
+++ src/sys/coda/coda_vfsops.c Sun Aug 10 06:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vfsops.c,v 1.80 2014/03/23 15:21:15 hannken Exp $ */
+/* $NetBSD: coda_vfsops.c,v 1.80.2.1 2014/08/10 06:54:29 tls Exp $ */
/*
*
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coda_vfsops.c,v 1.80 2014/03/23 15:21:15 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: coda_vfsops.c,v 1.80.2.1 2014/08/10 06:54:29 tls Exp $);
#ifndef _KERNEL_OPT
#define NVCODA 4
@@ -178,6 +178,8 @@ coda_mount(struct mount *vfsp, /* Alloca
CodaFid ctlfid = CTL_FID;
int error;
+if (data == NULL)
+ return EINVAL;
if (vfsp-mnt_flag MNT_GETARGS)
return EINVAL;
ENTRY;
Index: src/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.96 src/sys/coda/coda_vnops.c:1.96.2.1
--- src/sys/coda/coda_vnops.c:1.96 Thu Mar 20 06:48:54 2014
+++ src/sys/coda/coda_vnops.c Sun Aug 10 06:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.96 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.96.2.1 2014/08/10 06:54:29 tls Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coda_vnops.c,v 1.96 2014/03/20 06:48:54 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: coda_vnops.c,v 1.96.2.1 2014/08/10 06:54:29 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -109,6 +109,8 @@ const struct vnodeopv_entry_desc coda_vn
{ vop_setattr_desc, coda_setattr }, /* setattr */
{ vop_read_desc, coda_read }, /* read */
{ vop_write_desc, coda_write }, /* write */
+{ vop_fallocate_desc, genfs_eopnotsupp }, /* fallocate */
+{ vop_fdiscard_desc, genfs_eopnotsupp }, /* fdiscard */
{ vop_fcntl_desc, genfs_fcntl }, /* fcntl */
{ vop_ioctl_desc, coda_ioctl }, /* ioctl */
{ vop_mmap_desc, genfs_mmap }, /* mmap */
CVS commit: [tls-earlyentropy] src/sys/altq
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:53:38 UTC 2014
Modified Files:
src/sys/altq [tls-earlyentropy]: altq_conf.c altq_subr.c if_altq.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/altq/altq_conf.c
cvs rdiff -u -r1.28 -r1.28.38.1 src/sys/altq/altq_subr.c
cvs rdiff -u -r1.13 -r1.13.36.1 src/sys/altq/if_altq.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/altq/altq_conf.c
diff -u src/sys/altq/altq_conf.c:1.20 src/sys/altq/altq_conf.c:1.20.2.1
--- src/sys/altq/altq_conf.c:1.20 Sun Mar 16 05:20:22 2014
+++ src/sys/altq/altq_conf.c Sun Aug 10 06:53:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_conf.c,v 1.20 2014/03/16 05:20:22 dholland Exp $ */
+/* $NetBSD: altq_conf.c,v 1.20.2.1 2014/08/10 06:53:38 tls Exp $ */
/* $KAME: altq_conf.c,v 1.24 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_conf.c,v 1.20 2014/03/16 05:20:22 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_conf.c,v 1.20.2.1 2014/08/10 06:53:38 tls Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -178,6 +178,7 @@ const struct cdevsw altq_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER,
};
Index: src/sys/altq/altq_subr.c
diff -u src/sys/altq/altq_subr.c:1.28 src/sys/altq/altq_subr.c:1.28.38.1
--- src/sys/altq/altq_subr.c:1.28 Sun Jan 4 18:41:36 2009
+++ src/sys/altq/altq_subr.c Sun Aug 10 06:53:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_subr.c,v 1.28 2009/01/04 18:41:36 pooka Exp $ */
+/* $NetBSD: altq_subr.c,v 1.28.38.1 2014/08/10 06:53:38 tls Exp $ */
/* $KAME: altq_subr.c,v 1.24 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_subr.c,v 1.28 2009/01/04 18:41:36 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_subr.c,v 1.28.38.1 2014/08/10 06:53:38 tls Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -356,7 +356,7 @@ tbr_timeout(void *arg)
active = 0;
s = splnet();
- for (ifp = TAILQ_FIRST(ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
+ IFNET_FOREACH(ifp) {
if (!TBR_IS_ENABLED(ifp-if_snd))
continue;
active++;
Index: src/sys/altq/if_altq.h
diff -u src/sys/altq/if_altq.h:1.13 src/sys/altq/if_altq.h:1.13.36.1
--- src/sys/altq/if_altq.h:1.13 Tue Aug 18 17:20:20 2009
+++ src/sys/altq/if_altq.h Sun Aug 10 06:53:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_altq.h,v 1.13 2009/08/18 17:20:20 dyoung Exp $ */
+/* $NetBSD: if_altq.h,v 1.13.36.1 2014/08/10 06:53:38 tls Exp $ */
/* $KAME: if_altq.h,v 1.12 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -45,6 +45,7 @@ struct ifaltq {
int ifq_len;
int ifq_maxlen;
int ifq_drops;
+ kmutex_t *ifq_lock;
/* alternate queueing related fields */
int altq_type; /* discipline type */
CVS commit: [tls-earlyentropy] src/sys/arch
Module Name:src Committed By: tls Date: Sun Aug 10 06:54:12 UTC 2014 Modified Files: src/sys/arch/acorn26/conf [tls-earlyentropy]: GENERIC src/sys/arch/acorn26/include [tls-earlyentropy]: loadfile_machdep.h src/sys/arch/acorn26/ioc [tls-earlyentropy]: arcpp.c src/sys/arch/acorn32/conf [tls-earlyentropy]: GENERIC LOWMEM_WSCONS NC src/sys/arch/acorn32/include [tls-earlyentropy]: loadfile_machdep.h src/sys/arch/acorn32/mainbus [tls-earlyentropy]: fd.c src/sys/arch/algor/conf [tls-earlyentropy]: P4032 P5064 P6032 files.algor src/sys/arch/alpha/alpha [tls-earlyentropy]: compat_13_machdep.c compat_16_machdep.c core_machdep.c fp_complete.c ipifuncs.c machdep.c process_machdep.c promcons.c trap.c vm_machdep.c src/sys/arch/alpha/include [tls-earlyentropy]: alpha.h intr.h limits.h loadfile_machdep.h proc.h src/sys/arch/amd64/amd64 [tls-earlyentropy]: locore.S machdep.c netbsd32_syscall.c rbus_machdep.c src/sys/arch/amd64/conf [tls-earlyentropy]: ALL DRMKMS GENERIC Makefile.amd64 XEN3_DOM0 XEN3_DOMU kern.ldscript src/sys/arch/amd64/include [tls-earlyentropy]: Makefile asm.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h limits.h mcontext.h vmparam.h src/sys/arch/amiga/amiga [tls-earlyentropy]: amiga_bus_simple_1word.c src/sys/arch/amiga/conf [tls-earlyentropy]: DRACO GENERIC GENERIC.in INSTALL files.amiga src/sys/arch/amiga/dev [tls-earlyentropy]: fd.c grf.c ite.c kbd.c kbdmap.c mfc.c ms.c msc.c par.c sbic.c ser.c view.c src/sys/arch/amiga/include [tls-earlyentropy]: loadfile_machdep.h src/sys/arch/amiga/stand/bootblock/boot [tls-earlyentropy]: Makefile src/sys/arch/amiga/stand/bootblock/bootxx_ffs [tls-earlyentropy]: Makefile src/sys/arch/amigappc/amigappc [tls-earlyentropy]: locore.S src/sys/arch/amigappc/include [tls-earlyentropy]: Makefile src/sys/arch/arc [tls-earlyentropy]: TODO src/sys/arch/arc/conf [tls-earlyentropy]: ARCTIC GENERIC M403 MIMORI PICA RPC44 files.arc src/sys/arch/arc/dev [tls-earlyentropy]: opms.c pccons.c src/sys/arch/arc/include [tls-earlyentropy]: loadfile_machdep.h src/sys/arch/arc/jazz [tls-earlyentropy]: fd.c src/sys/arch/arm/allwinner [tls-earlyentropy]: awin_board.c awin_eth.c awin_reg.h awin_tmr.c awin_usb.c awin_var.h src/sys/arch/arm/arm [tls-earlyentropy]: arm_machdep.c cpufunc.c cpufunc_asm_arm11.S cpufunc_asm_arm11x6.S cpufunc_asm_armv6.S cpufunc_asm_armv7.S cpufunc_asm_sheeva.S disksubr.c src/sys/arch/arm/arm32 [tls-earlyentropy]: arm32_kvminit.c arm32_machdep.c arm32_tlb.c bus_dma.c cpuswitch.S fault.c genassym.cf locore.S netbsd32_machdep.c pmap.c src/sys/arch/arm/at91 [tls-earlyentropy]: at91dbgu.c at91usart.c src/sys/arch/arm/broadcom [tls-earlyentropy]: bcm2835_genfb.c bcm2835_gpio_subr.c bcm2835_gpio_subr.h bcm2835_gpioreg.h bcm2835_obio.c bcm2835_vcaudio.c bcm2835_vcaudioreg.h bcm53xx_usb.c files.bcm2835 src/sys/arch/arm/clps711x [tls-earlyentropy]: clpscom.c src/sys/arch/arm/conf [tls-earlyentropy]: files.arm majors.arm32 src/sys/arch/arm/cortex [tls-earlyentropy]: a9_mpsubr.S a9wdt.c gic.c gic_intr.h gic_reg.h gtmr.c pl310.c src/sys/arch/arm/cortina [tls-earlyentropy]: files.g2 src/sys/arch/arm/ep93xx [tls-earlyentropy]: epcom.c src/sys/arch/arm/footbridge [tls-earlyentropy]: footbridge_com.c src/sys/arch/arm/imx [tls-earlyentropy]: files.imx51 imx51_ccm.c imx51_ccmreg.h imx51_ccmvar.h imx51_clock.c imx51_dpllreg.h imx51_gpio.c imx51_iomuxreg.h imx51_ipuv3.c imx51_ipuv3var.h imx51_tzic.c imx51_uart.c imx51_usb.c imx51reg.h imxclock.c imxi2creg.h imxsdmareg.h imxuart.c imxusb.c imxusbreg.h imxusbvar.h imxwdog.c src/sys/arch/arm/include [tls-earlyentropy]: Makefile armreg.h cdefs.h cpuconf.h cpufunc.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h mutex.h profile.h rwlock.h types.h src/sys/arch/arm/include/arm32 [tls-earlyentropy]: pmap.h pte.h vmparam.h src/sys/arch/arm/ixp12x0 [tls-earlyentropy]: ixp12x0_com.c src/sys/arch/arm/mainbus [tls-earlyentropy]: cpu_mainbus.c mainbus.c src/sys/arch/arm/marvell [tls-earlyentropy]: armadaxp.c src/sys/arch/arm/ofw [tls-earlyentropy]: ofw_irqhandler.c src/sys/arch/arm/omap [tls-earlyentropy]: am335x_prcm.c am335x_prcm.h files.omap2 if_cpsw.c obio_com.c omap2_reg.h omap3_sdmareg.h omap5430_intr.h omapfb.c sitara_cmreg.h src/sys/arch/arm/pic [tls-earlyentropy]:
CVS commit: [tls-earlyentropy] src/sys/conf
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:54:36 UTC 2014
Modified Files:
src/sys/conf [tls-earlyentropy]: Makefile.kern.inc files newvers.sh
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.167.2.1 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1090.2.2 -r1.1090.2.3 src/sys/conf/files
cvs rdiff -u -r1.57 -r1.57.36.1 src/sys/conf/newvers.sh
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/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.167 src/sys/conf/Makefile.kern.inc:1.167.2.1
--- src/sys/conf/Makefile.kern.inc:1.167 Mon Mar 10 02:36:50 2014
+++ src/sys/conf/Makefile.kern.inc Sun Aug 10 06:54:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.167 2014/03/10 02:36:50 ozaki-r Exp $
+# $NetBSD: Makefile.kern.inc,v 1.167.2.1 2014/08/10 06:54:36 tls Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -17,6 +17,11 @@
#
# all ports are expected to include bsd.own.mk for toolchain settings
+# Default DEBUG to -g if kernel debug info is requested by MKKDEBUG=yes
+.if defined(MKKDEBUG) ${MKKDEBUG} == yes
+DEBUG?=-g
+.endif
+
##
## (0) toolchain settings for things that aren't part of the standard
## toolchain
@@ -111,13 +116,6 @@ COPTS.kern_ssp.c+= -fno-stack-protector
COPTS.cpu.c+= -fno-stack-protector
.endif
-# If we want the bpendtsleep: label in kern_synch.c, we need to use
-# -fno-reorder-blocks. Don't make this a config(1) defflag without
-# making sure this fragment remains valid.
-.if defined(HAVE_GCC) !empty(${CFLAGS:M-DKERN_SYNCH_BPENDTSLEEP_LABEL})
-COPTS.kern_synch.c+= -fno-reorder-blocks
-.endif
-
# Use the per-source COPTS variables to add -g to just those
# files that match the shell patterns given in ${DEBUGLIST}
#
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1090.2.2 src/sys/conf/files:1.1090.2.3
--- src/sys/conf/files:1.1090.2.2 Sat Aug 9 06:19:50 2014
+++ src/sys/conf/files Sun Aug 10 06:54:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1090.2.2 2014/08/09 06:19:50 tls Exp $
+# $NetBSD: files,v 1.1090.2.3 2014/08/10 06:54:36 tls Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1231,6 +1231,10 @@ file dev/usb/ehci.c ehci needs-flag
device xhci: usbus, usbroothub, usb_dma
file dev/usb/xhci.c xhci needs-flag
+# Mentor graphics OTG IP
+device motg: usbus, usbroothub, usb_dma
+file dev/usb/motg.c motg needs-flag
+
# SL811HS/T USB controller
defflag opt_slhci.h SLHCI_DEBUG SLHCI_TRY_LSVH SLHCI_PROFILE_TRANSFER
device slhci: usbus, usbroothub
@@ -1601,6 +1605,7 @@ file kern/subr_extent.c
file kern/subr_hash.c
file kern/subr_humanize.c
file kern/subr_iostat.c
+file kern/subr_ipi.c
file kern/subr_kcpuset.c
file kern/subr_kmem.c
file kern/subr_kobj.c
@@ -1706,7 +1711,7 @@ file net/bridgestp.c bridge
file net/if_ecosubr.c eco
file net/if_etherip.c etherip needs-flag
file net/if_ethersubr.c ether | fddi | netatalk | token |
- wlan
+ wlan needs-flag
file net/if_faith.c faith (inet | inet6) needs-flag
file net/if_fddisubr.c fddi needs-flag
file net/if_gif.c gif needs-flag
@@ -1718,7 +1723,7 @@ file net/if_media.c
file net/if_mpls.c ifmpls needs-flag
file net/if_ppp.c ppp needs-flag
file net/if_srt.c srt
-file net/if_stf.c stf (inet | inet6) needs-flag
+file net/if_stf.c stf inet inet6 needs-flag
file net/if_sl.c sl needs-flag
file net/if_spppsubr.c sppp
file net/if_strip.c strip needs-flag
@@ -1730,6 +1735,7 @@ file net/if_pppoe.c pppoe needs-flag
file net/pfil.c
file net/ppp-deflate.c ppp ppp_deflate
file net/ppp_tty.c ppp
+file net/pktqueue.c
file net/net_stats.c
file net/radix.c
file net/raw_cb.c
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.57 src/sys/conf/newvers.sh:1.57.36.1
--- src/sys/conf/newvers.sh:1.57 Sun Jan 10 23:55:03 2010
+++ src/sys/conf/newvers.sh Sun Aug 10 06:54:36 2014
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.57 2010/01/10 23:55:03 snj Exp $
+# $NetBSD: newvers.sh,v 1.57.36.1 2014/08/10 06:54:36 tls Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -31,6 +31,115 @@
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
+# newvers.sh -- Create a vers.c file containing version information.
+#
+# The vers.c file in the current directory is the primary output. It
+# contains C source code with several variables containing information
+# about the build. This file is expected to be incorporated into a
+# kernel, and when that kernel is booted then the information can be
+# queried by the uname(8) command.
+#
+# Command line options:
+#
+# -rReproducible build: Do not embed directory
+# names,
CVS commit: [tls-earlyentropy] src/sys/ddb
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:54:38 UTC 2014
Modified Files:
src/sys/ddb [tls-earlyentropy]: db_cpu.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/ddb/db_cpu.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/ddb/db_cpu.c
diff -u src/sys/ddb/db_cpu.c:1.5 src/sys/ddb/db_cpu.c:1.5.2.1
--- src/sys/ddb/db_cpu.c:1.5 Sun Nov 24 21:58:38 2013
+++ src/sys/ddb/db_cpu.c Sun Aug 10 06:54:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_cpu.c,v 1.5 2013/11/24 21:58:38 rmind Exp $ */
+/* $NetBSD: db_cpu.c,v 1.5.2.1 2014/08/10 06:54:38 tls Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_cpu.c,v 1.5 2013/11/24 21:58:38 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_cpu.c,v 1.5.2.1 2014/08/10 06:54:38 tls Exp $);
#ifndef _KERNEL
#include stdbool.h
@@ -42,23 +42,37 @@ __KERNEL_RCSID(0, $NetBSD: db_cpu.c,v 1
#include ddb/ddb.h
-static struct cpu_info **cpu_info_addr;
+static int db_ncpu;
+static struct cpu_info **db_cpu_infos;
+
+static void
+db_cpu_init(void)
+{
+ db_expr_t addr;
+
+ db_value_of_name(ncpu, addr);
+ db_read_bytes((db_addr_t)addr, sizeof(db_ncpu), (char *)db_ncpu);
+
+ db_value_of_name(cpu_infos, addr);
+ db_read_bytes((db_addr_t)addr, sizeof(db_cpu_infos),
+ (char *)db_cpu_infos);
+}
static struct cpu_info *
-db_cpu_index(u_int idx)
+db_cpu_by_index(u_int idx)
{
- db_addr_t slot_addr = (db_addr_t)(cpu_info_addr + idx);
struct cpu_info *ci;
- db_read_bytes(slot_addr, sizeof(ci), (char *)ci);
+ db_read_bytes((db_addr_t)db_cpu_infos[idx], sizeof(ci), (char *)ci);
return ci;
}
struct cpu_info *
db_cpu_first(void)
{
- db_value_of_name(cpu_infos, (db_expr_t *)cpu_info_addr);
- return db_cpu_index(0);
+
+ db_cpu_init();
+ return db_cpu_by_index(0);
}
struct cpu_info *
@@ -67,5 +81,7 @@ db_cpu_next(struct cpu_info *ci)
u_int idx;
db_read_bytes((db_addr_t)ci-ci_index, sizeof(idx), (char *)idx);
- return db_cpu_index(idx + 1);
+ if ((idx + 1) = (u_int)db_ncpu)
+ return NULL;
+ return db_cpu_by_index(idx + 1);
}
CVS commit: [tls-earlyentropy] src/sys/dist/pf/net
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:55:09 UTC 2014
Modified Files:
src/sys/dist/pf/net [tls-earlyentropy]: pf.c pf_if.c pf_ioctl.c pfvar.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dist/pf/net/pf.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/dist/pf/net/pf_if.c
cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/dist/pf/net/pfvar.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.70 src/sys/dist/pf/net/pf.c:1.70.2.1
--- src/sys/dist/pf/net/pf.c:1.70 Sun Oct 20 21:05:47 2013
+++ src/sys/dist/pf/net/pf.c Sun Aug 10 06:55:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.70 2013/10/20 21:05:47 christos Exp $ */
+/* $NetBSD: pf.c,v 1.70.2.1 2014/08/10 06:55:09 tls Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.70 2013/10/20 21:05:47 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.70.2.1 2014/08/10 06:55:09 tls Exp $);
#include pflog.h
@@ -5822,7 +5822,7 @@ pf_test(int dir, struct ifnet *ifp, stru
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ipintrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -5852,7 +5852,7 @@ pf_test(int dir, struct ifnet *ifp, stru
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ipintrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -5876,7 +5876,7 @@ pf_test(int dir, struct ifnet *ifp, stru
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ipintrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -5900,7 +5900,7 @@ pf_test(int dir, struct ifnet *ifp, stru
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif, m, off, h,
- pd, a, ruleset, ipintrq);
+ pd, a, ruleset, NULL);
break;
}
@@ -5963,6 +5963,7 @@ done:
#endif /* !__NetBSD__ */
if (log) {
+#if NPFLOG 0
struct pf_rule *lr;
if (s != NULL s-nat_rule.ptr != NULL
@@ -5972,6 +5973,7 @@ done:
lr = r;
PFLOG_PACKET(kif, h, m, AF_INET, dir, reason, lr, a, ruleset,
pd);
+#endif
}
kif-pfik_bytes[0][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
@@ -6241,7 +6243,7 @@ pf_test6(int dir, struct ifnet *ifp, str
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ip6intrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -6271,7 +6273,7 @@ pf_test6(int dir, struct ifnet *ifp, str
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ip6intrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -6304,7 +6306,7 @@ pf_test6(int dir, struct ifnet *ifp, str
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif,
- m, off, h, pd, a, ruleset, ip6intrq);
+ m, off, h, pd, a, ruleset, NULL);
break;
}
@@ -6319,7 +6321,7 @@ pf_test6(int dir, struct ifnet *ifp, str
log = s-log;
} else if (s == NULL)
action = pf_test_rule(r, s, dir, kif, m, off, h,
- pd, a, ruleset, ip6intrq);
+ pd, a, ruleset, NULL);
break;
}
@@ -6383,6 +6385,7 @@ done:
#endif /* !__NetBSD__ */
if (log) {
+#if NPFLOG 0
struct pf_rule *lr;
if (s != NULL s-nat_rule.ptr != NULL
@@ -6392,6 +6395,7 @@ done:
lr = r;
PFLOG_PACKET(kif, h, m, AF_INET6, dir, reason, lr, a, ruleset,
pd);
+#endif
}
kif-pfik_bytes[1][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
@@ -6476,6 +6480,8 @@ int
pf_check_congestion(struct ifqueue *ifq)
{
#ifdef __NetBSD__
+ // XXX: not handled anyway
+ KASSERT(ifq == NULL);
return (0);
#else
if (ifq-ifq_congestion)
Index: src/sys/dist/pf/net/pf_if.c
diff -u src/sys/dist/pf/net/pf_if.c:1.24 src/sys/dist/pf/net/pf_if.c:1.24.4.1
--- src/sys/dist/pf/net/pf_if.c:1.24 Mon Jul 1 08:32:48 2013
+++ src/sys/dist/pf/net/pf_if.c Sun Aug 10 06:55:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_if.c,v 1.24 2013/07/01 08:32:48 skrll Exp $ */
+/* $NetBSD: pf_if.c,v 1.24.4.1 2014/08/10 06:55:09 tls Exp $ */
/* $OpenBSD: pf_if.c,v 1.47 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf_if.c,v 1.24 2013/07/01 08:32:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf_if.c,v 1.24.4.1 2014/08/10 06:55:09 tls Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -100,10 +100,6 @@ RB_GENERATE(pfi_ifhead, pfi_kif, pfik_tr
void
pfi_initialize(void)
{
-#ifdef __NetBSD__
- int i;
-#endif /* __NetBSD__ */
-
if (pfi_all !=
CVS commit: [tls-earlyentropy] src/sys/dev
Module Name:src Committed By: tls Date: Sun Aug 10 06:54:59 UTC 2014 Modified Files: src/sys/dev [tls-earlyentropy]: DEVNAMES audio.c bio.c ccd.c cgd.c clockctl.c cons.c dksubr.c dkvar.h fss.c kttcp.c ld.c lockstat.c md.c midi.c mm.c nullcons_subr.c radio.c rndpseudo.c sequencer.c verified_exec.c video.c vnd.c src/sys/dev/acpi [tls-earlyentropy]: acpi_ec.c acpi_pci_link.c src/sys/dev/altmem [tls-earlyentropy]: altmem.c src/sys/dev/apm [tls-earlyentropy]: apm.c src/sys/dev/arcbios [tls-earlyentropy]: arcbios_tty.c src/sys/dev/ata [tls-earlyentropy]: ata.c wd.c src/sys/dev/bluetooth [tls-earlyentropy]: bcsp.c bthidev.c bthub.c btmagic.c btsco.c btuart.c src/sys/dev/dec [tls-earlyentropy]: dz.c src/sys/dev/dkwedge [tls-earlyentropy]: dk.c src/sys/dev/dm [tls-earlyentropy]: device-mapper.c dm.h dm_target_linear.c dm_target_snapshot.c dm_target_stripe.c src/sys/dev/dmover [tls-earlyentropy]: dmover_io.c src/sys/dev/dtv [tls-earlyentropy]: dtv_device.c src/sys/dev/filemon [tls-earlyentropy]: filemon.c src/sys/dev/flash [tls-earlyentropy]: flash.c src/sys/dev/gpib [tls-earlyentropy]: ct.c gpib.c mt.c ppi.c rd.c src/sys/dev/gpio [tls-earlyentropy]: gpio.c src/sys/dev/hpc [tls-earlyentropy]: biconsdev.c btnmgr.c src/sys/dev/hpc/apm [tls-earlyentropy]: apmdev.c src/sys/dev/i2c [tls-earlyentropy]: at24cxx.c ds1307.c files.i2c i2c.c m41st84.c m41t00.c max6900.c pcf8583.c rs5c372.c spdmem_i2c.c tps65217pmic.c tps65217pmicreg.h w83795g.c x1226.c src/sys/dev/i2o [tls-earlyentropy]: dpti.c iop.c src/sys/dev/ic [tls-earlyentropy]: aic79xx.c apple_smc.c athioctl.h athn.c atppc.c cd18xx.c clmpcc.c com.c cy.c dpt.c hd64570.c icp_ioctl.c joy.c lpt.c mfi.c mlx.c mpt_debug.c mpt_netbsd.c rrunner.c rtl80x9.c smc91cxx.c spdmem.c sti.c stivar.h tpm.c vga.c vga_raster.c z8530tty.c src/sys/dev/ieee1394 [tls-earlyentropy]: fwdev.c src/sys/dev/ir [tls-earlyentropy]: cir.c irframe.c src/sys/dev/isa [tls-earlyentropy]: fd.c isv.c mcd.c satlink.c seagate.c spkr.c wt.c src/sys/dev/iscsi [tls-earlyentropy]: iscsi_main.c iscsi_pdu.h src/sys/dev/marvell [tls-earlyentropy]: gtmpsc.c src/sys/dev/mca [tls-earlyentropy]: ed_mca.c src/sys/dev/microcode/radeon [tls-earlyentropy]: CEDAR_rlc.bin CYPRESS_rlc.bin JUNIPER_rlc.bin LICENSE.radeon Makefile R700_rlc.bin REDWOOD_rlc.bin src/sys/dev/mii [tls-earlyentropy]: acphy.c amhphy.c atphy.c bmtphy.c brgphy.c brgphyreg.h ciphy.c ciphyreg.h dmphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c inphy.c iophy.c lxtphy.c makphy.c makphyreg.h mii.h miidevs miidevs.h miidevs_data.h miivar.h mvphy.c nsphy.c nsphyter.c qsphy.c rlphy.c sqphy.c tlphy.c tqphy.c ukphy_subr.c urlphy.c src/sys/dev/mscp [tls-earlyentropy]: mscp_disk.c mscp_tape.c src/sys/dev/mvme [tls-earlyentropy]: lpt_mvme.c src/sys/dev/nor [tls-earlyentropy]: cfi_0002.c src/sys/dev/ofw [tls-earlyentropy]: ofcons.c ofdisk.c openfirmio.c src/sys/dev/onewire [tls-earlyentropy]: onewire.c owtemp.c src/sys/dev/pad [tls-earlyentropy]: pad.c src/sys/dev/pci [tls-earlyentropy]: agp.c agp_i810.c agp_i810var.h agpreg.h agpvar.h amr.c autri.c com_puc.c cz.c genfb_pci.c gffb.c hifn7751.c ichsmb.c if_bge.c if_bgereg.h if_bnx.c if_bnxreg.h if_bnxvar.h if_de.c if_kse.c if_lmc.c if_txp.c if_vioif.c if_wm.c if_wmreg.h if_wmvar.h if_wpi.c if_wpireg.h if_wpivar.h igma.c joy_pci.c ld_virtio.c mly.c pci_subr.c pci_usrreq.c pcidevs pcidevs.h pcidevs_data.h pciio.h pcireg.h piixpm.c radeonfb.c rdcide.c siside.c twa.c twe.c ubsec.c ubsecreg.h ubsecvar.h viomb.c virtio.c virtiovar.h voodoofb.c src/sys/dev/pci/bktr [tls-earlyentropy]: bktr_os.c src/sys/dev/pci/hdaudio [tls-earlyentropy]: hdafg.c hdaudio.c hdaudio_ids.c src/sys/dev/pci/ixgbe [tls-earlyentropy]: ixgbe.c ixgbe_82599.c ixgbe_api.c ixgbe_common.c ixgbe_netbsd.h ixgbe_phy.c ixgbe_type.h src/sys/dev/pci/n8/include_private [tls-earlyentropy]: n8_sks.h src/sys/dev/pckbport [tls-earlyentropy]: synaptics.c synapticsreg.h synapticsvar.h wskbdmap_mfii.c src/sys/dev/pcmcia [tls-earlyentropy]: bt3c.c btbc.c if_malo_pcmcia.c if_malo_pcmciavar.h src/sys/dev/ppbus [tls-earlyentropy]: if_plip.c lpt.c ppbus_1284.c ppbus_base.c pps_ppbus.c src/sys/dev/putter [tls-earlyentropy]: putter.c src/sys/dev/qbus [tls-earlyentropy]: dhu.c dl.c if_dmc.c if_il.c qd.c
CVS commit: [tls-earlyentropy] src/sys/external
Module Name:src Committed By: tls Date: Sun Aug 10 06:55:41 UTC 2014 Modified Files: src/sys/external/bsd/acpica/dist/include/platform [tls-earlyentropy]: acnetbsd.h src/sys/external/bsd/common/include/linux [tls-earlyentropy]: completion.h kernel.h list.h src/sys/external/bsd/compiler_rt [tls-earlyentropy]: prepare-import.sh src/sys/external/bsd/compiler_rt/dist [tls-earlyentropy]: CREDITS.TXT LICENSE.TXT README.txt src/sys/external/bsd/compiler_rt/dist/lib/builtins [tls-earlyentropy]: adddf3.c addsf3.c assembly.h clear_cache.c comparedf2.c comparesf2.c divdf3.c fp_lib.h int_lib.h src/sys/external/bsd/compiler_rt/dist/lib/builtins/arm [tls-earlyentropy]: adddf3vfp.S addsf3vfp.S aeabi_dcmp.S aeabi_fcmp.S aeabi_idivmod.S aeabi_ldivmod.S aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S aeabi_uidivmod.S aeabi_uldivmod.S bswapdi2.S bswapsi2.S clzdi2.S clzsi2.S comparesf2.S divdf3vfp.S divmodsi4.S divsf3vfp.S divsi3.S eqdf2vfp.S eqsf2vfp.S extendsfdf2vfp.S fixdfsivfp.S fixsfsivfp.S fixunsdfsivfp.S fixunssfsivfp.S floatsidfvfp.S floatsisfvfp.S floatunssidfvfp.S floatunssisfvfp.S gedf2vfp.S gesf2vfp.S gtdf2vfp.S gtsf2vfp.S ledf2vfp.S lesf2vfp.S ltdf2vfp.S ltsf2vfp.S modsi3.S muldf3vfp.S mulsf3vfp.S nedf2vfp.S negdf2vfp.S negsf2vfp.S nesf2vfp.S restore_vfp_d8_d15_regs.S save_vfp_d8_d15_regs.S subdf3vfp.S subsf3vfp.S switch16.S switch32.S switch8.S switchu8.S sync_synchronize.S truncdfsf2vfp.S unorddf2vfp.S unordsf2vfp.S src/sys/external/bsd/compiler_rt/dist/lib/builtins/i386 [tls-earlyentropy]: ashldi3.S ashrdi3.S divdi3.S floatdidf.S floatdisf.S floatdixf.S floatundidf.S floatundisf.S floatundixf.S lshrdi3.S moddi3.S muldi3.S udivdi3.S umoddi3.S src/sys/external/bsd/compiler_rt/dist/lib/builtins/ppc [tls-earlyentropy]: fixtfdi.c src/sys/external/bsd/compiler_rt/dist/lib/builtins/x86_64 [tls-earlyentropy]: floatundidf.S floatundisf.S floatundixf.S src/sys/external/bsd/compiler_rt/dist/lib/profile [tls-earlyentropy]: GCDAProfiling.c src/sys/external/bsd/drm/dist/bsd-core [tls-earlyentropy]: drm_drv.c drm_memory.c drm_scatter.c src/sys/external/bsd/drm2/dist/drm [tls-earlyentropy]: Kconfig Makefile drm_agpsupport.c drm_buffer.c drm_bufs.c drm_cache.c drm_context.c drm_crtc.c drm_crtc_helper.c drm_debugfs.c drm_dma.c drm_dp_helper.c drm_drv.c drm_edid.c drm_encoder_slave.c drm_fb_helper.c drm_fops.c drm_gem.c drm_hashtab.c drm_info.c drm_ioctl.c drm_irq.c drm_lock.c drm_memory.c drm_mm.c drm_modes.c drm_pci.c drm_platform.c drm_prime.c drm_scatter.c drm_stub.c drm_vm.c src/sys/external/bsd/drm2/dist/drm/ast [tls-earlyentropy]: Kconfig ast_drv.c ast_drv.h ast_fb.c ast_main.c ast_mode.c ast_post.c ast_ttm.c src/sys/external/bsd/drm2/dist/drm/i2c [tls-earlyentropy]: Makefile ch7006_drv.c src/sys/external/bsd/drm2/dist/drm/i810 [tls-earlyentropy]: i810_dma.c i810_drv.c i810_drv.h src/sys/external/bsd/drm2/dist/drm/i915 [tls-earlyentropy]: Makefile dvo.h dvo_ch7xxx.c dvo_ivch.c dvo_ns2501.c dvo_sil164.c dvo_tfp410.c i915_debugfs.c i915_dma.c i915_drv.c i915_drv.h i915_gem.c i915_gem_context.c i915_gem_debug.c i915_gem_dmabuf.c i915_gem_evict.c i915_gem_execbuffer.c i915_gem_gtt.c i915_gem_stolen.c i915_gem_tiling.c i915_irq.c i915_reg.h i915_suspend.c i915_sysfs.c intel_bios.c intel_bios.h intel_crt.c intel_ddi.c intel_display.c intel_dp.c intel_drv.h intel_dvo.c intel_hdmi.c intel_i2c.c intel_lvds.c intel_modes.c intel_opregion.c intel_overlay.c intel_panel.c intel_pm.c intel_ringbuffer.c intel_ringbuffer.h intel_sdvo.c intel_sdvo_regs.h intel_sprite.c intel_tv.c src/sys/external/bsd/drm2/dist/drm/mga [tls-earlyentropy]: mga_dma.c mga_drv.c mga_drv.h mga_ioc32.c mga_irq.c mga_state.c src/sys/external/bsd/drm2/dist/drm/r128 [tls-earlyentropy]: r128_cce.c r128_drv.c r128_drv.h r128_ioc32.c r128_irq.c r128_state.c src/sys/external/bsd/drm2/dist/drm/savage [tls-earlyentropy]: savage_bci.c savage_drv.c savage_drv.h savage_state.c src/sys/external/bsd/drm2/dist/drm/sis [tls-earlyentropy]: sis_drv.c sis_drv.h sis_mm.c src/sys/external/bsd/drm2/dist/drm/tdfx [tls-earlyentropy]: tdfx_drv.c src/sys/external/bsd/drm2/dist/drm/ttm [tls-earlyentropy]: Makefile ttm_agp_backend.c ttm_bo.c ttm_bo_manager.c
CVS commit: [tls-earlyentropy] src/sys/lib
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:02 UTC 2014
Modified Files:
src/sys/lib/libkern [tls-earlyentropy]: Makefile.libkern libkern.h
src/sys/lib/libsa [tls-earlyentropy]: Makefile
src/sys/lib/libunwind [tls-earlyentropy]: AddressSpace.hpp
DwarfInstructions.hpp DwarfParser.hpp Makefile.inc Registers.hpp
UnwindCursor.hpp libunwind.cxx unwind_registers.S
src/sys/lib/libz [tls-earlyentropy]: Makefile
Added Files:
src/sys/lib/libgnuefi [tls-earlyentropy]: Makefile Makefile.inc
src/sys/lib/libsa [tls-earlyentropy]: bootcfg.c bootcfg.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.6.2 src/sys/lib/libgnuefi/Makefile \
src/sys/lib/libgnuefi/Makefile.inc
cvs rdiff -u -r1.32.2.3 -r1.32.2.4 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.113.2.2 -r1.113.2.3 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.81 -r1.81.2.1 src/sys/lib/libsa/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/lib/libsa/bootcfg.c \
src/sys/lib/libsa/bootcfg.h
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/lib/libunwind/AddressSpace.hpp
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/lib/libunwind/DwarfInstructions.hpp
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/lib/libunwind/DwarfParser.hpp \
src/sys/lib/libunwind/UnwindCursor.hpp
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/lib/libunwind/Makefile.inc
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/lib/libunwind/Registers.hpp \
src/sys/lib/libunwind/unwind_registers.S
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/lib/libunwind/libunwind.cxx
cvs rdiff -u -r1.18 -r1.18.26.1 src/sys/lib/libz/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/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.32.2.3 src/sys/lib/libkern/Makefile.libkern:1.32.2.4
--- src/sys/lib/libkern/Makefile.libkern:1.32.2.3 Sat Aug 9 07:45:03 2014
+++ src/sys/lib/libkern/Makefile.libkern Sun Aug 10 06:56:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.32.2.3 2014/08/09 07:45:03 tls Exp $
+# $NetBSD: Makefile.libkern,v 1.32.2.4 2014/08/10 06:56:02 tls Exp $
#
# Variable definitions for libkern.
@@ -44,7 +44,7 @@ CPPFLAGS+= -I${KERNDIR}/../../../common/
.endif
.if !defined(RUMPKERNEL)
-.include .${PARSEDIR}/Makefile.compiler-rt
+.include ${.PARSEDIR}/Makefile.compiler-rt
.endif
# Other stuff
@@ -79,8 +79,8 @@ SRCS+= random.c
SRCS+= rngtest.c
SRCS+= memchr.c
-SRCS+= strcat.c strcmp.c strcpy.c strlen.c strnlen.c
-SRCS+= strncat.c strncmp.c strncpy.c
+SRCS+= strcat.c strcmp.c strcpy.c strcspn.c strlen.c strnlen.c
+SRCS+= strncat.c strncmp.c strncpy.c strpbrk.c strspn.c
SRCS+= strcasecmp.c strncasecmp.c
SRCS+= xlat_mbr_fstype.c
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.113.2.2 src/sys/lib/libkern/libkern.h:1.113.2.3
--- src/sys/lib/libkern/libkern.h:1.113.2.2 Sat Aug 9 07:45:03 2014
+++ src/sys/lib/libkern/libkern.h Sun Aug 10 06:56:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.113.2.2 2014/08/09 07:45:03 tls Exp $ */
+/* $NetBSD: libkern.h,v 1.113.2.3 2014/08/10 06:56:02 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -61,8 +61,13 @@ LIBKERN_INLINE int isascii(int) __unused
LIBKERN_INLINE int isupper(int) __unused;
LIBKERN_INLINE int islower(int) __unused;
LIBKERN_INLINE int isalpha(int) __unused;
+LIBKERN_INLINE int isalnum(int) __unused;
LIBKERN_INLINE int isdigit(int) __unused;
LIBKERN_INLINE int isxdigit(int) __unused;
+LIBKERN_INLINE int iscntrl(int) __unused;
+LIBKERN_INLINE int isgraph(int) __unused;
+LIBKERN_INLINE int isprint(int) __unused;
+LIBKERN_INLINE int ispunct(int) __unused;
LIBKERN_INLINE int toupper(int) __unused;
LIBKERN_INLINE int tolower(int) __unused;
@@ -163,6 +168,12 @@ isalpha(int ch)
}
LIBKERN_INLINE int
+isalnum(int ch)
+{
+ return (isalpha(ch) || isdigit(ch));
+}
+
+LIBKERN_INLINE int
isdigit(int ch)
{
return (ch = '0' ch = '9');
@@ -177,6 +188,30 @@ isxdigit(int ch)
}
LIBKERN_INLINE int
+iscntrl(int ch)
+{
+ return ((ch = 0x00 ch = 0x1F) || ch == 0x7F);
+}
+
+LIBKERN_INLINE int
+isgraph(int ch)
+{
+ return (ch != ' ' isprint(ch));
+}
+
+LIBKERN_INLINE int
+isprint(int ch)
+{
+ return (ch = 0x20 ch = 0x7E);
+}
+
+LIBKERN_INLINE int
+ispunct(int ch)
+{
+ return (isprint(ch) ch != ' ' !isalnum(ch));
+}
+
+LIBKERN_INLINE int
toupper(int ch)
{
if (islower(ch))
@@ -312,13 +347,15 @@ char *strsep(char **, const char *);
/* These exist in GCC 3.x, but we don't bother. */
char *strcat(char *, const char *);
+size_t strcspn(const char *, const char *);
char *strncpy(char *, const char *, size_t);
char *strncat(char *, const char *, size_t);
int strncmp(const char *, const char *, size_t);
char *strchr(const char *, int);
char *strrchr(const char *, int);
-
char *strstr(const char *, const char *);
+char *strpbrk(const char *, const char *);
+size_t strspn(const
