CVS commit: src/distrib/sets
Module Name:src Committed By: snj Date: Thu Feb 5 07:52:49 UTC 2015 Modified Files: src/distrib/sets: makesrctars Log Message: GPL code isn't just in src/gnu these days (i.e., the last 6 years). move stuff from src/external/gpl[23] out of the src tarball and into gnusrc. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/makesrctars 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/makesrctars diff -u src/distrib/sets/makesrctars:1.39 src/distrib/sets/makesrctars:1.40 --- src/distrib/sets/makesrctars:1.39 Tue Jan 7 13:32:38 2014 +++ src/distrib/sets/makesrctars Thu Feb 5 07:52:49 2015 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: makesrctars,v 1.39 2014/01/07 13:32:38 christos Exp $ +# $NetBSD: makesrctars,v 1.40 2015/02/05 07:52:49 snj Exp $ # # makesrctars srcdir setdir # Create source tarballs in setdir from the source under srcdir. @@ -115,9 +115,9 @@ fi srcprefix=usr/src export setdir MTREE PAX CKSUM GZIP PASSWD srcprefix -makeset src . -v '^\.\/gnu|^\.\/share|^\.\/sys|^\.\/usr\.bin\/config|^\.\/common' +makeset src . -v '^\.\/common|^\.\/external\/gpl2|^\.\/external\/gpl3|^\.\/gnu|^\.\/share|^\.\/sys|^\.\/usr\.bin\/config' -makeset gnusrc gnu +makeset gnusrc . -e '^\..type=dir|^\.\/gnu|^\.\/external.type=dir|^\.\/external\/gpl2|^\.\/external\/gpl3' makeset syssrc . -e '^\..type=dir|^\.\/sys|^\.\/usr\.bin.type=dir|^\.\/usr\.bin\/config|^\.\/common'
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Thu Feb 5 01:26:54 UTC 2015
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
bzlib.c bzlib_private.h chk.sh libnetpgpverify.3 libverify.c
verify.h zlib.c
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: 1keypubring.gpg
1keysecring.gpg 1keytest.gpg.uu digest-20121220.tgz
joyent-pubring.gpg mkdist testit.sh
Log Message:
Sync the src version of netpgpverify with the version in pkgsrc
>
> revision 1.10
> date: 2015-02-04 16:58:02 -0800; author: agc; state: Exp; lines: +1 -0;
> commitid: 0v3HoBPFTnhDSK8y;
> appease compiler warning police - initialise a variable in case it's otherwise
> "used uninitialised". ride previous version bump.
>
> revision 1.9
> date: 2015-02-04 16:21:57 -0800; author: agc; state: Exp; lines: +48 -21;
> commitid: ElUADrlljB46GK8y;
> Update netpgpverify (and libnetpgpverify) to version 20150205
>
> + recognise signatures made by subkeys as well as by primary keys
>
> + print out the relevant key which signed the file, even if it's
> a subkey and not the primary key itself.
>
> + keep the same API as before
>
> with many thanks to Jonathan Perkin
>
> revision 1.8
> date: 2015-02-03 13:34:57 -0800; author: agc; state: Exp; lines: +1 -3;
> commitid: 6qTclEbv7hmZMB8y;
> Update netpgpverify, and libnetpgpverify, to 20150204
>
> + dump the huge output in testing script to /dev/null so that we can
> see what's happening with the other tests in testit.sh
>
> + fix from jperkin@, don't try to be clever when selecting the only
> key id in a keyring
>
> + add a test for single key (non-ssh) pubring
>
> revision 1.7
> date: 2015-02-03 13:13:17 -0800; author: agc; state: Exp; lines: +3 -0;
> commitid: ztXbqAi9ocXGFB8y;
> Update netpgpverify, and libnetpgpverify, to 20150203
>
> + portability fixes to make netpgpverify build on freebsd 10.1 with WARNS=5
>
> + fixed an oversight in the testit.sh script
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keypubring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keysecring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keytest.gpg.uu \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest-20121220.tgz \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/joyent-pubring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/mkdist \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/testit.sh
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.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/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3 Fri Jan 30 18:58:59 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd Thu Feb 5 01:26:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.3 2015/01/30 18:58:59 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.4 2015/02/05 01:26:54 agc Exp $
PROG=netpgpverify
@@ -34,6 +34,12 @@ tst:
@echo "expected failure, no valid key for verification"
-./${PROG} -k /dev/null NetBSD-6.0_RC1_hashes.gpg
@echo "dumping now"
- ./${PROG} -c dump -k pubring.gpg NetBSD-6.0_RC1_hashes.asc
+ ./${PROG} -c dump -k pubring.gpg NetBSD-6.0_RC1_hashes.asc > /dev/null
@echo "dumping ssh now"
./${PROG} -c dump -S sshtest-20140202.pub data.gpg
+ @echo "testing pubring with one key"
+ uudecode 1keytest.gpg.uu
+ ./${PROG} -k 1keypubring.gpg 1keytest.gpg
+ rm -f 1keytest.gpg
+ @echo "testing signing with a subkey"
+ ./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
diff
CVS commit: [netbsd-7] src/lib/libc/arch/powerpc64
Module Name:src
Committed By: martin
Date: Wed Feb 4 22:42:04 UTC 2015
Modified Files:
src/lib/libc/arch/powerpc64/gen [netbsd-7]: __setjmp14.S
src/lib/libc/arch/powerpc64/sys [netbsd-7]: getcontext.S
Log Message:
Fix merge mishap in previous
To generate a diff of this commit:
cvs rdiff -u -r1.2.24.1 -r1.2.24.2 \
src/lib/libc/arch/powerpc64/gen/__setjmp14.S
cvs rdiff -u -r1.4.20.1 -r1.4.20.2 \
src/lib/libc/arch/powerpc64/sys/getcontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/powerpc64/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.1 src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.2
--- src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.1 Wed Feb 4 22:00:24 2015
+++ src/lib/libc/arch/powerpc64/gen/__setjmp14.S Wed Feb 4 22:42:04 2015
@@ -1,12 +1,9 @@
-/* $NetBSD: __setjmp14.S,v 1.2.24.1 2015/02/04 22:00:24 martin Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.2.24.2 2015/02/04 22:42:04 martin Exp $ */
-#include
-
-#include
+#include "SYS.h"
#if defined(LIBC_SCCS)
- .text
- .asciz "$NetBSD: __setjmp14.S,v 1.2.24.1 2015/02/04 22:00:24 martin Exp $"
+__RCSID("$NetBSD: __setjmp14.S,v 1.2.24.2 2015/02/04 22:42:04 martin Exp $")
#endif
/*
Index: src/lib/libc/arch/powerpc64/sys/getcontext.S
diff -u src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.1 src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.2
--- src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.1 Wed Feb 4 22:00:24 2015
+++ src/lib/libc/arch/powerpc64/sys/getcontext.S Wed Feb 4 22:42:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.4.20.1 2015/02/04 22:00:24 martin Exp $ */
+/* $NetBSD: getcontext.S,v 1.4.20.2 2015/02/04 22:42:04 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
#include "SYS.h"
+#include "assym.h"
-#if defined(SYSLIBC_SCCS) && !defined(lint)
- .text
- .asciz "$NetBSD: getcontext.S,v 1.4.20.1 2015/02/04 22:00:24 martin Exp $"
-#endif /* SYSLIBC_SCCS && !lint */
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: getcontext.S,v 1.4.20.2 2015/02/04 22:42:04 martin Exp $")
+#endif /* LIBC_SCCS && !lint */
#ifdef WEAK_ALIAS
WEAK_ALIAS(getcontext, _getcontext)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Feb 4 22:08:48 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #477, #492, #493 To generate a diff of this commit: cvs rdiff -u -r1.1.2.193 -r1.1.2.194 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.193 src/doc/CHANGES-7.0:1.1.2.194 --- src/doc/CHANGES-7.0:1.1.2.193 Wed Feb 4 10:18:09 2015 +++ src/doc/CHANGES-7.0 Wed Feb 4 22:08:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.193 2015/02/04 10:18:09 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.194 2015/02/04 22:08:48 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -15514,3 +15514,121 @@ libexec/httpd/bozohttpd.c 1.61 EACCES as well. [snj, ticket #491] +external/mit/lua/dist/src/lprefix.h up to 1.2 +external/mit/lua/dist/doc/alert.png delete +external/mit/lua/dist/Makefile up to 1.3 +external/mit/lua/dist/READMEup to 1.3 +external/mit/lua/dist/doc/contents.html up to 1.3 +external/mit/lua/dist/doc/lua.1 up to 1.3 +external/mit/lua/dist/doc/lua.css up to 1.3 +external/mit/lua/dist/doc/manual.html up to 1.3 +external/mit/lua/dist/doc/readme.html up to 1.3 +external/mit/lua/dist/src/Makefile up to 1.3 +external/mit/lua/dist/src/lapi.cup to 1.3 +external/mit/lua/dist/src/lapi.hup to 1.3 +external/mit/lua/dist/src/lauxlib.c up to 1.4 +external/mit/lua/dist/src/lauxlib.h up to 1.3 +external/mit/lua/dist/src/lbaselib.cup to 1.4 +external/mit/lua/dist/src/lbitlib.c up to 1.2 +external/mit/lua/dist/src/lcode.c up to 1.3 +external/mit/lua/dist/src/lcode.h up to 1.3 +external/mit/lua/dist/src/lcorolib.cup to 1.2 +external/mit/lua/dist/src/lctype.c up to 1.2 +external/mit/lua/dist/src/lctype.h up to 1.2 +external/mit/lua/dist/src/ldblib.c up to 1.5 +external/mit/lua/dist/src/ldebug.c up to 1.3 +external/mit/lua/dist/src/ldebug.h up to 1.3 +external/mit/lua/dist/src/ldo.c up to 1.3 +external/mit/lua/dist/src/ldo.h up to 1.3 +external/mit/lua/dist/src/ldump.c up to 1.3 +external/mit/lua/dist/src/lfunc.c up to 1.3 +external/mit/lua/dist/src/lgc.c up to 1.3 +external/mit/lua/dist/src/lgc.h up to 1.3 +external/mit/lua/dist/src/linit.c up to 1.4 +external/mit/lua/dist/src/liolib.c up to 1.3 +external/mit/lua/dist/src/llex.cup to 1.3 +external/mit/lua/dist/src/llex.hup to 1.3 +external/mit/lua/dist/src/llimits.h up to 1.3 +external/mit/lua/dist/src/lmathlib.cup to 1.3 +external/mit/lua/dist/src/lmem.cup to 1.3 +external/mit/lua/dist/src/lmem.hup to 1.3 +external/mit/lua/dist/src/loadlib.c up to 1.3 +external/mit/lua/dist/src/lobject.c up to 1.4 +external/mit/lua/dist/src/lobject.h up to 1.3 +external/mit/lua/dist/src/lopcodes.cup to 1.3 +external/mit/lua/dist/src/lopcodes.hup to 1.3 +external/mit/lua/dist/src/loslib.c up to 1.3 +external/mit/lua/dist/src/lparser.c up to 1.3 +external/mit/lua/dist/src/lparser.h up to 1.3 +external/mit/lua/dist/src/lstate.c up to 1.3 +external/mit/lua/dist/src/lstate.h up to 1.3 +external/mit/lua/dist/src/lstring.c up to 1.3 +external/mit/lua/dist/src/lstring.h up to 1.3 +external/mit/lua/dist/src/lstrlib.c up to 1.6 +external/mit/lua/dist/src/ltable.c up to 1.3 +external/mit/lua/dist/src/ltable.h up to 1.3 +external/mit/lua/dist/src/ltablib.c up to 1.3 +external/mit/lua/dist/src/ltm.c up to 1.3 +external/mit/lua/dist/src/ltm.h up to 1.3 +external/mit/lua/dist/src/lua.c up to 1.3 +external/mit/lua/dist/src/lua.h up to 1.3 +external/mit/lua/dist/src/luac.cup to 1.3 +external/mit/lua/dist/src/luaconf.h up to 1.12 +external/mit/lua/dist/src/lundump.c up to 1.3 +external/mit/lua/dist/src/lutf8lib.cup to 1.2 +external/mit/lua/dist/src/lvm.c up to 1.4 +external/mit/lua/dist/src/lvm.h up to 1.3 +external/mit/lua/dist/src/lzio.cup to 1.3 +external/mit/lua/dist/src/lzio.hup to 1.3 +lib/lua/syslog/syslog.c1.2 +sys/modules/luapmf/Makefile 1.4 +sys/modules/luasystm/Makefile 1.3 + + Update Lua from 5.3 work3 to 5
CVS commit: [netbsd-7] src/sbin/ping6
Module Name:src
Committed By: martin
Date: Wed Feb 4 22:05:30 UTC 2015
Modified Files:
src/sbin/ping6 [netbsd-7]: ping6.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #493):
sbin/ping6/ping6.c: revision 1.83
Rework to avoid a conditional assignment which results in a
"maybe-uninitialized" warning
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.82.4.1 src/sbin/ping6/ping6.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/ping6/ping6.c
diff -u src/sbin/ping6/ping6.c:1.82 src/sbin/ping6/ping6.c:1.82.4.1
--- src/sbin/ping6/ping6.c:1.82 Sat Oct 19 01:09:16 2013
+++ src/sbin/ping6/ping6.c Wed Feb 4 22:05:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ping6.c,v 1.82 2013/10/19 01:09:16 christos Exp $ */
+/* $NetBSD: ping6.c,v 1.82.4.1 2015/02/04 22:05:29 martin Exp $ */
/* $KAME: ping6.c,v 1.164 2002/11/16 14:05:37 itojun Exp $ */
/*
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (
#else
#include
#ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.82 2013/10/19 01:09:16 christos Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.82.4.1 2015/02/04 22:05:29 martin Exp $");
#endif
#endif
@@ -125,6 +125,7 @@ __RCSID("$NetBSD: ping6.c,v 1.82 2013/10
#include
#include
#include
+#include
#include
#include
#include
@@ -1844,6 +1845,7 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
}
while (cp < end) {
+ size_t skip = 0;
clen = (size_t)(end - cp);
if ((ni->ni_flags & NI_SUPTYPE_FLAG_COMPRESS) == 0) {
if (clen == 0 || clen > MAXQTYPES / 8 ||
@@ -1860,8 +1862,8 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
return;
cp += sizeof(cbit);
clen = ntohs(cbit.words) * sizeof(v);
- if (cur + clen * 8 + (u_long)ntohs(cbit.skip) * 32 >
- MAXQTYPES)
+ skip = (size_t)ntohs(cbit.skip) * 32;
+ if (cur + clen * 8 + skip > MAXQTYPES)
return;
}
@@ -1874,9 +1876,7 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
b = pr_bitrange(0, (int)(cur + off * 8), b);
cp += clen;
- cur += clen * 8;
- if ((ni->ni_flags & NI_SUPTYPE_FLAG_COMPRESS) != 0)
- cur += ntohs(cbit.skip) * 32;
+ cur += clen * 8 + skip;
}
}
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Wed Feb 4 22:00:25 UTC 2015 Modified Files: src/compat/powerpc64/powerpc [netbsd-7]: bsd.powerpc.mk src/lib/libc/arch/powerpc [netbsd-7]: SYS.h src/lib/libc/arch/powerpc/sys [netbsd-7]: __clone.S __syscall.S brk.S getcontext.S pipe.S sbrk.S src/lib/libc/arch/powerpc64 [netbsd-7]: Makefile.inc SYS.h src/lib/libc/arch/powerpc64/gen [netbsd-7]: __setjmp14.S __sigsetjmp14.S src/lib/libc/arch/powerpc64/sys [netbsd-7]: __clone.S __sigtramp2.S __syscall.S __vfork14.S brk.S cerror.S fork.S getcontext.S pipe.S ptrace.S sbrk.S syscall.S src/lib/libc/compiler_rt [netbsd-7]: Makefile.inc src/sys/arch/powerpc/include [netbsd-7]: asm.h Added Files: src/lib/libc/arch/powerpc64 [netbsd-7]: genassym.cf Log Message: Pull up following revision(s) (requested by chs in ticket #492): lib/libc/arch/powerpc64/sys/__vfork14.S: revision 1.2 lib/libc/arch/powerpc64/sys/__syscall.S: revision 1.2 lib/libc/arch/powerpc/sys/__syscall.S: revision 1.3 lib/libc/arch/powerpc64/sys/syscall.S: revision 1.2 lib/libc/arch/powerpc/sys/__clone.S: revision 1.6 lib/libc/arch/powerpc64/gen/__setjmp14.S: revision 1.3 sys/arch/powerpc/include/asm.h: revision 1.47 lib/libc/arch/powerpc64/sys/cerror.S: revision 1.6 lib/libc/arch/powerpc64/sys/getcontext.S: revision 1.5 lib/libc/arch/powerpc64/sys/brk.S: revision 1.5 lib/libc/arch/powerpc64/sys/ptrace.S: revision 1.3 lib/libc/arch/powerpc64/genassym.cf: revision 1.1 lib/libc/arch/powerpc64/gen/__sigsetjmp14.S: revision 1.3 lib/libc/arch/powerpc/sys/getcontext.S: revision 1.6 compat/powerpc64/powerpc/bsd.powerpc.mk: revision 1.3 lib/libc/arch/powerpc64/sys/pipe.S: revision 1.2 lib/libc/arch/powerpc/sys/brk.S: revision 1.14 lib/libc/arch/powerpc64/SYS.h: revision 1.3 lib/libc/arch/powerpc64/sys/fork.S: revision 1.2 lib/libc/arch/powerpc64/sys/__sigtramp2.S: revision 1.4 lib/libc/arch/powerpc64/Makefile.inc: revision 1.3 lib/libc/arch/powerpc/sys/pipe.S: revision 1.9 lib/libc/compiler_rt/Makefile.inc: revision 1.25 lib/libc/arch/powerpc64/sys/sbrk.S: revision 1.4, 1.5 lib/libc/arch/powerpc64/sys/__clone.S: revision 1.2 lib/libc/arch/powerpc/sys/sbrk.S: revision 1.13 lib/libc/arch/powerpc/SYS.h: revision 1.13 powerpc64 uses the same sources as powerpc and needs the long double as double-double sources. - Spell LdAddr consistently - Add LDFLAGS+=-Wl,-m,elf32ppc_nbsd - Fix cmpptr/cmpreq/etc to use right mnemonics - Minimize differences between powerpc and powerpc64 - Fix powerpc64 assembly to use right instructions for 64bit CPUs. - Use hidden for __curbrk and __minbrk to avoid GOT/TOC relocations. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.6.1 src/compat/powerpc64/powerpc/bsd.powerpc.mk cvs rdiff -u -r1.12 -r1.12.24.1 src/lib/libc/arch/powerpc/SYS.h cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/libc/arch/powerpc/sys/__clone.S cvs rdiff -u -r1.2 -r1.2.4.1 src/lib/libc/arch/powerpc/sys/__syscall.S cvs rdiff -u -r1.13 -r1.13.4.1 src/lib/libc/arch/powerpc/sys/brk.S cvs rdiff -u -r1.5 -r1.5.24.1 src/lib/libc/arch/powerpc/sys/getcontext.S cvs rdiff -u -r1.8 -r1.8.24.1 src/lib/libc/arch/powerpc/sys/pipe.S cvs rdiff -u -r1.12 -r1.12.4.1 src/lib/libc/arch/powerpc/sys/sbrk.S cvs rdiff -u -r1.2 -r1.2.64.1 src/lib/libc/arch/powerpc64/Makefile.inc cvs rdiff -u -r1.2 -r1.2.24.1 src/lib/libc/arch/powerpc64/SYS.h cvs rdiff -u -r0 -r1.1.2.2 src/lib/libc/arch/powerpc64/genassym.cf cvs rdiff -u -r1.2 -r1.2.24.1 src/lib/libc/arch/powerpc64/gen/__setjmp14.S \ src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S cvs rdiff -u -r1.1 -r1.1.64.1 src/lib/libc/arch/powerpc64/sys/__clone.S \ src/lib/libc/arch/powerpc64/sys/__syscall.S \ src/lib/libc/arch/powerpc64/sys/__vfork14.S \ src/lib/libc/arch/powerpc64/sys/fork.S \ src/lib/libc/arch/powerpc64/sys/pipe.S \ src/lib/libc/arch/powerpc64/sys/syscall.S cvs rdiff -u -r1.3 -r1.3.24.1 src/lib/libc/arch/powerpc64/sys/__sigtramp2.S cvs rdiff -u -r1.4 -r1.4.20.1 src/lib/libc/arch/powerpc64/sys/brk.S \ src/lib/libc/arch/powerpc64/sys/getcontext.S cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/libc/arch/powerpc64/sys/cerror.S cvs rdiff -u -r1.2 -r1.2.4.1 src/lib/libc/arch/powerpc64/sys/ptrace.S cvs rdiff -u -r1.3 -r1.3.64.1 src/lib/libc/arch/powerpc64/sys/sbrk.S cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/lib/libc/compiler_rt/Makefile.inc cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/powerpc/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk diff -u src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2 src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2.6.1
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Wed Feb 4 14:23:05 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: add Xbox 360 Wireless Receiver To generate a diff of this commit: cvs rdiff -u -r1.688 -r1.689 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.688 src/sys/dev/usb/usbdevs:1.689 --- src/sys/dev/usb/usbdevs:1.688 Mon Jan 26 09:58:10 2015 +++ src/sys/dev/usb/usbdevs Wed Feb 4 14:23:04 2015 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.688 2015/01/26 09:58:10 gson Exp $ +$NetBSD: usbdevs,v 1.689 2015/02/04 14:23:04 jmcneill Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2167,6 +2167,7 @@ product MICROSOFT XBOX_DVD_PLAYBACK 0x02 product MICROSOFT XBOX_CONTROLLER_S10 0x0285 Xbox Controller S (1.0) product MICROSOFT XBOX_CONTROLLER_HUB 0x0288 Xbox Controller Hub product MICROSOFT XBOX_CONTROLLER_S12 0x0289 Xbox Controller S (1.2) +product MICROSOFT XBOX_360_WIRELESS_RECEIVER 0x0291 Xbox 360 Wireless Receiver product MICROSOFT 24GHZ_XCVR10 0x071d 2.4GHz Transceiver V1.0 product MICROSOFT 24GHZ_XCVR20 0x071f 2.4GHz Transceiver V2.0
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Wed Feb 4 12:55:47 UTC 2015
Modified Files:
src/lib/librumpuser: rumpuser_sp.c
Log Message:
If binding fails, print URL with which it failed.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/lib/librumpuser/rumpuser_sp.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/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.68 src/lib/librumpuser/rumpuser_sp.c:1.69
--- src/lib/librumpuser/rumpuser_sp.c:1.68 Mon Dec 8 00:12:03 2014
+++ src/lib/librumpuser/rumpuser_sp.c Wed Feb 4 12:55:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.68 2014/12/08 00:12:03 justin Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.69 2015/02/04 12:55:47 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.68 2014/12/08 00:12:03 justin Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.69 2015/02/04 12:55:47 pooka Exp $");
#endif /* !lint */
#include
@@ -1362,7 +1362,7 @@ rumpuser_sp_init(const char *url,
/*LINTED*/
if (bind(s, sap, parsetab[idx].slen) == -1) {
error = errno;
- fprintf(stderr, "rump_sp: server bind failed\n");
+ fprintf(stderr, "rump_sp: failed to bind to URL %s\n", url);
goto out;
}
if (listen(s, MAXCLI) == -1) {
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Wed Feb 4 12:48:05 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
default newvers.sh parameters to reproducible build
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/rump/librump/rumpkern/Makefile.rumpkern
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/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.153 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.154
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.153 Wed Jan 7 22:24:04 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Feb 4 12:48:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.153 2015/01/07 22:24:04 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.154 2015/02/04 12:48:05 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -50,18 +50,10 @@ SRCS+= locks_up.c
SRCS+= locks.c
.endif
-MKREPRO?=no
-
-.if ${MKREPRO} == "yes"
-_NVFLAGS=-r
-.else
-_NVFLAGS=
-.endif
-
vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh \
${RUMPTOP}/../sys/param.h ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
- ${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n ${_NVFLAGS}
+ ${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n -r
SRCS+= vers.c
CLEANFILES+= vers.c version
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Feb 4 11:38:32 UTC 2015 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Tickets #1244 - #1246 To generate a diff of this commit: cvs rdiff -u -r1.1.2.191 -r1.1.2.192 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.191 src/doc/CHANGES-6.2:1.1.2.192 --- src/doc/CHANGES-6.2:1.1.2.191 Wed Feb 4 04:39:59 2015 +++ src/doc/CHANGES-6.2 Wed Feb 4 11:38:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.191 2015/02/04 04:39:59 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.192 2015/02/04 11:38:31 martin Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -9532,3 +9532,28 @@ external/bsd/libevent/dist/buffer.c pat Fix CVE-2014-6272. [spz, ticket #1243] +sys/dev/pci/if_wm.c1.310 + + Fix a workaround for SWSM.SMBI bit not working correctly. + This problem was only occured with old boot ROM on 8257[12]. + [msaitoh, ticket #1244] + +sys/dev/mii/atphy.c1.13 +sys/dev/mii/brgphy.c1.64 +sys/dev/mii/ciphy.c1.20 +sys/dev/mii/mii_physubr.c 1.76 +sys/dev/mii/rgephy.c1.30 +sys/dev/mii/urlphy.c1.26 + + Fix a bug that the auto negotiation timer isn't cleard as we + expected. + To not forget clearing the timer and to reduce the code duplication, + clear mii_ticks in *mii_phy_auto(). + [msaitoh, ticket #1245] + +libexec/httpd/bozohttpd.c 1.61 + + Answer 403 not just when an open() fails with EPERM, but with + EACCES as well. + [snj, ticket #1246] +
CVS commit: [netbsd-6] src/libexec/httpd
Module Name:src
Committed By: martin
Date: Wed Feb 4 11:37:37 UTC 2015
Modified Files:
src/libexec/httpd [netbsd-6]: bozohttpd.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #1246):
libexec/httpd/bozohttpd.c: revision 1.61
spit out a 403 not just when an open() fails with EPERM, but with
EACCES as well.
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.30.2.1 src/libexec/httpd/bozohttpd.c:1.30.2.2
--- src/libexec/httpd/bozohttpd.c:1.30.2.1 Wed Jul 9 09:42:39 2014
+++ src/libexec/httpd/bozohttpd.c Wed Feb 4 11:37:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.30.2.1 2014/07/09 09:42:39 msaitoh Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.30.2.2 2015/02/04 11:37:37 martin Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1564,6 +1564,7 @@ bozo_process_request(bozo_httpreq_t *req
debug((httpd, DEBUG_FAT, "open failed: %s", strerror(errno)));
switch(errno) {
case EPERM:
+ case EACCES:
(void)bozo_http_error(httpd, 403, request,
"no permission to open file");
break;
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Wed Feb 4 11:35:04 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-6]: atphy.c brgphy.c ciphy.c mii_physubr.c
rgephy.c urlphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1245):
sys/dev/mii/rgephy.c: revision 1.30
sys/dev/mii/brgphy.c: revision 1.64
sys/dev/mii/atphy.c: revision 1.13
sys/dev/mii/urlphy.c: revision 1.26
sys/dev/mii/ciphy.c: revision 1.20
sys/dev/mii/mii_physubr.c: revision 1.76
Fix a bug that the auto negotiation timer isn't cleard as we expected.
To not to forget clearing the timer and to reduce the code duplication,
clear mii_ticks in *mii_phy_auto().
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.59.8.7 -r1.59.8.8 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.19.18.1 -r1.19.18.2 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.29.14.1 -r1.29.14.2 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.25.20.1 -r1.25.20.2 src/sys/dev/mii/urlphy.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/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.11.8.1 src/sys/dev/mii/atphy.c:1.11.8.2
--- src/sys/dev/mii/atphy.c:1.11.8.1 Tue Nov 4 09:23:20 2014
+++ src/sys/dev/mii/atphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $ */
+/* $NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $");
#include
#include
@@ -287,7 +287,6 @@ done:
if (sc->mii_ticks <= sc->mii_anegticks)
break;
- sc->mii_ticks = 0;
atphy_mii_phy_auto(sc);
break;
}
@@ -403,6 +402,7 @@ atphy_mii_phy_auto(struct mii_softc *sc)
{
uint16_t anar;
+ sc->mii_ticks = 0;
anar = BMSR_MEDIA_TO_ANAR(sc->mii_capabilities) | ANAR_CSMA;
if (sc->mii_flags & MIIF_DOPAUSE)
anar |= ANAR_X_PAUSE_TOWARDS;
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.59.8.7 src/sys/dev/mii/brgphy.c:1.59.8.8
--- src/sys/dev/mii/brgphy.c:1.59.8.7 Sun Dec 7 16:39:55 2014
+++ src/sys/dev/mii/brgphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.59.8.7 2014/12/07 16:39:55 martin Exp $ */
+/* $NetBSD: brgphy.c,v 1.59.8.8 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.59.8.7 2014/12/07 16:39:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.59.8.8 2015/02/04 11:35:04 martin Exp $");
#include
#include
@@ -803,6 +803,7 @@ brgphy_mii_phy_auto(struct mii_softc *sc
{
int anar, ktcr = 0;
+ sc->mii_ticks = 0;
brgphy_loop(sc);
PHY_RESET(sc);
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.19.18.1 src/sys/dev/mii/ciphy.c:1.19.18.2
--- src/sys/dev/mii/ciphy.c:1.19.18.1 Sun Nov 9 12:13:16 2014
+++ src/sys/dev/mii/ciphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.19.18.1 2014/11/09 12:13:16 martin Exp $ */
+/* $NetBSD: ciphy.c,v 1.19.18.2 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.19.18.1 2014/11/09 12:13:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.19.18.2 2015/02/04 11:35:04 martin Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -275,7 +275,6 @@ setit:
if (++sc->mii_ticks <= MII_ANEGTICKS)
break;
- sc->mii_ticks = 0;
mii_phy_auto(sc, 0);
return (0);
}
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.73.2.1 src/sys/dev/mii/mii_physubr.c:1.73.2.2
--- src/sys/dev/mii/mii_physubr.c:1.73.2.1 Tue Nov 4 09:23:20 2014
+++ src/sys/dev/mii/mii_physubr.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.73.2.1 2014/11/04 09:23:20 martin Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.73.2.2 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.73.2.1 2014/11/04 09:23:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.73.2.2 2015/02/04 11:35:04 martin Exp $");
#include
#include
@@ -202,6 +202,7 @@ mii_phy_auto(struct mii_softc *sc, int w
struct mii_data *mii = sc->mii_pdata;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ sc->mii_ticks = 0;
if ((sc->mii_flags & MIIF_DOINGAUTO) == 0) {
/*
* Check for 1000BASE-X. Autonegotiation is a bit
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Feb 4 10:55:00 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1244):
sys/dev/pci/if_wm.c: revision 1.310
Fix a bug that a workaround for SWSM.SMBI bit doesn't work correctly.
This problem was only occured with old boot ROM on 8257[12].
XXX pullup to netbsd-[67]
To generate a diff of this commit:
cvs rdiff -u -r1.227.2.14 -r1.227.2.15 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227.2.14 src/sys/dev/pci/if_wm.c:1.227.2.15
--- src/sys/dev/pci/if_wm.c:1.227.2.14 Thu Dec 4 06:04:07 2014
+++ src/sys/dev/pci/if_wm.c Wed Feb 4 10:55:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.14 2014/12/04 06:04:07 snj Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.15 2015/02/04 10:55:00 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.14 2014/12/04 06:04:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.15 2015/02/04 10:55:00 martin Exp $");
#include
#include
@@ -1805,7 +1805,7 @@ wm_attach(device_t parent, device_t self
case WM_T_82571:
case WM_T_82572:
reg = CSR_READ(sc, WMREG_SWSM2);
- if ((reg & SWSM2_LOCK) != 0) {
+ if ((reg & SWSM2_LOCK) == 0) {
CSR_WRITE(sc, WMREG_SWSM2, reg | SWSM2_LOCK);
force_clear_smbi = true;
} else
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Feb 4 10:18:09 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #489 and #491 To generate a diff of this commit: cvs rdiff -u -r1.1.2.192 -r1.1.2.193 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.192 src/doc/CHANGES-7.0:1.1.2.193 --- src/doc/CHANGES-7.0:1.1.2.192 Wed Feb 4 07:20:54 2015 +++ src/doc/CHANGES-7.0 Wed Feb 4 10:18:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.192 2015/02/04 07:20:54 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.193 2015/02/04 10:18:09 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -15503,3 +15503,14 @@ usr.sbin/npf/npfctl/npfctl.c 1.46 * npfctl_print_rule: print the ID in hex, not decimal. [rmind, ticket #479] +lib/libkvm/kvm_powerpc64.c 1.6 + + #if 0 some code not in use yet. + [chs, ticket #489] + +libexec/httpd/bozohttpd.c 1.61 + + Spit out a 403 not just when an open() fails with EPERM, but with + EACCES as well. + [snj, ticket #491] +
CVS commit: [netbsd-7] src/libexec/httpd
Module Name:src
Committed By: martin
Date: Wed Feb 4 10:17:19 UTC 2015
Modified Files:
src/libexec/httpd [netbsd-7]: bozohttpd.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #491):
libexec/httpd/bozohttpd.c: revision 1.61
spit out a 403 not just when an open() fails with EPERM, but with
EACCES as well.
To generate a diff of this commit:
cvs rdiff -u -r1.56.2.1 -r1.56.2.2 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.56.2.1 src/libexec/httpd/bozohttpd.c:1.56.2.2
--- src/libexec/httpd/bozohttpd.c:1.56.2.1 Mon Jan 12 10:02:29 2015
+++ src/libexec/httpd/bozohttpd.c Wed Feb 4 10:17:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.56.2.1 2015/01/12 10:02:29 martin Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.56.2.2 2015/02/04 10:17:19 martin Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1566,6 +1566,7 @@ bozo_process_request(bozo_httpreq_t *req
debug((httpd, DEBUG_FAT, "open failed: %s", strerror(errno)));
switch(errno) {
case EPERM:
+ case EACCES:
(void)bozo_http_error(httpd, 403, request,
"no permission to open file");
break;
CVS commit: [netbsd-7] src/lib/libkvm
Module Name:src
Committed By: martin
Date: Wed Feb 4 10:14:31 UTC 2015
Modified Files:
src/lib/libkvm [netbsd-7]: kvm_powerpc64.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #489):
lib/libkvm/kvm_powerpc64.c: revision 1.6
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/libkvm/kvm_powerpc64.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/libkvm/kvm_powerpc64.c
diff -u src/lib/libkvm/kvm_powerpc64.c:1.5 src/lib/libkvm/kvm_powerpc64.c:1.5.4.1
--- src/lib/libkvm/kvm_powerpc64.c:1.5 Mon Jan 27 21:00:01 2014
+++ src/lib/libkvm/kvm_powerpc64.c Wed Feb 4 10:14:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $ */
+/* $NetBSD: kvm_powerpc64.c,v 1.5.4.1 2015/02/04 10:14:30 martin Exp $ */
/*
* Copyright (c) 2005 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
#include
#include
-__RCSID("$NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $");
+__RCSID("$NetBSD: kvm_powerpc64.c,v 1.5.4.1 2015/02/04 10:14:30 martin Exp $");
void
_kvm_freevtop(kvm_t *kd)
@@ -117,17 +117,16 @@ _kvm_initvtop(kvm_t *kd)
int
_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
{
- cpu_kcore_hdr_t *cpu_kh;
- uint32_t pvr;
if (ISALIVE(kd)) {
_kvm_err(kd, 0, "vatop called in live kernel!");
return 0;
}
- cpu_kh = kd->cpu_data;
-
- pvr = (cpu_kh->pvr >> 16);
+#if 0
+ cpu_kcore_hdr_t *cpu_kh = kd->cpu_data;
+ uint32_t pvr = (cpu_kh->pvr >> 16);
+#endif
/* No hit -- no translation */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Feb 4 09:05:53 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixgbe_netbsd.c
Log Message:
Fix mutex related problem reported by Uwe Toenjes in PR#49328:
- Revert ixgbe_netbsd.c rev. 1.2
- make CORE_LOCK adaptive
- Release spin lock while reinitializing the jumb buffer structure.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/ixgbe/ixgbe_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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.17 src/sys/dev/pci/ixgbe/ixgbe.c:1.18
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.17 Wed Feb 4 04:37:13 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 4 09:05:53 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.17 2015/02/04 04:37:13 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.18 2015/02/04 09:05:53 msaitoh Exp $*/
#include "opt_inet.h"
@@ -3933,12 +3933,16 @@ ixgbe_setup_receive_ring(struct rx_ring
/* Free current RX buffer structs and their mbufs */
ixgbe_free_receive_ring(rxr);
+ IXGBE_RX_UNLOCK(rxr);
+
/* Now reinitialize our supply of jumbo mbufs. The number
* or size of jumbo mbufs may have changed.
*/
ixgbe_jcl_reinit(&adapter->jcl_head, rxr->ptag->dt_dmat,
2 * adapter->num_rx_desc, adapter->rx_mbuf_sz);
+ IXGBE_RX_LOCK(rxr);
+
/* Configure header split? */
if (ixgbe_header_split)
rxr->hdr_split = TRUE;
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.1 src/sys/dev/pci/ixgbe/ixgbe.h:1.2
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.1 Fri Aug 12 21:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe.h Wed Feb 4 09:05:53 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.h,v 1.24 2011/04/28 23:21:40 jfv Exp $*/
-/*$NetBSD: ixgbe.h,v 1.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe.h,v 1.2 2015/02/04 09:05:53 msaitoh Exp $*/
#ifndef _IXGBE_H_
@@ -476,7 +476,7 @@ struct adapter {
#define IXGBE_CORE_LOCK_INIT(_sc, _name) \
-mutex_init(&(_sc)->core_mtx, MUTEX_DEFAULT, IPL_NET)
+mutex_init(&(_sc)->core_mtx, MUTEX_DEFAULT, IPL_SOFTNET)
#define IXGBE_CORE_LOCK_DESTROY(_sc) mutex_destroy(&(_sc)->core_mtx)
#define IXGBE_TX_LOCK_DESTROY(_sc)mutex_destroy(&(_sc)->tx_mtx)
#define IXGBE_RX_LOCK_DESTROY(_sc)mutex_destroy(&(_sc)->rx_mtx)
Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.2 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.3
--- src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.2 Wed Jan 28 00:30:25 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.c Wed Feb 4 09:05:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_netbsd.c,v 1.2 2015/01/28 00:30:25 christos Exp $ */
+/* $NetBSD: ixgbe_netbsd.c,v 1.3 2015/02/04 09:05:53 msaitoh Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -56,7 +56,7 @@ ixgbe_dma_tag_create(bus_dma_tag_t dmat,
*dtp = NULL;
- if ((dt = kmem_zalloc(sizeof(*dt), KM_NOSLEEP)) == NULL)
+ if ((dt = kmem_zalloc(sizeof(*dt), KM_SLEEP)) == NULL)
return ENOMEM;
dt->dt_dmat = dmat;
@@ -136,19 +136,19 @@ ixgbe_newext(ixgbe_extmem_head_t *eh, bu
ixgbe_extmem_t *em;
int nseg, rc;
- em = kmem_zalloc(sizeof(*em), KM_NOSLEEP);
+ em = kmem_zalloc(sizeof(*em), KM_SLEEP);
if (em == NULL)
return NULL;
rc = bus_dmamem_alloc(dmat, size, PAGE_SIZE, 0, &em->em_seg, 1, &nseg,
- BUS_DMA_NOWAIT);
+ BUS_DMA_WAITOK);
if (rc != 0)
goto post_zalloc_err;
rc = bus_dmamem_map(dmat, &em->em_seg, 1, size, &em->em_vaddr,
- BUS_DMA_NOWAIT);
+ BUS_DMA_WAITOK);
if (rc != 0)
goto post_dmamem_err;
