CVS commit: src/distrib/i386/cdroms

2009-10-24 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Oct 24 06:36:39 UTC 2009

Modified Files:
src/distrib/i386/cdroms/bootcd: boot.cfg.in
src/distrib/i386/cdroms/installcd: boot.cfg.in

Log Message:
www.netbsd.org - www.NetBSD.org


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/i386/cdroms/bootcd/boot.cfg.in
cvs rdiff -u -r1.7 -r1.8 src/distrib/i386/cdroms/installcd/boot.cfg.in

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/bootcd/boot.cfg.in
diff -u src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.8 src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.9
--- src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.8	Mon Dec  1 10:20:15 2008
+++ src/distrib/i386/cdroms/bootcd/boot.cfg.in	Sat Oct 24 06:36:39 2009
@@ -7,7 +7,7 @@
 banner=
 banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
 banner=and legacy hardware.  However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.netbsd.org/.
+banner=try disabling it and report a bug at http://www.NetBSD.org/.
 menu=Install NetBSD:boot netbsd
 menu=Install NetBSD (no ACPI):boot netbsd -2
 menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12

Index: src/distrib/i386/cdroms/installcd/boot.cfg.in
diff -u src/distrib/i386/cdroms/installcd/boot.cfg.in:1.7 src/distrib/i386/cdroms/installcd/boot.cfg.in:1.8
--- src/distrib/i386/cdroms/installcd/boot.cfg.in:1.7	Mon Dec  1 10:20:15 2008
+++ src/distrib/i386/cdroms/installcd/boot.cfg.in	Sat Oct 24 06:36:39 2009
@@ -3,7 +3,7 @@
 banner=
 banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
 banner=and legacy hardware.  However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.netbsd.org/.
+banner=try disabling it and report a bug at http://www.NetBSD.org/.
 menu=Install NetBSD:boot netbsd
 menu=Install NetBSD (no ACPI):boot netbsd -2
 menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12



CVS commit: src/sys/arch/i386/stand/cdboot

2009-10-24 Thread David Laight
Module Name:src
Committed By:   dsl
Date:   Sat Oct 24 10:28:30 UTC 2009

Modified Files:
src/sys/arch/i386/stand/cdboot: cdboot.S

Log Message:
Add some illumination ...


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/stand/cdboot/cdboot.S

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/i386/stand/cdboot/cdboot.S
diff -u src/sys/arch/i386/stand/cdboot/cdboot.S:1.8 src/sys/arch/i386/stand/cdboot/cdboot.S:1.9
--- src/sys/arch/i386/stand/cdboot/cdboot.S:1.8	Sat May  3 13:07:31 2008
+++ src/sys/arch/i386/stand/cdboot/cdboot.S	Sat Oct 24 10:28:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdboot.S,v 1.8 2008/05/03 13:07:31 ad Exp $	*/
+/*	$NetBSD: cdboot.S,v 1.9 2009/10/24 10:28:30 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -224,6 +224,8 @@
 boot_cdrom:
 	movw	$str_banner, %si
 	call	message
+
+/* Read volume descriptor sectors until Primary decriptor found */
 	movl	$VD_LBA, %eax
 next_block:
 	movb	$1, %dh			/* Number of sectors to read */
@@ -238,6 +240,7 @@
 	call	message
 	jmp	panic
 
+/* Read all of root directory */
 pvd_found:
 	movw	$PVD_ADDR+PVD_ROOT_DR, %bx
 	movl	DR_EXTENT(%bx), %eax	/* LBA of the root directory */
@@ -246,6 +249,8 @@
 	movb	%dl, %dh		/*  ... and load it to %dh */
 	movl	$ROOTDIR_ADDR, %ebx
 	call	read_sectors
+
+/* Scan directory entries searching for /boot */
 next_entry:
 	cmpb	$0, DR_LEN(%bx)
 	jz	last_entry
@@ -270,6 +275,7 @@
 	call	message
 	jmp	panic
 
+/* Found /boot, read contents to 0x1000:0 */
 load_loader:
 	movl	DR_EXTENT(%bx), %eax
 	movl	DR_DATA_LEN(%bx), %edx
@@ -278,6 +284,8 @@
 	movb	%dl, %dh
 	movl	$LOADER_ADDR, %ebx
 	call	read_sectors
+
+/* Finally call into code of /boot */
 	movl	$boot_params, %esi	/* Provide boot_params */
 	xorl	%edx, %edx
 	movb	boot_drive, %dl
@@ -297,8 +305,8 @@
  */
 read_sectors:
 	pusha
-	movl	%eax, edd_lba		/* Convert LBA to segment */
-	shrl	$4, %ebx
+	movl	%eax, edd_lba
+	shrl	$4, %ebx		/* Convert buffer addr to seg:0 */
 	movw	%bx, edd_segment
 	movb	%dh, edd_nsecs
 	movb	boot_drive, %dl



CVS commit: src/bin/ksh

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:08:47 UTC 2009

Modified Files:
src/bin/ksh: ksh.Man

Log Message:
Show that -l is option for bind builtin.
(The -l is described later.)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/bin/ksh/ksh.Man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/ksh/ksh.Man
diff -u src/bin/ksh/ksh.Man:1.21 src/bin/ksh/ksh.Man:1.22
--- src/bin/ksh/ksh.Man:1.21	Mon Oct 27 19:52:28 2008
+++ src/bin/ksh/ksh.Man	Sat Oct 24 11:08:46 2009
@@ -1,5 +1,5 @@
 '\ t
-.\ $NetBSD: ksh.Man,v 1.21 2008/10/27 19:52:28 apb Exp $
+.\ $NetBSD: ksh.Man,v 1.22 2009/10/24 11:08:46 reed Exp $
 .\{{{}}}
 .\{{{  Notes about man page
 .\ - use the pseudo-macros .sh( and .sh) to begin and end sh-specific
@@ -1716,7 +1716,7 @@
 See Job Control below for more information.
 .\}}}
 .\{{{  bind [-l] [-m] [key[=editing-command] ...]
-.IP \fBbind\fP [\fB\-m\fP] [\fIkey\fP[\fB=\fP\fIediting-command\fP] ...]
+.IP \fBbind\fP [\fB\-l\fP] [\fB\-m\fP] [\fIkey\fP[\fB=\fP\fIediting-command\fP] ...]
 Set or view the current emacs command editing key bindings/macros.
 See Emacs Editing Mode below for a complete description.
 .\}}}



CVS commit: src/crypto/dist/heimdal/kuser

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:09:31 UTC 2009

Modified Files:
src/crypto/dist/heimdal/kuser: kimpersonate.1

