Re: CVS commit: src/sys/arch/luna68k/dev
On Thu, Jan 02, 2014 at 01:25:56PM +0900, Izumi Tsutsui wrote: This could lead to problems in the future. I would put it back. How? - it was added by me recently - netbsd-6 doesn't have it - no other serial driver except com(4) has it ISTM that if the field exists, it should always be initialized (in all tty drivers); if it doesn't need to be initialized, it shouldn't exist... The tty code is a mess but someday someone will fix it up. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/sys/arch/luna68k/dev
On Thu, Jan 02, 2014 at 11:11:34AM -0500, Christos Zoulas wrote: | ISTM that if the field exists, it should always be initialized (in all | tty drivers); if it doesn't need to be initialized, it shouldn't | exist... | | The tty code is a mess but someday someone will fix it up. grep -rw t_softc /usr/src/sys reveals: ./dev/ic/com.c: tp-t_softc = sc; ./sys/tty.h:void*t_softc; /* pointer to driver's softc. */ And the change was done a long time ago, and still nothing uses it. date: 2013-02-24 01:20:24 -0500; author: matt; state: Exp; lines: +2 -1; Add a t_softc member to struct tty in which a driver can store a pointer to its softc. (analogous to if_softc in struct ifnet). What's the plan? Dunno... Cc: added (my plan has been to invade with torches and pitchforks, but I've been putting off even looking at it while namei and vfs stuff remain a mess) -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/sys
On Thu, Jan 02, 2014 at 18:29:02 +, Antti Kantee wrote: Date: Thu, 2 Jan 2014 18:29:02 + From: Antti Kantee po...@netbsd.org Subject: CVS commit: src/sys To: source-chan...@netbsd.org Reply-To: source-changes-d@NetBSD.org Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: pooka Date: Thu Jan 2 18:29:01 UTC 2014 Modified Files: src/sys/net: if.c src/sys/netinet: in_proto.c tcp_subr.c tcp_timer.c tcp_var.h udp_usrreq.c udp_var.h src/sys/netinet6: in6_proto.c in6_var.h udp6_usrreq.c src/sys/rump/net/lib/libnetinet: component.c src/sys/rump/net/lib/libnetinet6: component.c Log Message: Allow kernels compiled with INET+INET6 to be booted as IPv4-only or IPv6-only. Forgot to explicitly #include sys/atomic.h? hpcsh GENERIC fails with: /usr/home/buildbot/slave2/src/sys/netinet/tcp_subr.c: In function 'tcp_init_common': /usr/home/buildbot/slave2/src/sys/netinet/tcp_subr.c:446:3: error: implicit declaration of function 'atomic_cas_uint' --- tcp_subr.o --- *** [tcp_subr.o] Error code 1 -uwe
Re: CVS commit: src/sys
On 01/02/2014 06:48 PM, Valery Ushakov wrote: Log Message: Allow kernels compiled with INET+INET6 to be booted as IPv4-only or IPv6-only. Forgot to explicitly #include sys/atomic.h? hpcsh GENERIC fails with: /usr/home/buildbot/slave2/src/sys/netinet/tcp_subr.c: In function 'tcp_init_common': /usr/home/buildbot/slave2/src/sys/netinet/tcp_subr.c:446:3: error: implicit declaration of function 'atomic_cas_uint' --- tcp_subr.o --- *** [tcp_subr.o] Error code 1 Ah, the good old x86 pmap leaks atomic.h gotcha. Fixed, thanks.
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:21:39 UTC 2014 Modified Files: src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.c bozohttpd.h cgi-bozo.c content-bozo.c daemon-bozo.c dir-index-bozo.c lua-bozo.c main.c printenv.lua ssl-bozo.c tilde-luzah-bozo.c src/libexec/httpd/small: Makefile Log Message: - update CHANGES with recent changes - update version to 20140102 - update copyrights - use getcwd() over getwd() - fix lean build (don't include lua) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/httpd/CHANGES cvs rdiff -u -r1.11 -r1.12 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.44 -r1.45 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.23 -r1.24 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.8 -r1.9 src/libexec/httpd/content-bozo.c \ src/libexec/httpd/lua-bozo.c cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/daemon-bozo.c \ src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/main.c cvs rdiff -u -r1.1 -r1.2 src/libexec/httpd/printenv.lua cvs rdiff -u -r1.9 -r1.10 src/libexec/httpd/tilde-luzah-bozo.c cvs rdiff -u -r1.1.1.1 -r1.2 src/libexec/httpd/small/Makefile 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/CHANGES diff -u src/libexec/httpd/CHANGES:1.13 src/libexec/httpd/CHANGES:1.14 --- src/libexec/httpd/CHANGES:1.13 Thu Jul 11 07:44:19 2013 +++ src/libexec/httpd/CHANGES Thu Jan 2 08:21:38 2014 @@ -1,6 +1,9 @@ $eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $ changes since bozohttpd 2018: + o update a few content types + o add support for directly calling lua scripts to handle + processes, from mbal...@netbsd.org o properly escape generated HTML o add authentication for redirections, from mar...@netbsd.org o handle chained ssl certifications, from el...@netbsd.org Index: src/libexec/httpd/auth-bozo.c diff -u src/libexec/httpd/auth-bozo.c:1.11 src/libexec/httpd/auth-bozo.c:1.12 --- src/libexec/httpd/auth-bozo.c:1.11 Sat Oct 12 18:46:12 2013 +++ src/libexec/httpd/auth-bozo.c Thu Jan 2 08:21:38 2014 @@ -1,9 +1,9 @@ -/* $NetBSD: auth-bozo.c,v 1.11 2013/10/12 18:46:12 mbalmer Exp $ */ +/* $NetBSD: auth-bozo.c,v 1.12 2014/01/02 08:21:38 mrg Exp $ */ /* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */ /* - * Copyright (c) 1997-2011 Matthew R. Green + * Copyright (c) 1997-2014 Matthew R. Green * All rights reserved. * * Redistribution and use in source and binary forms, with or without Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.44 src/libexec/httpd/bozohttpd.c:1.45 --- src/libexec/httpd/bozohttpd.c:1.44 Sat Oct 12 18:46:12 2013 +++ src/libexec/httpd/bozohttpd.c Thu Jan 2 08:21:38 2014 @@ -1,9 +1,9 @@ -/* $NetBSD: bozohttpd.c,v 1.44 2013/10/12 18:46:12 mbalmer Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.45 2014/01/02 08:21:38 mrg Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ /* - * Copyright (c) 1997-2013 Matthew R. Green + * Copyright (c) 1997-2014 Matthew R. Green * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,7 +109,7 @@ #define INDEX_HTML index.html #endif #ifndef SERVER_SOFTWARE -#define SERVER_SOFTWARE bozohttpd/20130711 +#define SERVER_SOFTWARE bozohttpd/20140102 #endif #ifndef DIRECT_ACCESS_FILE #define DIRECT_ACCESS_FILE .bzdirect Index: src/libexec/httpd/bozohttpd.h diff -u src/libexec/httpd/bozohttpd.h:1.30 src/libexec/httpd/bozohttpd.h:1.31 --- src/libexec/httpd/bozohttpd.h:1.30 Sat Oct 12 17:24:07 2013 +++ src/libexec/httpd/bozohttpd.h Thu Jan 2 08:21:38 2014 @@ -1,9 +1,9 @@ -/* $NetBSD: bozohttpd.h,v 1.30 2013/10/12 17:24:07 mbalmer Exp $ */ +/* $NetBSD: bozohttpd.h,v 1.31 2014/01/02 08:21:38 mrg Exp $ */ /* $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $ */ /* - * Copyright (c) 1997-2013 Matthew R. Green + * Copyright (c) 1997-2014 Matthew R. Green * All rights reserved. * * Redistribution and use in source and binary forms, with or without Index: src/libexec/httpd/cgi-bozo.c diff -u src/libexec/httpd/cgi-bozo.c:1.23 src/libexec/httpd/cgi-bozo.c:1.24 --- src/libexec/httpd/cgi-bozo.c:1.23 Sat Oct 12 18:46:12 2013 +++ src/libexec/httpd/cgi-bozo.c Thu Jan 2 08:21:38 2014 @@ -1,9 +1,9 @@ -/* $NetBSD: cgi-bozo.c,v 1.23 2013/10/12 18:46:12 mbalmer Exp $ */ +/* $NetBSD: cgi-bozo.c,v 1.24 2014/01/02 08:21:38 mrg Exp $ */ /* $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $ */ /* - * Copyright (c) 1997-2013 Matthew R. Green + * Copyright (c) 1997-2014 Matthew R. Green * All rights reserved. * * Redistribution and use in source and binary forms, with or without Index: src/libexec/httpd/content-bozo.c diff -u src/libexec/httpd/content
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:22:59 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: update version, date and copyright. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/libexec/httpd/bozohttpd.8 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/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.41 src/libexec/httpd/bozohttpd.8:1.42 --- src/libexec/httpd/bozohttpd.8:1.41 Sat Oct 12 22:37:43 2013 +++ src/libexec/httpd/bozohttpd.8 Thu Jan 2 08:22:59 2014 @@ -1,8 +1,8 @@ -.\ $NetBSD: bozohttpd.8,v 1.41 2013/10/12 22:37:43 wiz Exp $ +.\ $NetBSD: bozohttpd.8,v 1.42 2014/01/02 08:22:59 mrg Exp $ .\ .\ $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\ -.\ Copyright (c) 1997-2013 Matthew R. Green +.\ Copyright (c) 1997-2014 Matthew R. Green .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 12, 2013 +.Dd January 2, 2014 .Dt HTTPD 8 .Os .Sh NAME @@ -507,7 +507,7 @@ The focus has always been simplicity and and regular code audits. This manual documents .Nm -version 20130711. +version 20140102. .Sh AUTHORS .An -nosplit .Nm
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:30:22 UTC 2014 Modified Files: src/libexec/httpd: Makefile.boot Log Message: update for 20140102. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/libexec/httpd/Makefile.boot 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/Makefile.boot diff -u src/libexec/httpd/Makefile.boot:1.5 src/libexec/httpd/Makefile.boot:1.6 --- src/libexec/httpd/Makefile.boot:1.5 Mon May 10 14:44:19 2010 +++ src/libexec/httpd/Makefile.boot Thu Jan 2 08:30:22 2014 @@ -4,14 +4,17 @@ # see Makefile for a list of compile options that may be placed in CFLAGS. CC= cc -CFLAGS= -O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +OPT= -O +LARGE_CFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +LOCAL_CFLAGS= -DNO_LUA_SUPPORT +CFLAGS= $(OPT) $(LARGE_CFLAGS) $(LOCAL_CFLAGS) GROFF= groff -Tascii CRYPTOLIBDIR= # -L/usr/local/lib CRYPTOLIBS= $(CRYPTOLIBDIR) -lcrypto -lssl FILES= bozohttpd.c auth-bozo.c cgi-bozo.c content-bozo.c daemon-bozo.c \ - dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c main.c + dir-index-bozo.c lua-bozo.c ssl-bozo.c tilde-luzah-bozo.c main.c all: $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:47:38 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: sort the contributor list, and update the defines list to include lua. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/libexec/httpd/bozohttpd.8 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/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.42 src/libexec/httpd/bozohttpd.8:1.43 --- src/libexec/httpd/bozohttpd.8:1.42 Thu Jan 2 08:22:59 2014 +++ src/libexec/httpd/bozohttpd.8 Thu Jan 2 08:47:38 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: bozohttpd.8,v 1.42 2014/01/02 08:22:59 mrg Exp $ +.\ $NetBSD: bozohttpd.8,v 1.43 2014/01/02 08:47:38 mrg Exp $ .\ .\ $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\ @@ -368,11 +368,15 @@ Support for these protocols is very mini not supported. .Pp .Nm -can be compiled without CGI support (NO_CGIBIN_SUPPORT), user -transformations (NO_USER_SUPPORT), directory index support (NO_DIRINDEX_SUPPORT), -daemon mode support (NO_DAEMON_MODE), and dynamic MIME content -(NO_DYNAMIC_CONTENT), and SSL support (NO_SSL_SUPPORT) by defining the listed -macros when building +can be compiled without +CGI support (NO_CGIBIN_SUPPORT), +user transformations (NO_USER_SUPPORT), +directory index support (NO_DIRINDEX_SUPPORT), +daemon mode support (NO_DAEMON_MODE), +dynamic MIME content (NO_DYNAMIC_CONTENT), +Lua suport (NO_LUA_SUPPORT), +and SSL support (NO_SSL_SUPPORT) +by defining the listed macros when building .Nm . .Ss HTTP BASIC AUTHORISATION .Nm @@ -522,10 +526,6 @@ The large list of contributors includes: .Aq Mt mbal...@netbsd.org added Lua support for dynamic content creation .It -.An Arnaud Lacombe -.Aq Mt a...@netbsd.org -provided some clean up for memory leaks -.It .An Christoph Badura .Aq Mt b...@bsd.de provided Range: header support @@ -542,6 +542,11 @@ provided an IPv6 bugfix .Aq Mt ch...@research.att.com provided cgi-bin support fixes, and more .It +.An Alistair G. Crooks +.Aq Mt a...@netbsd.org +cleaned up many internal interfaces, made bozohttpd linkable as a +library and provided the Lua binding. +.It .An DEGROOTE Arnaud .Aq Mt degro...@netbsd.org provided a fix for daemon mode @@ -554,11 +559,6 @@ provided directory indexing support .Aq Mt p...@pdc.kth.se provided a fix for a minor (non-security) buffer overflow condition .It -.An Alistair G. Crooks -.Aq Mt a...@netbsd.org -cleaned up many internal interfaces, made bozohttpd linkable as a -library and provided the Lua binding. -.It .An Roland Dowdeswell .Aq Mt el...@netbsd.org added support for serving gzipped files and better SSL handling @@ -595,6 +595,10 @@ provided fixes for HTTP basic authorisat .Aq Mt w...@netbsd.org provided many fixes and enhancements for the man page .It +.An Arnaud Lacombe +.Aq Mt a...@netbsd.org +provided some clean up for memory leaks +.It .An Johnny Lam .Aq Mt j...@netbsd.org provided man page fixes
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Jan 2 13:07:42 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: grep -2.16 out. To generate a diff of this commit: cvs rdiff -u -r1.1083 -r1.1084 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1083 src/doc/3RDPARTY:1.1084 --- src/doc/3RDPARTY:1.1083 Tue Dec 31 20:27:57 2013 +++ src/doc/3RDPARTY Thu Jan 2 13:07:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1083 2013/12/31 20:27:57 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1084 2014/01/02 13:07:42 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -444,7 +444,7 @@ Notes: Package: grep Version: 2.5.1 -Current Vers: 2.15 +Current Vers: 2.16 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/grep/ Home Page: http://www.gnu.org/software/grep/
CVS commit: src/sys/external/bsd/dwc2
Module Name:src
Committed By: skrll
Date: Thu Jan 2 15:54:10 UTC 2014
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
src/sys/external/bsd/dwc2/dist: dwc2_hcd.c dwc2_hcdqueue.c
Log Message:
Protect access of urb-hcpriv by adapting the following change from the
Raspberry PI dwc_otg driver.
https://github.com/raspberrypi/linux/commit/38753ce72d4f10d5d0f1ed27fa691a2ba8910941
dwc_otg: prevent OOPSes during device disconnects
The dwc_otg_urb_enqueue function is thread-unsafe. In particular the
access of urb-hcpriv, usb_hcd_link_urb_to_ep, dwc_otg_urb-qtd and
friends does not occur within a critical section and so if a device
was unplugged during activity there was a high chance that the
usbcore hub_thread would try to disable the endpoint with partially-
formed entries in the URB queue. This would result in BUG() or null
pointer dereferences.
Fix so that access of urb-hcpriv, enqueuing to the hardware and
adding to usbcore endpoint URB lists is contained within a single
critical section.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/dwc2/dwc2.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.22 src/sys/external/bsd/dwc2/dwc2.c:1.23
--- src/sys/external/bsd/dwc2/dwc2.c:1.22 Tue Dec 31 09:10:43 2013
+++ src/sys/external/bsd/dwc2/dwc2.c Thu Jan 2 15:54:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.22 2013/12/31 09:10:43 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.23 2014/01/02 15:54:10 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.22 2013/12/31 09:10:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.23 2014/01/02 15:54:10 skrll Exp $);
#include opt_usb.h
@@ -1298,7 +1298,6 @@ dwc2_device_start(usbd_xfer_handle xfer)
memset(dwc2_urb, 0, sizeof(*dwc2_urb) +
sizeof(dwc2_urb-iso_descs[0]) * DWC2_MAXISOCPACKETS);
- dwc2_urb-priv = xfer;
dwc2_hcd_urb_set_pipeinfo(hsotg, dwc2_urb, addr, epnum, xfertype, dir,
mps);
@@ -1379,6 +1378,9 @@ dwc2_device_start(usbd_xfer_handle xfer)
}
/* might need to check cpu_intr_p */
+ mutex_spin_enter(hsotg-lock);
+
+ dwc2_urb-priv = xfer;
retval = dwc2_hcd_urb_enqueue(hsotg, dwc2_urb, dpipe-priv, 0);
if (retval)
goto fail;
@@ -1389,14 +1391,14 @@ dwc2_device_start(usbd_xfer_handle xfer)
}
if (alloc_bandwidth) {
- mutex_spin_enter(hsotg-lock);
dwc2_allocate_bus_bandwidth(hsotg,
dwc2_hcd_get_ep_bandwidth(hsotg, dpipe),
xfer);
- mutex_spin_exit(hsotg-lock);
}
fail:
+ mutex_spin_exit(hsotg-lock);
+
// mutex_exit(sc-sc_lock);
switch (retval) {
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcd.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.9 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.10
--- src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.9 Sun Nov 24 12:25:19 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.c Thu Jan 2 15:54:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcd.c,v 1.9 2013/11/24 12:25:19 skrll Exp $ */
+/* $NetBSD: dwc2_hcd.c,v 1.10 2014/01/02 15:54:10 skrll Exp $ */
/*
* hcd.c - DesignWare HS OTG Controller host-mode routines
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2_hcd.c,v 1.9 2013/11/24 12:25:19 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2_hcd.c,v 1.10 2014/01/02 15:54:10 skrll Exp $);
#include sys/types.h
#include sys/kmem.h
@@ -367,7 +367,6 @@ dwc2_hcd_urb_enqueue(struct dwc2_hsotg *
{
struct dwc2_softc *sc = hsotg-hsotg_sc;
struct dwc2_qtd *qtd;
- unsigned long flags;
u32 intr_mask;
int retval;
int dev_speed;
@@ -421,11 +420,9 @@ dwc2_hcd_urb_enqueue(struct dwc2_hsotg *
*/
return 0;
- spin_lock_irqsave(hsotg-lock, flags);
tr_type = dwc2_hcd_select_transactions(hsotg);
if (tr_type != DWC2_TRANSACTION_NONE)
dwc2_hcd_queue_transactions(hsotg, tr_type);
- spin_unlock_irqrestore(hsotg-lock, flags);
}
return retval;
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.6 src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.7
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.6 Sun Nov 24 12:25:19 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c Thu Jan 2 15:54:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcdqueue.c,v 1.6 2013/11/24 12:25:19 skrll Exp $ */
+/* $NetBSD: dwc2_hcdqueue.c,v 1.7 2014/01/02 15:54:10 skrll Exp $ */
/*
* hcd_queue.c - DesignWare HS OTG Controller host queuing routines
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2_hcdqueue.c,v 1.6 2013/11/24 12:25:19 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2_hcdqueue.c,v
CVS commit: [matt-nb5-mips64] src/gnu/dist/gdb6/bfd
Module Name:src
Committed By: matt
Date: Thu Jan 2 17:34:43 UTC 2014
Modified Files:
src/gnu/dist/gdb6/bfd [matt-nb5-mips64]: config.bfd
Log Message:
allow arm*{,eb]-*-netbsdelf*
To generate a diff of this commit:
cvs rdiff -u -r1.4.24.1 -r1.4.24.2 src/gnu/dist/gdb6/bfd/config.bfd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/bfd/config.bfd
diff -u src/gnu/dist/gdb6/bfd/config.bfd:1.4.24.1 src/gnu/dist/gdb6/bfd/config.bfd:1.4.24.2
--- src/gnu/dist/gdb6/bfd/config.bfd:1.4.24.1 Sun Aug 23 23:04:08 2009
+++ src/gnu/dist/gdb6/bfd/config.bfd Thu Jan 2 17:34:42 2014
@@ -187,11 +187,11 @@ case ${targ} in
targ_selvecs=bfd_elf32_bigarc_vec
;;
- armeb-*-netbsdelf*)
+ arm*eb-*-netbsdelf*)
targ_defvec=bfd_elf32_bigarm_vec
targ_selvecs=bfd_elf32_littlearm_vec armnetbsd_vec
;;
- arm-*-netbsdelf*)
+ arm*-*-netbsdelf*)
targ_defvec=bfd_elf32_littlearm_vec
targ_selvecs=bfd_elf32_bigarm_vec armnetbsd_vec
;;
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Thu Jan 2 17:43:33 UTC 2014 Modified Files: src/sys/arch/hp300/stand/common: scsi.c Log Message: Change the SCSI select timeout from 2ms to 250ms as kernel spc(4) driver does. Noticed by miod@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/scsi.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/hp300/stand/common/scsi.c diff -u src/sys/arch/hp300/stand/common/scsi.c:1.10 src/sys/arch/hp300/stand/common/scsi.c:1.11 --- src/sys/arch/hp300/stand/common/scsi.c:1.10 Tue Feb 8 20:20:14 2011 +++ src/sys/arch/hp300/stand/common/scsi.c Thu Jan 2 17:43:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: scsi.c,v 1.10 2011/02/08 20:20:14 rmind Exp $ */ +/* $NetBSD: scsi.c,v 1.11 2014/01/02 17:43:32 tsutsui Exp $ */ /* * This is reported to fix some odd failures when disklabeling @@ -181,10 +181,10 @@ issue_select(volatile struct scsidevice hd-scsi_pctl = 0; hd-scsi_temp = (1 target) | our_addr; - /* select timeout is hardcoded to 2ms */ - hd-scsi_tch = 0; - hd-scsi_tcm = 32; - hd-scsi_tcl = 4; + /* select timeout is hardcoded to 250ms */ + hd-scsi_tch = 2; + hd-scsi_tcm = 113; + hd-scsi_tcl = 3; hd-scsi_scmd = SCMD_SELECT; return 0;
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 2 17:47:23 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: sc.c Log Message: Change the SCSI select timeout from 2ms to 250ms as kernel spc(4) driver does. Noticed by miod@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/sc.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/luna68k/stand/boot/sc.c diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.4 src/sys/arch/luna68k/stand/boot/sc.c:1.5 --- src/sys/arch/luna68k/stand/boot/sc.c:1.4 Tue Jan 22 15:48:40 2013 +++ src/sys/arch/luna68k/stand/boot/sc.c Thu Jan 2 17:47:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sc.c,v 1.4 2013/01/22 15:48:40 tsutsui Exp $ */ +/* $NetBSD: sc.c,v 1.5 2014/01/02 17:47:23 tsutsui Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -191,10 +191,10 @@ issue_select(struct scsidevice *hd, u_ch hd-scsi_pctl = 0; hd-scsi_temp = (1 SCSI_ID) | (1 target); - /* select timeout is hardcoded to 2ms */ - hd-scsi_tch = 0; - hd-scsi_tcm = 32; - hd-scsi_tcl = 4; + /* select timeout is hardcoded to 250ms */ + hd-scsi_tch = 2; + hd-scsi_tcm = 113; + hd-scsi_tcl = 3; hd-scsi_scmd = SCMD_SELECT;
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src
Committed By: tho
Date: Thu Jan 2 17:57:58 UTC 2014
Modified Files:
src/crypto/external/bsd/libsaslc/etc: Makefile
src/crypto/external/bsd/libsaslc/etc/mech: Makefile
Log Message:
Do not install files in usr/share/ when MKSHARE=no
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/etc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/etc/mech/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/libsaslc/etc/Makefile
diff -u src/crypto/external/bsd/libsaslc/etc/Makefile:1.3 src/crypto/external/bsd/libsaslc/etc/Makefile:1.4
--- src/crypto/external/bsd/libsaslc/etc/Makefile:1.3 Sun Feb 20 05:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/Makefile Thu Jan 2 17:57:58 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/02/20 05:17:47 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/02 17:57:58 tho Exp $
.include bsd.own.mk
SUBDIR=mech
+.if ${MKSHARE} != no
FILESDIR=/usr/share/examples/libsaslc
FILESOWN=root
FILESGRP=wheel
@@ -19,6 +20,7 @@ CFG_MECH+= EXTERNAL.conf
CFG_MECH+= GSSAPI.conf
CFG_MECH+= LOGIN.conf
CFG_MECH+= PLAIN.conf
+.endif
.include bsd.files.mk
.include bsd.subdir.mk
Index: src/crypto/external/bsd/libsaslc/etc/mech/Makefile
diff -u src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.2 src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.3
--- src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.2 Sun Feb 20 05:42:34 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/Makefile Thu Jan 2 17:57:58 2014
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 05:42:34 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/02 17:57:58 tho Exp $
.include bsd.own.mk
+.if ${MKSHARE} != no
FILESDIR=/usr/share/examples/libsaslc/mech
FILESOWN=root
FILESGRP=wheel
@@ -15,5 +16,6 @@ FILES+= EXTERNAL.conf
FILES+= GSSAPI.conf
FILES+= LOGIN.conf
FILES+= PLAIN.conf
+.endif
.include bsd.prog.mk
CVS commit: src/distrib/sets/lists
Module Name:src
Committed By: tho
Date: Thu Jan 2 18:04:28 UTC 2014
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/misc: mi
Log Message:
Fix a few share flags
. Add missing share flag on usr/share/examples/npf files.
. Drop share for directories in examples/{libsaslc,npf,tmux}. This is how it
is done for other directories in usr/share.
This fixes checkflist with MKSHARE=no.
ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.1055 -r1.1056 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.187 -r1.188 src/distrib/sets/lists/misc/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1055 src/distrib/sets/lists/base/mi:1.1056
--- src/distrib/sets/lists/base/mi:1.1055 Sat Dec 28 02:32:01 2013
+++ src/distrib/sets/lists/base/mi Thu Jan 2 18:04:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1055 2013/12/28 02:32:01 rjs Exp $
+# $NetBSD: mi,v 1.1056 2014/01/02 18:04:28 tho Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -1764,18 +1764,18 @@
./usr/share/examples/ipf base-netutil-examples
./usr/share/examples/isdn base-isdn-examples
./usr/share/examples/kerberos base-krb5-examples
-./usr/share/examples/lua base-sys-examples share
+./usr/share/examples/lua base-sys-examples
./usr/share/examples/lua/README base-sys-examples share
./usr/share/examples/lua/gpio.lua base-sys-examples share
./usr/share/examples/lua/sqlite.lua base-sys-examples share
./usr/share/examples/mount_portal base-miscfs-examples
./usr/share/examples/named base-obsolete obsolete
./usr/share/examples/npf base-netutil-examples
-./usr/share/examples/npf/hashtablefile base-netutil-examples
-./usr/share/examples/npf/host-npf.conf base-netutil-examples
-./usr/share/examples/npf/l2tp_gw-npf.conf base-netutil-examples
-./usr/share/examples/npf/soho_gw-npf.conf base-netutil-examples
-./usr/share/examples/npf/treetablefile base-netutil-examples
+./usr/share/examples/npf/hashtablefile base-netutil-examples share
+./usr/share/examples/npf/host-npf.conf base-netutil-examples share
+./usr/share/examples/npf/l2tp_gw-npf.conf base-netutil-examples share
+./usr/share/examples/npf/soho_gw-npf.conf base-netutil-examples share
+./usr/share/examples/npf/treetablefile base-netutil-examples share
./usr/share/examples/openssl base-crypto-examples
./usr/share/examples/pfbase-netutil-examples
./usr/share/examples/postfix base-postfix-examples
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.187 src/distrib/sets/lists/misc/mi:1.188
--- src/distrib/sets/lists/misc/mi:1.187 Sat Dec 28 14:13:40 2013
+++ src/distrib/sets/lists/misc/mi Thu Jan 2 18:04:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.187 2013/12/28 14:13:40 mrg Exp $
+# $NetBSD: mi,v 1.188 2014/01/02 18:04:28 tho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -766,9 +766,9 @@
./usr/share/examples/kyua-cli misc-kyua-examples
./usr/share/examples/kyua-cli/Kyuafile.top misc-kyua-examples share,kyua
./usr/share/examples/kyua-cli/kyua.conf misc-kyua-examples share,kyua
-./usr/share/examples/libsaslc misc-libsaslc-examples share
+./usr/share/examples/libsaslc misc-libsaslc-examples
./usr/share/examples/libsaslc/README misc-libsaslc-examples share
-./usr/share/examples/libsaslc/mech misc-libsaslc-examples share
+./usr/share/examples/libsaslc/mech misc-libsaslc-examples
./usr/share/examples/libsaslc/mech/ANONYMOUS.conf misc-libsaslc-examples share
./usr/share/examples/libsaslc/mech/CRAM-MD5.conf misc-libsaslc-examples share
./usr/share/examples/libsaslc/mech/DIGEST-MD5.conf misc-libsaslc-examples share
@@ -943,7 +943,7 @@
./usr/share/examples/supfiles/sup2.fr.netbsd.org misc-sup-examples share
./usr/share/examples/syslogd/all.debug misc-sysutil-examples share
./usr/share/examples/syslogd/all.newsyslog.conf misc-sysutil-examples share
-./usr/share/examples/tmux misc-tmux-examples share
+./usr/share/examples/tmux misc-tmux-examples
./usr/share/examples/tmux/screen-keys.conf misc-tmux-examples share
./usr/share/examples/usermgmt misc-obsolete obsolete
./usr/share/examples/usermgmt/.cshrc misc-obsolete obsolete
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: joerg
Date: Thu Jan 2 18:26:03 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/libntp: prettydate.c
Log Message:
Use separate variables for the format strings to get working format
string checking with both GCC and Clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libntp/prettydate.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/bsd/ntp/dist/libntp/prettydate.c
diff -u src/external/bsd/ntp/dist/libntp/prettydate.c:1.2 src/external/bsd/ntp/dist/libntp/prettydate.c:1.3
--- src/external/bsd/ntp/dist/libntp/prettydate.c:1.2 Sat Dec 28 03:20:13 2013
+++ src/external/bsd/ntp/dist/libntp/prettydate.c Thu Jan 2 18:26:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: prettydate.c,v 1.2 2013/12/28 03:20:13 christos Exp $ */
+/* $NetBSD: prettydate.c,v 1.3 2014/01/02 18:26:03 joerg Exp $ */
/*
* prettydate - convert a time stamp to something readable
@@ -159,10 +159,10 @@ common_prettydate(
int local
)
{
- static const char* pfmt[2] = {
- %08lx.%08lx %s, %s %2d %4d %2d:%02d:%02d.%03u,
- %08lx.%08lx [%s, %s %2d %4d %2d:%02d:%02d.%03u UTC]
- };
+ static const char pfmt0[] =
+ %08lx.%08lx %s, %s %2d %4d %2d:%02d:%02d.%03u;
+ static const char pfmt1[] =
+ %08lx.%08lx [%s, %s %2d %4d %2d:%02d:%02d.%03u UTC];
char *bp;
struct tm *tm;
@@ -188,13 +188,13 @@ common_prettydate(
*/
struct calendar jd;
ntpcal_time_to_date(jd, sec);
- snprintf(bp, LIB_BUFLENGTH, pfmt[local != 0],
+ snprintf(bp, LIB_BUFLENGTH, local ? pfmt1 : pfmt0,
(u_long)ts-l_ui, (u_long)ts-l_uf,
daynames[jd.weekday], months[jd.month-1],
jd.monthday, jd.year, jd.hour,
jd.minute, jd.second, msec);
} else
- snprintf(bp, LIB_BUFLENGTH, pfmt[0],
+ snprintf(bp, LIB_BUFLENGTH, pfmt0,
(u_long)ts-l_ui, (u_long)ts-l_uf,
daynames[tm-tm_wday], months[tm-tm_mon],
tm-tm_mday, 1900 + tm-tm_year, tm-tm_hour,
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Thu Jan 2 18:29:01 UTC 2014
Modified Files:
src/sys/net: if.c
src/sys/netinet: in_proto.c tcp_subr.c tcp_timer.c tcp_var.h
udp_usrreq.c udp_var.h
src/sys/netinet6: in6_proto.c in6_var.h udp6_usrreq.c
src/sys/rump/net/lib/libnetinet: component.c
src/sys/rump/net/lib/libnetinet6: component.c
Log Message:
Allow kernels compiled with INET+INET6 to be booted as IPv4-only or IPv6-only.
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/net/if.c
cvs rdiff -u -r1.106 -r1.107 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.252 -r1.253 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.86 -r1.87 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.171 -r1.172 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.191 -r1.192 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.38 -r1.39 src/sys/netinet/udp_var.h
cvs rdiff -u -r1.99 -r1.100 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.66 -r1.67 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.91 -r1.92 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libnetinet/component.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetinet6/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.269 src/sys/net/if.c:1.270
--- src/sys/net/if.c:1.269 Sat Oct 19 21:39:12 2013
+++ src/sys/net/if.c Thu Jan 2 18:29:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.269 2013/10/19 21:39:12 mrg Exp $ */
+/* $NetBSD: if.c,v 1.270 2014/01/02 18:29:01 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.269 2013/10/19 21:39:12 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.270 2014/01/02 18:29:01 pooka Exp $);
#include opt_inet.h
@@ -1358,7 +1358,7 @@ if_link_state_change(struct ifnet *ifp,
* listeners would have an address and expect it to work right
* away.
*/
- if (link_state == LINK_STATE_UP
+ if (in6_present link_state == LINK_STATE_UP
old_link_state == LINK_STATE_UNKNOWN)
in6_if_link_down(ifp);
#endif
@@ -1372,10 +1372,12 @@ if_link_state_change(struct ifnet *ifp,
#endif
#ifdef INET6
- if (link_state == LINK_STATE_DOWN)
- in6_if_link_down(ifp);
- else if (link_state == LINK_STATE_UP)
- in6_if_link_up(ifp);
+ if (in6_present) {
+ if (link_state == LINK_STATE_DOWN)
+ in6_if_link_down(ifp);
+ else if (link_state == LINK_STATE_UP)
+ in6_if_link_up(ifp);
+ }
#endif
splx(s);
@@ -1402,7 +1404,8 @@ if_down(struct ifnet *ifp)
#endif
rt_ifmsg(ifp);
#ifdef INET6
- in6_if_down(ifp);
+ if (in6_present)
+ in6_if_down(ifp);
#endif
}
@@ -1431,7 +1434,8 @@ if_up(struct ifnet *ifp)
#endif
rt_ifmsg(ifp);
#ifdef INET6
- in6_if_up(ifp);
+ if (in6_present)
+ in6_if_up(ifp);
#endif
}
@@ -1906,7 +1910,7 @@ ifioctl(struct socket *so, u_long cmd, v
if (((oif_flags ^ ifp-if_flags) IFF_UP) != 0) {
#ifdef INET6
- if ((ifp-if_flags IFF_UP) != 0) {
+ if (in6_present (ifp-if_flags IFF_UP) != 0) {
int s = splnet();
in6_if_up(ifp);
splx(s);
Index: src/sys/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.106 src/sys/netinet/in_proto.c:1.107
--- src/sys/netinet/in_proto.c:1.106 Wed Jun 5 19:01:26 2013
+++ src/sys/netinet/in_proto.c Thu Jan 2 18:29:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.c,v 1.106 2013/06/05 19:01:26 christos Exp $ */
+/* $NetBSD: in_proto.c,v 1.107 2014/01/02 18:29:01 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in_proto.c,v 1.106 2013/06/05 19:01:26 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: in_proto.c,v 1.107 2014/01/02 18:29:01 pooka Exp $);
#include opt_mrouting.h
#include opt_inet.h
@@ -200,7 +200,6 @@ const struct protosw inetsw[] = {
.pr_usrreq = tcp_usrreq,
.pr_init = tcp_init,
.pr_fasttimo = tcp_fasttimo,
- .pr_slowtimo = tcp_slowtimo,
.pr_drain = tcp_drainstub,
},
{ .pr_type = SOCK_RAW,
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.252 src/sys/netinet/tcp_subr.c:1.253
--- src/sys/netinet/tcp_subr.c:1.252 Sat Nov 23 14:20:21 2013
+++ src/sys/netinet/tcp_subr.c Thu Jan 2 18:29:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.252 2013/11/23 14:20:21 christos Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.253 2014/01/02 18:29:01 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.252 2013/11/23 14:20:21 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.253 2014/01/02 18:29:01 pooka Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -104,6 +104,7 @@ __KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v
#include sys/systm.h
#include sys/malloc.h
#include
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 2 18:45:24 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: sc.c
Log Message:
Add bound check of a controller number in scrun().
Noticed by miod@openbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/sc.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/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.5 src/sys/arch/luna68k/stand/boot/sc.c:1.6
--- src/sys/arch/luna68k/stand/boot/sc.c:1.5 Thu Jan 2 17:47:23 2014
+++ src/sys/arch/luna68k/stand/boot/sc.c Thu Jan 2 18:45:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.5 2014/01/02 17:47:23 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.6 2014/01/02 18:45:24 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -254,8 +254,14 @@ int
scrun(int ctlr, int slave, u_char *cdb, int cdblen, u_char *buf, int len,
volatile int *lock)
{
- struct scsi_softc *hs = scsi_softc[ctlr];
- struct scsidevice *hd = (struct scsidevice *) hs-sc_hc-hp_addr;
+ struct scsi_softc *hs;
+ struct scsidevice *hd;
+
+ if (ctlr 0 || ctlr = NSC)
+ return 0;
+
+ hs = scsi_softc[ctlr];
+ hd = (struct scsidevice *)hs-sc_hc-hp_addr;
if (hd-scsi_ssts (SSTS_INITIATOR|SSTS_TARGET|SSTS_BUSY))
return(0);
CVS commit: src/sys/netinet
Module Name:src Committed By: pooka Date: Thu Jan 2 18:52:04 UTC 2014 Modified Files: src/sys/netinet: tcp_subr.c Log Message: need atomic.h, from uwe To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/sys/netinet/tcp_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet/tcp_subr.c diff -u src/sys/netinet/tcp_subr.c:1.253 src/sys/netinet/tcp_subr.c:1.254 --- src/sys/netinet/tcp_subr.c:1.253 Thu Jan 2 18:29:01 2014 +++ src/sys/netinet/tcp_subr.c Thu Jan 2 18:52:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_subr.c,v 1.253 2014/01/02 18:29:01 pooka Exp $ */ +/* $NetBSD: tcp_subr.c,v 1.254 2014/01/02 18:52:04 pooka Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.253 2014/01/02 18:29:01 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.254 2014/01/02 18:52:04 pooka Exp $); #include opt_inet.h #include opt_ipsec.h @@ -100,6 +100,7 @@ __KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v #include opt_mbuftrace.h #include sys/param.h +#include sys/atomic.h #include sys/proc.h #include sys/systm.h #include sys/malloc.h
CVS commit: src/sys/arch/shark/ofw
Module Name:src
Committed By: joerg
Date: Thu Jan 2 19:00:39 UTC 2014
Modified Files:
src/sys/arch/shark/ofw: chipsfb_ofbus.c igsfb_ofbus.c
Log Message:
Fix const use.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/shark/ofw/chipsfb_ofbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/ofw/igsfb_ofbus.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/shark/ofw/chipsfb_ofbus.c
diff -u src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.3 src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.4
--- src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.3 Wed Aug 22 21:15:17 2012
+++ src/sys/arch/shark/ofw/chipsfb_ofbus.c Thu Jan 2 19:00:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb_ofbus.c,v 1.3 2012/08/22 21:15:17 macallan Exp $ */
+/* $NetBSD: chipsfb_ofbus.c,v 1.4 2014/01/02 19:00:39 joerg Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: chipsfb_ofbus.c,v 1.3 2012/08/22 21:15:17 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: chipsfb_ofbus.c,v 1.4 2014/01/02 19:00:39 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -73,7 +73,7 @@ int chipsfb_ofbus_cnattach(bus_space_tag
CFATTACH_DECL_NEW(chipsfb_ofbus, sizeof(struct chipsfb_softc),
chipsfb_ofbus_match, chipsfb_ofbus_attach, NULL, NULL);
-static const char const *compat_strings[] = { CHPS,ct65550, NULL };
+static const char * const compat_strings[] = { CHPS,ct65550, NULL };
vaddr_t chipsfb_mem_vaddr = 0, chipsfb_mmio_vaddr = 0;
paddr_t chipsfb_mem_paddr;
Index: src/sys/arch/shark/ofw/igsfb_ofbus.c
diff -u src/sys/arch/shark/ofw/igsfb_ofbus.c:1.14 src/sys/arch/shark/ofw/igsfb_ofbus.c:1.15
--- src/sys/arch/shark/ofw/igsfb_ofbus.c:1.14 Sat Oct 27 17:18:11 2012
+++ src/sys/arch/shark/ofw/igsfb_ofbus.c Thu Jan 2 19:00:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_ofbus.c,v 1.14 2012/10/27 17:18:11 chs Exp $ */
+/* $NetBSD: igsfb_ofbus.c,v 1.15 2014/01/02 19:00:39 joerg Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: igsfb_ofbus.c,v 1.14 2012/10/27 17:18:11 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: igsfb_ofbus.c,v 1.15 2014/01/02 19:00:39 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -73,7 +73,7 @@ static paddr_t igsfb_ofbus_mmap(void *,
CFATTACH_DECL_NEW(igsfb_ofbus, sizeof(struct igsfb_softc),
igsfb_ofbus_match, igsfb_ofbus_attach, NULL, NULL);
-static const char const *compat_strings[] = { igs,cyperpro2010, NULL };
+static const char * const compat_strings[] = { igs,cyperpro2010, NULL };
vaddr_t igsfb_mem_vaddr = 0, igsfb_mmio_vaddr = 0;
paddr_t igsfb_mem_paddr;
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Thu Jan 2 19:15:07 UTC 2014
Modified Files:
src/sys/sys: exec_elf.h
Log Message:
Add more gnu sections
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/sys/exec_elf.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/sys/exec_elf.h
diff -u src/sys/sys/exec_elf.h:1.133 src/sys/sys/exec_elf.h:1.134
--- src/sys/sys/exec_elf.h:1.133 Wed Jan 1 13:57:16 2014
+++ src/sys/sys/exec_elf.h Thu Jan 2 14:15:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.h,v 1.133 2014/01/01 18:57:16 dsl Exp $ */
+/* $NetBSD: exec_elf.h,v 1.134 2014/01/02 19:15:07 christos Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -418,7 +418,10 @@ typedef struct {
#define SHT_NUM 19
#define SHT_LOOS 0x6000 /* Operating system specific range */
+#define SHT_GNU_INCREMENTAL_INPUTS 0x6fff4700 /* GNU incremental build data */
+#define SHT_GNU_ATTRIBUTES 0x6ff5 /* GNU object attributes */
#define SHT_GNU_HASH 0x6ff6 /* GNU style symbol hash table */
+#define SHT_GNU_LIBLIST 0x6ff7 /* GNU list of prelink dependencies */
#define SHT_SUNW_move 0x6ffa
#define SHT_SUNW_syminfo 0x6ffc
#define SHT_SUNW_verdef 0x6ffd /* Versions defined by file */
CVS commit: src/external/bsd/libelf/dist
Module Name:src Committed By: christos Date: Thu Jan 2 19:20:35 UTC 2014 Modified Files: src/external/bsd/libelf/dist: libelf.h libelf_data.c Log Message: add gnu attributes to the known sections To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libelf/dist/libelf.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libelf/dist/libelf_data.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/bsd/libelf/dist/libelf.h diff -u src/external/bsd/libelf/dist/libelf.h:1.7 src/external/bsd/libelf/dist/libelf.h:1.8 --- src/external/bsd/libelf/dist/libelf.h:1.7 Mon Feb 22 05:48:32 2010 +++ src/external/bsd/libelf/dist/libelf.h Thu Jan 2 14:20:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libelf.h,v 1.7 2010/02/22 10:48:32 darran Exp $ */ +/* $NetBSD: libelf.h,v 1.8 2014/01/02 19:20:35 christos Exp $ */ /*- * Copyright (c) 2006 Joseph Koshy @@ -54,6 +54,7 @@ # define __LIBELF_HAVE_ELF_NOTE 1 # define __LIBELF_HAVE_ELF_SYMINFO 1 # define __LIBELF_HAVE_ELF_VERS 1 +# define __LIBELF_HAVE_ELF_ATTRIBUTES 1 #elif defined(__FreeBSD__) # include sys/elf32.h # include sys/elf64.h Index: src/external/bsd/libelf/dist/libelf_data.c diff -u src/external/bsd/libelf/dist/libelf_data.c:1.5 src/external/bsd/libelf/dist/libelf_data.c:1.6 --- src/external/bsd/libelf/dist/libelf_data.c:1.5 Thu Jun 20 21:36:31 2013 +++ src/external/bsd/libelf/dist/libelf_data.c Thu Jan 2 14:20:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libelf_data.c,v 1.5 2013/06/21 01:36:31 christos Exp $ */ +/* $NetBSD: libelf_data.c,v 1.6 2014/01/02 19:20:35 christos Exp $ */ /*- * Copyright (c) 2006 Joseph Koshy @@ -87,6 +87,10 @@ _libelf_xlate_shtype(uint32_t sht) case SHT_SUNW_syminfo: return (ELF_T_SYMINFO); #endif /* __LIBELF_HAVE_ELF_SYMINFO */ +#if defined(__LIBELF_HAVE_ELF_ATTRIBUTES) + case SHT_GNU_ATTRIBUTES: + return (ELF_T_BYTE); /* XXX */ +#endif /* __LIBELF_HAVE_ELF_ATTRIBUTES */ default: if (sht = SHT_LOPROC sht = SHT_HIPROC) return (ELF_T_BYTE);
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Jan 2 19:25:08 UTC 2014
Modified Files:
src/share/mk: sys.mk
Log Message:
disable ctf handling for the shuttle .c - '' rule since we don't create
an object file to work on.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.119 src/share/mk/sys.mk:1.120
--- src/share/mk/sys.mk:1.119 Tue Dec 31 13:46:09 2013
+++ src/share/mk/sys.mk Thu Jan 2 14:25:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.119 2013/12/31 18:46:09 christos Exp $
+# $NetBSD: sys.mk,v 1.120 2014/01/02 19:25:08 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -118,9 +118,10 @@ YACC.y?= ${YACC} ${YFLAGS}
# C
.c:
${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+# XXX: disable for now
+#.if defined(CTFCONVERT)
+# ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+#.endif
.c.o:
${COMPILE.c} ${.IMPSRC}
.if defined(CTFCONVERT)
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 2 19:50:03 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: sc.c scsi.c
Log Message:
Replace broken (by SCCS) ISO-2022-JP comments with UTF-8.
Recovered and decoded by isaki@.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/sc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/scsi.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/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.6 src/sys/arch/luna68k/stand/boot/sc.c:1.7
--- src/sys/arch/luna68k/stand/boot/sc.c:1.6 Thu Jan 2 18:45:24 2014
+++ src/sys/arch/luna68k/stand/boot/sc.c Thu Jan 2 19:50:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.6 2014/01/02 18:45:24 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.7 2014/01/02 19:50:03 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -419,13 +419,13 @@ scsi_request_sense(int ctlr, int slave,
printf(scsi_request_sense: Start\n);
#endif
- /* Request Sense$Nl9g!EAw$5$l$k%G!%?D9$O%?!%2368H$K0MB8$7!*/
- /* %;%s%9%G!%?$N#8/usr/src/sys/luna68k/stand/SCCS/s.sc.c$%HL\$NAddtional Sens Length$K$h$jF0E*$K7hDj$9$k!#*/
- /* $3$3$G$O%G!%?!EAw?t$rcdb$NAllocation Length$K:GDcD9$G$$k#8/usr/src/sys/luna68k/stand/SCCS/s.sc.c$%H */
- /* $r8GDj$7$F!#S#P#C$N=hM}%7!%1%s%9$rJx$5$J$$$h$$K$7$F$$$k!# */
+ /* Request Senseの場合、転送されるデータ長はターゲットに依存し、*/
+ /* センスデータの８バイト目のAdditional Sens Lengthにより動的に決定する。*/
+ /* ここではデーター転送数をcdbのAllocation Lengthに最低長である８バイト */
+ /* を固定して、ＳＰＣの処理シーケンスを崩さないようにしている。 */
- /* %F!@(#)sc.c 8.1f%K373H$NuBV$rD4$Y$k$?$a!Addtional Sens Field$r%%/%;%9$9$k */
- /* I,MW$,$$k$N$G6/10/93P%$%98.1i%$%PB$Glen$r7hDj$9$k$3$H$K$9$k*/
+ /* テープユニットの状態を調べるため、Addtional Sens Fieldをアクセスする */
+ /* 必要があるのでデバイスドライバ側でlenを決定することにする*/
cdb.lun = unit;
cdb.len = len;
Index: src/sys/arch/luna68k/stand/boot/scsi.c
diff -u src/sys/arch/luna68k/stand/boot/scsi.c:1.2 src/sys/arch/luna68k/stand/boot/scsi.c:1.3
--- src/sys/arch/luna68k/stand/boot/scsi.c:1.2 Sun Jan 20 07:32:45 2013
+++ src/sys/arch/luna68k/stand/boot/scsi.c Thu Jan 2 19:50:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.2 2013/01/20 07:32:45 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.3 2014/01/02 19:50:03 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -84,9 +84,9 @@
int scsi_device = 6;
-#define SENSBUFF 8 /* 6/10/93P%$%98.1i%$%P$G%;%s%9%G!%? */
- /* $ND9$5$r#8/usr/src/sys/luna68k/stand/SCCS/s.scsi.c$%H0JFb$K8GDj$7$F */
-u_char sensbuff[SENSBUFF];/* #80Je$OL50UL#$G$$k!# */
+#define SENSBUFF 8 /* デバイスドライバでセンスデータ */
+ /* の長さを８バイト以内に固定して */
+u_char sensbuff[SENSBUFF];/* ８以上は無意味である。 */
static struct scsi_inquiry inquirybuf;
static struct scsi_fmt_cdb inquiry = {
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 2 20:02:00 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: bmd.c font.c samachdep.h
Log Message:
Misc cleanup. Mostly from OpenBSD/luna88k.
- fix isprint() macro
- hight - height
- remove an unused function
- adjust tabs/spaces
- constify the bitmap font
- consistently use #definespace
- use #if 0/#endif to disable code block
- u_long - uint32_t, u_short - uint16_t
- some KNF
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/bmd.c \
src/sys/arch/luna68k/stand/boot/font.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/stand/boot/samachdep.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/luna68k/stand/boot/bmd.c
diff -u src/sys/arch/luna68k/stand/boot/bmd.c:1.2 src/sys/arch/luna68k/stand/boot/bmd.c:1.3
--- src/sys/arch/luna68k/stand/boot/bmd.c:1.2 Sun Jan 20 13:35:43 2013
+++ src/sys/arch/luna68k/stand/boot/bmd.c Thu Jan 2 20:02:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bmd.c,v 1.2 2013/01/20 13:35:43 tsutsui Exp $ */
+/* $NetBSD: bmd.c,v 1.3 2014/01/02 20:02:00 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -80,8 +80,6 @@
#include sys/param.h
#include luna68k/stand/boot/samachdep.h
-#define isprint(c) ( c 0x20 ? 0 : 1)
-
/*
* RFCNT register
*/
@@ -94,37 +92,36 @@ union bmd_rfcnt {
uint32_t u;
};
+#define isprint(c) ((c) = 0x20 (c) 0x7f)
/*
- * Width Hight
+ * Width Height
*/
-#define PB_WIDTH 2048/* Plane Width (Bit) */
-#define PB_HIGHT 1024/* Plane Hight (Bit) */
-#define PL_WIDTH 64/* Plane Width (long) */
-#define PS_WIDTH 128/* Plane Width (long) */
-#define P_WIDTH 256/* Plane Width (Byte) */
-
-#define SB_WIDTH 1280/* Screen Width (Bit) */
-#define SB_HIGHT 1024/* Screen Hight (Bit) */
-#define SL_WIDTH 40/* Screen Width (Long) */
-#define S_WIDTH 160/* Screen Width (Byte) */
+#define PB_WIDTH 2048 /* Plane Width (Bit) */
+#define PB_HEIGHT 1024 /* Plane Hight (Bit) */
+#define PL_WIDTH 64 /* Plane Width (long) */
+#define PS_WIDTH 128 /* Plane Width (long) */
+#define P_WIDTH 256 /* Plane Width (Byte) */
-#define FB_WIDTH 12/* Font Width(Bit) */
-#define FB_HIGHT 20/* Font Hight(Bit) */
+#define SB_WIDTH 1280 /* Screen Width (Bit) */
+#define SB_HEIGHT 1024 /* Screen Hight (Bit) */
+#define SL_WIDTH 40 /* Screen Width (Long) */
+#define S_WIDTH 160 /* Screen Width (Byte) */
+#define FB_WIDTH 12 /* Font Width(Bit) */
+#define FB_HEIGHT 20 /* Font Hight(Bit) */
-#define NEXT_LINE(addr)( addr + (PL_WIDTH * FB_HIGHT) )
-#define SKIP_NEXT_LINE(addr) ( addr += (PL_WIDTH - SL_WIDTH) )
+#define NEXT_LINE(addr) ( addr + (PL_WIDTH * FB_HEIGHT) )
+#define SKIP_NEXT_LINE(addr) ( addr += (PL_WIDTH - SL_WIDTH) )
-void bmd_add_new_line(void);
void bmd_draw_char(char *, char *, int, int, int);
void bmd_reverse_char(char *, char *, int, int);
void bmd_erase_char(char *, char *, int, int);
-void bmd_erase_screen(volatile u_long *);
-void bmd_scroll_screen(volatile u_long *, volatile u_long *,
+void bmd_erase_screen(volatile uint32_t *);
+void bmd_scroll_screen(volatile uint32_t *, volatile uint32_t *,
int, int, int, int);
@@ -152,9 +149,9 @@ struct bmd_softc {
void (*bc_escape)(int);
};
-#define STAT_NORMAL 0x
-#define STAT_ESCAPE 0x0001
-#define STAT_INSERT 0x0100
+#define STAT_NORMAL 0x
+#define STAT_ESCAPE 0x0001
+#define STAT_INSERT 0x0100
struct bmd_softc bmd_softc;
struct bmd_linec bmd_linec[52];
@@ -224,11 +221,11 @@ bmd_escape_0(int c)
break;
default:
-/*
+#if 0
*bp-bc_esc++ = c;
bp-bc_escape = bmd_escape_1;
return;
- */
+#endif
break;
}
@@ -293,10 +290,10 @@ bmdinit(void)
* adjust plane position
*/
- bp-bc_raddr = (char *) 0xB10C0008; /* plane-0 hardware address */
- bp-bc_waddr = (char *) 0xB1080008; /* common bitmap hardware address */
- rfcnt.p.rfc_hcnt = 7;/* shift left 16 dot */
- rfcnt.p.rfc_vcnt = -27;/* shift down1 dot */
+ bp-bc_raddr = (char *) 0xB10C0008; /* plane-0 hardware address */
+ bp-bc_waddr = (char *) 0xB1080008; /* common bitmap hardware address */
+ rfcnt.p.rfc_hcnt = 7; /* shift left 16 dot */
+ rfcnt.p.rfc_vcnt = -27; /* shift down1 dot */
*bmd_rfcnt = rfcnt.u;
bp-bc_stat = STAT_NORMAL;
@@ -324,7 +321,7 @@ bmdinit(void)
bp-bc_escape = bmd_escape;
*bmd_bmsel = 0xff;/* all planes */
- bmd_erase_screen((u_long *) bp-bc_waddr); /* clear screen */
+ bmd_erase_screen((uint32_t *)bp-bc_waddr); /* clear screen */
*bmd_bmsel = 0x01;/* 1 plane */
/* turn on cursole */
@@ -375,8 +372,8 @@ bmdputc(int c)
bq-bl_col = bq-bl_end = bp-bc_xmin;
bp-bc_row++;
if (bp-bc_row = bp-bc_ymax) {
-bmd_scroll_screen((u_long *) bp-bc_raddr,
- (u_long *)
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: christos
Date: Thu Jan 2 20:12:23 UTC 2014
Modified Files:
src/lib/libc/rpc: rpcb_clnt.c
Log Message:
don't lose the RPC error from CLNT_CALL.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/rpc/rpcb_clnt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/rpcb_clnt.c
diff -u src/lib/libc/rpc/rpcb_clnt.c:1.29 src/lib/libc/rpc/rpcb_clnt.c:1.30
--- src/lib/libc/rpc/rpcb_clnt.c:1.29 Mon Mar 11 16:19:29 2013
+++ src/lib/libc/rpc/rpcb_clnt.c Thu Jan 2 15:12:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_clnt.c,v 1.29 2013/03/11 20:19:29 tron Exp $ */
+/* $NetBSD: rpcb_clnt.c,v 1.30 2014/01/02 20:12:23 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro;
#else
-__RCSID($NetBSD: rpcb_clnt.c,v 1.29 2013/03/11 20:19:29 tron Exp $);
+__RCSID($NetBSD: rpcb_clnt.c,v 1.30 2014/01/02 20:12:23 christos Exp $);
#endif
#endif
@@ -578,9 +578,12 @@ rpcb_set(rpcprog_t program, rpcvers_t ve
(void) snprintf(uidbuf, sizeof uidbuf, %d, geteuid());
parms.r_owner = uidbuf;
- CLNT_CALL(client, (rpcproc_t)RPCBPROC_SET, (xdrproc_t) xdr_rpcb,
+ if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_SET, (xdrproc_t) xdr_rpcb,
(char *)(void *)parms, (xdrproc_t) xdr_bool,
- (char *)(void *)rslt, tottimeout);
+ (char *)(void *)rslt, tottimeout) != RPC_SUCCESS) {
+ rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+ clnt_geterr(client, rpc_createerr.cf_error);
+ }
CLNT_DESTROY(client);
free(parms.r_addr);
@@ -617,9 +620,12 @@ rpcb_unset(rpcprog_t program, rpcvers_t
(void) snprintf(uidbuf, sizeof uidbuf, %d, geteuid());
parms.r_owner = uidbuf;
- CLNT_CALL(client, (rpcproc_t)RPCBPROC_UNSET, (xdrproc_t) xdr_rpcb,
+ if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_UNSET, (xdrproc_t) xdr_rpcb,
(char *)(void *)parms, (xdrproc_t) xdr_bool,
- (char *)(void *)rslt, tottimeout);
+ (char *)(void *)rslt, tottimeout) != RPC_SUCCESS) {
+ rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+ clnt_geterr(client, rpc_createerr.cf_error);
+ }
CLNT_DESTROY(client);
return (rslt);
@@ -1218,9 +1224,13 @@ rpcb_taddr2uaddr(struct netconfig *nconf
return (NULL);
}
- CLNT_CALL(client, (rpcproc_t)RPCBPROC_TADDR2UADDR,
+ if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_TADDR2UADDR,
(xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
- (xdrproc_t) xdr_wrapstring, (char *)(void *)uaddr, tottimeout);
+ (xdrproc_t) xdr_wrapstring, (char *)(void *)uaddr, tottimeout)
+ != RPC_SUCCESS) {
+ rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+ clnt_geterr(client, rpc_createerr.cf_error);
+ }
CLNT_DESTROY(client);
return (uaddr);
}
@@ -1259,6 +1269,8 @@ rpcb_uaddr2taddr(struct netconfig *nconf
(xdrproc_t) xdr_wrapstring, (char *)(void *)uaddr,
(xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
tottimeout) != RPC_SUCCESS) {
+ rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+ clnt_geterr(client, rpc_createerr.cf_error);
free(taddr);
taddr = NULL;
}
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: joerg
Date: Thu Jan 2 21:35:50 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_true.c
Log Message:
Add format string attribute for better detection.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/ntpd/refclock_true.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/bsd/ntp/dist/ntpd/refclock_true.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_true.c:1.1.1.3 src/external/bsd/ntp/dist/ntpd/refclock_true.c:1.2
--- src/external/bsd/ntp/dist/ntpd/refclock_true.c:1.1.1.3 Fri Dec 27 23:31:00 2013
+++ src/external/bsd/ntp/dist/ntpd/refclock_true.c Thu Jan 2 21:35:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_true.c,v 1.1.1.3 2013/12/27 23:31:00 christos Exp $ */
+/* $NetBSD: refclock_true.c,v 1.2 2014/01/02 21:35:50 joerg Exp $ */
/*
* refclock_true - clock driver for the Kinemetrics Truetime receivers
@@ -203,6 +203,7 @@ struct refclock refclock_true = {
#if !defined(__STDC__)
# define true_debug (void)
#else
+NTP_PRINTF(2, 3)
static void
true_debug(struct peer *peer, const char *fmt, ...)
{
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: joerg
Date: Thu Jan 2 21:35:19 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/libntp: timetoa.c
Log Message:
Avoid pointer operations on the format string.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/libntp/timetoa.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/bsd/ntp/dist/libntp/timetoa.c
diff -u src/external/bsd/ntp/dist/libntp/timetoa.c:1.1.1.1 src/external/bsd/ntp/dist/libntp/timetoa.c:1.2
--- src/external/bsd/ntp/dist/libntp/timetoa.c:1.1.1.1 Fri Dec 27 23:30:48 2013
+++ src/external/bsd/ntp/dist/libntp/timetoa.c Thu Jan 2 21:35:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: timetoa.c,v 1.1.1.1 2013/12/27 23:30:48 christos Exp $ */
+/* $NetBSD: timetoa.c,v 1.2 2014/01/02 21:35:19 joerg Exp $ */
/*
* timetoa.c -- time_t related string formatting
@@ -59,14 +59,12 @@ format_time_fraction(
u_int u;
long fraclimit;
int notneg; /* flag for non-negative value */
- const char * fmt;
ldiv_t qr;
DEBUG_REQUIRE(prec != 0);
LIB_GETBUF(cp);
secs_u = (u_time)secs;
- fmt = -% UTIME_FORMAT .%0*ld;
/* check if we need signed or unsigned mode */
notneg = (prec 0);
@@ -94,9 +92,7 @@ format_time_fraction(
/* Get the absolute value of the split representation time. */
notneg = notneg || ((time_t)secs_u = 0);
- if (notneg) {
- fmt++; /* skip '-' */
- } else {
+ if (!notneg) {
secs_u = ~secs_u;
if (0 == frac)
secs_u++;
@@ -105,7 +101,8 @@ format_time_fraction(
}
/* finally format the data and return the result */
- snprintf(cp, LIB_BUFLENGTH, fmt, secs_u, prec_u, frac);
+ snprintf(cp, LIB_BUFLENGTH, %s% UTIME_FORMAT .%0*ld,
+ notneg? : -, secs_u, prec_u, frac);
return cp;
}
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: joerg
Date: Thu Jan 2 21:37:00 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_control.c
Log Message:
Don't pass in a format string, but flags for using %f / %g and the
desired precision. Allows format string verification to work correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_control.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/bsd/ntp/dist/ntpd/ntp_control.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.7 src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.8
--- src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.7 Sat Dec 28 03:20:14 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_control.c Thu Jan 2 21:37:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_control.c,v 1.7 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntp_control.c,v 1.8 2014/01/02 21:37:00 joerg Exp $ */
/*
* ntp_control.c - respond to mode 6 control messages and send async
@@ -60,13 +60,10 @@ static u_short ctlclkstatus (struct refc
static void ctl_flushpkt (u_char);
static void ctl_putdata (const char *, unsigned int, int);
static void ctl_putstr (const char *, const char *, size_t);
-static void ctl_putdblf (const char *, const char *, double);
-const char ctl_def_dbl_fmt[] = %.3f;
-#define ctl_putdbl(tag, d) ctl_putdblf(tag, ctl_def_dbl_fmt, d)
-const char ctl_def_dbl6_fmt[] = %.6f;
-#define ctl_putdbl6(tag, d) ctl_putdblf(tag, ctl_def_dbl6_fmt, d)
-const char ctl_def_sfp_fmt[] = %g;
-#define ctl_putsfp(tag, sfp) ctl_putdblf(tag, ctl_def_sfp_fmt, \
+static void ctl_putdblf (const char *, int, int, double);
+#define ctl_putdbl(tag, d) ctl_putdblf(tag, 1, 3, d)
+#define ctl_putdbl6(tag, d) ctl_putdblf(tag, 1, 6, d)
+#define ctl_putsfp(tag, sfp) ctl_putdblf(tag, 0, -1, \
FPTOD(sfp))
static void ctl_putuint (const char *, u_long);
static void ctl_puthex (const char *, u_long);
@@ -1426,7 +1423,8 @@ ctl_putunqstr(
static void
ctl_putdblf(
const char * tag,
- const char * fmt,
+ int use_f,
+ int precision,
double d
)
{
@@ -1440,7 +1438,8 @@ ctl_putdblf(
*cp++ = *cq++;
*cp++ = '=';
NTP_INSIST((size_t)(cp - buffer) sizeof(buffer));
- snprintf(cp, sizeof(buffer) - (cp - buffer), fmt, d);
+ snprintf(cp, sizeof(buffer) - (cp - buffer), use_f ? %.*f : %.*g,
+ precision, d);
cp += strlen(cp);
ctl_putdata(buffer, (unsigned)(cp - buffer), 0);
}
@@ -2097,7 +2096,7 @@ ctl_putsys(
case CS_K_OFFSET:
CTL_IF_KERNLOOP(
ctl_putdblf,
- (sys_var[varid].text, %g, to_ms * ntx.offset)
+ (sys_var[varid].text, 0, -1, to_ms * ntx.offset)
);
break;
@@ -2111,7 +2110,7 @@ ctl_putsys(
case CS_K_MAXERR:
CTL_IF_KERNLOOP(
ctl_putdblf,
- (sys_var[varid].text, %.6g,
+ (sys_var[varid].text, 0, 6,
to_ms * ntx.maxerror)
);
break;
@@ -2119,7 +2118,7 @@ ctl_putsys(
case CS_K_ESTERR:
CTL_IF_KERNLOOP(
ctl_putdblf,
- (sys_var[varid].text, %.6g,
+ (sys_var[varid].text, 0, 6,
to_ms * ntx.esterror)
);
break;
@@ -2143,7 +2142,7 @@ ctl_putsys(
case CS_K_PRECISION:
CTL_IF_KERNLOOP(
ctl_putdblf,
- (sys_var[varid].text, %.6g,
+ (sys_var[varid].text, 0, 6,
to_ms * ntx.precision)
);
break;
CVS commit: src/external/bsd/ntp
Module Name:src
Committed By: joerg
Date: Thu Jan 2 21:38:38 UTC 2014
Modified Files:
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/lib/libopts: Makefile
Log Message:
Update warning flags to reflect the fixes. Restrict GCC flags to GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/lib/libopts/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/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.12 src/external/bsd/ntp/Makefile.inc:1.13
--- src/external/bsd/ntp/Makefile.inc:1.12 Sat Sep 21 22:28:12 2013
+++ src/external/bsd/ntp/Makefile.inc Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2013/09/21 22:28:12 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2014/01/02 21:38:38 joerg Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -7,7 +7,6 @@ USE_FORT?= yes # network client/server
CWARNFLAGS+= -Wno-missing-noreturn
CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \
- -Wno-format-security \
-Wno-parentheses -Wno-constant-logical-operand \
-Wno-error=unused-const-variable
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.14 src/external/bsd/ntp/bin/ntpd/Makefile:1.15
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.14 Mon Dec 30 17:48:13 2013
+++ src/external/bsd/ntp/bin/ntpd/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/12/30 17:48:13 christos Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/02 21:38:38 joerg Exp $
.include bsd.own.mk
@@ -73,7 +73,7 @@ SRCS= cmd_args.c\
LDADD+= -L${LIBPARSE} -lparse -L${LIBISC} -liscntp -lm -lutil
DPADD+= ${LIBPARSE}/libparse.a ${LIBISC}/libiscntp.a ${LIBOPTS}/libopts.a ${LIBNTP}/libntp.a ${LIBM} ${LIBUTIL}
-CWARNFLAGS.clang+= -Wno-strncat-size
+COPTS.ntp_control.c+= ${${ACTIVE_CC} == gcc:? -Wno-error=format-nonliteral :}
.include ${.CURDIR}/../Makefile.inc
@@ -83,8 +83,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
-COPTS.ntp_control.c+= -Wno-format-nonliteral
-
.include bsd.prog.mk
# kill default .y.c rule - to rebuild ntp_parser.c we need bison which is not part of the toolchain
Index: src/external/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.5 src/external/bsd/ntp/lib/libiscntp/Makefile:1.6
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.5 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -43,6 +43,6 @@ SRCS= assertions.c \
time.c \
sockaddr.c
-COPTS.log.c+= -Wno-format-nonliteral
+COPTS.log.c+= -Wno-error=format-nonliteral
.include bsd.lib.mk
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.6 src/external/bsd/ntp/lib/libntp/Makefile:1.7
--- src/external/bsd/ntp/lib/libntp/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/lib/libntp/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -75,10 +75,8 @@ work_fork.c \
work_thread.c \
ymd2yd.c
-COPTS.msyslog.c+= -Wno-format-nonliteral
-COPTS.prettydate.c=-Wno-format-nonliteral
-COPTS.timetoa.c=-Wno-format-nonliteral
CPPFLAGS+= -I${IDIST}/sntp/libopts
+COPTS.msyslog.c+= -Wno-error=format-nonliteral
.include bsd.lib.mk
Index: src/external/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.7 src/external/bsd/ntp/lib/libopts/Makefile:1.8
--- src/external/bsd/ntp/lib/libopts/Makefile:1.7 Sun Dec 29 03:32:00 2013
+++ src/external/bsd/ntp/lib/libopts/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/29 03:32:00 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -16,17 +16,9 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
-COPTS.libopts.c += -Wno-format-nonliteral -Wno-error -DPOSIX_SHELL=\/bin/sh\
-
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
-COPTS.libopts.c += -Wno-format-contains-nul
-COPTS.find.c += -Wno-format-contains-nul
-COPTS.makeshell.c += -Wno-format-contains-nul
-COPTS.nested.c += -Wno-format-contains-nul
-COPTS.pgusage.c +=
CVS commit: src/distrib/notes/common
Module Name:src Committed By: tho Date: Thu Jan 2 22:22:18 UTC 2014 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.498 -r1.499 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.498 src/distrib/notes/common/main:1.499 --- src/distrib/notes/common/main:1.498 Thu Oct 17 02:58:56 2013 +++ src/distrib/notes/common/main Thu Jan 2 22:22:18 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.498 2013/10/17 02:58:56 elad Exp $ +.\ $NetBSD: main,v 1.499 2014/01/02 22:22:18 tho Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1282,6 +1282,7 @@ If you're one of them, and would like to .It Ta Brett Lymn Ta Mt bl...@netbsd.org .It Ta MAEKAWA Masahide Ta Mt gehe...@netbsd.org .It Ta Anders Magnusson Ta Mt ra...@netbsd.org +.It Ta Anthony Mallet Ta Mt t...@netbsd.org .It Ta John Marino Ta Mt mar...@netbsd.org .It Ta Roy Marples Ta Mt r...@netbsd.org .It Ta Cherry G. Mathew Ta Mt che...@netbsd.org
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Jan 2 23:33:50 UTC 2014 Modified Files: src/include: unistd.h Log Message: PR/4891: Wiz: readlink moved from xopen to base at issue 5. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/include/unistd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/unistd.h diff -u src/include/unistd.h:1.139 src/include/unistd.h:1.140 --- src/include/unistd.h:1.139 Wed Oct 9 05:38:21 2013 +++ src/include/unistd.h Thu Jan 2 18:33:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: unistd.h,v 1.139 2013/10/09 09:38:21 njoly Exp $ */ +/* $NetBSD: unistd.h,v 1.140 2014/01/02 23:33:50 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. @@ -159,6 +159,16 @@ extern int optopt; #endif /* + * The Open Group Base Specifications, Issue 5; IEEE Std 1003.1-2001 (POSIX) + */ +#if (_POSIX_C_SOURCE - 0) = 200112L || (_XOPEN_SOURCE - 0) = 500 || \ +defined(_NETBSD_SOURCE) +#if __SSP_FORTIFY_LEVEL == 0 +ssize_t readlink(const char * __restrict, char * __restrict, size_t); +#endif +#endif + +/* * The Open Group Base Specifications, Issue 6; IEEE Std 1003.1-2001 (POSIX) */ #if (_POSIX_C_SOURCE - 0) = 200112L || (_XOPEN_SOURCE - 0) = 600 || \ @@ -260,9 +270,6 @@ int lchown(const char *, uid_t, gid_t) int lchown(const char *, uid_t, gid_t); #endif int lockf(int, int, off_t); -#if __SSP_FORTIFY_LEVEL == 0 -ssize_t readlink(const char * __restrict, char * __restrict, size_t); -#endif void *sbrk(intptr_t); /* XXX prototype wrong! */ int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() */
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Fri Jan 3 00:02:01 UTC 2014
Modified Files:
src/usr.bin/make: compat.c
Log Message:
Treat '~' as a meta char requiring a shell.
Patch from Steve McIntyre 93sam at debian.org
Reviewed by: christos
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.bin/make/compat.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/make/compat.c
diff -u src/usr.bin/make/compat.c:1.93 src/usr.bin/make/compat.c:1.94
--- src/usr.bin/make/compat.c:1.93 Mon Sep 2 19:26:42 2013
+++ src/usr.bin/make/compat.c Fri Jan 3 00:02:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.94 2014/01/03 00:02:01 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $;
+static char rcsid[] = $NetBSD: compat.c,v 1.94 2014/01/03 00:02:01 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)compat.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $);
+__RCSID($NetBSD: compat.c,v 1.94 2014/01/03 00:02:01 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -130,7 +130,7 @@ Compat_Init(void)
Shell_Init(); /* setup default shell */
-for (cp = #=|^(){};*?[]:$`\\\n; *cp != '\0'; cp++) {
+for (cp = ~#=|^(){};*?[]:$`\\\n; *cp != '\0'; cp++) {
meta[(unsigned char) *cp] = 1;
}
/*
CVS commit: src/sys/arch/amiga
Module Name:src
Committed By: rkujawa
Date: Fri Jan 3 00:33:06 UTC 2014
Modified Files:
src/sys/arch/amiga/amiga: gayle.c gayle.h
src/sys/arch/amiga/conf: files.amiga
src/sys/arch/amiga/dev: acafhreg.h efa.c efareg.h gayle_pcmcia.c
wdc_acafh.c wdc_amiga.c
src/sys/arch/amiga/include: bus.h
Added Files:
src/sys/arch/amiga/amiga: amiga_bus_simple_0x1000.c
Log Message:
Rework handling of Commodore Gayle chip. Avoid ugly struct casts, introduce
proper bus_space accesses and some abstraction layer. All drivers that utilised
Gayle also had to be refactored.
I tried not to break anything more, but this clearly needs more testing...
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/amiga/amiga_bus_simple_0x1000.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/amiga/gayle.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/amiga/gayle.h
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/acafhreg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/efareg.h \
src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/gayle_pcmcia.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/include/bus.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/amiga/amiga/gayle.c
diff -u src/sys/arch/amiga/amiga/gayle.c:1.6 src/sys/arch/amiga/amiga/gayle.c:1.7
--- src/sys/arch/amiga/amiga/gayle.c:1.6 Sun Dec 11 12:16:26 2005
+++ src/sys/arch/amiga/amiga/gayle.c Fri Jan 3 00:33:06 2014
@@ -1,30 +1,193 @@
-/* $NetBSD: gayle.c,v 1.6 2005/12/11 12:16:26 christos Exp $ */
+/* $NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $ */
/* public domain */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gayle.c,v 1.6 2005/12/11 12:16:26 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $);
/*
- * Gayle management routines
+ * Gayle management - provide functions for use in the drivers that utilise
+ * the chip.
*
- * Any module that uses gayle should call gayle_init() before using anything
- * related to gayle. gayle_init() can be called multiple times.
+ * These overly complicated routines try to deal with a few variants of
+ * Gayle chip that exists.
*/
+#include sys/bus.h
+#include sys/systm.h
+
+#include machine/cpu.h
#include amiga/amiga/gayle.h
#include amiga/dev/zbusvar.h
-struct gayle_struct *gayle_base_virtual_address = 0;
+/* #define GAYLE_DEBUG 1 */
+
+struct gayle_tag {
+ struct bus_space_tag gayle_io_bst;
+ bus_space_tag_t gayle_io_t;
+ bus_space_handle_t gayle_io_h;
+
+ struct bus_space_tag gayle_isr_bst;
+ bus_space_tag_t gayle_isr_t;
+ bus_space_handle_t gayle_isr_h;
+};
-#define GAYLE_PHYS_ADDRESS 0xda8000
+typedef struct gayle_tag *gayle_tag_t;
+/*
+ * Having these as static variables is ugly, but they don't fit into
+ * driver's softc, as the chip might be utilised by many different drivers.
+ * And since we can only have one Gayle per system it should be okay.
+ */
+static struct gayle_tag gayle;
+static gayle_tag_t gayle_t = NULL;
+
+/*
+ * Any module that uses gayle should call gayle_init() before using anything
+ * related to gayle. gayle_init() can be called multiple times.
+ */
void
gayle_init(void) {
+ bus_addr_t gayle_vbase;
- if (gayle_base_virtual_address != 0)
+ if (gayle_t != NULL)
return;
- gayle_base_virtual_address =
- (struct gayle_struct *) __UNVOLATILE(ztwomap(GAYLE_PHYS_ADDRESS));
+#ifdef GAYLE_DEBUG
+ aprint_normal(gayle: doing init\n);
+#endif /* GAYLE_DEBUG */
+
+ gayle_t = gayle;
+
+ gayle_vbase = (bus_addr_t) __UNVOLATILE(ztwomap(GAYLE_REGS_BASE));
+
+ gayle_t-gayle_io_bst.base = gayle_vbase;
+ gayle_t-gayle_io_bst.absm = amiga_bus_stride_0x1000;
+ gayle_t-gayle_io_t = (gayle_t-gayle_io_bst);
+
+ bus_space_map(gayle_t-gayle_io_t, 0, 0x4, 0, gayle_t-gayle_io_h);
+
+ /*
+ * The A4000 variant of Gayle has interrupt status register at offset
+ * +0x1000 from IDE registers.
+ * XXX: in fact, on A4000 we should initialise only this part...
+ */
+ if (is_a4000()) {
+ gayle_t-gayle_isr_bst.base = (bus_addr_t) __UNVOLATILE(ztwomap(
+ GAYLE_IDE_BASE_A4000+GAYLE_IDE_INTREQ_A4000));
+
+ gayle_t-gayle_io_bst.absm = amiga_bus_stride_1;
+ gayle_t-gayle_isr_t = (gayle_t-gayle_isr_bst);
+ } else {
+ bus_space_subregion(gayle_t-gayle_io_t, gayle_t-gayle_io_h,
+ GAYLE_INTREQ, 0x1, (gayle_t-gayle_isr_h));
+
+ gayle_t-gayle_isr_bst = gayle_t-gayle_io_bst;
+ gayle_t-gayle_isr_t = gayle_t-gayle_io_t;
+ }
+
}
+
+uint8_t
+gayle_intr_status(void)
+{
+ uint8_t rv;
+
+ rv = bus_space_read_1(gayle_t-gayle_isr_t, gayle_t-gayle_isr_h, 0);
+#ifdef GAYLE_DEBUG
+ aprint_normal(gayle: intr status %x\n, rv);
+#endif /* GAYLE_DEBUG
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 02:03:12 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: autoconf.c device.h ioconf.c sd.c
sio.c
Log Message:
Remove unused code (from OpenBSD/luna88k). Some KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/autoconf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/device.h \
src/sys/arch/luna68k/stand/boot/sd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/ioconf.c \
src/sys/arch/luna68k/stand/boot/sio.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/luna68k/stand/boot/autoconf.c
diff -u src/sys/arch/luna68k/stand/boot/autoconf.c:1.7 src/sys/arch/luna68k/stand/boot/autoconf.c:1.8
--- src/sys/arch/luna68k/stand/boot/autoconf.c:1.7 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/autoconf.c Fri Jan 3 02:03:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.7 2013/01/22 15:48:40 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.8 2014/01/03 02:03:12 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -470,9 +470,6 @@ same_hw_device(struct hp_hw *hw, struct
case SCSI:
found = dr_type(hd-hp_driver, scsi);
break;
- case VME:
- case MISC:
- break;
}
return(found);
}
Index: src/sys/arch/luna68k/stand/boot/device.h
diff -u src/sys/arch/luna68k/stand/boot/device.h:1.5 src/sys/arch/luna68k/stand/boot/device.h:1.6
--- src/sys/arch/luna68k/stand/boot/device.h:1.5 Mon Jan 14 12:28:11 2013
+++ src/sys/arch/luna68k/stand/boot/device.h Fri Jan 3 02:03:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.5 2013/01/14 12:28:11 tsutsui Exp $ */
+/* $NetBSD: device.h,v 1.6 2014/01/03 02:03:12 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -98,49 +98,25 @@ struct hp_device {
int hp_ipl;
};
-struct devqueue {
- struct devqueue *dq_forw;
- struct devqueue *dq_back;
- int dq_ctlr;
- int dq_unit;
- int dq_slave;
- struct driver *dq_driver;
-};
-
struct hp_hw {
uint8_t *hw_addr; /* physical address of registers */
short hw_type; /* type (defined below) */
char *hw_name; /* HP product name */
};
-#define MAX_CTLR 16 /* Totally arbitrary */
-#define MAXSLAVES 8 /* Currently the HPIB limit */
+#define MAX_CTLR 8 /* Totally arbitrary */
+#define MAXSLAVES 8 /* Currently the SCSI limit */
#define WILD_CARD_CTLR 0
/* A controller is a card which can have one or more slaves attached */
#define CONTROLLER 0x10
-#define HPIB 0x16
-#define SCSI 0x17
-#define VME 0x18
-#define FLINK 0x19
-
-/* Slaves are devices which attach to controllers, e.g. disks, tapes */
-#define RD 0x2a
-#define PPI 0x2b
-#define CT 0x2c
-
-/* These are not controllers, but may have their own HPIB address */
-#define BITMAP 1
-#define NET 2
-#define FPA 4
-#define MISC 5
-#define KEYBOARD 6
-#define COMMDCA 7
-#define COMMDCM 8
-#define COMMDCL 9
-#define PPORT 10
-#define SIO 11
+#define SCSI (CONTROLLER | 0)
+
+/* Non-disk device types */
+#define NET 1
+#define KEYBOARD 2
+#define SIO 3
extern struct hp_ctlr hp_cinit[];
extern struct hp_device hp_dinit[];
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.5 src/sys/arch/luna68k/stand/boot/sd.c:1.6
--- src/sys/arch/luna68k/stand/boot/sd.c:1.5 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/sd.c Fri Jan 3 02:03:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.5 2013/01/22 15:48:40 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.6 2014/01/03 02:03:12 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -89,15 +89,12 @@ struct disklabel sdlabel[NSD];
struct sd_softc {
struct hp_device *sc_hd;
- struct devqueue sc_dq;
- int sc_format_pid; /* process using format mode */
short sc_flags;
short sc_type; /* drive type */
short sc_punit; /* physical unit (scsi lun) */
u_short sc_bshift; /* convert device blocks to DEV_BSIZE blks */
u_int sc_blks; /* number of blocks on device */
int sc_blksize; /* device block size in bytes */
- u_int sc_wpms; /* average xfer rate in 16 bit wds/sec. */
};
struct sd_devdata {
@@ -120,7 +117,6 @@ struct sd_devdata sd_devdata[NSD];
#define sdunit(x) ((minor(x) 3) 0x7)
#define sdpart(x) (minor(x) 0x7)
-#define sdpunit(x) ((x) 7)
static struct scsi_inquiry inqbuf;
static struct scsi_fmt_cdb inq = {
@@ -210,7 +206,6 @@ sdident(struct sd_softc *sc, struct hp_d
++sc-sc_bshift;
sc-sc_blks = sc-sc_bshift;
}
- sc-sc_wpms = 32 * (60 * DEV_BSIZE / 2); /* XXX */
return(inqbuf.type);
}
@@ -228,7 +223,7 @@ sdinit(void *arg)
hd-hp_ctlr, hd-hp_slave);
#endif
sc-sc_hd = hd;
- sc-sc_punit = sdpunit(hd-hp_flags);
+ sc-sc_punit = 0; /* XXX no LUN support yet */
sc-sc_type = sdident(sc, hd);
if (sc-sc_type 0)
return(0);
Index: src/sys/arch/luna68k/stand/boot/ioconf.c
diff -u
CVS import: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Fri Jan 3 02:05:41 UTC 2014 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29035 Log Message: import v2_0: 2013-01-12 - v2.0 * removed Qt3-based wpa_gui (obsoleted by wpa_qui-qt4) * removed unmaintained driver wrappers broadcom, iphone, osx, ralink, hostap, madwifi (hostap and madwifi remain available for hostapd; their wpa_supplicant functionality is obsoleted by wext) * improved debug logging (human readable event names, interface name included in more entries) * changed AP mode behavior to enable WPS only for open and WPA/WPA2-Personal configuration * improved P2P concurrency operations - better coordination of concurrent scan and P2P search operations - avoid concurrent remain-on-channel operation requests by canceling previous operations prior to starting a new one - reject operations that would require multi-channel concurrency if the driver does not support it - add parameter to select whether STA or P2P connection is preferred if the driver cannot support both at the same time - allow driver to indicate channel changes - added optional delay=search delay in milliseconds parameter for p2p_find to avoid taking all radio resources - use 500 ms p2p_find search delay by default during concurrent operations - allow all channels in GO Negotiation if the driver supports multi-channel concurrency * added number of small changes to make it easier for static analyzers to understand the implementation * fixed number of small bugs (see git logs for more details) * nl80211: number of updates to use new cfg80211/nl80211 functionality - replace monitor interface with nl80211 commands for AP mode - additional information for driver-based AP SME - STA entry authorization in RSN IBSS * EAP-pwd: - fixed KDF for group 21 and zero-padding - added support for fragmentation - increased maximum number of hunting-and-pecking iterations * avoid excessive Probe Response retries for broadcast Probe Request frames (only with drivers using wpa_supplicant AP mode SME/MLME) * added GET country ctrl_iface command * do not save an invalid network block in wpa_supplicant.conf to avoid problems reading the file on next start * send STA connected/disconnected ctrl_iface events to both the P2P group and parent interfaces * added preliminary support for using TLS v1.2 (CONFIG_TLSV12=y) * added SET pno 1/0 ctrl_iface command to start/stop preferred network offload with sched_scan driver command * merged in number of changes from Android repository for P2P, nl80211, and build parameters * changed P2P GO mode configuration to use driver capabilities to automatically enable HT operations when supported * added wpa_cli status wps command to fetch WPA2-Personal passhrase for WPS use cases in AP mode * EAP-AKA: keep pseudonym identity across EAP exchanges to match EAP-SIM behavior * improved reassociation behavior in cases where association is rejected or when an AP disconnects us to handle common load balancing mechanisms - try to avoid extra scans when the needed information is available * added optional join argument for p2p_prov_disc ctrl_iface command * added group ifname to P2P-PROV-DISC-* events * added P2P Device Address to AP-STA-DISCONNECTED event and use p2p_dev_addr parameter name with AP-STA-CONNECTED * added workarounds for WPS PBC overlap detection for some P2P use cases where deployed stations work incorrectly * optimize WPS connection speed by disconnecting prior to WPS scan and by using single channel scans when AP channel is known * PCSC and SIM/USIM improvements: - accept 0x67 (Wrong length) as a response to READ RECORD to fix issues with some USIM cards - try to read MNC length from SIM/USIM - build realm according to 3GPP TS 23.003 with identity from the SIM - allow T1 protocol to be enabled * added more WPS and P2P information available through D-Bus * improve P2P negotiation robustness - extra waits to get ACK frames through - longer timeouts for cases where deployed devices have been identified have issues meeting the specification requirements - more retries for some P2P frames - handle race conditions in GO Negotiation start by both devices - ignore unexpected GO Negotiation Response
CVS commit: src/external/bsd/wpa/bin
Module Name:src
Committed By: christos
Date: Fri Jan 3 02:07:31 UTC 2014
Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile
Log Message:
update for 2.0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_supplicant/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/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.3 src/external/bsd/wpa/bin/hostapd/Makefile:1.4
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.3 Sun Oct 7 20:03:20 2012
+++ src/external/bsd/wpa/bin/hostapd/Makefile Thu Jan 2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/03 02:07:31 christos Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -15,6 +15,7 @@ authsrv.c \
beacon.c \
ctrl_iface_ap.c \
drv_callbacks.c \
+eap_user_db.c \
hostapd.c \
ieee802_11_auth.c \
ieee802_11_shared.c \
@@ -39,11 +40,13 @@ wpa_ctrl.c
# drivers
SRCS+= \
driver_bsd.c \
+driver_common.c \
drivers.c
# radius
SRCS+= \
radius.c \
+radius_das.c \
radius_client.c \
radius_server.c
@@ -82,10 +85,10 @@ eap_server_methods.c
# crypto
SRCS+= \
+crypto_openssl.c \
md5.c \
random.c \
-sha1.c \
-sha1-pbkdf2.c
+sha1-prf.c
.PATH.c: \
${HOSTAPD_DISTDIR} \
@@ -143,7 +146,6 @@ aes-eax.c \
aes-encblock.c \
aes-omac1.c \
aes-wrap.c \
-crypto_openssl.c \
dh_groups.c \
fips_prf_openssl.c \
ms_funcs.c \
Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.1 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.2
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.1 Wed Aug 4 13:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile Thu Jan 2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:34 christos Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/03 02:07:31 christos Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -8,8 +8,6 @@ PROG= wpa_passphrase
SRCS= \
md5.c \
os_unix.c \
-sha1-pbkdf2.c \
-sha1.c \
wpa_debug.c \
wpa_passphrase.c \
wpabuf.c
Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.2 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.3
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.2 Sun Oct 7 20:03:20 2012
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile Thu Jan 2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/03 02:07:31 christos Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -32,7 +32,6 @@ pmksa_cache.c \
preauth.c \
random.c \
scan.c \
-sha1.c \
wpa.c \
wpa_common.c \
wpa_debug.c \
@@ -98,8 +97,8 @@ eap_tls_common.c \
eap_ttls.c \
ms_funcs.c \
mschapv2.c \
-sha1-pbkdf2.c \
sha1-tlsprf.c \
+sha1-prf.c \
tls_openssl.c
SRCS+=aes-ctr.c \
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Jan 3 02:10:19 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new wpa To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/doc/3RDPARTY cvs rdiff -u -r1.1877 -r1.1878 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1084 src/doc/3RDPARTY:1.1085 --- src/doc/3RDPARTY:1.1084 Thu Jan 2 08:07:42 2014 +++ src/doc/3RDPARTY Thu Jan 2 21:10:19 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1084 2014/01/02 13:07:42 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1085 2014/01/03 02:10:19 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1275,7 +1275,7 @@ register removal) to apply. The diffs ha is too much inertia to apply them. Check for .gitignore files. Package: wpa_supplicant/hostapd -Version: 1.1 +Version: 2.0 Current Vers: 2.0 Maintainer: Jouni Malinen jkmal...@cc.hut.fi Archive Site: http://hostap.epitest.fi/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1877 src/doc/CHANGES:1.1878 --- src/doc/CHANGES:1.1877 Tue Dec 31 15:27:57 2013 +++ src/doc/CHANGES Thu Jan 2 21:10:19 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1877 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1878 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -328,3 +328,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: tcpdump(8): Import 4.5.1 [christos 2013131231] libpcap: Import 1.5.2 [christos 20131231] bind: update to 9.9.5b1 [christos 2013-12-31] + wpa: Import wpa_supplicant and hostapd 2.0 [christos 20140102]
CVS commit: src/external/bsd/wpa/bin/hostapd
Module Name:src
Committed By: christos
Date: Fri Jan 3 02:15:43 UTC 2014
Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
Log Message:
move crypto_openssl.c back into the right room.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/hostapd/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/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.4 src/external/bsd/wpa/bin/hostapd/Makefile:1.5
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.4 Thu Jan 2 21:07:31 2014
+++ src/external/bsd/wpa/bin/hostapd/Makefile Thu Jan 2 21:15:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/01/03 02:07:31 christos Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/03 02:15:43 christos Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -85,7 +85,6 @@ eap_server_methods.c
# crypto
SRCS+= \
-crypto_openssl.c \
md5.c \
random.c \
sha1-prf.c
@@ -146,6 +145,7 @@ aes-eax.c \
aes-encblock.c \
aes-omac1.c \
aes-wrap.c \
+crypto_openssl.c \
dh_groups.c \
fips_prf_openssl.c \
ms_funcs.c \
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 03:25:25 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: autoconf.c device.h if_le.c ioconf.c
sd.c
Log Message:
Misc cleanup from OpenBSD/luna88k.
- remove unused code
- use proper prefix for structure members for readability
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/autoconf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/device.h \
src/sys/arch/luna68k/stand/boot/sd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/if_le.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/ioconf.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/luna68k/stand/boot/autoconf.c
diff -u src/sys/arch/luna68k/stand/boot/autoconf.c:1.8 src/sys/arch/luna68k/stand/boot/autoconf.c:1.9
--- src/sys/arch/luna68k/stand/boot/autoconf.c:1.8 Fri Jan 3 02:03:12 2014
+++ src/sys/arch/luna68k/stand/boot/autoconf.c Fri Jan 3 03:25:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.8 2014/01/03 02:03:12 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.9 2014/01/03 03:25:25 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -195,10 +195,7 @@ find_controller(struct hp_hw *hw)
hc-hp_alive = 1;
printf(%s%d, hc-hp_driver-d_name, hc-hp_unit);
printf( at %p,, hc-hp_addr);
- printf( ipl %d, hc-hp_ipl);
- if (hc-hp_flags)
- printf( flags 0x%x, hc-hp_flags);
- printf(\n);
+ printf( ipl %d\n, hc-hp_ipl);
find_slaves(hc);
} else
hc-hp_addr = oaddr;
@@ -218,13 +215,13 @@ find_device(struct hp_hw *hw)
hw-hw_name, hw-hw_sc, (u_int)hw-hw_addr, hw-hw_type);
#endif
match_d = NULL;
- for (hd = hp_dinit; hd-hp_driver; hd++) {
- if (hd-hp_alive)
+ for (hd = hp_dinit; hd-hpd_driver; hd++) {
+ if (hd-hpd_alive)
continue;
/* Must not be a slave */
- if (hd-hp_cdriver)
+ if (hd-hpd_cdriver)
continue;
- addr = hd-hp_addr;
+ addr = hd-hpd_addr;
/*
* Exact match; all done.
*/
@@ -243,8 +240,8 @@ find_device(struct hp_hw *hw)
if (acdebug) {
if (match_d)
printf(found %s%d\n,
- match_d-hp_driver-d_name,
- match_d-hp_unit);
+ match_d-hpd_driver-d_name,
+ match_d-hpd_unit);
else
printf(not found\n);
}
@@ -260,19 +257,14 @@ find_device(struct hp_hw *hw)
* Note, we can still fail if HW won't initialize.
*/
hd = match_d;
- oaddr = hd-hp_addr;
- hd-hp_addr = hw-hw_addr;
- if ((*hd-hp_driver-d_init)(hd)) {
- hd-hp_alive = 1;
- printf(%s%d, hd-hp_driver-d_name, hd-hp_unit);
- printf( at %p, hd-hp_addr);
- if (hd-hp_ipl)
- printf(, ipl %d, hd-hp_ipl);
- if (hd-hp_flags)
- printf(, flags 0x%x, hd-hp_flags);
- printf(\n);
+ oaddr = hd-hpd_addr;
+ hd-hpd_addr = hw-hw_addr;
+ if ((*hd-hpd_driver-d_init)(hd)) {
+ hd-hpd_alive = 1;
+ printf(%s%d, hd-hpd_driver-d_name, hd-hpd_unit);
+ printf( at %p\n, hd-hpd_addr);
} else
- hd-hp_addr = oaddr;
+ hd-hpd_addr = oaddr;
return(1);
}
@@ -303,7 +295,7 @@ find_slaves(struct hp_ctlr *hc)
for (s = 0; s maxslaves; s++) {
rescan = 1;
match_s = NULL;
- for (hd = hp_dinit; hd-hp_driver; hd++) {
+ for (hd = hp_dinit; hd-hpd_driver; hd++) {
/*
* Rule out the easy ones:
* 1. slave already assigned or not a slave
@@ -311,13 +303,13 @@ find_slaves(struct hp_ctlr *hc)
* 3. controller specified but not this one
* 4. slave specified but not this one
*/
- if (hd-hp_alive || hd-hp_cdriver == NULL)
+ if (hd-hpd_alive || hd-hpd_cdriver == NULL)
continue;
- if (!dr_type(hc-hp_driver, hd-hp_cdriver-d_name))
+ if (!dr_type(hc-hp_driver, hd-hpd_cdriver-d_name))
continue;
- if (hd-hp_ctlr = 0 hd-hp_ctlr != hc-hp_unit)
+ if (hd-hpd_ctlr = 0 hd-hpd_ctlr != hc-hp_unit)
continue;
- if (hd-hp_slave = 0 hd-hp_slave != s)
+ if (hd-hpd_slave = 0 hd-hpd_slave != s)
continue;
/*
* Case 0: first possible match.
@@ -336,7 +328,7 @@ find_slaves(struct hp_ctlr *hc)
* reserve locations for dynamic addition of
* disk/tape drives by fully qualifing the location.
*/
- if (hd-hp_slave == s hd-hp_ctlr == hc-hp_unit) {
+ if (hd-hpd_slave == s hd-hpd_ctlr == hc-hp_unit) {
match_s = hd;
rescan = 0;
break;
@@ -345,8 +337,8 @@ find_slaves(struct hp_ctlr *hc)
* Case 2: right controller, wildcarded slave.
* Remember first and keep looking for an exact match.
*/
- if (hd-hp_ctlr == hc-hp_unit
- match_s-hp_ctlr 0) {
+ if (hd-hpd_ctlr == hc-hp_unit
+ match_s-hpd_ctlr 0) {
match_s = hd;
new_s = s;
continue;
@@ -355,8 +347,8 @@ find_slaves(struct hp_ctlr *hc)
* Case 3: right slave, wildcarded controller.
* Remember and keep looking for a better match.
*/
- if (hd-hp_slave == s
- match_s-hp_ctlr 0 match_s-hp_slave 0) {
+ if (hd-hpd_slave == s
+
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 03:44:41 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: boot.c
Log Message:
Disable unnecessary boot device check. From OpenBSD/luna88k.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/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/luna68k/stand/boot/boot.c
diff -u src/sys/arch/luna68k/stand/boot/boot.c:1.3 src/sys/arch/luna68k/stand/boot/boot.c:1.4
--- src/sys/arch/luna68k/stand/boot/boot.c:1.3 Tue Mar 5 15:34:53 2013
+++ src/sys/arch/luna68k/stand/boot/boot.c Fri Jan 3 03:44:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.3 2013/03/05 15:34:53 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.4 2014/01/03 03:44:41 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -85,7 +85,9 @@
int howto;
+#if 0
static int get_boot_device(const char *, int *, int *, int *);
+#endif
struct exec header;
@@ -123,26 +125,33 @@ how_to_boot(int argc, char *argv[])
return ST_NORMAL;
}
+#if 0
int
get_boot_device(const char *s, int *devp, int *unitp, int *partp)
{
const char *p = s;
int unit, part;
+ uint = 0;
+ part = 0;
+
while (*p != '(') {
if (*p == '\0')
goto error;
p++;
}
- while (*++p != ',') {
+ p++;
+ for (; *p != ',' *p != ')') {
if (*p == '\0')
goto error;
if (*p = '0' *p = '9')
unit = (unit * 10) + (*p - '0');
}
- while (*++p != ')') {
+ if (*p == ',')
+ p++;
+ for (; *p != ')'; p++) {
if (*p == '\0')
goto error;
if (*p = '0' *p = '9')
@@ -158,6 +167,7 @@ get_boot_device(const char *s, int *devp
error:
return -1;
}
+#endif
int
boot(int argc, char *argv[])
@@ -178,14 +188,18 @@ int
bootnetbsd(char *line)
{
int io;
+#if 0
int dev, unit, part;
+#endif
u_long marks[MARK_MAX];
void (*entry)(void);
+#if 0
if (get_boot_device(line, dev, unit, part) != 0) {
printf(Bad file name %s\n, line);
return ST_ERROR;
}
+#endif
/* Note marks[MARK_START] is passed as an load address offset */
memset(marks, 0, sizeof(marks));
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 06:15:10 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: devopen.c samachdep.h version
Log Message:
Pull more fixes from OpenBSD/luna88k:
- accept empty controller and partition numbers, as well as empty filenames,
and use defaults (0, 0 and netbsd) instead of complaining the boot path
is invalid
- move a macro where actually necessary
Also bump version to denote the user visible change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/devopen.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/version
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/luna68k/stand/boot/devopen.c
diff -u src/sys/arch/luna68k/stand/boot/devopen.c:1.3 src/sys/arch/luna68k/stand/boot/devopen.c:1.4
--- src/sys/arch/luna68k/stand/boot/devopen.c:1.3 Wed Jan 16 15:46:20 2013
+++ src/sys/arch/luna68k/stand/boot/devopen.c Fri Jan 3 06:15:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $ */
+/* $NetBSD: devopen.c,v 1.4 2014/01/03 06:15:10 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -74,6 +74,8 @@
#include luna68k/stand/boot/samachdep.h
#include machine/disklabel.h
+#define MAXDEVNAME 16
+
static int make_device(const char *, int *, int *, int *, char **);
int
@@ -123,21 +125,21 @@ make_device(const char *str, int *devp,
{
const char *cp;
struct devsw *dp;
- int major, unit, part;
+ int major, unit = 0, part = 0;
int i;
char devname[MAXDEVNAME + 1];
/*
* parse path strings
*/
- /* find end of dev type name */
+ /* find end of dev type name */
for (cp = str, i = 0; *cp != '\0' *cp != '(' i MAXDEVNAME; i++)
devname[i] = *cp++;
if (*cp != '(') {
return (-1);
}
devname[i] = '\0';
- /* compare dev type name */
+ /* compare dev type name */
for (dp = devsw; dp-dv_name; dp++)
if (!strcmp(devname, dp-dv_name))
break;
@@ -146,40 +148,44 @@ make_device(const char *str, int *devp,
return (-1);
}
major = dp - devsw;
- /* get unit number */
- unit = *cp++ - '0';
- if (*cp = '0' *cp = '9')
- unit = unit * 10 + *cp++ - '0';
- if (unit 0 || unit 63) {
+ /* get mixed controller and unit number */
+ for (; *cp != ',' *cp != ')'; cp++) {
+ if (*cp == '\0')
+ return -1;
+ if (*cp = '0' *cp = '9')
+ unit = unit * 10 + *cp - '0';
+ }
+ if (unit 0 || unit = 20 || (unit % 10) 7) {
#ifdef DEBUG
printf(%s: invalid unit number (%d)\n, __func__, unit);
#endif
return (-1);
}
- /* get partition offset */
- if (*cp++ != ',') {
- return (-1);
- }
- part = *cp - '0';
- /* check out end of dev spec */
- for (;;) {
- if (*cp == ')')
- break;
- if (*cp++)
- continue;
- return (-1);
+ /* get optional partition number */
+ if (*cp == ',')
+ cp++;
+
+ for (; /* *cp != ',' */ *cp != ')'; cp++) {
+ if (*cp == '\0')
+ return -1;
+ if (*cp = '0' *cp = '9')
+ part = part * 10 + *cp - '0';
}
- if (part 0 || part MAXPARTITIONS) {
+ if (part 0 || part = MAXPARTITIONS) {
#ifdef DEBUG
printf(%s: invalid partition number (%d)\n, __func__, part);
#endif
return (-1);
}
-
+ /* check out end of dev spec */
*devp = major;
*unitp = unit;
*partp = part;
- *fname = __UNCONST(cp + 1);
+ cp++;
+ if (*cp == '\0')
+ *fname = netbsd;
+ else
+ *fname = __UNCONST(cp); /* XXX */
#ifdef DEBUG
printf(%s: major = %d, unit = %d, part = %d, fname = %s\n,
__func__, major, unit, part, *fname);
Index: src/sys/arch/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.11 src/sys/arch/luna68k/stand/boot/samachdep.h:1.12
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.11 Thu Jan 2 20:02:00 2014
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Fri Jan 3 06:15:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.11 2014/01/02 20:02:00 tsutsui Exp $ */
+/* $NetBSD: samachdep.h,v 1.12 2014/01/03 06:15:10 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -45,8 +45,6 @@
#define MHZ_33 4
#define MHZ_50 6
-#define MAXDEVNAME 16
-
struct consdev;
struct frame;
typedef struct label_t {
Index: src/sys/arch/luna68k/stand/boot/version
diff -u src/sys/arch/luna68k/stand/boot/version:1.6 src/sys/arch/luna68k/stand/boot/version:1.7
--- src/sys/arch/luna68k/stand/boot/version:1.6 Tue Mar 5 15:34:53 2013
+++ src/sys/arch/luna68k/stand/boot/version Fri Jan 3 06:15:10 2014
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.6 2013/03/05 15:34:53 tsutsui Exp $
+$NetBSD: version,v 1.7 2014/01/03 06:15:10 tsutsui Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -10,3 +10,4 @@ is taken as the current.
1.3: Add UFS2 support.
1.4: Add support
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 06:37:13 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: getline.c init_main.c samachdep.h
Log Message:
Pull more fixes from OpenBSD/luna88k:
- Bring getline() - a.k.a libsa gets() with a prompt prefix - in par with libsa
gets(), featurewise; this means support for ^u to clear the input.
- constify
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/getline.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/init_main.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/stand/boot/samachdep.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/luna68k/stand/boot/getline.c
diff -u src/sys/arch/luna68k/stand/boot/getline.c:1.2 src/sys/arch/luna68k/stand/boot/getline.c:1.3
--- src/sys/arch/luna68k/stand/boot/getline.c:1.2 Sun Jan 20 07:32:45 2013
+++ src/sys/arch/luna68k/stand/boot/getline.c Fri Jan 3 06:37:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getline.c,v 1.2 2013/01/20 07:32:45 tsutsui Exp $ */
+/* $NetBSD: getline.c,v 1.3 2014/01/03 06:37:13 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -79,40 +79,54 @@
#include luna68k/stand/boot/samachdep.h
int
-getline(char *prompt, char *buff)
+getline(const char *prompt, char *buff)
{
int c;
- char *p = buff;
+ char *p, *lp = buff;
printf(%s, prompt);
- for(;;) {
- c = getchar() 0x7F;
+ for (;;) {
+ c = getchar() 0x7f;
switch (c) {
- case 0x0a:
- case 0x0d:
+ case '\n':
+ case '\r':
+ *lp = '\0';
putchar('\n');
- *p = '\0';
goto outloop;
- case 0x08:
+ case '\b':
case 0x7f:
- if (p buff) {
-putchar(0x08);
+ if (lp buff) {
+lp--;
+putchar('\b');
putchar(' ');
-putchar(0x08);
-p--;
+putchar('\b');
}
break;
+ case 'r' 0x1f:
+ putchar('\n');
+ printf(%s, prompt);
+ for (p = buff; p lp; ++p)
+putchar(*p);
+ break;
+
+ case 'u' 0x1f:
+ case 'w' 0x1f:
+ lp = buff;
+ printf(\n%s, prompt);
+ break;
+
default:
- *p++ = c;
+ *lp++ = c;
putchar(c);
break;
}
}
outloop:
- return(strlen(buff));
+ *lp = '\0';
+ return lp - buff;
}
Index: src/sys/arch/luna68k/stand/boot/init_main.c
diff -u src/sys/arch/luna68k/stand/boot/init_main.c:1.6 src/sys/arch/luna68k/stand/boot/init_main.c:1.7
--- src/sys/arch/luna68k/stand/boot/init_main.c:1.6 Tue Mar 5 15:34:53 2013
+++ src/sys/arch/luna68k/stand/boot/init_main.c Fri Jan 3 06:37:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.6 2013/03/05 15:34:53 tsutsui Exp $ */
+/* $NetBSD: init_main.c,v 1.7 2014/01/03 06:37:13 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -112,7 +112,7 @@ char *argv[MAXARGS];
#define BOOT_TIMEOUT 10
int boot_timeout = BOOT_TIMEOUT;
-char prompt[16] = boot ;
+static const char prompt[] = boot ;
void
main(void)
Index: src/sys/arch/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.12 src/sys/arch/luna68k/stand/boot/samachdep.h:1.13
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.12 Fri Jan 3 06:15:10 2014
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Fri Jan 3 06:37:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.12 2014/01/03 06:15:10 tsutsui Exp $ */
+/* $NetBSD: samachdep.h,v 1.13 2014/01/03 06:37:13 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -103,7 +103,7 @@ int fsdump(int, char **);
int fsrestore(int, char **);
/* getline.c */
-int getline(char *, char *);
+int getline(const char *, char *);
/* if_le.c */
int leinit(void *);
CVS commit: src/sys/arch
Module Name:src
Committed By: mlelstv
Date: Fri Jan 3 07:14:21 UTC 2014
Modified Files:
src/sys/arch/amiga/amiga: cc.c cc.h
src/sys/arch/atari/atari: stalloc.c stalloc.h
Log Message:
Fix allocator routines. Instead of abusing CIRCLEQ pointers, add an explicit
type field to tag memory nodes that are or are not on the free list.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/amiga/cc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/amiga/cc.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/atari/atari/stalloc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/atari/stalloc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.24 src/sys/arch/amiga/amiga/cc.c:1.25
--- src/sys/arch/amiga/amiga/cc.c:1.24 Wed Nov 27 17:24:43 2013
+++ src/sys/arch/amiga/amiga/cc.c Fri Jan 3 07:14:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cc.c,v 1.24 2013/11/27 17:24:43 christos Exp $ */
+/* $NetBSD: cc.c,v 1.25 2014/01/03 07:14:20 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cc.c,v 1.24 2013/11/27 17:24:43 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cc.c,v 1.25 2014/01/03 07:14:20 mlelstv Exp $);
#include sys/types.h
#include sys/param.h
@@ -513,7 +513,7 @@ alloc_chipmem(u_long size)
* for a new node in between.
*/
TAILQ_REMOVE(free_list, mn, free_link);
- TAILQ_NEXT(mn, free_link) = NULL;
+ mn-type = MNODE_USED;
size = mn-size; /* increase size. (or same) */
chip_total -= mn-size;
splx(s);
@@ -533,7 +533,7 @@ alloc_chipmem(u_long size)
* and mark as not on free list
*/
TAILQ_INSERT_AFTER(chip_list, new, mn, link);
- TAILQ_NEXT(mn, free_link) = NULL;
+ mn-type = MNODE_USED;
chip_total -= size + sizeof(struct mem_node);
splx(s);
@@ -557,52 +557,53 @@ free_chipmem(void *mem)
/*
* check ahead of us.
*/
- if (TAILQ_NEXT(next, link) != NULL
- TAILQ_NEXT(next, free_link) != NULL) {
+ if (next-type == MNODE_FREE) {
/*
* if next is: a valid node and a free node. == merge
*/
TAILQ_INSERT_BEFORE(next, mn, free_link);
+ mn-type = MNODE_FREE;
TAILQ_REMOVE(chip_list, next, link);
- TAILQ_REMOVE(chip_list, next, free_link);
+ TAILQ_REMOVE(free_list, next, free_link);
chip_total += mn-size + sizeof(struct mem_node);
mn-size += next-size + sizeof(struct mem_node);
}
- if (TAILQ_PREV(prev, chiplist, link) != NULL
- TAILQ_PREV(prev, freelist, free_link) != NULL) {
+ if (prev-type == MNODE_FREE) {
/*
* if prev is: a valid node and a free node. == merge
*/
- if (TAILQ_NEXT(mn, free_link) == NULL)
+ if (mn-type != MNODE_FREE)
chip_total += mn-size + sizeof(struct mem_node);
else {
/* already on free list */
TAILQ_REMOVE(free_list, mn, free_link);
+ mn-type = MNODE_USED;
chip_total += sizeof(struct mem_node);
}
TAILQ_REMOVE(chip_list, mn, link);
prev-size += mn-size + sizeof(struct mem_node);
- } else if (TAILQ_NEXT(mn, free_link) == NULL) {
+ } else if (mn-type != MNODE_FREE) {
/*
* we still are not on free list and we need to be.
* -- | --
*/
- while (TAILQ_NEXT(next, link) != NULL
- TAILQ_PREV(prev, chiplist, link) != NULL) {
- if (TAILQ_NEXT(next, free_link) != NULL) {
+ while (next != NULL prev != NULL) {
+ if (next-type == MNODE_FREE) {
TAILQ_INSERT_BEFORE(next, mn, free_link);
+mn-type = MNODE_FREE;
break;
}
- if (TAILQ_NEXT(prev, free_link) != NULL) {
+ if (prev-type == MNODE_FREE) {
TAILQ_INSERT_AFTER(free_list, prev, mn,
free_link);
+mn-type = MNODE_FREE;
break;
}
prev = TAILQ_PREV(prev, chiplist, link);
next = TAILQ_NEXT(next, link);
}
- if (TAILQ_NEXT(mn, free_link) == NULL) {
- if (TAILQ_NEXT(next, link) == NULL) {
+ if (mn-type != MNODE_FREE) {
+ if (next == NULL) {
/*
* we are not on list so we can add
* ourselves to the tail. (we walked to it.)
@@ -611,6 +612,7 @@ free_chipmem(void *mem)
} else {
TAILQ_INSERT_HEAD(free_list,mn,free_link);
}
+ mn-type = MNODE_FREE;
}
chip_total += mn-size; /* add our helpings to the pool. */
}
Index: src/sys/arch/amiga/amiga/cc.h
diff -u src/sys/arch/amiga/amiga/cc.h:1.17 src/sys/arch/amiga/amiga/cc.h:1.18
--- src/sys/arch/amiga/amiga/cc.h:1.17 Sat Nov 23 22:48:00 2013
+++ src/sys/arch/amiga/amiga/cc.h Fri Jan 3 07:14:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cc.h,v 1.17 2013/11/23 22:48:00 christos Exp $ */
+/* $NetBSD: cc.h,v 1.18 2014/01/03 07:14:20 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -160,7 +160,10 @@ struct mem_node {
TAILQ_ENTRY(mem_node) link;
TAILQ_ENTRY(mem_node) free_link;
u_long size; /* size of memory following node. */
+ u_char type; /* free, used */
};
+#define MNODE_FREE 0
+#define MNODE_USED
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 3 07:17:19 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: samachdep.h sc.c scsi.c scsireg.h sd.c
ufs_disksubr.c
Log Message:
Pull more cleanups from OpenBSD/luna88k:
- remove unused declarations
- rename struct scsi_fmt_cdb to scsi_generic_cdb
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/sc.c \
src/sys/arch/luna68k/stand/boot/sd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/scsi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/scsireg.h \
src/sys/arch/luna68k/stand/boot/ufs_disksubr.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/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.13 src/sys/arch/luna68k/stand/boot/samachdep.h:1.14
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.13 Fri Jan 3 06:37:13 2014
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Fri Jan 3 07:17:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.13 2014/01/03 06:37:13 tsutsui Exp $ */
+/* $NetBSD: samachdep.h,v 1.14 2014/01/03 07:17:19 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -84,10 +84,6 @@ void cninit(void);
int cngetc(void);
void cnputc(int);
-/* devopen.c */
-extern u_int opendev;
-int atoi(char *);
-
/* disklabel.c */
extern u_char lbl_buff[];
int disklabel(int, char **);
@@ -171,8 +167,8 @@ int romcngetc(dev_t);
void romcnputc(dev_t, int);
/* sc.c */
-struct scsi_fmt_cdb;
-int scsi_immed_command(int, int, int, struct scsi_fmt_cdb *, u_char *,
+struct scsi_generic_cdb;
+int scsi_immed_command(int, int, int, struct scsi_generic_cdb *, u_char *,
unsigned int);
int scsi_request_sense(int, int, int, u_char *, unsigned int);
int scsi_test_unit_rdy(int, int, int);
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.7 src/sys/arch/luna68k/stand/boot/sc.c:1.8
--- src/sys/arch/luna68k/stand/boot/sc.c:1.7 Thu Jan 2 19:50:03 2014
+++ src/sys/arch/luna68k/stand/boot/sc.c Fri Jan 3 07:17:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.7 2014/01/02 19:50:03 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.8 2014/01/03 07:17:19 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -453,7 +453,7 @@ scsi_request_sense(int ctlr, int slave,
}
int
-scsi_immed_command(int ctlr, int slave, int unit, struct scsi_fmt_cdb *cdb,
+scsi_immed_command(int ctlr, int slave, int unit, struct scsi_generic_cdb *cdb,
u_char *buf, unsigned int len)
{
int status;
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.7 src/sys/arch/luna68k/stand/boot/sd.c:1.8
--- src/sys/arch/luna68k/stand/boot/sd.c:1.7 Fri Jan 3 03:25:25 2014
+++ src/sys/arch/luna68k/stand/boot/sd.c Fri Jan 3 07:17:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.7 2014/01/03 03:25:25 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.8 2014/01/03 07:17:19 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -119,13 +119,13 @@ struct sd_devdata sd_devdata[NSD];
#define sdpart(x) (minor(x) 0x7)
static struct scsi_inquiry inqbuf;
-static struct scsi_fmt_cdb inq = {
+static struct scsi_generic_cdb inq = {
6,
{ CMD_INQUIRY, 0, 0, 0, sizeof(inqbuf), 0 }
};
static u_long capbuf[2];
-struct scsi_fmt_cdb cap = {
+struct scsi_generic_cdb cap = {
10,
{ CMD_READ_CAPACITY, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
@@ -292,12 +292,12 @@ sdclose(struct open_file *f)
return 0;
}
-static struct scsi_fmt_cdb cdb_read = {
+static struct scsi_generic_cdb cdb_read = {
10,
{ CMD_READ_EXT, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
-static struct scsi_fmt_cdb cdb_write = {
+static struct scsi_generic_cdb cdb_write = {
6,
{ CMD_WRITE_EXT, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
@@ -312,7 +312,7 @@ sdstrategy(void *devdata, int func, dadd
int unit = sd-unit;
int part = sd-part;
struct sd_softc *sc = sd_softc[unit];
- struct scsi_fmt_cdb *cdb;
+ struct scsi_generic_cdb *cdb;
daddr_t blk;
u_int nblk = size sc-sc_bshift;
int stat, ctlr, slave;
Index: src/sys/arch/luna68k/stand/boot/scsi.c
diff -u src/sys/arch/luna68k/stand/boot/scsi.c:1.3 src/sys/arch/luna68k/stand/boot/scsi.c:1.4
--- src/sys/arch/luna68k/stand/boot/scsi.c:1.3 Thu Jan 2 19:50:03 2014
+++ src/sys/arch/luna68k/stand/boot/scsi.c Fri Jan 3 07:17:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.3 2014/01/02 19:50:03 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.4 2014/01/03 07:17:19 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -89,13 +89,13 @@ int scsi_device = 6;
u_char sensbuff[SENSBUFF];/* ８以上は無意味である。 */
static struct scsi_inquiry inquirybuf;
-static struct scsi_fmt_cdb inquiry = {
+static struct scsi_generic_cdb inquiry = {
6,
{ CMD_INQUIRY, 0, 0, 0, sizeof(inquirybuf), 0 }
};
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:21:39 UTC 2014 Modified Files: src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.c bozohttpd.h cgi-bozo.c content-bozo.c daemon-bozo.c dir-index-bozo.c lua-bozo.c main.c printenv.lua ssl-bozo.c tilde-luzah-bozo.c src/libexec/httpd/small: Makefile Log Message: - update CHANGES with recent changes - update version to 20140102 - update copyrights - use getcwd() over getwd() - fix lean build (don't include lua) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/httpd/CHANGES cvs rdiff -u -r1.11 -r1.12 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.44 -r1.45 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.23 -r1.24 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.8 -r1.9 src/libexec/httpd/content-bozo.c \ src/libexec/httpd/lua-bozo.c cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/daemon-bozo.c \ src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/main.c cvs rdiff -u -r1.1 -r1.2 src/libexec/httpd/printenv.lua cvs rdiff -u -r1.9 -r1.10 src/libexec/httpd/tilde-luzah-bozo.c cvs rdiff -u -r1.1.1.1 -r1.2 src/libexec/httpd/small/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:22:59 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: update version, date and copyright. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 2 08:47:38 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: sort the contributor list, and update the defines list to include lua. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src Committed By: tho Date: Thu Jan 2 12:54:36 UTC 2014 Modified Files: src/distrib/sets: sets.subr src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: ad.arm ad.arm.shl ad.m68k.shl ad.mips md.alpha md.amd64 md.i386 md.sparc64 shl.mi src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xcomp: md.amd64 md.i386 shl.mi src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.cats md.dreamcast md.evbarm md.evbmips md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.i386 md.luna68k md.macppc md.netwinder md.newsmips md.ofppc md.prep md.sgimips md.shark md.sparc md.sparc64 md.vax md.zaurus Log Message: Mark all _pic.a archive files with the 'picinstall' flag. This fixes checkflist with MKPICINSTALL=no. ok christos@. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/sets.subr cvs rdiff -u -r1.682 -r1.683 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/comp/ad.arm.shl cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.m68k.shl cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.258 -r1.259 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.551 -r1.552 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xserver/md.bebox cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xserver/md.cats \ src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.dreamcast \ src/distrib/sets/lists/xserver/md.ofppc cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.evbarm cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.evbmips cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xserver/md.ews4800mips \ src/distrib/sets/lists/xserver/md.prep \ src/distrib/sets/lists/xserver/md.zaurus cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xserver/md.hp300 cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.hpcarm cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xserver/md.hpcsh cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xserver/md.luna68k \ src/distrib/sets/lists/xserver/md.newsmips \ src/distrib/sets/lists/xserver/md.vax cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/xserver/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Jan 2 13:07:42 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: grep -2.16 out. To generate a diff of this commit: cvs rdiff -u -r1.1083 -r1.1084 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/dwc2
Module Name:src Committed By: skrll Date: Thu Jan 2 15:54:10 UTC 2014 Modified Files: src/sys/external/bsd/dwc2: dwc2.c src/sys/external/bsd/dwc2/dist: dwc2_hcd.c dwc2_hcdqueue.c Log Message: Protect access of urb-hcpriv by adapting the following change from the Raspberry PI dwc_otg driver. https://github.com/raspberrypi/linux/commit/38753ce72d4f10d5d0f1ed27fa691a2ba8910941 dwc_otg: prevent OOPSes during device disconnects The dwc_otg_urb_enqueue function is thread-unsafe. In particular the access of urb-hcpriv, usb_hcd_link_urb_to_ep, dwc_otg_urb-qtd and friends does not occur within a critical section and so if a device was unplugged during activity there was a high chance that the usbcore hub_thread would try to disable the endpoint with partially- formed entries in the URB queue. This would result in BUG() or null pointer dereferences. Fix so that access of urb-hcpriv, enqueuing to the hardware and adding to usbcore endpoint URB lists is contained within a single critical section. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/dwc2/dwc2.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tho Date: Thu Jan 2 16:46:40 UTC 2014 Modified Files: src/distrib/sets/lists/comp: ad.arm ad.arm.shl ad.mips md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xcomp: shl.mi src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.cats md.dreamcast md.evbarm md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.i386 md.luna68k md.macppc md.netwinder md.newsmips md.ofppc md.prep md.sgimips md.shark md.sparc md.sparc64 md.zaurus Log Message: Drop superflous picinstall flag on obsolete items Reported by apb@, thanks! To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/ad.arm.shl cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.259 -r1.260 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.552 -r1.553 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xserver/md.bebox cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xserver/md.cats \ src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xserver/md.dreamcast \ src/distrib/sets/lists/xserver/md.ofppc cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xserver/md.evbarm cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.ews4800mips \ src/distrib/sets/lists/xserver/md.prep \ src/distrib/sets/lists/xserver/md.zaurus cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xserver/md.hp300 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.hpcarm cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.hpcsh cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xserver/md.luna68k \ src/distrib/sets/lists/xserver/md.newsmips cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xserver/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/gnu/dist/gdb6/bfd
Module Name:src
Committed By: matt
Date: Thu Jan 2 17:34:43 UTC 2014
Modified Files:
src/gnu/dist/gdb6/bfd [matt-nb5-mips64]: config.bfd
Log Message:
allow arm*{,eb]-*-netbsdelf*
To generate a diff of this commit:
cvs rdiff -u -r1.4.24.1 -r1.4.24.2 src/gnu/dist/gdb6/bfd/config.bfd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Thu Jan 2 17:43:33 UTC 2014 Modified Files: src/sys/arch/hp300/stand/common: scsi.c Log Message: Change the SCSI select timeout from 2ms to 250ms as kernel spc(4) driver does. Noticed by miod@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/scsi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 2 17:47:23 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: sc.c Log Message: Change the SCSI select timeout from 2ms to 250ms as kernel spc(4) driver does. Noticed by miod@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/sc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src Committed By: tho Date: Thu Jan 2 17:57:58 UTC 2014 Modified Files: src/crypto/external/bsd/libsaslc/etc: Makefile src/crypto/external/bsd/libsaslc/etc/mech: Makefile Log Message: Do not install files in usr/share/ when MKSHARE=no ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/etc/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/etc/mech/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src
Committed By: tho
Date: Thu Jan 2 18:04:28 UTC 2014
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/misc: mi
Log Message:
Fix a few share flags
. Add missing share flag on usr/share/examples/npf files.
. Drop share for directories in examples/{libsaslc,npf,tmux}. This is how it
is done for other directories in usr/share.
This fixes checkflist with MKSHARE=no.
ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.1055 -r1.1056 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.187 -r1.188 src/distrib/sets/lists/misc/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src Committed By: joerg Date: Thu Jan 2 18:26:03 UTC 2014 Modified Files: src/external/bsd/ntp/dist/libntp: prettydate.c Log Message: Use separate variables for the format strings to get working format string checking with both GCC and Clang. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libntp/prettydate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Thu Jan 2 18:29:01 UTC 2014 Modified Files: src/sys/net: if.c src/sys/netinet: in_proto.c tcp_subr.c tcp_timer.c tcp_var.h udp_usrreq.c udp_var.h src/sys/netinet6: in6_proto.c in6_var.h udp6_usrreq.c src/sys/rump/net/lib/libnetinet: component.c src/sys/rump/net/lib/libnetinet6: component.c Log Message: Allow kernels compiled with INET+INET6 to be booted as IPv4-only or IPv6-only. To generate a diff of this commit: cvs rdiff -u -r1.269 -r1.270 src/sys/net/if.c cvs rdiff -u -r1.106 -r1.107 src/sys/netinet/in_proto.c cvs rdiff -u -r1.252 -r1.253 src/sys/netinet/tcp_subr.c cvs rdiff -u -r1.86 -r1.87 src/sys/netinet/tcp_timer.c cvs rdiff -u -r1.171 -r1.172 src/sys/netinet/tcp_var.h cvs rdiff -u -r1.191 -r1.192 src/sys/netinet/udp_usrreq.c cvs rdiff -u -r1.38 -r1.39 src/sys/netinet/udp_var.h cvs rdiff -u -r1.99 -r1.100 src/sys/netinet6/in6_proto.c cvs rdiff -u -r1.66 -r1.67 src/sys/netinet6/in6_var.h cvs rdiff -u -r1.91 -r1.92 src/sys/netinet6/udp6_usrreq.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libnetinet/component.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetinet6/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 2 18:45:24 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: sc.c Log Message: Add bound check of a controller number in scrun(). Noticed by miod@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/sc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: pooka Date: Thu Jan 2 18:52:04 UTC 2014 Modified Files: src/sys/netinet: tcp_subr.c Log Message: need atomic.h, from uwe To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/sys/netinet/tcp_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: joerg Date: Thu Jan 2 19:00:39 UTC 2014 Modified Files: src/sys/arch/shark/ofw: chipsfb_ofbus.c igsfb_ofbus.c Log Message: Fix const use. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/shark/ofw/chipsfb_ofbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/ofw/igsfb_ofbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Thu Jan 2 19:15:07 UTC 2014 Modified Files: src/sys/sys: exec_elf.h Log Message: Add more gnu sections To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libelf/dist
Module Name:src Committed By: christos Date: Thu Jan 2 19:20:35 UTC 2014 Modified Files: src/external/bsd/libelf/dist: libelf.h libelf_data.c Log Message: add gnu attributes to the known sections To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libelf/dist/libelf.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libelf/dist/libelf_data.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu Jan 2 19:25:08 UTC 2014 Modified Files: src/share/mk: sys.mk Log Message: disable ctf handling for the shuttle .c - '' rule since we don't create an object file to work on. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/share/mk/sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 2 19:50:03 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: sc.c scsi.c Log Message: Replace broken (by SCCS) ISO-2022-JP comments with UTF-8. Recovered and decoded by isaki@. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/sc.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/scsi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 2 20:02:00 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: bmd.c font.c samachdep.h Log Message: Misc cleanup. Mostly from OpenBSD/luna88k. - fix isprint() macro - hight - height - remove an unused function - adjust tabs/spaces - constify the bitmap font - consistently use #definespace - use #if 0/#endif to disable code block - u_long - uint32_t, u_short - uint16_t - some KNF To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/bmd.c \ src/sys/arch/luna68k/stand/boot/font.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/stand/boot/samachdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/rpc
Module Name:src Committed By: christos Date: Thu Jan 2 20:12:23 UTC 2014 Modified Files: src/lib/libc/rpc: rpcb_clnt.c Log Message: don't lose the RPC error from CLNT_CALL. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/rpc/rpcb_clnt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src Committed By: joerg Date: Thu Jan 2 21:35:19 UTC 2014 Modified Files: src/external/bsd/ntp/dist/libntp: timetoa.c Log Message: Avoid pointer operations on the format string. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/libntp/timetoa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src Committed By: joerg Date: Thu Jan 2 21:35:50 UTC 2014 Modified Files: src/external/bsd/ntp/dist/ntpd: refclock_true.c Log Message: Add format string attribute for better detection. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/ntpd/refclock_true.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src Committed By: joerg Date: Thu Jan 2 21:37:00 UTC 2014 Modified Files: src/external/bsd/ntp/dist/ntpd: ntp_control.c Log Message: Don't pass in a format string, but flags for using %f / %g and the desired precision. Allows format string verification to work correctly. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_control.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp
Module Name:src Committed By: joerg Date: Thu Jan 2 21:38:38 UTC 2014 Modified Files: src/external/bsd/ntp: Makefile.inc src/external/bsd/ntp/bin/ntpd: Makefile src/external/bsd/ntp/lib/libiscntp: Makefile src/external/bsd/ntp/lib/libntp: Makefile src/external/bsd/ntp/lib/libopts: Makefile Log Message: Update warning flags to reflect the fixes. Restrict GCC flags to GCC. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/Makefile.inc cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/bin/ntpd/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/lib/libiscntp/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/lib/libntp/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/lib/libopts/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: tho Date: Thu Jan 2 22:22:18 UTC 2014 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.498 -r1.499 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Jan 2 23:33:50 UTC 2014 Modified Files: src/include: unistd.h Log Message: PR/4891: Wiz: readlink moved from xopen to base at issue 5. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/include/unistd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Fri Jan 3 00:02:01 UTC 2014 Modified Files: src/usr.bin/make: compat.c Log Message: Treat '~' as a meta char requiring a shell. Patch from Steve McIntyre 93sam at debian.org Reviewed by: christos To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/usr.bin/make/compat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: rkujawa Date: Fri Jan 3 00:33:06 UTC 2014 Modified Files: src/sys/arch/amiga/amiga: gayle.c gayle.h src/sys/arch/amiga/conf: files.amiga src/sys/arch/amiga/dev: acafhreg.h efa.c efareg.h gayle_pcmcia.c wdc_acafh.c wdc_amiga.c src/sys/arch/amiga/include: bus.h Added Files: src/sys/arch/amiga/amiga: amiga_bus_simple_0x1000.c Log Message: Rework handling of Commodore Gayle chip. Avoid ugly struct casts, introduce proper bus_space accesses and some abstraction layer. All drivers that utilised Gayle also had to be refactored. I tried not to break anything more, but this clearly needs more testing... To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/amiga/amiga_bus_simple_0x1000.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/amiga/gayle.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/amiga/gayle.h cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/acafhreg.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/efa.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/efareg.h \ src/sys/arch/amiga/dev/wdc_acafh.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/gayle_pcmcia.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/wdc_amiga.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 02:03:12 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: autoconf.c device.h ioconf.c sd.c sio.c Log Message: Remove unused code (from OpenBSD/luna88k). Some KNF. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/autoconf.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/device.h \ src/sys/arch/luna68k/stand/boot/sd.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/ioconf.c \ src/sys/arch/luna68k/stand/boot/sio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Fri Jan 3 02:05:41 UTC 2014 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29035 Log Message: import v2_0: 2013-01-12 - v2.0 * removed Qt3-based wpa_gui (obsoleted by wpa_qui-qt4) * removed unmaintained driver wrappers broadcom, iphone, osx, ralink, hostap, madwifi (hostap and madwifi remain available for hostapd; their wpa_supplicant functionality is obsoleted by wext) * improved debug logging (human readable event names, interface name included in more entries) * changed AP mode behavior to enable WPS only for open and WPA/WPA2-Personal configuration * improved P2P concurrency operations - better coordination of concurrent scan and P2P search operations - avoid concurrent remain-on-channel operation requests by canceling previous operations prior to starting a new one - reject operations that would require multi-channel concurrency if the driver does not support it - add parameter to select whether STA or P2P connection is preferred if the driver cannot support both at the same time - allow driver to indicate channel changes - added optional delay=search delay in milliseconds parameter for p2p_find to avoid taking all radio resources - use 500 ms p2p_find search delay by default during concurrent operations - allow all channels in GO Negotiation if the driver supports multi-channel concurrency * added number of small changes to make it easier for static analyzers to understand the implementation * fixed number of small bugs (see git logs for more details) * nl80211: number of updates to use new cfg80211/nl80211 functionality - replace monitor interface with nl80211 commands for AP mode - additional information for driver-based AP SME - STA entry authorization in RSN IBSS * EAP-pwd: - fixed KDF for group 21 and zero-padding - added support for fragmentation - increased maximum number of hunting-and-pecking iterations * avoid excessive Probe Response retries for broadcast Probe Request frames (only with drivers using wpa_supplicant AP mode SME/MLME) * added GET country ctrl_iface command * do not save an invalid network block in wpa_supplicant.conf to avoid problems reading the file on next start * send STA connected/disconnected ctrl_iface events to both the P2P group and parent interfaces * added preliminary support for using TLS v1.2 (CONFIG_TLSV12=y) * added SET pno 1/0 ctrl_iface command to start/stop preferred network offload with sched_scan driver command * merged in number of changes from Android repository for P2P, nl80211, and build parameters * changed P2P GO mode configuration to use driver capabilities to automatically enable HT operations when supported * added wpa_cli status wps command to fetch WPA2-Personal passhrase for WPS use cases in AP mode * EAP-AKA: keep pseudonym identity across EAP exchanges to match EAP-SIM behavior * improved reassociation behavior in cases where association is rejected or when an AP disconnects us to handle common load balancing mechanisms - try to avoid extra scans when the needed information is available * added optional join argument for p2p_prov_disc ctrl_iface command * added group ifname to P2P-PROV-DISC-* events * added P2P Device Address to AP-STA-DISCONNECTED event and use p2p_dev_addr parameter name with AP-STA-CONNECTED * added workarounds for WPS PBC overlap detection for some P2P use cases where deployed stations work incorrectly * optimize WPS connection speed by disconnecting prior to WPS scan and by using single channel scans when AP channel is known * PCSC and SIM/USIM improvements: - accept 0x67 (Wrong length) as a response to READ RECORD to fix issues with some USIM cards - try to read MNC length from SIM/USIM - build realm according to 3GPP TS 23.003 with identity from the SIM - allow T1 protocol to be enabled * added more WPS and P2P information available through D-Bus * improve P2P negotiation robustness - extra waits to get ACK frames through - longer timeouts for cases where deployed devices have been identified have issues meeting the specification requirements - more retries for some P2P frames - handle race conditions in GO Negotiation start by both devices - ignore unexpected GO Negotiation Response
CVS commit: src/external/bsd/wpa/bin
Module Name:src Committed By: christos Date: Fri Jan 3 02:07:31 UTC 2014 Modified Files: src/external/bsd/wpa/bin/hostapd: Makefile src/external/bsd/wpa/bin/wpa_passphrase: Makefile src/external/bsd/wpa/bin/wpa_supplicant: Makefile Log Message: update for 2.0 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_passphrase/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_supplicant/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Fri Jan 3 02:08:17 UTC 2014 Modified Files: src/external/bsd/wpa/dist/hostapd: hostapd_cli.c src/external/bsd/wpa/dist/src/ap: wpa_auth.c src/external/bsd/wpa/dist/src/drivers: driver_bsd.c driver_test.c src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c src/external/bsd/wpa/dist/src/l2_packet: l2_packet_freebsd.c src/external/bsd/wpa/dist/src/utils: eloop.c os.h radiotap.h trace.h src/external/bsd/wpa/dist/wpa_supplicant: wpa_cli.c Removed Files: src/external/bsd/wpa/dist/src/crypto: md5-non-fips.c src/external/bsd/wpa/dist/src/drivers: Apple80211.h MobileApple80211.c MobileApple80211.h driver_broadcom.c driver_iphone.m driver_osx.m driver_ralink.c driver_ralink.h wireless_copy.h src/external/bsd/wpa/dist/src/wps: wps_nfc.c wps_nfc_pn531.c wps_ufd.c src/external/bsd/wpa/dist/wpa_supplicant: main_symbian.cpp wpa_supplicant.nsi src/external/bsd/wpa/dist/wpa_supplicant/symbian: README.symbian bld.inf wpa_supplicant.mmp src/external/bsd/wpa/dist/wpa_supplicant/systemd: wpa_supplicant-nl80...@.service.in wpa_supplicant-wi...@.service.in wpa_supplic...@.service.in src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui: .gitignore eventhistory.ui eventhistory.ui.h main.cpp networkconfig.ui networkconfig.ui.h scanresults.ui scanresults.ui.h setup-mingw-cross-compiling userdatarequest.ui userdatarequest.ui.h wpa_gui.pro wpagui.ui wpagui.ui.h wpamsg.h src/external/bsd/wpa/dist/wpa_supplicant/xcode/wpa_supplicant.xcodeproj: project.pbxproj Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/ap/wpa_auth.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/wpa/dist/src/crypto/md5-non-fips.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/wpa/dist/src/drivers/Apple80211.h \ src/external/bsd/wpa/dist/src/drivers/MobileApple80211.c \ src/external/bsd/wpa/dist/src/drivers/MobileApple80211.h \ src/external/bsd/wpa/dist/src/drivers/driver_broadcom.c \ src/external/bsd/wpa/dist/src/drivers/driver_iphone.m \ src/external/bsd/wpa/dist/src/drivers/driver_osx.m \ src/external/bsd/wpa/dist/src/drivers/driver_ralink.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/wpa/dist/src/drivers/driver_ralink.c \ src/external/bsd/wpa/dist/src/drivers/wireless_copy.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/drivers/driver_test.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/utils/eloop.c \ src/external/bsd/wpa/dist/src/utils/os.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/utils/radiotap.h \ src/external/bsd/wpa/dist/src/utils/trace.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/wpa/dist/src/wps/wps_nfc.c \ src/external/bsd/wpa/dist/src/wps/wps_nfc_pn531.c \ src/external/bsd/wpa/dist/src/wps/wps_ufd.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/main_symbian.cpp cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.nsi cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/symbian/README.symbian \ src/external/bsd/wpa/dist/wpa_supplicant/symbian/bld.inf cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/symbian/wpa_supplicant.mmp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80...@.service.in \ src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wi...@.service.in \ src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplic...@.service.in cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/.gitignore cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui.h \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/main.cpp \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui.h \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui.h \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling \
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Jan 3 02:10:19 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new wpa To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/doc/3RDPARTY cvs rdiff -u -r1.1877 -r1.1878 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/wpa/bin/hostapd
Module Name:src Committed By: christos Date: Fri Jan 3 02:15:43 UTC 2014 Modified Files: src/external/bsd/wpa/bin/hostapd: Makefile Log Message: move crypto_openssl.c back into the right room. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/hostapd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 03:25:25 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: autoconf.c device.h if_le.c ioconf.c sd.c Log Message: Misc cleanup from OpenBSD/luna88k. - remove unused code - use proper prefix for structure members for readability To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/autoconf.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/device.h \ src/sys/arch/luna68k/stand/boot/sd.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/if_le.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/ioconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 03:44:41 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: boot.c Log Message: Disable unnecessary boot device check. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 06:15:10 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: devopen.c samachdep.h version Log Message: Pull more fixes from OpenBSD/luna88k: - accept empty controller and partition numbers, as well as empty filenames, and use defaults (0, 0 and netbsd) instead of complaining the boot path is invalid - move a macro where actually necessary Also bump version to denote the user visible change. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/devopen.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/luna68k/stand/boot/samachdep.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 06:37:13 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: getline.c init_main.c samachdep.h Log Message: Pull more fixes from OpenBSD/luna88k: - Bring getline() - a.k.a libsa gets() with a prompt prefix - in par with libsa gets(), featurewise; this means support for ^u to clear the input. - constify To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/getline.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/init_main.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/stand/boot/samachdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: mlelstv Date: Fri Jan 3 07:14:21 UTC 2014 Modified Files: src/sys/arch/amiga/amiga: cc.c cc.h src/sys/arch/atari/atari: stalloc.c stalloc.h Log Message: Fix allocator routines. Instead of abusing CIRCLEQ pointers, add an explicit type field to tag memory nodes that are or are not on the free list. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/amiga/cc.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/amiga/cc.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/atari/atari/stalloc.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/atari/stalloc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Jan 3 07:17:19 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: samachdep.h sc.c scsi.c scsireg.h sd.c ufs_disksubr.c Log Message: Pull more cleanups from OpenBSD/luna88k: - remove unused declarations - rename struct scsi_fmt_cdb to scsi_generic_cdb To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/stand/boot/samachdep.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/sc.c \ src/sys/arch/luna68k/stand/boot/sd.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/scsi.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/scsireg.h \ src/sys/arch/luna68k/stand/boot/ufs_disksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
