CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Thu Mar 14 07:10:07 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Added Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/lib: Makefile.inc
src/external/bsd/atf/usr.bin: Makefile.inc
Log Message:
Deduce the version number to encode in pkgconfig files by getting it from
bconfig.h. Also make the build of these files depends on bconfig.h itself.
This should fix once and for all the problems of the
atf/atf-{c,c++}/pkg_config_test:version tests breaking because the
pkgconfig files hold an old version number during update builds.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.16 src/external/bsd/atf/lib/libatf-c/Makefile:1.17
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.16 Tue Feb 19 15:35:42 2013
+++ src/external/bsd/atf/lib/libatf-c/Makefile Thu Mar 14 07:10:06 2013
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2013/02/19 15:35:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2013/03/14 07:10:06 jmmv Exp $
NOLINT= # defined
-.include bsd.own.mk
+.include bsd.init.mk
LIB= atf-c
CWARNFLAGS+= -Wno-missing-noreturn
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
.PATH: ${SRCDIR}/atf-c/detail
@@ -88,8 +87,8 @@ FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c.pc: Makefile atf-c.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.18 src/external/bsd/atf/lib/libatf-c++/Makefile:1.19
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.18 Tue Feb 19 15:35:43 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Mar 14 07:10:06 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2013/03/14 07:10:06 jmmv Exp $
NOLINT= # defined
-.include bsd.own.mk
+.include bsd.init.mk
LIB= atf-c++
LIBISCXX= yes
@@ -16,10 +16,10 @@ LIBDPLIBS+= stdc++ ${.CURDIR}/../../
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c++
.PATH: ${SRCDIR}/atf-c++/detail
+.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h
CPPFLAGS+= -I${.CURDIR}/../libatf-c
CPPFLAGS+= -I.
@@ -62,8 +62,8 @@ FILES+= atf-c++.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c++.pc: Makefile atf-c++.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8 Tue Feb 19 15:35:43 2013
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Thu Mar 14 07:10:07 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2013/03/14 07:10:07 jmmv Exp $
-.include bsd.own.mk
+.include bsd.init.mk
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-sh
+.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h.
BINDIR= /usr/bin
PROG_CXX= atf-sh
@@ -28,8 +28,8 @@ FILES+= atf-sh.pc
FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
-atf-sh.pc: Makefile atf-sh.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-sh.pc: Makefile atf-sh.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
${SRCDIR}/atf-sh/atf-sh.pc.in atf-sh.pc
CLEANFILES+= atf-sh.pc
Added files:
Index: src/external/bsd/atf/Makefile.inc
diff -u /dev/null src/external/bsd/atf/Makefile.inc:1.1
--- /dev/null Thu Mar 14 07:10:07 2013
+++ src/external/bsd/atf/Makefile.inc Thu Mar 14 07:10:05 2013
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: joerg Date: Thu Mar 14 10:06:46 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: INTEGRATOR_CP Log Message: Include tmpfs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/INTEGRATOR_CP 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/evbarm/conf/INTEGRATOR_CP diff -u src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.2 src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.3 --- src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.2 Sat Mar 2 02:42:13 2013 +++ src/sys/arch/evbarm/conf/INTEGRATOR_CP Thu Mar 14 10:06:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: INTEGRATOR_CP,v 1.2 2013/03/02 02:42:13 christos Exp $ +# $NetBSD: INTEGRATOR_CP,v 1.3 2013/03/14 10:06:45 joerg Exp $ # # INTEGRATOR_CP -- ARM Integrator CP kernel # @@ -42,6 +42,7 @@ file-system PROCFS # /proc #file-system UMAPFS # NULLFS + uid and gid remapping #file-system UNION # union file system file-system PTYFS # /dev/pts/N support +file-system TMPFS # memory file system # File system options #options QUOTA # legacy UFS quotas
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: nakayama
Date: Thu Mar 14 11:53:34 UTC 2013
Modified Files:
src/sys/lib/libkern: Makefile.libkern
src/sys/lib/libkern/arch/sparc: Makefile.inc
Log Message:
Make sparc64 32-bit kernel buildable.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.34 -r1.35 src/sys/lib/libkern/arch/sparc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.21 src/sys/lib/libkern/Makefile.libkern:1.22
--- src/sys/lib/libkern/Makefile.libkern:1.21 Mon Mar 11 11:44:48 2013
+++ src/sys/lib/libkern/Makefile.libkern Thu Mar 14 11:53:33 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.21 2013/03/11 11:44:48 christos Exp $
+# $NetBSD: Makefile.libkern,v 1.22 2013/03/14 11:53:33 nakayama Exp $
#
# Variable definitions for libkern.
@@ -74,7 +74,7 @@ SRCS+= memmove.c
SRCS+= strchr.c strrchr.c
SRCS+= memcmp.c
-.if (${MACHINE_ARCH} != sparc64) || defined(RUMPTOP)
+.if (${MACHINE} != sparc64) || defined(RUMPTOP)
# provided by memcpyset.s on sparc64, but RUMP does not know about it.
SRCS+= memcpy.c
.if empty(SRCS:Mmemset2.*)
Index: src/sys/lib/libkern/arch/sparc/Makefile.inc
diff -u src/sys/lib/libkern/arch/sparc/Makefile.inc:1.34 src/sys/lib/libkern/arch/sparc/Makefile.inc:1.35
--- src/sys/lib/libkern/arch/sparc/Makefile.inc:1.34 Fri Aug 14 19:23:54 2009
+++ src/sys/lib/libkern/arch/sparc/Makefile.inc Thu Mar 14 11:53:34 2013
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.34 2009/08/14 19:23:54 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.35 2013/03/14 11:53:34 nakayama Exp $
SRCS+= ffs.S
+.if (${MACHINE} != sparc64) || defined(RUMPTOP)
+# provided by memcpyset.s on sparc64 32-bit kernel
SRCS+= memset.S
+.endif
SRCS+= strlen.S
SRCS+= htonl.S htons.S ntohl.S ntohs.S
SRCS+= random.S
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Thu Mar 14 12:47:33 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added Huawei E171 3G modem. To generate a diff of this commit: cvs rdiff -u -r1.637 -r1.638 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.637 src/sys/dev/usb/usbdevs:1.638 --- src/sys/dev/usb/usbdevs:1.637 Sun Jan 27 01:35:28 2013 +++ src/sys/dev/usb/usbdevs Thu Mar 14 12:47:33 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.637 2013/01/27 01:35:28 jakllsch Exp $ +$NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1684,6 +1684,8 @@ product HUAWEI E1750 0x140c Huawei E1 product HUAWEI E1750INIT 0x1446 Huawei E1750 USB CD product HUAWEI K3765 0x1465 Huawei K3765 product HUAWEI E1820 0x14ac Huawei E1820 +product HUAWEI E171INIT 0x14fe Huawei E171 USB CD +product HUAWEI E171 0x1506 Huawei E171 product HUAWEI K3765INIT 0x1520 Huawei K3765 USB CD /* Huawei-3Com products */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nonaka
Date: Thu Mar 14 12:49:33 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.630 -r1.631 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.631 -r1.632 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.630 src/sys/dev/usb/usbdevs.h:1.631
--- src/sys/dev/usb/usbdevs.h:1.630 Sun Jan 27 01:36:33 2013
+++ src/sys/dev/usb/usbdevs.h Thu Mar 14 12:49:33 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.630 2013/01/27 01:36:33 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.631 2013/03/14 12:49:33 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.637 2013/01/27 01:35:28 jakllsch Exp
+ * NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp
*/
/*
@@ -1691,6 +1691,8 @@
#define USB_PRODUCT_HUAWEI_E1750INIT 0x1446 /* Huawei E1750 USB CD */
#define USB_PRODUCT_HUAWEI_K3765 0x1465 /* Huawei K3765 */
#define USB_PRODUCT_HUAWEI_E1820 0x14ac /* Huawei E1820 */
+#define USB_PRODUCT_HUAWEI_E171INIT 0x14fe /* Huawei E171 USB CD */
+#define USB_PRODUCT_HUAWEI_E171 0x1506 /* Huawei E171 */
#define USB_PRODUCT_HUAWEI_K3765INIT 0x1520 /* Huawei K3765 USB CD */
/* Huawei-3Com products */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.631 src/sys/dev/usb/usbdevs_data.h:1.632
--- src/sys/dev/usb/usbdevs_data.h:1.631 Sun Jan 27 01:36:33 2013
+++ src/sys/dev/usb/usbdevs_data.h Thu Mar 14 12:49:33 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.631 2013/01/27 01:36:33 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.632 2013/03/14 12:49:33 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.637 2013/01/27 01:35:28 jakllsch Exp
+ * NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp
*/
/*
@@ -5279,6 +5279,14 @@ const struct usb_product usb_products[]
Huawei E1820,
},
{
+ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E171INIT,
+ Huawei E171 USB CD,
+ },
+ {
+ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E171,
+ Huawei E171,
+ },
+ {
USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765INIT,
Huawei K3765 USB CD,
},
@@ -9863,4 +9871,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1936;
+const int usb_nproducts = 1938;
CVS commit: src
Module Name:src
Committed By: nonaka
Date: Thu Mar 14 13:08:56 UTC 2013
Modified Files:
src/share/man/man4: u3g.4
src/sys/dev/usb: u3g.c
Log Message:
Add support for the Huawei E171 3G Modem.
Tested by Saifi Khan at
http://mail-index.netbsd.org/netbsd-users/2013/03/14/msg012629.html
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/u3g.4
cvs rdiff -u -r1.27 -r1.28 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/share/man/man4/u3g.4
diff -u src/share/man/man4/u3g.4:1.5 src/share/man/man4/u3g.4:1.6
--- src/share/man/man4/u3g.4:1.5 Sat Aug 4 19:48:24 2012
+++ src/share/man/man4/u3g.4 Thu Mar 14 13:08:56 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: u3g.4,v 1.5 2012/08/04 19:48:24 wiz Exp $
+.\ $NetBSD: u3g.4,v 1.6 2013/03/14 13:08:56 nonaka Exp $
.\
.\ Copyright (c) 2008 AnyWi Technologies
.\ All rights reserved.
@@ -17,7 +17,7 @@
.\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\
-.Dd August 4, 2012
+.Dd March 14, 2013
.Dt U3G 4
.Os
.Sh NAME
@@ -56,6 +56,8 @@ driver supports the following adapters:
.Pp
.Bl -bullet -compact
.It
+Huawei E171
+.It
Huawei E220 (E270?)
.It
Huawei Mobile
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.27 src/sys/dev/usb/u3g.c:1.28
--- src/sys/dev/usb/u3g.c:1.27 Thu Nov 1 00:38:43 2012
+++ src/sys/dev/usb/u3g.c Thu Mar 14 13:08:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.27 2012/11/01 00:38:43 christos Exp $ */
+/* $NetBSD: u3g.c,v 1.28 2013/03/14 13:08:56 nonaka Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.27 2012/11/01 00:38:43 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.28 2013/03/14 13:08:56 nonaka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -191,6 +191,7 @@ static const struct usb_devno u3g_devs[]
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_EM770W },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
+ { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E171 },
/* OEM: Merlin */
{ USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620 },
/* OEM: Novatel */
@@ -427,6 +428,25 @@ u3g_huawei_k3765_reinit(usbd_device_hand
}
static int
+u3g_huawei_e171_reinit(usbd_device_handle dev)
+{
+ unsigned char cmd[31];
+
+ /* magic string adapted from some webpage */
+ memset(cmd, 0, sizeof(cmd));
+ cmd[0] = 0x55;
+ cmd[1] = 0x53;
+ cmd[2] = 0x42;
+ cmd[3] = 0x43;
+ cmd[15]= 0x11;
+ cmd[16]= 0x06;
+ cmd[17]= 0x20;
+ cmd[20]= 0x01;
+
+ return send_bulkmsg(dev, cmd, sizeof(cmd));
+}
+
+static int
u3g_sierra_reinit(usbd_device_handle dev)
{
/* Some Sierra devices presents themselves as a umass device with
@@ -484,6 +504,9 @@ u3ginit_match(device_t parent, cfdata_t
case USB_PRODUCT_HUAWEI_K3765INIT:
return u3g_huawei_k3765_reinit(uaa-device);
break;
+ case USB_PRODUCT_HUAWEI_E171INIT:
+ return u3g_huawei_e171_reinit(uaa-device);
+ break;
default:
return u3g_huawei_reinit(uaa-device);
break;
CVS commit: [netbsd-6] src/lib/libterminfo
Module Name:src
Committed By: riz
Date: Thu Mar 14 15:40:58 UTC 2013
Modified Files:
src/lib/libterminfo [netbsd-6]: tparm.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #834):
lib/libterminfo/tparm.c: revision 1.10
Fix %t logic and don't output any %; or %e parts.
Fixes PR lib/47490 thanks to Julien Oster
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/lib/libterminfo/tparm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.7.4.1 src/lib/libterminfo/tparm.c:1.7.4.2
--- src/lib/libterminfo/tparm.c:1.7.4.1 Tue Dec 11 04:26:26 2012
+++ src/lib/libterminfo/tparm.c Thu Mar 14 15:40:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $ */
+/* $NetBSD: tparm.c,v 1.7.4.2 2013/03/14 15:40:58 riz Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $);
+__RCSID($NetBSD: tparm.c,v 1.7.4.2 2013/03/14 15:40:58 riz Exp $);
#include assert.h
#include ctype.h
@@ -453,7 +453,7 @@ _ti_tiparm(TERMINAL *term, const char *s
break;
case 't': /* then */
pop(val, NULL, stack);
- if (val != 0) {
+ if (val == 0) {
l = 0;
for (; *str != '\0'; str++) {
if (*str != '%')
@@ -464,10 +464,14 @@ _ti_tiparm(TERMINAL *term, const char *s
else if (*str == ';') {
if (l 0)
l--;
- else
+ else {
+ str++;
break;
- } else if (*str == 'e' l == 0)
+ }
+ } else if (*str == 'e' l == 0) {
+ str++;
break;
+ }
}
}
break;
@@ -482,8 +486,10 @@ _ti_tiparm(TERMINAL *term, const char *s
else if (*str == ';') {
if (l 0)
l--;
- else
+ else {
+ str++;
break;
+ }
}
}
break;
CVS commit: [netbsd-6] src/external/historical/nawk/dist
Module Name:src Committed By: riz Date: Thu Mar 14 15:54:58 UTC 2013 Modified Files: src/external/historical/nawk/dist [netbsd-6]: tran.c Log Message: Pull up following revision(s) (requested by cheusov in ticket #836): external/historical/nawk/dist/tran.c: revision 1.8 PR/47553: Aleksev Cheusov: awk segfault: NULL dereference. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.6.1 src/external/historical/nawk/dist/tran.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/historical/nawk/dist/tran.c diff -u src/external/historical/nawk/dist/tran.c:1.5 src/external/historical/nawk/dist/tran.c:1.5.6.1 --- src/external/historical/nawk/dist/tran.c:1.5 Sat May 28 15:13:04 2011 +++ src/external/historical/nawk/dist/tran.c Thu Mar 14 15:54:58 2013 @@ -344,7 +344,7 @@ char *setsval(Cell *vp, const char *s) / donefld = 0; /* mark $1... invalid */ donerec = 1; } - t = tostring(s); /* in case it's self-assign */ + t = s ? tostring(s) : tostring(); /* in case it's self-assign */ if (freeable(vp)) xfree(vp-sval); vp-tval = ~NUM;
CVS commit: [netbsd-6-0] src/external/historical/nawk/dist
Module Name:src Committed By: riz Date: Thu Mar 14 15:55:11 UTC 2013 Modified Files: src/external/historical/nawk/dist [netbsd-6-0]: tran.c Log Message: Pull up following revision(s) (requested by cheusov in ticket #836): external/historical/nawk/dist/tran.c: revision 1.8 PR/47553: Aleksev Cheusov: awk segfault: NULL dereference. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.12.1 src/external/historical/nawk/dist/tran.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/historical/nawk/dist/tran.c diff -u src/external/historical/nawk/dist/tran.c:1.5 src/external/historical/nawk/dist/tran.c:1.5.12.1 --- src/external/historical/nawk/dist/tran.c:1.5 Sat May 28 15:13:04 2011 +++ src/external/historical/nawk/dist/tran.c Thu Mar 14 15:55:10 2013 @@ -344,7 +344,7 @@ char *setsval(Cell *vp, const char *s) / donefld = 0; /* mark $1... invalid */ donerec = 1; } - t = tostring(s); /* in case it's self-assign */ + t = s ? tostring(s) : tostring(); /* in case it's self-assign */ if (freeable(vp)) xfree(vp-sval); vp-tval = ~NUM;
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 15:55:31 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Ticket 836. To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.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-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.19 src/doc/CHANGES-6.0.2:1.1.2.20 --- src/doc/CHANGES-6.0.2:1.1.2.19 Mon Feb 11 20:43:01 2013 +++ src/doc/CHANGES-6.0.2 Thu Mar 14 15:55:30 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.19 2013/02/11 20:43:01 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.20 2013/03/14 15:55:30 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -123,3 +123,8 @@ sys/kern/subr_pserialize.c 1.7 Avoid possible race with softint handler. [rmind, ticket #811] +external/historical/nawk/dist/tran.c 1.8 + + Fix awk segfault due to NULL dereference. PR#47553. + [cheusov, ticket #836] +
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Thu Mar 14 16:33:10 UTC 2013
Modified Files:
src/sys/compat/common [netbsd-6]: compat_mod.c compat_util.h
kern_time_50.c vfs_syscalls_43.c
src/sys/kern [netbsd-6]: init_main.c init_sysctl.c
Added Files:
src/sys/compat/common [netbsd-6]: compat_mod.h
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #837):
sys/compat/common/kern_time_50.c: revision 1.25
sys/kern/init_sysctl.c: revision 1.195
sys/kern/init_main.c: revision 1.447
sys/compat/common/compat_util.h: revision 1.23
sys/compat/common/compat_mod.h: revision 1.1
sys/compat/common/compat_mod.c: revision 1.16
sys/compat/common/compat_mod.c: revision 1.17
sys/compat/common/compat_mod.c: revision 1.18
sys/compat/common/vfs_syscalls_43.c: revision 1.55
Move boottime50 and its associated sysctl into the compat module. As
noted on tech-kern. Should fix PR/47579.
OK christos@
Will request pull-up to 6.0 in a few days.
Wrap sysctl_teardown(compat_clog) with the appropriate #if defined()s
remove empty #if
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r0 -r1.1.6.2 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.22 -r1.22.18.1 src/sys/compat/common/compat_util.h
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/compat/common/kern_time_50.c
cvs rdiff -u -r1.54 -r1.54.14.1 src/sys/compat/common/vfs_syscalls_43.c
cvs rdiff -u -r1.441.2.2 -r1.441.2.3 src/sys/kern/init_main.c
cvs rdiff -u -r1.186 -r1.186.2.1 src/sys/kern/init_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/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.14 src/sys/compat/common/compat_mod.c:1.14.8.1
--- src/sys/compat/common/compat_mod.c:1.14 Mon Aug 8 23:44:06 2011
+++ src/sys/compat/common/compat_mod.c Thu Mar 14 16:33:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $ */
+/* $NetBSD: compat_mod.c,v 1.14.8.1 2013/03/14 16:33:09 riz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.14.8.1 2013/03/14 16:33:09 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -52,12 +52,18 @@ __KERNEL_RCSID(0, $NetBSD: compat_mod.c
#include sys/syscall.h
#include sys/syscallargs.h
#include sys/syscallvar.h
+#include sys/sysctl.h
#include uvm/uvm_extern.h
#include uvm/uvm_object.h
#include compat/common/compat_util.h
+#include compat/common/compat_mod.h
+#if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50)
+static struct sysctllog *compat_clog = NULL;
+#endif
+
MODULE(MODULE_CLASS_MISC, compat, NULL);
int ttcompat(struct tty *, u_long, void *, int, struct lwp *);
@@ -269,9 +275,7 @@ compat_modcmd(modcmd_t cmd, void *arg)
sendsig_sigcontext_vec = sendsig_sigcontext;
#endif
#endif
-#if defined(COMPAT_09) || defined(COMPAT_43)
compat_sysctl_init();
-#endif
return 0;
case MODULE_CMD_FINI:
@@ -328,12 +332,31 @@ compat_modcmd(modcmd_t cmd, void *arg)
rw_exit(exec_lock);
#endif
#endif /* COMPAT_16 */
-#if defined(COMPAT_09) || defined(COMPAT_43)
compat_sysctl_fini();
-#endif
return 0;
default:
return ENOTTY;
}
}
+
+void
+compat_sysctl_init(void)
+{
+
+#if defined(COMPAT_09) || defined(COMPAT_43)
+ compat_sysctl_vfs(compat_clog);
+#endif
+#if defined(COMPAT_50)
+ compat_sysctl_time(compat_clog);
+#endif
+}
+
+void
+compat_sysctl_fini(void)
+{
+
+#if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50)
+sysctl_teardown(compat_clog);
+#endif
+}
Index: src/sys/compat/common/compat_util.h
diff -u src/sys/compat/common/compat_util.h:1.22 src/sys/compat/common/compat_util.h:1.22.18.1
--- src/sys/compat/common/compat_util.h:1.22 Mon Dec 14 04:09:38 2009
+++ src/sys/compat/common/compat_util.h Thu Mar 14 16:33:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_util.h,v 1.22 2009/12/14 04:09:38 mrg Exp $ */
+/* $NetBSD: compat_util.h,v 1.22.18.1 2013/03/14 16:33:09 riz Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -82,7 +82,4 @@ void compat_offseterr(struct vnode *, co
int compat_elf_check_interp(struct exec_package *, char *, const char *);
-void compat_sysctl_init(void);
-void compat_sysctl_fini(void);
-
#endif /* !_COMPAT_UTIL_H_ */
Index: src/sys/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.22 src/sys/compat/common/kern_time_50.c:1.22.2.1
--- src/sys/compat/common/kern_time_50.c:1.22 Wed Jan 4 14:31:17 2012
+++ src/sys/compat/common/kern_time_50.c Thu Mar 14 16:33:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.22 2012/01/04 14:31:17 apb Exp $ */
+/*
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 16:33:58 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 834-837. To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 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.106 src/doc/CHANGES-6.1:1.1.2.107 --- src/doc/CHANGES-6.1:1.1.2.106 Tue Feb 19 04:53:08 2013 +++ src/doc/CHANGES-6.1 Thu Mar 14 16:33:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.106 2013/02/19 04:53:08 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.107 2013/03/14 16:33:57 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8579,3 +8579,39 @@ sys/sys/param.h patched by hand Welcome to 6.1_RC1! [riz] + +lib/libterminfo/tparm.c1.10 + + Fix conditionals in terminal descriptions. PR#47490. + [roy, ticket #834] + +lib/libterminfo/Makefile.hash 1.7 +lib/libterminfo/genman1.5 +lib/libterminfo/term.h1.13-1.14 +lib/libterminfo/term_private.h 1.11 +lib/libterminfo/terminfo.3 1.9-1.10 +lib/libterminfo/terminfo.5.in 1.18 +lib/libterminfo/tparm.c1.11-1.14 +usr.bin/tput/Makefile1.11 +usr.bin/tput/tput.c1.23-1.26 + + Various libterminfo/tput fixes. PR#46793, PR#47090, PR#47532. + [roy, ticket #835] + +external/historical/nawk/dist/tran.c 1.8 + + Fix awk segfault due to NULL dereference. PR#47553. + [cheusov, ticket #836] + +sys/compat/common/compat_mod.c 1.16-1.18 via patch +sys/compat/common/compat_mod.h 1.1 +sys/compat/common/compat_util.h 1.23 via patch +sys/compat/common/kern_time_50.c 1.25 via patch +sys/compat/common/vfs_syscalls_43.c 1.55 via patch +sys/kern/init_main.c1.447 via patch +sys/kern/init_sysctl.c1.195 via patch + + Move boottime50 and its associated sysctl into the compat module. + PR#47579. + [pgoyette, ticket #837] +
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Mar 14 18:49:20 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Sync with *BSD. No functional change:
- make bge_chipid() and use it.
- use switch() instead of a lot of if()s.
- sort lines.
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.214 src/sys/dev/pci/if_bge.c:1.215
--- src/sys/dev/pci/if_bge.c:1.214 Wed Mar 13 09:44:20 2013
+++ src/sys/dev/pci/if_bge.c Thu Mar 14 18:49:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.214 2013/03/13 09:44:20 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.215 2013/03/14 18:49:20 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.214 2013/03/13 09:44:20 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.215 2013/03/14 18:49:20 msaitoh Exp $);
#include vlan.h
@@ -184,6 +184,7 @@ static int bge_rxthresh_nodenum;
typedef int (*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
+static uint32_t bge_chipid(const struct pci_attach_args *pa);
static int bge_probe(device_t, cfdata_t, void *);
static void bge_attach(device_t, device_t, void *);
static void bge_release_resources(struct bge_softc *);
@@ -647,14 +648,14 @@ static const struct bge_product {
NULL },
};
+#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)-bge_flags BGE_JUMBO_CAPABLE)
#define BGE_IS_5700_FAMILY(sc) ((sc)-bge_flags BGE_5700_FAMILY)
+#define BGE_IS_5705_PLUS(sc) ((sc)-bge_flags BGE_5705_PLUS)
#define BGE_IS_5714_FAMILY(sc) ((sc)-bge_flags BGE_5714_FAMILY)
-#define BGE_IS_5705_PLUS(sc) ((sc)-bge_flags BGE_5705_PLUS)
-#define BGE_IS_575X_PLUS(sc) ((sc)-bge_flags BGE_575X_PLUS)
-#define BGE_IS_5755_PLUS(sc) ((sc)-bge_flags BGE_5755_PLUS)
+#define BGE_IS_575X_PLUS(sc) ((sc)-bge_flags BGE_575X_PLUS)
+#define BGE_IS_5755_PLUS(sc) ((sc)-bge_flags BGE_5755_PLUS)
#define BGE_IS_5717_PLUS(sc) ((sc)-bge_flags BGE_5717_PLUS)
#define BGE_IS_57765_PLUS(sc) ((sc)-bge_flags BGE_57765_PLUS)
-#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)-bge_flags BGE_JUMBO_CAPABLE)
static const struct bge_revision {
uint32_t br_chipid;
@@ -2610,6 +2611,42 @@ bge_setpowerstate(struct bge_softc *sc,
return EOPNOTSUPP;
}
+static uint32_t
+bge_chipid(const struct pci_attach_args *pa)
+{
+ uint32_t id;
+
+ id = pci_conf_read(pa-pa_pc, pa-pa_tag, BGE_PCI_MISC_CTL)
+ BGE_PCIMISCCTL_ASICREV_SHIFT;
+
+ if (BGE_ASICREV(id) == BGE_ASICREV_USE_PRODID_REG) {
+ switch (PCI_PRODUCT(pa-pa_id)) {
+ case PCI_PRODUCT_BROADCOM_BCM5717:
+ case PCI_PRODUCT_BROADCOM_BCM5718:
+ case PCI_PRODUCT_BROADCOM_BCM5724: /* ??? */
+ id = pci_conf_read(pa-pa_pc, pa-pa_tag,
+ BGE_PCI_GEN2_PRODID_ASICREV);
+ break;
+ case PCI_PRODUCT_BROADCOM_BCM57761:
+ case PCI_PRODUCT_BROADCOM_BCM57762:
+ case PCI_PRODUCT_BROADCOM_BCM57765:
+ case PCI_PRODUCT_BROADCOM_BCM57766:
+ case PCI_PRODUCT_BROADCOM_BCM57781:
+ case PCI_PRODUCT_BROADCOM_BCM57785:
+ case PCI_PRODUCT_BROADCOM_BCM57791:
+ case PCI_PRODUCT_BROADCOM_BCM57795:
+ id = pci_conf_read(pa-pa_pc, pa-pa_tag,
+ BGE_PCI_GEN15_PRODID_ASICREV);
+ break;
+ default:
+ id = pci_conf_read(pa-pa_pc, pa-pa_tag,
+ BGE_PCI_PRODID_ASICREV);
+ break;
+ }
+ }
+
+ return id;
+}
/*
* Probe for a Broadcom chip. Check the PCI vendor and device IDs
@@ -2730,37 +2767,8 @@ bge_attach(device_t parent, device_t sel
pci_conf_write(pc, sc-sc_pcitag, BGE_PCI_PWRMGMT_CMD, pm_ctl);
DELAY(1000); /* 27 usec is allegedly sufficent */
- /*
- * Save ASIC rev.
- */
- sc-bge_chipid =
- pci_conf_read(pa-pa_pc, pa-pa_tag, BGE_PCI_MISC_CTL)
- BGE_PCIMISCCTL_ASICREV_SHIFT;
-
- if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_USE_PRODID_REG) {
- switch (PCI_PRODUCT(pa-pa_id)) {
- case PCI_PRODUCT_BROADCOM_BCM5717:
- case PCI_PRODUCT_BROADCOM_BCM5718:
- case PCI_PRODUCT_BROADCOM_BCM5724: /* ??? */
- sc-bge_chipid = pci_conf_read(pc, pa-pa_tag,
- BGE_PCI_GEN2_PRODID_ASICREV);
- break;
- case PCI_PRODUCT_BROADCOM_BCM57761:
- case PCI_PRODUCT_BROADCOM_BCM57762:
- case PCI_PRODUCT_BROADCOM_BCM57765:
- case PCI_PRODUCT_BROADCOM_BCM57781:
- case PCI_PRODUCT_BROADCOM_BCM57785:
- case PCI_PRODUCT_BROADCOM_BCM57791:
- case PCI_PRODUCT_BROADCOM_BCM57795:
- sc-bge_chipid = pci_conf_read(pc, pa-pa_tag,
- BGE_PCI_GEN15_PRODID_ASICREV);
- break;
- default:
- sc-bge_chipid = pci_conf_read(pc, pa-pa_tag,
- BGE_PCI_PRODID_ASICREV);
- break;
- }
- }
+ /* Save various chip information. */
+ sc-bge_chipid = bge_chipid(pa);
if ((pci_get_capability(sc-sc_pc, sc-sc_pcitag, PCI_CAP_PCIEXPRESS,
sc-bge_pciecap, NULL) != 0)
@@ -2778,48 +2786,45 @@ bge_attach(device_t parent, device_t sel
unable to find PCIX
CVS commit: [netbsd-6] src/lib/libterminfo
Module Name:src
Committed By: riz
Date: Thu Mar 14 19:07:31 UTC 2013
Modified Files:
src/lib/libterminfo [netbsd-6]: tparm.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #835):
lib/libterminfo/tparm.c: revision 1.8
Ensure that we request a buffer big enough, although with the current
terminfo specification this should never happen.
Correctly return NULL when realloc(3) fails.
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.3 -r1.7.4.4 src/lib/libterminfo/tparm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.7.4.3 src/lib/libterminfo/tparm.c:1.7.4.4
--- src/lib/libterminfo/tparm.c:1.7.4.3 Thu Mar 14 15:48:29 2013
+++ src/lib/libterminfo/tparm.c Thu Mar 14 19:07:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.7.4.3 2013/03/14 15:48:29 riz Exp $ */
+/* $NetBSD: tparm.c,v 1.7.4.4 2013/03/14 19:07:30 riz Exp $ */
/*
* Copyright (c) 2009, 2011, 2013 The NetBSD Foundation, Inc.
@@ -28,7 +28,8 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.7.4.3 2013/03/14 15:48:29 riz Exp $);
+__RCSID($NetBSD: tparm.c,v 1.7.4.4 2013/03/14 19:07:30 riz Exp $);
+#include sys/param.h
#include assert.h
#include ctype.h
@@ -98,10 +99,10 @@ checkbuf(TERMINAL *term, size_t len)
char *buf;
if (term-_bufpos + len = term-_buflen) {
- len = term-_buflen + BUFSIZ;
+ len = term-_buflen + MAX(len, BUFSIZ);
buf = realloc(term-_buf, len);
if (buf == NULL)
- return 0;
+ return NULL;
term-_buf = buf;
term-_buflen = len;
}
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 19:08:11 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Adjust ticket 835 to fix the build. To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 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.107 src/doc/CHANGES-6.1:1.1.2.108 --- src/doc/CHANGES-6.1:1.1.2.107 Thu Mar 14 16:33:57 2013 +++ src/doc/CHANGES-6.1 Thu Mar 14 19:08:11 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.107 2013/03/14 16:33:57 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.108 2013/03/14 19:08:11 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8591,7 +8591,7 @@ lib/libterminfo/term.h1.13-1.14 lib/libterminfo/term_private.h 1.11 lib/libterminfo/terminfo.3 1.9-1.10 lib/libterminfo/terminfo.5.in 1.18 -lib/libterminfo/tparm.c1.11-1.14 +lib/libterminfo/tparm.c1.8,1.11-1.14 usr.bin/tput/Makefile1.11 usr.bin/tput/tput.c1.23-1.26
CVS commit: src/sys/kern
Module Name:src
Committed By: gdt
Date: Thu Mar 14 19:13:17 UTC 2013
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
Add comment questioning lock asymmetry.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/kern/uipc_socket.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/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.213 src/sys/kern/uipc_socket.c:1.214
--- src/sys/kern/uipc_socket.c:1.213 Thu Feb 14 21:57:58 2013
+++ src/sys/kern/uipc_socket.c Thu Mar 14 19:13:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.213 2013/02/14 21:57:58 christos Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.214 2013/03/14 19:13:17 gdt Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.213 2013/02/14 21:57:58 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.214 2013/03/14 19:13:17 gdt Exp $);
#include opt_compat_netbsd.h
#include opt_sock_counters.h
@@ -538,6 +538,7 @@ socreate(int dom, struct socket **aso, i
lock = lockso-so_lock;
so-so_lock = lock;
mutex_obj_hold(lock);
+ /* XXX Why is this not solock, to match sounlock? */
mutex_enter(lock);
} else {
/* Lock assigned and taken during PRU_ATTACH. */
CVS commit: src/lib/libm/complex
Module Name:src Committed By: njoly Date: Thu Mar 14 19:15:34 UTC 2013 Modified Files: src/lib/libm/complex: cacosh.3 Log Message: Remove unknown .LP macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libm/complex/cacosh.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/complex/cacosh.3 diff -u src/lib/libm/complex/cacosh.3:1.3 src/lib/libm/complex/cacosh.3:1.4 --- src/lib/libm/complex/cacosh.3:1.3 Tue Jan 29 02:05:09 2013 +++ src/lib/libm/complex/cacosh.3 Thu Mar 14 19:15:34 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: cacosh.3,v 1.3 2013/01/29 02:05:09 matt Exp $ +.\ $NetBSD: cacosh.3,v 1.4 2013/03/14 19:15:34 njoly Exp $ .\ Copyright (c) 2001-2003 The Open Group, All Rights Reserved .Dd January 29, 2013 .Dt CACOSH 3 @@ -26,7 +26,6 @@ in the range of a half-strip of non-nega the real axis and in the interval [\-i pi,\ +i pi] along the imaginary axis. .Sh ERRORS -.LP No errors are defined. .Sh SEE ALSO .Xr ccosh 3 ,
CVS commit: src/share/man
Module Name:src Committed By: njoly Date: Thu Mar 14 19:16:52 UTC 2013 Modified Files: src/share/man/man4/man4.amiga: em4k.4 empb.4 src/share/man/man7: hier.7 Log Message: Fix dates. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.amiga/em4k.4 cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.amiga/empb.4 cvs rdiff -u -r1.102 -r1.103 src/share/man/man7/hier.7 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/em4k.4 diff -u src/share/man/man4/man4.amiga/em4k.4:1.2 src/share/man/man4/man4.amiga/em4k.4:1.3 --- src/share/man/man4/man4.amiga/em4k.4:1.2 Tue Jan 29 22:01:28 2013 +++ src/share/man/man4/man4.amiga/em4k.4 Thu Mar 14 19:16:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: em4k.4,v 1.2 2013/01/29 22:01:28 wiz Exp $ +.\ $NetBSD: em4k.4,v 1.3 2013/03/14 19:16:52 njoly Exp $ .\ .\ Copyright (c) 2013 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd 29 January, 2013 +.Dd January 29, 2013 .Dt EM4K 4 amiga .Os .Sh NAME Index: src/share/man/man4/man4.amiga/empb.4 diff -u src/share/man/man4/man4.amiga/empb.4:1.9 src/share/man/man4/man4.amiga/empb.4:1.10 --- src/share/man/man4/man4.amiga/empb.4:1.9 Tue Jan 29 21:31:19 2013 +++ src/share/man/man4/man4.amiga/empb.4 Thu Mar 14 19:16:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: empb.4,v 1.9 2013/01/29 21:31:19 rkujawa Exp $ +.\ $NetBSD: empb.4,v 1.10 2013/03/14 19:16:52 njoly Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd 29 Jaunary, 2012 +.Dd January 29, 2012 .Dt EMPB 4 amiga .Os .Sh NAME Index: src/share/man/man7/hier.7 diff -u src/share/man/man7/hier.7:1.102 src/share/man/man7/hier.7:1.103 --- src/share/man/man7/hier.7:1.102 Fri Mar 1 18:25:27 2013 +++ src/share/man/man7/hier.7 Thu Mar 14 19:16:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: hier.7,v 1.102 2013/03/01 18:25:27 joerg Exp $ +.\ $NetBSD: hier.7,v 1.103 2013/03/14 19:16:52 njoly Exp $ .\ .\ Copyright (c) 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)hier.7 8.5 (Berkeley) 6/1/94 .\ -.Dd Feburary 5, 2013 +.Dd February 5, 2013 .Dt HIER 7 .Os .Sh NAME
CVS commit: src/usr.bin/vis
Module Name:src Committed By: njoly Date: Thu Mar 14 19:17:23 UTC 2013 Modified Files: src/usr.bin/vis: vis.1 Log Message: Add missing .El macro. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/vis/vis.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/vis/vis.1 diff -u src/usr.bin/vis/vis.1:1.18 src/usr.bin/vis/vis.1:1.19 --- src/usr.bin/vis/vis.1:1.18 Wed Feb 27 20:12:44 2013 +++ src/usr.bin/vis/vis.1 Thu Mar 14 19:17:23 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: vis.1,v 1.18 2013/02/27 20:12:44 christos Exp $ +.\ $NetBSD: vis.1,v 1.19 2013/03/14 19:17:23 njoly Exp $ .\ .\ Copyright (c) 1989, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -154,6 +154,7 @@ instead. .It Ev LC_CTYPE Specify the locale of the input data. Set to C if the input data locale is unknown. +.El .Sh SEE ALSO .Xr unvis 1 , .Xr svis 3 ,
CVS commit: src/share/man/man4/man4.evbarm
Module Name:src Committed By: njoly Date: Thu Mar 14 19:17:59 UTC 2013 Modified Files: src/share/man/man4/man4.evbarm: cpsw.4 Log Message: Kill extra .Sh. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.evbarm/cpsw.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.evbarm/cpsw.4 diff -u src/share/man/man4/man4.evbarm/cpsw.4:1.2 src/share/man/man4/man4.evbarm/cpsw.4:1.3 --- src/share/man/man4/man4.evbarm/cpsw.4:1.2 Sun Jan 6 21:25:54 2013 +++ src/share/man/man4/man4.evbarm/cpsw.4 Thu Mar 14 19:17:58 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: cpsw.4,v 1.2 2013/01/06 21:25:54 wiz Exp $ +.\ $NetBSD: cpsw.4,v 1.3 2013/03/14 19:17:58 njoly Exp $ .\ .\ Copyright (c) 2013 Jonathan A. Kollasch .\ All rights reserved @@ -40,7 +40,6 @@ See The .Nm driver supports the TI AM335x 3-port Ethernet Switch subsystem. -.Sh .Sh SEE ALSO .Xr mii 4 .Sh HISTORY
CVS commit: src/share/man/man4/man4.sparc64
Module Name:src Committed By: njoly Date: Thu Mar 14 19:18:32 UTC 2013 Modified Files: src/share/man/man4/man4.sparc64: tda.4 Log Message: Add missing Ta macro. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.sparc64/tda.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.sparc64/tda.4 diff -u src/share/man/man4/man4.sparc64/tda.4:1.2 src/share/man/man4/man4.sparc64/tda.4:1.3 --- src/share/man/man4/man4.sparc64/tda.4:1.2 Sun Feb 3 08:22:21 2013 +++ src/share/man/man4/man4.sparc64/tda.4 Thu Mar 14 19:18:32 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: tda.4,v 1.2 2013/02/03 08:22:21 jdc Exp $ +.\ $NetBSD: tda.4,v 1.3 2013/03/14 19:18:32 njoly Exp $ .\ .\ Copyright (c) 2013 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ The speed-related values are made availa interface. The range of the values are: .Bl -column -offset indent .Sy System temperature .Sy Minimum .Sy Maximum -.It Sy Ta Sy Minimum Sy Maximum +.It Sy Ta Sy Minimum Ta Sy Maximum .It Li CPU temperature Ta =57 Ta =67 .It Li System temperature Ta =20 Ta =30 .It Li Speed value Ta 12 Ta 63
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src Committed By: riz Date: Thu Mar 14 19:26:42 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6]: southamerica Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.46.4.5 -r1.1.1.46.4.6 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/share/zoneinfo/southamerica diff -u src/share/zoneinfo/southamerica:1.1.1.46.4.5 src/share/zoneinfo/southamerica:1.1.1.46.4.6 --- src/share/zoneinfo/southamerica:1.1.1.46.4.5 Tue Nov 20 23:16:37 2012 +++ src/share/zoneinfo/southamerica Thu Mar 14 19:26:42 2013 @@ -1560,6 +1560,15 @@ Rule Para 2005 2009 - Mar Sun=8 0:00 0 # ... Rule Para 2010 max - Oct Sun=1 0:00 1:00 S Rule Para 2010 max - Apr Sun=8 0:00 0 - +# +# From Steffen Thorsen (2013-03-07): +# Paraguay will end DST on 2013-03-24 00:00 +# They do not tell if this will be a permanent change or just this year +# http://www.ande.gov.py/interna.php?id=1075 +# +# From Paul Eggert (2013-03-07): +# For now, assume it's just this year. +Rule Para 2013 only - Mar 24 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Asuncion -3:50:40 - LMT 1890
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: riz Date: Thu Mar 14 19:47:56 UTC 2013 Modified Files: src/distrib/sets/lists/base [netbsd-6-0]: mi src/doc [netbsd-6-0]: 3RDPARTY src/share/zoneinfo [netbsd-6-0]: africa northamerica southamerica Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.984.2.10 -r1.984.2.10.2.1 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.909.2.14.2.3 -r1.909.2.14.2.4 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.1.4.1 -r1.1.1.30.4.1.4.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.49.4.4.4.1 -r1.1.1.49.4.4.4.2 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.3.4.2 -r1.1.1.46.4.3.4.3 \ 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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.984.2.10 src/distrib/sets/lists/base/mi:1.984.2.10.2.1 --- src/distrib/sets/lists/base/mi:1.984.2.10 Mon Oct 1 20:15:34 2012 +++ src/distrib/sets/lists/base/mi Thu Mar 14 19:47:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.984.2.10 2012/10/01 20:15:34 riz Exp $ +# $NetBSD: mi,v 1.984.2.10.2.1 2013/03/14 19:47:54 riz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4547,6 +4547,7 @@ ./usr/share/zoneinfo/Asia/Kashgar base-sys-share share ./usr/share/zoneinfo/Asia/Kathmandu base-sys-share share ./usr/share/zoneinfo/Asia/Katmandu base-sys-share share +./usr/share/zoneinfo/Asia/Khandyga base-sys-share share ./usr/share/zoneinfo/Asia/Kolkata base-sys-share share ./usr/share/zoneinfo/Asia/Krasnoyarsk base-sys-share share ./usr/share/zoneinfo/Asia/Kuala_Lumpur base-sys-share share @@ -4592,6 +4593,7 @@ ./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share ./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share ./usr/share/zoneinfo/Asia/Urumqi base-sys-share share +./usr/share/zoneinfo/Asia/Ust-Nera base-sys-share share ./usr/share/zoneinfo/Asia/Vientiane base-sys-share share ./usr/share/zoneinfo/Asia/Vladivostok base-sys-share share ./usr/share/zoneinfo/Asia/Yakutsk base-sys-share share @@ -4707,6 +4709,7 @@ ./usr/share/zoneinfo/Europe/Brussels base-sys-share share ./usr/share/zoneinfo/Europe/Bucharest base-sys-share share ./usr/share/zoneinfo/Europe/Budapest base-sys-share share +./usr/share/zoneinfo/Europe/Busingen base-sys-share share ./usr/share/zoneinfo/Europe/Chisinau base-sys-share share ./usr/share/zoneinfo/Europe/Copenhagen base-sys-share share ./usr/share/zoneinfo/Europe/Dublin base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.14.2.3 src/doc/3RDPARTY:1.909.2.14.2.4 --- src/doc/3RDPARTY:1.909.2.14.2.3 Tue Nov 20 23:29:34 2012 +++ src/doc/3RDPARTY Thu Mar 14 19:47:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.14.2.3 2012/11/20 23:29:34 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.14.2.4 2013/03/14 19:47:54 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1143,8 +1143,8 @@ Notes: Added changes from a5 - a12
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 19:55:39 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.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-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.20 src/doc/CHANGES-6.0.2:1.1.2.21 --- src/doc/CHANGES-6.0.2:1.1.2.20 Thu Mar 14 15:55:30 2013 +++ src/doc/CHANGES-6.0.2 Thu Mar 14 19:55:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.20 2013/03/14 15:55:30 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.21 2013/03/14 19:55:38 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -128,3 +128,26 @@ external/historical/nawk/dist/tran.c 1. Fix awk segfault due to NULL dereference. PR#47553. [cheusov, ticket #836] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +distrib/sets/lists/base/mi patch + + Merge tzdata2013a and tzdata2013b from + ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz and + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz . + Important changes from tzdata2012j to tzdata2013a: + Chile's 2013 rules, and we guess rules for 2014 and later, will be + the same as 2012, namely Apr Sun=23 03:00 UTC to + Sep Sun=2 04:00 UTC. + New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. + Many changes affect historical time stamps before 1940. + Important changes from tzdata2013a to tzdata2013b: + Haiti uses US daylight-saving rules this year, and presumably + future years. + Paraguay will end DST on March 24 this year. + Morocco does not observe DST during Ramadan; + try to predict Ramadan in Morocco as best we can. + [apb, ticket #845] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 19:56:24 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 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.108 src/doc/CHANGES-6.1:1.1.2.109 --- src/doc/CHANGES-6.1:1.1.2.108 Thu Mar 14 19:08:11 2013 +++ src/doc/CHANGES-6.1 Thu Mar 14 19:56:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.108 2013/03/14 19:08:11 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.109 2013/03/14 19:56:24 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8615,3 +8615,26 @@ sys/kern/init_sysctl.c1.195 via patc PR#47579. [pgoyette, ticket #837] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +distrib/sets/lists/base/mi patch + + Merge tzdata2013a and tzdata2013b from + ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz and + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz . + Important changes from tzdata2012j to tzdata2013a: + Chile's 2013 rules, and we guess rules for 2014 and later, will be + the same as 2012, namely Apr Sun=23 03:00 UTC to + Sep Sun=2 04:00 UTC. + New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. + Many changes affect historical time stamps before 1940. + Important changes from tzdata2013a to tzdata2013b: + Haiti uses US daylight-saving rules this year, and presumably + future years. + Paraguay will end DST on March 24 this year. + Morocco does not observe DST during Ramadan; + try to predict Ramadan in Morocco as best we can. + [apb, ticket #845] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Thu Mar 14 19:59:52 UTC 2013 Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi src/doc [netbsd-5]: 3RDPARTY src/share/zoneinfo [netbsd-5]: africa northamerica southamerica Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.780.2.25 -r1.780.2.26 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.647.2.23 -r1.647.2.24 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.2.3 -r1.1.1.27.2.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.42.2.6 -r1.1.1.42.2.7 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.5 -r1.1.1.42.2.6 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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.25 src/distrib/sets/lists/base/mi:1.780.2.26 --- src/distrib/sets/lists/base/mi:1.780.2.25 Thu Nov 15 13:28:22 2012 +++ src/distrib/sets/lists/base/mi Thu Mar 14 19:59:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.25 2012/11/15 13:28:22 msaitoh Exp $ +# $NetBSD: mi,v 1.780.2.26 2013/03/14 19:59:50 riz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4578,6 +4578,7 @@ ./usr/share/zoneinfo/Asia/Kashgar base-sys-share share ./usr/share/zoneinfo/Asia/Kathmandu base-sys-share share ./usr/share/zoneinfo/Asia/Katmandu base-sys-share share +./usr/share/zoneinfo/Asia/Khandyga base-sys-share share ./usr/share/zoneinfo/Asia/Kolkata base-sys-share share ./usr/share/zoneinfo/Asia/Krasnoyarsk base-sys-share share ./usr/share/zoneinfo/Asia/Kuala_Lumpur base-sys-share share @@ -4623,6 +4624,7 @@ ./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share ./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share ./usr/share/zoneinfo/Asia/Urumqi base-sys-share share +./usr/share/zoneinfo/Asia/Ust-Nera base-sys-share share ./usr/share/zoneinfo/Asia/Vientiane base-sys-share share ./usr/share/zoneinfo/Asia/Vladivostok base-sys-share share ./usr/share/zoneinfo/Asia/Yakutsk base-sys-share share @@ -4738,6 +4740,7 @@ ./usr/share/zoneinfo/Europe/Brussels base-sys-share share ./usr/share/zoneinfo/Europe/Bucharest base-sys-share share ./usr/share/zoneinfo/Europe/Budapest base-sys-share share +./usr/share/zoneinfo/Europe/Busingen base-sys-share share ./usr/share/zoneinfo/Europe/Chisinau base-sys-share share ./usr/share/zoneinfo/Europe/Copenhagen base-sys-share share ./usr/share/zoneinfo/Europe/Dublin base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.23 src/doc/3RDPARTY:1.647.2.24 --- src/doc/3RDPARTY:1.647.2.23 Wed Nov 14 20:01:00 2012 +++ src/doc/3RDPARTY Thu Mar 14 19:59:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.23 2012/11/14 20:01:00 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.24 2013/03/14 19:59:49 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 / tzdata2012j -Current Vers: tzcode2012j /
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 20:00:12 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.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.3 diff -u src/doc/CHANGES-5.3:1.1.2.5 src/doc/CHANGES-5.3:1.1.2.6 --- src/doc/CHANGES-5.3:1.1.2.5 Mon Jan 21 20:18:59 2013 +++ src/doc/CHANGES-5.3 Thu Mar 14 20:00:12 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.5 2013/01/21 20:18:59 bouyer Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.6 2013/03/14 20:00:12 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -170,3 +170,26 @@ sys/external/bsd/ipf/netinet/ip_fil_netb Fix off-by-one read error. [msaitoh, ticket #1840] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +distrib/sets/lists/base/mi patch + + Merge tzdata2013a and tzdata2013b from + ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz and + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz . + Important changes from tzdata2012j to tzdata2013a: + Chile's 2013 rules, and we guess rules for 2014 and later, will be + the same as 2012, namely Apr Sun=23 03:00 UTC to + Sep Sun=2 04:00 UTC. + New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. + Many changes affect historical time stamps before 1940. + Important changes from tzdata2013a to tzdata2013b: + Haiti uses US daylight-saving rules this year, and presumably + future years. + Paraguay will end DST on March 24 this year. + Morocco does not observe DST during Ramadan; + try to predict Ramadan in Morocco as best we can. + [apb, ticket #1854] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 20:02:22 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.2.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-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.3 src/doc/CHANGES-5.2.1:1.1.2.4 --- src/doc/CHANGES-5.2.1:1.1.2.3 Mon Jan 21 20:23:36 2013 +++ src/doc/CHANGES-5.2.1 Thu Mar 14 20:02:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.3 2013/01/21 20:23:36 bouyer Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.4 2013/03/14 20:02:21 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -63,3 +63,26 @@ sys/external/bsd/ipf/netinet/ip_fil_netb Fix off-by-one read error. [msaitoh, ticket #1840] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +distrib/sets/lists/base/mi patch + + Merge tzdata2013a and tzdata2013b from + ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz and + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz . + Important changes from tzdata2012j to tzdata2013a: + Chile's 2013 rules, and we guess rules for 2014 and later, will be + the same as 2012, namely Apr Sun=23 03:00 UTC to + Sep Sun=2 04:00 UTC. + New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. + Many changes affect historical time stamps before 1940. + Important changes from tzdata2013a to tzdata2013b: + Haiti uses US daylight-saving rules this year, and presumably + future years. + Paraguay will end DST on March 24 this year. + Morocco does not observe DST during Ramadan; + try to predict Ramadan in Morocco as best we can. + [apb, ticket #1854] +
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: riz Date: Thu Mar 14 20:03:23 UTC 2013 Modified Files: src/distrib/sets/lists/base [netbsd-5-1]: mi src/doc [netbsd-5-1]: 3RDPARTY src/share/zoneinfo [netbsd-5-1]: africa northamerica southamerica Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.780.2.16.2.4 -r1.780.2.16.2.5 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.647.2.12.2.9 -r1.647.2.12.2.10 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.10.3 -r1.1.1.27.10.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.42.10.6 -r1.1.1.42.10.7 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.10.5 -r1.1.1.42.10.6 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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.16.2.4 src/distrib/sets/lists/base/mi:1.780.2.16.2.5 --- src/distrib/sets/lists/base/mi:1.780.2.16.2.4 Fri Mar 2 06:42:27 2012 +++ src/distrib/sets/lists/base/mi Thu Mar 14 20:03:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.16.2.4 2012/03/02 06:42:27 riz Exp $ +# $NetBSD: mi,v 1.780.2.16.2.5 2013/03/14 20:03:21 riz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4570,6 +4570,7 @@ ./usr/share/zoneinfo/Asia/Kashgar base-sys-share share ./usr/share/zoneinfo/Asia/Kathmandu base-sys-share share ./usr/share/zoneinfo/Asia/Katmandu base-sys-share share +./usr/share/zoneinfo/Asia/Khandyga base-sys-share share ./usr/share/zoneinfo/Asia/Kolkata base-sys-share share ./usr/share/zoneinfo/Asia/Krasnoyarsk base-sys-share share ./usr/share/zoneinfo/Asia/Kuala_Lumpur base-sys-share share @@ -4615,6 +4616,7 @@ ./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share ./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share ./usr/share/zoneinfo/Asia/Urumqi base-sys-share share +./usr/share/zoneinfo/Asia/Ust-Nera base-sys-share share ./usr/share/zoneinfo/Asia/Vientiane base-sys-share share ./usr/share/zoneinfo/Asia/Vladivostok base-sys-share share ./usr/share/zoneinfo/Asia/Yakutsk base-sys-share share @@ -4730,6 +4732,7 @@ ./usr/share/zoneinfo/Europe/Brussels base-sys-share share ./usr/share/zoneinfo/Europe/Bucharest base-sys-share share ./usr/share/zoneinfo/Europe/Budapest base-sys-share share +./usr/share/zoneinfo/Europe/Busingen base-sys-share share ./usr/share/zoneinfo/Europe/Chisinau base-sys-share share ./usr/share/zoneinfo/Europe/Copenhagen base-sys-share share ./usr/share/zoneinfo/Europe/Dublin base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.12.2.9 src/doc/3RDPARTY:1.647.2.12.2.10 --- src/doc/3RDPARTY:1.647.2.12.2.9 Wed Nov 14 20:03:28 2012 +++ src/doc/3RDPARTY Thu Mar 14 20:03:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.12.2.9 2012/11/14 20:03:28 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.12.2.10 2013/03/14 20:03:20 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
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 20:03:57 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 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.35 src/doc/CHANGES-5.1.3:1.1.2.36 --- src/doc/CHANGES-5.1.3:1.1.2.35 Mon Jan 21 20:22:55 2013 +++ src/doc/CHANGES-5.1.3 Thu Mar 14 20:03:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.35 2013/01/21 20:22:55 bouyer Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.36 2013/03/14 20:03:57 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2349,3 +2349,26 @@ sys/external/bsd/ipf/netinet/ip_fil_netb Fix off-by-one read error. [msaitoh, ticket #1840] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +distrib/sets/lists/base/mi patch + + Merge tzdata2013a and tzdata2013b from + ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz and + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz . + Important changes from tzdata2012j to tzdata2013a: + Chile's 2013 rules, and we guess rules for 2014 and later, will be + the same as 2012, namely Apr Sun=23 03:00 UTC to + Sep Sun=2 04:00 UTC. + New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. + Many changes affect historical time stamps before 1940. + Important changes from tzdata2013a to tzdata2013b: + Haiti uses US daylight-saving rules this year, and presumably + future years. + Paraguay will end DST on March 24 this year. + Morocco does not observe DST during Ramadan; + try to predict Ramadan in Morocco as best we can. + [apb, ticket #1854] +
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Thu Mar 14 20:06:05 UTC 2013 Modified Files: src/sys/dev/mii: miidevs Log Message: Add BCM5756. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.112 src/sys/dev/mii/miidevs:1.113 --- src/sys/dev/mii/miidevs:1.112 Wed Feb 20 16:41:19 2013 +++ src/sys/dev/mii/miidevs Thu Mar 14 20:06:04 2013 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.112 2013/02/20 16:41:19 msaitoh Exp $ +$NetBSD: miidevs,v 1.113 2013/03/14 20:06:04 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -173,6 +173,7 @@ model BROADCOM2 BCM5906 0x0004 BCM5906 model BROADCOM2 BCM5481 0x000a BCM5481 1000BASE-T media interface model BROADCOM2 BCM5482 0x000b BCM5482 1000BASE-T media interface model BROADCOM2 BCM5755 0x000c BCM5755 1000BASE-T media interface +model BROADCOM2 BCM5756 0x000d BCM5756 1000BASE-T media interface XXX model BROADCOM2 BCM5754 0x000e BCM5754/5787 1000BASE-T media interface model BROADCOM2 BCM5708S 0x0015 BCM5708S 1000/2500baseSX PHY model BROADCOM2 BCM5785 0x0016 BCM5785 1000BASE-T media interface
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Thu Mar 14 20:06:39 UTC 2013
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.115 src/sys/dev/mii/miidevs.h:1.116
--- src/sys/dev/mii/miidevs.h:1.115 Wed Feb 20 16:41:48 2013
+++ src/sys/dev/mii/miidevs.h Thu Mar 14 20:06:39 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.115 2013/02/20 16:41:48 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.116 2013/03/14 20:06:39 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.112 2013/02/20 16:41:19 msaitoh Exp
+ * NetBSD: miidevs,v 1.113 2013/03/14 20:06:04 msaitoh Exp
*/
/*-
@@ -226,6 +226,8 @@
#define MII_STR_BROADCOM2_BCM5482 BCM5482 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5755 0x000c
#define MII_STR_BROADCOM2_BCM5755 BCM5755 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5756 0x000d
+#define MII_STR_BROADCOM2_BCM5756 BCM5756 1000BASE-T media interface XXX
#define MII_MODEL_BROADCOM2_BCM5754 0x000e
#define MII_STR_BROADCOM2_BCM5754 BCM5754/5787 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5708S 0x0015
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.103 src/sys/dev/mii/miidevs_data.h:1.104
--- src/sys/dev/mii/miidevs_data.h:1.103 Wed Feb 20 16:41:48 2013
+++ src/sys/dev/mii/miidevs_data.h Thu Mar 14 20:06:38 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.103 2013/02/20 16:41:48 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.104 2013/03/14 20:06:38 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.112 2013/02/20 16:41:19 msaitoh Exp
+ * NetBSD: miidevs,v 1.113 2013/03/14 20:06:04 msaitoh Exp
*/
/*-
@@ -83,6 +83,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5481, MII_STR_BROADCOM2_BCM5481 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5482, MII_STR_BROADCOM2_BCM5482 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5755, MII_STR_BROADCOM2_BCM5755 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5756, MII_STR_BROADCOM2_BCM5756 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5754, MII_STR_BROADCOM2_BCM5754 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5708S, MII_STR_BROADCOM2_BCM5708S },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785, MII_STR_BROADCOM2_BCM5785 },
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Thu Mar 14 20:42:57 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser_port.h Log Message: StunOS = 5.11 has posix_memalign(), so add an additional constraint for when we need to emulate it with memalign() and when not. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/librumpuser/rumpuser_port.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.12 src/lib/librumpuser/rumpuser_port.h:1.13 --- src/lib/librumpuser/rumpuser_port.h:1.12 Thu Jan 17 21:42:22 2013 +++ src/lib/librumpuser/rumpuser_port.h Thu Mar 14 20:42:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.12 2013/01/17 21:42:22 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.13 2013/03/14 20:42:57 pooka Exp $ */ /* * Portability header for non-NetBSD platforms. @@ -76,7 +76,7 @@ getenv_r(const char *name, char *buf, si } #endif -#if defined(__sun__) +#if defined(__sun__) !defined(HAVE_POSIX_MEMALIGN) #include sys/sysmacros.h /* Solarisa 10 has memalign() but no posix_memalign() */
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Thu Mar 14 21:31:36 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser_port.h Log Message: Refine previous: sys/sysmacros.h is where MIN/MAX comes from on Solaris, so it needs to be included unconditionally. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/librumpuser/rumpuser_port.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.13 src/lib/librumpuser/rumpuser_port.h:1.14 --- src/lib/librumpuser/rumpuser_port.h:1.13 Thu Mar 14 20:42:57 2013 +++ src/lib/librumpuser/rumpuser_port.h Thu Mar 14 21:31:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.13 2013/03/14 20:42:57 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.14 2013/03/14 21:31:35 pooka Exp $ */ /* * Portability header for non-NetBSD platforms. @@ -76,9 +76,10 @@ getenv_r(const char *name, char *buf, si } #endif -#if defined(__sun__) !defined(HAVE_POSIX_MEMALIGN) +#if defined(__sun__) #include sys/sysmacros.h +#if !defined(HAVE_POSIX_MEMALIGN) /* Solarisa 10 has memalign() but no posix_memalign() */ #include stdlib.h @@ -91,6 +92,7 @@ posix_memalign(void **ptr, size_t align, return ENOMEM; return 0; } +#endif /* !HAVE_POSIX_MEMALIGN */ #endif /* __sun__ */ #ifndef __RCSID
CVS commit: [netbsd-6] src/sys/dev/ic
Module Name:src
Committed By: riz
Date: Thu Mar 14 21:52:11 UTC 2013
Modified Files:
src/sys/dev/ic [netbsd-6]: isp.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #838):
sys/dev/ic/isp.c: revision 1.123
Disable ICBOPT_FAST_POST for ISP 2100.
Fixes PR kern/47302. From Matthew Jacob.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.122.10.1 src/sys/dev/ic/isp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/isp.c
diff -u src/sys/dev/ic/isp.c:1.122 src/sys/dev/ic/isp.c:1.122.10.1
--- src/sys/dev/ic/isp.c:1.122 Mon Feb 28 17:17:55 2011
+++ src/sys/dev/ic/isp.c Thu Mar 14 21:52:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $ */
+/* $NetBSD: isp.c,v 1.122.10.1 2013/03/14 21:52:10 riz Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
@@ -43,7 +43,7 @@
*/
#ifdef __NetBSD__
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $);
+__KERNEL_RCSID(0, $NetBSD: isp.c,v 1.122.10.1 2013/03/14 21:52:10 riz Exp $);
#include dev/ic/isp_netbsd.h
#endif
#ifdef __FreeBSD__
@@ -1580,7 +1580,13 @@ isp_fibre_init(ispsoftc_t *isp)
*
* NB: for the 2300, ICBOPT_EXTENDED is required.
*/
- if (IS_2200(isp) || IS_23XX(isp)) {
+ if (IS_2100(isp)) {
+ /*
+ * We can't have Fast Posting any more- we now
+ * have 32 bit handles.
+ */
+ icbp-icb_fwoptions = ~ICBOPT_FAST_POST;
+ } else if (IS_2200(isp) || IS_23XX(isp)) {
icbp-icb_fwoptions |= ICBOPT_EXTENDED;
/*
* Prefer or force Point-To-Point instead Loop?
CVS commit: [netbsd-6] src/sys/secmodel/extensions
Module Name:src
Committed By: riz
Date: Thu Mar 14 21:56:23 UTC 2013
Modified Files:
src/sys/secmodel/extensions [netbsd-6]: secmodel_extensions.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #839):
sys/secmodel/extensions/secmodel_extensions.c: revision 1.5
Make the callback deal with embryonic connections which do not have
credentials yet. Fixes PR kern/47598.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 \
src/sys/secmodel/extensions/secmodel_extensions.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/secmodel/extensions/secmodel_extensions.c
diff -u src/sys/secmodel/extensions/secmodel_extensions.c:1.2.2.1 src/sys/secmodel/extensions/secmodel_extensions.c:1.2.2.2
--- src/sys/secmodel/extensions/secmodel_extensions.c:1.2.2.1 Fri Feb 8 23:04:26 2013
+++ src/sys/secmodel/extensions/secmodel_extensions.c Thu Mar 14 21:56:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_extensions.c,v 1.2.2.1 2013/02/08 23:04:26 riz Exp $ */
+/* $NetBSD: secmodel_extensions.c,v 1.2.2.2 2013/03/14 21:56:23 riz Exp $ */
/*-
* Copyright (c) 2011 Elad Efrat e...@netbsd.org
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: secmodel_extensions.c,v 1.2.2.1 2013/02/08 23:04:26 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: secmodel_extensions.c,v 1.2.2.2 2013/03/14 21:56:23 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -461,6 +461,9 @@ secmodel_extensions_network_cb(kauth_cre
if (curtain != 0) {
struct socket *so = (struct socket *)arg1;
+ if (__predict_false(so == NULL || so-so_cred == NULL))
+ return KAUTH_RESULT_DENY;
+
if (!kauth_cred_uidmatch(cred, so-so_cred)) {
int error;
bool isroot = false;
CVS commit: [netbsd-6-0] src/sys/secmodel/extensions
Module Name:src
Committed By: riz
Date: Thu Mar 14 21:56:41 UTC 2013
Modified Files:
src/sys/secmodel/extensions [netbsd-6-0]: secmodel_extensions.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #839):
sys/secmodel/extensions/secmodel_extensions.c: revision 1.5
Make the callback deal with embryonic connections which do not have
credentials yet. Fixes PR kern/47598.
To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 \
src/sys/secmodel/extensions/secmodel_extensions.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/secmodel/extensions/secmodel_extensions.c
diff -u src/sys/secmodel/extensions/secmodel_extensions.c:1.2.8.1 src/sys/secmodel/extensions/secmodel_extensions.c:1.2.8.2
--- src/sys/secmodel/extensions/secmodel_extensions.c:1.2.8.1 Fri Feb 8 23:04:01 2013
+++ src/sys/secmodel/extensions/secmodel_extensions.c Thu Mar 14 21:56:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_extensions.c,v 1.2.8.1 2013/02/08 23:04:01 riz Exp $ */
+/* $NetBSD: secmodel_extensions.c,v 1.2.8.2 2013/03/14 21:56:41 riz Exp $ */
/*-
* Copyright (c) 2011 Elad Efrat e...@netbsd.org
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: secmodel_extensions.c,v 1.2.8.1 2013/02/08 23:04:01 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: secmodel_extensions.c,v 1.2.8.2 2013/03/14 21:56:41 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -461,6 +461,9 @@ secmodel_extensions_network_cb(kauth_cre
if (curtain != 0) {
struct socket *so = (struct socket *)arg1;
+ if (__predict_false(so == NULL || so-so_cred == NULL))
+ return KAUTH_RESULT_DENY;
+
if (!kauth_cred_uidmatch(cred, so-so_cred)) {
int error;
bool isroot = false;
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 21:56:58 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: TIcket 839 To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.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-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.21 src/doc/CHANGES-6.0.2:1.1.2.22 --- src/doc/CHANGES-6.0.2:1.1.2.21 Thu Mar 14 19:55:38 2013 +++ src/doc/CHANGES-6.0.2 Thu Mar 14 21:56:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.21 2013/03/14 19:55:38 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.22 2013/03/14 21:56:58 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -151,3 +151,9 @@ distrib/sets/lists/base/mi patch try to predict Ramadan in Morocco as best we can. [apb, ticket #845] +sys/secmodel/extensions/secmodel_extensions.c 1.5 + + Fix a crash which can happen with sysctl security.curtain=1 + set. PR#47598. + [martin, ticket #839] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 22:04:33 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 838, 839, 843. To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 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.109 src/doc/CHANGES-6.1:1.1.2.110 --- src/doc/CHANGES-6.1:1.1.2.109 Thu Mar 14 19:56:24 2013 +++ src/doc/CHANGES-6.1 Thu Mar 14 22:04:32 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.109 2013/03/14 19:56:24 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.110 2013/03/14 22:04:32 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8638,3 +8638,71 @@ distrib/sets/lists/base/mi patch try to predict Ramadan in Morocco as best we can. [apb, ticket #845] +sys/dev/ic/isp.c1.123 + + Fix FC-AL devices on QLogic ISP2100. PR#47302. + [martin, ticket #838] + +sys/secmodel/extensions/secmodel_extensions.c 1.5 + + Fix a crash which can happen with sysctl security.curtain=1 + set. PR#47598. + [martin, ticket #839] + +lib/libc/rpc/DISCLAIMER1.3 +lib/libc/rpc/auth_none.c 1.16 +lib/libc/rpc/auth_unix.c 1.25 +lib/libc/rpc/authunix_prot.c 1.16 +lib/libc/rpc/bindresvport.c 1.25 +lib/libc/rpc/clnt_bcast.c 1.26 +lib/libc/rpc/clnt_dg.c1.28 +lib/libc/rpc/clnt_generic.c 1.30 +lib/libc/rpc/clnt_perror.c 1.30 +lib/libc/rpc/clnt_raw.c1.32 +lib/libc/rpc/clnt_simple.c 1.32 +lib/libc/rpc/clnt_vc.c1.21 +lib/libc/rpc/getnetconfig.c 1.21 +lib/libc/rpc/getnetpath.c 1.17 +lib/libc/rpc/getrpcent.c 1.23 +lib/libc/rpc/getrpcport.c 1.18 +lib/libc/rpc/pmap_clnt.c 1.19 +lib/libc/rpc/pmap_getmaps.c 1.18 +lib/libc/rpc/pmap_getport.c 1.19 +lib/libc/rpc/pmap_prot.c 1.12 +lib/libc/rpc/pmap_prot2.c 1.17 +lib/libc/rpc/pmap_rmt.c1.34 +lib/libc/rpc/rpc_callmsg.c 1.20 +lib/libc/rpc/rpc_commondata.c 1.9 +lib/libc/rpc/rpc_dtablesize.c 1.16 +lib/libc/rpc/rpc_generic.c 1.28 +lib/libc/rpc/rpc_prot.c1.21 +lib/libc/rpc/rpc_soc.c1.18 +lib/libc/rpc/rpcb_clnt.c 1.29 +lib/libc/rpc/rpcb_prot.c 1.11 +lib/libc/rpc/rpcb_st_xdr.c 1.10 +lib/libc/rpc/svc.c1.34 +lib/libc/rpc/svc_auth.c1.17 +lib/libc/rpc/svc_auth_unix.c 1.21 +lib/libc/rpc/svc_dg.c1.17 +lib/libc/rpc/svc_dg.h1.2 +lib/libc/rpc/svc_generic.c 1.15 +lib/libc/rpc/svc_raw.c1.24 +lib/libc/rpc/svc_run.c1.22 +lib/libc/rpc/svc_simple.c 1.33 +lib/libc/rpc/svc_vc.c1.30 +lib/libc/rpc/xdr.c1.33 +lib/libc/rpc/xdr_array.c 1.19 +lib/libc/rpc/xdr_float.c 1.38 +lib/libc/rpc/xdr_mem.c1.19 +lib/libc/rpc/xdr_rec.c1.35 +lib/libc/rpc/xdr_reference.c 1.18 +lib/libc/rpc/xdr_sizeof.c 1.5 +lib/libc/rpc/xdr_stdio.c 1.19 + + Replace previous Sun Microsystems, Inc. license with a standard + BSD 3-clause license granted by Oracle America, Inc.. + This license change was approved by Wim Coekaerts, Senior + Vice President, Linux and Virtualization at Oracle Corporation. + This fixes PR lib/45293 by Pedro Giffuni. + [tron, ticket #843] +
CVS commit: [netbsd-6] src/lib/libc/arch/alpha/gen
Module Name:src Committed By: riz Date: Thu Mar 14 22:36:06 UTC 2013 Modified Files: src/lib/libc/arch/alpha/gen [netbsd-6]: __longjmp14.c __setjmp14.S Log Message: Pull up following revision(s) (requested by martin in ticket #846): lib/libc/arch/alpha/gen/__setjmp14.S: revision 1.6 lib/libc/arch/alpha/gen/__longjmp14.c: revision 1.6 lib/libc/arch/alpha/gen/__longjmp14.c: revision 1.7 Save the GP register value and restore it on longjmp. While formally GP is not a callee-saved register, for static linking the link time optimization described in section 3.2.3 of the Calling Standard for Alpha Systems allows the caller to rely on GP being the value needed within setjmp() - and not restore it after return if setjmp and the call site share a GP value. This fixes longjmp/setjmp for statically linked programs, e.g. /rescue/csh or the static tcsh variant from pkgsrc. Remove clearing of ucontext_t, the only random register values now are argument and scratch registers (which will be reloaded after return anyway). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.24.1 src/lib/libc/arch/alpha/gen/__longjmp14.c cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/libc/arch/alpha/gen/__setjmp14.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/alpha/gen/__longjmp14.c diff -u src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5 src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5.24.1 --- src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5 Mon Apr 28 20:22:55 2008 +++ src/lib/libc/arch/alpha/gen/__longjmp14.c Thu Mar 14 22:36:06 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __longjmp14.c,v 1.5 2008/04/28 20:22:55 martin Exp $ */ +/* $NetBSD: __longjmp14.c,v 1.5.24.1 2013/03/14 22:36:06 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -74,6 +74,7 @@ __longjmp14(jmp_buf env, int val) uc.uc_mcontext.__gregs[_REG_S5] = sc-sc_regs[R_S5]; uc.uc_mcontext.__gregs[_REG_S6] = sc-sc_regs[R_S6]; uc.uc_mcontext.__gregs[_REG_RA] = sc-sc_regs[R_RA]; + uc.uc_mcontext.__gregs[_REG_GP] = sc-sc_regs[R_GP]; uc.uc_mcontext.__gregs[_REG_SP] = sc-sc_sp; uc.uc_mcontext.__gregs[_REG_PC] = sc-sc_pc; uc.uc_mcontext.__gregs[_REG_PS] = Index: src/lib/libc/arch/alpha/gen/__setjmp14.S diff -u src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5 src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5.4.1 --- src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5 Sun Jun 12 05:44:36 2011 +++ src/lib/libc/arch/alpha/gen/__setjmp14.S Thu Mar 14 22:36:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __setjmp14.S,v 1.5 2011/06/12 05:44:36 matt Exp $ */ +/* $NetBSD: __setjmp14.S,v 1.5.4.1 2013/03/14 22:36:05 riz Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -55,6 +55,7 @@ LEAF(__setjmp14, 1) stq s6, (SC_REGS+_REG_S6)(a0) stq ra, (SC_REGS+_REG_RA)(a0) stq sp, (SC_REGS+_REG_SP)(a0) + stq gp, (SC_REGS+_REG_GP)(a0) /* * get signal information
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 22:37:11 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 844, 846 To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 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.110 src/doc/CHANGES-6.1:1.1.2.111 --- src/doc/CHANGES-6.1:1.1.2.110 Thu Mar 14 22:04:32 2013 +++ src/doc/CHANGES-6.1 Thu Mar 14 22:37:10 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.110 2013/03/14 22:04:32 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.111 2013/03/14 22:37:10 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8706,3 +8706,17 @@ lib/libc/rpc/xdr_stdio.c 1.19 This fixes PR lib/45293 by Pedro Giffuni. [tron, ticket #843] +src/sys/dist/ipf/netinet/fil.c patch +src/sys/dist/ipf/netinet/ip_lookup.c patch + + Fix some problems in IPF where a lock may be left locked + when it should be released or unlocked when it's not locked. + [chs, ticket #844] + +lib/libc/arch/alpha/gen/__longjmp14.c 1.6-1.7 +lib/libc/arch/alpha/gen/__setjmp14.S 1.6 + + Fix longjmp/setjmp on alpha for statically linked programs + such as those in /rescue. + [martin, ticket #846] +
CVS commit: [netbsd-6-0] src/lib/libc/arch/alpha/gen
Module Name:src Committed By: riz Date: Thu Mar 14 22:37:24 UTC 2013 Modified Files: src/lib/libc/arch/alpha/gen [netbsd-6-0]: __longjmp14.c __setjmp14.S Log Message: Pull up following revision(s) (requested by martin in ticket #846): lib/libc/arch/alpha/gen/__setjmp14.S: revision 1.6 lib/libc/arch/alpha/gen/__longjmp14.c: revision 1.6 lib/libc/arch/alpha/gen/__longjmp14.c: revision 1.7 Save the GP register value and restore it on longjmp. While formally GP is not a callee-saved register, for static linking the link time optimization described in section 3.2.3 of the Calling Standard for Alpha Systems allows the caller to rely on GP being the value needed within setjmp() - and not restore it after return if setjmp and the call site share a GP value. This fixes longjmp/setjmp for statically linked programs, e.g. /rescue/csh or the static tcsh variant from pkgsrc. Remove clearing of ucontext_t, the only random register values now are argument and scratch registers (which will be reloaded after return anyway). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.30.1 src/lib/libc/arch/alpha/gen/__longjmp14.c cvs rdiff -u -r1.5 -r1.5.10.1 src/lib/libc/arch/alpha/gen/__setjmp14.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/alpha/gen/__longjmp14.c diff -u src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5 src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5.30.1 --- src/lib/libc/arch/alpha/gen/__longjmp14.c:1.5 Mon Apr 28 20:22:55 2008 +++ src/lib/libc/arch/alpha/gen/__longjmp14.c Thu Mar 14 22:37:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __longjmp14.c,v 1.5 2008/04/28 20:22:55 martin Exp $ */ +/* $NetBSD: __longjmp14.c,v 1.5.30.1 2013/03/14 22:37:24 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -74,6 +74,7 @@ __longjmp14(jmp_buf env, int val) uc.uc_mcontext.__gregs[_REG_S5] = sc-sc_regs[R_S5]; uc.uc_mcontext.__gregs[_REG_S6] = sc-sc_regs[R_S6]; uc.uc_mcontext.__gregs[_REG_RA] = sc-sc_regs[R_RA]; + uc.uc_mcontext.__gregs[_REG_GP] = sc-sc_regs[R_GP]; uc.uc_mcontext.__gregs[_REG_SP] = sc-sc_sp; uc.uc_mcontext.__gregs[_REG_PC] = sc-sc_pc; uc.uc_mcontext.__gregs[_REG_PS] = Index: src/lib/libc/arch/alpha/gen/__setjmp14.S diff -u src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5 src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5.10.1 --- src/lib/libc/arch/alpha/gen/__setjmp14.S:1.5 Sun Jun 12 05:44:36 2011 +++ src/lib/libc/arch/alpha/gen/__setjmp14.S Thu Mar 14 22:37:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __setjmp14.S,v 1.5 2011/06/12 05:44:36 matt Exp $ */ +/* $NetBSD: __setjmp14.S,v 1.5.10.1 2013/03/14 22:37:24 riz Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -55,6 +55,7 @@ LEAF(__setjmp14, 1) stq s6, (SC_REGS+_REG_S6)(a0) stq ra, (SC_REGS+_REG_RA)(a0) stq sp, (SC_REGS+_REG_SP)(a0) + stq gp, (SC_REGS+_REG_GP)(a0) /* * get signal information
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Mar 14 22:37:38 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: TIcket 846. To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-6.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-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.22 src/doc/CHANGES-6.0.2:1.1.2.23 --- src/doc/CHANGES-6.0.2:1.1.2.22 Thu Mar 14 21:56:58 2013 +++ src/doc/CHANGES-6.0.2 Thu Mar 14 22:37:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.22 2013/03/14 21:56:58 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.23 2013/03/14 22:37:37 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -157,3 +157,10 @@ sys/secmodel/extensions/secmodel_extensi set. PR#47598. [martin, ticket #839] +lib/libc/arch/alpha/gen/__longjmp14.c 1.6-1.7 +lib/libc/arch/alpha/gen/__setjmp14.S 1.6 + + Fix longjmp/setjmp on alpha for statically linked programs + such as those in /rescue. + [martin, ticket #846] +