Log Message:
Fix Document Title.
(I already report and it is fixed upstream.)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/dist/heimdal/kuser/kimpersonate.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/heimdal/kuser/kimpersonate.1
diff -u src/crypto/dist/heimdal/kuser/kimpersonate.1:1.2 src/crypto/dist/heimdal/kuser/kimpersonate.1:1.3
--- src/crypto/dist/heimdal/kuser/kimpersonate.1:1.2	Wed Oct 14 23:37:33 2009
+++ src/crypto/dist/heimdal/kuser/kimpersonate.1	Sat Oct 24 11:09:31 2009
@@ -30,10 +30,10 @@
 .\ SUCH DAMAGE. 
 .\ 
 .\ $Heimdal: kimpersonate.1 20259 2007-02-17 23:49:54Z lha $
-.\ $NetBSD: kimpersonate.1,v 1.2 2009/10/14 23:37:33 joerg Exp $
+.\ $NetBSD: kimpersonate.1,v 1.3 2009/10/24 11:09:31 reed Exp $
 .\
 .Dd September 18, 2006
-.Dt KERBEROS 1
+.Dt KIMPERSONATE 1
 .Os Heimdal
 .Sh NAME
 .Nm kimpersonate



CVS commit: src/crypto/dist/heimdal/lib/krb5

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:12:56 UTC 2009

Modified Files:
src/crypto/dist/heimdal/lib/krb5: verify_krb5_conf.8

Log Message:
Fix Nm macro usage.

Fixed upstream in April:
http://github.com/heimdal/heimdal/commit/9747de8132d06824c23f2e34dcf9232cfdfe1e5b


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8

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/heimdal/lib/krb5/verify_krb5_conf.8
diff -u src/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8:1.9 src/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8:1.10
--- src/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8:1.9	Sat Mar 22 08:37:15 2008
+++ src/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8	Sat Oct 24 11:12:56 2009
@@ -30,7 +30,7 @@
 .\ SUCH DAMAGE.
 .\
 .\ $Heimdal: verify_krb5_conf.8 14375 2004-12-08 17:52:41Z lha $
-.\ $NetBSD: verify_krb5_conf.8,v 1.9 2008/03/22 08:37:15 mlelstv Exp $
+.\ $NetBSD: verify_krb5_conf.8,v 1.10 2009/10/24 11:12:56 reed Exp $
 .\
 .Dd December  8, 2004
 .Dt VERIFY_KRB5_CONF 8
@@ -80,7 +80,7 @@
 is confused.
 .It path: unknown entry
 Means that string is not known by
-.Nm  .
+.Nm .
 .El
 .Sh SEE ALSO
 .Xr krb5.conf 5



CVS commit: src/lib/libmenu

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:17:13 UTC 2009

Modified Files:
src/lib/libmenu: menu_post.3

Log Message:
Add missing comma in the NAME Nm list.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libmenu/menu_post.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/libmenu/menu_post.3
diff -u src/lib/libmenu/menu_post.3:1.9 src/lib/libmenu/menu_post.3:1.10
--- src/lib/libmenu/menu_post.3:1.9	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_post.3	Sat Oct 24 11:17:13 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: menu_post.3,v 1.9 2003/04/16 13:35:11 wiz Exp $
+.\	$NetBSD: menu_post.3,v 1.10 2009/10/24 11:17:13 reed Exp $
 .\
 .\ Copyright (c) 1999
 .\	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -33,7 +33,7 @@
 .Dt MENU_POST 3
 .Os
 .Sh NAME
-.Nm post_menu
+.Nm post_menu ,
 .Nm unpost_menu
 .Nd post (draw) or unpost a menu
 .Sh LIBRARY



CVS commit: src/share/man/man5

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:22:48 UTC 2009

Modified Files:
src/share/man/man5: rc.conf.5

Log Message:
For the rpc* references use the full rpc.* names.
These match what is really installed.
I know the man links are there too. But this helps in the
case where someone has printed man pages but only has one
man page printed per inode -- so best to refer to the known Dt name.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/share/man/man5/rc.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.137 src/share/man/man5/rc.conf.5:1.138
--- src/share/man/man5/rc.conf.5:1.137	Wed Sep 30 18:17:22 2009
+++ src/share/man/man5/rc.conf.5	Sat Oct 24 11:22:48 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: rc.conf.5,v 1.137 2009/09/30 18:17:22 apb Exp $
+.\	$NetBSD: rc.conf.5,v 1.138 2009/10/24 11:22:48 reed Exp $
 .\
 .\ Copyright (c) 1996 Matthew R. Green
 .\ All rights reserved.
@@ -862,11 +862,11 @@
 services.
 These include NFS,
 .Tn NIS ,
-.Xr bootparamd 8 ,
-.Xr rstatd 8 ,
-.Xr rusersd 8 ,
+.Xr rpc.bootparamd 8 ,
+.Xr rpc.rstatd 8 ,
+.Xr rpc.rusersd 8 ,
 and
-.Xr rwalld 8 .
+.Xr rpc.rwalld 8 .
 Passes
 .Sy rpcbind_flags .
 .El



CVS commit: src/sys/arch/i386/stand/cdboot

2009-10-24 Thread David Laight
Module Name:src
Committed By:   dsl
Date:   Sat Oct 24 11:23:07 UTC 2009

Modified Files:
src/sys/arch/i386/stand/cdboot: cdboot.S

Log Message:
Support reading /boot  64k.  Based on the patch from Izumi Tsutsui.
Compiles but not actually tested!  Fixes PR/42202


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/cdboot/cdboot.S

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/i386/stand/cdboot/cdboot.S
diff -u src/sys/arch/i386/stand/cdboot/cdboot.S:1.9 src/sys/arch/i386/stand/cdboot/cdboot.S:1.10
--- src/sys/arch/i386/stand/cdboot/cdboot.S:1.9	Sat Oct 24 10:28:30 2009
+++ src/sys/arch/i386/stand/cdboot/cdboot.S	Sat Oct 24 11:23:06 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdboot.S,v 1.9 2009/10/24 10:28:30 dsl Exp $	*/
+/*	$NetBSD: cdboot.S,v 1.10 2009/10/24 11:23:06 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -33,9 +33,6 @@
  * This is a primary boot loader that loads a secondary boot loader
  * directly from CD without performing floppy/hard disk emulation as
  * described by the El Torito specification.
- *
- * TODO:
- *  - Support for loading secondary boot loader  64kB
  */
 
 #include machine/asm.h
@@ -302,21 +299,34 @@
  * %eax = LBA of starting sector
  * %ebx = buffer to store sectors
  * %dh = number of sectors to read
+ *
+ * Long transfers are split onto multiple 64k reads
  */
+#define MAX_SECTORS (0x1/BLOCK_SIZE)
 read_sectors:
-	pusha
+	pushal
 	movl	%eax, edd_lba
 	shrl	$4, %ebx		/* Convert buffer addr to seg:0 */
 	movw	%bx, edd_segment
