CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Fri Aug 15 07:39:25 UTC 2014
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
avoid calling into time code when cold, and avoid calling nanotime()
if we're not going to use the result anyway.
XXX: not necessarily the best fix, but better than crashing *early*
boot due to too-early nanotime() calls.
XXX: pullup.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/kern/subr_prf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.154 src/sys/kern/subr_prf.c:1.155
--- src/sys/kern/subr_prf.c:1.154 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/subr_prf.c Fri Aug 15 07:39:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.154 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: subr_prf.c,v 1.155 2014/08/15 07:39:25 mrg Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.155 2014/08/15 07:39:25 mrg Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -1200,7 +1200,6 @@ kprintf(const char *fmt0, int oflags, vo
const char *xdigs; /* digits for [xX] conversion */
char bf[KPRINTF_BUFSIZE]; /* space for %c, %[diouxX] */
char *tailp; /* tail pointer for snprintf */
- struct timespec ts;
if (oflags == TOBUFONLY && (vp != NULL))
tailp = *(char **)vp;
@@ -1549,9 +1548,12 @@ done:
*(char **)vp = sbuf;
(*v_flush)();
- (void)nanotime(&ts);
#ifdef RND_PRINTF
- SHA512_Update(&kprnd_sha, (char *)&ts, sizeof(ts));
+ if (!cold) {
+ struct timespec ts;
+ (void)nanotime(&ts);
+ SHA512_Update(&kprnd_sha, (char *)&ts, sizeof(ts));
+ }
#endif
return ret;
}
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: martin Date: Fri Aug 15 07:45:31 UTC 2014 Modified Files: src/sys/arch/sparc/include: int_fmtio.h Log Message: All FAST datatypes are int (32 bit) on both sparc and sparc64, only FAST64 variants are long (sparc64) or long long (sparc). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/include/int_fmtio.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/sparc/include/int_fmtio.h diff -u src/sys/arch/sparc/include/int_fmtio.h:1.5 src/sys/arch/sparc/include/int_fmtio.h:1.6 --- src/sys/arch/sparc/include/int_fmtio.h:1.5 Wed Aug 13 19:48:17 2014 +++ src/sys/arch/sparc/include/int_fmtio.h Fri Aug 15 07:45:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.6 2014/08/15 07:45:31 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -57,15 +57,12 @@ #else #define PRIdLEAST64 "lld" /* int_least64_t */ #endif -#ifdef __arch64__ -#define PRIdFAST8 "ld" /* int_fast8_t */ -#define PRIdFAST16 "ld" /* int_fast16_t */ -#define PRIdFAST32 "ld" /* int_fast32_t */ -#define PRIdFAST64 "ld" /* int_fast64_t */ -#else #define PRIdFAST8 "d" /* int_fast8_t */ #define PRIdFAST16 "d" /* int_fast16_t */ #define PRIdFAST32 "d" /* int_fast32_t */ +#ifdef __arch64__ +#define PRIdFAST64 "ld" /* int_fast64_t */ +#else #define PRIdFAST64 "lld" /* int_fast64_t */ #endif #ifdef __arch64__ @@ -91,15 +88,12 @@ #else #define PRIiLEAST64 "lli" /* int_least64_t */ #endif -#ifdef __arch64__ -#define PRIiFAST8 "li" /* int_fast8_t */ -#define PRIiFAST16 "li" /* int_fast16_t */ -#define PRIiFAST32 "li" /* int_fast32_t */ -#define PRIiFAST64 "li" /* int_fast64_t */ -#else #define PRIiFAST8 "i" /* int_fast8_t */ #define PRIiFAST16 "i" /* int_fast16_t */ #define PRIiFAST32 "i" /* int_fast32_t */ +#ifdef __arch64__ +#define PRIiFAST64 "li" /* int_fast64_t */ +#else #define PRIiFAST64 "lli" /* int_fast64_t */ #endif #ifdef __arch64__ @@ -253,15 +247,12 @@ #else #define SCNdLEAST64 "lld" /* int_least64_t */ #endif -#ifdef __arch64__ -#define SCNdFAST8 "ld" /* int_fast8_t */ -#define SCNdFAST16 "ld" /* int_fast16_t */ -#define SCNdFAST32 "ld" /* int_fast32_t */ -#define SCNdFAST64 "ld" /* int_fast64_t */ -#else #define SCNdFAST8 "d" /* int_fast8_t */ #define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ +#ifdef __arch64__ +#define SCNdFAST64 "ld" /* int_fast64_t */ +#else #define SCNdFAST64 "lld" /* int_fast64_t */ #endif #ifdef __arch64__ @@ -287,15 +278,12 @@ #else #define SCNiLEAST64 "lli" /* int_least64_t */ #endif -#ifdef __arch64__ -#define SCNiFAST8 "li" /* int_fast8_t */ -#define SCNiFAST16 "li" /* int_fast16_t */ -#define SCNiFAST32 "li" /* int_fast32_t */ -#define SCNiFAST64 "li" /* int_fast64_t */ -#else #define SCNiFAST8 "i" /* int_fast8_t */ #define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ +#ifdef __arch64__ +#define SCNiFAST64 "li" /* int_fast64_t */ +#else #define SCNiFAST64 "lli" /* int_fast64_t */ #endif #ifdef __arch64__ @@ -323,15 +311,12 @@ #else #define SCNoLEAST64 "llo" /* uint_least64_t */ #endif -#ifdef __arch64__ -#define SCNoFAST8 "hho" /* uint_fast8_t */ -#define SCNoFAST16 "ho" /* uint_fast16_t */ -#define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "lo" /* uint_fast64_t */ -#else #define SCNoFAST8 "o" /* uint_fast8_t */ #define SCNoFAST16 "o" /* uint_fast16_t */ #define SCNoFAST32 "o" /* uint_fast32_t */ +#ifdef __arch64__ +#define SCNoFAST64 "lo" /* uint_fast64_t */ +#else #define SCNoFAST64 "llo" /* uint_fast64_t */ #endif #ifdef __arch64__ @@ -357,15 +342,12 @@ #else #define SCNuLEAST64 "llu" /* uint_least64_t */ #endif -#ifdef __arch64__ -#define SCNuFAST8 "hhu" /* uint_fast8_t */ -#define SCNuFAST16 "hu" /* uint_fast16_t */ -#define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "lu" /* uint_fast64_t */ -#else #define SCNuFAST8 "u" /* uint_fast8_t */ #define SCNuFAST16 "u" /* uint_fast16_t */ #define SCNuFAST32 "u" /* uint_fast32_t */ +#ifdef __arch64__ +#define SCNuFAST64 "lu" /* uint_fast64_t */ +#else #define SCNuFAST64 "llu" /* uint_fast64_t */ #endif #ifdef __arch64__ @@ -391,15 +373,12 @@ #else #define SCNxLEAST64 "llx" /* uint_least64_t */ #endif -#ifdef __arch64__ -#define SCNxFAST8 "hhx" /* uint_fast8_t */ -#define SCNxFAST16 "hx" /* uint_fast16_t */ -#define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "lx" /* uint_fast64_t */ -#else #define SCNxFAST8 "x" /* uint_fast8_t */ #define SCNxFAST16 "x" /* uint_fast16_t */ #define SCNxFAST32 "x" /* uint_fast32_t */ +#ifdef __arch64__ +#define SCNxFAST64 "lx" /* uint_fast64_t */ +#else #define SCNxFAST64 "llx" /* uint_fast64_t */ #endif #ifdef __arch64__
CVS commit: src/sys/arch/m68k/include
Module Name:src Committed By: martin Date: Fri Aug 15 07:53:37 UTC 2014 Modified Files: src/sys/arch/m68k/include: int_mwgwtypes.h Log Message: Fix editor mishap To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/include/int_mwgwtypes.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/m68k/include/int_mwgwtypes.h diff -u src/sys/arch/m68k/include/int_mwgwtypes.h:1.5 src/sys/arch/m68k/include/int_mwgwtypes.h:1.6 --- src/sys/arch/m68k/include/int_mwgwtypes.h:1.5 Wed Aug 13 22:25:39 2014 +++ src/sys/arch/m68k/include/int_mwgwtypes.h Fri Aug 15 07:53:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.5 2014/08/13 22:25:39 matt Exp $ */ +/* $NetBSD: int_mwgwtypes.h,v 1.6 2014/08/15 07:53:37 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -87,7 +87,6 @@ typedef long long int intmax_t; typedef unsigned long long int uintmax_t; #endif -#ifdef __UINT_FAST64_TYPE__ -#include -#else +#endif + #endif /* !_M68K_INT_MWGWTYPES_H_ */
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 15 08:43:26 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket . To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.19 src/doc/CHANGES-6.1.5:1.1.2.20 --- src/doc/CHANGES-6.1.5:1.1.2.19 Fri Aug 8 05:51:12 2014 +++ src/doc/CHANGES-6.1.5 Fri Aug 15 08:43:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.19 2014/08/08 05:51:12 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.20 2014/08/15 08:43:26 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -717,3 +717,536 @@ sys/dev/pci/agp_i810.c1.108-1.110 vi Bind i810 dcache pages at the requested offset, not at VA start. From John D Baker in PR xsrc/48344. [riastradh, ticket #1105] + +crypto/external/bsd/openssl/dist/CHANGES patch +crypto/external/bsd/openssl/dist/Configure patch +crypto/external/bsd/openssl/dist/FAQ patch +crypto/external/bsd/openssl/dist/Makefile patch +crypto/external/bsd/openssl/dist/NEWS patch +crypto/external/bsd/openssl/dist/README patch +crypto/external/bsd/openssl/dist/apps/apps.c patch +crypto/external/bsd/openssl/dist/apps/ca.c patch +crypto/external/bsd/openssl/dist/apps/ciphers.c patch +crypto/external/bsd/openssl/dist/apps/crl2p7.c patch +crypto/external/bsd/openssl/dist/apps/enc.c patch +crypto/external/bsd/openssl/dist/apps/ocsp.c patch +crypto/external/bsd/openssl/dist/apps/progs.h patch +crypto/external/bsd/openssl/dist/apps/progs.pl patch +crypto/external/bsd/openssl/dist/apps/s_client.c patch +crypto/external/bsd/openssl/dist/apps/s_server.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_utctm.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/ameth_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/bio_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/charmap.pl patch +crypto/external/bsd/openssl/dist/crypto/asn1/evp_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/x_crl.c patch +crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_sqr.c patch +crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c patch +crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ectest.c patch +crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c patch +crypto/external/bsd/openssl/dist/crypto/evp/evp_pbe.c patch +crypto/external/bsd/openssl/dist/crypto/idea/ideatest.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.h patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.pl patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_ht.c patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lib.c patch +crypto/external/bsd/openssl/dist/crypto/opensslconf.h patch +crypto/external/bsd/openssl/dist/crypto/opensslv.h patch +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/Makefile patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/bio_ber.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/dec.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/doc delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/enc.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/es1.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.h delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/info.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/infokey.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a1 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a2 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/server.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/sign.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3dess.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/c.pem delete +crypto/e
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 15 08:43:44 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: Ticket . To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.0.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.6 diff -u src/doc/CHANGES-6.0.6:1.1.2.19 src/doc/CHANGES-6.0.6:1.1.2.20 --- src/doc/CHANGES-6.0.6:1.1.2.19 Fri Aug 8 05:51:35 2014 +++ src/doc/CHANGES-6.0.6 Fri Aug 15 08:43:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.6,v 1.1.2.19 2014/08/08 05:51:35 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.6,v 1.1.2.20 2014/08/15 08:43:44 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6 release: @@ -717,3 +717,536 @@ sys/dev/pci/agp_i810.c1.108-1.110 vi Bind i810 dcache pages at the requested offset, not at VA start. From John D Baker in PR xsrc/48344. [riastradh, ticket #1105] + +crypto/external/bsd/openssl/dist/CHANGES patch +crypto/external/bsd/openssl/dist/Configure patch +crypto/external/bsd/openssl/dist/FAQ patch +crypto/external/bsd/openssl/dist/Makefile patch +crypto/external/bsd/openssl/dist/NEWS patch +crypto/external/bsd/openssl/dist/README patch +crypto/external/bsd/openssl/dist/apps/apps.c patch +crypto/external/bsd/openssl/dist/apps/ca.c patch +crypto/external/bsd/openssl/dist/apps/ciphers.c patch +crypto/external/bsd/openssl/dist/apps/crl2p7.c patch +crypto/external/bsd/openssl/dist/apps/enc.c patch +crypto/external/bsd/openssl/dist/apps/ocsp.c patch +crypto/external/bsd/openssl/dist/apps/progs.h patch +crypto/external/bsd/openssl/dist/apps/progs.pl patch +crypto/external/bsd/openssl/dist/apps/s_client.c patch +crypto/external/bsd/openssl/dist/apps/s_server.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_utctm.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/ameth_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/bio_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/charmap.pl patch +crypto/external/bsd/openssl/dist/crypto/asn1/evp_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/x_crl.c patch +crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_sqr.c patch +crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c patch +crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ectest.c patch +crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c patch +crypto/external/bsd/openssl/dist/crypto/evp/evp_pbe.c patch +crypto/external/bsd/openssl/dist/crypto/idea/ideatest.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.h patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.pl patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_ht.c patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lib.c patch +crypto/external/bsd/openssl/dist/crypto/opensslconf.h patch +crypto/external/bsd/openssl/dist/crypto/opensslv.h patch +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/Makefile patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/bio_ber.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/dec.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/doc delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/enc.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/es1.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.h delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/info.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/infokey.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a1 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a2 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/server.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/sign.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3dess.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/c.pem delete +crypto/e
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 15 08:43:06 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket . To generate a diff of this commit: cvs rdiff -u -r1.1.2.127 -r1.1.2.128 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.127 src/doc/CHANGES-6.2:1.1.2.128 --- src/doc/CHANGES-6.2:1.1.2.127 Fri Aug 8 05:50:41 2014 +++ src/doc/CHANGES-6.2 Fri Aug 15 08:43:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.127 2014/08/08 05:50:41 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.128 2014/08/15 08:43:06 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -3122,3 +3122,536 @@ xsrc/external/mit/xf86-video-mga/dist/ut - This patch has been used in Debian, Ubuntu and Gentoo for years. - Disable HW cursor by default on G200 server chips. [mrg, ticket #1106] + +crypto/external/bsd/openssl/dist/CHANGES patch +crypto/external/bsd/openssl/dist/Configure patch +crypto/external/bsd/openssl/dist/FAQ patch +crypto/external/bsd/openssl/dist/Makefile patch +crypto/external/bsd/openssl/dist/NEWS patch +crypto/external/bsd/openssl/dist/README patch +crypto/external/bsd/openssl/dist/apps/apps.c patch +crypto/external/bsd/openssl/dist/apps/ca.c patch +crypto/external/bsd/openssl/dist/apps/ciphers.c patch +crypto/external/bsd/openssl/dist/apps/crl2p7.c patch +crypto/external/bsd/openssl/dist/apps/enc.c patch +crypto/external/bsd/openssl/dist/apps/ocsp.c patch +crypto/external/bsd/openssl/dist/apps/progs.h patch +crypto/external/bsd/openssl/dist/apps/progs.pl patch +crypto/external/bsd/openssl/dist/apps/s_client.c patch +crypto/external/bsd/openssl/dist/apps/s_server.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/a_utctm.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/ameth_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/bio_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/charmap.pl patch +crypto/external/bsd/openssl/dist/crypto/asn1/evp_asn1.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c patch +crypto/external/bsd/openssl/dist/crypto/asn1/x_crl.c patch +crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c patch +crypto/external/bsd/openssl/dist/crypto/bn/bn_sqr.c patch +crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c patch +crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c patch +crypto/external/bsd/openssl/dist/crypto/ec/ectest.c patch +crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c patch +crypto/external/bsd/openssl/dist/crypto/evp/evp_pbe.c patch +crypto/external/bsd/openssl/dist/crypto/idea/ideatest.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.c patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.h patch +crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.pl patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_ht.c patch +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lib.c patch +crypto/external/bsd/openssl/dist/crypto/opensslconf.h patch +crypto/external/bsd/openssl/dist/crypto/opensslv.h patch +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/Makefile patch +crypto/external/bsd/openssl/dist/crypto/pkcs7/bio_ber.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/dec.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/doc delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/enc.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/es1.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/example.h delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/info.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/infokey.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a1 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a2 delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/server.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/sign.c delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3des.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3dess.pem delete +crypto/external/bsd/openssl/dist/crypto/pkcs7/t/c.pem delete +crypto/external/bsd/
CVS commit: src/sys/arch/m68k/include
Module Name:src Committed By: martin Date: Fri Aug 15 08:59:58 UTC 2014 Modified Files: src/sys/arch/m68k/include: int_fmtio.h Log Message: Fix the SCN*FAST* defines To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/include/int_fmtio.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/m68k/include/int_fmtio.h diff -u src/sys/arch/m68k/include/int_fmtio.h:1.4 src/sys/arch/m68k/include/int_fmtio.h:1.5 --- src/sys/arch/m68k/include/int_fmtio.h:1.4 Wed Aug 13 19:48:17 2014 +++ src/sys/arch/m68k/include/int_fmtio.h Fri Aug 15 08:59:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.4 2014/08/13 19:48:17 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.5 2014/08/15 08:59:58 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -143,8 +143,8 @@ #define SCNdLEAST16 "hd" /* int_least16_t */ #define SCNdLEAST32 "d" /* int_least32_t */ #define SCNdLEAST64 "lld" /* int_least64_t */ -#define SCNdFAST8 "hhd" /* int_fast8_t */ -#define SCNdFAST16 "hd" /* int_fast16_t */ +#define SCNdFAST8 "d" /* int_fast8_t */ +#define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ #define SCNdFAST64 "lld" /* int_fast64_t */ #define SCNdMAX "lld" /* intmax_t */ @@ -158,8 +158,8 @@ #define SCNiLEAST16 "hi" /* int_least16_t */ #define SCNiLEAST32 "i" /* int_least32_t */ #define SCNiLEAST64 "lli" /* int_least64_t */ -#define SCNiFAST8 "hhi" /* int_fast8_t */ -#define SCNiFAST16 "hi" /* int_fast16_t */ +#define SCNiFAST8 "i" /* int_fast8_t */ +#define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ #define SCNiFAST64 "lli" /* int_fast64_t */ #define SCNiMAX "lli" /* intmax_t */ @@ -175,8 +175,8 @@ #define SCNoLEAST16 "ho" /* uint_least16_t */ #define SCNoLEAST32 "o" /* uint_least32_t */ #define SCNoLEAST64 "llo" /* uint_least64_t */ -#define SCNoFAST8 "hho" /* uint_fast8_t */ -#define SCNoFAST16 "ho" /* uint_fast16_t */ +#define SCNoFAST8 "o" /* uint_fast8_t */ +#define SCNoFAST16 "o" /* uint_fast16_t */ #define SCNoFAST32 "o" /* uint_fast32_t */ #define SCNoFAST64 "llo" /* uint_fast64_t */ #define SCNoMAX "llo" /* uintmax_t */ @@ -190,8 +190,8 @@ #define SCNuLEAST16 "hu" /* uint_least16_t */ #define SCNuLEAST32 "u" /* uint_least32_t */ #define SCNuLEAST64 "llu" /* uint_least64_t */ -#define SCNuFAST8 "hhu" /* uint_fast8_t */ -#define SCNuFAST16 "hu" /* uint_fast16_t */ +#define SCNuFAST8 "u" /* uint_fast8_t */ +#define SCNuFAST16 "u" /* uint_fast16_t */ #define SCNuFAST32 "u" /* uint_fast32_t */ #define SCNuFAST64 "llu" /* uint_fast64_t */ #define SCNuMAX "llu" /* uintmax_t */ @@ -205,8 +205,8 @@ #define SCNxLEAST16 "hx" /* uint_least16_t */ #define SCNxLEAST32 "x" /* uint_least32_t */ #define SCNxLEAST64 "llx" /* uint_least64_t */ -#define SCNxFAST8 "hhx" /* uint_fast8_t */ -#define SCNxFAST16 "hx" /* uint_fast16_t */ +#define SCNxFAST8 "x" /* uint_fast8_t */ +#define SCNxFAST16 "x" /* uint_fast16_t */ #define SCNxFAST32 "x" /* uint_fast32_t */ #define SCNxFAST64 "llx" /* uint_fast64_t */ #define SCNxMAX "llx" /* uintmax_t */
CVS commit: src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src
Committed By: martin
Date: Fri Aug 15 09:25:25 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h
Log Message:
Make {u,}intptr_t "long" on both sparc and sparc64 (as the NetBSD headers
always did)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-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/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.7 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.8
--- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.7 Sat Mar 1 08:58:33 2014
+++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Fri Aug 15 09:25:25 2014
@@ -46,6 +46,13 @@ along with GCC; see the file COPYING3.
#undef PTRDIFF_TYPE
#define PTRDIFF_TYPE "long int"
+/* we keep these "long" on both 32bit and 64bit targets */
+#undef INTPTR_TYPE
+#define INTPTR_TYPE PTRDIFF_TYPE
+
+#undef UINTPTR_TYPE
+#define UINTPTR_TYPE SIZE_TYPE
+
/* This is the char to use for continuation (in case we need to turn
continuation back on). */
#undef DBX_CONTIN_CHAR
CVS commit: src/libexec/ld.elf_so/arch/powerpc
Module Name:src
Committed By: matt
Date: Fri Aug 15 09:40:07 UTC 2014
Modified Files:
src/libexec/ld.elf_so/arch/powerpc: Makefile.inc
Log Message:
Use -fPIC since powerpc64 is always compiled as -fPIC and -fpic would cause
__PIC__ to change.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/libexec/ld.elf_so/arch/powerpc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/powerpc/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.14 src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.15
--- src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.14 Wed Aug 13 15:56:52 2014
+++ src/libexec/ld.elf_so/arch/powerpc/Makefile.inc Fri Aug 15 09:40:07 2014
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/08/13 15:56:52 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/08/15 09:40:07 matt Exp $
SRCS+= ppc_reloc.c
LDFLAGS+= -Wl,-e,_rtld_start
-# XXX Should not be in CPPFLAGS!
-CPPFLAGS+= -fpic
+CPPFLAGS+= -fPIC
.if ${LDELFSO_MACHINE_ARCH} == "powerpc64"
SRCS+= rtld_start64.S
CVS commit: [netbsd-7] src/sys/crypto/cprng_fast
Module Name:src
Committed By: martin
Date: Fri Aug 15 09:53:48 UTC 2014
Modified Files:
src/sys/crypto/cprng_fast [netbsd-7]: cprng_fast.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #16):
sys/crypto/cprng_fast/cprng_fast.c: revision 1.7
sys/crypto/cprng_fast/cprng_fast.c: revision 1.8
sys/crypto/cprng_fast/cprng_fast.c: revision 1.9
sys/crypto/cprng_fast/cprng_fast.c: revision 1.10
Access to struct cprng_fast must be consistently at IPL_VM.
Use percpu_foreach instead of manual iteration.
Move initial entropy bookkeeping out of the fast path.
Tweak cprng_fast_buf to use 32-bit unaligned writes if possible.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/crypto/cprng_fast/cprng_fast.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.6 src/sys/crypto/cprng_fast/cprng_fast.c:1.6.2.1
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.6 Mon Aug 11 03:50:29 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Fri Aug 15 09:53:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.6 2014/08/11 03:50:29 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.6.2.1 2014/08/15 09:53:48 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.6 2014/08/11 03:50:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.6.2.1 2014/08/15 09:53:48 martin Exp $");
#include
#include
@@ -203,6 +203,7 @@ struct cprng_fast {
__CTASSERT(sizeof ((struct cprng_fast *)0)->key == CPRNG_FAST_SEED_BYTES);
+static void cprng_fast_init_cpu(void *, void *, struct cpu_info *);
static void cprng_fast_schedule_reseed(struct cprng_fast *);
static void cprng_fast_intr(void *);
@@ -218,33 +219,39 @@ static void *cprng_fast_softint __read_m
void
cprng_fast_init(void)
{
- struct cpu_info *ci;
- CPU_INFO_ITERATOR cii;
crypto_core_selftest();
cprng_fast_percpu = percpu_alloc(sizeof(struct cprng_fast));
- for (CPU_INFO_FOREACH(cii, ci)) {
- struct cprng_fast *cprng;
- uint8_t seed[CPRNG_FAST_SEED_BYTES];
-
- percpu_traverse_enter();
- cprng = percpu_getptr_remote(cprng_fast_percpu, ci);
- cprng_strong(kern_cprng, seed, sizeof(seed), FASYNC);
- /* Can't do anything about it if not full entropy. */
- cprng_fast_seed(cprng, seed);
- explicit_memset(seed, 0, sizeof(seed));
- percpu_traverse_exit();
- }
+ percpu_foreach(cprng_fast_percpu, &cprng_fast_init_cpu, NULL);
cprng_fast_softint = softint_establish(SOFTINT_SERIAL|SOFTINT_MPSAFE,
&cprng_fast_intr, NULL);
}
+static void
+cprng_fast_init_cpu(void *p, void *arg __unused, struct cpu_info *ci __unused)
+{
+ struct cprng_fast *const cprng = p;
+ uint8_t seed[CPRNG_FAST_SEED_BYTES];
+
+ cprng_strong(kern_cprng, seed, sizeof seed, FASYNC);
+ cprng_fast_seed(cprng, seed);
+ cprng->have_initial = rnd_initial_entropy;
+ (void)explicit_memset(seed, 0, sizeof seed);
+}
+
static inline int
cprng_fast_get(struct cprng_fast **cprngp)
{
+ struct cprng_fast *cprng;
+ int s;
+
+ *cprngp = cprng = percpu_getref(cprng_fast_percpu);
+ s = splvm();
- *cprngp = percpu_getref(cprng_fast_percpu);
- return splvm();
+ if (__predict_false(!cprng->have_initial))
+ cprng_fast_schedule_reseed(cprng);
+
+ return s;
}
static inline void
@@ -256,7 +263,7 @@ cprng_fast_put(struct cprng_fast *cprng,
splx(s);
percpu_putref(cprng_fast_percpu);
}
-
+
static inline void
cprng_fast_schedule_reseed(struct cprng_fast *cprng __unused)
{
@@ -269,11 +276,15 @@ cprng_fast_intr(void *cookie __unused)
{
struct cprng_fast *cprng;
uint8_t seed[CPRNG_FAST_SEED_BYTES];
+ int s;
cprng_strong(kern_cprng, seed, sizeof(seed), FASYNC);
cprng = percpu_getref(cprng_fast_percpu);
+ s = splvm();
cprng_fast_seed(cprng, seed);
+ cprng->have_initial = rnd_initial_entropy;
+ splx(s);
percpu_putref(cprng_fast_percpu);
explicit_memset(seed, 0, sizeof(seed));
@@ -298,12 +309,6 @@ cprng_fast_seed(struct cprng_fast *cprng
(void)memset(cprng->buffer, 0, sizeof cprng->buffer);
(void)memcpy(cprng->key, seed, sizeof cprng->key);
(void)memset(cprng->nonce, 0, sizeof cprng->nonce);
-
- if (__predict_true(rnd_initial_entropy)) {
- cprng->have_initial = true;
- } else {
- cprng->have_initial = false;
- }
}
static inline uint32_t
@@ -320,12 +325,6 @@ cprng_fast_word(struct cprng_fast *cprng
if (__predict_false(++cprng->nonce[0] == 0)) {
cprng->nonce[1]++;
cprng_fast_schedule_reseed(cprng);
- } else {
- if (__predict_false(false == cprng->have_initial)) {
-if (rnd_initial_entropy) {
- cprng_fast_schedule_reseed(cprng);
-}
- }
}
v = cprng->buffer[CPRNG_FAST_BUFIDX];
cprng->buffer[CPRNG_FAST_BUFIDX] = CPRNG_FAST_BUFIDX;
@@ -339,11 +338,17 @@ cprng_fast_buf(struct cprng_
CVS commit: [netbsd-7] src/distrib
Module Name:src
Committed By: martin
Date: Fri Aug 15 10:23:22 UTC 2014
Modified Files:
src/distrib/amd64/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/i386/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd [netbsd-7]: Makefile
src/distrib/vax/cdroms/installcd [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #17):
distrib/vax/cdroms/installcd/Makefile: revision 1.9
distrib/amd64/cdroms/Makefile.cdrom: revision 1.11
distrib/i386/cdroms/Makefile.cdrom: revision 1.31
distrib/sparc64/cdroms/installcd/Makefile: revision 1.19
CD images need libarchive if MKBSDTAR is yes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.18 -r1.18.2.1 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.10 src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.1
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.10 Sat Jul 26 19:34:08 2014
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.1 2014/08/15 10:23:22 martin Exp $
.include
@@ -37,6 +37,9 @@ CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+= ./usr/lib/libarchive.so*
+.endif
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.30 src/distrib/i386/cdroms/Makefile.cdrom:1.30.2.1
--- src/distrib/i386/cdroms/Makefile.cdrom:1.30 Sat Jul 26 19:34:08 2014
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.30.2.1 2014/08/15 10:23:22 martin Exp $
.include
@@ -37,6 +37,9 @@ CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+= ./usr/lib/libarchive.so*
+.endif
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.18 src/distrib/sparc64/cdroms/installcd/Makefile:1.18.2.1
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.18 Sat Jul 26 19:34:08 2014
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2014/08/15 10:23:22 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -38,6 +38,9 @@ CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+= ./usr/lib/libarchive.so*
+.endif
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.8 src/distrib/vax/cdroms/installcd/Makefile:1.8.2.1
--- src/distrib/vax/cdroms/installcd/Makefile:1.8 Sat Jul 26 19:34:08 2014
+++ src/distrib/vax/cdroms/installcd/Makefile Fri Aug 15 10:23:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2014/08/15 10:23:21 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -68,6 +68,9 @@ CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+= ./usr/lib/libarchive.so*
+.endif
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Fri Aug 15 11:04:07 UTC 2014 Modified Files: src/lib/libc/time: Makefile NEWS Theory asctime.c checktab.awk ctime.3 localtime.c private.h strftime.c time2posix.3 tz-art.htm tz-link.htm tzfile.5 tzfile.h tzselect.8 tzselect.ksh tzset.3 zdump.8 zdump.c zic.8 zic.c Log Message: merge tzcode2014f via patch To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/Makefile cvs rdiff -u -r1.4 -r1.5 src/lib/libc/time/NEWS cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/Theory \ src/lib/libc/time/tzfile.h cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/asctime.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/time/checktab.awk cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/ctime.3 cvs rdiff -u -r1.82 -r1.83 src/lib/libc/time/localtime.c cvs rdiff -u -r1.33 -r1.34 src/lib/libc/time/private.h \ src/lib/libc/time/zdump.c cvs rdiff -u -r1.30 -r1.31 src/lib/libc/time/strftime.c cvs rdiff -u -r1.17 -r1.18 src/lib/libc/time/time2posix.3 cvs rdiff -u -r1.5 -r1.6 src/lib/libc/time/tz-art.htm \ src/lib/libc/time/tzselect.8 cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/tz-link.htm cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/tzfile.5 cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/tzselect.ksh cvs rdiff -u -r1.28 -r1.29 src/lib/libc/time/tzset.3 cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/zdump.8 cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/zic.8 cvs rdiff -u -r1.46 -r1.47 src/lib/libc/time/zic.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/time/Makefile diff -u src/lib/libc/time/Makefile:1.21 src/lib/libc/time/Makefile:1.22 --- src/lib/libc/time/Makefile:1.21 Tue Aug 5 11:45:49 2014 +++ src/lib/libc/time/Makefile Fri Aug 15 07:04:07 2014 @@ -1,4 +1,3 @@ -# # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -6,7 +5,7 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. -VERSION= 2014e +VERSION= 2014f # Email address for bug reports. BUGEMAIL= t...@iana.org @@ -96,14 +95,14 @@ REDO= posix_right YEARISTYPE= ./yearistype # Non-default libraries needed to link. -# Add -lintl if you want to use `gettext' on Solaris. +# Add -lintl if you want to use 'gettext' on Solaris. LDLIBS= # Add the following to the end of the "CFLAGS=" line as needed. # -DBIG_BANG=-999LL if the Big Bang occurred at time -999 (see zic.c) -# -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) +# -DHAVE_ADJTIME=0 if 'adjtime' does not exist (SVR0?) # -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if `gettext' works (GNU, Linux, Solaris); also see LDLIBS +# -DHAVE_GETTEXT=1 if 'gettext' works (GNU, Linux, Solaris); also see LDLIBS # -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard (Solaris 8). # -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" @@ -124,7 +123,7 @@ LDLIBS= # year 2000 grief # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" -# -TTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; +# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # -DNO_ERROR_IN_DST_GAP=1 @@ -136,14 +135,16 @@ LDLIBS= GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ -Wall -Wextra \ -Wbad-function-cast -Wcast-align -Wcast-qual \ - -Wformat=2 -Winit-self \ + -Wdeclaration-after-statement \ + -Wformat=2 -Winit-self -Wjump-misses-init \ -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \ -Wnested-externs -Wno-address -Wno-cast-qual \ -Wno-format-nonliteral -Wno-sign-compare -Wno-sign-conversion \ -Wno-type-limits \ -Wno-unused-parameter -Woverlength-strings -Wpointer-arith \ -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ - -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \ + -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ + -Wsuggest-attribute=pure -Wtrampolines \ -Wwrite-strings # # If you want to use System V compatibility code, add @@ -237,7 +238,7 @@ ZIC= $(zic) $(ZFLAGS) ZFLAGS= -# The name of a Posix-compliant `awk' on your system. +# The name of a Posix-compliant 'awk' on your system. AWK= awk # The full path name of a Posix-compliant shell, preferably one that supports @@ -267,16 +268,34 @@ VALIDATE_ENV = \ SP_CHARSET_FIXED=YES \ SP_ENCODING=UTF-8 -# INVALID_CHAR is a regular expression that matches invalid characters in -# distributed files. For now, stick to a safe subset of ASCII. +# SAFE_CHAR is a regular expression that matches a
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Aug 15 11:05:07 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1145 -r1.1146 src/doc/3RDPARTY cvs rdiff -u -r1.1968 -r1.1969 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.1145 src/doc/3RDPARTY:1.1146 --- src/doc/3RDPARTY:1.1145 Sun Aug 10 16:52:33 2014 +++ src/doc/3RDPARTY Fri Aug 15 07:05:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1145 2014/08/10 20:52:33 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1146 2014/08/15 11:05:07 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1300,7 +1300,7 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2014e / tzdata2014f +Version: tzcode2014f / tzdata2014f Current Vers: tzcode2014f / tzdata2014f Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1968 src/doc/CHANGES:1.1969 --- src/doc/CHANGES:1.1968 Mon Aug 11 05:12:34 2014 +++ src/doc/CHANGES Fri Aug 15 07:05:07 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1968 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1969 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -25,3 +25,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: + libc: Update to tzcode2014f. [christos 20140815]
CVS commit: src/sys/kern
Module Name:src Committed By: apb Date: Fri Aug 15 11:05:35 UTC 2014 Modified Files: src/sys/kern: subr_prf.c Log Message: If mutex_tryenter() fails, don't call mutex_exit(). To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/kern/subr_prf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_prf.c diff -u src/sys/kern/subr_prf.c:1.155 src/sys/kern/subr_prf.c:1.156 --- src/sys/kern/subr_prf.c:1.155 Fri Aug 15 07:39:25 2014 +++ src/sys/kern/subr_prf.c Fri Aug 15 11:05:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_prf.c,v 1.155 2014/08/15 07:39:25 mrg Exp $ */ +/* $NetBSD: subr_prf.c,v 1.156 2014/08/15 11:05:35 apb Exp $ */ /*- * Copyright (c) 1986, 1988, 1991, 1993 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.155 2014/08/15 07:39:25 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.156 2014/08/15 11:05:35 apb Exp $"); #include "opt_ddb.h" #include "opt_ipkdb.h" @@ -161,8 +161,8 @@ static void kprintf_rnd_get(size_t bytes /* This is optional but seems useful. */ SHA512_Update(&kprnd_sha, kprnd_accum, sizeof(kprnd_accum)); + mutex_exit(&kprintf_mtx); } - mutex_exit(&kprintf_mtx); } }
CVS commit: [netbsd-7] src/sys/external/bsd/drm2
Module Name:src
Committed By: martin
Date: Fri Aug 15 11:11:59 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: pci.h
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_agp_backend.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #18):
sys/external/bsd/drm2/ttm/ttm_agp_backend.c: revision 1.2
sys/external/bsd/drm2/ttm/ttm_agp_backend.c: revision 1.3
sys/external/bsd/drm2/include/linux/pci.h: revision 1.8
Fix shifts & masks in Linux pci_read_config_{word,byte}.
Use ttm_dma_tt_init in ttm_agp_tt_create so we can use ttm_bus_dma.
Zero ttm_agp objects on creation.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/external/bsd/drm2/ttm/ttm_agp_backend.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/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.7 src/sys/external/bsd/drm2/include/linux/pci.h:1.7.2.1
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.7 Wed Aug 6 13:52:06 2014
+++ src/sys/external/bsd/drm2/include/linux/pci.h Fri Aug 15 11:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.7 2014/08/06 13:52:06 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.7.2.1 2014/08/15 11:11:59 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -200,7 +200,7 @@ pci_read_config_word(struct pci_dev *pde
{
KASSERT(!ISSET(reg, 1));
*valuep = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag,
- (reg &~ 3)) >> (8 * (reg & 3));
+ (reg &~ 2)) >> (8 * (reg & 2));
return 0;
}
@@ -208,7 +208,7 @@ static inline int
pci_read_config_byte(struct pci_dev *pdev, int reg, uint8_t *valuep)
{
*valuep = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag,
- (reg &~ 1)) >> (8 * (reg & 1));
+ (reg &~ 3)) >> (8 * (reg & 3));
return 0;
}
Index: src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.1 src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.1.4.1
--- src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.1 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c Fri Aug 15 11:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_agp_backend.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: ttm_agp_backend.c,v 1.1.4.1 2014/08/15 11:11:59 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.1.4.1 2014/08/15 11:11:59 martin Exp $");
#include
#include
@@ -57,11 +57,11 @@ ttm_agp_tt_create(struct ttm_bo_device *
{
struct ttm_agp *ttm_agp;
- ttm_agp = kmem_alloc(sizeof(*ttm_agp), KM_SLEEP);
+ ttm_agp = kmem_zalloc(sizeof(*ttm_agp), KM_SLEEP);
ttm_agp->agp = &bridge->abd_sc;
ttm_agp->ttm_dma.ttm.func = &ttm_agp_backend_func;
- if (ttm_tt_init(&ttm_agp->ttm_dma.ttm, bdev, size, page_flags,
+ if (ttm_dma_tt_init(&ttm_agp->ttm_dma, bdev, size, page_flags,
dummy_read_page) != 0)
goto fail;
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Fri Aug 15 11:58:14 UTC 2014 Modified Files: src/sys/sys: stdarg.h Log Message: #include To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/sys/stdarg.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/stdarg.h diff -u src/sys/sys/stdarg.h:1.3 src/sys/sys/stdarg.h:1.4 --- src/sys/sys/stdarg.h:1.3 Thu Jul 19 22:46:41 2012 +++ src/sys/sys/stdarg.h Fri Aug 15 11:58:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.3 2012/07/19 22:46:41 pooka Exp $ */ +/* $NetBSD: stdarg.h,v 1.4 2014/08/15 11:58:13 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -34,6 +34,7 @@ #ifndef _SYS_STDARG_H_ #define _SYS_STDARG_H_ +#include #include #include
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Fri Aug 15 12:26:56 UTC 2014 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by riastradh in ticket #19): distrib/sets/lists/debug/mi: revision 1.82 Add tar.debug and cpio.debug to lists for MKBSDTAR=yes MKDEBUG=yes. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.81.2.1 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.81 src/distrib/sets/lists/debug/mi:1.81.2.1 --- src/distrib/sets/lists/debug/mi:1.81 Sat Aug 9 11:33:53 2014 +++ src/distrib/sets/lists/debug/mi Fri Aug 15 12:26:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.81 2014/08/09 11:33:53 apb Exp $ +# $NetBSD: mi,v 1.81.2.1 2014/08/15 12:26:56 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -251,6 +251,7 @@ ./usr/libdata/debug/bin/chio.debug comp-util-debug debug ./usr/libdata/debug/bin/chmod.debug comp-util-debug debug ./usr/libdata/debug/bin/cp.debug comp-util-debug debug +./usr/libdata/debug/bin/cpio.debug comp-util-debug debug,bsdtar ./usr/libdata/debug/bin/csh.debug comp-util-debug debug ./usr/libdata/debug/bin/date.debug comp-util-debug debug ./usr/libdata/debug/bin/dd.debug comp-util-debug debug @@ -280,6 +281,7 @@ ./usr/libdata/debug/bin/stty.debug comp-util-debug debug ./usr/libdata/debug/bin/sync.debug comp-util-debug debug ./usr/libdata/debug/bin/systrace.debug comp-obsolete obsolete +./usr/libdata/debug/bin/tar.debug comp-util-debug debug,bsdtar ./usr/libdata/debug/bin/test.debug comp-util-debug debug ./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/amrctl.debug comp-sysutil-debug debug
CVS commit: [netbsd-7] src/distrib/sets/lists/modules
Module Name:src Committed By: martin Date: Fri Aug 15 12:53:54 UTC 2014 Modified Files: src/distrib/sets/lists/modules [netbsd-7]: md.amd64 Log Message: Pull up following revision(s) (requested by riastradh in ticket #21): distrib/sets/lists/modules/md.amd64: revision 1.42 Add dtrace modules to amd64-xen module set list. Hi jnemeth! To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.2.1 src/distrib/sets/lists/modules/md.amd64 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/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.41 src/distrib/sets/lists/modules/md.amd64:1.41.2.1 --- src/distrib/sets/lists/modules/md.amd64:1.41 Mon Aug 11 05:19:16 2014 +++ src/distrib/sets/lists/modules/md.amd64 Fri Aug 15 12:53:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41 2014/08/11 05:19:16 jnemeth Exp $ +# $NetBSD: md.amd64,v 1.41.2.1 2014/08/15 12:53:54 martin Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -234,6 +234,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/coretemp/coretemp.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/cryptobase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/crypto/crypto.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/cyclicbase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/cyclic/cyclic.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/cx24227base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/cx24227/cx24227.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/cxdtvbase-kernel-modules kmod,compatmodules @@ -246,6 +248,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/dk_subr/dk_subr.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dmbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtracebase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/drmbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtvbase-kernel-modules kmod,compatmodules @@ -266,6 +270,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/exec_script/exec_script.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ext2fsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ext2fs/ext2fs.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/fbtbase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/fbt/fbt.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/fdescbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/fdesc/fdesc.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ffsbase-kernel-modules kmod,compatmodules @@ -404,6 +410,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/procfsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/procfs/procfs.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/profilebase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/profile/profile.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ptyfsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ptyfs/ptyfs.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/puffsbase-kernel-modules kmod,compatmodules @@ -414,6 +422,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/pwdog/pwdog.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/sdtbase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/sdt/sdt.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/sdtempbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/sdtemp/sdtemp.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/secmodel_bsd44 base-kernel-modules k
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Aug 15 12:56:24 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: subr_cprng.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #22):
sys/kern/subr_cprng.c: revision 1.25
Lock cprng->cs_lock around rndsink_request to avoid race with callback.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/kern/subr_cprng.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.24 src/sys/kern/subr_cprng.c:1.24.2.1
--- src/sys/kern/subr_cprng.c:1.24 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/subr_cprng.c Fri Aug 15 12:56:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.24 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.24.2.1 2014/08/15 12:56:24 martin Exp $ */
/*-
* Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.24 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.24.2.1 2014/08/15 12:56:24 martin Exp $");
#include
#include
@@ -151,6 +151,7 @@ cprng_strong_create(const char *name, in
/* Get some initial entropy. Record whether it is full entropy. */
uint8_t seed[NIST_BLOCK_KEYLEN_BYTES];
+ mutex_enter(&cprng->cs_lock);
cprng->cs_ready = rndsink_request(cprng->cs_rndsink, seed,
sizeof(seed));
if (nist_ctr_drbg_instantiate(&cprng->cs_drbg, seed, sizeof(seed),
@@ -168,6 +169,7 @@ cprng_strong_create(const char *name, in
if (!cprng->cs_ready && !ISSET(flags, CPRNG_INIT_ANY))
printf("cprng %s: creating with partial entropy\n",
cprng->cs_name);
+ mutex_exit(&cprng->cs_lock);
return cprng;
}
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: martin
Date: Fri Aug 15 12:58:45 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: init_main.c
src/sys/rump/librump/rumpkern [netbsd-7]: rump.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #23):
sys/rump/librump/rumpkern/rump.c: revision 1.310
sys/rump/librump/rumpkern/rump.c: revision 1.309
sys/kern/init_main.c: revision 1.459
Defer cprng_fast_init until CPUs are detected.
Restore placement of percpu_init in rump_init.
Probably doesn't matter, but let's avoid needless churn around the
real bug fix.
To generate a diff of this commit:
cvs rdiff -u -r1.458 -r1.458.2.1 src/sys/kern/init_main.c
cvs rdiff -u -r1.308 -r1.308.2.1 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.458 src/sys/kern/init_main.c:1.458.2.1
--- src/sys/kern/init_main.c:1.458 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/init_main.c Fri Aug 15 12:58:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.458 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: init_main.c,v 1.458.2.1 2014/08/15 12:58:45 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.458 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.458.2.1 2014/08/15 12:58:45 martin Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -501,8 +501,6 @@ main(void)
kern_cprng = cprng_strong_create("kernel", IPL_VM,
CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
- cprng_fast_init();
-
/* Initialize interfaces. */
ifinit1();
@@ -514,6 +512,9 @@ main(void)
/* Configure the system hardware. This will enable interrupts. */
configure();
+ /* Once all CPUs are detected, initialize the per-CPU cprng_fast. */
+ cprng_fast_init();
+
ssp_init();
ubc_init(); /* must be after autoconfig */
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.308 src/sys/rump/librump/rumpkern/rump.c:1.308.2.1
--- src/sys/rump/librump/rumpkern/rump.c:1.308 Mon Aug 11 04:27:24 2014
+++ src/sys/rump/librump/rumpkern/rump.c Fri Aug 15 12:58:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.308 2014/08/11 04:27:24 ozaki-r Exp $ */
+/* $NetBSD: rump.c,v 1.308.2.1 2014/08/15 12:58:45 martin Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308 2014/08/11 04:27:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308.2.1 2014/08/15 12:58:45 martin Exp $");
#include
#define ELFSIZE ARCH_ELFSIZE
@@ -286,8 +286,6 @@ rump_init(void)
uvm_ra_init();
uao_init();
- percpu_init();
-
mutex_obj_init();
callout_startup();
@@ -305,7 +303,6 @@ rump_init(void)
kern_cprng = cprng_strong_create("kernel", IPL_VM,
CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
- cprng_fast_init();
rump_hyperentropy_init();
procinit();
@@ -328,6 +325,7 @@ rump_init(void)
rump_schedule();
bootlwp = curlwp;
+ percpu_init();
inittimecounter();
ntp_init();
@@ -364,6 +362,9 @@ rump_init(void)
aprint_verbose("cpu%d at thinair0: rump virtual cpu\n", i);
}
+ /* Once all CPUs are detected, initialize the per-CPU cprng_fast. */
+ cprng_fast_init();
+
/* CPUs are up. allow kernel threads to run */
rump_thread_allow(NULL);
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Aug 15 13:00:48 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: subr_prf.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #24):
sys/kern/subr_prf.c: revision 1.155
avoid calling into time code when cold, and avoid calling nanotime()
if we're not going to use the result anyway.
XXX: not necessarily the best fix, but better than crashing *early*
boot due to too-early nanotime() calls.
XXX: pullup.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/kern/subr_prf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.154 src/sys/kern/subr_prf.c:1.154.2.1
--- src/sys/kern/subr_prf.c:1.154 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/subr_prf.c Fri Aug 15 13:00:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.154 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -1200,7 +1200,6 @@ kprintf(const char *fmt0, int oflags, vo
const char *xdigs; /* digits for [xX] conversion */
char bf[KPRINTF_BUFSIZE]; /* space for %c, %[diouxX] */
char *tailp; /* tail pointer for snprintf */
- struct timespec ts;
if (oflags == TOBUFONLY && (vp != NULL))
tailp = *(char **)vp;
@@ -1549,9 +1548,12 @@ done:
*(char **)vp = sbuf;
(*v_flush)();
- (void)nanotime(&ts);
#ifdef RND_PRINTF
- SHA512_Update(&kprnd_sha, (char *)&ts, sizeof(ts));
+ if (!cold) {
+ struct timespec ts;
+ (void)nanotime(&ts);
+ SHA512_Update(&kprnd_sha, (char *)&ts, sizeof(ts));
+ }
#endif
return ret;
}
CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/radeon
Module Name:xsrc Committed By: martin Date: Fri Aug 15 13:04:23 UTC 2014 Modified Files: xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: radeon_bo_gem.c Log Message: Pull up following revision(s) (requested by mrg in ticket #25): external/mit/libdrm/dist/radeon/radeon_bo_gem.c: revision 1.4 convert an mmap() to drmMap(). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 \ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3.2.1 --- xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3 Mon Mar 17 07:52:19 2014 +++ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c Fri Aug 15 13:04:23 2014 @@ -178,8 +178,8 @@ static int bo_map(struct radeon_bo_int * boi, boi->handle, r); return r; } -ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi->bom->fd, args.addr_ptr); -if (ptr == MAP_FAILED) +r = drmMap(boi->bom->fd, args.addr_ptr, args.size, &ptr); +if (r) return -errno; bo_gem->priv_ptr = ptr; wait:
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: martin
Date: Fri Aug 15 13:07:37 UTC 2014
Modified Files:
src/doc [netbsd-7]: CHANGES-7.0
Log Message:
Tickets 16-19 and 21-25.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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.9 src/doc/CHANGES-7.0:1.1.2.10
--- src/doc/CHANGES-7.0:1.1.2.9 Thu Aug 14 06:58:39 2014
+++ src/doc/CHANGES-7.0 Fri Aug 15 13:07:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.9 2014/08/14 06:58:39 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.10 2014/08/15 13:07:37 martin Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -108,3 +108,71 @@ sys/dev/usb/usb.h1.107
Define AXEN_DEBUG. From Takahiro HAYASHI.
[skrll, ticket #10]
+sys/crypto/cprng_fast/cprng_fast.c 1.10
+sys/crypto/cprng_fast/cprng_fast.c 1.7
+sys/crypto/cprng_fast/cprng_fast.c 1.8
+sys/crypto/cprng_fast/cprng_fast.c 1.9
+
+ Access to struct cprng_fast must be consistently at IPL_VM.
+ Use percpu_foreach instead of manual iteration.
+ Move initial entropy bookkeeping out of the fast path.
+ Tweak cprng_fast_buf to use 32-bit unaligned writes if possible.
+ [riastradh, ticket #16]
+
+distrib/amd64/cdroms/Makefile.cdrom 1.11
+distrib/i386/cdroms/Makefile.cdrom 1.31
+distrib/sparc64/cdroms/installcd/Makefile 1.19
+distrib/vax/cdroms/installcd/Makefile 1.9
+
+ CD images need libarchive if MKBSDTAR is yes.
+ [riastradh, ticket #17]
+
+sys/external/bsd/drm2/include/linux/pci.h 1.8
+sys/external/bsd/drm2/ttm/ttm_agp_backend.c 1.2
+sys/external/bsd/drm2/ttm/ttm_agp_backend.c 1.3
+
+ Fix shifts & masks in Linux pci_read_config_{word,byte}.
+ Use ttm_dma_tt_init in ttm_agp_tt_create so we can use ttm_bus_dma.
+ Zero ttm_agp objects on creation.
+ [riastradh, ticket #18]
+
+distrib/sets/lists/debug/mi 1.82
+
+ Add tar.debug and cpio.debug to lists for MKBSDTAR=yes MKDEBUG=yes.
+ [riastradh, ticket #19]
+
+distrib/sets/lists/modules/md.amd64 1.42
+
+ Add dtrace modules to amd64-xen module set list. Hi jnemeth!
+ [riastradh, ticket #21]
+
+sys/kern/subr_cprng.c1.25
+
+ Lock cprng->cs_lock around rndsink_request to avoid race with callback.
+ [riastradh, ticket #22]
+
+sys/kern/init_main.c1.459
+sys/rump/librump/rumpkern/rump.c 1.309
+sys/rump/librump/rumpkern/rump.c 1.310
+
+ Defer cprng_fast_init until CPUs are detected.
+ Restore placement of percpu_init in rump_init.
+ Probably doesn't matter, but let's avoid needless churn around the
+ real bug fix.
+ [riastradh, ticket #23]
+
+sys/kern/subr_prf.c1.155
+
+ avoid calling into time code when cold, and avoid calling nanotime()
+ if we're not going to use the result anyway.
+
+ XXX: not necessarily the best fix, but better than crashing *early*
+ boot due to too-early nanotime() calls.
+
+ [mrg, ticket #24]
+
+xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c 1.4
+
+ convert an mmap() to drmMap().
+ [mrg, ticket #25]
+
CVS commit: src/lib/libc/time
Module Name:src
Committed By: martin
Date: Fri Aug 15 13:20:29 UTC 2014
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
Intialize dstname - the invariant combination with dstlen is too complex
for gcc to follow.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/lib/libc/time/localtime.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/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.83 src/lib/libc/time/localtime.c:1.84
--- src/lib/libc/time/localtime.c:1.83 Fri Aug 15 11:04:07 2014
+++ src/lib/libc/time/localtime.c Fri Aug 15 13:20:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.83 2014/08/15 11:04:07 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.84 2014/08/15 13:20:29 martin Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.83 2014/08/15 11:04:07 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.84 2014/08/15 13:20:29 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -997,6 +997,7 @@ tzparse(timezone_t sp, const char *name,
char * cp;
int load_result;
+ dstname = NULL; /* XXX gcc */
stdname = name;
if (lastditch) {
stdlen = strlen(name); /* length of standard zone name */
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri Aug 15 13:32:54 UTC 2014
Modified Files:
src/lib/libedit: readline.c
Log Message:
Fix typo in comment (Tobias Stoeckmann)
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/lib/libedit/readline.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/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.111 src/lib/libedit/readline.c:1.112
--- src/lib/libedit/readline.c:1.111 Sun Jul 6 14:09:04 2014
+++ src/lib/libedit/readline.c Fri Aug 15 09:32:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.111 2014/07/06 18:09:04 christos Exp $ */
+/* $NetBSD: readline.c,v 1.112 2014/08/15 13:32:53 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.111 2014/07/06 18:09:04 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.112 2014/08/15 13:32:53 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -338,7 +338,7 @@ rl_initialize(void)
el_set(e, EL_SIGNAL, rl_catch_signals);
/* set default mode to "emacs"-style and read setting afterwards */
- /* so this can be overriden */
+ /* so this can be overridden */
el_set(e, EL_EDITOR, "emacs");
if (rl_terminal_name != NULL)
el_set(e, EL_TERMINAL, rl_terminal_name);
CVS commit: src/sys/fs/ptyfs
Module Name:src
Committed By: hannken
Date: Fri Aug 15 13:40:39 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs.h ptyfs_subr.c ptyfs_vfsops.c ptyfs_vnops.c
Log Message:
Change ptyfs to vcache.
- Use (type, minor) as key.
- Change ptyfs_allocvp to return a referenced vnode and lock where needed.
- Remove unneeded vnode backpointer ptyfs_vnode.
- Keep a single hashlist for pty nodes to make their attributes persistent.
OK: Christos Zoulas
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/ptyfs/ptyfs.h
cvs rdiff -u -r1.30 -r1.31 src/sys/fs/ptyfs/ptyfs_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/fs/ptyfs/ptyfs_vfsops.c
cvs rdiff -u -r1.48 -r1.49 src/sys/fs/ptyfs/ptyfs_vnops.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/fs/ptyfs/ptyfs.h
diff -u src/sys/fs/ptyfs/ptyfs.h:1.13 src/sys/fs/ptyfs/ptyfs.h:1.14
--- src/sys/fs/ptyfs/ptyfs.h:1.13 Wed Aug 13 14:10:00 2014
+++ src/sys/fs/ptyfs/ptyfs.h Fri Aug 15 13:40:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs.h,v 1.13 2014/08/13 14:10:00 hannken Exp $ */
+/* $NetBSD: ptyfs.h,v 1.14 2014/08/15 13:40:39 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -87,11 +87,15 @@ typedef enum {
/*
* control data for the proc file system.
*/
+struct ptyfskey {
+ ptyfstype ptk_type; /* type of ptyfs node */
+ int ptk_pty; /* the pty index */
+};
struct ptyfsnode {
- LIST_ENTRY(ptyfsnode) ptyfs_hash; /* hash chain */
- struct vnode *ptyfs_vnode; /* vnode associated with this ptyfsnode */
- ptyfstype ptyfs_type; /* type of ptyfs node */
- int ptyfs_pty; /* the pty index */
+ SLIST_ENTRY(ptyfsnode) ptyfs_hash; /* hash chain */
+ struct ptyfskey ptyfs_key;
+#define ptyfs_type ptyfs_key.ptk_type
+#define ptyfs_pty ptyfs_key.ptk_pty
u_long ptyfs_fileno; /* unique file id */
int ptyfs_status; /* status flag for times */
#define PTYFS_ACCESS 1
@@ -150,16 +154,14 @@ struct ptyfs_args {
* Convert between ptyfsnode vnode
*/
#define VTOPTYFS(vp) ((struct ptyfsnode *)(vp)->v_data)
-#define PTYFSTOV(ptyfs) ((ptyfs)->ptyfs_vnode)
-int ptyfs_freevp(struct vnode *);
void ptyfs_set_active(struct mount *, int);
void ptyfs_clr_active(struct mount *, int);
int ptyfs_next_active(struct mount *, int);
int ptyfs_allocvp(struct mount *, struct vnode **, ptyfstype, int);
void ptyfs_hashinit(void);
-void ptyfs_hashreinit(void);
void ptyfs_hashdone(void);
+struct ptyfsnode *ptyfs_get_node(ptyfstype, int);
void ptyfs_itimes(struct ptyfsnode *, const struct timespec *,
const struct timespec *, const struct timespec *);
Index: src/sys/fs/ptyfs/ptyfs_subr.c
diff -u src/sys/fs/ptyfs/ptyfs_subr.c:1.30 src/sys/fs/ptyfs/ptyfs_subr.c:1.31
--- src/sys/fs/ptyfs/ptyfs_subr.c:1.30 Wed Aug 13 14:10:00 2014
+++ src/sys/fs/ptyfs/ptyfs_subr.c Fri Aug 15 13:40:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_subr.c,v 1.30 2014/08/13 14:10:00 hannken Exp $ */
+/* $NetBSD: ptyfs_subr.c,v 1.31 2014/08/15 13:40:39 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_subr.c,v 1.30 2014/08/13 14:10:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_subr.c,v 1.31 2014/08/15 13:40:39 hannken Exp $");
#include
#include
@@ -92,110 +92,29 @@ __KERNEL_RCSID(0, "$NetBSD: ptyfs_subr.c
#include
#include
-#include
static kmutex_t ptyfs_hashlock;
-static LIST_HEAD(ptyfs_hashhead, ptyfsnode) *ptyfs_used_tbl, *ptyfs_free_tbl;
-static u_long ptyfs_used_mask, ptyfs_free_mask; /* size of hash table - 1 */
-static kmutex_t ptyfs_used_slock, ptyfs_free_slock;
-
-static void ptyfs_hashins(struct ptyfsnode *);
-static void ptyfs_hashrem(struct ptyfsnode *);
-
-static struct vnode *ptyfs_used_get(ptyfstype, int, struct mount *, int);
-static struct ptyfsnode *ptyfs_free_get(ptyfstype, int);
-
-static void ptyfs_rehash(kmutex_t *, struct ptyfs_hashhead **,
-u_long *);
-
-#define PTYHASH(type, pty, mask) (PTYFS_FILENO(type, pty) % (mask + 1))
-
+static SLIST_HEAD(ptyfs_hashhead, ptyfsnode) *ptyfs_node_tbl;
+static u_long ptyfs_node_mask; /* size of hash table - 1 */
/*
- * allocate a ptyfsnode/vnode pair. the vnode is
- * referenced, and locked.
+ * allocate a ptyfsnode/vnode pair. the vnode is referenced.
*
* the pty, ptyfs_type, and mount point uniquely
* identify a ptyfsnode. the mount point is needed
* because someone might mount this filesystem
* twice.
- *
- * all ptyfsnodes are maintained on a singly-linked
- * list. new nodes are only allocated when they cannot
- * be found on this list. entries on the list are
- * removed when the vfs reclaim entry is called.
- *
- * a single lock is kept for the entire list. this is
- * needed because the getnewvnode() function can block
- * waiting for a vnode to become free, in which case there
- * may be more than one ptyess trying to get the same
- * vnode. this lock is only taken if we are going to
- * call getnewvnode, since
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: ozaki-r
Date: Fri Aug 15 15:03:03 UTC 2014
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c shmifvar.h
Log Message:
Make shmif SIMPLEX
Add a sender field to a packet header on a shmif bus to identify
and ignore packets sent by itself.
This makes shmif work with bridges.
ok pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/rump/net/lib/libshmif/if_shmem.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libshmif/shmifvar.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/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.62 src/sys/rump/net/lib/libshmif/if_shmem.c:1.63
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.62 Sat Aug 9 09:43:49 2014
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Fri Aug 15 15:03:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.62 2014/08/09 09:43:49 ozaki-r Exp $ */
+/* $NetBSD: if_shmem.c,v 1.63 2014/08/15 15:03:03 ozaki-r Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.62 2014/08/09 09:43:49 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.63 2014/08/15 15:03:03 ozaki-r Exp $");
#include
#include
@@ -97,6 +97,8 @@ struct shmif_sc {
struct lwp *sc_rcvl;
bool sc_dying;
+
+ uint64_t sc_uuid;
};
static void shmif_rcv(void *);
@@ -167,12 +169,13 @@ allocif(int unit, struct shmif_sc **scp)
sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
sc->sc_memfd = -1;
sc->sc_unit = unit;
+ sc->sc_uuid = cprng_fast64();
ifp = &sc->sc_ec.ec_if;
snprintf(ifp->if_xname, sizeof(ifp->if_xname), "shmif%d", unit);
ifp->if_softc = sc;
- ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_init = shmif_init;
ifp->if_ioctl = shmif_ioctl;
ifp->if_start = shmif_start;
@@ -540,6 +543,7 @@ shmif_start(struct ifnet *ifp)
sp.sp_len = pktsize;
sp.sp_sec = tv.tv_sec;
sp.sp_usec = tv.tv_usec;
+ sp.sp_sender = sc->sc_uuid;
bpf_mtap(ifp, m0);
@@ -743,7 +747,9 @@ shmif_rcv(void *arg)
* Test if we want to pass the packet upwards
*/
eth = mtod(m, struct ether_header *);
- if (memcmp(eth->ether_dhost, CLLADDR(ifp->if_sadl),
+ if (sp.sp_sender == sc->sc_uuid) {
+ passup = false;
+ } else if (memcmp(eth->ether_dhost, CLLADDR(ifp->if_sadl),
ETHER_ADDR_LEN) == 0) {
passup = true;
} else if (ETHER_IS_MULTICAST(eth->ether_dhost)) {
Index: src/sys/rump/net/lib/libshmif/shmifvar.h
diff -u src/sys/rump/net/lib/libshmif/shmifvar.h:1.7 src/sys/rump/net/lib/libshmif/shmifvar.h:1.8
--- src/sys/rump/net/lib/libshmif/shmifvar.h:1.7 Fri Dec 20 09:06:35 2013
+++ src/sys/rump/net/lib/libshmif/shmifvar.h Fri Aug 15 15:03:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmifvar.h,v 1.7 2013/12/20 09:06:35 pooka Exp $ */
+/* $NetBSD: shmifvar.h,v 1.8 2014/08/15 15:03:03 ozaki-r Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -56,6 +56,8 @@ struct shmif_pkthdr {
uint32_t sp_sec;
uint32_t sp_usec;
+
+ uint64_t sp_sender;
};
#define BUSMEM_SIZE (1024*1024)
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: riastradh
Date: Fri Aug 15 15:04:33 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: hyperentropy.c
Log Message:
Call rnd_add_data asynchronously for the rump hyperentropy callback.
Avoids recursion rnd_getmore -> rnd_add_data -> rnd_getmore, which is
silly but I don't have time to fix it properly right now.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c
diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.3 src/sys/rump/librump/rumpkern/hyperentropy.c:1.4
--- src/sys/rump/librump/rumpkern/hyperentropy.c:1.3 Sun Aug 10 16:44:36 2014
+++ src/sys/rump/librump/rumpkern/hyperentropy.c Fri Aug 15 15:04:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperentropy.c,v 1.3 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: hyperentropy.c,v 1.4 2014/08/15 15:04:33 riastradh Exp $ */
/*
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.3 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.4 2014/08/15 15:04:33 riastradh Exp $");
#include
#include
@@ -37,10 +37,12 @@ __KERNEL_RCSID(0, "$NetBSD: hyperentropy
#include "rump_private.h"
static krndsource_t rndsrc;
+static volatile unsigned hyperentropy_wanted;
+static void *feedrandom_softint;
#define MAXGET (RND_POOLBITS/NBBY)
static void
-feedrandom(size_t bytes, void *arg)
+feedrandom(size_t bytes)
{
uint8_t *rnddata;
size_t dsize;
@@ -52,18 +54,42 @@ feedrandom(size_t bytes, void *arg)
kmem_intr_free(rnddata, MAXGET);
}
+static void
+feedrandom_intr(void *cookie __unused)
+{
+
+ feedrandom(atomic_swap_uint(&hyperentropy_wanted, 0));
+}
+
+static void
+feedrandom_cb(size_t bytes, void *cookie __unused)
+{
+ unsigned old, new;
+
+ do {
+ old = hyperentropy_wanted;
+ new = ((MAXGET - old) < bytes? MAXGET : (old + bytes));
+ } while (atomic_cas_uint(&hyperentropy_wanted, old, new) != old);
+
+ softint_schedule(feedrandom_softint);
+}
+
void
rump_hyperentropy_init(void)
{
if (rump_threads) {
- rndsource_setcb(&rndsrc, feedrandom, &rndsrc);
+ feedrandom_softint =
+ softint_establish(SOFTINT_CLOCK|SOFTINT_MPSAFE,
+ feedrandom_intr, NULL);
+ KASSERT(feedrandom_softint != NULL);
+ rndsource_setcb(&rndsrc, feedrandom_cb, &rndsrc);
rnd_attach_source(&rndsrc, "rump_hyperent", RND_TYPE_VM,
RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
} else {
/* without threads, just fill the pool */
rnd_attach_source(&rndsrc, "rump_hyperent", RND_TYPE_VM,
RND_FLAG_COLLECT_VALUE);
- feedrandom(RND_POOLBITS/NBBY, NULL);
+ feedrandom(MAXGET);
}
}
CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: riastradh
Date: Fri Aug 15 15:14:43 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
Log Message:
Fix format strings for uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5 Wed Aug 13 22:45:12 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Fri Aug 15 15:14:43 2014
@@ -921,7 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, st
#if NV_TEST_FOR_KERNEL_DRIVER
if (pci_device_has_kernel_driver(dev)) {
xf86DrvMsg(0, X_ERROR,
- NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
+ NV_NAME ": The PCI device 0x%"PRIx32" (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
id, name, dev->bus, dev->domain, dev->dev, dev->func);
xf86DrvMsg(0, X_ERROR,
NV_NAME ": This driver cannot operate until it has been unloaded.\n");
@@ -934,11 +934,11 @@ NVPciProbe(DriverPtr drv, int entity, st
name = pci_device_get_device_name(dev);
if(name)
xf86DrvMsg(0, X_WARNING,
- NV_NAME ": Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
+ NV_NAME ": Ignoring unsupported device 0x%"PRIx32" (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
id, name, dev->bus, dev->domain, dev->dev, dev->func);
else
xf86DrvMsg(0, X_WARNING,
- NV_NAME ": Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n",
+ NV_NAME ": Ignoring unsupported device 0x%"PRIx32" at %2.2d@%2.2d:%2.2d:%1.1d\n",
id, dev->bus, dev->domain, dev->dev, dev->func);
return FALSE;
}
CVS commit: xsrc/external/mit/xf86-video-radeonhd/dist/src
Module Name:xsrc
Committed By: riastradh
Date: Fri Aug 15 15:16:35 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-radeonhd/dist/src: r6xx_accel.h
rhd_video.h
Log Message:
Nuke bogus redefinitions of uint32/64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2 xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.2
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2 Mon Nov 9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h Fri Aug 15 15:16:35 2014
@@ -3,10 +3,6 @@
#include "xf86drm.h"
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
/* r600_exa.c */
Bool R6xxEXAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
void R6xxEXACloseScreen(ScreenPtr pScreen);
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3 xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.2
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3 Mon Nov 9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h Fri Aug 15 15:16:35 2014
@@ -26,10 +26,6 @@
#ifndef _RHD_VIDEO_H
#define _RHD_VIDEO_H
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
enum RHDXvColorSpace {
RHD_XV_COLOR_SPACE_AUTODETECT,
RHD_XV_COLOR_SPACE_REC601,
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Fri Aug 15 15:32:24 UTC 2014 Modified Files: src/sys/net: if_bridge.c Log Message: bridge: reject non-IFF_SIMPLEX interfaces bridge does not work with !IFF_SIMPLEX interfaces (PR/18035); the bug is not yet fixed. Until it gets fixed, we should reject non-IFF_SIMPLEX interfaces. Discussed with pooka@ To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/net/if_bridge.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_bridge.c diff -u src/sys/net/if_bridge.c:1.90 src/sys/net/if_bridge.c:1.91 --- src/sys/net/if_bridge.c:1.90 Wed Jul 23 05:32:23 2014 +++ src/sys/net/if_bridge.c Fri Aug 15 15:32:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bridge.c,v 1.90 2014/07/23 05:32:23 ozaki-r Exp $ */ +/* $NetBSD: if_bridge.c,v 1.91 2014/08/15 15:32:24 ozaki-r Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -80,7 +80,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.90 2014/07/23 05:32:23 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.91 2014/08/15 15:32:24 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_bridge_ipf.h" @@ -800,6 +800,10 @@ bridge_ioctl_add(struct bridge_softc *sc if (ifs->if_input != ether_input) return EINVAL; + /* FIXME: doesn't work with non-IFF_SIMPLEX interfaces */ + if ((ifs->if_flags & IFF_SIMPLEX) == 0) + return EINVAL; + bif = malloc(sizeof(*bif), M_DEVBUF, M_NOWAIT); if (bif == NULL) return (ENOMEM);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: justin Date: Fri Aug 15 17:45:00 UTC 2014 Modified Files: src/sys/rump/librump/rumpkern: hyperentropy.c Log Message: add sys/atomic.h and order headers correctly To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.4 src/sys/rump/librump/rumpkern/hyperentropy.c:1.5 --- src/sys/rump/librump/rumpkern/hyperentropy.c:1.4 Fri Aug 15 15:04:33 2014 +++ src/sys/rump/librump/rumpkern/hyperentropy.c Fri Aug 15 17:45:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hyperentropy.c,v 1.4 2014/08/15 15:04:33 riastradh Exp $ */ +/* $NetBSD: hyperentropy.c,v 1.5 2014/08/15 17:45:00 justin Exp $ */ /* * Copyright (c) 2014 Antti Kantee. All Rights Reserved. @@ -25,11 +25,12 @@ * SUCH DAMAGE. */ -#include -__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.4 2014/08/15 15:04:33 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.5 2014/08/15 17:45:00 justin Exp $"); -#include +#include +#include #include +#include #include #include
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: justin Date: Fri Aug 15 18:23:42 UTC 2014 Modified Files: src/sys/rump/librump/rumpkern: hyperentropy.c Log Message: Fix header ordering To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.5 src/sys/rump/librump/rumpkern/hyperentropy.c:1.6 --- src/sys/rump/librump/rumpkern/hyperentropy.c:1.5 Fri Aug 15 17:45:00 2014 +++ src/sys/rump/librump/rumpkern/hyperentropy.c Fri Aug 15 18:23:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hyperentropy.c,v 1.5 2014/08/15 17:45:00 justin Exp $ */ +/* $NetBSD: hyperentropy.c,v 1.6 2014/08/15 18:23:42 justin Exp $ */ /* * Copyright (c) 2014 Antti Kantee. All Rights Reserved. @@ -25,10 +25,10 @@ * SUCH DAMAGE. */ -__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.5 2014/08/15 17:45:00 justin Exp $"); +#include +__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.6 2014/08/15 18:23:42 justin Exp $"); #include -#include #include #include #include
CVS commit: src
Module Name:src
Committed By: apb
Date: Fri Aug 15 18:34:19 UTC 2014
Modified Files:
src: build.sh
Log Message:
Only the -m command line option, not MACHINE from the environment,
is supposed override MACHINE_ARCH from the environment with the
default MACHINE_ARCH for the requested machine.
Add and use an opt_m variable to enforce this.
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.294 src/build.sh:1.295
--- src/build.sh:1.294 Sun Aug 10 05:56:36 2014
+++ src/build.sh Fri Aug 15 18:34:19 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.294 2014/08/10 05:56:36 matt Exp $
+# $NetBSD: build.sh,v 1.295 2014/08/15 18:34:19 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1100,6 +1100,7 @@ parseoptions()
{
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
opt_a=false
+ opt_m=false
if type getopts >/dev/null 2>&1; then
# Use POSIX getopts.
@@ -1177,6 +1178,7 @@ parseoptions()
-m)
eval ${optargcmd}
MACHINE="${OPTARG}"
+ opt_m=true
;;
-N)
@@ -1372,16 +1374,17 @@ parseoptions()
# Set up MACHINE*. On a NetBSD host, these are allowed to be unset.
#
- # MACHINE_ARCH from the environment may be overridden by getarch
- # (based on the MACHINE), but MACHINE_ARCH from the -a option should
- # not be overridden.
- #
if [ -z "${MACHINE}" ]; then
[ "${uname_s}" = "NetBSD" ] ||
bomb "MACHINE must be set, or -m must be used, for cross builds."
MACHINE=${uname_m}
fi
- $opt_a || getarch
+ if $opt_m && ! $opt_a; then
+ # Settings implied by the command line -m option
+ # override MACHINE_ARCH from the environment (if any).
+ getarch
+ fi
+ [ -n "${MACHINE_ARCH}" ] || getarch
validatearch
# Set up default make(1) environment.
@@ -1864,7 +1867,7 @@ createmakewrapper()
eval cat <
CVS commit: src/libexec/httpd
Module Name:src Committed By: mbalmer Date: Fri Aug 15 19:35:28 UTC 2014 Modified Files: src/libexec/httpd: lua-bozo.c Log Message: NUL terminate a string. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/libexec/httpd/lua-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/lua-bozo.c diff -u src/libexec/httpd/lua-bozo.c:1.10 src/libexec/httpd/lua-bozo.c:1.11 --- src/libexec/httpd/lua-bozo.c:1.10 Sat Jul 19 18:38:34 2014 +++ src/libexec/httpd/lua-bozo.c Fri Aug 15 19:35:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lua-bozo.c,v 1.10 2014/07/19 18:38:34 lneto Exp $ */ +/* $NetBSD: lua-bozo.c,v 1.11 2014/08/15 19:35:28 mbalmer Exp $ */ /* * Copyright (c) 2013 Marc Balmer @@ -276,6 +276,7 @@ lua_url_decode(lua_State *L, char *s) *q++ = *p; } } + *q = '\0'; lua_pushstring(L, val); lua_setfield(L, -2, s); free(val);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: riastradh Date: Fri Aug 15 19:47:59 UTC 2014 Modified Files: src/sys/rump/librump/rumpkern: hyperentropy.c Log Message: comes first, per /usr/share/misc/style. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.6 src/sys/rump/librump/rumpkern/hyperentropy.c:1.7 --- src/sys/rump/librump/rumpkern/hyperentropy.c:1.6 Fri Aug 15 18:23:42 2014 +++ src/sys/rump/librump/rumpkern/hyperentropy.c Fri Aug 15 19:47:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hyperentropy.c,v 1.6 2014/08/15 18:23:42 justin Exp $ */ +/* $NetBSD: hyperentropy.c,v 1.7 2014/08/15 19:47:59 riastradh Exp $ */ /* * Copyright (c) 2014 Antti Kantee. All Rights Reserved. @@ -26,11 +26,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.6 2014/08/15 18:23:42 justin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.7 2014/08/15 19:47:59 riastradh Exp $"); +#include #include #include -#include #include #include
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: nakayama
Date: Fri Aug 15 19:55:23 UTC 2014
Modified Files:
src/sys/dev/isa: ess.c
Log Message:
Remove redundant colon.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/isa/ess.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/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.80 src/sys/dev/isa/ess.c:1.81
--- src/sys/dev/isa/ess.c:1.80 Thu Nov 24 03:35:57 2011
+++ src/sys/dev/isa/ess.c Fri Aug 15 19:55:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $ */
+/* $NetBSD: ess.c,v 1.81 2014/08/15 19:55:23 nakayama Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.81 2014/08/15 19:55:23 nakayama Exp $");
#include
#include
@@ -920,7 +920,7 @@ essattach(struct ess_softc *sc, int enab
return;
}
- aprint_normal(": ESS Technology ES%s [version 0x%04x]\n",
+ aprint_normal("ESS Technology ES%s [version 0x%04x]\n",
essmodel[sc->sc_model], sc->sc_version);
callout_init(&sc->sc_poll1_ch, CALLOUT_MPSAFE);
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: jmcneill
Date: Fri Aug 15 22:58:11 UTC 2014
Modified Files:
src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl
Log Message:
remove trailing colon from "addusername" msg
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.en src/usr.sbin/sysinst/msg.mi.es \
src/usr.sbin/sysinst/msg.mi.fr src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.2 src/usr.sbin/sysinst/msg.mi.de:1.3
--- src/usr.sbin/sysinst/msg.mi.de:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mi.de Fri Aug 15 22:58:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1260,7 +1260,7 @@ message lvmlv_mirrors_ask {Spiegel?}
message lvmlv_regsiz_ask {MirrorLogRegionSize?}
message lvmlv_readahsect_ask {ReadAheadSectors?}
message lvmlv_stripes_ask {Stripes?}
-message addusername {8 character username to add:}
+message addusername {8 character username to add}
message addusertowheel {Do you wish to add this user to group wheel?}
message Delete_partition
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.2 src/usr.sbin/sysinst/msg.mi.en:1.3
--- src/usr.sbin/sysinst/msg.mi.en:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mi.en Fri Aug 15 22:58:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1194,7 +1194,7 @@ message lvmlv_regsiz_ask {MirrorLogRegio
message lvmlv_readahsect_ask {ReadAheadSectors?}
message lvmlv_stripes_ask {Stripes?}
-message addusername {8 character username to add:}
+message addusername {8 character username to add}
message addusertowheel {Do you wish to add this user to group wheel?}
message Delete_partition
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.2 src/usr.sbin/sysinst/msg.mi.es:1.3
--- src/usr.sbin/sysinst/msg.mi.es:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mi.es Fri Aug 15 22:58:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1242,7 +1242,7 @@ message lvmlv_regsiz_ask {MirrorLogRegio
message lvmlv_readahsect_ask {ReadAheadSectors?}
message lvmlv_stripes_ask {Rayas?}
-message addusername {8 character username to add:}
+message addusername {8 character username to add}
message addusertowheel {Do you wish to add this user to group wheel?}
message Delete_partition
{Borrar partición}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.2 src/usr.sbin/sysinst/msg.mi.fr:1.3
--- src/usr.sbin/sysinst/msg.mi.fr:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mi.fr Fri Aug 15 22:58:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1303,7 +1303,7 @@ message lvmlv_regsiz_ask {MirrorLogRegio
message lvmlv_readahsect_ask {ReadAheadSectors?}
message lvmlv_stripes_ask {Stripes?}
-message addusername {8 character username to add:}
+message addusername {8 character username to add}
message addusertowheel {Do you wish to add this user to group wheel?}
message Delete_partition
{Supprimer la partition}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.2 src/usr.sbin/sysinst/msg.mi.pl:1.3
--- src/usr.sbin/sysinst/msg.mi.pl:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mi.pl Fri Aug 15 22:58:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -1198,7 +1198,7 @@ message lvmlv_regsiz_ask {MirrorLogRegio
message lvmlv_readahsect_ask {ReadAheadSectors?}
message lvmlv_stripes_ask {Stripes?}
-message addusername {8 character username to add:}
+message addusername {8 character username to add}
message addusertowheel {Do you wish to add this user to group wheel?}
message Delete_partition
{Usun partycje}
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 22:55:21 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1917. To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.65 src/doc/CHANGES-5.3:1.1.2.66 --- src/doc/CHANGES-5.3:1.1.2.65 Fri Aug 8 06:58:49 2014 +++ src/doc/CHANGES-5.3 Fri Aug 15 22:55:21 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.65 2014/08/08 06:58:49 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.66 2014/08/15 22:55:21 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -938,3 +938,32 @@ sys/compat/linux32/common/linux32_socket If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@. [maxv, ticket #1916] + +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1917] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:06:37 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Ticket 1917. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.2.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.13 src/doc/CHANGES-5.2.3:1.1.2.14 --- src/doc/CHANGES-5.2.3:1.1.2.13 Fri Aug 8 06:59:13 2014 +++ src/doc/CHANGES-5.2.3 Fri Aug 15 23:06:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.13 2014/08/08 06:59:13 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.14 2014/08/15 23:06:37 riz Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -196,3 +196,31 @@ sys/compat/linux32/common/linux32_socket If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@. [maxv, ticket #1916] +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1917] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:03:35 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Ticket 1917 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.5 diff -u src/doc/CHANGES-5.1.5:1.1.2.13 src/doc/CHANGES-5.1.5:1.1.2.14 --- src/doc/CHANGES-5.1.5:1.1.2.13 Fri Aug 8 06:59:32 2014 +++ src/doc/CHANGES-5.1.5 Fri Aug 15 23:03:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.5,v 1.1.2.13 2014/08/08 06:59:32 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.14 2014/08/15 23:03:35 riz Exp $ A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 release: @@ -196,3 +196,32 @@ sys/compat/linux32/common/linux32_socket If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@. [maxv, ticket #1916] + +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1917] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:07:24 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Fix whitespace in previous. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-5.2.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.14 src/doc/CHANGES-5.2.3:1.1.2.15 --- src/doc/CHANGES-5.2.3:1.1.2.14 Fri Aug 15 23:06:37 2014 +++ src/doc/CHANGES-5.2.3 Fri Aug 15 23:07:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.14 2014/08/15 23:06:37 riz Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.15 2014/08/15 23:07:24 riz Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -196,6 +196,7 @@ sys/compat/linux32/common/linux32_socket If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@. [maxv, ticket #1916] + distrib/sets/lists/base/mipatch doc/3RDPARTY patch share/zoneinfo/Makefile patch
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:34:53 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1107 To generate a diff of this commit: cvs rdiff -u -r1.1.2.128 -r1.1.2.129 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.128 src/doc/CHANGES-6.2:1.1.2.129 --- src/doc/CHANGES-6.2:1.1.2.128 Fri Aug 15 08:43:06 2014 +++ src/doc/CHANGES-6.2 Fri Aug 15 23:34:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.128 2014/08/15 08:43:06 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.129 2014/08/15 23:34:53 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -3655,3 +3655,32 @@ distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch [spz, ticket #] + +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1107] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:37:31 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: ticket 1107 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.0.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.6 diff -u src/doc/CHANGES-6.0.6:1.1.2.20 src/doc/CHANGES-6.0.6:1.1.2.21 --- src/doc/CHANGES-6.0.6:1.1.2.20 Fri Aug 15 08:43:44 2014 +++ src/doc/CHANGES-6.0.6 Fri Aug 15 23:37:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.6,v 1.1.2.20 2014/08/15 08:43:44 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.6,v 1.1.2.21 2014/08/15 23:37:31 riz Exp $ A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6 release: @@ -1250,3 +1250,32 @@ distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch [spz, ticket #] + +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1107] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:39:46 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket 1107 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.20 src/doc/CHANGES-6.1.5:1.1.2.21 --- src/doc/CHANGES-6.1.5:1.1.2.20 Fri Aug 15 08:43:26 2014 +++ src/doc/CHANGES-6.1.5 Fri Aug 15 23:39:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.20 2014/08/15 08:43:26 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.21 2014/08/15 23:39:46 riz Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -1250,3 +1250,32 @@ distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch [spz, ticket #] + +distrib/sets/lists/base/mipatch +doc/3RDPARTY patch +share/zoneinfo/Makefile patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leap-seconds.list patch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch +share/zoneinfo/zone1970.tabpatch + + Update timezone database from tzdata2014c to tzdata2014f. + This adds two new timezones (Asia/Chita and Asia/Srednekolymsk), + updates many other timezones, and adds two new + data files in the /usr/share/zoneinfo directory (leapseconds + and zone1970.dat). + [apb, ticket #1107] +
CVS commit: [netbsd-7] src/sys/kern
Module Name:src Committed By: riz Date: Fri Aug 15 23:57:51 UTC 2014 Modified Files: src/sys/kern [netbsd-7]: subr_prf.c Log Message: Pull up following revision(s) (requested by apb in ticket #26): sys/kern/subr_prf.c: revision 1.156 If mutex_tryenter() fails, don't call mutex_exit(). To generate a diff of this commit: cvs rdiff -u -r1.154.2.1 -r1.154.2.2 src/sys/kern/subr_prf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_prf.c diff -u src/sys/kern/subr_prf.c:1.154.2.1 src/sys/kern/subr_prf.c:1.154.2.2 --- src/sys/kern/subr_prf.c:1.154.2.1 Fri Aug 15 13:00:48 2014 +++ src/sys/kern/subr_prf.c Fri Aug 15 23:57:51 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $ */ +/* $NetBSD: subr_prf.c,v 1.154.2.2 2014/08/15 23:57:51 riz Exp $ */ /*- * Copyright (c) 1986, 1988, 1991, 1993 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154.2.2 2014/08/15 23:57:51 riz Exp $"); #include "opt_ddb.h" #include "opt_ipkdb.h" @@ -161,8 +161,8 @@ static void kprintf_rnd_get(size_t bytes /* This is optional but seems useful. */ SHA512_Update(&kprnd_sha, kprnd_accum, sizeof(kprnd_accum)); + mutex_exit(&kprintf_mtx); } - mutex_exit(&kprintf_mtx); } }
CVS commit: [netbsd-7] src
Module Name:src
Committed By: riz
Date: Fri Aug 15 23:59:25 UTC 2014
Modified Files:
src [netbsd-7]: build.sh
Log Message:
Pull up following revision(s) (requested by apb in ticket #27):
build.sh: revision 1.295
Only the -m command line option, not MACHINE from the environment,
is supposed override MACHINE_ARCH from the environment with the
default MACHINE_ARCH for the requested machine.
Add and use an opt_m variable to enforce this.
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.294.2.1 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.294 src/build.sh:1.294.2.1
--- src/build.sh:1.294 Sun Aug 10 05:56:36 2014
+++ src/build.sh Fri Aug 15 23:59:24 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.294 2014/08/10 05:56:36 matt Exp $
+# $NetBSD: build.sh,v 1.294.2.1 2014/08/15 23:59:24 riz Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1100,6 +1100,7 @@ parseoptions()
{
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
opt_a=false
+ opt_m=false
if type getopts >/dev/null 2>&1; then
# Use POSIX getopts.
@@ -1177,6 +1178,7 @@ parseoptions()
-m)
eval ${optargcmd}
MACHINE="${OPTARG}"
+ opt_m=true
;;
-N)
@@ -1372,16 +1374,17 @@ parseoptions()
# Set up MACHINE*. On a NetBSD host, these are allowed to be unset.
#
- # MACHINE_ARCH from the environment may be overridden by getarch
- # (based on the MACHINE), but MACHINE_ARCH from the -a option should
- # not be overridden.
- #
if [ -z "${MACHINE}" ]; then
[ "${uname_s}" = "NetBSD" ] ||
bomb "MACHINE must be set, or -m must be used, for cross builds."
MACHINE=${uname_m}
fi
- $opt_a || getarch
+ if $opt_m && ! $opt_a; then
+ # Settings implied by the command line -m option
+ # override MACHINE_ARCH from the environment (if any).
+ getarch
+ fi
+ [ -n "${MACHINE_ARCH}" ] || getarch
validatearch
# Set up default make(1) environment.
@@ -1864,7 +1867,7 @@ createmakewrapper()
eval cat <
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: riz Date: Fri Aug 15 23:59:40 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 26, 27 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 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.10 src/doc/CHANGES-7.0:1.1.2.11 --- src/doc/CHANGES-7.0:1.1.2.10 Fri Aug 15 13:07:37 2014 +++ src/doc/CHANGES-7.0 Fri Aug 15 23:59:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.10 2014/08/15 13:07:37 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.11 2014/08/15 23:59:39 riz Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -176,3 +176,15 @@ xsrc/external/mit/libdrm/dist/radeon/rad convert an mmap() to drmMap(). [mrg, ticket #25] +sys/kern/subr_prf.c1.156 + + If mutex_tryenter() fails, don't call mutex_exit(). + [apb, ticket #26] + +build.sh 1.295 + + Only the -m command line option, not MACHINE from the environment, + is supposed override MACHINE_ARCH from the environment with the + default MACHINE_ARCH for the requested machine. + [apb, ticket #27] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Sat Aug 16 00:56:58 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Add missing description for ticket #. To generate a diff of this commit: cvs rdiff -u -r1.1.2.129 -r1.1.2.130 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.129 src/doc/CHANGES-6.2:1.1.2.130 --- src/doc/CHANGES-6.2:1.1.2.129 Fri Aug 15 23:34:53 2014 +++ src/doc/CHANGES-6.2 Sat Aug 16 00:56:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.129 2014/08/15 23:34:53 riz Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.130 2014/08/16 00:56:58 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -3654,6 +3654,7 @@ distrib/sets/lists/comp/mipatch distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch + Update openssl to 1.0.1i. [spz, ticket #] distrib/sets/lists/base/mipatch
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Sat Aug 16 00:58:45 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Add missing description for ticket #. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.21 src/doc/CHANGES-6.1.5:1.1.2.22 --- src/doc/CHANGES-6.1.5:1.1.2.21 Fri Aug 15 23:39:46 2014 +++ src/doc/CHANGES-6.1.5 Sat Aug 16 00:58:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.21 2014/08/15 23:39:46 riz Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.22 2014/08/16 00:58:45 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -1249,6 +1249,7 @@ distrib/sets/lists/comp/mipatch distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch + Update openssl to 1.0.1i. [spz, ticket #] distrib/sets/lists/base/mipatch
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Sat Aug 16 00:59:29 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: Add missing description for ticket #. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.0.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.6 diff -u src/doc/CHANGES-6.0.6:1.1.2.21 src/doc/CHANGES-6.0.6:1.1.2.22 --- src/doc/CHANGES-6.0.6:1.1.2.21 Fri Aug 15 23:37:31 2014 +++ src/doc/CHANGES-6.0.6 Sat Aug 16 00:59:29 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.6,v 1.1.2.21 2014/08/15 23:37:31 riz Exp $ +# $NetBSD: CHANGES-6.0.6,v 1.1.2.22 2014/08/16 00:59:29 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6 release: @@ -1249,6 +1249,7 @@ distrib/sets/lists/comp/mipatch distrib/sets/lists/comp/shl.mipatch doc/3RDPARTY patch + Update openssl to 1.0.1i. [spz, ticket #] distrib/sets/lists/base/mipatch
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: ozaki-r
Date: Sat Aug 16 06:18:01 UTC 2014
Modified Files:
src/sys/rump/net/lib/libshmif: shmifvar.h
Log Message:
Bump SHMIF_VERSION
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libshmif/shmifvar.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/net/lib/libshmif/shmifvar.h
diff -u src/sys/rump/net/lib/libshmif/shmifvar.h:1.8 src/sys/rump/net/lib/libshmif/shmifvar.h:1.9
--- src/sys/rump/net/lib/libshmif/shmifvar.h:1.8 Fri Aug 15 15:03:03 2014
+++ src/sys/rump/net/lib/libshmif/shmifvar.h Sat Aug 16 06:18:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmifvar.h,v 1.8 2014/08/15 15:03:03 ozaki-r Exp $ */
+/* $NetBSD: shmifvar.h,v 1.9 2014/08/16 06:18:01 ozaki-r Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#define _RUMP_NET_SHMIFVAR_H_
#define SHMIF_MAGIC 0xca11d054
-#define SHMIF_VERSION 2
+#define SHMIF_VERSION 3
struct shmif_mem {
uint32_t shm_magic;
