date:20121031

CVS commit: src/share/man/man4/man4.amiga

2012-10-31 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Wed Oct 31 06:53:14 UTC 2012

Modified Files:
src/share/man/man4/man4.amiga: ed.4

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.amiga/ed.4

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/man4/man4.amiga/ed.4
diff -u src/share/man/man4/man4.amiga/ed.4:1.14 src/share/man/man4/man4.amiga/ed.4:1.15
--- src/share/man/man4/man4.amiga/ed.4:1.14	Tue Oct 30 22:29:01 2012
+++ src/share/man/man4/man4.amiga/ed.4	Wed Oct 31 06:53:14 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: ed.4,v 1.14 2012/10/30 22:29:01 rkujawa Exp $
+.\ $NetBSD: ed.4,v 1.15 2012/10/31 06:53:14 wiz Exp $
 .\
 .\ Copyright (c) 1994 Christopher G. Demetriou
 .\ All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp
 .\
-.Dd October 30, 2012 
+.Dd October 30, 2012
 .Dt ED 4 amiga
 .Os
 .Sh NAME

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

2012-10-31 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Oct 31 08:54:39 UTC 2012

Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c

Log Message:
gcc 4.1 is not smart enough to notice arg is only used when initialized
correctly and produces a might be used unintialized warning.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/npf/npfctl/npfctl.c

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

Modified files:

Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.21 src/usr.sbin/npf/npfctl/npfctl.c:1.22
--- src/usr.sbin/npf/npfctl/npfctl.c:1.21	Mon Oct 29 02:27:12 2012
+++ src/usr.sbin/npf/npfctl/npfctl.c	Wed Oct 31 08:54:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: npfctl.c,v 1.21 2012/10/29 02:27:12 rmind Exp $	*/
+/*	$NetBSD: npfctl.c,v 1.22 2012/10/31 08:54:39 martin Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: npfctl.c,v 1.21 2012/10/29 02:27:12 rmind Exp $);
+__RCSID($NetBSD: npfctl.c,v 1.22 2012/10/31 08:54:39 martin Exp $);
 
 #include sys/ioctl.h
 #include sys/stat.h
@@ -307,7 +307,7 @@ npfctl_table(int fd, int argc, char **ar
 	npf_ioctl_table_t nct;
 	fam_addr_mask_t fam;
 	size_t buflen = 512;
-	char *cmd, *arg;
+	char *cmd, *arg = NULL; /* XXX gcc */
 	int n, alen;
 
 	/* Default action is list. */

CVS commit: src

2012-10-31 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 31 10:17:35 UTC 2012

Modified Files:
src/sbin/ifconfig: Makefile.inc
src/sys/net: if_ether.h if_ethersubr.c
src/sys/sys: sockio.h
Added Files:
src/sbin/ifconfig: ether.c

Log Message:
Add SIOCGETHERCAP ioctl.
There was no way to know the setting of ec_capabilities and ec_capenable
other than grepping the source.

See http://mail-index.netbsd.org/tech-kern/2010/07/28/msg008613.html


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sbin/ifconfig/ether.c
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_ether.h
cvs rdiff -u -r1.192 -r1.193 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/sockio.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/ifconfig/Makefile.inc
diff -u src/sbin/ifconfig/Makefile.inc:1.8 src/sbin/ifconfig/Makefile.inc:1.9
--- src/sbin/ifconfig/Makefile.inc:1.8	Mon Dec 13 17:35:08 2010
+++ src/sbin/ifconfig/Makefile.inc	Wed Oct 31 10:17:34 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.8 2010/12/13 17:35:08 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2012/10/31 10:17:34 msaitoh Exp $
 
 # shared stuff with src/distrib/utils/x_ifconfig for install media.
 # stuff not required by install media should be into Makefile.
@@ -13,6 +13,7 @@ SRCS+= af_inet.c
 SRCS+= af_inetany.c
 SRCS+= agr.c
 SRCS+= env.c
+SRCS+= ether.c
 SRCS+= ieee80211.c
 SRCS+= ifconfig.c
 SRCS+= media.c

Index: src/sys/net/if_ether.h
diff -u src/sys/net/if_ether.h:1.60 src/sys/net/if_ether.h:1.61
--- src/sys/net/if_ether.h:1.60	Thu Oct 25 11:53:14 2012
+++ src/sys/net/if_ether.h	Wed Oct 31 10:17:34 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ether.h,v 1.60 2012/10/25 11:53:14 msaitoh Exp $	*/
+/*	$NetBSD: if_ether.h,v 1.61 2012/10/31 10:17:34 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -187,6 +187,19 @@ struct ethercom {
 #define	ETHERCAP_VLAN_HWTAGGING	0x0002	/* hardware VLAN tag support */
 #define	ETHERCAP_JUMBO_MTU	0x0004	/* 9000 byte MTU supported */
 
+#define	ECCAPBITS		\
+	\020			\
+	\1VLAN_MTU		\
+	\2VLAN_HWTAGGING	\
+	\3JUMBO_MTU
+
+/* ioctl() for Ethernet capabilities */
+struct eccapreq {
+	char		eccr_name[IFNAMSIZ];	/* if name, e.g. en0 */
+	int		eccr_capabilities;	/* supported capabiliites */
+	int		eccr_capenable;		/* capabilities enabled */
+};
+
 #ifdef	_KERNEL
 extern const uint8_t etherbroadcastaddr[ETHER_ADDR_LEN];
 extern const uint8_t ethermulticastaddr_slowprotocols[ETHER_ADDR_LEN];

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.192 src/sys/net/if_ethersubr.c:1.193
--- src/sys/net/if_ethersubr.c:1.192	Thu Oct 11 20:05:50 2012
+++ src/sys/net/if_ethersubr.c	Wed Oct 31 10:17:34 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.192 2012/10/11 20:05:50 christos Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.193 2012/10/31 10:17:34 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.192 2012/10/11 20:05:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.193 2012/10/31 10:17:34 msaitoh Exp $);
 
 #include opt_inet.h
 #include opt_atalk.h
@@ -1494,6 +1494,7 @@ int
 ether_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
 	struct ethercom *ec = (void *) ifp;
+	struct eccapreq *eccr;
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct if_laddrreq *iflr = data;
 	const struct sockaddr_dl *sdl;
@@ -1571,6 +1572,11 @@ ether_ioctl(struct ifnet *ifp, u_long cm
 			break;
 		}
 		return 0;
+	case SIOCGETHERCAP:
+		eccr = (struct eccapreq *)data;
+		eccr-eccr_capabilities = ec-ec_capabilities;
+		eccr-eccr_capenable = ec-ec_capenable;
+		return 0;
 	case SIOCADDMULTI:
 		return ether_addmulti(ifreq_getaddr(cmd, ifr), ec);
 	case SIOCDELMULTI:

Index: src/sys/sys/sockio.h
diff -u src/sys/sys/sockio.h:1.30 src/sys/sys/sockio.h:1.31
--- src/sys/sys/sockio.h:1.30	Mon Nov 15 22:42:36 2010
+++ src/sys/sys/sockio.h	Wed Oct 31 10:17:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sockio.h,v 1.30 2010/11/15 22:42:36 pooka Exp $	*/
+/*	$NetBSD: sockio.h,v 1.31 2012/10/31 10:17:35 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -132,6 +132,11 @@
 #define SIOCGLINKSTR	_IOWR('i', 135, struct ifdrv)
 #define SIOCSLINKSTR	 _IOW('i', 136, struct ifdrv)
 
+/* 137 is SIOCGATHSTATS in athioctl.h */
+/* 138 is SIOCGATHDIAG in athioctl.h */
+
+#define	SIOCGETHERCAP	_IOWR('i', 139, struct eccapreq) /* get ethercap */
+
 #define	SIOCSETPFSYNC	_IOW('i', 247, struct ifreq)	
 #define	SIOCGETPFSYNC	_IOWR('i', 248, struct ifreq)
 

Added files:

Index: src/sbin/ifconfig/ether.c
diff -u /dev/null src/sbin/ifconfig/ether.c:1.1
--- /dev/null	Wed Oct 31 10:17:35 2012
+++ src/sbin/ifconfig/ether.c	Wed Oct 31 10:17:34 2012
@@ -0,0 +1,88 @@
+/*	$NetBSD: ether.c,v 1.1 2012/10/31

CVS commit: src

2012-10-31 Thread Alan Barrett

Module Name:src
Committed By:   apb
Date:   Wed Oct 31 13:05:09 UTC 2012

Modified Files:
src: build.sh

Log Message:
Replace getarch and validatearch with table-driven implementations.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/build.sh

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

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.257 src/build.sh:1.258
--- src/build.sh:1.257	Thu Oct 18 16:15:29 2012
+++ src/build.sh	Wed Oct 31 13:05:09 2012
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.257 2012/10/18 16:15:29 apb Exp $
+#	$NetBSD: build.sh,v 1.258 2012/10/31 13:05:09 apb Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -263,6 +263,8 @@ progname=${0##*/}
 toppid=$$
 results=/dev/null
 tab='	'
+nl='
+'
 trap exit 1 1 2 3 15
 
 bomb()
@@ -546,203 +548,238 @@ initdefaults()
 
 }
 