-	movb	%dh, edd_nsecs
-	movb	boot_drive, %dl
+1:	movb	%dh, edd_nsecs
+	cmpb	$MAX_SECTORS, %dh
+	jle	2f			/* j if less than 64k */
+	movb	$MAX_SECTORS, edd_nsecs	/* Read 16 sectors - 64k bytes */
+2:	movb	boot_drive, %dl
 	movw	$edd_packet, %si
 read_again:
 	movb	$0x42, %ah
+	push	%dx			/* bios shouldn't kill %dh, but ... */
 	int	$0x13
+	pop	%dx			/* ... better safe than sorry! */
 	jc	read_fail
-	popa
+	addw	$0x1000, edd_segment	/* Advance segment addr by 64k bytes */
+	addl	$MAX_SECTORS, edd_lba	/* And sector number to match */
+	sub	edd_nsecs, %dh		/* Number of sectors remaining */
+	jnz	1b			
+	popal
 	ret
+
 read_fail:
 	cmpb	$ERROR_TIMEOUT, %ah
 	jz	read_again
@@ -324,17 +334,6 @@
 	call	message
 	jmp	panic
 
-/*
- * For debugging purpose
- */
-put_char:
-	pusha
-	movb	$0x0e, %ah
-	movw	$0x0001, %bx
-	int	$0x10
-	popa
-	ret
-
 #include message.S
 
 edd_packet:



CVS commit: src/share/man/man8

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 11:24:19 UTC 2009

Modified Files:
src/share/man/man8: afterboot.8

Log Message:
In SEE ALSO, refer to useradd instead of adduser.
(adduser is a man link, but no tool by that name.)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/share/man/man8/afterboot.8

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/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.40 src/share/man/man8/afterboot.8:1.41
--- src/share/man/man8/afterboot.8:1.40	Mon May 18 02:25:34 2009
+++ src/share/man/man8/afterboot.8	Sat Oct 24 11:24:19 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: afterboot.8,v 1.40 2009/05/18 02:25:34 snj Exp $
+.\	$NetBSD: afterboot.8,v 1.41 2009/10/24 11:24:19 reed Exp $
 .\	$OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
 .\
 .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -1005,7 +1005,6 @@
 .Xr hier 7 ,
 .Xr hostname 7 ,
 .Xr pkgsrc 7 ,
-.Xr adduser 8 ,
 .Xr amd 8 ,
 .Xr bootparamd 8 ,
 .Xr ccdconfig 8 ,
@@ -1023,6 +1022,7 @@
 .Xr rmt 8 ,
 .Xr route 8 ,
 .Xr umount 8 ,
+.Xr useradd 8 ,
 .Xr vipw 8 ,
 .Xr ypbind 8
 .Sh HISTORY



CVS commit: src/sys/rump

2009-10-24 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Sat Oct 24 11:29:55 UTC 2009

Modified Files:
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpuser: rumpuser.c

Log Message:
unused rumpuser_realpath is really dead


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.43 -r1.44 src/sys/rump/librump/rumpuser/rumpuser.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/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.29 src/sys/rump/include/rump/rumpuser.h:1.30
--- src/sys/rump/include/rump/rumpuser.h:1.29	Thu Oct 15 00:33:37 2009
+++ src/sys/rump/include/rump/rumpuser.h	Sat Oct 24 11:29:55 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.29 2009/10/15 00:33:37 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.30 2009/10/24 11:29:55 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -93,8 +93,6 @@
 
 int rumpuser_gethostname(char *, size_t, int *);
 
-char *rumpuser_realpath(const char *, char *, int *);
-
 int rumpuser_poll(struct pollfd *, int, int, int *);
 
 int rumpuser_putchar(int, int *);

Index: src/sys/rump/librump/rumpuser/rumpuser.c
diff -u src/sys/rump/librump/rumpuser/rumpuser.c:1.43 src/sys/rump/librump/rumpuser/rumpuser.c:1.44
--- src/sys/rump/librump/rumpuser/rumpuser.c:1.43	Fri Oct  9 14:41:36 2009
+++ src/sys/rump/librump/rumpuser/rumpuser.c	Sat Oct 24 11:29:55 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.c,v 1.43 2009/10/09 14:41:36 pooka Exp $	*/
+/*	$NetBSD: rumpuser.c,v 1.44 2009/10/24 11:29:55 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.43 2009/10/09 14:41:36 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.44 2009/10/24 11:29:55 pooka Exp $);
 #endif /* !lint */
 
 /* thank the maker for this */
@@ -414,20 +414,6 @@
 	DOCALL(int, (gethostname(name, namelen)));
 }
 
-char *
-rumpuser_realpath(const char *path, char resolvedname[MAXPATHLEN], int *error)
-{
-	char *rv;
-
-	rv = realpath(path, resolvedname);
-	if (rv == NULL)
-		*error = errno;
-	else
-		*error = 0;
-
-	return rv;
-}
-
 int
 rumpuser_poll(struct pollfd *fds, int nfds, int timeout, int *error)
 {



CVS commit: src/sys/rump

2009-10-24 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Sat Oct 24 11:36:59 UTC 2009

Modified Files:
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: rump.c
src/sys/rump/librump/rumpuser: rumpuser_dl.c

Log Message:
Pass modinit to rumpuser_dl_module_bootstrap() as a function pointer
to avoid linker rump - rumpuser - rump dependency which is annoying
redundancy in static linking.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.128 -r1.129 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpuser/rumpuser_dl.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/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.30 src/sys/rump/include/rump/rumpuser.h:1.31
--- src/sys/rump/include/rump/rumpuser.h:1.30	Sat Oct 24 11:29:55 2009
+++ src/sys/rump/include/rump/rumpuser.h	Sat Oct 24 11:36:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.30 2009/10/24 11:29:55 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.31 2009/10/24 11:36:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -187,6 +187,15 @@
 
 /* rumpuser dynloader */
 
-void rumpuser_dl_module_bootstrap(void);
+/* XXX: go _t, go */
+#ifdef __NetBSD__
+#include prop/proplib.h
+#else
+typedef struct prop_dictionary *prop_dictionary_t;
+#endif
+
+struct modinfo;
+typedef int (*rump_modinit_fn)(struct modinfo *, prop_dictionary_t);
+void rumpuser_dl_module_bootstrap(rump_modinit_fn);
 
 #endif /* _RUMP_RUMPUSER_H_ */

Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.128 src/sys/rump/librump/rumpkern/rump.c:1.129
--- src/sys/rump/librump/rumpkern/rump.c:1.128	Tue Oct 20 10:42:41 2009
+++ src/sys/rump/librump/rumpkern/rump.c	Sat Oct 24 11:36:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.129 2009/10/24 11:36:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.129 2009/10/24 11:36:59 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -294,12 +294,8 @@
 		vmem_rehash_start();
 #endif
 
-	/*
-	 * Module bootstrap makes calls back into rump, so
-	 * unschedule before calling.
-	 */
+	rumpuser_dl_module_bootstrap(rump_module_init);
 	rump_unschedule();
-	rumpuser_dl_module_bootstrap();
 
 	return 0;
 }

