CVS commit: src/share/man/man5

2012-09-30 Thread Joseph Koshy 
Module Name:src
Committed By:   jkoshy
Date:   Sun Sep 30 06:00:26 UTC 2012

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

Log Message:
Correct a typo.

Reported by:tsutsui


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/share/man/man5/mk.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/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.63 src/share/man/man5/mk.conf.5:1.64
--- src/share/man/man5/mk.conf.5:1.63	Sun Sep 30 03:48:16 2012
+++ src/share/man/man5/mk.conf.5	Sun Sep 30 06:00:26 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: mk.conf.5,v 1.63 2012/09/30 03:48:16 jkoshy Exp $
+.\	$NetBSD: mk.conf.5,v 1.64 2012/09/30 06:00:26 jkoshy Exp $
 .\
 .\  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\  All rights reserved.
@@ -309,7 +309,7 @@ then file deletions will not be verified
 Indicates whether support for multiple ABIs is to be built and
 installed.
 .DFLTy
-on amd64, mips and sparc64,
+on amd64, mips64 and sparc64,
 .Dq no
 on other architectures.
 .

CVS commit: src/usr.sbin/npf/npfctl

2012-09-30 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Sep 30 07:43:04 UTC 2012

Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5

Log Message:
Whitespace fixes, remove unnecessary Pp
XXX: Subsections Rules and Procedures seem empty?


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/npf/npfctl/npf.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/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.18 src/usr.sbin/npf/npfctl/npf.conf.5:1.19
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.18	Sat Sep 29 19:50:03 2012
+++ src/usr.sbin/npf/npfctl/npf.conf.5	Sun Sep 30 07:43:03 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.18 2012/09/29 19:50:03 rmind Exp $
+.\$NetBSD: npf.conf.5,v 1.19 2012/09/30 07:43:03 wiz Exp $
 .\
 .\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -60,7 +60,7 @@ definitions to call on filtered packets.
 The minimal
 .Nm
 must contain a mandatory
-.Cd default group.
+.Cd default group .
 .Sh SYNTAX
 .Ss Variables
 Variables are specified using the dollar ($) sign, which is used both
@@ -96,7 +96,6 @@ The file should contain a list of IP add
 .Ed
 .Pp
 Tables of type hash can only contain IP addresses.
-.Pp
 .Ss Groups
 Groups may have the following options: name, interface, and direction.
 They are defined in the following form:
@@ -106,9 +105,7 @@ group (name my_group, interface wm0, i
 	# List of rules
 }
 .Ed
-.Pp
 .Ss Rules
-.Pp
 .Ss Map
 Network Address Translation (NAT) is expressed in a form of segment mapping.
 At present, only dynamic translation is supported.
@@ -135,7 +132,6 @@ on packets originating from 10.1.1.0/24 
 Explicit filter criteria can be specified using pass criteria as
 an additional option of the mapping.
 .Ss Procedures
