CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Jan 12 09:51:26 UTC 2015 Modified Files: src/share/man/man4: urtw.4 Log Message: Fix table. Based on diff by Henning Petersen in PR 49514. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/urtw.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/urtw.4 diff -u src/share/man/man4/urtw.4:1.4 src/share/man/man4/urtw.4:1.5 --- src/share/man/man4/urtw.4:1.4 Wed Jul 31 13:34:04 2013 +++ src/share/man/man4/urtw.4 Mon Jan 12 09:51:26 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: urtw.4,v 1.4 2013/07/31 13:34:04 soren Exp $ +.\ $NetBSD: urtw.4,v 1.5 2015/01/12 09:51:26 wiz Exp $ .\ Copyright (c) 2008 Weongyo Jeong .\ All rights reserved. .\ @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd July 31, 2013 +.Dd January 12, 2015 .Dt URTW 4 .Os .Sh NAME @@ -54,17 +54,17 @@ The driver supports Realtek RTL8187B/L based wireless network devices, including: .Pp .Bl -column Shuttle XPC Accessory PN20 RTL8225 USB -compact -offset 6n -.It Em Card Radio Bus -.It Belkin F5D7050E RTL8225 USB -.It Linksys WUSB54GCv2 RTL8225 USB -.It Netgear WG111v2 RTL8225 USB -.It Netgear WG111v3 RTL8225 USB -.It Safehome WLG-1500SMA5 RTL8225 USB -.It Shuttle XPC Accessory PN20 RTL8225 USB -.It Sitecom WL168v1 RTL8225 USB -.It Sitecom WL168v4 RTL8225 USB -.It SureCom EP-9001-g(2A) RTL8225 USB -.It TRENDnet TEW-424UB V3.xR RTL8225 USB +.It Em Card Ta Em Radio Ta Em Bus +.It Belkin F5D7050E Ta RTL8225 Ta USB +.It Linksys WUSB54GCv2 Ta RTL8225 Ta USB +.It Netgear WG111v2 Ta RTL8225 Ta USB +.It Netgear WG111v3 Ta RTL8225 Ta USB +.It Safehome WLG-1500SMA5 Ta RTL8225 Ta USB +.It Shuttle XPC Accessory PN20 Ta RTL8225 Ta USB +.It Sitecom WL168v1 Ta RTL8225 Ta USB +.It Sitecom WL168v4 Ta RTL8225 Ta USB +.It SureCom EP-9001-g(2A) Ta RTL8225 Ta USB +.It TRENDnet TEW-424UB V3.xR Ta RTL8225 Ta USB .El .Sh EXAMPLES .Xr ifconfig.if 5
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: mrg Date: Mon Jan 12 09:14:45 UTC 2015 Modified Files: src/sys/arch/hppa/include: ieeefp.h Log Message: use unsigned over uint32_t so that this file works without stdint.h being included before hand. fixes mknative-gcc problems, and likely others. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/ieeefp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/ieeefp.h diff -u src/sys/arch/hppa/include/ieeefp.h:1.5 src/sys/arch/hppa/include/ieeefp.h:1.6 --- src/sys/arch/hppa/include/ieeefp.h:1.5 Sat Dec 27 16:54:03 2014 +++ src/sys/arch/hppa/include/ieeefp.h Mon Jan 12 09:14:45 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ieeefp.h,v 1.5 2014/12/27 16:54:03 martin Exp $ */ +/* $NetBSD: ieeefp.h,v 1.6 2015/01/12 09:14:45 mrg Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -12,8 +12,8 @@ #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE) -typedef uint32_t fenv_t; -typedef uint32_t fexcept_t; +typedef unsigned fenv_t; +typedef unsigned fexcept_t; #define FE_INEXACT 0x01 /* imprecise (loss of precision) */ #define FE_UNDERFLOW 0x02 /* underflow exception */
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: christos
Date: Mon Jan 12 14:17:08 UTC 2015
Modified Files:
src/usr.bin/ftp: ftp_var.h
Log Message:
Increase the buffer limit; otherwise files in:
http://www.taxdetective.ca/Samples/sampledatafiles.html
fail.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/ftp/ftp_var.h
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/ftp/ftp_var.h
diff -u src/usr.bin/ftp/ftp_var.h:1.82 src/usr.bin/ftp/ftp_var.h:1.83
--- src/usr.bin/ftp/ftp_var.h:1.82 Fri Dec 21 13:07:36 2012
+++ src/usr.bin/ftp/ftp_var.h Mon Jan 12 09:17:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp_var.h,v 1.82 2012/12/21 18:07:36 christos Exp $ */
+/* $NetBSD: ftp_var.h,v 1.83 2015/01/12 14:17:08 christos Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -169,7 +169,7 @@ enum {
/*
* Global defines
*/
-#define FTPBUFLEN MAXPATHLEN + 200
+#define FTPBUFLEN (4 * MAXPATHLEN)
#define MAX_IN_PORT_T 0xU
#define HASHBYTES 1024 /* default mark for `hash' command */
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Jan 12 10:22:22 UTC 2015 Modified Files: src/distrib/sets/lists/base [netbsd-7]: mi src/distrib/sets/lists/debug [netbsd-7]: mi src/distrib/sets/lists/man [netbsd-7]: mi src/usr.bin [netbsd-7]: Makefile Added Files: src/usr.bin/midirecord [netbsd-7]: Makefile midirecord.1 midirecord.c Log Message: Pull up following revision(s) (requested by mrg in ticket #409): usr.bin/midirecord/Makefile: revision 1.1 usr.bin/midirecord/midirecord.1: revision 1.1-1.3 usr.bin/midirecord/midirecord.c: revision 1.1-1.6 usr.bin/Makefile: revision 1.219 distrib/sets/lists/base/mi: revision 1.1093 distrib/sets/lists/man/mi: revision 1.1492 distrib/sets/lists/debug/mi: revision 1.98 Add midirecord. To generate a diff of this commit: cvs rdiff -u -r1.1087.2.1 -r1.1087.2.2 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.81.2.1 -r1.81.2.2 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1485.2.4 -r1.1485.2.5 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.218 -r1.218.2.1 src/usr.bin/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/usr.bin/midirecord/Makefile cvs rdiff -u -r0 -r1.3.2.2 src/usr.bin/midirecord/midirecord.1 cvs rdiff -u -r0 -r1.6.2.2 src/usr.bin/midirecord/midirecord.c 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.1087.2.1 src/distrib/sets/lists/base/mi:1.1087.2.2 --- src/distrib/sets/lists/base/mi:1.1087.2.1 Tue Nov 18 18:32:29 2014 +++ src/distrib/sets/lists/base/mi Mon Jan 12 10:22:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087.2.1 2014/11/18 18:32:29 snj Exp $ +# $NetBSD: mi,v 1.1087.2.2 2015/01/12 10:22:22 martin Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -593,6 +593,7 @@ ./usr/bin/merge base-util-bin ./usr/bin/mesg base-util-bin ./usr/bin/midiplaybase-audio-bin +./usr/bin/midirecordbase-audio-bin ./usr/bin/mixerctlbase-audio-bin ./usr/bin/mk_cmdsbase-obsolete obsolete ./usr/bin/mkcsmapperbase-util-bin Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.81.2.1 src/distrib/sets/lists/debug/mi:1.81.2.2 --- src/distrib/sets/lists/debug/mi:1.81.2.1 Fri Aug 15 12:26:56 2014 +++ src/distrib/sets/lists/debug/mi Mon Jan 12 10:22:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.81.2.1 2014/08/15 12:26:56 martin Exp $ +# $NetBSD: mi,v 1.81.2.2 2015/01/12 10:22:22 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -616,6 +616,7 @@ ./usr/libdata/debug/usr/bin/merge.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mesg.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/midiplay.debug comp-audio-debug debug +./usr/libdata/debug/usr/bin/midirecord.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/mixerctl.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/mk_cmds.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/mkcsmapper.debug comp-util-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1485.2.4 src/distrib/sets/lists/man/mi:1.1485.2.5 --- src/distrib/sets/lists/man/mi:1.1485.2.4 Fri Dec 12 16:38:48 2014 +++ src/distrib/sets/lists/man/mi Mon Jan 12 10:22:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1485.2.4 2014/12/12 16:38:48 martin Exp $ +# $NetBSD: mi,v 1.1485.2.5 2015/01/12 10:22:22 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -319,6 +319,7 @@ ./usr/share/man/cat1/merge.0 man-util-catman .cat ./usr/share/man/cat1/mesg.0 man-util-catman .cat ./usr/share/man/cat1/midiplay.0 man-audio-catman .cat +./usr/share/man/cat1/midirecord.0 man-audio-catman .cat ./usr/share/man/cat1/mixerctl.0 man-audio-catman .cat ./usr/share/man/cat1/mkdep.0 man-c-catman .cat ./usr/share/man/cat1/mkdir.0 man-util-catman .cat @@ -3436,6 +3437,7 @@ ./usr/share/man/html1/merge.html man-util-htmlman html ./usr/share/man/html1/mesg.html man-util-htmlman html ./usr/share/man/html1/midiplay.html man-audio-htmlman html +./usr/share/man/html1/midirecord.html man-audio-htmlman html ./usr/share/man/html1/mixerctl.html man-audio-htmlman html ./usr/share/man/html1/mkdep.html man-c-htmlman html ./usr/share/man/html1/mkdir.html man-util-htmlman html @@ -6192,6 +6194,7 @@ ./usr/share/man/man1/merge.1 man-util-man .man ./usr/share/man/man1/mesg.1 man-util-man .man ./usr/share/man/man1/midiplay.1 man-audio-man .man +./usr/share/man/man1/midirecord.1 man-audio-man .man ./usr/share/man/man1/mixerctl.1 man-audio-man .man ./usr/share/man/man1/mkdep.1 man-c-man .man ./usr/share/man/man1/mkdir.1 man-util-man .man Index: src/usr.bin/Makefile diff -u
CVS commit: [netbsd-7] src/libexec/httpd
Module Name:src
Committed By: martin
Date: Mon Jan 12 10:02:30 UTC 2015
Modified Files:
src/libexec/httpd [netbsd-7]: auth-bozo.c bozohttpd.8 bozohttpd.c
bozohttpd.h content-bozo.c dir-index-bozo.c lua-bozo.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #408):
libexec/httpd/content-bozo.c: revision 1.11
libexec/httpd/dir-index-bozo.c: revision 1.20
libexec/httpd/bozohttpd.h: revision 1.34
libexec/httpd/bozohttpd.c: revision 1.57
libexec/httpd/bozohttpd.8: revision 1.47
libexec/httpd/bozohttpd.c: revision 1.58
libexec/httpd/bozohttpd.8: revision 1.48
libexec/httpd/bozohttpd.c: revision 1.59
libexec/httpd/lua-bozo.c: revision 1.11
libexec/httpd/bozohttpd.c: revision 1.60
libexec/httpd/auth-bozo.c: revision 1.14
libexec/httpd/auth-bozo.c: revision 1.15
libexec/httpd/auth-bozo.c: revision 1.16
Update bozohttpd to 20141225:
- NUL terminate a string.
- don't truncate file sizes to 32 bits for directory indexes.
- Fixed off-by-one in virtualhost processing. Previous code was
checking if Host header is a prefix of any existing vhost.
This behaviour might be used to uncover existing vitual hosts
from the remote.
- Fixed memory leak in case of multiple authentication headers sent
by the client.
- Avoid array access out of bounds.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.46 -r1.46.4.1 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56 -r1.56.2.1 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.33 -r1.33.2.1 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.10 -r1.10.2.1 src/libexec/httpd/content-bozo.c \
src/libexec/httpd/lua-bozo.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/libexec/httpd/dir-index-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.13 src/libexec/httpd/auth-bozo.c:1.13.2.1
--- src/libexec/httpd/auth-bozo.c:1.13 Tue Jul 8 14:01:21 2014
+++ src/libexec/httpd/auth-bozo.c Mon Jan 12 10:02:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bozo.c,v 1.13 2014/07/08 14:01:21 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.13.2.1 2015/01/12 10:02:29 martin Exp $ */
/* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
@@ -118,6 +118,13 @@ bozo_auth_check(bozo_httpreq_t *request,
}
void
+bozo_auth_init(bozo_httpreq_t *request)
+{
+ request-hr_authuser = NULL;
+ request-hr_authpass = NULL;
+}
+
+void
bozo_auth_cleanup(bozo_httpreq_t *request)
{
@@ -150,6 +157,8 @@ bozo_auth_check_headers(bozo_httpreq_t *
return bozo_http_error(httpd, 400, request,
bad authorization field);
*pass++ = '\0';
+ free(request-hr_authuser);
+ free(request-hr_authpass);
request-hr_authuser = bozostrdup(httpd, authbuf);
request-hr_authpass = bozostrdup(httpd, pass);
debug((httpd, DEBUG_FAT,
@@ -229,6 +238,12 @@ base64_decode(const unsigned char *in, s
unsigned char *cp;
size_t i;
+ if (ilen == 0) {
+ if (olen)
+ *out = '\0';
+ return 0;
+ }
+
cp = out;
for (i = 0; i ilen; i += 4) {
if (cp + 3 out + olen)
@@ -250,7 +265,7 @@ base64_decode(const unsigned char *in, s
| decodetable[in[i + 3]];
#undef IN_CHECK
}
- while (in[i - 1] == '=')
+ while (i 0 in[i - 1] == '=')
cp--,i--;
return (cp - out);
}
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.46 src/libexec/httpd/bozohttpd.8:1.46.4.1
--- src/libexec/httpd/bozohttpd.8:1.46 Sun Feb 9 12:32:32 2014
+++ src/libexec/httpd/bozohttpd.8 Mon Jan 12 10:02:29 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: bozohttpd.8,v 1.46 2014/02/09 12:32:32 mrg Exp $
+.\ $NetBSD: bozohttpd.8,v 1.46.4.1 2015/01/12 10:02:29 martin Exp $
.\
.\ $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\
@@ -26,7 +26,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd February 9, 2014
+.Dd December 25, 2014
.Dt HTTPD 8
.Os
.Sh NAME
@@ -513,7 +513,7 @@ The focus has always been simplicity and
and regular code audits.
This manual documents
.Nm
-version 20140201.
+version 20141225.
.Sh AUTHORS
.An -nosplit
.Nm
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.56 src/libexec/httpd/bozohttpd.c:1.56.2.1
--- src/libexec/httpd/bozohttpd.c:1.56 Thu Jul 17 10:21:51 2014
+++ src/libexec/httpd/bozohttpd.c Mon Jan 12 10:02:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.56 2014/07/17 10:21:51 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.56.2.1 2015/01/12 10:02:29 martin Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -109,7 +109,7 @@
#define INDEX_HTML index.html
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE bozohttpd/20140717
+#define SERVER_SOFTWARE bozohttpd/20141225
#endif
#ifndef
CVS commit: [netbsd-7] src/sys/dev/marvell
Module Name:src
Committed By: martin
Date: Mon Jan 12 10:27:10 UTC 2015
Modified Files:
src/sys/dev/marvell [netbsd-7]: if_gfe.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #410):
sys/dev/marvell/if_gfe.c: revision 1.44
sizeof doesn't evaluate the expression, so increment of rxd doesn't
happen. Move it out.
To generate a diff of this commit:
cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/sys/dev/marvell/if_gfe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.42.2.1 src/sys/dev/marvell/if_gfe.c:1.42.2.2
--- src/sys/dev/marvell/if_gfe.c:1.42.2.1 Thu Oct 30 12:04:46 2014
+++ src/sys/dev/marvell/if_gfe.c Mon Jan 12 10:27:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.42.2.1 2014/10/30 12:04:46 martin Exp $ */
+/* $NetBSD: if_gfe.c,v 1.42.2.2 2015/01/12 10:27:10 martin Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_gfe.c,v 1.42.2.1 2014/10/30 12:04:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_gfe.c,v 1.42.2.2 2015/01/12 10:27:10 martin Exp $);
#include opt_inet.h
@@ -816,7 +816,7 @@ gfe_rx_rxqinit(struct gfe_softc *sc, enu
ds = rxq-rxq_buf_mem.gdm_map-dm_segs;
nxtaddr = rxq-rxq_desc_busaddr + sizeof(*rxd);
for (idx = 0, rxd = rxq-rxq_descs; idx GE_RXDESC_MAX;
- idx++, nxtaddr += sizeof(*(++rxd))) {
+ idx++, rxd++, nxtaddr += sizeof(*rxd)) {
rxd-ed_lencnt = htogt32(GE_RXBUF_SIZE 16);
rxd-ed_cmdsts = htogt32(RX_CMD_F|RX_CMD_L|RX_CMD_O|RX_CMD_EI);
rxd-ed_bufptr = htogt32(ds-ds_addr + boff);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Jan 12 10:27:57 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #308 - #310 To generate a diff of this commit: cvs rdiff -u -r1.1.2.159 -r1.1.2.160 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.159 src/doc/CHANGES-7.0:1.1.2.160 --- src/doc/CHANGES-7.0:1.1.2.159 Sun Jan 11 14:15:42 2015 +++ src/doc/CHANGES-7.0 Mon Jan 12 10:27:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.159 2015/01/11 14:15:42 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.160 2015/01/12 10:27:57 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13346,3 +13346,36 @@ sys/dev/usb/umidivar.hdelete the USB code. fixes lockdebug issues, and likely hangs. [mrg, ticket #407] +libexec/httpd/auth-bozo.c 1.14-1.16 +libexec/httpd/bozohttpd.8 1.47-1.48 +libexec/httpd/bozohttpd.c 1.57-1.60 +libexec/httpd/bozohttpd.h 1.34 +libexec/httpd/content-bozo.c 1.11 +libexec/httpd/dir-index-bozo.c 1.20 +libexec/httpd/lua-bozo.c 1.11 + + Update bozohttpd to 20141225: + - memory leak fixes + - off-by-one virtualhost processing + - supports 4GiB file sizes for directory listing + - additional sanity checks for some input parsing + - support .ts and .vob files + [mrg, ticket #408] + +usr.bin/midirecord/Makefile 1.1 +usr.bin/midirecord/midirecord.1 1.1-1.3 +usr.bin/midirecord/midirecord.c 1.1-1.6 +distrib/sets/lists/base/mi 1.1093 +distrib/sets/lists/debug/mi 1.98 +distrib/sets/lists/man/mi 1.1492 +usr.bin/Makefile1.219 + + Add usr/bin/midirecord. + [mrg, ticket #409] + +sys/dev/marvell/if_gfe.c 1.44 + + sizeof doesn't evaluate the expression, so move the increment of + rxd out. + [joerg, ticket #410] +
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: christos
Date: Mon Jan 12 16:34:39 UTC 2015
Modified Files:
src/sys/arch/x86/x86: cpu.c
Log Message:
PR/49104: Jarle Greipsland: Don't touch cr4 in cpus that don't have it.
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/x86/x86/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.112 src/sys/arch/x86/x86/cpu.c:1.113
--- src/sys/arch/x86/x86/cpu.c:1.112 Mon Dec 8 10:22:47 2014
+++ src/sys/arch/x86/x86/cpu.c Mon Jan 12 11:34:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.112 2014/12/08 15:22:47 msaitoh Exp $ */
+/* $NetBSD: cpu.c,v 1.113 2015/01/12 16:34:39 christos Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.112 2014/12/08 15:22:47 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.113 2015/01/12 16:34:39 christos Exp $);
#include opt_ddb.h
#include opt_mpbios.h /* for MPDEBUG */
@@ -551,11 +551,10 @@ cpu_childdetached(device_t self, device_
void
cpu_init(struct cpu_info *ci)
{
- uint32_t cr4;
+ uint32_t cr4 = 0;
lcr0(rcr0() | CR0_WP);
- cr4 = rcr4();
/*
* On a P6 or above, enable global TLB caching if the
* hardware supports it.
@@ -580,7 +579,10 @@ cpu_init(struct cpu_info *ci)
if (cpu_feature[1] CPUID2_XSAVE)
cr4 |= CR4_OSXSAVE;
- lcr4(cr4);
+ if (cr4) {
+ cr4 |= rcr4();
+ lcr4(cr4);
+ }
/* If xsave is enabled, enable all fpu features */
if (cr4 CR4_OSXSAVE)
CVS commit: [netbsd-7] src/usr.bin/audio/common
Module Name:src
Committed By: martin
Date: Mon Jan 12 19:15:27 UTC 2015
Modified Files:
src/usr.bin/audio/common [netbsd-7]: audio.c libaudio.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #409):
usr.bin/audio/common/audio.c: revision 1.23
usr.bin/audio/common/libaudio.h: revision 1.19
add a decode_uint() function.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/usr.bin/audio/common/audio.c
cvs rdiff -u -r1.18 -r1.18.4.1 src/usr.bin/audio/common/libaudio.h
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/audio/common/audio.c
diff -u src/usr.bin/audio/common/audio.c:1.22 src/usr.bin/audio/common/audio.c:1.22.4.1
--- src/usr.bin/audio/common/audio.c:1.22 Fri Aug 30 20:57:26 2013
+++ src/usr.bin/audio/common/audio.c Mon Jan 12 19:15:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.22 2013/08/30 20:57:26 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.22.4.1 2015/01/12 19:15:27 martin Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: audio.c,v 1.22 2013/08/30 20:57:26 mrg Exp $);
+__RCSID($NetBSD: audio.c,v 1.22.4.1 2015/01/12 19:15:27 martin Exp $);
#endif
@@ -155,6 +155,21 @@ decode_int(const char *arg, int *intp)
}
void
+decode_uint(const char *arg, unsigned *intp)
+{
+ char *ep;
+ unsigned ret;
+
+ ret = (unsigned)strtoul(arg, ep, 10);
+
+ if (ep[0] == '\0') {
+ *intp = ret;
+ return;
+ }
+ errx(1, argument `%s' not a valid integer, arg);
+}
+
+void
decode_time(const char *arg, struct timeval *tvp)
{
char *s, *colon, *dot;
Index: src/usr.bin/audio/common/libaudio.h
diff -u src/usr.bin/audio/common/libaudio.h:1.18 src/usr.bin/audio/common/libaudio.h:1.18.4.1
--- src/usr.bin/audio/common/libaudio.h:1.18 Fri Aug 30 20:57:26 2013
+++ src/usr.bin/audio/common/libaudio.h Mon Jan 12 19:15:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: libaudio.h,v 1.18 2013/08/30 20:57:26 mrg Exp $ */
+/* $NetBSD: libaudio.h,v 1.18.4.1 2015/01/12 19:15:27 martin Exp $ */
/*
* Copyright (c) 1999, 2009 Matthew R. Green
@@ -180,6 +180,7 @@ const char *audio_errstring (int);
* generic routines?
*/
void decode_int (const char *, int *);
+void decode_uint (const char *, unsigned *);
void decode_time (const char *, struct timeval *);
void decode_encoding (const char *, int *);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Jan 12 19:18:22 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ammend #409 for additional pullups (decode_uint) To generate a diff of this commit: cvs rdiff -u -r1.1.2.160 -r1.1.2.161 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.160 src/doc/CHANGES-7.0:1.1.2.161 --- src/doc/CHANGES-7.0:1.1.2.160 Mon Jan 12 10:27:57 2015 +++ src/doc/CHANGES-7.0 Mon Jan 12 19:18:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.160 2015/01/12 10:27:57 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.161 2015/01/12 19:18:22 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13365,6 +13365,8 @@ libexec/httpd/lua-bozo.c 1.11 usr.bin/midirecord/Makefile 1.1 usr.bin/midirecord/midirecord.1 1.1-1.3 usr.bin/midirecord/midirecord.c 1.1-1.6 +usr.bin/audio/common/audio.c 1.23 +usr.bin/audio/common/libaudio.h 1.19 distrib/sets/lists/base/mi 1.1093 distrib/sets/lists/debug/mi 1.98 distrib/sets/lists/man/mi 1.1492
CVS commit: src/distrib/amd64
Module Name:src
Committed By: snj
Date: Mon Jan 12 19:40:48 UTC 2015
Added Files:
src/distrib/amd64: Makefile
Log Message:
Restore unintentionally deleted file, which prevented building of any
install media. PR port-amd64/49558.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.9 src/distrib/amd64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/distrib/amd64/Makefile
diff -u /dev/null src/distrib/amd64/Makefile:1.9
--- /dev/null Mon Jan 12 19:40:48 2015
+++ src/distrib/amd64/Makefile Mon Jan 12 19:40:48 2015
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
+
+SUBDIR=
+SUBDIR+= ramdisks
+SUBDIR+= .WAIT
+SUBDIR+= instkernel
+SUBDIR+= kmod
+SUBDIR+= kmod-cgdroot
+SUBDIR+= .WAIT
+SUBDIR+= cdroms
+SUBDIR+= liveimage
+SUBDIR+= installimage
+TARGETS+= release
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+live_image:
+ ${MAKEDIRTARGET} liveimage live_image
+
+install_image:
+ ${MAKEDIRTARGET} installimage install_image
+
+.include bsd.subdir.mk
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Mon Jan 12 19:50:25 UTC 2015
Modified Files:
src/usr.sbin/makefs: ffs.c
Log Message:
PR/49559: Christian Brueffer: Fix typo maxbpf instead of maxbpg.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.sbin/makefs/ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.63 src/usr.sbin/makefs/ffs.c:1.64
--- src/usr.sbin/makefs/ffs.c:1.63 Sat Jun 22 22:06:06 2013
+++ src/usr.sbin/makefs/ffs.c Mon Jan 12 14:50:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.63 2013/06/23 02:06:06 dholland Exp $ */
+/* $NetBSD: ffs.c,v 1.64 2015/01/12 19:50:25 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: ffs.c,v 1.63 2013/06/23 02:06:06 dholland Exp $);
+__RCSID($NetBSD: ffs.c,v 1.64 2015/01/12 19:50:25 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -164,7 +164,7 @@ ffs_prep_opts(fsinfo_t *fsopts)
1, INT_MAX, bytes per inode },
{ 'm', minfree, ffs_opts-minfree, OPT_INT32,
0, 99, minfree },
- { 'M', maxbpf, ffs_opts-maxbpg, OPT_INT32,
+ { 'M', maxbpg, ffs_opts-maxbpg, OPT_INT32,
1, INT_MAX, max blocks per file in a cg },
{ 'a', avgfilesize, ffs_opts-avgfilesize, OPT_INT32,
1, INT_MAX, expected average file size },
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Mon Jan 12 19:50:47 UTC 2015 Modified Files: src/usr.sbin/makefs: README Log Message: reflect reality about filesystems supported. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/makefs/README diff -u src/usr.sbin/makefs/README:1.6 src/usr.sbin/makefs/README:1.7 --- src/usr.sbin/makefs/README:1.6 Sat Oct 18 04:33:31 2014 +++ src/usr.sbin/makefs/README Mon Jan 12 14:50:47 2015 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.6 2014/10/18 08:33:31 snj Exp $ +$NetBSD: README,v 1.7 2015/01/12 19:50:47 christos Exp $ makefs - build a file system image from a directory tree @@ -15,16 +15,21 @@ user overview: makefs creates a file system image from a given directory tree. the following file system types can be built: - ffs BSD fast file system + cd9660 ISO 9660 file system + chfs Chip file system, for flash devices + ffs BSD fast file system + msdos MS-DOS `FAT' file system (FAT12, FAT16, FAT32) + udf Universal Disk Format file system v7fs 7th edition(V7) file system Support for the following file systems maybe be added in the future + ext2fs Linux EXT2 file system - fat MS-DOS `FAT' file system (FAT12, FAT16, FAT32) Various file system independent parameters and contraints can be specified, such as: + - minimum file system size (in KB) - maximum file system size (in KB) - free inodes @@ -38,6 +43,7 @@ specified, such as: File system specific parameters can be given as well, with a command line option such as -o fsspeccific-options,comma-separated. For example, ffs would allow tuning of: + - block fragment size - cylinder groups - number of blocks per inode
CVS commit: [netbsd-7] src/tests/lib/libc/gen
Module Name:src Committed By: snj Date: Mon Jan 12 21:02:09 UTC 2015 Modified Files: src/tests/lib/libc/gen [netbsd-7]: isqemu.h Log Message: Pull up following revision(s) (requested by gson in ticket #413): tests/lib/libc/gen/isqemu.h: revision 1.4 Need stdlib.h for EXIT_FAILURE To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/tests/lib/libc/gen/isqemu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/gen/isqemu.h diff -u src/tests/lib/libc/gen/isqemu.h:1.3 src/tests/lib/libc/gen/isqemu.h:1.3.10.1 --- src/tests/lib/libc/gen/isqemu.h:1.3 Sun Apr 14 12:46:29 2013 +++ src/tests/lib/libc/gen/isqemu.h Mon Jan 12 21:02:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: isqemu.h,v 1.3 2013/04/14 12:46:29 martin Exp $ */ +/* $NetBSD: isqemu.h,v 1.3.10.1 2015/01/12 21:02:09 snj Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -34,6 +34,7 @@ #include sys/param.h #include sys/sysctl.h #include stdbool.h +#include stdlib.h #include string.h #include errno.h #include err.h
CVS commit: [netbsd-7] src/sys/arch/x86/x86
Module Name:src
Committed By: snj
Date: Mon Jan 12 21:06:42 UTC 2015
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: cpu.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #414):
sys/arch/x86/x86/cpu.c: revision 1.113
PR/49104: Jarle Greipsland: Don't touch cr4 in cpus that don't have it.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.111.2.1 src/sys/arch/x86/x86/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.111 src/sys/arch/x86/x86/cpu.c:1.111.2.1
--- src/sys/arch/x86/x86/cpu.c:1.111 Mon May 12 11:56:02 2014
+++ src/sys/arch/x86/x86/cpu.c Mon Jan 12 21:06:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.111 2014/05/12 11:56:02 joerg Exp $ */
+/* $NetBSD: cpu.c,v 1.111.2.1 2015/01/12 21:06:41 snj Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.111 2014/05/12 11:56:02 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.111.2.1 2015/01/12 21:06:41 snj Exp $);
#include opt_ddb.h
#include opt_mpbios.h /* for MPDEBUG */
@@ -552,11 +552,10 @@ cpu_childdetached(device_t self, device_
void
cpu_init(struct cpu_info *ci)
{
- uint32_t cr4;
+ uint32_t cr4 = 0;
lcr0(rcr0() | CR0_WP);
- cr4 = rcr4();
/*
* On a P6 or above, enable global TLB caching if the
* hardware supports it.
@@ -581,7 +580,10 @@ cpu_init(struct cpu_info *ci)
if (cpu_feature[1] CPUID2_XSAVE)
cr4 |= CR4_OSXSAVE;
- lcr4(cr4);
+ if (cr4) {
+ cr4 |= rcr4();
+ lcr4(cr4);
+ }
/* If xsave is enabled, enable all fpu features */
if (cr4 CR4_OSXSAVE)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Mon Jan 12 21:18:46 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 411-415 To generate a diff of this commit: cvs rdiff -u -r1.1.2.161 -r1.1.2.162 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.161 src/doc/CHANGES-7.0:1.1.2.162 --- src/doc/CHANGES-7.0:1.1.2.161 Mon Jan 12 19:18:22 2015 +++ src/doc/CHANGES-7.0 Mon Jan 12 21:18:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.161 2015/01/12 19:18:22 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.162 2015/01/12 21:18:45 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13205,7 +13205,6 @@ sys/kern/kern_rndq.c1.29 Don't use cpu_counter32() unconditionally. [christos, ticket #397] - sys/kern/vfs_mount.c1.32 vfs_vnode_iterator_destroy: set v_usecount of marker to zero to @@ -13381,3 +13380,44 @@ sys/dev/marvell/if_gfe.c 1.44 rxd out. [joerg, ticket #410] +sys/arch/sparc/stand/ofwboot/Makefile 1.33 + + Strip debug symbols from ofwboot. The forth bootsector loading + this file when booting from disk is simplistic and does not + skip non loadable sections. The five times bigger file with + debug info overruns some important memory contents with some + firmware versions otherwise. + [martin, ticket #411] + +sys/arch/arm/arm32/arm32_boot.c 1.12 + + use IPL_NONE for CPU attach message serialization mutex + [jmcneill, ticket #412] + +tests/lib/libc/gen/isqemu.h 1.4 +tests/lib/libm/Makefile1.31 +tests/lib/libm/t_fmod.c1.3 + + Add stdlib.h to isqenu.h for EXIT_FAILURE. + Mark the lib/libm/t_fmod test as an expected failure + under QEMU. + [gson, ticket #413] + +sys/arch/x86/x86/cpu.c1.113 + + Don't touch cr4 in cpus that don't have it. PR port-i386/49104 + [christos, ticket #414] + +share/man/man9/sysmon_pswitch.9 1.6 +sys/dev/pci/if_wpi.c1.70, 1.71 +sys/dev/pci/if_wpivar.h1.19 +sys/dev/sysmon/sysmon_power.c 1.49 +sys/sys/power.h 1.20 + + Introduce a new switch type, PSWITCH_TYPE_RADIO, to be used to + report to userland hardware radio switch changes. powerd(8) + will call a radio_button script to handle the event. This + script can e.g. start or stop wpa_supplicant. Update wpi(4) + to report PSWITCH_TYPE_RADIO events to sysmon. + [bouyer, ticket #415] +
CVS commit: [netbsd-7] src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: snj
Date: Mon Jan 12 20:57:31 UTC 2015
Modified Files:
src/sys/arch/sparc/stand/ofwboot [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by martin in ticket #411):
sys/arch/sparc/stand/ofwboot/Makefile: revision 1.33
Strip debug symbols from ofwboot.
The forth bootsector loading this file when booting from disk is
simplistic and does not skip non loadable sections. The five times
bigger file with debug info overruns some important memory contents
with some firmware versions otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/arch/sparc/stand/ofwboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.32 src/sys/arch/sparc/stand/ofwboot/Makefile:1.32.4.1
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.32 Sun Jan 12 15:26:31 2014
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Mon Jan 12 20:57:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/01/12 15:26:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2015/01/12 20:57:31 snj Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -103,7 +103,7 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBK
.else
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
- ${LD} -X -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
+ ${LD} -X -N -S -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} # native linker
.endif
CVS commit: [netbsd-7] src/sys/arch/arm/arm32
Module Name:src Committed By: snj Date: Mon Jan 12 21:00:29 UTC 2015 Modified Files: src/sys/arch/arm/arm32 [netbsd-7]: arm32_boot.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #412): sys/arch/arm/arm32/arm32_boot.c: revision 1.12 use IPL_NONE for CPU attach message serialization mutex To generate a diff of this commit: cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/sys/arch/arm/arm32/arm32_boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_boot.c diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.7.4.2 src/sys/arch/arm/arm32/arm32_boot.c:1.7.4.3 --- src/sys/arch/arm/arm32/arm32_boot.c:1.7.4.2 Sat Dec 13 19:32:43 2014 +++ src/sys/arch/arm/arm32/arm32_boot.c Mon Jan 12 21:00:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_boot.c,v 1.7.4.2 2014/12/13 19:32:43 martin Exp $ */ +/* $NetBSD: arm32_boot.c,v 1.7.4.3 2015/01/12 21:00:29 snj Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -123,7 +123,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.7.4.2 2014/12/13 19:32:43 martin Exp $); +__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.7.4.3 2015/01/12 21:00:29 snj Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -305,7 +305,7 @@ initarm_common(vaddr_t kvm_base, vsize_t #endif #ifdef MULTIPROCESSOR - mutex_init(cpu_hatch_lock, MUTEX_DEFAULT, IPL_HIGH); + mutex_init(cpu_hatch_lock, MUTEX_DEFAULT, IPL_NONE); #endif #ifdef VERBOSE_INIT_ARM
CVS commit: [netbsd-7] src/tests/lib/libm
Module Name:src
Committed By: snj
Date: Mon Jan 12 21:03:09 UTC 2015
Modified Files:
src/tests/lib/libm [netbsd-7]: Makefile t_fmod.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #413):
tests/lib/libm/Makefile: revision 1.31
tests/lib/libm/t_fmod.c: revision 1.3
Mark the lib/libm/t_fmod test as an expected failure under QEMU,
with a reference to PR misc/44767.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/tests/lib/libm/Makefile
cvs rdiff -u -r1.2 -r1.2.6.1 src/tests/lib/libm/t_fmod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.26 src/tests/lib/libm/Makefile:1.26.2.1
--- src/tests/lib/libm/Makefile:1.26 Sun Aug 10 11:30:51 2014
+++ src/tests/lib/libm/Makefile Mon Jan 12 21:03:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/08/10 11:30:51 martin Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2015/01/12 21:03:09 snj Exp $
.include bsd.own.mk
@@ -14,6 +14,8 @@ CPPFLAGS+= -DHAVE_FENV_H
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.endif
+CPPFLAGS.t_fmod.c+= -I${.CURDIR}/../libc/gen
+
TESTS_C+= t_acos
TESTS_C+= t_asin
TESTS_C+= t_atan
Index: src/tests/lib/libm/t_fmod.c
diff -u src/tests/lib/libm/t_fmod.c:1.2 src/tests/lib/libm/t_fmod.c:1.2.6.1
--- src/tests/lib/libm/t_fmod.c:1.2 Thu Feb 27 17:26:02 2014
+++ src/tests/lib/libm/t_fmod.c Mon Jan 12 21:03:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fmod.c,v 1.2 2014/02/27 17:26:02 joerg Exp $ */
+/* $NetBSD: t_fmod.c,v 1.2.6.1 2015/01/12 21:03:09 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
#include float.h
#include math.h
+#include isqemu.h
+
ATF_TC(fmod);
ATF_TC_HEAD(fmod, tc)
{
@@ -41,6 +43,9 @@ ATF_TC_HEAD(fmod, tc)
ATF_TC_BODY(fmod, tc)
{
+ if (isQEMU())
+ atf_tc_expect_fail(PR misc/44767);
+
ATF_CHECK(fmodf(2.0, 1.0) == 0);
ATF_CHECK(fmod(2.0, 1.0) == 0);
ATF_CHECK(fmodl(2.0, 1.0) == 0);
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Mon Jan 12 21:15:12 UTC 2015
Modified Files:
src/share/man/man9 [netbsd-7]: sysmon_pswitch.9
src/sys/dev/pci [netbsd-7]: if_wpi.c if_wpivar.h
src/sys/dev/sysmon [netbsd-7]: sysmon_power.c
src/sys/sys [netbsd-7]: power.h
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #415):
share/man/man9/sysmon_pswitch.9: revision 1.6
sys/dev/pci/if_wpi.c: revision 1.70, 1.71
sys/dev/pci/if_wpivar.h: revision 1.19
sys/dev/sysmon/sysmon_power.c: revision 1.49
sys/sys/power.h: revision 1.20
As proposed on tech-net@, introduce a new switch type, PSWITCH_TYPE_RADIO,
to be used to report to userland hardware radio switch changes.
powerd(8) will call a radio_button script to handle the event.
This script can e.g. start or stop wpa_supplicant.
Update wpi(4) to report PSWITCH_TYPE_RADIO events to sysmon.
--
Take sc_rsw_mtx before calling wpi_getrfkill() from wpi_init(),
Problem reported and patch tested by chris at chriswareham.net
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/share/man/man9/sysmon_pswitch.9
cvs rdiff -u -r1.68.2.1 -r1.68.2.2 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/pci/if_wpivar.h
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.19 -r1.19.10.1 src/sys/sys/power.h
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/man9/sysmon_pswitch.9
diff -u src/share/man/man9/sysmon_pswitch.9:1.5 src/share/man/man9/sysmon_pswitch.9:1.5.4.1
--- src/share/man/man9/sysmon_pswitch.9:1.5 Tue Mar 18 18:20:40 2014
+++ src/share/man/man9/sysmon_pswitch.9 Mon Jan 12 21:15:12 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysmon_pswitch.9,v 1.5 2014/03/18 18:20:40 riastradh Exp $
+.\ $NetBSD: sysmon_pswitch.9,v 1.5.4.1 2015/01/12 21:15:12 snj Exp $
.\
.\ Copyright (c) 2010 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 January 26, 2010
+.Dd January 6, 2015
.Dt SYSMON_PSWITCH 9
.Os
.Sh NAME
@@ -75,6 +75,7 @@ The following types are defined:
.It PSWITCH_TYPE_RESET
.It PSWITCH_TYPE_ACADAPTER
.It PSWITCH_TYPE_HOTKEY
+.It PSWITCH_TYPE_RADIO
.El
.Pp
If the type is
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.68.2.1 src/sys/dev/pci/if_wpi.c:1.68.2.2
--- src/sys/dev/pci/if_wpi.c:1.68.2.1 Sun Dec 21 19:32:48 2014
+++ src/sys/dev/pci/if_wpi.c Mon Jan 12 21:15:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.68.2.1 2014/12/21 19:32:48 snj Exp $ */
+/* $NetBSD: if_wpi.c,v 1.68.2.2 2015/01/12 21:15:12 snj Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.68.2.1 2014/12/21 19:32:48 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.68.2.2 2015/01/12 21:15:12 snj Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1
#include sys/kauth.h
#include sys/callout.h
#include sys/proc.h
+#include sys/kthread.h
#include sys/bus.h
#include machine/endian.h
@@ -48,6 +49,8 @@ __KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1
#include dev/pci/pcivar.h
#include dev/pci/pcidevs.h
+#include dev/sysmon/sysmonvar.h
+
#include net/bpf.h
#include net/if.h
#include net/if_arp.h
@@ -153,6 +156,7 @@ static void wpi_stop(struct ifnet *, int
static bool wpi_resume(device_t, const pmf_qual_t *);
static int wpi_getrfkill(struct wpi_softc *);
static void wpi_sysctlattach(struct wpi_softc *);
+static void wpi_rsw_thread(void *);
#ifdef WPI_DEBUG
#define DPRINTF(x) do { if (wpi_debug 0) printf x; } while (0)
@@ -214,6 +218,22 @@ wpi_attach(device_t parent __unused, dev
sc-sc_pct = pa-pa_pc;
sc-sc_pcitag = pa-pa_tag;
+ sc-sc_rsw_status = WPI_RSW_UNKNOWN;
+ sc-sc_rsw.smpsw_name = device_xname(self);
+ sc-sc_rsw.smpsw_type = PSWITCH_TYPE_RADIO;
+ error = sysmon_pswitch_register(sc-sc_rsw);
+ if (error) {
+ aprint_error_dev(self,
+ unable to register radio switch with sysmon\n);
+ return;
+ }
+ mutex_init(sc-sc_rsw_mtx, MUTEX_DEFAULT, IPL_NONE);
+ cv_init(sc-sc_rsw_cv, wpirsw);
+ if (kthread_create(PRI_NONE, 0, NULL,
+ wpi_rsw_thread, sc, sc-sc_rsw_lwp, %s, device_xname(self))) {
+ aprint_error_dev(self, couldn't create switch thread\n);
+ }
+
callout_init(sc-calib_to, 0);
callout_setfunc(sc-calib_to, wpi_calib_timeout, sc);
@@ -411,6 +431,13 @@ wpi_detach(device_t self, int flags __un
pci_intr_disestablish(sc-sc_pct, sc-sc_ih);
sc-sc_ih = NULL;
}
+ mutex_enter(sc-sc_rsw_mtx);
+ sc-sc_dying = 1;
+ cv_signal(sc-sc_rsw_cv);
+ while (sc-sc_rsw_lwp != NULL)
+ cv_wait(sc-sc_rsw_cv, sc-sc_rsw_mtx);
+ mutex_exit(sc-sc_rsw_mtx);
+ sysmon_pswitch_unregister(sc-sc_rsw);
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: mrg
Date: Tue Jan 13 02:37:20 UTC 2015
Modified Files:
src/usr.bin/gzip: gzip.1 gzip.c
Log Message:
do not use directory paths present in gzip files with the -N flag,
similar to the problem reported in pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/gzip/gzip.1
cvs rdiff -u -r1.106 -r1.107 src/usr.bin/gzip/gzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/gzip.1
diff -u src/usr.bin/gzip/gzip.1:1.23 src/usr.bin/gzip/gzip.1:1.24
--- src/usr.bin/gzip/gzip.1:1.23 Tue Mar 18 18:20:45 2014
+++ src/usr.bin/gzip/gzip.1 Tue Jan 13 02:37:20 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: gzip.1,v 1.23 2014/03/18 18:20:45 riastradh Exp $
+.\ $NetBSD: gzip.1,v 1.24 2015/01/13 02:37:20 mrg Exp $
.\
.\ Copyright (c) 1997, 2003, 2004 Matthew R. Green
.\ All rights reserved.
@@ -24,7 +24,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd June 18, 2011
+.Dd January 13, 2015
.Dt GZIP 1
.Os
.Sh NAME
@@ -191,7 +191,7 @@ program for
This manual documents
.Nx
.Nm
-version 20040427.
+version 20150113.
.Sh AUTHORS
This implementation of
.Nm
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.106 src/usr.bin/gzip/gzip.c:1.107
--- src/usr.bin/gzip/gzip.c:1.106 Sat Oct 18 08:33:30 2014
+++ src/usr.bin/gzip/gzip.c Tue Jan 13 02:37:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.106 2014/10/18 08:33:30 snj Exp $ */
+/* $NetBSD: gzip.c,v 1.107 2015/01/13 02:37:20 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.);
-__RCSID($NetBSD: gzip.c,v 1.106 2014/10/18 08:33:30 snj Exp $);
+__RCSID($NetBSD: gzip.c,v 1.107 2015/01/13 02:37:20 mrg Exp $);
#endif /* not lint */
/*
@@ -160,7 +160,7 @@ static suffixes_t suffixes[] = {
#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
#define SUFFIX_MAXLEN 30
-static const char gzip_version[] = NetBSD gzip 20101018;
+static const char gzip_version[] = NetBSD gzip 20150113;
static int cflag; /* stdout mode */
static int dflag; /* decompress mode */
@@ -1311,7 +1311,7 @@ file_uncompress(char *file, char *outfil
#ifndef SMALL
ssize_t rv;
time_t timestamp = 0;
- unsigned char name[PATH_MAX + 1];
+ char name[PATH_MAX + 1];
#endif
/* gather the old name info */
@@ -1372,15 +1372,24 @@ file_uncompress(char *file, char *outfil
goto lose;
}
if (name[0] != 0) {
+char *dp, *nf;
+
+/* strip saved directory name */
+nf = strrchr(name, '/');
+if (nf == NULL)
+ nf = name;
+else
+ nf++;
+
/* preserve original directory name */
-char *dp = strrchr(file, '/');
+dp = strrchr(file, '/');
if (dp == NULL)
dp = file;
else
dp++;
snprintf(outfile, outsize, %.*s%.*s,
(int) (dp - file),
- file, (int) rbytes, name);
+ file, (int) rbytes, nf);
}
}
}
CVS commit: src/external/zlib/pigz/dist
Module Name:src
Committed By: mrg
Date: Tue Jan 13 02:36:22 UTC 2015
Modified Files:
src/external/zlib/pigz/dist: pigz.c
Log Message:
merge
https://github.com/madler/pigz/commit/fdad1406b3ec809f4954ff7cdf9e99eb18c2458f
--
When decompressing with -N or -NT, strip any path from header name.
This uses the path of the compressed file combined with the name
from the header as the name of the decompressed output file. Any
path information in the header name is stripped. This avoids a
possible vulnerability where absolute or descending paths are put
in the gzip header.
--
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/zlib/pigz/dist/pigz.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/zlib/pigz/dist/pigz.c
diff -u src/external/zlib/pigz/dist/pigz.c:1.1.1.2 src/external/zlib/pigz/dist/pigz.c:1.2
--- src/external/zlib/pigz/dist/pigz.c:1.1.1.2 Sun Jun 15 17:37:21 2014
+++ src/external/zlib/pigz/dist/pigz.c Tue Jan 13 02:36:22 2015
@@ -3502,26 +3502,35 @@ local void process(char *path)
(use -f to force));
}
else {
-char *to, *repl;
+char *to = g.inf, *sufx = ;
+size_t pre = 0;
-/* use header name for output when decompressing with -N */
-to = g.inf;
-if (g.decode (g.headis 1) != 0 g.hname != NULL) {
-to = g.hname;
-len = strlen(g.hname);
+/* select parts of the output file name */
+if (g.decode) {
+/* for -dN or -dNT, use the path from the input file and the name
+ from the header, stripping any path in the header name */
+if ((g.headis 1) != 0 g.hname != NULL) {
+pre = justname(g.inf) - g.inf;
+to = justname(g.hname);
+len = strlen(to);
+}
+/* for -d or -dNn, replace abbreviated suffixes */
+else if (strcmp(to + len, .tgz) == 0)
+sufx = .tar;
}
-
-/* replace .tgx with .tar when decoding */
-repl = g.decode strcmp(to + len, .tgz) ? : .tar;
+else
+/* add appropriate suffix when compressing */
+sufx = g.sufx;
/* create output file and open to write */
-g.outf = MALLOC(len + (g.decode ? strlen(repl) : strlen(g.sufx)) + 1);
+g.outf = MALLOC(pre + len + strlen(sufx) + 1);
if (g.outf == NULL)
bail(not enough memory, );
-memcpy(g.outf, to, len);
-strcpy(g.outf + len, g.decode ? repl : g.sufx);
+memcpy(g.outf, g.inf, pre);
+memcpy(g.outf + pre, to, len);
+strcpy(g.outf + pre + len, sufx);
g.outd = open(g.outf, O_CREAT | O_TRUNC | O_WRONLY |
- (g.force ? 0 : O_EXCL), 0600);
+ (g.force ? 0 : O_EXCL), 0600);
/* if exists and not -f, give user a chance to overwrite */
if (g.outd 0 errno == EEXIST isatty(0) g.verbosity) {
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Jan 13 03:11:34 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Fix a legacy interrupt problem. If the INTx line was shared with another
device, the ixgbe_legacy_irq() enabled the interrupt even if the interface
was down. Check the interface state and call functions appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.14 src/sys/dev/pci/ixgbe/ixgbe.c:1.15
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.14 Mon Apr 21 16:35:06 2014
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Jan 13 03:11:34 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.14 2014/04/21 16:35:06 chs Exp $*/
+/*$NetBSD: ixgbe.c,v 1.15 2015/01/13 03:11:34 msaitoh Exp $*/
#include opt_inet.h
@@ -1478,30 +1478,33 @@ ixgbe_legacy_irq(void *arg)
{
struct ix_queue *que = arg;
struct adapter *adapter = que-adapter;
+ struct ifnet *ifp = adapter-ifp;
struct ixgbe_hw *hw = adapter-hw;
struct tx_ring *txr = adapter-tx_rings;
- bool more_tx, more_rx;
+ bool more_tx = false, more_rx = false;
u32 reg_eicr, loop = MAX_LOOP;
-
reg_eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
adapter-stats.legint.ev_count++;
++que-irqs;
if (reg_eicr == 0) {
adapter-stats.intzero.ev_count++;
- ixgbe_enable_intr(adapter);
+ if ((ifp-if_flags IFF_UP) != 0)
+ ixgbe_enable_intr(adapter);
return 0;
}
- more_rx = ixgbe_rxeof(que, adapter-rx_process_limit);
+ if ((ifp-if_flags IFF_RUNNING) != 0) {
+ more_rx = ixgbe_rxeof(que, adapter-rx_process_limit);
- IXGBE_TX_LOCK(txr);
- do {
- adapter-txloops.ev_count++;
- more_tx = ixgbe_txeof(txr);
- } while (loop-- more_tx);
- IXGBE_TX_UNLOCK(txr);
+ IXGBE_TX_LOCK(txr);
+ do {
+ adapter-txloops.ev_count++;
+ more_tx = ixgbe_txeof(txr);
+ } while (loop-- more_tx);
+ IXGBE_TX_UNLOCK(txr);
+ }
if (more_rx || more_tx) {
if (more_rx)