Index: src/sys/rump/librump/rumpuser/rumpuser_dl.c
diff -u src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.3 src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.4
--- src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.3	Wed Oct 14 18:18:53 2009
+++ src/sys/rump/librump/rumpuser/rumpuser_dl.c	Sat Oct 24 11:36:59 2009
@@ -1,4 +1,4 @@
-/*  $NetBSD: rumpuser_dl.c,v 1.3 2009/10/14 18:18:53 pooka Exp $	*/
+/*  $NetBSD: rumpuser_dl.c,v 1.4 2009/10/24 11:36:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_dl.c,v 1.3 2009/10/14 18:18:53 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.4 2009/10/24 11:36:59 pooka Exp $);
 
 #include sys/types.h
 #include sys/time.h
@@ -41,13 +41,12 @@
 #include stdio.h
 #include string.h
 
-#include rump/rump.h
 #include rump/rumpuser.h
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)\
 || (defined(__sun__)  defined(__svr4__))
 static void
-process(const char *soname)
+process(const char *soname, rump_modinit_fn domodinit)
 {
 	void *handle;
 	struct modinfo **mi, **mi_end;
@@ -67,7 +66,7 @@
 		goto out;
 
 	for (; mi  mi_end; mi++)
-		rump_pub_module_init(*mi, NULL);
+		domodinit(*mi, NULL);
 	assert(mi == mi_end);
 
  out:
@@ -79,7 +78,7 @@
  * from all objects in the linkmap.
  */
 void
-rumpuser_dl_module_bootstrap(void)
+rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit)
 {
 	struct link_map *map;
 
@@ -98,7 +97,7 @@
 	for (; map-l_next; map = map-l_next)
 		continue;
 	for (; map; map = map-l_prev)
-		process(map-l_name);
+		process(map-l_name, domodinit);
 }
 #else
 void



CVS commit: src/share/man/man8

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 12:18:05 UTC 2009

Modified Files:
src/share/man/man8: afterboot.8

Log Message:
Change two man page references to use the official names.
(I define official as the Document Title name and original file name.)


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/share/man/man8/afterboot.8

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/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.41 src/share/man/man8/afterboot.8:1.42
--- src/share/man/man8/afterboot.8:1.41	Sat Oct 24 11:24:19 2009
+++ src/share/man/man8/afterboot.8	Sat Oct 24 12:18:05 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: afterboot.8,v 1.41 2009/10/24 11:24:19 reed Exp $
+.\	$NetBSD: afterboot.8,v 1.42 2009/10/24 12:18:05 reed Exp $
 .\	$OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
 .\
 .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -455,7 +455,7 @@
 .Pp
 There are many more YP man pages available to help you.
 You can find more information by starting with
-.Xr yp 8 .
+.Xr nis 8 .
 .Ss Check disk mounts
 Check that the disks are mounted correctly by
 comparing the
@@ -1006,7 +1006,6 @@
 .Xr hostname 7 ,
 .Xr pkgsrc 7 ,
 .Xr amd 8 ,
-.Xr bootparamd 8 ,
 .Xr ccdconfig 8 ,
 .Xr chown 8 ,
 .Xr dhcpd 8 ,
@@ -1017,10 +1016,12 @@
 .Xr mrouted 8 ,
 .Xr mtree 8 ,
 .Xr named 8 ,
+.Xr nis 8 .
 .Xr rbootd 8 ,
 .Xr rc 8 ,
 .Xr rmt 8 ,
 .Xr route 8 ,
+.Xr rpc.bootparamd 8 ,
 .Xr umount 8 ,
 .Xr useradd 8 ,
 .Xr vipw 8 ,



CVS commit: src/share/man/man8

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 12:21:31 UTC 2009

Modified Files:
src/share/man/man8: nis.8

Log Message:
Refer to rpc.bootparamd instead of bootparamd.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man8/nis.8

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/man8/nis.8
diff -u src/share/man/man8/nis.8:1.2 src/share/man/man8/nis.8:1.3
--- src/share/man/man8/nis.8:1.2	Sat Feb 26 16:39:17 2005
+++ src/share/man/man8/nis.8	Sat Oct 24 12:21:31 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: nis.8,v 1.2 2005/02/26 16:39:17 thorpej Exp $
+.\	$NetBSD: nis.8,v 1.3 2009/10/24 12:21:31 reed Exp $
 .\
 .\ Copyright (c) 1992/3 Theo de Raadt dera...@fsa.ca
 .\ All rights reserved.
@@ -121,7 +121,7 @@
 also provides hooks for other client programs, such as
 .Xr amd 8
 and
-.Xr bootparamd 8 ,
+.Xr rpc.bootparamd 8 ,
 that can use
 .Tn NIS
 maps.



CVS commit: src/usr.sbin/btpand

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 12:22:24 UTC 2009

Modified Files:
src/usr.sbin/btpand: btpand.8

Log Message:
Fix man page reference from non-existent dhcp(8) to dhcpd(8).
Hope this was what was intended.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/btpand/btpand.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/btpand/btpand.8
diff -u src/usr.sbin/btpand/btpand.8:1.3 src/usr.sbin/btpand/btpand.8:1.4
--- src/usr.sbin/btpand/btpand.8:1.3	Sun Aug 17 14:43:07 2008
+++ src/usr.sbin/btpand/btpand.8	Sat Oct 24 12:22:24 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: btpand.8,v 1.3 2008/08/17 14:43:07 plunky Exp $
+.\ $NetBSD: btpand.8,v 1.4 2009/10/24 12:22:24 reed Exp $
 .\
 .\ Copyright (c) 2008 Iain Hibbert
 .\ All rights reserved.
@@ -210,7 +210,7 @@
 .Xr btconfig 8 ,
 .Xr brconfig 8 ,
 .Xr dhclient 8 ,
-.Xr dhcp 8 ,
+.Xr dhcpd 8 ,
 .Xr ifconfig 8 ,
 .Xr sdpd 8
 .Pp



CVS commit: src/usr.sbin/inetd

2009-10-24 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat Oct 24 12:23:47 UTC 2009

Modified Files:
src/usr.sbin/inetd: inetd.8