+# valid_MACHINE_ARCH -- A multi-line string, listing all valid
+# MACHINE/MACHINE_ARCH pairs.
+#
+# Each line contains a MACHINE and MACHINE_ARCH value, an optional ALIAS
+# which may be used to refer to the MACHINE/MACHINE_ARCH pair, and an
+# optional DEFAULT or NO_DEFAULT keyword.
+#
+# When a MACHINE corresponds to multiple possible values of
+# MACHINE_ARCH, then this table should list all allowed combinations.
+# If the MACHINE is associated with a default MACHINE_ARCH (to be
+# used when the user specifies the MACHINE but fails to specify the
+# MACHINE_ARCH), then one of the lines should have the DEFAULT
+# keyword.  If there is no default MACHINE_ARCH for a particular
+# MACHINE, then there should be a line with the NO_DEFAULT keyword,
+# and with a blank MACHINE_ARCH.
+#
+valid_MACHINE_ARCH='
+MACHINE=acorn26		MACHINE_ARCH=arm
+MACHINE=acorn32		MACHINE_ARCH=arm
+MACHINE=algor		MACHINE_ARCH=mips64el	ALIAS=algor64
+MACHINE=algor		MACHINE_ARCH=mipsel	DEFAULT
+MACHINE=alpha		MACHINE_ARCH=alpha
+MACHINE=amd64		MACHINE_ARCH=x86_64
+MACHINE=amiga		MACHINE_ARCH=m68k
+MACHINE=amigappc	MACHINE_ARCH=powerpc
+MACHINE=arc		MACHINE_ARCH=mips64el	ALIAS=arc64
+MACHINE=arc		MACHINE_ARCH=mipsel	DEFAULT
+MACHINE=atari		MACHINE_ARCH=m68k
+MACHINE=bebox		MACHINE_ARCH=powerpc
+MACHINE=cats		MACHINE_ARCH=arm	DEFAULT
+MACHINE=cats		MACHINE_ARCH=earm
+MACHINE=cesfic		MACHINE_ARCH=m68k
+MACHINE=cobalt		MACHINE_ARCH=mips64el	ALIAS=cobalt64
+MACHINE=cobalt		MACHINE_ARCH=mipsel	DEFAULT
+MACHINE=dreamcast	MACHINE_ARCH=sh3el
+MACHINE=emips		MACHINE_ARCH=mipseb
+MACHINE=evbarm		MACHINE_ARCH=arm	ALIAS=evbarm-el	DEFAULT
+MACHINE=evbarm		MACHINE_ARCH=armeb	ALIAS=evbarm-eb
+MACHINE=evbarm		MACHINE_ARCH=earm	ALIAS=evbearm-el
+MACHINE=evbarm		MACHINE_ARCH=earmeb	ALIAS=evbearm-eb
+MACHINE=evbmips		MACHINE_ARCH=		NO_DEFAULT
+MACHINE=evbmips		MACHINE_ARCH=mips64eb	ALIAS=evbmips64-eb
+MACHINE=evbmips		MACHINE_ARCH=mips64el	ALIAS=evbmips64-el
+MACHINE=evbmips		MACHINE_ARCH=mipseb	ALIAS=evbmips-eb
+MACHINE=evbmips		MACHINE_ARCH=mipsel	ALIAS=evbmips-el
+MACHINE=evbppc		MACHINE_ARCH=powerpc	DEFAULT
+MACHINE=evbppc		MACHINE_ARCH=powerpc64	ALIAS=evbppc64
+MACHINE=evbsh3		MACHINE_ARCH=		NO_DEFAULT
+MACHINE=evbsh3		MACHINE_ARCH=sh3eb	ALIAS=evbsh3-eb
+MACHINE=evbsh3		MACHINE_ARCH=sh3el	ALIAS=evbsh3-el
+MACHINE=ews4800mips	MACHINE_ARCH=mipseb
+MACHINE=hp300		MACHINE_ARCH=m68k
+MACHINE=hp700		MACHINE_ARCH=hppa
+MACHINE=hpcarm		MACHINE_ARCH=arm
+MACHINE=hpcmips		MACHINE_ARCH=mipsel
+MACHINE=hpcsh		MACHINE_ARCH=sh3el
+MACHINE=i386		MACHINE_ARCH=i386
+MACHINE=ia64		MACHINE_ARCH=ia64
+MACHINE=ibmnws		MACHINE_ARCH=powerpc
+MACHINE=iyonix		MACHINE_ARCH=arm	DEFAULT
+MACHINE=iyonix		MACHINE_ARCH=earm
+MACHINE=landisk		MACHINE_ARCH=sh3el
+MACHINE=luna68k		MACHINE_ARCH=m68k
+MACHINE=mac68k		MACHINE_ARCH=m68k
+MACHINE=macppc		MACHINE_ARCH=powerpc	DEFAULT
+MACHINE=macppc		MACHINE_ARCH=powerpc64	ALIAS=macppc64
+MACHINE=mipsco		MACHINE_ARCH=mipseb
+MACHINE=mmeye		MACHINE_ARCH=sh3eb
+MACHINE=mvme68k		MACHINE_ARCH=m68k
+MACHINE=mvmeppc		MACHINE_ARCH=powerpc
+MACHINE=netwinder	MACHINE_ARCH=arm	DEFAULT
+MACHINE=netwinder	MACHINE_ARCH=earm
+MACHINE=news68k		MACHINE_ARCH=m68k
+MACHINE=newsmips	MACHINE_ARCH=mipseb
+MACHINE=next68k		MACHINE_ARCH=m68k
+MACHINE=ofppc		MACHINE_ARCH=powerpc	DEFAULT
+MACHINE=ofppc		MACHINE_ARCH=powerpc64	ALIAS=ofppc64
+MACHINE=pmax		MACHINE_ARCH=mips64el	ALIAS=pmax64
+MACHINE=pmax		MACHINE_ARCH=mipsel	DEFAULT
+MACHINE=prep		MACHINE_ARCH=powerpc
+MACHINE=rs6000		MACHINE_ARCH=powerpc
+MACHINE=sandpoint	MACHINE_ARCH=powerpc
+MACHINE=sbmips		MACHINE_ARCH=		NO_DEFAULT
+MACHINE=sbmips		MACHINE_ARCH=mips64eb	ALIAS=sbmips64-eb
+MACHINE=sbmips		MACHINE_ARCH=mips64el	ALIAS=sbmips64-el
+MACHINE=sbmips		MACHINE_ARCH=mipseb	ALIAS=sbmips-eb
+MACHINE=sbmips		MACHINE_ARCH=mipsel	ALIAS=sbmips-el
+MACHINE=sgimips		MACHINE_ARCH=mips64eb	ALIAS=sgimips64
+MACHINE=sgimips		MACHINE_ARCH=mipseb	DEFAULT
+MACHINE=shark		MACHINE_ARCH=arm	DEFAULT
+MACHINE=shark		MACHINE_ARCH=earm
+MACHINE=sparc		MACHINE_ARCH=sparc

CVS commit: src/tests/kernel

2012-10-31 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Oct 31 13:48:12 UTC 2012

Modified Files:
src/tests/kernel: gen_t_subr_prf

Log Message:
Avoid ssp re-definitions for the functions we provide.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/gen_t_subr_prf

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

Modified files:

Index: src/tests/kernel/gen_t_subr_prf
diff -u src/tests/kernel/gen_t_subr_prf:1.2 src/tests/kernel/gen_t_subr_prf:1.3
--- src/tests/kernel/gen_t_subr_prf:1.2	Wed Mar 14 22:02:22 2012
+++ src/tests/kernel/gen_t_subr_prf	Wed Oct 31 09:48:12 2012
@@ -9,6 +9,12 @@ cat  _EOF  $2
 
 #include atf-c.h
 
+/* Avoid SSP re-definitions */
+#undef snprintf
+#undef vsnprintf
+#undef sprintf
+#undef vsprintf
+
 #define KPRINTF_BUFSIZE 1024
 #undef putchar
 #define putchar xputchar

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 15:17:53 UTC 2012

Modified Files:
src/sys/dev/scsipi [netbsd-5]: sd.c

Log Message:
sys/dev/scsipi/sd.c patch