-.Pp
 .Ss Misc
 Text after a hash (#) character is considered a comment.
 The \\ character at the end of a line marks a continuation line,
@@ -170,7 +166,7 @@ map		= map interface ( static | dyn
 		  [ pass filt-opts ]
 
 ; Rule procedure definition.  The name should be in the double quotes.
-; 
+;
 ; Each call can have its own options in a form of key-value pairs.
 ; Both key and values may be strings (either in double quotes or not)
 ; and numbers, depending on the extension.

CVS commit: src/sys/dev/pci

2012-09-30 Thread David Laight 
Module Name:src
Committed By:   dsl
Date:   Sun Sep 30 11:29:42 UTC 2012

Modified Files:
src/sys/dev/pci: if_rtw_pci.c

Log Message:
Fix debug build


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_rtw_pci.c

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

Modified files:

Index: src/sys/dev/pci/if_rtw_pci.c
diff -u src/sys/dev/pci/if_rtw_pci.c:1.21 src/sys/dev/pci/if_rtw_pci.c:1.22
--- src/sys/dev/pci/if_rtw_pci.c:1.21	Sun Sep 23 01:12:51 2012
+++ src/sys/dev/pci/if_rtw_pci.c	Sun Sep 30 11:29:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_pci.c,v 1.21 2012/09/23 01:12:51 chs Exp $ */
+/* $NetBSD: if_rtw_pci.c,v 1.22 2012/09/30 11:29:42 dsl Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005, 2010 David Young.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_rtw_pci.c,v 1.21 2012/09/23 01:12:51 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_rtw_pci.c,v 1.22 2012/09/30 11:29:42 dsl Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -139,11 +139,13 @@ static const struct rtw_pci_product {
 	{ PCI_VENDOR_REALTEK,		PCI_PRODUCT_REALTEK_RT8180,
 	  Realtek RTL8180 802.11 MAC/BBP },
 #ifdef RTW_DEBUG
+#if 0   /* These came from openbsd, netbsd doesn't have the definitions. */
 	{ PCI_VENDOR_REALTEK,		PCI_PRODUCT_REALTEK_RT8185,
 	  Realtek RTL8185 802.11 MAC/BBP },
 	{ PCI_VENDOR_BELKIN2,		PCI_PRODUCT_BELKIN2_F5D7010,
 	  Belkin F5D7010 },
 #endif
+#endif
 	{ PCI_VENDOR_BELKIN,		PCI_PRODUCT_BELKIN_F5D6001,
 	  Belkin F5D6001 },
 	{ PCI_VENDOR_BELKIN,		PCI_PRODUCT_BELKIN_F5D6020V3,

CVS commit: src/sys/kern

2012-09-30 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Sep 30 11:49:44 UTC 2012

Modified Files:
src/sys/kern: tty.c

Log Message:
Provide consistent locking around getc() in ttread(). This is necessary
to prevent crashes in MPSAFE tty drivers like ucom.


To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/kern/tty.c

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

Modified files:

Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.253 src/sys/kern/tty.c:1.254
--- src/sys/kern/tty.c:1.253	Fri Aug 17 16:21:19 2012
+++ src/sys/kern/tty.c	Sun Sep 30 11:49:44 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.253 2012/08/17 16:21:19 christos Exp $	*/
+/*	$NetBSD: tty.c,v 1.254 2012/09/30 11:49:44 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.253 2012/08/17 16:21:19 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.254 2012/09/30 11:49:44 mlelstv Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1928,7 +1928,6 @@ ttread(struct tty *tp, struct uio *uio, 
 		goto loop;
 	}
  read:
-	mutex_spin_exit(tty_lock);
 
 	/*
 	 * Input present, check for input mapping and processing.
@@ -1940,16 +1939,14 @@ ttread(struct tty *tp, struct uio *uio, 
 		 */
 		if (CCEQ(cc[VDSUSP], c) 
 		ISSET(lflag, IEXTEN|ISIG) == (IEXTEN|ISIG)) {
-			mutex_spin_enter(tty_lock);
 			ttysig(tp, TTYSIG_PG1, SIGTSTP);
 			if (first) {
 error = ttypause(tp, hz);
-mutex_spin_exit(tty_lock);
 if (error)
 	break;
-goto loop;
-			} else
 mutex_spin_exit(tty_lock);
+goto loop;
+			}
 			break;
 		}
 		/*
@@ -1973,11 +1970,11 @@ ttread(struct tty *tp, struct uio *uio, 
 			break;
 		first = 0;
 	}
+
 	/*
 	 * Look to unblock output now that (presumably)
 	 * the input queue has gone down.
 	 */
-	mutex_spin_enter(tty_lock);
 	if (ISSET(tp-t_state, TS_TBLOCK)  tp-t_rawq.c_cc  TTYHOG / 5) {
 		if (ISSET(tp-t_iflag, IXOFF) 
 		cc[VSTART] != _POSIX_VDISABLE

CVS commit: src/usr.sbin/npf/npfctl

2012-09-30 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Sep 30 13:15:03 UTC 2012

Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5

Log Message:
Use more markup. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/npf/npfctl/npf.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/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.20 src/usr.sbin/npf/npfctl/npf.conf.5:1.21
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.20	Sun Sep 30 12:59:31 2012
+++ src/usr.sbin/npf/npfctl/npf.conf.5	Sun Sep 30 13:15:03 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.20 2012/09/30 12:59:31 spz Exp $
+.\$NetBSD: npf.conf.5,v 1.21 2012/09/30 13:15:03 wiz Exp $
 .\
 .\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -124,7 +124,10 @@ pass stateful in final family inet proto
 	from $source port $sport to $dest port $dport apply someproc
 .Ed
 .Pp
-Any protocol in /etc/protocols can be specified. Further packet
+Any protocol in
+.Pa /etc/protocols
+can be specified.
+Further packet
 specification at present is limited to protocol TCP understanding flags,
 TCP and UDP understanding source and destination ports, and ICMP and
 IPv6-ICMP understanding icmp-type.

CVS commit: [netbsd-5] src/lib/libcurses

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 17:52:06 UTC 2012

Modified Files:
src/lib/libcurses [netbsd-5]: get_wch.c

Log Message:
Pull up following revision(s) (requested by blymn in ticket #1791):
lib/libcurses/get_wch.c: revision 1.10
* Size argument for memset when clearing cbuf was wrong, cbuf is an array
  of char not int so memset was stomping memory past the end of the array.
  Use sizeof properly to correctly determine the amount of memory to clear.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 src/lib/libcurses/get_wch.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/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.6 src/lib/libcurses/get_wch.c:1.6.8.1
--- src/lib/libcurses/get_wch.c:1.6	Mon Apr 14 20:33:59 2008
+++ src/lib/libcurses/get_wch.c	Sun Sep 30 17:52:06 2012
@@ -1,4 +1,4 @@
-/*   $NetBSD: get_wch.c,v 1.6 2008/04/14 20:33:59 jdc Exp $ */
+/*   $NetBSD: get_wch.c,v 1.6.8.1 2012/09/30 17:52:06 bouyer Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: get_wch.c,v 1.6 2008/04/14 20:33:59 jdc Exp $);
+__RCSID($NetBSD: get_wch.c,v 1.6.8.1 2012/09/30 17:52:06 bouyer Exp $);
 #endif		  /* not lint */
 
 #include string.h
@@ -67,7 +67,7 @@ void
 __init_get_wch(SCREEN *screen)
 {
 	wstate = INKEY_NORM;
-	memset( screen-cbuf, 0, MAX_CBUF_SIZE * sizeof( int ));
+	memset( screen-cbuf, 0, sizeof(screen-cbuf));
 	screen-cbuf_head = screen-cbuf_tail = screen-cbuf_cur = 0;
 }
 #endif /* HAVE_WCHAR */

CVS commit: [netbsd-5] src/lib/libmenu

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 17:55:21 UTC 2012

Modified Files:
src/lib/libmenu [netbsd-5]: internals.c

Log Message:
Pull up following revision(s) (requested by blymn in ticket #1792):
lib/libmenu/internals.c: revisions 1.14, 1.15
Extraneous whitespace removal.
* Corrected menu drawing when O_ROWMAJOR is not set
* Corrected menu item neighbour calculation so it works when O_ROWMAJOR
  is set and unset.  This corrects item navigation which was previously
  broken when O_ROWMAJOR was not set.
This resolves lib/46620.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.24.1 src/lib/libmenu/internals.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/libmenu/internals.c
diff -u src/lib/libmenu/internals.c:1.13 src/lib/libmenu/internals.c:1.13.24.1
--- src/lib/libmenu/internals.c:1.13	Fri Nov 24 19:46:58 2006
+++ src/lib/libmenu/internals.c	Sun Sep 30 17:55:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: internals.c,v 1.13 2006/11/24 19:46:58 christos Exp $	*/
+/*	$NetBSD: internals.c,v 1.13.24.1 2012/09/30 17:55:21 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1998-1999 Brett Lymn (bl...@baea.com.au, brett_l...@yahoo.com.au)
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: internals.c,v 1.13 2006/11/24 19:46:58 christos Exp $);
+__RCSID($NetBSD: internals.c,v 1.13.24.1 2012/09/30 17:55:21 bouyer Exp $);
 
 #include menu.h
 #include ctype.h
@@ -37,9 +37,7 @@ __RCSID($NetBSD: internals.c,v 1.13 200
 
 /* internal function prototypes */
 static void
-_menui_calc_neighbours(MENU *menu, int item_no, int cycle, int item_rows,
-		   int item_cols, ITEM **next, ITEM **prev,
-			ITEM **major_next, ITEM **major_prev);
+_menui_calc_neighbours(MENU *menu, int item_no);
 static void _menui_redraw_menu(MENU *menu, int old_top_row, int old_cur_item);
 
   /*
@@ -52,9 +50,8 @@ static void _menui_redraw_menu(MENU *men
 int
 _menui_stitch_items(MENU *menu)
 {
-	int i, cycle, row_major;
+	int i, row_major;
 
-	cycle = ((menu-opts  O_NONCYCLIC) != O_NONCYCLIC);
 	row_major = ((menu-opts  O_ROWMAJOR) == O_ROWMAJOR);
 
 	if (menu-posted == 1)
@@ -62,41 +59,14 @@ _menui_stitch_items(MENU *menu)
 	if (menu-items == NULL)
 		return E_BAD_ARGUMENT;
 
-	if (row_major) {
-		menu-item_rows = menu-item_count / menu-cols;
-		menu-item_cols = menu-cols;
-		if (menu-item_count  (menu-item_rows * menu-item_cols))
-			menu-item_rows += 1;
-	} else {
-		menu-item_cols = menu-item_count / menu-rows;
-		menu-item_rows = menu-rows;
-		if (menu-item_count  (menu-item_rows * menu-item_cols))
-			menu-item_cols += 1;
-	}
-	
+	menu-item_rows = menu-item_count / menu-cols;
+	menu-item_cols = menu-cols;
+	if (menu-item_count  (menu-item_rows * menu-item_cols))
+		menu-item_rows += 1;
 
 	_menui_max_item_size(menu);
 
 	for (i = 0; i  menu-item_count; i++) {
-		  /* Calculate the neighbours.  The ugliness here deals with
-		   * the differing menu layout styles.  The layout affects
-		   * the neighbour calculation so we change the arguments
-		   * around depending on the layout style.
-		   */
-		_menui_calc_neighbours(menu, i, cycle,
-	(row_major) ? menu-item_rows
-	: menu-item_cols,
-	(row_major) ? menu-item_cols
-	: menu-item_rows,
-	(row_major) ? menu-items[i]-right
-	: menu-items[i]-down,
-	(row_major) ? menu-items[i]-left
-	: menu-items[i]-up,
-	(row_major) ? menu-items[i]-down
-	: menu-items[i]-right,
-	(row_major) ? menu-items[i]-up
-	: menu-items[i]-left);
-		
 		  /* fill in the row and column value of the item */
 		if (row_major) {
 			menu-items[i]-row = i / menu-item_cols;
@@ -105,125 +75,200 @@ _menui_stitch_items(MENU *menu)
 			menu-items[i]-row = i % menu-item_rows;
 			menu-items[i]-col = i / menu-item_rows;
 		}
+
+		_menui_calc_neighbours(menu, i);
 	}
-	
+
 	return E_OK;
 }
 
   /*
-   * Calculate the neighbours for an item in menu.  This routine deliberately
-   * does not refer to up/down/left/right as these concepts depend on the menu
-   * layout style (row major or not).  By arranging the arguments in the right
-   * order the caller can generate the neighbours for either menu layout style.
+   * Calculate the neighbours for an item in menu.
*/
 static void
-_menui_calc_neighbours(MENU *menu, int item_no, int cycle, int item_rows,
-		   int item_cols, ITEM **next, ITEM **prev,
-		   ITEM **major_next, ITEM **major_prev)
+_menui_calc_neighbours(MENU *menu, int item_no)
 {
-	int neighbour;
+	int neighbour, cycle, row_major, edge;
+	ITEM *item;
 
-	if (item_rows  2) {
+	row_major = ((menu-opts  O_ROWMAJOR) == O_ROWMAJOR);
+	cycle = ((menu-opts  O_NONCYCLIC) != O_NONCYCLIC);
+	item = menu-items[item_no];
+
+	if (menu-item_rows  2) {
 		if (cycle) {
-			*major_next = menu-items[item_no];
-			*major_prev = menu-items[item_no];
+			item-up = item;
+			item-down = item;
 		} else {
-			*major_next = NULL;
-

CVS commit: [netbsd-5] src/sys/nfs

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 17:59:57 UTC 2012

Modified Files:
src/sys/nfs [netbsd-5]: nfs_serv.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #1794):
sys/nfs/nfs_serv.c: revision 1.164 via patch
fix error handling in nfsrv_rename(): when the first nfs_namei() fails,
don't try to free the resources allocated by a successful lookup.


To generate a diff of this commit:
cvs rdiff -u -r1.138.16.2 -r1.138.16.3 src/sys/nfs/nfs_serv.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/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.138.16.2 src/sys/nfs/nfs_serv.c:1.138.16.3
--- src/sys/nfs/nfs_serv.c:1.138.16.2	Sun Feb 14 13:27:45 2010
+++ src/sys/nfs/nfs_serv.c	Sun Sep 30 17:59:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_serv.c,v 1.138.16.2 2010/02/14 13:27:45 bouyer Exp $	*/
+/*	$NetBSD: nfs_serv.c,v 1.138.16.3 2012/09/30 17:59:57 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.138.16.2 2010/02/14 13:27:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.138.16.3 2012/09/30 17:59:57 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1866,6 +1866,7 @@ nfsrv_rename(nfsd, slp, lwp, mrq)
 		fdirfor_ret = VOP_GETATTR(fdirp, fdirfor, cred);
 	}
 	if (error) {
+		fromnd.ni_cnd.cn_nameiop = 0;
 		nfsm_reply(2 * NFSX_WCCDATA(v3));
 		nfsm_srvwcc_data(fdirfor_ret, fdirfor, fdiraft_ret, fdiraft);
 		nfsm_srvwcc_data(tdirfor_ret, tdirfor, tdiraft_ret, tdiraft);

CVS commit: [netbsd-5] src/sys/dev/pci

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:03:43 UTC 2012

Modified Files:
src/sys/dev/pci [netbsd-5]: mfi_pci.c

Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1795):
sys/dev/pci/mfi_pci.c: revision 1.17 via patch
PR/46877 - Wolfgang Stukenbrock -- missing definition for Symbios SAS 9261-8i


To generate a diff of this commit:
cvs rdiff -u -r1.5.14.1 -r1.5.14.2 src/sys/dev/pci/mfi_pci.c

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

Modified files:

Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.5.14.1 src/sys/dev/pci/mfi_pci.c:1.5.14.2
--- src/sys/dev/pci/mfi_pci.c:1.5.14.1	Sun Mar 28 15:03:22 2010
+++ src/sys/dev/pci/mfi_pci.c	Sun Sep 30 18:03:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.5.14.1 2010/03/28 15:03:22 snj Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.5.14.2 2012/09/30 18:03:43 bouyer Exp $ */
 /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom ma...@peereboom.us
@@ -17,7 +17,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.5.14.1 2010/03/28 15:03:22 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.5.14.2 2012/09/30 18:03:43 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -78,6 +78,7 @@ static const struct mfi_pci_subtype mfi_
 
 static const struct mfi_pci_subtype mfi_gen2_subtypes[] = {
 	{ PCI_VENDOR_SYMBIOS,	0x9261,		SAS 9260-8i },
+	{ PCI_VENDOR_SYMBIOS,	0x9263,		SAS 9261-8i },
 	{ 0x0,			0,		 }
 };

CVS commit: [netbsd-5-1] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:12:36 UTC 2012

Modified Files:
src/doc [netbsd-5-1]: 3RDPARTY
src/share/zoneinfo [netbsd-5-1]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #1798):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.12.2.4 -r1.647.2.12.2.5 src/doc/3RDPARTY
cvs rdiff -u -r1.17.10.3 -r1.17.10.4 src/share/zoneinfo/australasia

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.647.2.12.2.4 src/doc/3RDPARTY:1.647.2.12.2.5
--- src/doc/3RDPARTY:1.647.2.12.2.4	Sat Sep 15 09:26:52 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:12:35 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.12.2.4 2012/09/15 09:26:52 bouyer Exp $
+#  $NetBSD: 3RDPARTY,v 1.647.2.12.2.5 2012/09/30 18:12:35 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -924,8 +924,8 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:	tzcode2004a / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2004a / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.17.10.3 src/share/zoneinfo/australasia:1.17.10.4
--- src/share/zoneinfo/australasia:1.17.10.3	Sat Sep 15 09:26:53 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:12:36 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-5-0] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:12:47 UTC 2012

Modified Files:
src/doc [netbsd-5-0]: 3RDPARTY
src/share/zoneinfo [netbsd-5-0]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #1798):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.6.2.7 -r1.647.2.6.2.8 src/doc/3RDPARTY
cvs rdiff -u -r1.17.6.3 -r1.17.6.4 src/share/zoneinfo/australasia

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.647.2.6.2.7 src/doc/3RDPARTY:1.647.2.6.2.8
--- src/doc/3RDPARTY:1.647.2.6.2.7	Sat Sep 15 09:26:27 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:12:46 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.6.2.7 2012/09/15 09:26:27 bouyer Exp $
+#  $NetBSD: 3RDPARTY,v 1.647.2.6.2.8 2012/09/30 18:12:46 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -924,8 +924,8 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:	tzcode2004a / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2004a / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.17.6.3 src/share/zoneinfo/australasia:1.17.6.4
--- src/share/zoneinfo/australasia:1.17.6.3	Sat Sep 15 09:26:28 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:12:46 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-5] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:12:51 UTC 2012

Modified Files:
src/doc [netbsd-5]: 3RDPARTY
src/share/zoneinfo [netbsd-5]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #1798):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.18 -r1.647.2.19 src/doc/3RDPARTY
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 src/share/zoneinfo/australasia

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.647.2.18 src/doc/3RDPARTY:1.647.2.19
--- src/doc/3RDPARTY:1.647.2.18	Sat Sep 15 09:26:41 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:12:51 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.18 2012/09/15 09:26:41 bouyer Exp $
+#  $NetBSD: 3RDPARTY,v 1.647.2.19 2012/09/30 18:12:51 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -924,8 +924,8 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:	tzcode2004a / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2004a / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.17.2.3 src/share/zoneinfo/australasia:1.17.2.4
--- src/share/zoneinfo/australasia:1.17.2.3	Sat Sep 15 09:26:42 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:12:51 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-5-0] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:13:27 UTC 2012

Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.3

Log Message:
ticket 1798


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-5.0.3

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

Modified files:

Index: src/doc/CHANGES-5.0.3
diff -u src/doc/CHANGES-5.0.3:1.1.2.82 src/doc/CHANGES-5.0.3:1.1.2.83
--- src/doc/CHANGES-5.0.3:1.1.2.82	Sat Sep 15 09:27:22 2012
+++ src/doc/CHANGES-5.0.3	Sun Sep 30 18:13:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.82 2012/09/15 09:27:22 bouyer Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.83 2012/09/30 18:13:27 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
 release:
@@ -5110,3 +5110,13 @@ share/zoneinfo/zone.tab	patch
 		* Use a single version number for both code and data.
 	[apb, ticket #1783]
 
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1798]
+

CVS commit: [netbsd-5-1] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:13:29 UTC 2012

Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.3

Log Message:
ticket 1798


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-5.1.3

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

Modified files:

Index: src/doc/CHANGES-5.1.3
diff -u src/doc/CHANGES-5.1.3:1.1.2.23 src/doc/CHANGES-5.1.3:1.1.2.24
--- src/doc/CHANGES-5.1.3:1.1.2.23	Sat Sep 15 09:27:32 2012
+++ src/doc/CHANGES-5.1.3	Sun Sep 30 18:13:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.23 2012/09/15 09:27:32 bouyer Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.24 2012/09/30 18:13:29 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
 release:
@@ -2196,3 +2196,13 @@ share/zoneinfo/zone.tab	patch
 		* Use a single version number for both code and data.
 	[apb, ticket #1783]
 
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1798]
+

CVS commit: [netbsd-5] src/gnu/dist/binutils

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:17:50 UTC 2012

Modified Files:
src/gnu/dist/binutils/bfd [netbsd-5]: archive.c
src/gnu/dist/binutils/binutils [netbsd-5]: arsup.c

Log Message:
gnu/dist/binutils/bfd/archive.c patch
gnu/dist/binutils/binutils/arsup.c  patch

Fix buffer overflow in ar(1), from toolchain/46827
[christos, ticket #1793]


To generate a diff of this commit:
cvs rdiff -u -r1.5.26.1 -r1.5.26.2 src/gnu/dist/binutils/bfd/archive.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.26.1 src/gnu/dist/binutils/binutils/arsup.c

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

Modified files:

Index: src/gnu/dist/binutils/bfd/archive.c
diff -u src/gnu/dist/binutils/bfd/archive.c:1.5.26.1 src/gnu/dist/binutils/bfd/archive.c:1.5.26.2
--- src/gnu/dist/binutils/bfd/archive.c:1.5.26.1	Thu Dec  4 02:21:30 2008
+++ src/gnu/dist/binutils/bfd/archive.c	Sun Sep 30 18:17:50 2012
@@ -1325,7 +1325,7 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, c
   struct ar_hdr *hdr;
   char *temp, *temp1;
   bfd_size_type amt;
-  char tmpbuf[11];
+  char tmpbuf[1024];
 
   if (member  (member-flags  BFD_IN_MEMORY) != 0)
 {
@@ -1355,7 +1355,8 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, c
   strncpy (hdr-ar_fmag, ARFMAG, 2);
 
   /* Goddamned sprintf doesn't permit MAXIMUM field lengths.  */
-  sprintf ((hdr-ar_date), %-12ld, (long) status.st_mtime);
+  sprintf (tmpbuf, %-12ld, (long) status.st_mtime);
+  memcpy(hdr-ar_date, tmpbuf, sizeof(hdr-ar_date));
 #ifdef HPUX_LARGE_AR_IDS
   /* HP has a very special way to handle UID/GID's with numeric values
   9.  */
@@ -1363,7 +1364,10 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, c
 hpux_uid_gid_encode (hdr-ar_gid, (long) status.st_uid);
   else
 #endif
-sprintf ((hdr-ar_uid), %ld, (long) status.st_uid);
+  {
+  sprintf (tmpbuf, %ld, (long) status.st_uid);
+  memcpy(hdr-ar_uid, tmpbuf, sizeof(hdr-ar_uid));
+  }
 #ifdef HPUX_LARGE_AR_IDS
   /* HP has a very special way to handle UID/GID's with numeric values
   9.  */
@@ -1371,8 +1375,12 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, c
 hpux_uid_gid_encode (hdr-ar_uid, (long) status.st_gid);
   else
 #endif
-  sprintf ((hdr-ar_gid), %ld, (long) status.st_gid);
-  sprintf ((hdr-ar_mode), %-8o, (unsigned int) status.st_mode);
+  {
+  sprintf (tmpbuf, %ld, (long) status.st_gid);
+  memcpy(hdr-ar_gid, tmpbuf, sizeof(hdr-ar_gid));
+  }
+  sprintf (tmpbuf, %-8o, (unsigned int) status.st_mode);
+  memcpy(hdr-ar_mode, tmpbuf, sizeof(hdr-ar_mode));
   sprintf (tmpbuf, %-10ld, (long) status.st_size);
   memcpy(hdr-ar_size, tmpbuf, sizeof(hdr-ar_size));
   /* Correct for a lossage in sprintf whereby it null-terminates.  I cannot

Index: src/gnu/dist/binutils/binutils/arsup.c
diff -u src/gnu/dist/binutils/binutils/arsup.c:1.1.1.3 src/gnu/dist/binutils/binutils/arsup.c:1.1.1.3.26.1
--- src/gnu/dist/binutils/binutils/arsup.c:1.1.1.3	Thu Feb  2 20:38:46 2006
+++ src/gnu/dist/binutils/binutils/arsup.c	Sun Sep 30 18:17:50 2012
@@ -147,7 +147,7 @@ char *real_name;
 void
 ar_open (char *name, int t)
 {
-  char *tname = (char *) xmalloc (strlen (name) + 10);
+  char *tname = (char *) xmalloc (4096);
   const char *bname = lbasename (name);
   real_name = name;

CVS commit: [netbsd-5] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:19:34 UTC 2012

Modified Files:
src/doc [netbsd-5]: CHANGES-5.2

Log Message:
tickets 1791-1795, 1798


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.185 -r1.1.2.186 src/doc/CHANGES-5.2

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

Modified files:

Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.185 src/doc/CHANGES-5.2:1.1.2.186
--- src/doc/CHANGES-5.2:1.1.2.185	Fri Sep 28 10:59:34 2012
+++ src/doc/CHANGES-5.2	Sun Sep 30 18:19:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.185 2012/09/28 10:59:34 sborrill Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.186 2012/09/30 18:19:34 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -8611,3 +8611,42 @@ distrib/sets/lists/man/mi			1.1370 via p
 	Add uts(4) driver for USB touchscreens.
 	[liamjfoy, #1797]
 
+lib/libcurses/get_wch.c1.10
+
+	fixes an out of bounds memory write in libcurses
+	[blymn, ticket #1791]
+
+lib/libmenu/internals.c1.14, 1.15
+
+	fix a bug with menu presentation and item linking when O_ROWMAJOR
+	is set.  Fix lib/46620.
+	[blymn, ticket #1792]
+
+sys/nfs/nfs_serv.c1.164 via patch
+
+	fix error handling in nfsrv_rename(): when the first nfs_namei() fails,
+	don't try to free not-yet-allocated resources.
+	[chs, ticket #1794]
+
+sys/dev/pci/mfi_pci.c1.17 via patch
+
+	PR/46877 - Wolfgang Stukenbrock -- missing definition for Symbios
+	SAS 9261-8i
+	[jnemeth, ticket #1795]
+
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1798]
+
+gnu/dist/binutils/bfd/archive.c			patch
+gnu/dist/binutils/binutils/arsup.c		patch
+
+	Fix buffer overflow in ar(1), from toolchain/46827
+	[christos, ticket #1793]
+

CVS commit: [netbsd-4] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:22:42 UTC 2012

Modified Files:
src/doc [netbsd-4]: 3RDPARTY
src/share/zoneinfo [netbsd-4]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #1458):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.486.2.17 -r1.486.2.18 src/doc/3RDPARTY
cvs rdiff -u -r1.11.2.8 -r1.11.2.9 src/share/zoneinfo/australasia

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.486.2.17 src/doc/3RDPARTY:1.486.2.18
--- src/doc/3RDPARTY:1.486.2.17	Sat Sep 15 09:04:07 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:22:41 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.486.2.17 2012/09/15 09:04:07 bouyer Exp $
+#	$NetBSD: 3RDPARTY,v 1.486.2.18 2012/09/30 18:22:41 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -845,8 +845,8 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:	tzcode2004a / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2004a / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.11.2.8 src/share/zoneinfo/australasia:1.11.2.9
--- src/share/zoneinfo/australasia:1.11.2.8	Sat Sep 15 09:04:07 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:22:41 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-4] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:23:06 UTC 2012

Modified Files:
src/doc [netbsd-4]: CHANGES-4.1

Log Message:
ticket 1458


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.249 -r1.1.2.250 src/doc/CHANGES-4.1

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

Modified files:

Index: src/doc/CHANGES-4.1
diff -u src/doc/CHANGES-4.1:1.1.2.249 src/doc/CHANGES-4.1:1.1.2.250
--- src/doc/CHANGES-4.1:1.1.2.249	Sat Sep 15 09:23:03 2012
+++ src/doc/CHANGES-4.1	Sun Sep 30 18:23:06 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.1,v 1.1.2.249 2012/09/15 09:23:03 bouyer Exp $
+#	$NetBSD: CHANGES-4.1,v 1.1.2.250 2012/09/30 18:23:06 bouyer Exp $
 
 A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
 release:
@@ -4754,3 +4754,13 @@ dist/bind/lib/dns/include/dns/rdata.h			
 	record) from upstream.
 	[spz, ticket #1457]
 
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1458]
+

CVS commit: [netbsd-4-0] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:23:36 UTC 2012

Modified Files:
src/doc [netbsd-4-0]: 3RDPARTY
src/share/zoneinfo [netbsd-4-0]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #1458):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.486.2.9.2.8 -r1.486.2.9.2.9 src/doc/3RDPARTY
cvs rdiff -u -r1.11.2.4.2.4 -r1.11.2.4.2.5 src/share/zoneinfo/australasia

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.486.2.9.2.8 src/doc/3RDPARTY:1.486.2.9.2.9
--- src/doc/3RDPARTY:1.486.2.9.2.8	Sat Sep 15 09:03:52 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:23:36 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.486.2.9.2.8 2012/09/15 09:03:52 bouyer Exp $
+#	$NetBSD: 3RDPARTY,v 1.486.2.9.2.9 2012/09/30 18:23:36 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -845,8 +845,8 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:	tzcode2004a / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2004a / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.11.2.4.2.4 src/share/zoneinfo/australasia:1.11.2.4.2.5
--- src/share/zoneinfo/australasia:1.11.2.4.2.4	Sat Sep 15 09:03:52 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:23:36 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-4-0] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:23:53 UTC 2012

Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2

Log Message:
ticket 1458


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-4.0.2

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

Modified files:

Index: src/doc/CHANGES-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.108 src/doc/CHANGES-4.0.2:1.1.2.109
--- src/doc/CHANGES-4.0.2:1.1.2.108	Sat Sep 15 09:24:50 2012
+++ src/doc/CHANGES-4.0.2	Sun Sep 30 18:23:53 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.0.2,v 1.1.2.108 2012/09/15 09:24:50 bouyer Exp $
+#	$NetBSD: CHANGES-4.0.2,v 1.1.2.109 2012/09/30 18:23:53 bouyer Exp $
 
 A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
 release:
@@ -1471,3 +1471,13 @@ dist/bind/lib/dns/include/dns/rdata.h			
 	record) from upstream.
 	[spz, ticket #1457]
 
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1458]
+

CVS commit: [netbsd-6] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:26:24 UTC 2012

Modified Files:
src/doc [netbsd-6]: 3RDPARTY
src/share/zoneinfo [netbsd-6]: australasia

Log Message:
Pull up following revision(s) (requested by apb in ticket #578):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
  20 this year.  (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released.  We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.


To generate a diff of this commit:
cvs rdiff -u -r1.909.2.13 -r1.909.2.14 src/doc/3RDPARTY
cvs rdiff -u -r1.23.4.3 -r1.23.4.4 src/share/zoneinfo/australasia

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.909.2.13 src/doc/3RDPARTY:1.909.2.14
--- src/doc/3RDPARTY:1.909.2.13	Mon Aug 13 20:19:20 2012
+++ src/doc/3RDPARTY	Sun Sep 30 18:26:24 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.909.2.13 2012/08/13 20:19:20 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.909.2.14 2012/09/30 18:26:24 bouyer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1143,8 +1143,8 @@ Notes:
 Added changes from a5 - a12 manually.
 
 Package:	tz
-Version:	tzcode2011i / tzdata2012e
-Current Vers:	tzcode2012e / tzdata2012e
+Version:	tzcode2011i / tzdata2012f
+Current Vers:	tzcode2012f / tzdata2012f
 Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
 Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://elsie.nci.nih.gov/pub/

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.23.4.3 src/share/zoneinfo/australasia:1.23.4.4
--- src/share/zoneinfo/australasia:1.23.4.3	Thu Aug  9 08:36:47 2012
+++ src/share/zoneinfo/australasia	Sun Sep 30 18:26:24 2012
@@ -321,15 +321,23 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.
 
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun=18	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

CVS commit: [netbsd-6] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:26:54 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
ticket 578


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-6.0

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

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.208 src/doc/CHANGES-6.0:1.1.2.209
--- src/doc/CHANGES-6.0:1.1.2.208	Mon Sep 17 19:06:24 2012
+++ src/doc/CHANGES-6.0	Sun Sep 30 18:26:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.208 2012/09/17 19:06:24 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.209 2012/09/30 18:26:54 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -8642,3 +8642,13 @@ sys/sys/param.h	patched by hand
 
 	Welcome to NetBSD 6.0_RC2!
 
+doc/3RDPARTY	1.970 via patch
+share/zoneinfo/australasia			1.27 via patch
+
+	Merge tzdata2012f from
+	http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
+	Changes from tzdata2012e to tzdata2012f:
+	* australasia (Pacific/Fiji): Fiji DST is October 21 through
+	  January 20 this year.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #578]
+

CVS commit: [netbsd-6] src

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:35:40 UTC 2012

Modified Files:
src [netbsd-6]: UPDATING

Log Message:
Pull up following revision(s) (requested by dholland in ticket #561):
UPDATING: revision 1.239
Fix typo, noticed by stu314 on freenode.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.2 -r1.234.2.3 src/UPDATING

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

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.234.2.2 src/UPDATING:1.234.2.3
--- src/UPDATING:1.234.2.2	Fri Sep  7 22:19:27 2012
+++ src/UPDATING	Sun Sep 30 18:35:40 2012
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.234.2.2 2012/09/07 22:19:27 bouyer Exp $
+$NetBSD: UPDATING,v 1.234.2.3 2012/09/30 18:35:40 bouyer Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -25,7 +25,7 @@ Recent changes:
 20120216:
 	Default for MKCATPAGES changed to NO. Update builds will fail
 	unless DESTDIR is cleaned manually. If you built between 20120207
-	and 20120216, daily and weekly could have created an unreable
+	and 20120216, daily and weekly could have created an unreadable
 	/var/db/man.db index for apropos. Running makemandb -f or
 	the next run of weekly will fix it.

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:53:59 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl

Log Message:
Pull up following revision(s) (requested by jdf in ticket #567):
distrib/utils/sysinst/msg.mi.es: revision 1.46
distrib/utils/sysinst/msg.mi.es: revision 1.47
distrib/utils/sysinst/msg.mi.fr: revision 1.129
distrib/utils/sysinst/msg.mi.en: revision 1.175
distrib/utils/sysinst/msg.mi.de: revision 1.70
distrib/utils/sysinst/menus.mi: revision 1.47
distrib/utils/sysinst/msg.mi.pl: revision 1.86
Add translations for Config menu (was hardcoded before), best guesses for
French and Spanish.
Add translations for Polish config menu entries (provided by Marcin Piotr
Pawlowski).
Add Spanish translations for sysinst's new configuration menu, plus adding a
few
that were left previously.
Translation provided by jmmv.


To generate a diff of this commit:
cvs rdiff -u -r1.61.2.2 -r1.61.2.3 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.169.2.2 -r1.169.2.3 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.39.2.3 -r1.39.2.4 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.119.2.2 -r1.119.2.3 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.78.2.2 -r1.78.2.3 src/distrib/utils/sysinst/msg.mi.pl

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/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.61.2.2 src/distrib/utils/sysinst/msg.mi.de:1.61.2.3
--- src/distrib/utils/sysinst/msg.mi.de:1.61.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.de	Sun Sep 30 18:53:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.de,v 1.61.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.61.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -955,6 +955,7 @@ message Upgrade_NetBSD_on_a_hard_disk {A
 message Re_install_sets_or_install_additional_sets {Erneute Installation oder zusätzliche Pakete installieren}
 message Reboot_the_computer {Computer neu starten}
 message Utility_menu {Extras}
+message Config_menu {Konfigurationsmenü}
 message exit_utility_menu {Zurück zum Hauptmenü}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Extras}
 message Run_bin_sh {Ausführen von /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.169.2.2 src/distrib/utils/sysinst/msg.mi.en:1.169.2.3
--- src/distrib/utils/sysinst/msg.mi.en:1.169.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.en	Sun Sep 30 18:53:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.en,v 1.169.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.169.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -895,6 +895,7 @@ message Upgrade_NetBSD_on_a_hard_disk {U
 message Re_install_sets_or_install_additional_sets {Re-install sets or install additional sets}
 message Reboot_the_computer {Reboot the computer}
 message Utility_menu {Utility menu}
+message Config_menu {Config menu}
 message exit_utility_menu {Back to main menu}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Utilities}
 message Run_bin_sh {Run /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.39.2.3 src/distrib/utils/sysinst/msg.mi.es:1.39.2.4
--- src/distrib/utils/sysinst/msg.mi.es:1.39.2.3	Sun Sep 30 18:46:39 2012
+++ src/distrib/utils/sysinst/msg.mi.es	Sun Sep 30 18:53:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.es,v 1.39.2.3 2012/09/30 18:46:39 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.39.2.4 2012/09/30 18:53:57 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.

Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.119.2.2 src/distrib/utils/sysinst/msg.mi.fr:1.119.2.3
--- src/distrib/utils/sysinst/msg.mi.fr:1.119.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.fr	Sun Sep 30 18:53:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.fr,v 1.119.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.119.2.3 2012/09/30 18:53:57 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -993,6 +993,7 @@ message Upgrade_NetBSD_on_a_hard_disk {M
 message Re_install_sets_or_install_additional_sets {Réinstaller ou installer de nouveaux composants}
 message Reboot_the_computer {Redémarrer l'ordinateur}
 message Utility_menu {Utilitaires}
+message Config_menu {Configuration}
 message exit_utility_menu {Quitter}
 message NetBSD_VERSION_Utilities {Utilitaires NetBSD-@@VERSION@@}
 message Run_bin_sh {Exécuter /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.78.2.2 src/distrib/utils/sysinst/msg.mi.pl:1.78.2.3
---

CVS commit: [netbsd-6] src/usr.sbin/postinstall

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:59:53 UTC 2012

Modified Files:
src/usr.sbin/postinstall [netbsd-6]: postinstall

Log Message:
Pull up following revision(s) (requested by ast in ticket #568):
usr.sbin/postinstall/postinstall: revision 1.147
Make sure that the to fix, run: ... instructions actually work cut-and-paste
By default postinstall has mode 644 so /bin/sh or similar needs to be prepended


To generate a diff of this commit:
cvs rdiff -u -r1.129.2.9 -r1.129.2.10 src/usr.sbin/postinstall/postinstall

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

Modified files:

Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.129.2.9 src/usr.sbin/postinstall/postinstall:1.129.2.10
--- src/usr.sbin/postinstall/postinstall:1.129.2.9	Wed Aug 15 17:36:46 2012
+++ src/usr.sbin/postinstall/postinstall	Sun Sep 30 18:59:53 2012
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.129.2.9 2012/08/15 17:36:46 sborrill Exp $
+# $NetBSD: postinstall,v 1.129.2.10 2012/09/30 18:59:53 bouyer Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2077,7 +2077,7 @@ EOF
 			[ $MACHINE = $(uname -m) ]  m= || m= -m $MACHINE
 			cat _Fix_me_
 To fix, run:
-${0} ${SRC_ARGLIST} -d ${DEST_DIR:-/}$m fix${items_failed}
+${HOST_SH} ${0} ${SRC_ARGLIST} -d ${DEST_DIR:-/}$m fix${items_failed}
 Note that this may overwrite local changes.
 _Fix_me_
 		fi

CVS commit: [netbsd-6] src/doc

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 19:00:33 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 561-563, 565, 567, 568


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-6.0

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

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.209 src/doc/CHANGES-6.0:1.1.2.210
--- src/doc/CHANGES-6.0:1.1.2.209	Sun Sep 30 18:26:54 2012
+++ src/doc/CHANGES-6.0	Sun Sep 30 19:00:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.209 2012/09/30 18:26:54 bouyer Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.210 2012/09/30 19:00:33 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -8652,3 +8652,49 @@ share/zoneinfo/australasia			1.27 via pa
 	  January 20 this year.  (Thanks to Steffen Thorsen.)
 	[apb, ticket #578]
 
+UPDATING	1.239
+
+	Fix typo, noticed by stu314 on freenode.
+	[dholland, ticket #561]
+
+doc/CHANGESpatch
+
+	Add forgotten CHANGES entries for rndctl entropy save/load and all the
+	kernel entropy changes.
+	[tls, ticket #562]
+
+distrib/utils/sysinst/msg.mi.es			1.47
+
+	Add Spanish translations for sysinst's new configuration menu,
+	plus adding a few that were left previously.
+	Translation provided by jmmv.
+	[martin, ticket #563]
+
+UPDATING	1.240
+
+	Strengthen the entry about the openssl update, to clarify and emphasize
+	that just doing a non-update build isn't enough; you really do have to
+	nuke $DESTDIR.
+	[dholland, ticket #565]
+
+distrib/utils/sysinst/menus.mi			1.47
+distrib/utils/sysinst/msg.mi.de			1.70
+distrib/utils/sysinst/msg.mi.en			1.175
+distrib/utils/sysinst/msg.mi.es			1.46
+distrib/utils/sysinst/msg.mi.fr			1.129
+distrib/utils/sysinst/msg.mi.pl			1.86
+
+	Add translations for Config menu (was hardcoded before)
+	Add translations for Polish config menu entries (provided by
+	Marcin Piotr Pawlowski).
+	Add Spanish translations for sysinst's new configuration menu,
+	plus adding a few that were left previously.  Translation provided
+	by jmmv.
+	[jdf, ticket #567]
+
+usr.sbin/postinstall/postinstall		1.147
+
+	Make sure that the to fix, run: ... instructions actually work
+	cut-and-paste.
+	[ast, ticket #568]
+

CVS commit: src/sys/arch/i386

2012-09-30 Thread David Laight 
Module Name:src
Committed By:   dsl
Date:   Sun Sep 30 20:19:52 UTC 2012

Modified Files:
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: genassym.cf machdep.c mainbus.c
Removed Files:
src/sys/arch/i386/i386: apmbios.c apmcall.S

Log Message:
Remove the obvious parts of i386 Advanced power management 'apm' support.
This is the code that predates ACPI, and might once have been able to
  power down some laptops.
It hasn't been compiled for ages (it isn't it i386/ALL or any other
  standard kernel) and hasn't worked for even longer.
The APM specification was made obsolete by ACPI before it was widely
  implemented.
This will allow some other, even more dubious code be removed.
Unfortunately apmbios.h is used by the world !


To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.19 -r0 src/sys/arch/i386/i386/apmbios.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/i386/i386/apmcall.S
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.730 -r1.731 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/i386/i386/mainbus.c

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

Modified files:

Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.365 src/sys/arch/i386/conf/files.i386:1.366
--- src/sys/arch/i386/conf/files.i386:1.365	Thu Sep 27 18:28:55 2012
+++ src/sys/arch/i386/conf/files.i386	Sun Sep 30 20:19:51 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.365 2012/09/27 18:28:55 alnsn Exp $
+#	$NetBSD: files.i386,v 1.366 2012/09/30 20:19:51 dsl Exp $
 #
 # new style config file for i386 architecture
 #
@@ -322,11 +322,6 @@ file	arch/i386/isa/cmos.c		cmos needs-fl
 
 include dev/apm/files.apm
 
-# Advanced Power Management support (APM)
-attach	apm at apmbus with apmbios: bioscall
-file	arch/i386/i386/apmbios.c	apmbios	needs-flag
-file	arch/i386/i386/apmcall.S	apmbios
-
 #
 # Compatibility modules
 #

Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.92 src/sys/arch/i386/i386/genassym.cf:1.93
--- src/sys/arch/i386/i386/genassym.cf:1.92	Fri Apr 20 22:23:24 2012
+++ src/sys/arch/i386/i386/genassym.cf	Sun Sep 30 20:19:51 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.92 2012/04/20 22:23:24 rmind Exp $
+#	$NetBSD: genassym.cf,v 1.93 2012/09/30 20:19:51 dsl Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -108,10 +108,6 @@ ifndef XEN
 include apmbios.h
 endif
 endif
-if NAPMBIOS  0
-include machine/bioscall.h
-include machine/apmvar.h
-endif
 
 include compat/sys/signal.h
 
@@ -264,24 +260,6 @@ else
 define	IH_NEXT			offsetof(struct intrhand, ih_next)
 endif
 
-if NAPMBIOS  0
-define	APM_CODE32		offsetof(struct apm_connect_info, apm_code32_seg_base)
-define	APM_CODE16		offsetof(struct apm_connect_info, apm_code16_seg_base)
-define	APM_DATA		offsetof(struct apm_connect_info, apm_data_seg_base)
-define	APM_CODE32_LEN		offsetof(struct apm_connect_info, apm_code32_seg_len)
-define	APM_DATA_LEN		offsetof(struct apm_connect_info, apm_data_seg_len)
-define	APM_ENTRY		offsetof(struct apm_connect_info, apm_entrypt)
-define	APM_DETAIL		offsetof(struct apm_connect_info, apm_detail)
-define	APM_SIZE		sizeof(struct apm_connect_info)
-define	BIOSCALLREG_EAX		offsetof(struct bioscallregs, EAX)
-define	BIOSCALLREG_EBX		offsetof(struct bioscallregs, EBX)
-define	BIOSCALLREG_ECX		offsetof(struct bioscallregs, ECX)
-define	BIOSCALLREG_EDX		offsetof(struct bioscallregs, EDX)
-define	BIOSCALLREG_ESI		offsetof(struct bioscallregs, ESI)
-define	BIOSCALLREG_EDI		offsetof(struct bioscallregs, EDI)
-define	BIOSCALLREG_EFLAGS	offsetof(struct bioscallregs, EFLAGS)
-endif
-
 define	CPU_INFO_SELF		offsetof(struct cpu_info, ci_self)
 define	CPU_INFO_RESCHED	offsetof(struct cpu_info, ci_want_resched)
 define	CPU_INFO_WANT_PMAPLOAD	offsetof(struct cpu_info, ci_want_pmapload)

Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.730 src/sys/arch/i386/i386/machdep.c:1.731
--- src/sys/arch/i386/i386/machdep.c:1.730	Fri Jul 27 22:55:29 2012
+++ src/sys/arch/i386/i386/machdep.c	Sun Sep 30 20:19:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.730 2012/07/27 22:55:29 drochner Exp $	*/
+/*	$NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.730 2012/07/27 22:55:29 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $);
 
 #include opt_beep.h
 #include opt_compat_ibcs2.h
@@ -190,10 +190,6 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v 
 #include machine/acpi_machdep.h
 #endif
 
-#if NAPMBIOS  0
-#include machine/apmvar.h
-#endif
-
 #include isa.h
 #include isadma.h
 #include npx.h
@@ -894,21 +890,6 @@ haltsys:

CVS commit: src/share/man/man8

2012-09-30 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Sun Sep 30 20:49:13 UTC 2012

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

Log Message:
Rewrite section on DNS so it makes sense, is true, and is useful.

This may need to be adapted for openresolv too...


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 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.48 src/share/man/man8/afterboot.8:1.49
--- src/share/man/man8/afterboot.8:1.48	Sun Mar 11 23:42:07 2012
+++ src/share/man/man8/afterboot.8	Sun Sep 30 20:49:12 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: afterboot.8,v 1.48 2012/03/11 23:42:07 njoly Exp $
+.\	$NetBSD: afterboot.8,v 1.49 2012/09/30 20:49:12 riastradh 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
@@ -374,42 +374,34 @@ and then starting the server with the co
 The first time the server is started, it will generate a new keypair,
 which will be stored inside the directory
 .Pa /etc/ssh .
-.Ss BIND Name Server (DNS)
-If you are using the BIND Name Server, check the
-.Pa /etc/resolv.conf
-file.
-It may look something like:
-.Bd -literal -offset indent
-domain some.thing.dom
-nameserver 192.168.0.1
-nameserver 192.168.4.55
-search some.thing.dom. thing.dom.
-.Ed
+.Ss Host names and DNS
+The system resolves host names according the rules for hosts in the
+name service switch configuration at
+.Pa /etc/nsswitch.conf .
+By default, it will query
+.Pa /etc/hosts
+first, and then the DNS resolver specified in
+.Pa /etc/resolv.conf .
 .Pp
-For further details, see
-.Xr resolv.conf 5 .
-Note the name service lookup order is set via
-.Xr nsswitch.conf 5
-mechanism.
-.Pp
-If using a caching name server add the line nameserver 127.0.0.1 first.
-To get a local caching name server to run
-you will need to set
+If your network does not have a usable DNS resolver, e.g. one provided
+by DHCP, you can run a local caching recursive resolver by setting
 .Dq named=YES
 in
 .Pa /etc/rc.conf
-and create the
-.Pa named.conf
-file in the appropriate place for
-.Xr named 8 ,
-usually in
-.Pa /etc/namedb .
-The same holds true if the machine is going to be a
-name server for your domain.
-In both these cases, make sure that
+and either rebooting or running the following command:
+.Bd -literal -offset indent
+.Ic /etc/rc.d/named start
+.Ed
+.Pp
 .Xr named 8
-is running
-(otherwise there are long waits for resolver timeouts).
+is configured in
+.Pa /etc/named.conf
+by default to run as a local caching recursive resolver.
+Then, to make the system use it, put the following in
+.Pa /etc/resolv.conf :
+.Bd -literal -offset indent
+nameserver 127.0.0.1
+.Ed
 .Ss RPC-based network services
 Several services depend on the RPC portmapper
 .Xr rpcbind 8
@@ -988,8 +980,10 @@ for details on how to do so.
 .Xr exports 5 ,
 .Xr fstab 5 ,
 .Xr group 5 ,
+.Xr hosts 5 ,
 .Xr ifconfig.if 5 ,
 .Xr mailer.conf 5 ,
+.Xr named.conf 5 ,
 .Xr nsswitch.conf 5 ,
 .Xr passwd 5 ,
 .Xr printcap 5 ,

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

2012-09-30 Thread David Laight 
Module Name:src
Committed By:   dsl
Date:   Sun Sep 30 20:54:52 UTC 2012

Modified Files:
src/sys/arch/i386/i386: genassym.cf machdep.c mainbus.c

Log Message:
Fix build.
I've removed 'option apmbios' so config no longer generates apmbios.h
Not to be confused with dev/apm/apmbios.h :-)


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.731 -r1.732 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/mainbus.c

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

Modified files:

Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.93 src/sys/arch/i386/i386/genassym.cf:1.94
--- src/sys/arch/i386/i386/genassym.cf:1.93	Sun Sep 30 20:19:51 2012
+++ src/sys/arch/i386/i386/genassym.cf	Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.93 2012/09/30 20:19:51 dsl Exp $
+#	$NetBSD: genassym.cf,v 1.94 2012/09/30 20:54:52 dsl Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -104,9 +104,6 @@ endif
 
 if defined(_KERNEL)  defined(_KERNEL_OPT)
 include ioapic.h
-ifndef XEN
-include apmbios.h
-endif
 endif
 
 include compat/sys/signal.h

Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.731 src/sys/arch/i386/i386/machdep.c:1.732
--- src/sys/arch/i386/i386/machdep.c:1.731	Sun Sep 30 20:19:51 2012
+++ src/sys/arch/i386/i386/machdep.c	Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $	*/
+/*	$NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $);
 
 #include opt_beep.h
 #include opt_compat_ibcs2.h
@@ -177,7 +177,6 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v 
 #endif
 
 #include acpica.h
-#include apmbios.h
 #include bioscall.h
 
 #if NBIOSCALL  0

Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.95 src/sys/arch/i386/i386/mainbus.c:1.96
--- src/sys/arch/i386/i386/mainbus.c:1.95	Sun Sep 30 20:19:52 2012
+++ src/sys/arch/i386/i386/mainbus.c	Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.95 2012/09/30 20:19:52 dsl Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.96 2012/09/30 20:54:52 dsl Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.95 2012/09/30 20:19:52 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.96 2012/09/30 20:54:52 dsl Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, $NetBSD: mainbus.c,v 
 #include isa.h
 #include isadma.h
 #include mca.h
-#include apmbios.h
 #include pnpbios.h
 #include acpica.h
 #include ipmi.h

CVS commit: src/libexec/ld.elf_so

2012-09-30 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Mon Oct  1 03:03:46 UTC 2012

Modified Files:
src/libexec/ld.elf_so: rtld.c

Log Message:
On failure in _rtld_dlcheck, call _rtld_error, not xwarnx.

Callers need not call _rtld_error themselves now.

Fixes PR lib/41760.  Should add the test case from the PR too.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/libexec/ld.elf_so/rtld.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/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.158 src/libexec/ld.elf_so/rtld.c:1.159
--- src/libexec/ld.elf_so/rtld.c:1.158	Wed Aug 15 03:46:06 2012
+++ src/libexec/ld.elf_so/rtld.c	Mon Oct  1 03:03:46 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.c,v 1.158 2012/08/15 03:46:06 matt Exp $	 */
+/*	$NetBSD: rtld.c,v 1.159 2012/10/01 03:03:46 riastradh Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.158 2012/08/15 03:46:06 matt Exp $);
+__RCSID($NetBSD: rtld.c,v 1.159 2012/10/01 03:03:46 riastradh Exp $);
 #endif /* not lint */
 
 #include sys/param.h
@@ -775,7 +775,7 @@ _rtld_dlcheck(void *handle)
 			break;
 
 	if (obj == NULL || obj-dl_refcount == 0) {
-		xwarnx(Invalid shared object handle %p, handle);
+		_rtld_error(Invalid shared object handle %p, handle);
 		return NULL;
 	}
 	return obj;
@@ -1335,7 +1335,6 @@ dlinfo(void *handle, int req, void *v)
 		}
 	} else {
 		if ((obj = _rtld_dlcheck(handle)) == NULL) {
-			_rtld_error(Invalid handle);
 			_rtld_shared_exit();
 			return -1;
 		}