Log Message:
Change manpage reference from talkd to ntalkd.
(Man link does exist, but no binary.)


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/inetd/inetd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/inetd/inetd.8
diff -u src/usr.sbin/inetd/inetd.8:1.55 src/usr.sbin/inetd/inetd.8:1.56
--- src/usr.sbin/inetd/inetd.8:1.55	Thu Oct 22 22:50:35 2009
+++ src/usr.sbin/inetd/inetd.8	Sat Oct 24 12:23:47 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: inetd.8,v 1.55 2009/10/22 22:50:35 tsarna Exp $
+.\	$NetBSD: inetd.8,v 1.56 2009/10/24 12:23:47 reed Exp $
 .\
 .\ Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -303,7 +303,7 @@
 .Xr comsat 8
 .Pq Xr biff 1
 and
-.Xr talkd 8
+.Xr ntalkd 8
 are both examples of the latter type of
 datagram server.
 .Xr tftpd 8



CVS commit: src/distrib/utils/sysinst/arch

2009-10-24 Thread Arnaud Ysmal
Module Name:src
Committed By:   stacktic
Date:   Sat Oct 24 12:47:31 UTC 2009

Modified Files:
src/distrib/utils/sysinst/arch/alpha: msg.md.fr
src/distrib/utils/sysinst/arch/amiga: msg.md.fr
src/distrib/utils/sysinst/arch/hpcarm: msg.md.fr
src/distrib/utils/sysinst/arch/i386: msg.md.fr
src/distrib/utils/sysinst/arch/macppc: msg.md.fr
src/distrib/utils/sysinst/arch/playstation2: msg.md.fr
src/distrib/utils/sysinst/arch/sparc: msg.md.fr
src/distrib/utils/sysinst/arch/sparc64: msg.md.fr

Log Message:
Fixed a few french messages - patch from Marylène Ysmal.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/alpha/msg.md.fr
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/amiga/msg.md.fr
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
cvs rdiff -u -r1.48 -r1.49 src/distrib/utils/sysinst/arch/i386/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/macppc/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 \
src/distrib/utils/sysinst/arch/playstation2/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/sparc/msg.md.fr
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/sparc64/msg.md.fr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/alpha/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.10 src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.11
--- src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.10	Sat Feb  2 04:51:36 2008
+++ src/distrib/utils/sysinst/arch/alpha/msg.md.fr	Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.10 2008/02/02 04:51:36 itohy Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.11 2009/10/24 12:47:30 stacktic Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -46,7 +46,7 @@
 }
 
 message dobootblks
-{Installation du block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
 }
 
 message set_kernel_1

Index: src/distrib/utils/sysinst/arch/amiga/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.5 src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.6
--- src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.5	Sat Feb  2 05:33:56 2008
+++ src/distrib/utils/sysinst/arch/amiga/msg.md.fr	Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.5 2008/02/02 05:33:56 itohy Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.6 2009/10/24 12:47:30 stacktic Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -44,7 +44,7 @@
 }
 
 message dobootblks
-{Installation des block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
 }
 
 message set_kernel_1

Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.2	Sat Feb  2 05:34:00 2008
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr	Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.2 2008/02/02 05:34:00 itohy Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.3 2009/10/24 12:47:30 stacktic Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -44,52 +44,56 @@
 }
 
 message dobad144