Allow disk strategy to be queried and changed at runtime
for sd(4) disks.
[buhrow, ticket #1807]


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.275.4.1 src/sys/dev/scsipi/sd.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/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.275 src/sys/dev/scsipi/sd.c:1.275.4.1
--- src/sys/dev/scsipi/sd.c:1.275	Wed Jul 16 18:54:09 2008
+++ src/sys/dev/scsipi/sd.c	Wed Oct 31 15:17:53 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.275 2008/07/16 18:54:09 drochner Exp $	*/
+/*	$NetBSD: sd.c,v 1.275.4.1 2012/10/31 15:17:53 riz Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.275 2008/07/16 18:54:09 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.275.4.1 2012/10/31 15:17:53 riz Exp $);
 
 #include opt_scsi.h
 #include rnd.h
@@ -1003,7 +1003,7 @@ sdioctl(dev_t dev, u_long cmd, void *add
 	struct sd_softc *sd = device_lookup_private(sd_cd, SDUNIT(dev));
 	struct scsipi_periph *periph = sd-sc_periph;
 	int part = SDPART(dev);
-	int error = 0;
+	int error = 0, s;
 #ifdef __HAVE_OLD_DISKLABEL
 	struct disklabel *newlabel = NULL;
 #endif
@@ -1027,6 +1027,8 @@ sdioctl(dev_t dev, u_long cmd, void *add
 		case OSCIOCIDENTIFY:
 		case SCIOCCOMMAND:
 		case SCIOCDEBUG:
+		case DIOCGSTRATEGY:
+		case DIOCSSTRATEGY:
 			if (part == RAW_PART)
 break;
 		/* FALLTHROUGH */
@@ -1237,6 +1239,47 @@ sdioctl(dev_t dev, u_long cmd, void *add
 		return (dkwedge_list(sd-sc_dk, dkwl, l));
 	}
 
+	case DIOCGSTRATEGY:
+	{
+		struct disk_strategy *dks = (void *)addr;
+
+		s = splbio();
+		strlcpy(dks-dks_name, bufq_getstrategyname(sd-buf_queue),
+		sizeof(dks-dks_name));
+		splx(s);
+		dks-dks_paramlen = 0;
+
+		return 0;
+	}
+	
+	case DIOCSSTRATEGY:
+	{
+		struct disk_strategy *dks = (void *)addr;
+		struct bufq_state *new;
+		struct bufq_state *old;
+
+		if ((flag  FWRITE) == 0) {
+			return EBADF;
+		}
+		if (dks-dks_param != NULL) {
+			return EINVAL;
+		}
+		dks-dks_name[sizeof(dks-dks_name) - 1] = 0; /* ensure term */
+		error = bufq_alloc(new, dks-dks_name,
+		BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
+		if (error) {
+			return error;
+		}
+		s = splbio();
+		old = sd-buf_queue;
+		bufq_move(new, old);
+		sd-buf_queue = new;
+		splx(s);
+		bufq_free(old);
+
+		return 0;
+	}
+
 	default:
 		if (part != RAW_PART)
 			return (ENOTTY);

CVS commit: [netbsd-5] src/sys/arch/i386/i386

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 15:34:58 UTC 2012

Modified Files:
src/sys/arch/i386/i386 [netbsd-5]: locore.S

Log Message:
Pull up following revision(s) (requested by chs in ticket #1810):
sys/arch/i386/i386/locore.S: revision 1.103
in osyscall, set the PSL_I bit into the correct field of the trapframe.
it was going into tf_eip instead of tf_eflags, which would sometimes
corrupt %eip and always return to user mode with interrupts disabled.
this was found with a netbsd 1.0 binary, and dsl@ points out that
this should also fix PR 41342.


To generate a diff of this commit:
cvs rdiff -u -r1.78.4.3 -r1.78.4.4 src/sys/arch/i386/i386/locore.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/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.78.4.3 src/sys/arch/i386/i386/locore.S:1.78.4.4
--- src/sys/arch/i386/i386/locore.S:1.78.4.3	Sat Apr  4 17:39:09 2009
+++ src/sys/arch/i386/i386/locore.S	Wed Oct 31 15:34:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.78.4.3 2009/04/04 17:39:09 snj Exp $	*/
+/*	$NetBSD: locore.S,v 1.78.4.4 2012/10/31 15:34:58 riz Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -134,7 +134,7 @@
  */
 
 #include machine/asm.h
-__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.78.4.3 2009/04/04 17:39:09 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.78.4.4 2012/10/31 15:34:58 riz Exp $);
 
 #include opt_compat_oldboot.h
 #include opt_ddb.h
@@ -1081,7 +1081,7 @@ IDTVEC(osyscall)
 	cli			# must be first instruction
 	pushfl			# set eflags in trap frame
 	popl	8(%esp)
-	orl	$PSL_I,(%esp)	# re-enable ints on return to user
+	orl	$PSL_I,8(%esp)	# re-enable ints on return to user
 	pushl	$7		# size of instruction for restart
 	jmp	syscall1
 IDTVEC_END(osyscall)

CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist/bsd-core

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 15:49:07 UTC 2012

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: drm_sysctl.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #1811):
sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c: revision 1.8
fix the DRM string sysctls to use copyout() instead of strcat()
to deliver the data to the user buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.2.10.2 -r1.2.10.3 \
src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c

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

Modified files:

Index: src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.2.10.2 src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.2.10.3
--- src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.2.10.2	Wed Dec  8 04:24:27 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c	Wed Oct 31 15:49:07 2012
@@ -176,7 +176,55 @@ int drm_sysctl_cleanup(struct drm_device
 
 #ifdef __NetBSD__
 #define SYSCTL_OUT(x, y, z) \
-	(len+=z,(len*oldlenp)?(strcat((char*)oldp, y),0):EOVERFLOW)
+	drm_sysctl_out(oldp, oldlenp, len, y, z, error, retcode);
+
+static int
+drm_sysctl_out(void *oldp, size_t *oldlenp, size_t *lenp,
+	   const char *buf, size_t buflen,
+	   int *errorp, int *retcodep)
+{
+	size_t copylen;
+	int error = 0;
+
+	/*
+	 * If there's room left in the user buffer,
+	 * copy out as much data as there is room for.
+	 */
+
+	if (*lenp  *oldlenp) {
+		copylen = MIN(buflen, *oldlenp - *lenp);
+		error = copyout(buf, (char *)oldp + *lenp, copylen);
+		if (error) {
+			*errorp = error;
+		}
+	} else {
+		copylen = 0;
+	}
+	*lenp += buflen;
+
+	/*
+	 * If we didn't copy everything, remember that we should
+	 * return ENOMEM at the end.
+	 */
+
+	if (copylen  buflen  *errorp == 0) {
+		*errorp = ENOMEM;
+	}
+
+	/*
+	 * If this is the final call (indicated by the buffer
+	 * being the string terminator byte), return the
+	 * total space required in *oldlenp and return
+	 * the saved error in *retcodep.
+	 */
+
+	if (buflen == 1  *buf == 0) {
+		*oldlenp = *lenp;
+		*retcodep = *errorp;
+	}
+	return error;
+}
+
 #endif
 
 #define DRM_SYSCTL_PRINT(fmt, arg...)\
@@ -193,7 +241,8 @@ static int drm_name_info DRM_SYSCTL_HAND
 	struct drm_device *dev = arg1;
 #elif   defined(__NetBSD__)
 	struct drm_device *dev = rnode-sysctl_data;
-	int len = 0;
+	size_t len = 0;
+	int error = 0;
 #endif
 	char buf[128];
 	int retcode;
@@ -231,7 +280,8 @@ static int drm_vm_info DRM_SYSCTL_HANDLE
 	struct drm_device *dev = arg1;
 #elif   defined(__NetBSD__)
 	struct drm_device *dev = rnode-sysctl_data;
-	int len = 0;
+	size_t len = 0;
+	int error = 0;
 #endif
 	drm_local_map_t *map, *tempmaps;
 	const char   *types[] = { FB, REG, SHM, AGP, SG, GEM, TTM };
@@ -296,7 +346,8 @@ static int drm_bufs_info DRM_SYSCTL_HAND
 	struct drm_device *dev = arg1;
 #elif   defined(__NetBSD__)
 	struct drm_device *dev = rnode-sysctl_data;
-	int len = 0;
+	size_t len = 0;
+	int error = 0;
 #endif
 	drm_device_dma_t *dma = dev-dma;
 	drm_device_dma_t tempdma;
@@ -358,7 +409,8 @@ static int drm_clients_info DRM_SYSCTL_H
 	struct drm_device *dev = arg1;
 #elif   defined(__NetBSD__)
 	struct drm_device *dev = rnode-sysctl_data;
-	int len = 0;
+	size_t len = 0;
+	int error = 0;
 #endif
 	struct drm_file *priv, *tempprivs;
 	char buf[128];

CVS commit: [netbsd-5] src/doc

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 15:49:27 UTC 2012

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

Log Message:
Tickets 1807, 1810, 1811.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.192 -r1.1.2.193 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.192 src/doc/CHANGES-5.2:1.1.2.193
--- src/doc/CHANGES-5.2:1.1.2.192	Fri Oct 26 11:34:05 2012
+++ src/doc/CHANGES-5.2	Wed Oct 31 15:49:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.192 2012/10/26 11:34:05 sborrill Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.193 2012/10/31 15:49:27 riz Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -8715,3 +8715,19 @@ sys/arch/xen/xen/xengnt.c			1.25 via pat
 	and port-xen/47056.
 	[royger, ticket #1805]
 
+sys/dev/scsipi/sd.cpatch
+
+	Allow disk strategy to be queried and changed at runtime
+	for sd(4) disks.
+	[buhrow, ticket #1807]
+
+sys/arch/i386/i386/locore.S			1.103 via patch
+
+	Fix running BSDi and NetBSD = 1.0 binaries.  PR#41342.
+	[chs, ticket #1810]
+
+sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c	1.8 via patch
+
+	Avoid crashing when writing to certain DRM sysctls.
+	[chs, ticket #1811]
+

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 15:49:59 UTC 2012

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

Log Message:
Ticket 1811.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 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.28 src/doc/CHANGES-5.1.3:1.1.2.29
--- src/doc/CHANGES-5.1.3:1.1.2.28	Thu Oct 25 09:29:32 2012
+++ src/doc/CHANGES-5.1.3	Wed Oct 31 15:49:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.28 2012/10/25 09:29:32 sborrill Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.29 2012/10/31 15:49:59 riz Exp $
 
 A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
 release:
@@ -2244,3 +2244,8 @@ share/misc/bsd-family-tree			1.46-1.47
 	5.1.2.
 	[riz, ticket #1806]
 
+sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c	1.8 via patch
+
+	Avoid crashing when writing to certain DRM sysctls.
+	[chs, ticket #1811]
+

CVS commit: [netbsd-6] src/sys

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:07:46 UTC 2012

Modified Files:
src/sys/net [netbsd-6]: if_atmsubr.c if_ethersubr.c if_fddisubr.c
if_ppp.c
src/sys/netinet6 [netbsd-6]: in6_var.h ip6_flow.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #638):
sys/net/if_ppp.c: revision 1.137
sys/netinet6/ip6_flow.c: revision 1.20
sys/net/if_fddisubr.c: revision 1.82
sys/net/if_ethersubr.c: revision 1.192
sys/netinet6/in6_var.h: revision 1.66
sys/net/if_atmsubr.c: revision 1.50
PR/47058: Antti Kantee: If the ipv6 flow code modifies the mbuf, pass the
change up to the caller.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.10.1 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.188.8.2 -r1.188.8.3 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.81 -r1.81.14.1 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.136 -r1.136.8.1 src/sys/net/if_ppp.c
cvs rdiff -u -r1.64 -r1.64.20.1 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/netinet6/ip6_flow.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/net/if_atmsubr.c
diff -u src/sys/net/if_atmsubr.c:1.49 src/sys/net/if_atmsubr.c:1.49.10.1
--- src/sys/net/if_atmsubr.c:1.49	Tue Feb  1 19:46:28 2011
+++ src/sys/net/if_atmsubr.c	Wed Oct 31 16:07:46 2012
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_atmsubr.c,v 1.49 2011/02/01 19:46:28 chuck Exp $   */
+/*  $NetBSD: if_atmsubr.c,v 1.49.10.1 2012/10/31 16:07:46 riz Exp $   */
 
 /*
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atmsubr.c,v 1.49 2011/02/01 19:46:28 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atmsubr.c,v 1.49.10.1 2012/10/31 16:07:46 riz Exp $);
 
 #include opt_inet.h
 #include opt_gateway.h
@@ -288,7 +288,7 @@ atm_input(struct ifnet *ifp, struct atm_
 #ifdef INET6
 	  case ETHERTYPE_IPV6:
 #ifdef GATEWAY  
-		if (ip6flow_fastforward(m))
+		if (ip6flow_fastforward(m))
 			return;
 #endif
 		  schednetisr(NETISR_IPV6);

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.188.8.2 src/sys/net/if_ethersubr.c:1.188.8.3
--- src/sys/net/if_ethersubr.c:1.188.8.2	Mon Aug 20 19:23:07 2012
+++ src/sys/net/if_ethersubr.c	Wed Oct 31 16:07:46 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.188.8.2 2012/08/20 19:23:07 riz Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.188.8.3 2012/10/31 16:07:46 riz Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.188.8.2 2012/08/20 19:23:07 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.188.8.3 2012/10/31 16:07:46 riz Exp $);
 
 #include opt_inet.h
 #include opt_atalk.h
@@ -915,7 +915,7 @@ ether_input(struct ifnet *ifp, struct mb
 #ifdef INET6
 		case ETHERTYPE_IPV6:
 #ifdef GATEWAY  
-			if (ip6flow_fastforward(m))
+			if (ip6flow_fastforward(m))
 return;
 #endif
 			schednetisr(NETISR_IPV6);

Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.81 src/sys/net/if_fddisubr.c:1.81.14.1
--- src/sys/net/if_fddisubr.c:1.81	Mon Apr  5 07:22:23 2010
+++ src/sys/net/if_fddisubr.c	Wed Oct 31 16:07:46 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fddisubr.c,v 1.81 2010/04/05 07:22:23 joerg Exp $	*/
+/*	$NetBSD: if_fddisubr.c,v 1.81.14.1 2012/10/31 16:07:46 riz Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.81 2010/04/05 07:22:23 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.81.14.1 2012/10/31 16:07:46 riz Exp $);
 
 #include opt_gateway.h
 #include opt_inet.h
@@ -648,7 +648,7 @@ fddi_input(struct ifnet *ifp, struct mbu
 #ifdef INET6
 		case ETHERTYPE_IPV6:
 #ifdef GATEWAY  
-			if (ip6flow_fastforward(m))
+			if (ip6flow_fastforward(m))
 return;
 #endif
 			schednetisr(NETISR_IPV6);

Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.136 src/sys/net/if_ppp.c:1.136.8.1
--- src/sys/net/if_ppp.c:1.136	Fri Oct 28 22:08:14 2011
+++ src/sys/net/if_ppp.c	Wed Oct 31 16:07:46 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.136 2011/10/28 22:08:14 dyoung Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.136.8.1 2012/10/31 16:07:46 riz Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.136 2011/10/28 22:08:14 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.136.8.1 2012/10/31 16:07:46 riz Exp $);
 
 #include ppp.h
 
@@ -1645,7 +1645,7 @@ ppp_inproc(struct ppp_softc *sc, struct 
 	m-m_data += PPP_HDRLEN;
 	m-m_len -= PPP_HDRLEN;
 #ifdef GATEWAY  
-	if (ip6flow_fastforward(m))
+	if (ip6flow_fastforward(m))
 		return;
 #endif
 	schednetisr(NETISR_IPV6);

Index:

CVS commit: [netbsd-6] src/sys/fs/ptyfs

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:09:41 UTC 2012

Modified Files:
src/sys/fs/ptyfs [netbsd-6]: ptyfs_subr.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #639):
sys/fs/ptyfs/ptyfs_subr.c: revision 1.24
fix the mystery of the bad directory times.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/fs/ptyfs/ptyfs_subr.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/fs/ptyfs/ptyfs_subr.c
diff -u src/sys/fs/ptyfs/ptyfs_subr.c:1.23 src/sys/fs/ptyfs/ptyfs_subr.c:1.23.8.1
--- src/sys/fs/ptyfs/ptyfs_subr.c:1.23	Sun Jun 12 03:35:53 2011
+++ src/sys/fs/ptyfs/ptyfs_subr.c	Wed Oct 31 16:09:41 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptyfs_subr.c,v 1.23 2011/06/12 03:35:53 rmind Exp $	*/
+/*	$NetBSD: ptyfs_subr.c,v 1.23.8.1 2012/10/31 16:09:41 riz Exp $	*/
 
 /*
  * Copyright (c) 1993
@@ -73,7 +73,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.23 2011/06/12 03:35:53 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.23.8.1 2012/10/31 16:09:41 riz Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -174,7 +174,7 @@ ptyfs_getinfo(struct ptyfsnode *ptyfs, s
 	}
 out:
 	ptyfs-ptyfs_uid = ptyfs-ptyfs_gid = 0;
-	ptyfs-ptyfs_flags |= PTYFS_CHANGE;
+	ptyfs-ptyfs_flag |= PTYFS_CHANGE;
 	PTYFS_ITIMES(ptyfs, NULL, NULL, NULL);
 	ptyfs-ptyfs_birthtime = ptyfs-ptyfs_mtime =
 	ptyfs-ptyfs_atime = ptyfs-ptyfs_ctime;

CVS commit: [netbsd-6] src/sys/arch/xen/xen

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:15:09 UTC 2012

Modified Files:
src/sys/arch/xen/xen [netbsd-6]: xengnt.c

Log Message:
Pull up following revision(s) (requested by royger in ticket #640):
sys/arch/xen/xen/xengnt.c: revision 1.25
xen: don't use grants 0-8
Not all grants from the first frame can be used, grants from 0 to 8
(both included) are reserved for external tools. Using this grants
caused system crashes and fs corruption.
Closes PR port-xen/47057 and port-xen/47056
Reviewed by bouyer@


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/xen/xen/xengnt.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/xen/xen/xengnt.c
diff -u src/sys/arch/xen/xen/xengnt.c:1.22.2.1 src/sys/arch/xen/xen/xengnt.c:1.22.2.2
--- src/sys/arch/xen/xen/xengnt.c:1.22.2.1	Thu Feb 23 21:19:55 2012
+++ src/sys/arch/xen/xen/xengnt.c	Wed Oct 31 16:15:09 2012
@@ -1,4 +1,4 @@
-/*  $NetBSD: xengnt.c,v 1.22.2.1 2012/02/23 21:19:55 riz Exp $  */
+/*  $NetBSD: xengnt.c,v 1.22.2.2 2012/10/31 16:15:09 riz Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1.22.2.1 2012/02/23 21:19:55 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1.22.2.2 2012/10/31 16:15:09 riz Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -51,6 +51,9 @@ __KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1
 
 #define NR_GRANT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(grant_entry_t))
 
+/* External tools reserve first few grant table entries. */
+#define NR_RESERVED_ENTRIES 8
+
 /* Current number of frames making up the grant table */
 int gnt_nr_grant_frames;
 /* Maximum number of frames that can make up the grant table */
@@ -161,7 +164,7 @@ xengnt_more_entries(void)
 	gnttab_setup_table_t setup;
 	u_long *pages;
 	int nframes_new = gnt_nr_grant_frames + 1;
-	int i;
+	int i, start_gnt;
 	KASSERT(mutex_owned(grant_lock));
 
 	if (gnt_nr_grant_frames == gnt_max_grant_frames)
@@ -204,9 +207,14 @@ xengnt_more_entries(void)
 
 	/*
 	 * add the grant entries associated to the last grant table frame
-	 * and mark them as free
+	 * and mark them as free. Prevent using the first grants (from 0 to 8)
+	 * since they are used by the tools.
 	 */
-	for (i = gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE;
+	start_gnt = (gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE) 
+	(NR_RESERVED_ENTRIES + 1) ?
+	(NR_RESERVED_ENTRIES + 1) :
+	(gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
+	for (i = start_gnt;
 	i  nframes_new * NR_GRANT_ENTRIES_PER_PAGE;
 	i++) {
 		KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
@@ -240,7 +248,7 @@ xengnt_get_entry(void)
 	last_gnt_entry--;
 	entry = gnt_entries[last_gnt_entry];
 	gnt_entries[last_gnt_entry] = XENGNT_NO_ENTRY;
-	KASSERT(entry != XENGNT_NO_ENTRY);
+	KASSERT(entry != XENGNT_NO_ENTRY  entry  NR_RESERVED_ENTRIES);
 	KASSERT(last_gnt_entry = 0);
 	KASSERT(last_gnt_entry = gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
 	return entry;
@@ -253,6 +261,7 @@ static void
 xengnt_free_entry(grant_ref_t entry)
 {
 	mutex_enter(grant_lock);
+	KASSERT(entry  NR_RESERVED_ENTRIES);
 	KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
 	KASSERT(last_gnt_entry = 0);
 	KASSERT(last_gnt_entry = gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);

CVS commit: [netbsd-6-0] src/sys/arch/xen/xen

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:15:28 UTC 2012

Modified Files:
src/sys/arch/xen/xen [netbsd-6-0]: xengnt.c

Log Message:
Pull up following revision(s) (requested by royger in ticket #640):
sys/arch/xen/xen/xengnt.c: revision 1.25
xen: don't use grants 0-8
Not all grants from the first frame can be used, grants from 0 to 8
(both included) are reserved for external tools. Using this grants
caused system crashes and fs corruption.
Closes PR port-xen/47057 and port-xen/47056
Reviewed by bouyer@


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.1.4.1 src/sys/arch/xen/xen/xengnt.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/xen/xen/xengnt.c
diff -u src/sys/arch/xen/xen/xengnt.c:1.22.2.1 src/sys/arch/xen/xen/xengnt.c:1.22.2.1.4.1
--- src/sys/arch/xen/xen/xengnt.c:1.22.2.1	Thu Feb 23 21:19:55 2012
+++ src/sys/arch/xen/xen/xengnt.c	Wed Oct 31 16:15:28 2012
@@ -1,4 +1,4 @@
-/*  $NetBSD: xengnt.c,v 1.22.2.1 2012/02/23 21:19:55 riz Exp $  */
+/*  $NetBSD: xengnt.c,v 1.22.2.1.4.1 2012/10/31 16:15:28 riz Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1.22.2.1 2012/02/23 21:19:55 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1.22.2.1.4.1 2012/10/31 16:15:28 riz Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -51,6 +51,9 @@ __KERNEL_RCSID(0, $NetBSD: xengnt.c,v 1
 
 #define NR_GRANT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(grant_entry_t))
 
+/* External tools reserve first few grant table entries. */
+#define NR_RESERVED_ENTRIES 8
+
 /* Current number of frames making up the grant table */
 int gnt_nr_grant_frames;
 /* Maximum number of frames that can make up the grant table */
@@ -161,7 +164,7 @@ xengnt_more_entries(void)
 	gnttab_setup_table_t setup;
 	u_long *pages;
 	int nframes_new = gnt_nr_grant_frames + 1;
-	int i;
+	int i, start_gnt;
 	KASSERT(mutex_owned(grant_lock));
 
 	if (gnt_nr_grant_frames == gnt_max_grant_frames)
@@ -204,9 +207,14 @@ xengnt_more_entries(void)
 
 	/*
 	 * add the grant entries associated to the last grant table frame
-	 * and mark them as free
+	 * and mark them as free. Prevent using the first grants (from 0 to 8)
+	 * since they are used by the tools.
 	 */
-	for (i = gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE;
+	start_gnt = (gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE) 
+	(NR_RESERVED_ENTRIES + 1) ?
+	(NR_RESERVED_ENTRIES + 1) :
+	(gnt_nr_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
+	for (i = start_gnt;
 	i  nframes_new * NR_GRANT_ENTRIES_PER_PAGE;
 	i++) {
 		KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
@@ -240,7 +248,7 @@ xengnt_get_entry(void)
 	last_gnt_entry--;
 	entry = gnt_entries[last_gnt_entry];
 	gnt_entries[last_gnt_entry] = XENGNT_NO_ENTRY;
-	KASSERT(entry != XENGNT_NO_ENTRY);
+	KASSERT(entry != XENGNT_NO_ENTRY  entry  NR_RESERVED_ENTRIES);
 	KASSERT(last_gnt_entry = 0);
 	KASSERT(last_gnt_entry = gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
 	return entry;
@@ -253,6 +261,7 @@ static void
 xengnt_free_entry(grant_ref_t entry)
 {
 	mutex_enter(grant_lock);
+	KASSERT(entry  NR_RESERVED_ENTRIES);
 	KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
 	KASSERT(last_gnt_entry = 0);
 	KASSERT(last_gnt_entry = gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);

CVS commit: [netbsd-6] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:26:24 UTC 2012

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

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #657]


To generate a diff of this commit:
cvs rdiff -u -r1.909.2.15 -r1.909.2.16 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.50.4.4 -r1.1.1.50.4.5 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.46.4.3 -r1.1.1.46.4.4 src/share/zoneinfo/southamerica

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.15 src/doc/3RDPARTY:1.909.2.16
--- src/doc/3RDPARTY:1.909.2.15	Tue Oct 23 20:19:50 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:26:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.909.2.15 2012/10/23 20:19:50 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.909.2.16 2012/10/31 16:26:23 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1143,11 +1143,12 @@ Notes:
 Added changes from a5 - a12 manually.
 
 Package:	tz
-Version:	tzcode2011i / tzdata2012g
-Current Vers:	tzcode2012g / tzdata2012g
+Version:	tzcode2011i / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
-Archive Site:	ftp://elsie.nci.nih.gov/pub/
+Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
+Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, apb

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.50.4.4 src/share/zoneinfo/asia:1.1.1.50.4.5
--- src/share/zoneinfo/asia:1.1.1.50.4.4	Tue Oct 23 20:19:50 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:26:23 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after

CVS commit: [netbsd-6-0] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:27:00 UTC 2012

Modified Files:
src/doc [netbsd-6-0]: 3RDPARTY
src/share/zoneinfo [netbsd-6-0]: asia southamerica

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #657]


To generate a diff of this commit:
cvs rdiff -u -r1.909.2.14.2.1 -r1.909.2.14.2.2 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.50.4.3.4.1 -r1.1.1.50.4.3.4.2 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.46.4.3 -r1.1.1.46.4.3.4.1 \
src/share/zoneinfo/southamerica

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.14.2.1 src/doc/3RDPARTY:1.909.2.14.2.2
--- src/doc/3RDPARTY:1.909.2.14.2.1	Tue Oct 23 20:20:39 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:26:59 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.909.2.14.2.1 2012/10/23 20:20:39 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.909.2.14.2.2 2012/10/31 16:26:59 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1143,11 +1143,12 @@ Notes:
 Added changes from a5 - a12 manually.
 
 Package:	tz
-Version:	tzcode2011i / tzdata2012g
-Current Vers:	tzcode2012g / tzdata2012g
+Version:	tzcode2011i / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
-Archive Site:	ftp://elsie.nci.nih.gov/pub/
+Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
+Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, apb

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.50.4.3.4.1 src/share/zoneinfo/asia:1.1.1.50.4.3.4.2
--- src/share/zoneinfo/asia:1.1.1.50.4.3.4.1	Tue Oct 23 20:20:39 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:26:59 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:27:45 UTC 2012

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

Log Message:
Tickets 640, 657.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-6.0.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-6.0.1
diff -u src/doc/CHANGES-6.0.1:1.1.2.8 src/doc/CHANGES-6.0.1:1.1.2.9
--- src/doc/CHANGES-6.0.1:1.1.2.8	Fri Oct 26 08:05:00 2012
+++ src/doc/CHANGES-6.0.1	Wed Oct 31 16:27:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.1,v 1.1.2.8 2012/10/26 08:05:00 sborrill Exp $
+# $NetBSD: CHANGES-6.0.1,v 1.1.2.9 2012/10/31 16:27:45 riz Exp $
 
 A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1
 release:
@@ -58,3 +58,23 @@ share/misc/bsd-family-tree			1.46-1.47
 	5.1.2.
 	[riz, ticket #641]
 
+sys/arch/xen/xen/xengnt.c			1.25
+
+	Prevent a memory corruption issue that locks up a Xen DomU,
+	and con potentially cause file system corruption.
+	PR#47056, PR#47057.
+	[royger, ticket #640]
+
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #657]
+

CVS commit: [netbsd-6] src/doc

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:28:20 UTC 2012

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

Log Message:
Tickets 638-640, 657.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-6.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-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.15 src/doc/CHANGES-6.1:1.1.2.16
--- src/doc/CHANGES-6.1:1.1.2.15	Fri Oct 26 09:33:39 2012
+++ src/doc/CHANGES-6.1	Wed Oct 31 16:28:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.15 2012/10/26 09:33:39 sborrill Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.16 2012/10/31 16:28:20 riz Exp $
 
 A complete list of changes from the 6.0 release until the 6.1 release:
 
@@ -360,3 +360,39 @@ sbin/gpt/gpt.c	1.16-1.17
 	Endianness fixes.
 	[riz, ticket #619]
 
+sys/net/if_atmsubr.c1.50
+sys/net/if_ethersubr.c1.192
+sys/net/if_fddisubr.c1.82
+sys/net/if_ppp.c1.137
+sys/netinet6/in6_var.h1.66
+sys/netinet6/ip6_flow.c1.20
+
+	If the IPv6 flow code modifies the mbuf, pass the change up to
+	the caller.  PR#47058.
+	[christos, ticket #638]
+
+sys/fs/ptyfs/ptyfs_subr.c			1.24
+
+	Fix bad directory times on ptyfs.
+	[christos, ticket #639]
+
+sys/arch/xen/xen/xengnt.c			1.25
+
+	Prevent a memory corruption issue that locks up a Xen DomU,
+	and con potentially cause file system corruption.
+	PR#47056, PR#47057.
+	[royger, ticket #640]
+
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #657]
+

CVS commit: [netbsd-4-0] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:38:23 UTC 2012

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

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #1464]


To generate a diff of this commit:
cvs rdiff -u -r1.486.2.9.2.10 -r1.486.2.9.2.11 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.40.2.1.2.5 -r1.1.1.40.2.1.2.6 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.35.2.2.2.4 -r1.1.1.35.2.2.2.5 \
src/share/zoneinfo/southamerica

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.10 src/doc/3RDPARTY:1.486.2.9.2.11
--- src/doc/3RDPARTY:1.486.2.9.2.10	Tue Oct 23 23:44:16 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:38:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.486.2.9.2.10 2012/10/23 23:44:16 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.486.2.9.2.11 2012/10/31 16:38:22 riz 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 / tzdata2012g
-Current Vers:	tzcode2012g / tzdata2012g
+Version:	tzcode2004a / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.40.2.1.2.5 src/share/zoneinfo/asia:1.1.1.40.2.1.2.6
--- src/share/zoneinfo/asia:1.1.1.40.2.1.2.5	Tue Oct 23 23:44:16 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:38:23 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after more than a year
+# past, approved sending the proposed June 2011 changes to the Time
+# Decree Law back to the Knesset for second and third (final)

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:39:30 UTC 2012

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

Log Message:
Ticket 1464


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.113 -r1.1.2.114 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.113 src/doc/CHANGES-4.0.2:1.1.2.114
--- src/doc/CHANGES-4.0.2:1.1.2.113	Thu Oct 25 08:42:46 2012
+++ src/doc/CHANGES-4.0.2	Wed Oct 31 16:39:29 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.0.2,v 1.1.2.113 2012/10/25 08:42:46 sborrill Exp $
+#	$NetBSD: CHANGES-4.0.2,v 1.1.2.114 2012/10/31 16:39:29 riz Exp $
 
 A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
 release:
@@ -1510,3 +1510,16 @@ share/misc/bsd-family-tree			1.46-1.47
 	5.1.2.
 	[riz, ticket #1463]
 
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1464]
+

CVS commit: [netbsd-4] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:40:15 UTC 2012

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

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #1464]


To generate a diff of this commit:
cvs rdiff -u -r1.486.2.19 -r1.486.2.20 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.40.2.6 -r1.1.1.40.2.7 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.35.2.6 -r1.1.1.35.2.7 src/share/zoneinfo/southamerica

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.19 src/doc/3RDPARTY:1.486.2.20
--- src/doc/3RDPARTY:1.486.2.19	Tue Oct 23 23:43:08 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:40:14 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.486.2.19 2012/10/23 23:43:08 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.486.2.20 2012/10/31 16:40:14 riz 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 / tzdata2012g
-Current Vers:	tzcode2012g / tzdata2012g
+Version:	tzcode2004a / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.40.2.6 src/share/zoneinfo/asia:1.1.1.40.2.7
--- src/share/zoneinfo/asia:1.1.1.40.2.6	Tue Oct 23 23:43:09 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:40:14 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after more than a year
+# past, approved sending the proposed June 2011 changes to the Time
+# Decree Law back to the Knesset for second and third (final) votes
+# before the upcoming elections on Jan. 22, 2013.  Hence,

CVS commit: [netbsd-4] src/doc

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:40:56 UTC 2012

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

Log Message:
Ticket 1464


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.255 -r1.1.2.256 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.255 src/doc/CHANGES-4.1:1.1.2.256
--- src/doc/CHANGES-4.1:1.1.2.255	Thu Oct 25 08:31:29 2012
+++ src/doc/CHANGES-4.1	Wed Oct 31 16:40:56 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.1,v 1.1.2.255 2012/10/25 08:31:29 sborrill Exp $
+#	$NetBSD: CHANGES-4.1,v 1.1.2.256 2012/10/31 16:40:56 riz Exp $
 
 A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
 release:
@@ -4798,3 +4798,16 @@ share/misc/bsd-family-tree			1.46-1.47
 	5.1.2.
 	[riz, ticket #1463]
 
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1464]
+

CVS commit: [netbsd-5-0] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:46:10 UTC 2012

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

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #1812]


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.6.2.9 -r1.647.2.6.2.10 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.44.6.4 -r1.1.1.44.6.5 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.42.6.3 -r1.1.1.42.6.4 src/share/zoneinfo/southamerica

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.9 src/doc/3RDPARTY:1.647.2.6.2.10
--- src/doc/3RDPARTY:1.647.2.6.2.9	Tue Oct 23 23:25:18 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:46:09 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.6.2.9 2012/10/23 23:25:18 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.647.2.6.2.10 2012/10/31 16:46:09 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -924,9 +924,10 @@ License:	BSD (4-clause)
 Notes:
 
 Package:	tz
-Version:   tzcode2004a / tzdata2012g
-Current Vers:  tzcode2012g / tzdata2012g
-Maintainer:Paul Eggert egg...@cs.ucla.edu
+Version:	tzcode2004a / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
+Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
+Maintainer:	Robert Elz k...@munnari.oz.au
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.44.6.4 src/share/zoneinfo/asia:1.1.1.44.6.5
--- src/share/zoneinfo/asia:1.1.1.44.6.4	Tue Oct 23 23:25:18 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:46:10 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after more than a year
+# past,

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:47:19 UTC 2012

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

Log Message:
Ticket 1812


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.87 -r1.1.2.88 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.87 src/doc/CHANGES-5.0.3:1.1.2.88
--- src/doc/CHANGES-5.0.3:1.1.2.87	Thu Oct 25 09:12:14 2012
+++ src/doc/CHANGES-5.0.3	Wed Oct 31 16:47:18 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.87 2012/10/25 09:12:14 sborrill Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.88 2012/10/31 16:47:18 riz Exp $
 
 A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
 release:
@@ -5157,3 +5157,16 @@ share/misc/bsd-family-tree			1.46-1.47
 	5.1.2.
 	[riz, ticket #1806]
 
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1812]
+

CVS commit: [netbsd-5-1] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:47:54 UTC 2012

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

Log Message:
doc/3RDPARTYpatch
share/zoneinfo/asia patch
share/zoneinfo/southamerica patch

Import tzdata2012h from
ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
Changes from tzdata2012g to tzdata2012h:
   Bahia no longer has DST.  (Thanks to Kelley Cook.)
   Tocantins has DST.  (Thanks to Rodrigo Severo.)
   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
[apb, ticket #1812]


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.12.2.5 -r1.647.2.12.2.6 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.44.10.4 -r1.1.1.44.10.5 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.42.10.3 -r1.1.1.42.10.4 src/share/zoneinfo/southamerica

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.5 src/doc/3RDPARTY:1.647.2.12.2.6
--- src/doc/3RDPARTY:1.647.2.12.2.5	Sun Sep 30 18:12:35 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:47:53 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.12.2.5 2012/09/30 18:12:35 bouyer Exp $
+#	$NetBSD: 3RDPARTY,v 1.647.2.12.2.6 2012/10/31 16:47:53 riz 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 / tzdata2012f
-Current Vers:	tzcode2012f / tzdata2012f
+Version:	tzcode2004a / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 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/asia
diff -u src/share/zoneinfo/asia:1.1.1.44.10.4 src/share/zoneinfo/asia:1.1.1.44.10.5
--- src/share/zoneinfo/asia:1.1.1.44.10.4	Tue Oct 23 23:21:01 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:47:53 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after more than a year
+# past, approved sending the proposed June 2011 changes to the Time
+# Decree Law back to the Knesset for second and third (final) votes
+# before

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:48:13 UTC 2012

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

Log Message:
Ticket 1812.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 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.29 src/doc/CHANGES-5.1.3:1.1.2.30
--- src/doc/CHANGES-5.1.3:1.1.2.29	Wed Oct 31 15:49:59 2012
+++ src/doc/CHANGES-5.1.3	Wed Oct 31 16:48:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.29 2012/10/31 15:49:59 riz Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.30 2012/10/31 16:48:13 riz Exp $
 
 A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
 release:
@@ -2249,3 +2249,16 @@ sys/external/bsd/drm/dist/bsd-core/drm_s
 	Avoid crashing when writing to certain DRM sysctls.
 	[chs, ticket #1811]
 
+doc/3RDPARTY	patch
+share/zoneinfo/asiapatch
+share/zoneinfo/southamerica			patch
+
+	Import tzdata2012h from
+	ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz
+	Changes from tzdata2012g to tzdata2012h:
+   	   Bahia no longer has DST.  (Thanks to Kelley Cook.)
+	   Tocantins has DST.  (Thanks to Rodrigo Severo.)
+	   Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
+	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
+	[apb, ticket #1812]
+

CVS commit: [netbsd-5] src

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:50:03 UTC 2012

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

Log Message:
Ticket 1812.


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.20 -r1.647.2.21 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.44.2.4 -r1.1.1.44.2.5 src/share/zoneinfo/asia
cvs rdiff -u -r1.1.1.42.2.3 -r1.1.1.42.2.4 src/share/zoneinfo/southamerica

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.20 src/doc/3RDPARTY:1.647.2.21
--- src/doc/3RDPARTY:1.647.2.20	Tue Oct 23 23:27:20 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:50:02 2012
@@ -1,4 +1,4 @@
-#  $NetBSD: 3RDPARTY,v 1.647.2.20 2012/10/23 23:27:20 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.647.2.21 2012/10/31 16:50:02 riz 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 / tzdata2012g
-Current Vers:	tzcode2012g / tzdata2012g
+Version:	tzcode2004a / tzdata2012h
+Current Vers:	tzcode2012h / tzdata2012h
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.44.2.4 src/share/zoneinfo/asia:1.1.1.44.2.5
--- src/share/zoneinfo/asia:1.1.1.44.2.4	Tue Oct 23 23:27:21 2012
+++ src/share/zoneinfo/asia	Wed Oct 31 16:50:03 2012
@@ -1170,15 +1170,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced lastFri with Fri=26 by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # Fri=26 to mean April 1 in years like 2005, so for now we list the
@@ -1195,39 +1195,36 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2012-10-18):
+
+# Yesterday, the Interior Ministry Committee, after more than a year
+# past, approved sending the proposed June 2011 changes to the Time
+# Decree Law back to the Knesset for second and third (final) votes
+# before the upcoming elections on Jan. 22, 2013.  Hence, although the
+# changes are not yet law, they are expected to be so before Februray 2013.
+#
+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March.
+# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the
+# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day
+# later (i.e. at 02:00 the first Monday after October 2).
+# [Rosh Hashana holidays are factored in until 2100.]
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Zion	2013	max	-	Mar	Fri=23	2:00	1:00	D
+Rule	Zion	2013	2026	-	Oct	Sun=2	2:00	0	S

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:51:10 UTC 2012

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

Log Message:
Fix last commit (ticket 1812, my fault)


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.12.2.6 -r1.647.2.12.2.7 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.647.2.12.2.6 src/doc/3RDPARTY:1.647.2.12.2.7
--- src/doc/3RDPARTY:1.647.2.12.2.6	Wed Oct 31 16:47:53 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:51:10 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.647.2.12.2.6 2012/10/31 16:47:53 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.647.2.12.2.7 2012/10/31 16:51:10 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -926,8 +926,7 @@ Notes:
 Package:	tz
 Version:	tzcode2004a / tzdata2012h
 Current Vers:	tzcode2012h / tzdata2012h
-Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
-Maintainer:	Robert Elz k...@munnari.oz.au
+Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/

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

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 16:51:53 UTC 2012

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

Log Message:
Fix last commit (ticket 1812, my fault)


To generate a diff of this commit:
cvs rdiff -u -r1.647.2.6.2.10 -r1.647.2.6.2.11 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.647.2.6.2.10 src/doc/3RDPARTY:1.647.2.6.2.11
--- src/doc/3RDPARTY:1.647.2.6.2.10	Wed Oct 31 16:46:09 2012
+++ src/doc/3RDPARTY	Wed Oct 31 16:51:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.647.2.6.2.10 2012/10/31 16:46:09 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.647.2.6.2.11 2012/10/31 16:51:52 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -926,8 +926,7 @@ Notes:
 Package:	tz
 Version:	tzcode2004a / tzdata2012h
 Current Vers:	tzcode2012h / tzdata2012h
-Maintainer:	Arthur David Olson a...@elsie.nci.nih.gov
-Maintainer:	Robert Elz k...@munnari.oz.au
+Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/

CVS commit: [netbsd-6] src/sys/arch/i386/i386

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 17:19:49 UTC 2012

Modified Files:
src/sys/arch/i386/i386 [netbsd-6]: locore.S

Log Message:
Pull up following revision(s) (requested by chs in ticket #642):
sys/arch/i386/i386/locore.S: revision 1.103
in osyscall, set the PSL_I bit into the correct field of the trapframe.
it was going into tf_eip instead of tf_eflags, which would sometimes
corrupt %eip and always return to user mode with interrupts disabled.
this was found with a netbsd 1.0 binary, and dsl@ points out that
this should also fix PR 41342.


To generate a diff of this commit:
cvs rdiff -u -r1.95.10.2 -r1.95.10.3 src/sys/arch/i386/i386/locore.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/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.95.10.2 src/sys/arch/i386/i386/locore.S:1.95.10.3
--- src/sys/arch/i386/i386/locore.S:1.95.10.2	Fri Apr 20 23:32:14 2012
+++ src/sys/arch/i386/i386/locore.S	Wed Oct 31 17:19:49 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $	*/
+/*	$NetBSD: locore.S,v 1.95.10.3 2012/10/31 17:19:49 riz Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -129,7 +129,7 @@
  */
 
 #include machine/asm.h
-__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.95.10.3 2012/10/31 17:19:49 riz Exp $);
 
 #include opt_compat_oldboot.h
 #include opt_ddb.h
@@ -1123,7 +1123,7 @@ IDTVEC(osyscall)
 #endif
 	pushfl			# set eflags in trap frame
 	popl	8(%esp)
-	orl	$PSL_I,(%esp)	# re-enable ints on return to user
+	orl	$PSL_I,8(%esp)	# re-enable ints on return to user
 	pushl	$7		# size of instruction for restart
 	jmp	syscall1
 IDTVEC_END(osyscall)

CVS commit: [netbsd-6] src/sys

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 17:30:21 UTC 2012

Modified Files:
src/sys/kern [netbsd-6]: subr_cprng.c
src/sys/netinet [netbsd-6]: tcp_subr.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #644):
sys/netinet/tcp_subr.c: revision 1.248
sys/kern/subr_cprng.c: revision 1.12
Fix a bug that kmem_alloc() is called from the interrupt context.


To generate a diff of this commit:
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/kern/subr_cprng.c
cvs rdiff -u -r1.246 -r1.246.2.1 src/sys/netinet/tcp_subr.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/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.5.2.4 src/sys/kern/subr_cprng.c:1.5.2.5
--- src/sys/kern/subr_cprng.c:1.5.2.4	Wed Oct 17 21:27:12 2012
+++ src/sys/kern/subr_cprng.c	Wed Oct 31 17:30:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_cprng.c,v 1.5.2.4 2012/10/17 21:27:12 riz Exp $ */
+/*	$NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 
 #include sys/cprng.h
 
-__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.5.2.4 2012/10/17 21:27:12 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $);
 
 void
 cprng_init(void)
@@ -284,7 +284,8 @@ rekeyany:
 	 * If the generator has just been keyed, perform
 	 * the statistical RNG test.
 	 */
-	if (__predict_false(c-drbg.reseed_counter == 1)) {
+	if (__predict_false(c-drbg.reseed_counter == 1) 
+	(flags  FASYNC) == 0) {
 		rngtest_t *rt = kmem_alloc(sizeof(*rt), KM_NOSLEEP);
 
 		if (rt) {

Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.246 src/sys/netinet/tcp_subr.c:1.246.2.1
--- src/sys/netinet/tcp_subr.c:1.246	Sat Dec 31 20:41:59 2011
+++ src/sys/netinet/tcp_subr.c	Wed Oct 31 17:30:20 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $	*/
+/*	$NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -2219,7 +2219,7 @@ tcp_new_iss1(void *laddr, void *faddr, u
 	 */
 	if (tcp_iss_gotten_secret == false) {
 		cprng_strong(kern_cprng,
-			 tcp_iss_secret, sizeof(tcp_iss_secret), 0);
+			 tcp_iss_secret, sizeof(tcp_iss_secret), FASYNC);
 		tcp_iss_gotten_secret = true;
 	}

CVS commit: [netbsd-6] src/doc

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 17:32:01 UTC 2012

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

Log Message:
Tickets 642-644


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-6.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-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.16 src/doc/CHANGES-6.1:1.1.2.17
--- src/doc/CHANGES-6.1:1.1.2.16	Wed Oct 31 16:28:20 2012
+++ src/doc/CHANGES-6.1	Wed Oct 31 17:32:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.16 2012/10/31 16:28:20 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.17 2012/10/31 17:32:01 riz Exp $
 
 A complete list of changes from the 6.0 release until the 6.1 release:
 
@@ -396,3 +396,23 @@ share/zoneinfo/southamerica			patch
 	   Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
 	[apb, ticket #657]
 
+sys/arch/i386/i386/locore.S			1.103 via patch
+
+	Fix running BSDi and NetBSD = 1.0 binaries.  PR#41342.
+	[chs, ticket #642]
+
+sys/dev/pci/pucdata.c1.77-1.82
+sys/dev/pci/pcidevs1.1125, 1.1129 via patch
+sys/dev/pci/pcidevs.hregen
+sys/dev/pci/pcidevs_data.h			regen
+share/man/man4/puc.41.36-1.38
+
+	Additional device support for puc(4).
+	[msaitoh, ticket #643]
+
+sys/kern/subr_cprng.c1.12
+sys/netinet/tcp_subr.c1.248
+
+	Fix a bug that kmem_alloc() is called from the interrupt context.
+	[msaitoh, ticket #644]
+

CVS commit: src/sys/dev/nand

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 18:58:09 UTC 2012

Modified Files:
src/sys/dev/nand: files.nand nand.c nand.h

Log Message:
Hook nand_samsung.c into the build, and use it if a legacy chip
from Samsung is found.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/nand/files.nand
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/nand/nand.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nand/nand.h

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

Modified files:

Index: src/sys/dev/nand/files.nand
diff -u src/sys/dev/nand/files.nand:1.4 src/sys/dev/nand/files.nand:1.5
--- src/sys/dev/nand/files.nand:1.4	Tue Jun 28 18:14:11 2011
+++ src/sys/dev/nand/files.nand	Wed Oct 31 18:58:08 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.nand,v 1.4 2011/06/28 18:14:11 ahoka Exp $
+# $NetBSD: files.nand,v 1.5 2012/10/31 18:58:08 riz Exp $
 
 define	nandbus	{ }
 
@@ -9,6 +9,7 @@ file	dev/nand/hamming.c	nand
 file	dev/nand/nand_bbt.c	nand
 file	dev/nand/nand_crc.c	nand
 file	dev/nand/nand_micron.c	nand
+file	dev/nand/nand_samsung.c	nand
 
 defpseudodev	nandemulator: nandbus
 file	dev/nand/nandemulator.c	nandemulator

Index: src/sys/dev/nand/nand.c
diff -u src/sys/dev/nand/nand.c:1.17 src/sys/dev/nand/nand.c:1.18
--- src/sys/dev/nand/nand.c:1.17	Thu Jul 12 03:05:01 2012
+++ src/sys/dev/nand/nand.c	Wed Oct 31 18:58:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand.c,v 1.17 2012/07/12 03:05:01 matt Exp $	*/
+/*	$NetBSD: nand.c,v 1.18 2012/10/31 18:58:08 riz Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
 /* Common driver for NAND chips implementing the ONFI 2.2 specification */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nand.c,v 1.17 2012/07/12 03:05:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nand.c,v 1.18 2012/10/31 18:58:08 riz Exp $);
 
 #include locators.h
 
@@ -332,6 +332,8 @@ nand_fill_chip_structure_legacy(device_t
 	switch (chip-nc_manf_id) {
 	case NAND_MFR_MICRON:
 		return nand_read_parameters_micron(self, chip);
+	case NAND_MFR_SAMSUNG:
+		return nand_read_parameters_samsung(self, chip);
 	default:
 		return 1;
 	}

Index: src/sys/dev/nand/nand.h
diff -u src/sys/dev/nand/nand.h:1.13 src/sys/dev/nand/nand.h:1.14
--- src/sys/dev/nand/nand.h:1.13	Fri Jul 15 19:19:57 2011
+++ src/sys/dev/nand/nand.h	Wed Oct 31 18:58:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand.h,v 1.13 2011/07/15 19:19:57 cliff Exp $	*/
+/*	$NetBSD: nand.h,v 1.14 2012/10/31 18:58:08 riz Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -428,6 +428,7 @@ extern const struct nand_manufacturer na
  * Manufacturer specific parameter functions
  */
 int nand_read_parameters_micron(device_t, struct nand_chip *);
+int nand_read_parameters_samsung(device_t, struct nand_chip *);
 
 /* debug inlines */

CVS commit: src/sys/dev/nand

2012-10-31 Thread Adam Hoka

Module Name:src
Committed By:   ahoka
Date:   Wed Oct 31 20:51:25 UTC 2012

Modified Files:
src/sys/dev/nand: nand_samsung.c

Log Message:
Fill more info in nand chip structure.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nand/nand_samsung.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/nand/nand_samsung.c
diff -u src/sys/dev/nand/nand_samsung.c:1.2 src/sys/dev/nand/nand_samsung.c:1.3
--- src/sys/dev/nand/nand_samsung.c:1.2	Tue Oct 30 22:43:36 2012
+++ src/sys/dev/nand/nand_samsung.c	Wed Oct 31 20:51:25 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand_samsung.c,v 1.2 2012/10/30 22:43:36 riz Exp $	*/
+/*	$NetBSD: nand_samsung.c,v 1.3 2012/10/31 20:51:25 ahoka Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -37,11 +37,23 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nand_samsung.c,v 1.2 2012/10/30 22:43:36 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: nand_samsung.c,v 1.3 2012/10/31 20:51:25 ahoka Exp $);
 
 #include nand.h
 #include onfi.h
 
+enum {
+	NAND_SAMSUNG_PAGEMASK = 0x3,
+	NAND_SAMSUNG_BLOCKMASK = 0x3  4,
+	NAND_SAMSUNG_SPAREMASK = 0x1  2,
+	NAND_SAMSUNG_BITSMASK = 0x1  6
+};
+
+enum {
+	NAND_SAMSUNG_PLANENUMMASK = 0x3  2,
+	NAND_SAMSUNG_PLANESIZEMASK = 0x7  4
+};
+
 int
 nand_read_parameters_samsung(device_t self, struct nand_chip * const chip)
 {
@@ -66,15 +78,12 @@ nand_read_parameters_samsung(device_t se
 	nand_read_1(self, params3);
 	nand_select(self, false);
 
-	enum {
-		NAND_SAMSUNG_PAGEMASK = 0x3,
-		NAND_SAMSUNG_BLOCKMASK = 0x3  4,
-		NAND_SAMSUNG_SPAREMASK = 0x1  2,
-		NAND_SAMSUNG_BITSMASK = 0x1  6
-	};
-
 	/* K9XXG08UXA */
 	if (devid == 0xdc) {
+		/* From the documentation */
+		chip-nc_addr_cycles_column = 2;
+		chip-nc_addr_cycles_row = 3;
+
 		switch (params2  NAND_SAMSUNG_PAGEMASK) {
 		case 0x0:
 			chip-nc_page_size = 1024;
@@ -124,12 +133,56 @@ nand_read_parameters_samsung(device_t se
 			break;
 		}
 		
-		// TODO make this nice like the above
-		chip-nc_size = (((params3  4)  0x7) + 1) * 64 * 1024 * 1024;
+		switch ((params3  NAND_SAMSUNG_PLANENUMMASK)  2) {
+		case 0x0:
+			chip-nc_num_luns = 1;
+			break;
+		case 0x1:
+			chip-nc_num_luns = 2;
+			break;
+		case 0x2:
+			chip-nc_num_luns = 4;
+			break;
+		case 0x3:
+			chip-nc_num_luns = 8;
+			break;
+		}
+
+		uint64_t planesize;
+		switch ((params3  NAND_SAMSUNG_PLANESIZEMASK)  4) {
+		case 0x0:
+			planesize = 64 * 1024 * 1024;
+			break;
+		case 0x1:
+			planesize = 128 * 1024 * 1024;
+			break;
+		case 0x2:
+			planesize = 256 * 1024 * 1024;
+			break;
+		case 0x3:
+			planesize = 512 * 1024 * 1024;
+			break;
+		case 0x4:
+			planesize = 1024 * 1024 * 1024;
+			break;
+		case 0x5:
+			planesize = 2ul * 1024 * 1024 * 1024;
+			break;
+		case 0x6:
+			planesize = 4ul * 1024 * 1024 * 1024;
+			break;
+		case 0x7:
+			planesize = 8ul * 1024 * 1024 * 1024;
+			break;
+		}
+
+		chip-nc_lun_blocks = planesize / chip-nc_block_size;
+		chip-nc_size = planesize * chip-nc_num_luns;
+
+		aprint_normal_dev(self, vendor: Samsung, model: K9XXG08UXA\n);
 	} else {
 		return 1;
 	}

 	return 0;
 }
-

CVS commit: src/sys/dev/nand

2012-10-31 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Wed Oct 31 21:30:27 UTC 2012

Modified Files:
src/sys/dev/nand: nand_samsung.c

Log Message:
Avoid a 'may be used uninitialized' warning.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nand/nand_samsung.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/nand/nand_samsung.c
diff -u src/sys/dev/nand/nand_samsung.c:1.3 src/sys/dev/nand/nand_samsung.c:1.4
--- src/sys/dev/nand/nand_samsung.c:1.3	Wed Oct 31 20:51:25 2012
+++ src/sys/dev/nand/nand_samsung.c	Wed Oct 31 21:30:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand_samsung.c,v 1.3 2012/10/31 20:51:25 ahoka Exp $	*/
+/*	$NetBSD: nand_samsung.c,v 1.4 2012/10/31 21:30:27 riz Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nand_samsung.c,v 1.3 2012/10/31 20:51:25 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: nand_samsung.c,v 1.4 2012/10/31 21:30:27 riz Exp $);
 
 #include nand.h
 #include onfi.h
@@ -148,7 +148,7 @@ nand_read_parameters_samsung(device_t se
 			break;
 		}
 
-		uint64_t planesize;
+		uint64_t planesize = 0;
 		switch ((params3  NAND_SAMSUNG_PLANESIZEMASK)  4) {
 		case 0x0:
 			planesize = 64 * 1024 * 1024;

CVS commit: src/sys/dev/usb

2012-10-31 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Nov  1 00:38:43 UTC 2012

Modified Files:
src/sys/dev/usb: u3g.c

Log Message:
Match all pairs of bulkin-bulkout interfaces to ucom's, configuring multiple
ucoms per modem as they are available, instead of picking up the last bulkin
bulkout pair. This makes my Sierra U250 3G portion of the modem to work.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/u3g.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/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.26 src/sys/dev/usb/u3g.c:1.27
--- src/sys/dev/usb/u3g.c:1.26	Fri Oct  5 18:04:56 2012
+++ src/sys/dev/usb/u3g.c	Wed Oct 31 20:38:43 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: u3g.c,v 1.26 2012/10/05 22:04:56 khorben Exp $	*/
+/*	$NetBSD: u3g.c,v 1.27 2012/11/01 00:38:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.26 2012/10/05 22:04:56 khorben Exp $);
+__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.27 2012/11/01 00:38:43 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -113,16 +113,19 @@ struct u3g_softc {
 	device_t		sc_dev;
 	usbd_device_handle	sc_udev;
 	bool			sc_dying;	/* We're going away */
-
-	device_t		sc_ucom;	/* Child ucom(4) handle */
 	int			sc_ifaceno;	/* Device interface number */
 
-	bool			sc_open;	/* Device is in use */
-	bool			sc_purging;	/* Purging stale data */
-	struct timeval		sc_purge_start;	/* Control duration of purge */
+	struct u3g_com {
+		device_t	c_dev;		/* Child ucom(4) handle */
 
-	u_char			sc_msr;		/* Emulated 'msr' */
-	uint16_t		sc_outpins;	/* Output pin state */
+		bool		c_open;		/* Device is in use */
+		bool		c_purging;	/* Purging stale data */
+		struct timeval	c_purge_start;	/* Control duration of purge */
+
+		u_char		c_msr;		/* Emulated 'msr' */
+		uint16_t	c_outpins;	/* Output pin state */
+	} sc_com[10];
+	size_t			sc_ncom;
 
 	usbd_pipe_handle	sc_intr_pipe;	/* Interrupt pipe */
 	u_char			*sc_intr_buff;	/* Interrupt buffer */
@@ -246,7 +249,7 @@ static const struct usb_devno u3g_devs[]
 	{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781 },
 	{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725 },
 	{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_USB305 },
-
+	{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_250U },
 	/* Toshiba */
 	{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MODEM_EU870DT1 },
 
@@ -629,20 +632,16 @@ u3g_attach(device_t parent, device_t sel
 	uca.ibufsize = U3G_BUFF_SIZE;
 	uca.obufsize = U3G_BUFF_SIZE;
 	uca.ibufsizepad = U3G_BUFF_SIZE;
-	uca.portno = uaa-ifaceno;
 	uca.opkthdrlen = 0;
 	uca.device = dev;
 	uca.iface = iface;
 	uca.methods = u3g_methods;
 	uca.arg = sc;
+	uca.portno = -1;
 	uca.bulkin = uca.bulkout = -1;
 
-	sc-sc_outpins = 0;
-	sc-sc_msr = UMSR_DSR | UMSR_CTS | UMSR_DCD;
-	sc-sc_ifaceno = uaa-ifaceno;
-	sc-sc_open = false;
-	sc-sc_purging = false;
 
+	sc-sc_ifaceno = uaa-ifaceno;
 	intr_address = -1;
 	intr_size = 0;
 
@@ -668,25 +667,33 @@ u3g_attach(device_t parent, device_t sel
 		UE_GET_XFERTYPE(ed-bmAttributes) == UE_BULK) {
 			uca.bulkout = ed-bEndpointAddress;
 		}
+		if (uca.bulkin != -1  uca.bulkout != -1) {
+			struct u3g_com *com;
+			if (sc-sc_ncom == __arraycount(sc-sc_com)) {
+aprint_error_dev(self, Need to configure 
+more than %zu ttys, sc-sc_ncom);
+continue;
+			}
+			uca.portno = sc-sc_ncom++;
+			com = sc-sc_com[uca.portno];
+			com-c_outpins = 0;
+			com-c_msr = UMSR_DSR | UMSR_CTS | UMSR_DCD;
+			com-c_open = false;
+			com-c_purging = false;
+			com-c_dev = config_found_sm_loc(self, ucombus,
+NULL, uca, ucomprint, ucomsubmatch);
+			uca.bulkin = -1;
+			uca.bulkout = -1;
+		}
 	}
 
-	if (uca.bulkin == -1) {
-		aprint_error_dev(self, Missing bulk in for interface %d\n,
-		sc-sc_ifaceno);
-		sc-sc_dying = true;
-		return;
-	}
-
-	if (uca.bulkout == -1) {
-		aprint_error_dev(self, Missing bulk out for interface %d\n,
+	if (sc-sc_ncom == 0) {
+		aprint_error_dev(self, Missing bulk in/out for interface %d\n,
 		sc-sc_ifaceno);
 		sc-sc_dying = true;
 		return;
 	}
 
-	sc-sc_ucom = config_found_sm_loc(self, ucombus,
-	NULL, uca, ucomprint, ucomsubmatch);
-
 	/*
 	 * If the interface has an interrupt pipe, open it immediately so
 	 * that we can track input pin state changes regardless of whether
@@ -722,13 +729,14 @@ u3g_detach(device_t self, int flags)
 
 	pmf_device_deregister(self);
 
-	if (sc-sc_ucom != NULL) {
-		rv = config_detach(sc-sc_ucom, flags);
-		if (rv != 0) {
-			aprint_verbose_dev(self, Can't deallocate 
-			port (%d), rv);
+	for (size_t i = 0; i  sc-sc_ncom; i++)
+		if (sc-sc_com[i].c_dev != NULL) {
+			rv = config_detach(sc-sc_com[i].c_dev, flags);
+			if (rv != 0) {
+aprint_verbose_dev(self, Can't deallocate 
+port (%d), rv);
+			}
 		}
-	}
 
 	if (sc-sc_intr_pipe != NULL) {
 		(void)

CVS commit: src/share/examples/pppd

2012-10-31 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Nov  1 00:40:22 UTC 2012

Added Files:
src/share/examples/pppd: sprint3G sprint3G.chat

Log Message:
add configurations to connect to Sprint's 3G network.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/examples/pppd/sprint3G \
src/share/examples/pppd/sprint3G.chat

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

Added files:

Index: src/share/examples/pppd/sprint3G
diff -u /dev/null src/share/examples/pppd/sprint3G:1.1
--- /dev/null	Wed Oct 31 20:40:22 2012
+++ src/share/examples/pppd/sprint3G	Wed Oct 31 20:40:22 2012
@@ -0,0 +1,27 @@
+# $NetBSD: sprint3G,v 1.1 2012/11/01 00:40:22 christos Exp $
+# Script to connect to Sprint-3G's service.
+#
+#kdebug 10
+#debug 10
+/dev/ttyU0 460800
+holdoff 10
+#idle 600
+demand
+#active-filter-out icmp or (udp and not udp port route) or (tcp and not tcp port ntp)
+#active-filter-in icmp or (udp and not udp port route) or (tcp and not tcp port ntp)
+#pass-filter-in tcp or (udp and not udp port route) or icmp
+#pass-filter-out tcp or (udp and not udp port route) or icmp
+#netmask 0xff00
+ipcp-accept-local
+#lcp-echo-failure 5
+#lcp-echo-interval 5
+#mtu 296
+defaultroute
+crtscts
+modem
+lock
+connect /etc/ppp/connect/sprint3G.chat
+noauth
+user
+password
+usepeerdns
Index: src/share/examples/pppd/sprint3G.chat
diff -u /dev/null src/share/examples/pppd/sprint3G.chat:1.1
--- /dev/null	Wed Oct 31 20:40:22 2012
+++ src/share/examples/pppd/sprint3G.chat	Wed Oct 31 20:40:22 2012
@@ -0,0 +1,5 @@
+#!/bin/sh
+chat -t 100 -v ''	'ATZ' \
+  'OK' 		'ATDT#777' \
+  TIMEOUT		120 \
+  'CONNECT'   	'\c'

CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/libverify

2012-10-31 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Thu Nov  1 01:35:35 UTC 2012

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify 
[agc-netpgp-standalone]:
libverify.c verify.h

Log Message:
display revoked userids, and particularly, compromised and revoked userids


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 \
src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.10 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.11
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.10	Tue Oct 30 02:10:42 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c	Thu Nov  1 01:35:35 2012
@@ -1237,6 +1237,9 @@ recog_userid(pgpv_t *pgp, pgpv_signed_us
 		if (signature.primary_userid) {
 			userid-primary_userid = signature.primary_userid;
 		}
+		if (signature.revoked) {
+			userid-revoked = signature.revoked;
+		}
 	}
 	return 1;
 }
@@ -1260,6 +1263,9 @@ recog_userattr(pgpv_t *pgp, pgpv_signed_
 			return 0;
 		}
 		ARRAY_APPEND(userattr-sigs, signature);
+		if (signature.revoked) {
+			userattr-revoked = signature.revoked;
+		}
 	}
 	return 1;
 }
@@ -1361,6 +1367,9 @@ fmt_pubkey(char *s, size_t size, pgpv_pu
 	return cc;
 }
 
+/* we add 1 to revocation value to denote compromised */
+#define COMPROMISED	(0x02 + 1)
+
 /* format a userid - used to order the userids when formatting */
 static size_t
 fmt_userid(char *s, size_t size, pgpv_primarykey_t *primary, uint8_t u)
@@ -1368,8 +1377,10 @@ fmt_userid(char *s, size_t size, pgpv_pr
 	pgpv_signed_userid_t	*userid;
 
 	userid = ARRAY_ELEMENT(primary-signed_userids, u);
-	return snprintf(s, size, uid  %.*s\n,
-			(int)userid-userid.size, userid-userid.data);
+	return snprintf(s, size, uid  %.*s%s\n,
+			(int)userid-userid.size, userid-userid.data,
+			(userid-revoked == COMPROMISED) ?  [COMPROMISED AND REVOKED] :
+			(userid-revoked) ?  [REVOKED] : );
 }
 
 /* print a primary key, per RFC 4880 */
@@ -1919,6 +1930,7 @@ recog_primary_key(pgpv_t *pgp, pgpv_prim
 			/* XXX - check it's a good key expiry */
 			primary-primary.expiry = signature.keyexpiry;
 		}
+if (signature.revoked) fprintf(stderr, agc - revoked1\n);
 		ARRAY_APPEND(primary-direct_sigs, signature);
 	}
 	/* some keys out there have user ids where they shouldn't */

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h:1.1.2.9 src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h:1.1.2.10
--- src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h:1.1.2.9	Tue Oct 30 02:10:42 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h	Thu Nov  1 01:35:35 2012
@@ -211,11 +211,13 @@ typedef struct pgpv_signed_userid_t {
 	pgpv_string_t	 	 userid;
 	PGPV_ARRAY(pgpv_signature_t, sigs);
 	uint8_t			 primary_userid;
+	uint8_t			 revoked;
 } pgpv_signed_userid_t;
 
 typedef struct pgpv_signed_userattr_t {
 	pgpv_userattr_t	 	 userattr;
 	PGPV_ARRAY(pgpv_signature_t, sigs);
+	uint8_t			 revoked;
 } pgpv_signed_userattr_t;
 
 typedef struct pgpv_signed_subkey_t {

CVS commit: src/sys/dev/marvell

2012-10-31 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Nov  1 02:46:41 UTC 2012

Modified Files:
src/sys/dev/marvell: if_mvgbe.c

Log Message:
No functional change.
- Change style a bit.
- use csc for the variable name of struct mvgbec_softc in mvgbec_attach()
  for consistency.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/marvell/if_mvgbe.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/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.27 src/sys/dev/marvell/if_mvgbe.c:1.28
--- src/sys/dev/marvell/if_mvgbe.c:1.27	Fri Oct 26 21:03:26 2012
+++ src/sys/dev/marvell/if_mvgbe.c	Thu Nov  1 02:46:41 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvgbe.c,v 1.27 2012/10/26 21:03:26 msaitoh Exp $	*/
+/*	$NetBSD: if_mvgbe.c,v 1.28 2012/11/01 02:46:41 msaitoh Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.27 2012/10/26 21:03:26 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.28 2012/11/01 02:46:41 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -92,7 +92,8 @@ CTASSERT(MVGBE_RX_RING_CNT  1  MVGBE_
 	(MVGBE_RX_RING_CNT + 1) % MVGBE_RX_RING_CNT);
 
 #define MVGBE_JSLOTS		384	/*  */
-#define MVGBE_JLEN		((MVGBE_MRU + MVGBE_RXBUF_ALIGN)~MVGBE_RXBUF_MASK)
+#define MVGBE_JLEN \
+((MVGBE_MRU + MVGBE_RXBUF_ALIGN)  ~MVGBE_RXBUF_MASK)
 #define MVGBE_NTXSEG		30
 #define MVGBE_JPAGESZ		PAGE_SIZE
 #define MVGBE_RESID \
@@ -274,8 +275,10 @@ static void mvgbe_filter_setup(struct mv
 #ifdef MVGBE_DEBUG
 static void mvgbe_dump_txdesc(struct mvgbe_tx_desc *, int);
 #endif
-static int mvgbe_ipginttx(struct mvgbec_softc *, struct mvgbe_softc *, unsigned int);
-static int mvgbe_ipgintrx(struct mvgbec_softc *, struct mvgbe_softc *, unsigned int);
+static int mvgbe_ipginttx(struct mvgbec_softc *, struct mvgbe_softc *,
+unsigned int);
+static int mvgbe_ipgintrx(struct mvgbec_softc *, struct mvgbe_softc *,
+unsigned int);
 static void sysctl_mvgbe_init(struct mvgbe_softc *);
 static int mvgbe_sysctl_ipginttx(SYSCTLFN_PROTO);
 static int mvgbe_sysctl_ipgintrx(SYSCTLFN_PROTO);
@@ -358,7 +361,7 @@ mvgbec_match(device_t parent, cfdata_t m
 static void
 mvgbec_attach(device_t parent, device_t self, void *aux)
 {
-	struct mvgbec_softc *sc = device_private(self);
+	struct mvgbec_softc *csc = device_private(self);
 	struct marvell_attach_args *mva = aux, gbea;
 	struct mvgbe_softc *port;
 	struct mii_softc *mii;
@@ -369,10 +372,10 @@ mvgbec_attach(device_t parent, device_t 
 	aprint_naive(\n);
 	aprint_normal(: Marvell Gigabit Ethernet Controller\n);
 
-	sc-sc_dev = self;
-	sc-sc_iot = mva-mva_iot;
+	csc-sc_dev = self;
+	csc-sc_iot = mva-mva_iot;
 	if (bus_space_subregion(mva-mva_iot, mva-mva_ioh, mva-mva_offset,
-	mva-mva_size, sc-sc_ioh)) {
+	mva-mva_size, csc-sc_ioh)) {
 		aprint_error_dev(self, Cannot map registers\n);
 		return;
 	}
@@ -381,15 +384,15 @@ mvgbec_attach(device_t parent, device_t 
 		mvgbec0 = self;
 
 	phyaddr = 0;
-	MVGBE_WRITE(sc, MVGBE_PHYADDR, phyaddr);
+	MVGBE_WRITE(csc, MVGBE_PHYADDR, phyaddr);
 
-	mutex_init(sc-sc_mtx, MUTEX_DEFAULT, IPL_NET);
+	mutex_init(csc-sc_mtx, MUTEX_DEFAULT, IPL_NET);
 
 	/* Disable and clear Gigabit Ethernet Unit interrupts */
-	MVGBE_WRITE(sc, MVGBE_EUIM, 0);
-	MVGBE_WRITE(sc, MVGBE_EUIC, 0);
+	MVGBE_WRITE(csc, MVGBE_EUIM, 0);
+	MVGBE_WRITE(csc, MVGBE_EUIC, 0);
 
-	mvgbec_wininit(sc);
+	mvgbec_wininit(csc);
 
 	memset(gbea, 0, sizeof(gbea));
 	for (i = 0; i  __arraycount(mvgbe_ports); i++) {
@@ -397,17 +400,17 @@ mvgbec_attach(device_t parent, device_t 
 		mvgbe_ports[i].unit != mva-mva_unit)
 			continue;
 
-		sc-sc_flags = mvgbe_ports[i].flags;
+		csc-sc_flags = mvgbe_ports[i].flags;
 
 		for (j = 0; j  mvgbe_ports[i].ports; j++) {
 			gbea.mva_name = mvgbe;
 			gbea.mva_model = mva-mva_model;
-			gbea.mva_iot = sc-sc_iot;
-			gbea.mva_ioh = sc-sc_ioh;
+			gbea.mva_iot = csc-sc_iot;
+			gbea.mva_ioh = csc-sc_ioh;
 			gbea.mva_unit = j;
 			gbea.mva_dmat = mva-mva_dmat;
 			gbea.mva_irq = mvgbe_ports[i].irqs[j];
-			child = config_found_sm_loc(sc-sc_dev, mvgbec, NULL,
+			child = config_found_sm_loc(csc-sc_dev, mvgbec, NULL,
 			gbea, mvgbec_print, mvgbec_search);
 			if (child) {
 port = device_private(child);
@@ -417,7 +420,7 @@ mvgbec_attach(device_t parent, device_t 
 		}
 		break;
 	}
-	MVGBE_WRITE(sc, MVGBE_PHYADDR, phyaddr);
+	MVGBE_WRITE(csc, MVGBE_PHYADDR, phyaddr);
 }
 
 static int

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

2012-10-31 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Nov  1 03:21:49 UTC 2012

Modified Files:
src/usr.sbin/npf/npfctl: Makefile

Log Message:
put in /sbin


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/npf/npfctl/Makefile

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/Makefile
diff -u src/usr.sbin/npf/npfctl/Makefile:1.8 src/usr.sbin/npf/npfctl/Makefile:1.9
--- src/usr.sbin/npf/npfctl/Makefile:1.8	Sun Sep 16 09:47:41 2012
+++ src/usr.sbin/npf/npfctl/Makefile	Wed Oct 31 23:21:49 2012
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2012/09/16 13:47:41 rmind Exp $
+# $NetBSD: Makefile,v 1.9 2012/11/01 03:21:49 christos Exp $
 
+BINDIR=/sbin
 PROG=		npfctl
 MAN=		npfctl.8 npf.conf.5

CVS commit: src/distrib/sets/lists

2012-10-31 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Nov  1 03:26:44 UTC 2012

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi

Log Message:
mv npfctl from /usr/sbin to /sbin so it is available before /usr is mounted.


To generate a diff of this commit:
cvs rdiff -u -r1.1009 -r1.1010 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1784 -r1.1785 src/distrib/sets/lists/comp/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1009 src/distrib/sets/lists/base/mi:1.1010
--- src/distrib/sets/lists/base/mi:1.1009	Tue Sep 18 11:14:40 2012
+++ src/distrib/sets/lists/base/mi	Wed Oct 31 23:26:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1009 2012/09/18 15:14:40 skrll Exp $
+# $NetBSD: mi,v 1.1010 2012/11/01 03:26:42 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -321,6 +321,7 @@
 ./sbin/nfsd	base-obsolete		obsolete
 ./sbin/nfsiod	base-obsolete		obsolete
 ./sbin/nologin	base-sysutil-root
+./sbin/npfctl	base-npf-bin		npf
 ./sbin/pdisk	base-sysutil-root
 ./sbin/pfctl	base-pf-root		pf
 ./sbin/pflogd	base-pf-root		pf
@@ -1356,7 +1357,7 @@
 ./usr/sbin/netgroup_mkdb			base-nis-bin
 ./usr/sbin/nfsd	base-nfsserver-bin
 ./usr/sbin/nfsiodbase-obsolete		obsolete
-./usr/sbin/npfctlbase-npf-bin		npf
+./usr/sbin/npfctlbase-obsolete		obsolete
 ./usr/sbin/npftestbase-npf-bin		npf,rump,pic
 ./usr/sbin/nsec3hashbase-bind-bin
 ./usr/sbin/nslookupbase-obsolete		obsolete

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1784 src/distrib/sets/lists/comp/mi:1.1785
--- src/distrib/sets/lists/comp/mi:1.1784	Sat Oct 27 18:36:11 2012
+++ src/distrib/sets/lists/comp/mi	Wed Oct 31 23:26:43 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1784 2012/10/27 22:36:11 alnsn Exp $
+#	$NetBSD: mi,v 1.1785 2012/11/01 03:26:43 christos Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -3488,6 +3488,7 @@
 ./usr/libdata/debug/sbin/newfs_sysvbfs.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/newfs_udf.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/newfs_v7fs.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/npfctl.debug		comp-npf-debug		npf,debug
 ./usr/libdata/debug/sbin/pdisk.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/pfctl.debug		comp-pf-debug		pf,debug
 ./usr/libdata/debug/sbin/pflogd.debug		comp-pf-debug		pf,debug
@@ -4219,7 +4220,7 @@
 ./usr/libdata/debug/usr/sbin/ndp.debug		comp-netutil-debug	inet6,debug
 ./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug	comp-nis-debug		debug
 ./usr/libdata/debug/usr/sbin/nfsd.debug		comp-nfsserver-debug	debug
-./usr/libdata/debug/usr/sbin/npfctl.debug	comp-npf-debug		npf,debug
+./usr/libdata/debug/usr/sbin/npfctl.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/sbin/npftest.debug	comp-npf-debug		npf,rump,debug,pic
 ./usr/libdata/debug/usr/sbin/nsec3hash.debug	comp-bind-debug		debug
 ./usr/libdata/debug/usr/sbin/ntp-keygen.debug	comp-ntp-debug		crypto,debug

41 matches

Mail list logo