CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: dholland Date: Thu Dec 2 08:36:02 UTC 2010 Modified Files: src/usr.bin/calendar/calendars: calendar.history Log Message: Ahem. Battle of Wounded Knee? How about massacre? XXX: this file needs a *lot* of attention. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/calendar/calendars/calendar.history 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/calendar/calendars/calendar.history diff -u src/usr.bin/calendar/calendars/calendar.history:1.25 src/usr.bin/calendar/calendars/calendar.history:1.26 --- src/usr.bin/calendar/calendars/calendar.history:1.25 Sat Jun 5 20:53:44 2010 +++ src/usr.bin/calendar/calendars/calendar.history Thu Dec 2 08:36:02 2010 @@ -512,5 +512,5 @@ 12/20 U.S. buys ~1,000,000 sq. miles of Louisiana for ~$20/sq.mi. 12/27 Ether first used as anesthetic in childbirth, 1845 12/28 Comet Kohoutek at perihelion, 1973 -12/29 Battle of Wounded knee, 1890 +12/29 Massacre at Wounded Knee, 1890 12/30 First Los Angeles freeway dedicated, 1940
CVS commit: src/crypto/external/bsd/openssh/bin/sshd
Module Name:src
Committed By: he
Date: Thu Dec 2 10:21:28 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/bin/sshd: Makefile
Log Message:
Don't rely on the shared library dependencies to pull in the ssl and lber
libraries, for the benefit of static linking and our sun2 port.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/sshd/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/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.3 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.3 Mon Nov 22 22:19:54 2010
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Thu Dec 2 10:21:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/22 22:19:54 christos Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/02 10:21:28 he Exp $
.include bsd.own.mk
@@ -58,8 +58,8 @@
.if (${USE_LDAP} != no)
SRCS+= ldapauth.c
-LDADD+= -lldap
-DPADD+= ${LIBLDAP}
+LDADD+= -lldap -lssl -llber
+DPADD+= ${LIBLDAP} ${LIBSSL} ${LIBLBER}
.endif
.include bsd.prog.mk
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: he Date: Thu Dec 2 10:23:51 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: ssh-pkcs11.c Log Message: Make this build for platforms which don't define HAVE_DLOPEN, notably our sun2 port. Eliminates defined but not used warnings turned into errors by our setup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c 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/openssh/dist/ssh-pkcs11.c diff -u src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.2 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.3 --- src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.2 Sun Nov 21 18:59:04 2010 +++ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c Thu Dec 2 10:23:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ssh-pkcs11.c,v 1.2 2010/11/21 18:59:04 adam Exp $ */ +/* $NetBSD: ssh-pkcs11.c,v 1.3 2010/12/02 10:23:51 he Exp $ */ /* $OpenBSD: ssh-pkcs11.c,v 1.6 2010/06/08 21:32:19 markus Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include includes.h -__RCSID($NetBSD: ssh-pkcs11.c,v 1.2 2010/11/21 18:59:04 adam Exp $); +__RCSID($NetBSD: ssh-pkcs11.c,v 1.3 2010/12/02 10:23:51 he Exp $); #include sys/types.h #include sys/queue.h @@ -166,6 +166,7 @@ return (-1); } +#ifdef HAVE_DLOPEN /* openssl callback for freeing an RSA key */ static int pkcs11_rsa_finish(RSA *rsa) @@ -466,7 +467,6 @@ return (0); } -#ifdef HAVE_DLOPEN /* register a new provider, fails if provider already exists */ int pkcs11_add_provider(char *provider_id, char *pin, Key ***keyp)
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Thu Dec 2 12:04:01 UTC 2010 Modified Files: src/share/man/man7: c.7 Log Message: Various (mostly wording) improvements. Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man7/c.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/c.7 diff -u src/share/man/man7/c.7:1.5 src/share/man/man7/c.7:1.6 --- src/share/man/man7/c.7:1.5 Wed Dec 1 13:27:15 2010 +++ src/share/man/man7/c.7 Thu Dec 2 12:04:01 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: c.7,v 1.5 2010/12/01 13:27:15 jruoho Exp $ +.\ $NetBSD: c.7,v 1.6 2010/12/02 12:04:01 wiz Exp $ .\ .\ Copyright (C) 2007, 2010 Gabor Kovesdan. All rights reserved. .\ @@ -38,42 +38,45 @@ The C language contains some basic ideas from the BCPL language through the B language written by Ken Thompson in 1970 for the DEC PDP-7 machines. The development of the UNIX operating system was started on a PDP-7 -machine in assembly language, but it made very difficult to port the existing -code to other systems. +machine in assembly language, but this choice made it very difficult +to port the existing code to other systems. .Pp In 1972 Dennis M. Ritchie worked out the C programming language for further development of the UNIX operating system. The idea was to implement only the C compiler for different -platforms, and implement most part of the operating system +platforms, and implement most parts of the operating system in the new programming language to simplify the portability between different architectures. -It follows that C is very eligible for (but not limited to) writing +It follows that C is very well adapted for (but not limited to) writing operating systems and low-level applications. .Pp The C language did not have a specification or standardized version for a long time. It went through a lot of changes and improvements for ages. In 1978, Brian W. Kernighan and Dennis M. Ritchie published the -first book about C under the title The C Programming Language. +first book about C under the title +.Dq The C Programming Language . We can think of this book as the first specification of the language. -This version is often referred as KR C after the names of the authors. -Sometimes it is referred as C78, as well, after the publishing year of +This version is often referred to as +.Dq KR C +after the names of the authors. +Sometimes it is referred to as C78, as well, after the publishing year of the first edition of the book. .Pp -It is important to notice, that the instruction set of the language is +It is important to notice that the instruction set of the language is limited to the most fundamental elements for simplicity. -Handling of the standard I/O and such common functions are implemented in +Handling of the standard I/O and similar common functions are implemented in the libraries shipped with the compiler. As these functions are also widely used, it was demanded to include into the description what requisites the library should conform to, not just strictly the language itself. Accordingly, the aforementioned standards cover the library elements, as well. -The elements of this standard library is still not enough for more +The elements of this standard library are still not enough for more complicated tasks. In this case the provided system calls of the given operating system can be used. -To not loose the portability by using these system calls, the POSIX -(Portable Operating System Interface) standard evolved. +To not lose the portability by using these system calls, the POSIX +(Portable Operating System Interface (for Unix)) standard evolved. It describes what functions should be available to keep portability. Note, that POSIX is not a C standard, but an operating system standard and thus is beyond the scope of this manual. @@ -82,22 +85,21 @@ .Pp After the publication of the book mentioned before, the American National Standards Institute (ANSI) started to work on -standardizing the language, and they announced ANSI X3.159-1989 -in 1989. -It is usually referred as ANSI C or C89. +standardizing the language, and in 1989 they announced ANSI X3.159-1989. +It is usually referred to as ANSI C or C89. The main difference in this standard were the function prototypes, -which is a new way of declaring functions. +which was a new way of declaring functions. With the old-style function declarations, the compiler was unable to -check the sanity of the actual parameters at a function call. +check the sanity of the actual parameters of a function call. The old syntax was highly error-prone because incompatible parameters were hard to detect in the program code and the problem only showed up at run-time. .Pp In 1990, the International Organization for Standardization (ISO) adopted -the ANSI standard as ISO/IEC 9899:1990 in 1990. -This is
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Dec 2 14:54:44 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 shl.mi Log Message: fix sets for bind 9.7.2-P3 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.558 -r1.559 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/comp/shl.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/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.28 src/distrib/sets/lists/base/ad.mips64eb:1.29 --- src/distrib/sets/lists/base/ad.mips64eb:1.28 Mon Nov 22 17:22:28 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Dec 2 09:54:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.28 2010/11/22 22:22:28 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.29 2010/12/02 14:54:43 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -54,7 +54,7 @@ ./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic,binutils ./usr/lib/64/libbfd.so.11.0 base-compat-shlib compat,pic,binutils ./usr/lib/64/libbind9.so.5 base-compat-shlib compat,pic -./usr/lib/64/libbind9.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/libbind9.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/64/libbluetooth.so.4.2 base-compat-shlib compat,pic ./usr/lib/64/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -74,7 +74,7 @@ ./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic -./usr/lib/64/libdns.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/64/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic @@ -98,11 +98,11 @@ ./usr/lib/64/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/64/libipsec.so.3.0 base-compat-shlib compat,pic ./usr/lib/64/libisc.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisc.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/libisc.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libisccc.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisccc.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/libisccc.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libisccfg.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisccfg.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/libisccfg.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/libiscsi.so.2 base-compat-shlib compat,pic,iscsi ./usr/lib/64/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi ./usr/lib/64/libkadm5clnt.so.12 base-compat-shlib compat,pic,kerberos @@ -124,7 +124,7 @@ ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic -./usr/lib/64/liblwres.so.5.1 base-compat-shlib compat,pic +./usr/lib/64/liblwres.so.5.2 base-compat-shlib compat,pic ./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libm.so.0base-compat-shlib compat,pic @@ -295,7 +295,7 @@ ./usr/lib/o32/libbfd.so.11 base-compat-shlib compat,pic,binutils ./usr/lib/o32/libbfd.so.11.0 base-compat-shlib compat,pic,binutils ./usr/lib/o32/libbind9.so.5 base-compat-shlib compat,pic -./usr/lib/o32/libbind9.so.5.1 base-compat-shlib compat,pic +./usr/lib/o32/libbind9.so.5.2 base-compat-shlib compat,pic ./usr/lib/o32/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/o32/libbluetooth.so.4.2 base-compat-shlib compat,pic ./usr/lib/o32/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -315,7 +315,7 @@ ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic -./usr/lib/o32/libdns.so.5.1 base-compat-shlib compat,pic +./usr/lib/o32/libdns.so.5.2 base-compat-shlib compat,pic ./usr/lib/o32/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/o32/libedit.so.3.0 base-compat-shlib compat,pic
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Dec 2 14:55:40 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.790 -r1.791 src/doc/3RDPARTY cvs rdiff -u -r1.1464 -r1.1465 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.790 src/doc/3RDPARTY:1.791 --- src/doc/3RDPARTY:1.790 Mon Nov 29 09:52:11 2010 +++ src/doc/3RDPARTY Thu Dec 2 09:55:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.790 2010/11/29 14:52:11 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.791 2010/12/02 14:55:40 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -91,8 +91,8 @@ bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.7.2b1 -Current Vers: 9.7.2b1 +Version: 9.7.2-P3 +Current Vers: 9.7.2-P3 Maintainer: Paul Vixie vi...@vix.com Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/sw/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1464 src/doc/CHANGES:1.1465 --- src/doc/CHANGES:1.1464 Sat Nov 27 19:26:39 2010 +++ src/doc/CHANGES Thu Dec 2 09:55:40 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1464 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1465 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -792,3 +792,4 @@ dhcpcd(8): Import dhcpcd-5.2.9. [roy 20101127] postfix(1): Import version 2.7.2 [tron 20101127] module: Rename module.prop to module.plist. [jnemeth 20101127] + bind: Update to 9.7.2-P3 [christos 20101202]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Dec 2 16:06:18 UTC 2010 Modified Files: src/doc: CHANGES Log Message: mention what changed in bind. To generate a diff of this commit: cvs rdiff -u -r1.1465 -r1.1466 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/CHANGES diff -u src/doc/CHANGES:1.1465 src/doc/CHANGES:1.1466 --- src/doc/CHANGES:1.1465 Thu Dec 2 09:55:40 2010 +++ src/doc/CHANGES Thu Dec 2 11:06:18 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1465 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1466 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -792,4 +792,5 @@ dhcpcd(8): Import dhcpcd-5.2.9. [roy 20101127] postfix(1): Import version 2.7.2 [tron 20101127] module: Rename module.prop to module.plist. [jnemeth 20101127] - bind: Update to 9.7.2-P3 [christos 20101202] + bind: Update to 9.7.2-P3. Bug and security fixes since 9.7.2b1. See + src/external/bsd/bind/dist/CHANGES [christos 20101202]
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Thu Dec 2 16:36:55 UTC 2010 Modified Files: src/usr.bin/make: var.c Log Message: add commented out a possible addition that provides $^ like gmake, but I am not sure if we should add it, since we already have $ for it. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/usr.bin/make/var.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/var.c diff -u src/usr.bin/make/var.c:1.159 src/usr.bin/make/var.c:1.160 --- src/usr.bin/make/var.c:1.159 Sat Jun 5 21:13:12 2010 +++ src/usr.bin/make/var.c Thu Dec 2 11:36:55 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $ */ +/* $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $; +static char rcsid[] = $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $; #else #include sys/cdefs.h #ifndef lint #if 0 static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $); +__RCSID($NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $); #endif #endif /* not lint */ #endif @@ -379,6 +379,12 @@ name = TARGET; break; } +#ifdef notyet +/* for compatibility with gmake */ +if (name[0] == '^' name[1] == '\0') + name = ALLSRC; +#endif + /* * First look for the variable in the given context. If it's not there, * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Thu Dec 2 16:46:22 UTC 2010
Modified Files:
src/usr.bin/make: var.c
Log Message:
From Aleksey Cheusov: Fix unexpected behavior with:
all: test1 test2
test1:
@echo ${foo::=foo-text}
test2:
@echo $(foo::=foo-text)
Saying:
nbmake: Unclosed substitution for foo (} missing)
for test 2
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.160 src/usr.bin/make/var.c:1.161
--- src/usr.bin/make/var.c:1.160 Thu Dec 2 11:36:55 2010
+++ src/usr.bin/make/var.c Thu Dec 2 11:46:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $ */
+/* $NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $);
+__RCSID($NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -2492,7 +2492,7 @@
cp = ++tstr;
break;
}
- delim = BRCLOSE;
+ delim = startc == PROPEN ? PRCLOSE : BRCLOSE;
pattern.flags = 0;
pattern.rhs = VarGetPattern(ctxt, parsestate, errnum,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Thu Dec 2 16:56:22 UTC 2010 Modified Files: src/sys/dev/usb: if_otus.c Log Message: Don't crash during detach if the attach hook failed before setting up. From Chuck Silvers To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_otus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/if_otus.c diff -u src/sys/dev/usb/if_otus.c:1.7 src/sys/dev/usb/if_otus.c:1.8 --- src/sys/dev/usb/if_otus.c:1.7 Thu Nov 4 10:08:31 2010 +++ src/sys/dev/usb/if_otus.c Thu Dec 2 11:56:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_otus.c,v 1.7 2010/11/04 14:08:31 christos Exp $ */ +/* $NetBSD: if_otus.c,v 1.8 2010/12/02 16:56:21 christos Exp $ */ /* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */ /*- @@ -645,6 +645,9 @@ DPRINTF(otus_detach\n); + if (ifp == NULL) /* Failed to attach properly */ + return 0; + otus_stop(ifp); s = splnet();
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Thu Dec 2 17:38:05 UTC 2010
Modified Files:
src/sys/dev/usb: if_otus.c
Log Message:
just ignore things that refer to the interface while detaching.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_otus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.8 src/sys/dev/usb/if_otus.c:1.9
--- src/sys/dev/usb/if_otus.c:1.8 Thu Dec 2 11:56:21 2010
+++ src/sys/dev/usb/if_otus.c Thu Dec 2 12:38:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.8 2010/12/02 16:56:21 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.9 2010/12/02 17:38:05 christos Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -645,22 +645,22 @@
DPRINTF(otus_detach\n);
- if (ifp == NULL) /* Failed to attach properly */
- return 0;
-
- otus_stop(ifp);
+ if (ifp != NULL) /* Failed to attach properly */
+ otus_stop(ifp);
s = splnet();
/* Wait for all queued asynchronous commands to complete. */
- while (sc-sc_cmdq.queued 0)
- tsleep(sc-sc_cmdq, 0, sc_cmdq, 0);
+ if (ifp != NULL) {
+ while (sc-sc_cmdq.queued 0)
+ tsleep(sc-sc_cmdq, 0, sc_cmdq, 0);
+ }
usb_rem_task(sc-sc_udev, sc-sc_task);
callout_destroy(sc-sc_scan_to);
callout_destroy(sc-sc_calib_to);
- if (ifp-if_flags != 0) { /* if_attach() has been called. */
+ if (ifp ifp-if_flags != 0) { /* if_attach() has been called. */
ifp-if_flags = ~(IFF_RUNNING | IFF_OACTIVE);
bpf_detach(ifp);
ieee80211_ifdetach(sc-sc_ic);
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: elric Date: Thu Dec 2 18:02:58 UTC 2010 Modified Files: src/sbin/cgdconfig: cgdconfig.c Log Message: Remove a line that was intended only for my personal testing and that breaks things. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sbin/cgdconfig/cgdconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.c diff -u src/sbin/cgdconfig/cgdconfig.c:1.30 src/sbin/cgdconfig/cgdconfig.c:1.31 --- src/sbin/cgdconfig/cgdconfig.c:1.30 Thu Dec 2 04:54:32 2010 +++ src/sbin/cgdconfig/cgdconfig.c Thu Dec 2 18:02:58 2010 @@ -1,6 +1,4 @@ -#define opendisk1(x,y,z,t,u,v) opendisk(x,y,z,t,u) - -/* $NetBSD: cgdconfig.c,v 1.30 2010/12/02 04:54:32 elric Exp $ */ +/* $NetBSD: cgdconfig.c,v 1.31 2010/12/02 18:02:58 elric Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -35,7 +33,7 @@ #ifndef lint __COPYRIGHT(@(#) Copyright (c) 2002, 2003\ The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: cgdconfig.c,v 1.30 2010/12/02 04:54:32 elric Exp $); +__RCSID($NetBSD: cgdconfig.c,v 1.31 2010/12/02 18:02:58 elric Exp $); #endif #include err.h
CVS commit: src/sys/netinet
Module Name:src
Committed By: plunky
Date: Thu Dec 2 19:07:28 UTC 2010
Modified Files:
src/sys/netinet: tcp_input.c
Log Message:
fix potential mbuf overflow, from Alexander Danilov on tech-net
To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/sys/netinet/tcp_input.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_input.c
diff -u src/sys/netinet/tcp_input.c:1.305 src/sys/netinet/tcp_input.c:1.306
--- src/sys/netinet/tcp_input.c:1.305 Wed May 26 17:38:29 2010
+++ src/sys/netinet/tcp_input.c Thu Dec 2 19:07:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.305 2010/05/26 17:38:29 bouyer Exp $ */
+/* $NetBSD: tcp_input.c,v 1.306 2010/12/02 19:07:27 plunky Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.305 2010/05/26 17:38:29 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.306 2010/12/02 19:07:27 plunky Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -4274,7 +4274,7 @@
return (ENOBUFS);
#endif
MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m tlen MHLEN) {
+ if (m (max_linkhdr + tlen) MHLEN) {
MCLGET(m, M_DONTWAIT);
if ((m-m_flags M_EXT) == 0) {
m_freem(m);
CVS commit: src/sys/rump/include/machine
Module Name:src
Committed By: pooka
Date: Thu Dec 2 21:20:40 UTC 2010
Modified Files:
src/sys/rump/include/machine: cpu.h
Log Message:
add ci_curlwp since we use it now
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/machine/cpu.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/rump/include/machine/cpu.h
diff -u src/sys/rump/include/machine/cpu.h:1.12 src/sys/rump/include/machine/cpu.h:1.13
--- src/sys/rump/include/machine/cpu.h:1.12 Thu Oct 15 16:46:37 2009
+++ src/sys/rump/include/machine/cpu.h Thu Dec 2 21:20:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.12 2009/10/15 16:46:37 pooka Exp $ */
+/* $NetBSD: cpu.h,v 1.13 2010/12/02 21:20:39 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -38,6 +38,7 @@
struct cpu_info {
struct cpu_data ci_data;
cpuid_t ci_cpuid;
+ struct lwp *ci_curlwp;
/*
* XXX: horrible workaround for vax lock.h.
CVS commit: src/sbin/resize_ffs
Module Name:src Committed By: riz Date: Thu Dec 2 22:00:27 UTC 2010 Modified Files: src/sbin/resize_ffs: resize_ffs.c Log Message: Use howmany() instead of / to calculate the number of cylinders for the changed file system, so as to not drop a partial cylinder at the end. Fixes PR bin/44177. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sbin/resize_ffs/resize_ffs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/resize_ffs/resize_ffs.c diff -u src/sbin/resize_ffs/resize_ffs.c:1.16 src/sbin/resize_ffs/resize_ffs.c:1.17 --- src/sbin/resize_ffs/resize_ffs.c:1.16 Wed Dec 1 17:39:21 2010 +++ src/sbin/resize_ffs/resize_ffs.c Thu Dec 2 22:00:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: resize_ffs.c,v 1.16 2010/12/01 17:39:21 riz Exp $ */ +/* $NetBSD: resize_ffs.c,v 1.17 2010/12/02 22:00:27 riz Exp $ */ /* From sources sent on February 17, 2003 */ /*- * As its sole author, I explicitly place this code in the public @@ -882,7 +882,8 @@ * to be at least one frag in size.) */ writeat(newsb-fs_size - 1, sbbuf, newsb-fs_fsize); /* Update fs_old_ncyl and fs_ncg. */ - newsb-fs_old_ncyl = (newsb-fs_size * NSPF(newsb)) / newsb-fs_old_spc; + newsb-fs_old_ncyl = howmany(newsb-fs_size * NSPF(newsb), + newsb-fs_old_spc); newsb-fs_ncg = howmany(newsb-fs_old_ncyl, newsb-fs_old_cpg); /* Does the last cg end before the end of its inode area? There is no * reason why this couldn't be handled, but it would complicate a lot @@ -1521,7 +1522,8 @@ newsb-fs_time = timestamp(); /* Update the size figures. */ newsb-fs_size = dbtofsb(newsb, newsize); - newsb-fs_old_ncyl = (newsb-fs_size * NSPF(newsb)) / newsb-fs_old_spc; + newsb-fs_old_ncyl = howmany(newsb-fs_size * NSPF(newsb), + newsb-fs_old_spc); newsb-fs_ncg = howmany(newsb-fs_old_ncyl, newsb-fs_old_cpg); /* Does the (new) last cg end before the end of its inode area? See * the similar code in grow() for more on this. */
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Thu Dec 2 22:03:23 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: t_resize_ffs.sh
Log Message:
Update existing test cases and add a couple more:
- PR bin/44177 is fixed
- test grow/shrink on a ffsv1 with 64k blocksize, which was broken until
recently
- make sure the partial cylinder left over is big enough so it doesn't
get thrown away now that resize_ffs properly uses the last cyl.
XXX TODO: add tests which ensure data integrity.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sbin/resize_ffs/t_resize_ffs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/resize_ffs/t_resize_ffs.sh
diff -u src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.1 src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.2
--- src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.1 Tue Nov 30 23:17:27 2010
+++ src/tests/sbin/resize_ffs/t_resize_ffs.sh Thu Dec 2 22:03:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_resize_ffs.sh,v 1.1 2010/11/30 23:17:27 riz Exp $
+# $NetBSD: t_resize_ffs.sh,v 1.2 2010/12/02 22:03:23 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,13 +33,14 @@
# misc routines
-atf_test_case grow cleanup
-grow_head()
+atf_test_case grow_ffsv1_partial_cg cleanup
+grow_ffsv1_partial_cg_head()
{
- atf_set descr Checks successful fs growth
+ atf_set descr Checks successful ffsv1 growth by less \
+ than a cylinder group
atf_set require.user root
}
-grow_body()
+grow_ffsv1_partial_cg_body()
{
cat disktab EOF
floppy288|2.88MB 3.5in Extra High Density Floppy:\
@@ -55,24 +56,92 @@
atf_check -o ignore -e ignore vnconfig -v ${VND} ${IMG}
atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} floppy288
# resize_ffs only supports ffsv1 at the moment
- atf_check -o ignore -e ignore newfs -V1 -s 3000 /dev/r${VND}a
+ atf_check -o ignore -e ignore newfs -V1 -s 4000 /dev/r${VND}a
# grow the fs to the full partition size (5760)
atf_check -s exit:0 resize_ffs -y /dev/r${VND}a
atf_check -s exit:0 -o ignore fsck -f -n /dev/r${VND}a
}
-grow_cleanup()
+grow_ffsv1_partial_cg_cleanup()
{
vnconfig -u ${VND}
}
-atf_test_case shrink cleanup
-shrink_head()
+atf_test_case grow_ffsv1_64k cleanup
+grow_ffsv1_64k()
{
- atf_set descr Checks successful fs shrinkage
+ atf_set descr Checks successful ffsv1 growth with 64k blocksize
atf_set require.user root
}
-shrink_body()
+grow_ffsv1_64k_body()
+{
+ cat disktab EOF
+disk64M|64MB test disk:\
+ :ty=test:se#512:nt#64:ns#32:nc#64:\
+ :pa#131072:oa#0:ba#65536:fa#8192:ta=4.2BSD:\
+ :pc#131072:oc#0:\
+ :pd#131072:od#0:
+EOF
+
+ echo ***resize_ffs grow 64k block test
+
+ atf_check -o ignore -e ignore dd if=/dev/zero of=${IMG} count=131072
+ atf_check -o ignore -e ignore vnconfig -v ${VND} ${IMG}
+ atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} disk64M
+ atf_check -o ignore -e ignore newfs -V1 -b 65536 -f 8192 \
+ -s 32768 /dev/r${VND}a
+
+ # grow the fs to the full partition size (131072)
+ atf_check -s exit:0 resize_ffs -y /dev/r${VND}a
+ atf_check -s exit:0 -o ignore fsck -f -n /dev/r${VND}a
+ atf_check -o match:'size[[:space:]]*8192' dumpfs /dev/r${VND}a
+}
+grow_ffsv1_64k_cleanup()
+{
+ vnconfig -u ${VND}
+}
+
+atf_test_case shrink_ffsv1_64k cleanup
+shrink_ffsv1_64k()
+{
+ atf_set descr Checks successful ffsv1 shrinkage with 64k blocksize
+ atf_set require.user root
+}
+shrink_ffsv1_64k_body()
+{
+ cat disktab EOF
+disk64M|64MB test disk:\
+ :ty=test:se#512:nt#64:ns#32:nc#64:\
+ :pa#131072:oa#0:ba#65536:fa#8192:ta=4.2BSD:\
+ :pc#131072:oc#0:\
+ :pd#131072:od#0:
+EOF
+
+ echo ***resize_ffs shrink 64k block test
+
+ atf_check -o ignore -e ignore dd if=/dev/zero of=${IMG} count=131072
+ atf_check -o ignore -e ignore vnconfig -v ${VND} ${IMG}
+ atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} disk64M
+ atf_check -o ignore -e ignore newfs -V1 -b 65536 -f 8192 /dev/r${VND}a
+
+ # shrink it to half size
+ atf_check -s exit:0 resize_ffs -y -s 65536 /dev/r${VND}a
+ atf_check -s exit:0 -o ignore fsck -f -n /dev/r${VND}a
+ atf_check -o match:'size[[:space:]]*4096' dumpfs /dev/r${VND}a
+}
+shrink_ffsv1_64k_cleanup()
+{
+ vnconfig -u ${VND}
+}
+
+atf_test_case shrink_ffsv1_partial_cg cleanup
+shrink_ffsv1_partial_cg_head()
+{
+ atf_set descr Checks successful shrinkage of ffsv1 by \
+ less than a cylinder group
+ atf_set require.user root
+}
+shrink_ffsv1_partial_cg_body()
{
cat disktab EOF
floppy288|2.88MB 3.5in Extra High Density Floppy:\
@@ -82,27 +151,27 @@
:pc#5760:oc#0:
EOF
- echo *** resize_ffs shrinkage test
+ echo *** resize_ffs shrinkage partial cg test
atf_check -o ignore -e ignore dd if=/dev/zero of=${IMG} count=5860
atf_check -o ignore -e ignore vnconfig -v ${VND} ${IMG}
atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} floppy288
- # resize_ffs only supports ffsv1 at the moment
CVS commit: src/sbin/resize_ffs
Module Name:src Committed By: riz Date: Thu Dec 2 22:04:01 UTC 2010 Modified Files: src/sbin/resize_ffs: TODO Log Message: Knock one off the list. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/resize_ffs/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/resize_ffs/TODO diff -u src/sbin/resize_ffs/TODO:1.3 src/sbin/resize_ffs/TODO:1.4 --- src/sbin/resize_ffs/TODO:1.3 Wed Dec 1 17:39:54 2010 +++ src/sbin/resize_ffs/TODO Thu Dec 2 22:04:01 2010 @@ -1,7 +1,5 @@ resize_ffs(8) TODO list -* Determine why shrinking a v1 file system gets the free block/frag info - wrong, requiring a fsck. * Add support for swapped byte order * Fix support for disk blocks of size other than 512 bytes * Add support for plain files (primarily to ease testing)
CVS commit: src/share/mk
Module Name:src
Committed By: wiz
Date: Thu Dec 2 23:08:04 UTC 2010
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
Remove HTMLDEPS; was only used by nroff.
Ok joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/share/mk/bsd.man.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/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.104 src/share/mk/bsd.man.mk:1.105
--- src/share/mk/bsd.man.mk:1.104 Tue Jun 1 23:29:10 2010
+++ src/share/mk/bsd.man.mk Thu Dec 2 23:08:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.104 2010/06/01 23:29:10 joerg Exp $
+# $NetBSD: bsd.man.mk,v 1.105 2010/12/02 23:08:04 wiz Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include bsd.init.mk
@@ -23,7 +23,6 @@
${TMACDEPDIR}/mdoc/doc-ditroff \
${TMACDEPDIR}/mdoc/doc-nroff \
${TMACDEPDIR}/mdoc/doc-syms
-HTMLDEPS?= ${TMACDEPDIR}/doc2html.tmac
MANTARGET?= cat
MAN?=
@@ -193,9 +192,8 @@
realall: ${HTMLPAGES}
.NOPATH: ${HTMLPAGES}
.SUFFIXES: ${_MNUMBERS:@n...@.html$n@}
-.MADE: ${HTMLDEPS}
-${_MNUMBERS:@n...@.$n.html$n@}: ${HTMLDEPS} # build rule
+${_MNUMBERS:@n...@.$n.html$n@}: # build rule
${_MKTARGET_FORMAT}
${TOOL_MANDOC_HTML} ${.IMPSRC} ${.TARGET}.tmp \
mv ${.TARGET}.tmp ${.TARGET}
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: bouyer Date: Thu Dec 2 23:12:30 UTC 2010 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: Make maxpartitions 16 on !i386. Fixes hardwiring root on device autoconf index 0 on amd64. Problem reported and patch tested by Tobias Nygren. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.109 src/sys/arch/xen/conf/files.xen:1.110 --- src/sys/arch/xen/conf/files.xen:1.109 Thu Jul 8 11:25:00 2010 +++ src/sys/arch/xen/conf/files.xen Thu Dec 2 23:12:30 2010 @@ -1,8 +1,12 @@ -# $NetBSD: files.xen,v 1.109 2010/07/08 11:25:00 rmind Exp $ +# $NetBSD: files.xen,v 1.110 2010/12/02 23:12:30 bouyer Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp +ifdef i386 maxpartitions 8 +else +maxpartitions 16 +endif maxusers 2 16 128
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src
Committed By: snj
Date: Thu Dec 2 23:42:37 UTC 2010
Modified Files:
src/sys/dev/ic [netbsd-5]: iavc.c
Log Message:
Pull up following revision(s) (requested by riz in ticket #1418):
sys/dev/ic/iavc.c: revision 1.8
Make this compile foo[0] does not work for void * :-) Wojciech Galazka
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.14.1 src/sys/dev/ic/iavc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/iavc.c
diff -u src/sys/dev/ic/iavc.c:1.7 src/sys/dev/ic/iavc.c:1.7.14.1
--- src/sys/dev/ic/iavc.c:1.7 Tue Apr 8 12:07:26 2008
+++ src/sys/dev/ic/iavc.c Thu Dec 2 23:42:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc.c,v 1.7 2008/04/08 12:07:26 cegger Exp $ */
+/* $NetBSD: iavc.c,v 1.7.14.1 2010/12/02 23:42:37 snj Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: iavc.c,v 1.7 2008/04/08 12:07:26 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: iavc.c,v 1.7.14.1 2010/12/02 23:42:37 snj Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -892,7 +892,7 @@
u_int8_t *dmabuf = 0, cmd;
if (sc-sc_dma) {
- dmabuf = amcc_get_byte(sc-sc_recvbuf[0], cmd);
+ dmabuf = amcc_get_byte(sc-sc_recvbuf, cmd);
} else {
cmd = iavc_get_byte(sc);
}
@@ -1004,9 +1004,9 @@
/* Copy message to DMA buffer. */
if (m-m_next)
- dmabuf = amcc_put_byte(sc-sc_sendbuf[0], SEND_DATA_B3_REQ);
+ dmabuf = amcc_put_byte(sc-sc_sendbuf, SEND_DATA_B3_REQ);
else
- dmabuf = amcc_put_byte(sc-sc_sendbuf[0], SEND_MESSAGE);
+ dmabuf = amcc_put_byte(sc-sc_sendbuf, SEND_MESSAGE);
dmabuf = amcc_put_word(dmabuf, m-m_len);
memcpy(dmabuf, m-m_data, m-m_len);
@@ -1061,7 +1061,7 @@
uint8_t *dmabuf;
if (sc-sc_dma) {
- memcpy(sc-sc_sendbuf[0], m-m_data + 2, m-m_len - 2);
+ memcpy(sc-sc_sendbuf, m-m_data + 2, m-m_len - 2);
txlen = m-m_len - 2;
} else {
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src Committed By: snj Date: Thu Dec 2 23:45:59 UTC 2010 Modified Files: src/sys/dev/ic [netbsd-5]: mpt.c mpt.h mpt_debug.c mpt_netbsd.c Log Message: Pull up following revision(s) (requested by riz in ticket #1487): sys/dev/ic/mpt.c: revision 1.14 sys/dev/ic/mpt.h: revision 1.7 sys/dev/ic/mpt_debug.c: revision 1.7 sys/dev/ic/mpt_netbsd.c: revision 1.15 add byte-swapping so that this works on BE platforms. the logic is based on the current freebsd driver. fixes PR 42870. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.42.1 src/sys/dev/ic/mpt.c cvs rdiff -u -r1.6 -r1.6.42.1 src/sys/dev/ic/mpt.h cvs rdiff -u -r1.4 -r1.4.86.1 src/sys/dev/ic/mpt_debug.c cvs rdiff -u -r1.14 -r1.14.14.1 src/sys/dev/ic/mpt_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/mpt.c diff -u src/sys/dev/ic/mpt.c:1.10 src/sys/dev/ic/mpt.c:1.10.42.1 --- src/sys/dev/ic/mpt.c:1.10 Fri Jul 27 18:38:13 2007 +++ src/sys/dev/ic/mpt.c Thu Dec 2 23:45:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mpt.c,v 1.10 2007/07/27 18:38:13 tron Exp $ */ +/* $NetBSD: mpt.c,v 1.10.42.1 2010/12/02 23:45:59 snj Exp $ */ /* * Copyright (c) 2000, 2001 by Greg Ansley @@ -27,6 +27,75 @@ /* * Additional Copyright (c) 2002 by Matthew Jacob under same license. */ +/*- + * Copyright (c) 2002, 2006 by Matthew Jacob + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + *substantially similar to the NO WARRANTY disclaimer below + *(Disclaimer) and any redistribution must be conditioned upon including + *a substantially similar Disclaimer requirement for further binary + *redistribution. + * 3. Neither the names of the above listed copyright holders nor the names + *of any contributors may be used to endorse or promote products derived + *from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT + * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Support from Chris Ellsworth in order to make SAS adapters work + * is gratefully acknowledged. + * + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. + */ +/*- + * Copyright (c) 2004, Avid Technology, Inc. and its contributors. + * Copyright (c) 2005, WHEEL Sp. z o.o. + * Copyright (c) 2004, 2005 Justin T. Gibbs + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + *substantially similar to the NO WARRANTY disclaimer below + *(Disclaimer) and any redistribution must be conditioned upon including + *a substantially similar Disclaimer requirement for further binary + *redistribution. + * 3. Neither the names of the above listed copyright holders nor the names + *of any contributors may be used to endorse or promote products derived + *from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Thu Dec 2 23:50:29 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: 1418 and 1487 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.33 src/doc/CHANGES-5.2:1.1.2.34 --- src/doc/CHANGES-5.2:1.1.2.33 Sat Nov 27 21:12:50 2010 +++ src/doc/CHANGES-5.2 Thu Dec 2 23:50:29 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.33 2010/11/27 21:12:50 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.34 2010/12/02 23:50:29 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -865,3 +865,17 @@ Add support for Kingston DT Mini 10 pendrive, with quirk. [sborrill, ticket #1489] +sys/dev/ic/iavc.c1.8 + + Make this compile. + [riz, ticket #1418] + +sys/dev/ic/mpt.c1.14 +sys/dev/ic/mpt.h1.7 +sys/dev/ic/mpt_debug.c1.7 +sys/dev/ic/mpt_netbsd.c1.15 + + Add byte-swapping so that this works on BE platforms. The logic + is based on the current freebsd driver. Fixes PR 42870. + [riz, ticket #1487] +
CVS commit: src/tests/util/make
Module Name:src
Committed By: christos
Date: Fri Dec 3 01:29:55 UTC 2010
Modified Files:
src/tests/util/make: Makefile t_make.sh
Added Files:
src/tests/util/make: d_unmatchedvarparen.mk d_unmatchedvarparen.out
Log Message:
Add a new test for the latest variable expansion problem.
- Cannot test because make test prints:
.: Can't open /usr/share/atf/atf.header.subr
- The shell script common code needs to be fixed to follow regular shell
style.
- variables are underquoted
- uses `` instead of $()
- does not use local for local variables, prefixes with undescore
- needlessly uses braces for numeric and symbolic variables.
- uses a fifo to grab output, and does not clean it up properly on error
- should not exit with 127 !!!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/make/Makefile \
src/tests/util/make/t_make.sh
cvs rdiff -u -r0 -r1.1 src/tests/util/make/d_unmatchedvarparen.mk \
src/tests/util/make/d_unmatchedvarparen.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/make/Makefile
diff -u src/tests/util/make/Makefile:1.2 src/tests/util/make/Makefile:1.3
--- src/tests/util/make/Makefile:1.2 Sat Jul 10 12:16:12 2010
+++ src/tests/util/make/Makefile Thu Dec 2 20:29:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/10 16:16:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/12/03 01:29:55 christos Exp $
NOMAN= # defined
@@ -37,6 +37,8 @@
FILES+= d_qequals.out
FILES+= d_ternary.mk
FILES+= d_ternary.out
+FILES+= d_unmatchedvarparen.mk
+FILES+= d_unmatchedvarparen.out
FILES+= d_varcmd.mk
FILES+= d_varcmd.out
Index: src/tests/util/make/t_make.sh
diff -u src/tests/util/make/t_make.sh:1.2 src/tests/util/make/t_make.sh:1.3
--- src/tests/util/make/t_make.sh:1.2 Sun Nov 7 12:51:23 2010
+++ src/tests/util/make/t_make.sh Thu Dec 2 20:29:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.2 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_make.sh,v 1.3 2010/12/03 01:29:55 christos Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -66,6 +66,7 @@
test_case qequals Checks operator ?=
test_case ternary Checks ternary modifier
test_case varcmd Checks behavior of command line variable assignments
+test_case unmatchedvarparen Checks $ ( ) matches
atf_init_test_cases()
{
@@ -84,4 +85,5 @@
atf_add_test_case qequals
atf_add_test_case ternary
atf_add_test_case varcmd
+ atf_add_test_case unmathedvarparen
}
Added files:
Index: src/tests/util/make/d_unmatchedvarparen.mk
diff -u /dev/null src/tests/util/make/d_unmatchedvarparen.mk:1.1
--- /dev/null Thu Dec 2 20:29:56 2010
+++ src/tests/util/make/d_unmatchedvarparen.mk Thu Dec 2 20:29:55 2010
@@ -0,0 +1,3 @@
+
+all:
+ @echo $(foo::=foo-text)
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Fri Dec 3 04:10:36 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: t_resize_ffs.sh
Log Message:
Correct two function names:
grow_ffsv1_64k() - grow_ffsv1_64k_head()
shrink_ffsv1_64k() - shrink_ffsv1_64k_head()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/resize_ffs/t_resize_ffs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/resize_ffs/t_resize_ffs.sh
diff -u src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.2 src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.3
--- src/tests/sbin/resize_ffs/t_resize_ffs.sh:1.2 Thu Dec 2 22:03:23 2010
+++ src/tests/sbin/resize_ffs/t_resize_ffs.sh Fri Dec 3 04:10:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_resize_ffs.sh,v 1.2 2010/12/02 22:03:23 riz Exp $
+# $NetBSD: t_resize_ffs.sh,v 1.3 2010/12/03 04:10:36 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -68,7 +68,7 @@
}
atf_test_case grow_ffsv1_64k cleanup
-grow_ffsv1_64k()
+grow_ffsv1_64k_head()
{
atf_set descr Checks successful ffsv1 growth with 64k blocksize
atf_set require.user root
@@ -102,7 +102,7 @@
}
atf_test_case shrink_ffsv1_64k cleanup
-shrink_ffsv1_64k()
+shrink_ffsv1_64k_head()
{
atf_set descr Checks successful ffsv1 shrinkage with 64k blocksize
atf_set require.user root