-{Installation de la table des block défectueux ...
+{Installation de la table des blocs défectueux ...
 }
 
 message getboottype
-{Aimez-vous installer l'ensemble normal de bootblocks ou de bootblocks serial?
+{Voulez-vous installer le programme de démarrage standard ou sur port série ?
+
+Le programme de démarrage standard utilise les périphériques définis par le
+BIOS (en général le moniteur et le clavier). Le programme de démarrage sur
+port série utilise quant à lui le premier port série.
 }
 
 message dobootblks
-{Installation des block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
 }
 
 message onebiosmatch
-{Ce disque correspond au disque du BIOS suivant:
+{Ce disque correspond au disque du BIOS suivant :
 
 }
 
 message onebiosmatch_header
-{BIOS # cylinders  heads   sectors
--- -- --- ---
+{BIOS # cylindres  têtes   secteurs
+-- -- --- 
 }
 
 message onebiosmatch_row
 {%-6x %-10d %-7d %-10d\n}
 
 message biosmultmatch
-{Ce disque correspond aux disques du BIOS suivants:
+{Ce disque correspond aux disques du BIOS suivants :
 
 }
 
 message biosmultmatch_header
-{   BIOS # cylinders  heads   sectors
-   -- -- --- ---
+{   BIOS # cylindres  têtes   secteurs
+   -- -- --- 
 }
 
 message biosmultmatch_row
 {%-1d: %-6x %-10d %-7d %d\n}
 
 message pickdisk
-{Choisissez un disque: }
+{Choisissez un disque : }
 
 message partabovechs
 {La partition de votre disque réservée à NetBSD se trouve en-dehors de l'espace
-que le BIOS de votre machine peut adresser. L'amorcage depuis cette 

CVS commit: src/sys/arch/i386/stand/cdboot

2009-10-24 Thread David Laight
Module Name:src
Committed By:   dsl
Date:   Sat Oct 24 12:57:17 UTC 2009

Modified Files:
src/sys/arch/i386/stand/cdboot: cdboot.S

Log Message:
Fix constant in comment


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/stand/cdboot/cdboot.S

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/i386/stand/cdboot/cdboot.S
diff -u src/sys/arch/i386/stand/cdboot/cdboot.S:1.10 src/sys/arch/i386/stand/cdboot/cdboot.S:1.11
--- src/sys/arch/i386/stand/cdboot/cdboot.S:1.10	Sat Oct 24 11:23:06 2009
+++ src/sys/arch/i386/stand/cdboot/cdboot.S	Sat Oct 24 12:57:17 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdboot.S,v 1.10 2009/10/24 11:23:06 dsl Exp $	*/
+/*	$NetBSD: cdboot.S,v 1.11 2009/10/24 12:57:17 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -311,7 +311,7 @@
 1:	movb	%dh, edd_nsecs
 	cmpb	$MAX_SECTORS, %dh
 	jle	2f			/* j if less than 64k */
-	movb	$MAX_SECTORS, edd_nsecs	/* Read 16 sectors - 64k bytes */
+	movb	$MAX_SECTORS, edd_nsecs	/* Read 32 sectors - 64k bytes */
 2:	movb	boot_drive, %dl
 	movw	$edd_packet, %si
 read_again:



CVS commit: src/sys/arch/mips/mips

2009-10-24 Thread Havard Eidnes
Module Name:src
Committed By:   he
Date:   Sat Oct 24 13:28:16 UTC 2009

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Fix the previous by terminating the comment.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mips/mips/mipsX_subr.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.32 src/sys/arch/mips/mips/mipsX_subr.S:1.33
--- src/sys/arch/mips/mips/mipsX_subr.S:1.32	Wed Oct 21 21:12:01 2009
+++ src/sys/arch/mips/mips/mipsX_subr.S	Sat Oct 24 13:28:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.32 2009/10/21 21:12:01 rmind Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.33 2009/10/24 13:28:16 he Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -2105,7 +2105,7 @@
 	nop
 
 resume:
-#endif /* !ENABLE_MIPS_16KB_PAGE
+#endif /* !ENABLE_MIPS_16KB_PAGE */
 	j	ra
 	nop
 END(MIPSX(cpu_switch_resume))



CVS commit: src/share/mk

2009-10-24 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat Oct 24 13:34:50 UTC 2009

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Add lintmanpages later to target to ensure that MKMANDOC is set.


To generate a diff of this commit:
cvs rdiff -u -r1.591 -r1.592 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.591 src/share/mk/bsd.own.mk:1.592
--- src/share/mk/bsd.own.mk:1.591	Fri Oct 23 23:12:10 2009
+++ src/share/mk/bsd.own.mk	Sat Oct 24 13:34:50 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.591 2009/10/23 23:12:10 joerg Exp $
+#	$NetBSD: bsd.own.mk,v 1.592 2009/10/24 13:34:50 joerg Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -595,9 +595,6 @@
 
 TARGETS+=	all clean cleandir depend dependall includes \
 		install lint obj regress tags html
-.if ${MKMANDOC} == yes
-TARGETS+=	lintmanpages
-.endif
 PHONY_NOTMAIN =	all clean cleandir depend dependall distclean includes \
 		install lint obj regress tags beforedepend afterdepend \
 		beforeinstall afterinstall realinstall realdepend realall \
@@ -1028,4 +1025,8 @@
 _MKTARGET_REMOVE?=	${_MKMSG_REMOVE} ${.TARGET}
 _MKTARGET_YACC?=	${_MKMSG_YACC} ${.CURDIR:T}/${.TARGET}
 
+.if ${MKMANDOC} == yes
+TARGETS+=	lintmanpages
+.endif
+
 .endif	# !defined(_BSD_OWN_MK_)



CVS commit: src/distrib/utils/sysinst/arch

2009-10-24 Thread Arnaud Ysmal
Module Name:src
Committed By:   stacktic
Date:   Sat Oct 24 14:41:58 UTC 2009

Modified Files:
src/distrib/utils/sysinst/arch/acorn26: msg.md.fr
src/distrib/utils/sysinst/arch/acorn32: msg.md.fr
src/distrib/utils/sysinst/arch/bebox: msg.md.fr
src/distrib/utils/sysinst/arch/cats: msg.md.fr
src/distrib/utils/sysinst/arch/evbarm: msg.md.fr
src/distrib/utils/sysinst/arch/evbmips: msg.md.fr
src/distrib/utils/sysinst/arch/evbppc: msg.md.fr
src/distrib/utils/sysinst/arch/hp300: msg.md.fr
src/distrib/utils/sysinst/arch/hp700: msg.md.fr
src/distrib/utils/sysinst/arch/hpcmips: msg.md.fr
src/distrib/utils/sysinst/arch/landisk: msg.md.fr
src/distrib/utils/sysinst/arch/mvme68k: msg.md.fr
src/distrib/utils/sysinst/arch/news68k: msg.md.fr
src/distrib/utils/sysinst/arch/newsmips: msg.md.fr
src/distrib/utils/sysinst/arch/sandpoint: msg.md.fr
src/distrib/utils/sysinst/arch/shark: msg.md.fr
src/distrib/utils/sysinst/arch/vax: msg.md.fr
src/distrib/utils/sysinst/arch/zaurus: msg.md.fr

Log Message:
Fixed a few french messages - patch from Marylène Ysmal.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/acorn26/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/acorn32/msg.md.fr
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/bebox/msg.md.fr
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/cats/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/evbmips/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/evbppc/msg.md.fr
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hp300/msg.md.fr
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hp700/msg.md.fr
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/hpcmips/msg.md.fr
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/landisk/msg.md.fr
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/mvme68k/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/news68k/msg.md.fr
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/newsmips/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/sandpoint/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/shark/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/vax/msg.md.fr
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/zaurus/msg.md.fr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/acorn26/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.6 src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.7
--- src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.6	Sat Feb  2 04:51:34 2008
+++ src/distrib/utils/sysinst/arch/acorn26/msg.md.fr	Sat Oct 24 14:41:57 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.6 2008/02/02 04:51:34 itohy Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.7 2009/10/24 14:41:57 stacktic Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,21 +50,21 @@
 }
 
 message badreadriscix
-{Impossible de lire la table de partition RISCiX
+{Impossible de lire la table de partitions RISCiX
 }
 
 message notnetbsdriscix
-{Aucune partition NetBSD trouvée dans la table de partition RISCiX. Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée dans la table de partitions RISCiX. Impossible
+de créer un label.
 }
 
 message notnetbsd
-{Aucune partition NetBSD trouvée (disque juste filecore ?). Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée (disque filecore uniquement ?). Impossible
+de créer un label.
 }
 
 message dobootblks
-{Installation du block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
 }
 
 message set_kernel_1

Index: src/distrib/utils/sysinst/arch/acorn32/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.9 src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.10
--- src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.9	Mon Feb  4 08:42:41 2008
+++ src/distrib/utils/sysinst/arch/acorn32/msg.md.fr	Sat Oct 24 14:41:57 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.9 2008/02/04 08:42:41 chris Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.10 2009/10/24 14:41:57 stacktic Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,21 +50,21 @@
 }
 
 message badreadriscix
-{Impossible de lire la table de partition RISCiX
+{Impossible de lire la table de partitions RISCiX
 }
 
 message notnetbsdriscix
-{Aucune partition NetBSD trouvée dans la table de partition RISCiX. Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée dans la table de partitions RISCiX. Impossible
+de créer un label.
 }
 
 message notnetbsd
-{Aucune partition NetBSD trouvée (disque juste filecore ?). Impossible

CVS commit: src/lib/libc/stdio

2009-10-24 Thread David Laight
Module Name:src
Committed By:   dsl
Date:   Sat Oct 24 14:50:48 UTC 2009

Modified Files:
src/lib/libc/stdio: fgets.c

Log Message:
Check for EOF before erroring fgets() with length = 0.
If length is invalid, set errno = EINVAL and __SERR as well returning NULL.
Should let me close PR/41992.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/stdio/fgets.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/libc/stdio/fgets.c
diff -u src/lib/libc/stdio/fgets.c:1.23 src/lib/libc/stdio/fgets.c:1.24
--- src/lib/libc/stdio/fgets.c:1.23	Wed Oct 14 21:25:52 2009
+++ src/lib/libc/stdio/fgets.c	Sat Oct 24 14:50:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: fgets.c,v 1.23 2009/10/14 21:25:52 dsl Exp $	*/
+/*	$NetBSD: fgets.c,v 1.24 2009/10/24 14:50:48 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,12 +37,13 @@
 #if 0
 static char sccsid[] = @(#)fgets.c	8.2 (Berkeley) 12/22/93;
 #else
-__RCSID($NetBSD: fgets.c,v 1.23 2009/10/14 21:25:52 dsl Exp $);
+__RCSID($NetBSD: fgets.c,v 1.24 2009/10/24 14:50:48 dsl Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #include assert.h
 #include stdio.h
+#include errno.h
 #include string.h
 #include reentrant.h
 #include local.h
@@ -61,14 +62,12 @@
 	int n;
 	FILE *fp;
 {
-	size_t len;
+	int len;
 	char *s;
 	unsigned char *p, *t;
 
 	_DIAGASSERT(buf != NULL);
 	_DIAGASSERT(fp != NULL);
-	if (n = 0)	/* sanity check */
-		return (NULL);
 
 	FLOCKFILE(fp);
 	_SET_ORIENTATION(fp, -1);
@@ -97,11 +96,25 @@
 		 * newline, and stop.  Otherwise, copy entire chunk
 		 * and loop.
 		 */
-		if (len  (size_t)n)
+		if (len  n) {
+			if (n  0) {
+/*
+ * Caller's length = 0
+ * We can't write into the buffer, so cannot
+ * return a string, so must return NULL.
+ * Set errno and __SERR so it is consistent.
+ * TOG gives no indication of what to do here!
+ */
+errno = EINVAL;
+fp-_flags |= __SERR;
+FUNLOCKFILE(fp);
+return NULL;
+			}
 			len = n;
+		}
 		t = memchr((void *)p, '\n', len);
 		if (t != NULL) {
-			len = ++t - p;
+			len = (int)(++t - p);
 			fp-_r -= len;
 			fp-_p = t;
 			(void)memcpy((void *)s, (void *)p, len);



CVS commit: src/lib/libc/sys

2009-10-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 24 17:49:58 UTC 2009

Modified Files:
src/lib/libc/sys: kqueue.2

Log Message:
simplify the example; only register the set of events to watch once since
it does not change. Also print that ATTR means changing times too.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/sys/kqueue.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.24 src/lib/libc/sys/kqueue.2:1.25
--- src/lib/libc/sys/kqueue.2:1.24	Tue Sep  1 18:12:05 2009
+++ src/lib/libc/sys/kqueue.2	Sat Oct 24 13:49:58 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: kqueue.2,v 1.24 2009/09/01 22:12:05 wiz Exp $
+.\	$NetBSD: kqueue.2,v 1.25 2009/10/24 17:49:58 christos Exp $
 .\
 .\ Copyright (c) 2000 Jonathan Lemon
 .\ All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\ $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $
 .\
-.Dd September 1, 2009
+.Dd October 24, 2009
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -496,7 +496,7 @@
 main(int argc, char *argv[])
 {
 int fd, kq, nev;
-struct kevent ev, ch;
+struct kevent ev;
 static const struct timespec tout = { 1, 0 };
 
 if ((fd = open(argv[1], O_RDONLY)) == -1)
@@ -505,11 +505,13 @@
 if ((kq = kqueue()) == -1)
 err(1, Cannot create kqueue);
 
-EV_SET(\*[Am]ch, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+EV_SET(\*[Am]ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
 NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
 NOTE_RENAME|NOTE_REVOKE, 0, 0);
+	if (kevent(kq, \*[Am]ch, 1, NULL, 0, \*[Am]tout) == -1)
+		err(1, kevent);
 for (;;) {
-nev = kevent(kq, \*[Am]ch, 1, \*[Am]ev, 1, \*[Am]tout);
+nev = kevent(kq, NULL, 0, \*[Am]ev, 1, \*[Am]tout);
 if (nev == -1)
 err(1, kevent);
 if (nev == 0)
@@ -527,7 +529,7 @@
 ev.fflags \*[Am]= ~NOTE_EXTEND;
 }
 if (ev.fflags \*[Am] NOTE_ATTRIB) {
-printf(chmod/chown );
+printf(chmod/chown/utimes );
 ev.fflags \*[Am]= ~NOTE_ATTRIB;
 }
 if (ev.fflags \*[Am] NOTE_LINK) {



CVS commit: src/sbin/disklabel

2009-10-24 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Oct 24 18:15:46 UTC 2009

Modified Files:
src/sbin/disklabel: dkcksum.c dkcksum.h

Log Message:
- u_short - uint16_t
- KNF a bit


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/disklabel/dkcksum.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/disklabel/dkcksum.h

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/dkcksum.c
diff -u src/sbin/disklabel/dkcksum.c:1.11 src/sbin/disklabel/dkcksum.c:1.12
--- src/sbin/disklabel/dkcksum.c:1.11	Sun Jun 12 19:18:34 2005
+++ src/sbin/disklabel/dkcksum.c	Sat Oct 24 18:15:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkcksum.c,v 1.11 2005/06/12 19:18:34 dyoung Exp $	*/
+/*	$NetBSD: dkcksum.c,v 1.12 2009/10/24 18:15:45 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)dkcksum.c	8.1 (Berkeley) 6/5/93;
 #else
-__RCSID($NetBSD: dkcksum.c,v 1.11 2005/06/12 19:18:34 dyoung Exp $);
+__RCSID($NetBSD: dkcksum.c,v 1.12 2009/10/24 18:15:45 tsutsui Exp $);
 #endif
 #endif /* not lint */
 
@@ -50,16 +50,16 @@
 #endif /* HAVE_NBTOOL_CONFIG_H */
 #include dkcksum.h
 
-u_short
+uint16_t
 dkcksum(struct disklabel *lp)
 {
-	u_short	*start, *end;
-	u_short	 sum;
+	uint16_t *start, *end;
+	uint16_t sum;
 
 	sum = 0;
-	start = (u_short *)lp;
-	end = (u_short *)lp-d_partitions[lp-d_npartitions];
+	start = (uint16_t *)lp;
+	end = (uint16_t *)lp-d_partitions[lp-d_npartitions];
 	while (start  end)
 		sum ^= *start++;
-	return (sum);
+	return sum;
 }

Index: src/sbin/disklabel/dkcksum.h
diff -u src/sbin/disklabel/dkcksum.h:1.3 src/sbin/disklabel/dkcksum.h:1.4
--- src/sbin/disklabel/dkcksum.h:1.3	Sun Dec 24 05:59:11 2000
+++ src/sbin/disklabel/dkcksum.h	Sat Oct 24 18:15:45 2009
@@ -1,3 +1,3 @@
-/*	$NetBSD: dkcksum.h,v 1.3 2000/12/24 05:59:11 lukem Exp $	*/
+/*	$NetBSD: dkcksum.h,v 1.4 2009/10/24 18:15:45 tsutsui Exp $	*/
 
-u_short	dkcksum(struct disklabel *);
+uint16_t	dkcksum(struct disklabel *);



CVS commit: src

2009-10-24 Thread Ty Sarna
Module Name:src
Committed By:   tsarna
Date:   Sun Oct 25 00:17:06 UTC 2009

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/etc: nsswitch.conf
src/external/apache2/mDNSResponder/nss: Makefile
src/share/man/man5: nsswitch.conf.5
Added Files:
src/external/apache2/mDNSResponder/nss: nss_mdnsd.c
Removed Files:
src/external/apache2/mDNSResponder/nss: nss_mdns.c

Log Message:
Major enhancements to mdnsd nsswitch support:

 - nss_mdns renamed to nss_multicast_dns for clarity and less chance of
   confusion with nss_mdnsd (see next).
 - Support using mdnsd for all unicast too with new nss_mdnsd module
   (note: this mode requires an updated mdnsd too, not yet committed)
 - Implement resolv.conf search directive support. Needed for nss_mdnsd,
   potentially useful with nss_multicast_dns (you could now do
   search example.com local in resolv.conf if you wanted to and it would
   act as you might expect)
 - Add references in nsswitch.conf man page and sample file
 - Implement AI_CANONNAME
 - Various bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.501 -r1.502 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/etc/nsswitch.conf
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/nss/Makefile
cvs rdiff -u -r1.1 -r0 src/external/apache2/mDNSResponder/nss/nss_mdns.c
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/nss/nss_mdnsd.c
cvs rdiff -u -r1.26 -r1.27 src/share/man/man5/nsswitch.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.501 src/distrib/sets/lists/base/shl.mi:1.502
--- src/distrib/sets/lists/base/shl.mi:1.501	Sun Oct 18 20:26:33 2009
+++ src/distrib/sets/lists/base/shl.mi	Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.501 2009/10/18 20:26:33 pooka Exp $
+# $NetBSD: shl.mi,v 1.502 2009/10/25 00:17:06 tsarna Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -174,7 +174,9 @@
 ./usr/lib/libzfs.so.0.0base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libzpool.so.0.0			base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libzpool_pic.a			base-zfs-shlib		zfs,dynamicroot
-./usr/lib/nss_mdns.so.0base-mdns-shlib		mdns
+./usr/lib/nss_mdns.so.0base-mdns-shlib		mdns,obsolete
+./usr/lib/nss_mdnsd.so.0			base-mdns-shlib		mdns
+./usr/lib/nss_multicast_dns.so.0		base-mdns-shlib		mdns
 ./usr/lib/security/pam_afslog.so.3		base-sys-shlib		kerberos,pam
 ./usr/lib/security/pam_chroot.so.3		base-sys-shlib		pam
 ./usr/lib/security/pam_deny.so.3		base-sys-shlib		pam

Index: src/etc/nsswitch.conf
diff -u src/etc/nsswitch.conf:1.5 src/etc/nsswitch.conf:1.6
--- src/etc/nsswitch.conf:1.5	Sun Oct 24 12:36:52 1999
+++ src/etc/nsswitch.conf	Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: nsswitch.conf,v 1.5 1999/10/24 12:36:52 lukem Exp $
+#	$NetBSD: nsswitch.conf,v 1.6 2009/10/25 00:17:06 tsarna Exp $
 #
 # nsswitch.conf(5) -
 #	name service switch configuration file
@@ -21,7 +21,7 @@
 #
 # group:		compat, dns, files, nis
 # group_compat:		dns, nis
-# hosts:		dns, files, nis
+# hosts:		dns, files, nis, mdnsd, multicast_dns
 # netgroup:		files, nis
 # networks:		dns, files, nis
 # passwd:		compat, dns, files, nis

Index: src/external/apache2/mDNSResponder/nss/Makefile
diff -u src/external/apache2/mDNSResponder/nss/Makefile:1.1 src/external/apache2/mDNSResponder/nss/Makefile:1.2
--- src/external/apache2/mDNSResponder/nss/Makefile:1.1	Mon Oct  5 03:54:17 2009
+++ src/external/apache2/mDNSResponder/nss/Makefile	Sun Oct 25 00:17:06 2009
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2009/10/05 03:54:17 tsarna Exp $
+#	$NetBSD: Makefile,v 1.2 2009/10/25 00:17:06 tsarna Exp $
 
-LIB=		nss_mdns
+LIB=		nss_mdnsd
 SHLIB_MAJOR=	0
+LINKS=  	${LIBDIR}/${LIB}.so.${SHLIB_MAJOR} \
+		${LIBDIR}/nss_multicast_dns.so.${SHLIB_MAJOR}
 
 NOLINT=		# don't build a lint library
 NOPROFILE=	# don't build a profile library
@@ -11,7 +13,7 @@
 
 .include ${.CURDIR}/../Makefile.inc
 
-SRCS=		nss_mdns.c
+SRCS=		nss_mdnsd.c
 LDADD+= 	-ldns_sd
 DPADD+= 	${LIBDNS_SD}
 

Index: src/share/man/man5/nsswitch.conf.5
diff -u src/share/man/man5/nsswitch.conf.5:1.26 src/share/man/man5/nsswitch.conf.5:1.27
--- src/share/man/man5/nsswitch.conf.5:1.26	Wed Mar 11 13:51:47 2009
+++ src/share/man/man5/nsswitch.conf.5	Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: nsswitch.conf.5,v 1.26 2009/03/11 13:51:47 joerg Exp $
+.\	$NetBSD: nsswitch.conf.5,v 1.27 2009/10/25 00:17:06 tsarna Exp $
 .\
 .\  Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
 .\  All rights reserved.
@@ -58,7 +58,7 @@
 take if that status code occurs.
 .Ss Sources
 The following sources are implemented:
-.Bl -column compat -offset indent -compact
+.Bl -column multicast_dns -offset indent -compact
 .It Sy Source	Description
 .It files	Local 

CVS commit: src/doc

2009-10-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct 25 04:42:16 UTC 2009

Modified Files:
src/doc: 3RDPARTY

Log Message:
update to 9.7.0-b1


To generate a diff of this commit:
cvs rdiff -u -r1.723 -r1.724 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.723 src/doc/3RDPARTY:1.724
--- src/doc/3RDPARTY:1.723	Wed Oct 21 18:32:11 2009
+++ src/doc/3RDPARTY	Sun Oct 25 00:42:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.723 2009/10/21 22:32:11 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.724 2009/10/25 04:42:16 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -91,8 +91,8 @@
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.6.1-P1
-Current Vers:	9.6.1-P1
+Version:	9.7.0-b1
+Current Vers:	9.7.0-b1
 Maintainer:	Paul Vixie vi...@vix.com
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/sw/bind/