CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: he
Date: Thu Dec 25 23:52:00 UTC 2014
Modified Files:
src/dist/bind/bin/named [netbsd-5-0]: config.c query.c server.c
src/dist/bind/lib/dns [netbsd-5-0]: adb.c resolver.c
src/dist/bind/lib/dns/include/dns [netbsd-5-0]: adb.h resolver.h
src/dist/bind/lib/export/isc [netbsd-5-0]: Makefile.in
src/dist/bind/lib/isc [netbsd-5-0]: Makefile.in
src/dist/bind/lib/isc/include/isc [netbsd-5-0]: Makefile.in types.h
src/dist/bind/lib/isccfg [netbsd-5-0]: namedconf.c
src/lib/libisc [netbsd-5-0]: Makefile
src/usr.sbin/bind [netbsd-5-0]: Makefile.inc
Added Files:
src/dist/bind/lib/isc [netbsd-5-0]: counter.c
src/dist/bind/lib/isc/include/isc [netbsd-5-0]: counter.h
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.8.4 -r1.1.1.8.8.5 src/dist/bind/bin/named/config.c
cvs rdiff -u -r1.8.8.7 -r1.8.8.8 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.9.8.4 -r1.1.1.9.8.5 src/dist/bind/bin/named/server.c
cvs rdiff -u -r1.6.8.4 -r1.6.8.5 src/dist/bind/lib/dns/adb.c
cvs rdiff -u -r1.8.8.6 -r1.8.8.7 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.5.8.3 -r1.1.1.5.8.4 \
src/dist/bind/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \
src/dist/bind/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.1.6.4 -r1.1.6.5 src/dist/bind/lib/export/isc/Makefile.in
cvs rdiff -u -r1.1.1.6.8.4 -r1.1.1.6.8.5 src/dist/bind/lib/isc/Makefile.in
cvs rdiff -u -r0 -r1.1.8.2 src/dist/bind/lib/isc/counter.c
cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \
src/dist/bind/lib/isc/include/isc/Makefile.in \
src/dist/bind/lib/isc/include/isc/types.h
cvs rdiff -u -r0 -r1.1.8.2 src/dist/bind/lib/isc/include/isc/counter.h
cvs rdiff -u -r1.1.1.7.8.4 -r1.1.1.7.8.5 src/dist/bind/lib/isccfg/namedconf.c
cvs rdiff -u -r1.2.8.2 -r1.2.8.3 src/lib/libisc/Makefile
cvs rdiff -u -r1.32.8.1 -r1.32.8.2 src/usr.sbin/bind/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/dist/bind/bin/named/config.c
diff -u src/dist/bind/bin/named/config.c:1.1.1.8.8.4 src/dist/bind/bin/named/config.c:1.1.1.8.8.5
--- src/dist/bind/bin/named/config.c:1.1.1.8.8.4 Wed Jul 25 12:02:49 2012
+++ src/dist/bind/bin/named/config.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.1.1.8.8.4 2012/07/25 12:02:49 jdc Exp $ */
+/* $NetBSD: config.c,v 1.1.1.8.8.5 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -75,6 +75,8 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {none;};\n\
match-mapped-addresses no;\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 50;\n\
memstatistics-file \named.memstats\;\n\
multiple-cnames no;\n\
# named-xfer obsolete;\n\
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.8.7 src/dist/bind/bin/named/query.c:1.8.8.8
--- src/dist/bind/bin/named/query.c:1.8.8.7 Wed Oct 17 20:50:14 2012
+++ src/dist/bind/bin/named/query.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.8.7 2012/10/17 20:50:14 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.8.8 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -3338,11 +3338,11 @@ query_recurse(ns_client_t *client, dns_r
peeraddr = client-peeraddr;
else
peeraddr = NULL;
- result = dns_resolver_createfetch2(client-view-resolver,
+ result = dns_resolver_createfetch3(client-view-resolver,
client-query.qname,
qtype, qdomain, nameservers,
NULL, peeraddr, client-message-id,
- client-query.fetchoptions,
+ client-query.fetchoptions, 0, NULL,
client-task,
query_resume, client,
rdataset, sigrdataset,
Index: src/dist/bind/bin/named/server.c
diff -u src/dist/bind/bin/named/server.c:1.1.1.9.8.4 src/dist/bind/bin/named/server.c:1.1.1.9.8.5
--- src/dist/bind/bin/named/server.c:1.1.1.9.8.4 Wed Jul 25 12:02:52 2012
+++ src/dist/bind/bin/named/server.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.1.1.9.8.4 2012/07/25 12:02:52 jdc Exp $ */
+/* $NetBSD: server.c,v 1.1.1.9.8.5 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1837,6 +1837,16 @@ configure_view(dns_view_t *view, cfg_obj
udpsize = 4096;
dns_resolver_setudpsize(view-resolver, (isc_uint16_t)udpsize);
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-depth, obj);
+ INSIST(result == ISC_R_SUCCESS);
+ dns_resolver_setmaxdepth(view-resolver, cfg_obj_asuint32(obj));
+
+ obj = NULL;
+ result = ns_config_get(maps,
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: he Date: Thu Dec 25 23:54:07 UTC 2014 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.93 -r1.1.2.94 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.93 src/doc/CHANGES-5.0.3:1.1.2.94 --- src/doc/CHANGES-5.0.3:1.1.2.93 Mon Jan 21 20:22:18 2013 +++ src/doc/CHANGES-5.0.3 Thu Dec 25 23:54:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.93 2013/01/21 20:22:18 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.94 2014/12/25 23:54:07 he Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5252,3 +5252,25 @@ sys/external/bsd/ipf/netinet/ip_fil_netb Fix off-by-one read error. [msaitoh, ticket #1840] +dist/bind/lib/isc/counter.c new, via patch +dist/bind/lib/isc/include/isc/counter.h new, via patch +dist/bind/bin/named/config.c patch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.c patch +dist/bind/lib/dns/adb.cpatch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/include/dns/adb.h patch +dist/bind/lib/dns/include/dns/resolver.h patch +dist/bind/lib/export/isc/Makefile.in patch +dist/bind/lib/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/types.h patch +dist/bind/lib/isccfg/namedconf.c patch +lib/libisc/Makefilepatch +usr.sbin/bind/Makefile.inc patch + + Apply fix for BIND, backported from the patch for 9.8.8 from ISC. + This is a fix for CVE-2014-8500, where a maliciously constructed + setup can cause BIND to issue an unlimited sequence of queries to + follow a delegation. + [spz, ticket #1937]
CVS commit: [netbsd-5-0] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:21:58 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-0]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.1.2.1 -r1.46.8.1.2.2 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.2 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 Mon May 11 20:03:08 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:21:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:22:18 UTC 2013 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.92 src/doc/CHANGES-5.0.3:1.1.2.93 --- src/doc/CHANGES-5.0.3:1.1.2.92 Sun Jan 13 17:17:46 2013 +++ src/doc/CHANGES-5.0.3 Mon Jan 21 20:22:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.92 2013/01/13 17:17:46 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.93 2013/01/21 20:22:18 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5247,3 +5247,8 @@ gnu/dist/grep/src/search.c 1.4 [apb, ticket #1838] +sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 1.4 via patch + + Fix off-by-one read error. + [msaitoh, ticket #1840] +
CVS commit: [netbsd-5-0] src/sys/dev
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 16:13:04 UTC 2013
Modified Files:
src/sys/dev [netbsd-5-0]: lockstat.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1826):
sys/dev/lockstat.c: revision 1.16
Fix off by one.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.16.1 src/sys/dev/lockstat.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/lockstat.c
diff -u src/sys/dev/lockstat.c:1.15 src/sys/dev/lockstat.c:1.15.16.1
--- src/sys/dev/lockstat.c:1.15 Mon Apr 28 20:23:46 2008
+++ src/sys/dev/lockstat.c Sun Jan 13 16:13:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $ */
+/* $NetBSD: lockstat.c,v 1.15.16.1 2013/01/13 16:13:03 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15.16.1 2013/01/13 16:13:03 bouyer Exp $);
#include sys/types.h
#include sys/param.h
@@ -270,7 +270,7 @@ lockstat_stop(lsdisable_t *ld)
cpuno = 0;
for (CPU_INFO_FOREACH(cii, ci)) {
- if (cpuno sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
+ if (cpuno = sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
log(LOG_WARNING, lockstat: too many CPUs\n);
break;
}
CVS commit: [netbsd-5-0] src/sys/dev/raidframe
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 16:15:06 UTC 2013
Modified Files:
src/sys/dev/raidframe [netbsd-5-0]: rf_driver.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1827):
sys/dev/raidframe/rf_driver.c: revision 1.131
Fix off by one read.
To generate a diff of this commit:
cvs rdiff -u -r1.118.10.1 -r1.118.10.1.2.1 src/sys/dev/raidframe/rf_driver.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/raidframe/rf_driver.c
diff -u src/sys/dev/raidframe/rf_driver.c:1.118.10.1 src/sys/dev/raidframe/rf_driver.c:1.118.10.1.2.1
--- src/sys/dev/raidframe/rf_driver.c:1.118.10.1 Tue Dec 23 04:03:00 2008
+++ src/sys/dev/raidframe/rf_driver.c Sun Jan 13 16:15:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.118.10.1 2008/12/23 04:03:00 snj Exp $ */
+/* $NetBSD: rf_driver.c,v 1.118.10.1.2.1 2013/01/13 16:15:06 bouyer Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.118.10.1 2008/12/23 04:03:00 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.118.10.1.2.1 2013/01/13 16:15:06 bouyer Exp $);
#include opt_raid_diagnostic.h
@@ -854,7 +854,7 @@ rf_ConfigureDebug(RF_Config_t *cfgPtr)
int i;
rf_ResetDebugOptions();
- for (i = 0; cfgPtr-debugVars[i][0] i RF_MAXDBGV; i++) {
+ for (i = 0; i RF_MAXDBGV cfgPtr-debugVars[i][0]; i++) {
name_p = rf_find_non_white(cfgPtr-debugVars[i][0]);
white_p = rf_find_white(name_p); /* skip to start of 2nd
* word */
CVS commit: [netbsd-5-0] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 16:29:00 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-5-0]: ubsa_common.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1830):
sys/dev/usb/ubsa_common.c: revision 1.9
Fix off by one read error.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/dev/usb/ubsa_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ubsa_common.c
diff -u src/sys/dev/usb/ubsa_common.c:1.4 src/sys/dev/usb/ubsa_common.c:1.4.14.1
--- src/sys/dev/usb/ubsa_common.c:1.4 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/ubsa_common.c Sun Jan 13 16:29:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa_common.c,v 1.4 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: ubsa_common.c,v 1.4.14.1 2013/01/13 16:29:00 bouyer Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev kan.FreeBSD.org.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ubsa_common.c,v 1.4 2008/05/24 16:40:58 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: ubsa_common.c,v 1.4.14.1 2013/01/13 16:29:00 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -112,7 +112,7 @@ ubsa_request(struct ubsa_softc *sc, int
else
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
- if (portno UBSA_MAXCONN) {
+ if (portno = UBSA_MAXCONN) {
printf(%s: ubsa_request: invalid port(%d)#\n,
USBDEVNAME(sc-sc_dev), portno);
return USBD_INVAL;
CVS commit: [netbsd-5-0] src/sys/external/bsd/drm/dist/shared-core
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 16:32:25 UTC 2013
Modified Files:
src/sys/external/bsd/drm/dist/shared-core [netbsd-5-0]: i915_suspend.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1831):
sys/external/bsd/drm/dist/shared-core/i915_suspend.c: revision 1.6
Fix wrong reference to dev_priv-saveSWF1. It was clearly wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.16.1 \
src/sys/external/bsd/drm/dist/shared-core/i915_suspend.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/drm/dist/shared-core/i915_suspend.c
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3 src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3.16.1
--- src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3 Sat Jul 19 22:14:13 2008
+++ src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c Sun Jan 13 16:32:25 2013
@@ -513,7 +513,7 @@ int i915_restore_state(struct drm_device
for (i = 0; i 16; i++) {
I915_WRITE(SWF00 + (i 2), dev_priv-saveSWF0[i]);
- I915_WRITE(SWF10 + (i 2), dev_priv-saveSWF1[i+7]);
+ I915_WRITE(SWF10 + (i 2), dev_priv-saveSWF1[i]);
}
for (i = 0; i 3; i++)
I915_WRITE(SWF30 + (i 2), dev_priv-saveSWF2[i]);
CVS commit: [netbsd-5-0] src/sbin/fsck_ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 16:55:07 UTC 2013
Modified Files:
src/sbin/fsck_ffs [netbsd-5-0]: pass1.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1837):
sbin/fsck_ffs/pass1.c: revision 1.50
Show pass1 SIGINFO output on stderr like other passes, not on stdout.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.6.1 src/sbin/fsck_ffs/pass1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/pass1.c
diff -u src/sbin/fsck_ffs/pass1.c:1.46 src/sbin/fsck_ffs/pass1.c:1.46.6.1
--- src/sbin/fsck_ffs/pass1.c:1.46 Sun Oct 12 23:26:12 2008
+++ src/sbin/fsck_ffs/pass1.c Sun Jan 13 16:55:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.46 2008/10/12 23:26:12 christos Exp $ */
+/* $NetBSD: pass1.c,v 1.46.6.1 2013/01/13 16:55:06 bouyer Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)pass1.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: pass1.c,v 1.46 2008/10/12 23:26:12 christos Exp $);
+__RCSID($NetBSD: pass1.c,v 1.46.6.1 2013/01/13 16:55:06 bouyer Exp $);
#endif
#endif /* not lint */
@@ -109,7 +109,8 @@ pass1(void)
else
inosused = sblock-fs_ipg;
if (got_siginfo) {
- printf(%s: phase 1: cyl group %d of %d (%d%%)\n,
+ fprintf(stderr,
+ %s: phase 1: cyl group %d of %d (%d%%)\n,
cdevname(), c, sblock-fs_ncg,
c * 100 / sblock-fs_ncg);
got_siginfo = 0;
CVS commit: [netbsd-5-0] src/etc/namedb
Module Name:src Committed By: bouyer Date: Sun Jan 13 17:07:35 UTC 2013 Modified Files: src/etc/namedb [netbsd-5-0]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1839): etc/namedb/root.cache: revision 1.17 D.ROOT-SERVERS.NET changes IPv4 address. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.16.1 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.13 src/etc/namedb/root.cache:1.13.16.1 --- src/etc/namedb/root.cache:1.13 Tue Feb 5 09:19:06 2008 +++ src/etc/namedb/root.cache Sun Jan 13 17:07:34 2013 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.13 2008/02/05 09:19:06 tron Exp $ +; $NetBSD: root.cache,v 1.13.16.1 2013/01/13 17:07:34 bouyer Exp $ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers @@ -33,7 +33,8 @@ C.ROOT-SERVERS.NET. 360 A ; formerly TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. -D.ROOT-SERVERS.NET. 360 A 128.8.10.90 +D.ROOT-SERVERS.NET. 360 A 199.7.91.13 +D.ROOT-SERVERS.NET. 360 2001:500:2D::D ; ; formerly NS.NASA.GOV ;
CVS commit: [netbsd-5-0] src/gnu/dist/grep
Module Name:src
Committed By: bouyer
Date: Sun Jan 13 17:14:47 UTC 2013
Modified Files:
src/gnu/dist/grep/lib [netbsd-5-0]: getopt.c regex.c
src/gnu/dist/grep/src [netbsd-5-0]: ansi2knr.c dfa.c grep.c search.c
Log Message:
Pull up following revision(s) (requested by apb in ticket #1838):
gnu/dist/grep/src/grep.c: revision 1.14
gnu/dist/grep/src/ansi2knr.c: revision 1.2
gnu/dist/grep/src/search.c: revision 1.4
gnu/dist/grep/src/dfa.c: revision 1.3
gnu/dist/grep/lib/getopt.c: revision 1.2
gnu/dist/grep/lib/regex.c: revision 1.2
Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.
This change to NetBSD's version of GNU grep 2.5.1 (licenced under
GPLv2) was made without direct reference to any code licenced
under GPLv3.
Thanks to Ignatios Souvatzis for looking at GPLv3-derived
patches and describing the problem in general terms. Thanks to
pkgsrc/devel/coccinelle for helping me find places where int
variables were used to store the results from pointer arithmetic
or strlen(). Thanks to Martin Husemann for testing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 src/gnu/dist/grep/lib/getopt.c \
src/gnu/dist/grep/lib/regex.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 src/gnu/dist/grep/src/ansi2knr.c
cvs rdiff -u -r1.2 -r1.2.42.1 src/gnu/dist/grep/src/dfa.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/gnu/dist/grep/src/grep.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/gnu/dist/grep/src/search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/grep/lib/getopt.c
diff -u src/gnu/dist/grep/lib/getopt.c:1.1.1.1 src/gnu/dist/grep/lib/getopt.c:1.1.1.1.42.1
--- src/gnu/dist/grep/lib/getopt.c:1.1.1.1 Sun Jan 26 23:15:12 2003
+++ src/gnu/dist/grep/lib/getopt.c Sun Jan 13 17:14:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt.c,v 1.1.1.1 2003/01/26 23:15:12 wiz Exp $ */
+/* $NetBSD: getopt.c,v 1.1.1.1.42.1 2013/01/13 17:14:47 bouyer Exp $ */
/* Getopt for GNU.
NOTE: The canonical source of this file is maintained with the GNU
@@ -431,7 +431,7 @@ _getopt_initialize (argc, argv, optstrin
else
{
const char *orig_str = __getopt_nonoption_flags;
- int len = nonoption_flags_max_len = strlen (orig_str);
+ size_t len = nonoption_flags_max_len = strlen (orig_str);
if (nonoption_flags_max_len argc)
nonoption_flags_max_len = argc;
__getopt_nonoption_flags =
Index: src/gnu/dist/grep/lib/regex.c
diff -u src/gnu/dist/grep/lib/regex.c:1.1.1.1 src/gnu/dist/grep/lib/regex.c:1.1.1.1.42.1
--- src/gnu/dist/grep/lib/regex.c:1.1.1.1 Sun Jan 26 23:15:13 2003
+++ src/gnu/dist/grep/lib/regex.c Sun Jan 13 17:14:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: regex.c,v 1.1.1.1 2003/01/26 23:15:13 wiz Exp $ */
+/* $NetBSD: regex.c,v 1.1.1.1.42.1 2013/01/13 17:14:47 bouyer Exp $ */
/* Extended regular expression matching and search library,
version 0.12.
@@ -1127,7 +1127,7 @@ print_double_string (where, string1, siz
int size1;
int size2;
{
- int this_char;
+ ptrdiff_t this_char;
if (where == NULL)
printf ((null));
Index: src/gnu/dist/grep/src/ansi2knr.c
diff -u src/gnu/dist/grep/src/ansi2knr.c:1.1.1.1 src/gnu/dist/grep/src/ansi2knr.c:1.1.1.1.42.1
--- src/gnu/dist/grep/src/ansi2knr.c:1.1.1.1 Sun Jan 26 23:15:29 2003
+++ src/gnu/dist/grep/src/ansi2knr.c Sun Jan 13 17:14:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi2knr.c,v 1.1.1.1 2003/01/26 23:15:29 wiz Exp $ */
+/* $NetBSD: ansi2knr.c,v 1.1.1.1.42.1 2013/01/13 17:14:47 bouyer Exp $ */
/* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises. All rights reserved. */
@@ -461,7 +461,7 @@ test1(buf)
}
{
char *id = p;
- int len;
+ ptrdiff_t len;
/*
* Check for identifier1(identifier2) and not
* identifier1(void), or identifier1(identifier2, ).
Index: src/gnu/dist/grep/src/dfa.c
diff -u src/gnu/dist/grep/src/dfa.c:1.2 src/gnu/dist/grep/src/dfa.c:1.2.42.1
--- src/gnu/dist/grep/src/dfa.c:1.2 Sun Jan 26 23:55:52 2003
+++ src/gnu/dist/grep/src/dfa.c Sun Jan 13 17:14:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dfa.c,v 1.2 2003/01/26 23:55:52 wiz Exp $ */
+/* $NetBSD: dfa.c,v 1.2.42.1 2013/01/13 17:14:47 bouyer Exp $ */
/* dfa.c - deterministic extended regexp routines for GNU
Copyright 1988, 1998, 2000 Free Software Foundation, Inc.
@@ -334,9 +334,10 @@ static int hard_LC_COLLATE; /* Nonzero i
#ifdef MBS_SUPPORT
/* These variables are used only if (MB_CUR_MAX 1). */
static mbstate_t mbs; /* Mbstate for mbrlen(). */
-static int cur_mb_len; /* Byte length of the current scanning
- multibyte character. */
-static int cur_mb_index;/* Byte index of the current scanning multibyte
+static ssize_t cur_mb_len; /* Byte length of the current
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 13 17:17:46 UTC 2013 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1826, 1827, 1830, 1831, 1837, 1839, 1838 To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.91 src/doc/CHANGES-5.0.3:1.1.2.92 --- src/doc/CHANGES-5.0.3:1.1.2.91 Mon Nov 26 20:01:48 2012 +++ src/doc/CHANGES-5.0.3 Sun Jan 13 17:17:46 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.91 2012/11/26 20:01:48 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.92 2013/01/13 17:17:46 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5203,3 +5203,47 @@ xsrc/external/mit/expat/dist/xmlwf/readf Address CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876. [spz, ticket #1821] +sys/dev/lockstat.c1.16 + + Fix off by one. + [msaitoh, ticket #1826] + +sys/dev/raidframe/rf_driver.c 1.131 + + Fix off by one read. + [msaitoh, ticket #1827] + +sys/dev/usb/ubsa_common.c 1.9 + + Fix off by one read error. + [msaitoh, ticket #1830] + +sys/external/bsd/drm/dist/shared-core/i915_suspend.c 1.6 + + Fix wrong reference to dev_priv-saveSWF1. It was clearly wrong. + [msaitoh, ticket #1831] + +sbin/fsck_ffs/pass1.c1.50 + + Show pass1 SIGINFO output on stderr like other passes, not on stdout. + [riastradh, ticket #1837] + +etc/namedb/root.cache1.17 + + D.ROOT-SERVERS.NET changes IPv4 address. + [taca, ticket #1839] + +gnu/dist/grep/lib/getopt.c 1.2 +gnu/dist/grep/lib/regex.c 1.2 +gnu/dist/grep/src/ansi2knr.c 1.2 +gnu/dist/grep/src/dfa.c1.3 +gnu/dist/grep/src/grep.c 1.14 +gnu/dist/grep/src/search.c 1.4 + + Change several int variables to size_t, ssize_t, or ptrdiff_t. + This should fix the bug described in CVE-2012-5667 when an input + line is so long that its length cannot be stored in an int + variable. + + [apb, ticket #1838] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Mon Nov 26 20:01:49 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1821. To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.90 src/doc/CHANGES-5.0.3:1.1.2.91 --- src/doc/CHANGES-5.0.3:1.1.2.90 Wed Nov 14 20:02:19 2012 +++ src/doc/CHANGES-5.0.3 Mon Nov 26 20:01:48 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.90 2012/11/14 20:02:19 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.91 2012/11/26 20:01:48 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5196,3 +5196,10 @@ share/zoneinfo/southamerica patch Various fixes to documentation and commentary. [apb, ticket #1818] +xsrc/external/mit/expat/dist/lib/expat.h patch +xsrc/external/mit/expat/dist/lib/xmlparse.c patch +xsrc/external/mit/expat/dist/xmlwf/readfilemap.c patch + + Address CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876. + [spz, ticket #1821] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 20:02:00 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1818] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.12 -r1.647.2.6.2.13 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.6.2 -r1.1.1.27.6.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.6.6 -r1.1.1.44.6.7 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.5 -r1.17.6.6 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.6.3 -r1.1.1.38.6.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.6.5 -r1.1.1.42.6.6 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.6.4 -r1.1.1.42.6.5 src/share/zoneinfo/southamerica 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.647.2.6.2.12 src/doc/3RDPARTY:1.647.2.6.2.13 --- src/doc/3RDPARTY:1.647.2.6.2.12 Tue Nov 6 20:26:39 2012 +++ src/doc/3RDPARTY Wed Nov 14 20:01:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.12 2012/11/06 20:26:39 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.13 2012/11/14 20:01:58 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.6.2 src/share/zoneinfo/africa:1.1.1.27.6.3 --- src/share/zoneinfo/africa:1.1.1.27.6.2 Sat Sep 15 09:26:28 2012 +++ src/share/zoneinfo/africa Wed Nov 14 20:01:58 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.6 src/share/zoneinfo/asia:1.1.1.44.6.7 --- src/share/zoneinfo/asia:1.1.1.44.6.6
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:02:20 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.89 src/doc/CHANGES-5.0.3:1.1.2.90 --- src/doc/CHANGES-5.0.3:1.1.2.89 Tue Nov 6 20:26:54 2012 +++ src/doc/CHANGES-5.0.3 Wed Nov 14 20:02:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.89 2012/11/06 20:26:54 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.90 2012/11/14 20:02:19 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5180,3 +5180,19 @@ share/zoneinfo/northamerica patch Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1813] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1818] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Tue Nov 6 20:26:40 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: asia northamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/northamerica patch Import tzdata2012i from ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . Changes from tzdata2012h to tzdata2012i: Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1813] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.11 -r1.647.2.6.2.12 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.44.6.5 -r1.1.1.44.6.6 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.42.6.4 -r1.1.1.42.6.5 src/share/zoneinfo/northamerica 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.647.2.6.2.11 src/doc/3RDPARTY:1.647.2.6.2.12 --- src/doc/3RDPARTY:1.647.2.6.2.11 Wed Oct 31 16:51:52 2012 +++ src/doc/3RDPARTY Tue Nov 6 20:26:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.11 2012/10/31 16:51:52 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.12 2012/11/06 20:26:39 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012h -Current Vers: tzcode2012h / tzdata2012h +Version: tzcode2004a / tzdata2012i +Current Vers: tzcode2012i / tzdata2012i Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.5 src/share/zoneinfo/asia:1.1.1.44.6.6 --- src/share/zoneinfo/asia:1.1.1.44.6.5 Wed Oct 31 16:46:10 2012 +++ src/share/zoneinfo/asia Tue Nov 6 20:26:40 2012 @@ -1204,7 +1204,7 @@ Rule Zion 2012 only - Sep 23 2:00 0 S # past, approved sending the proposed June 2011 changes to the Time # Decree Law back to the Knesset for second and third (final) votes # before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before Februray 2013. +# changes are not yet law, they are expected to be so before February 2013. # # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the Index: src/share/zoneinfo/northamerica diff -u src/share/zoneinfo/northamerica:1.1.1.42.6.4 src/share/zoneinfo/northamerica:1.1.1.42.6.5 --- src/share/zoneinfo/northamerica:1.1.1.42.6.4 Sat Sep 15 09:26:29 2012 +++ src/share/zoneinfo/northamerica Tue Nov 6 20:26:40 2012 @@ -2797,6 +2797,13 @@ Zone America/Costa_Rica -5:36:20 - LMT 1 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html # /a +# From Steffen Thorsen (2012-11-03): +# Radio Reloj and many other sources report that Cuba is changing back +# to standard time on 2012-11-04: +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre +# From Paul Eggert (2012-11-03): +# For now, assume the future rule is first Sunday in November. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2834,7 +2841,7 @@ Rule Cuba 2009 2010 - Mar Sun=8 0:00s 1 Rule Cuba 2011 only - Mar Sun=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S Rule Cuba 2012 only - Apr 1 0:00s 1:00 D -Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2012 max - Nov Sun=1 0:00s 0 S Rule Cuba 2013 max - Mar Sun=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue Nov 6 20:26:54 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1813. To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.88 src/doc/CHANGES-5.0.3:1.1.2.89 --- src/doc/CHANGES-5.0.3:1.1.2.88 Wed Oct 31 16:47:18 2012 +++ src/doc/CHANGES-5.0.3 Tue Nov 6 20:26:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.88 2012/10/31 16:47:18 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.89 2012/11/06 20:26:54 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5170,3 +5170,13 @@ share/zoneinfo/southamerica patch Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) [apb, ticket #1812] +doc/3RDPARTY patch +share/zoneinfo/asiapatch +share/zoneinfo/northamerica patch + + Import tzdata2012i from + ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . + Changes from tzdata2012h to tzdata2012i: + Cuba switches from DST on 4 Nov 2012 at 01:00. + [apb, ticket #1813] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Wed Oct 31 16:46:10 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: asia southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/southamerica patch Import tzdata2012h from ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz Changes from tzdata2012g to tzdata2012h: Bahia no longer has DST. (Thanks to Kelley Cook.) Tocantins has DST. (Thanks to Rodrigo Severo.) Israel has new DST rules next year. (Thanks to Ephraim Silverberg.) Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) [apb, ticket #1812] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.9 -r1.647.2.6.2.10 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.44.6.4 -r1.1.1.44.6.5 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.42.6.3 -r1.1.1.42.6.4 src/share/zoneinfo/southamerica 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.647.2.6.2.9 src/doc/3RDPARTY:1.647.2.6.2.10 --- src/doc/3RDPARTY:1.647.2.6.2.9 Tue Oct 23 23:25:18 2012 +++ src/doc/3RDPARTY Wed Oct 31 16:46:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.9 2012/10/23 23:25:18 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.10 2012/10/31 16:46:09 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,9 +924,10 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012g -Current Vers: tzcode2012g / tzdata2012g -Maintainer:Paul Eggert egg...@cs.ucla.edu +Version: tzcode2004a / tzdata2012h +Current Vers: tzcode2012h / tzdata2012h +Maintainer: Arthur David Olson a...@elsie.nci.nih.gov +Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.4 src/share/zoneinfo/asia:1.1.1.44.6.5 --- src/share/zoneinfo/asia:1.1.1.44.6.4 Tue Oct 23 23:25:18 2012 +++ src/share/zoneinfo/asia Wed Oct 31 16:46:10 2012 @@ -1170,15 +1170,15 @@ Rule Zion 2004 only - Sep 22 1:00 0 S # # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps -# From Paul Eggert (2005-02-22): +# From Paul Eggert (2012-10-26): # I used Ephraim Silverberg's dst-israel.el program # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20) # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4, -# to generate the transitions in this list. +# to generate the transitions from 2005 through 2012. # (I replaced lastFri with Fri=26 by hand.) -# The spring transitions below all correspond to the following Rule: +# The spring transitions all correspond to the following Rule: # -# Rule Zion 2005 max - Mar Fri=26 2:00 1:00 D +# Rule Zion 2005 2012 - Mar Fri=26 2:00 1:00 D # # but older zic implementations (e.g., Solaris 8) do not support # Fri=26 to mean April 1 in years like 2005, so for now we list the @@ -1195,39 +1195,36 @@ Rule Zion 2009 only - Sep 27 2:00 0 S Rule Zion 2010 only - Sep 12 2:00 0 S Rule Zion 2011 only - Apr 1 2:00 1:00 D Rule Zion 2011 only - Oct 2 2:00 0 S -Rule Zion 2012 2015 - Mar Fri=26 2:00 1:00 D +Rule Zion 2012 only - Mar Fri=26 2:00 1:00 D Rule Zion 2012 only - Sep 23 2:00 0 S -Rule Zion 2013 only - Sep 8 2:00 0 S -Rule Zion 2014 only - Sep 28 2:00 0 S -Rule Zion 2015 only - Sep 20 2:00 0 S -Rule Zion 2016 only - Apr 1 2:00 1:00 D -Rule Zion 2016 only - Oct 9 2:00 0 S -Rule Zion 2017 2021 - Mar Fri=26 2:00 1:00 D -Rule Zion 2017 only - Sep 24 2:00 0 S -Rule Zion 2018 only - Sep 16 2:00 0 S -Rule Zion 2019 only - Oct 6 2:00 0 S -Rule Zion 2020 only - Sep 27 2:00 0 S -Rule Zion 2021 only - Sep 12 2:00 0 S -Rule Zion 2022 only - Apr 1 2:00 1:00 D -Rule Zion 2022 only - Oct 2 2:00 0 S -Rule Zion 2023 2032 - Mar Fri=26 2:00 1:00 D -Rule Zion 2023 only - Sep 24 2:00 0 S -Rule Zion 2024 only - Oct 6 2:00 0 S -Rule Zion 2025 only - Sep 28 2:00 0 S -Rule Zion 2026 only - Sep 20 2:00 0 S -Rule Zion 2027 only - Oct 10 2:00 0 S -Rule Zion 2028 only - Sep 24 2:00 0 S -Rule Zion 2029 only - Sep 16 2:00 0 S -Rule Zion 2030 only - Oct 6 2:00 0 S -Rule Zion 2031 only - Sep 21 2:00 0 S -Rule Zion 2032 only - Sep 12 2:00 0 S -Rule Zion 2033 only - Apr 1 2:00 1:00 D -Rule Zion 2033 only - Oct 2 2:00 0 S -Rule Zion 2034 2037 - Mar Fri=26 2:00 1:00 D -Rule Zion 2034 only - Sep 17 2:00 0 S -Rule Zion 2035 only - Oct 7 2:00 0 S -Rule Zion 2036 only - Sep 28 2:00 0 S -Rule Zion 2037 only - Sep 13 2:00 0 S + +# From Ephraim Silverberg (2012-10-18): + +# Yesterday, the Interior Ministry Committee, after more than a year +# past,
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 31 16:47:19 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1812 To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.87 src/doc/CHANGES-5.0.3:1.1.2.88 --- src/doc/CHANGES-5.0.3:1.1.2.87 Thu Oct 25 09:12:14 2012 +++ src/doc/CHANGES-5.0.3 Wed Oct 31 16:47:18 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.87 2012/10/25 09:12:14 sborrill Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.88 2012/10/31 16:47:18 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5157,3 +5157,16 @@ share/misc/bsd-family-tree 1.46-1.47 5.1.2. [riz, ticket #1806] +doc/3RDPARTY patch +share/zoneinfo/asiapatch +share/zoneinfo/southamerica patch + + Import tzdata2012h from + ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz + Changes from tzdata2012g to tzdata2012h: + Bahia no longer has DST. (Thanks to Kelley Cook.) + Tocantins has DST. (Thanks to Rodrigo Severo.) + Israel has new DST rules next year. (Thanks to Ephraim Silverberg.) + Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) + [apb, ticket #1812] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 31 16:51:53 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY Log Message: Fix last commit (ticket 1812, my fault) To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.10 -r1.647.2.6.2.11 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.6.2.10 src/doc/3RDPARTY:1.647.2.6.2.11 --- src/doc/3RDPARTY:1.647.2.6.2.10 Wed Oct 31 16:46:09 2012 +++ src/doc/3RDPARTY Wed Oct 31 16:51:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.10 2012/10/31 16:46:09 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.11 2012/10/31 16:51:52 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -926,8 +926,7 @@ Notes: Package: tz Version: tzcode2004a / tzdata2012h Current Vers: tzcode2012h / tzdata2012h -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/
CVS commit: [netbsd-5-0] src/share/misc
Module Name:src Committed By: sborrill Date: Thu Oct 25 09:11:58 UTC 2012 Modified Files: src/share/misc [netbsd-5-0]: bsd-family-tree Log Message: Pull up the following revisions(s) (requested by riz in ticket #1806): share/misc/bsd-family-tree: revision 1.46-1.47 Re-add a line from NetBSD 0.8 to FreeBSD 1.0. Add some missing NetBSD releases: 4.0.1, 5.0.1, 5.0.2 and 5.1.2. To generate a diff of this commit: cvs rdiff -u -r1.40.12.2.2.1 -r1.40.12.2.2.2 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.40.12.2.2.1 src/share/misc/bsd-family-tree:1.40.12.2.2.2 --- src/share/misc/bsd-family-tree:1.40.12.2.2.1 Wed Oct 24 03:09:07 2012 +++ src/share/misc/bsd-family-tree Thu Oct 25 09:11:58 2012 @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | NetBSD 0.8| BSD/386 1.0 - || | | -FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 + |-NetBSD 0.8| BSD/386 1.0 + | /| | | +FreeBSD 1.0 -' NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -216,42 +216,42 @@ FreeBSD 5.2 | | | | 10.5| | | | | | | OpenBSD 4.2 | | | | NetBSD 4.0 | | - | FreeBSD 6.3| | | | - |\ | | | | - *--FreeBSD| | | |DragonFly 1.12.0 - |7.0 | | | | | - | | | | | OpenBSD 4.3 | - | | | | | |DragonFly 2.0.0 + | FreeBSD 6.3| ||| | + |\ | ||| | + *--FreeBSD| | |||DragonFly 1.12.0 + |7.0 | | ||| | + | | | | ||OpenBSD 4.3 | + | | | | | NetBSD 4.0.1|DragonFly 2.0.0 | |FreeBSD | | OpenBSD 4.4 | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | | | | | |DragonFly 2.2.0 | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | - | \ | ||| | - | | Mac OS X ||| | - | |10.6||| | - | | | |||DragonFly 2.4.0 - | | | ||OpenBSD 4.6 | - | | | ||| | - *--FreeBSD | | ||| | - |8.0 | | ||| | - | | FreeBSD | ||| | - | | 7.3| |||DragonFly 2.6.0 - | || | ||OpenBSD 4.7 | - | FreeBSD | | ||| | - |8.1 | | ||| | - | || | |||DragonFly 2.8.2 - | || | ||OpenBSD 4.8 | - | || | | NetBSD 5.1 | | - | FreeBSD FreeBSD | | | | - |8.2 7.4| | | DragonFly 2.10.1 - | | | | OpenBSD 4.9 | - | `-. Mac OS X | | | - |\ 10.7|
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Thu Oct 25 09:12:14 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket #1806 To generate a diff of this commit: cvs rdiff -u -r1.1.2.86 -r1.1.2.87 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.86 src/doc/CHANGES-5.0.3:1.1.2.87 --- src/doc/CHANGES-5.0.3:1.1.2.86 Wed Oct 24 03:09:28 2012 +++ src/doc/CHANGES-5.0.3 Thu Oct 25 09:12:14 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.86 2012/10/24 03:09:28 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.87 2012/10/25 09:12:14 sborrill Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5150,3 +5150,10 @@ share/misc/bsd-family-tree 1.45 via pa Update the family tree for NetBSD 6. [jnemeth, ticket #1804] +share/misc/bsd-family-tree 1.46-1.47 + + Re-add a line from NetBSD 0.8 to FreeBSD 1.0. + Add some missing NetBSD releases: 4.0.1, 5.0.1, 5.0.2 and + 5.1.2. + [riz, ticket #1806] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:25:19 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.8 -r1.647.2.6.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.44.6.3 -r1.1.1.44.6.4 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.4 -r1.17.6.5 src/share/zoneinfo/australasia 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.647.2.6.2.8 src/doc/3RDPARTY:1.647.2.6.2.9 --- src/doc/3RDPARTY:1.647.2.6.2.8 Sun Sep 30 18:12:46 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:25:18 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.8 2012/09/30 18:12:46 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.9 2012/10/23 23:25:18 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,10 +924,9 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2004a / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer:Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.3 src/share/zoneinfo/asia:1.1.1.44.6.4 --- src/share/zoneinfo/asia:1.1.1.44.6.3 Sat Sep 15 09:26:28 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:25:18 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.6.4 src/share/zoneinfo/australasia:1.17.6.5 --- src/share/zoneinfo/australasia:1.17.6.4 Sun Sep 30 18:12:46 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:25:19 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:25:41 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1803. To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.84 src/doc/CHANGES-5.0.3:1.1.2.85 --- src/doc/CHANGES-5.0.3:1.1.2.84 Wed Oct 17 20:57:15 2012 +++ src/doc/CHANGES-5.0.3 Tue Oct 23 23:25:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.84 2012/10/17 20:57:15 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.85 2012/10/23 23:25:41 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5133,3 +5133,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1802] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #1803] +
CVS commit: [netbsd-5-0] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:09:07 UTC 2012 Modified Files: src/share/misc [netbsd-5-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1804): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.40.12.2 -r1.40.12.2.2.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.40.12.2 src/share/misc/bsd-family-tree:1.40.12.2.2.1 --- src/share/misc/bsd-family-tree:1.40.12.2 Mon Jan 26 00:52:25 2009 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:09:07 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -226,10 +226,39 @@ FreeBSD 5.2 | | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | - | | | | | | - | V | | | | + | | | | |DragonFly 2.2.0 + | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | + | \ | ||| | + | | Mac OS X ||| | + | |10.6||| | + | | | |||DragonFly 2.4.0 + | | | ||OpenBSD 4.6 | + | | | ||| | + *--FreeBSD | | ||| | + |8.0 | | ||| | + | | FreeBSD | ||| | + | | 7.3| |||DragonFly 2.6.0 + | || | ||OpenBSD 4.7 | + | FreeBSD | | ||| | + |8.1 | | ||| | + | || | |||DragonFly 2.8.2 + | || | ||OpenBSD 4.8 | + | || | | NetBSD 5.1 | | + | FreeBSD FreeBSD | | | | + |8.2 7.4| | | DragonFly 2.10.1 + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | |
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:09:28 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1804. To generate a diff of this commit: cvs rdiff -u -r1.1.2.85 -r1.1.2.86 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.85 src/doc/CHANGES-5.0.3:1.1.2.86 --- src/doc/CHANGES-5.0.3:1.1.2.85 Tue Oct 23 23:25:41 2012 +++ src/doc/CHANGES-5.0.3 Wed Oct 24 03:09:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.85 2012/10/23 23:25:41 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.86 2012/10/24 03:09:28 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5145,3 +5145,8 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1804] +
CVS commit: [netbsd-5-0] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Wed Oct 17 20:50:14 UTC 2012
Modified Files:
src/dist/bind [netbsd-5-0]: CHANGES version
src/dist/bind/bin/named [netbsd-5-0]: query.c
Log Message:
Apply patch, requested by spz in ticket #1801:
dist/bind/CHANGES: patch
dist/bind/version: patch
dist/bind/bin/named/query.c:patch
fix CVE-2012-5166: Specially crafted DNS data can cause a lockup in named
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11.8.8 -r1.1.1.11.8.9 src/dist/bind/CHANGES \
src/dist/bind/version
cvs rdiff -u -r1.8.8.6 -r1.8.8.7 src/dist/bind/bin/named/query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/CHANGES
diff -u src/dist/bind/CHANGES:1.1.1.11.8.8 src/dist/bind/CHANGES:1.1.1.11.8.9
--- src/dist/bind/CHANGES:1.1.1.11.8.8 Fri Sep 14 00:00:41 2012
+++ src/dist/bind/CHANGES Wed Oct 17 20:50:13 2012
@@ -1,7 +1,8 @@
- --- 9.7.3-P4 released ---
+ --- 9.7.6-P4 released ---
-3331. [security] dns_rdataslab_fromrdataset could produce bad
- rdataslabs. [RT #29644]
+3383. [security] A certain combination of records in the RBT could
+cause named to hang while populating the additional
+section of a response. [RT #31090]
--- 9.7.6-P3 released ---
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.11.8.8 src/dist/bind/version:1.1.1.11.8.9
--- src/dist/bind/version:1.1.1.11.8.8 Fri Sep 14 00:00:42 2012
+++ src/dist/bind/version Wed Oct 17 20:50:14 2012
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=7
PATCHVER=6
RELEASETYPE=-P
-RELEASEVER=3
+RELEASEVER=4
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.8.6 src/dist/bind/bin/named/query.c:1.8.8.7
--- src/dist/bind/bin/named/query.c:1.8.8.6 Wed Jul 25 12:02:52 2012
+++ src/dist/bind/bin/named/query.c Wed Oct 17 20:50:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.8.6 2012/07/25 12:02:52 jdc Exp $ */
+/* $NetBSD: query.c,v 1.8.8.7 2012/10/17 20:50:14 bouyer Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1027,13 +1027,6 @@ query_isduplicate(ns_client_t *client, d
mname = NULL;
}
- /*
- * If the dns_name_t we're looking up is already in the message,
- * we don't want to trigger the caller's name replacement logic.
- */
- if (name == mname)
- mname = NULL;
-
if (mnamep != NULL)
*mnamep = mname;
@@ -1232,6 +1225,7 @@ query_addadditional(void *arg, dns_name_
if (dns_rdataset_isassociated(rdataset)
!query_isduplicate(client, fname, type, mname)) {
if (mname != NULL) {
+ INSIST(mname != fname);
query_releasename(client, fname);
fname = mname;
} else
@@ -1301,11 +1295,13 @@ query_addadditional(void *arg, dns_name_
#endif
if (!query_isduplicate(client, fname,
dns_rdatatype_a, mname)) {
-if (mname != NULL) {
- query_releasename(client, fname);
- fname = mname;
-} else
- need_addname = ISC_TRUE;
+if (mname != fname) {
+ if (mname != NULL) {
+ query_releasename(client, fname);
+ fname = mname;
+ } else
+ need_addname = ISC_TRUE;
+}
ISC_LIST_APPEND(fname-list, rdataset, link);
added_something = ISC_TRUE;
if (sigrdataset != NULL
@@ -1358,11 +1354,13 @@ query_addadditional(void *arg, dns_name_
#endif
if (!query_isduplicate(client, fname,
dns_rdatatype_, mname)) {
-if (mname != NULL) {
- query_releasename(client, fname);
- fname = mname;
-} else
- need_addname = ISC_TRUE;
+if (mname != fname) {
+ if (mname != NULL) {
+ query_releasename(client, fname);
+ fname = mname;
+ } else
+ need_addname = ISC_TRUE;
+}
ISC_LIST_APPEND(fname-list, rdataset, link);
added_something = ISC_TRUE;
if (sigrdataset != NULL
@@ -1885,22 +1883,24 @@ query_addadditional2(void *arg, dns_name
crdataset-type == dns_rdatatype_) {
if (!query_isduplicate(client, fname, crdataset-type,
mname)) {
-if (mname != NULL) {
- /*
- * A different type of this name is
- * already stored in the additional
- * section. We'll reuse the name.
- * Note that this should happen at most
- * once. Otherwise, fname-link could
- * leak below.
- */
- INSIST(mname0 == NULL);
-
- query_releasename(client, fname);
- fname = mname;
- mname0 = mname;
-} else
- need_addname = ISC_TRUE;
+if (mname != fname) {
+ if (mname != NULL) {
+ /*
+ * A different type of this name is
+ * already stored in the additional
+ * section. We'll reuse the name.
+ * Note that this should happen at most
+ * once. Otherwise, fname-link could
+ * leak below.
+ */
+ INSIST(mname0 == NULL);
+
+
CVS commit: [netbsd-5-0] src/usr.bin/calendar/calendars
Module Name:src Committed By: bouyer Date: Wed Oct 17 20:54:12 UTC 2012 Modified Files: src/usr.bin/calendar/calendars [netbsd-5-0]: calendar.netbsd Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1802): usr.bin/calendar/calendars/calendar.netbsd: revision 1.22 note NetBSD 6.0 release To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.8.1 src/usr.bin/calendar/calendars/calendar.netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.16 src/usr.bin/calendar/calendars/calendar.netbsd:1.16.8.1 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.16 Tue Sep 9 18:47:19 2008 +++ src/usr.bin/calendar/calendars/calendar.netbsd Wed Oct 17 20:54:12 2012 @@ -71,6 +71,7 @@ 10/13 NetBSD/iyonix port started, 2004 10/14 NetBSD/bebox port started, 1997 10/16 NetBSD/playstation2 port started, 2001 +10/17 NetBSD 6.0 released, 2012 10/26 NetBSD 1.0 released, 1994 10/30 pkgsrc/Darwin support added, 2001 11/02 NetBSD 2.1 released, 2005
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Oct 17 20:57:15 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1801, 1802 To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.83 src/doc/CHANGES-5.0.3:1.1.2.84 --- src/doc/CHANGES-5.0.3:1.1.2.83 Sun Sep 30 18:13:27 2012 +++ src/doc/CHANGES-5.0.3 Wed Oct 17 20:57:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.83 2012/09/30 18:13:27 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.84 2012/10/17 20:57:15 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5120,3 +5120,16 @@ share/zoneinfo/australasia 1.27 via pa January 20 this year. (Thanks to Steffen Thorsen.) [apb, ticket #1798] +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/bin/named/query.c patch + + fix CVE-2012-5166: Specially crafted DNS data can cause a + lockup in named. + [spz, ticket #1801] + +usr.bin/calendar/calendars/calendar.netbsd 1.22 + + note NetBSD 6.0 release + [jnemeth, ticket #1802] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:12:47 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1798): doc/3RDPARTY: revision 1.970 via patch share/zoneinfo/australasia: revision 1.27 via patch Merge tzdata2012f from http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz Changes from tzdata2012e to tzdata2012f: * australasia (Pacific/Fiji): Fiji DST is October 21 through January 20 this year. (Thanks to Steffen Thorsen.) tzcode2012f and tzdata2012f have been released. We have updated to tzdata2012f, and there are no real changes (apart from version number) in tzcode2012f. To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.7 -r1.647.2.6.2.8 src/doc/3RDPARTY cvs rdiff -u -r1.17.6.3 -r1.17.6.4 src/share/zoneinfo/australasia 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.647.2.6.2.7 src/doc/3RDPARTY:1.647.2.6.2.8 --- src/doc/3RDPARTY:1.647.2.6.2.7 Sat Sep 15 09:26:27 2012 +++ src/doc/3RDPARTY Sun Sep 30 18:12:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.7 2012/09/15 09:26:27 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.8 2012/09/30 18:12:46 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012e -Current Vers: tzcode2012e / tzdata2012e +Version: tzcode2004a / tzdata2012f +Current Vers: tzcode2012f / tzdata2012f Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.6.3 src/share/zoneinfo/australasia:1.17.6.4 --- src/share/zoneinfo/australasia:1.17.6.3 Sat Sep 15 09:26:28 2012 +++ src/share/zoneinfo/australasia Sun Sep 30 18:12:46 2012 @@ -321,15 +321,23 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # The commencement of daylight saving will remain unchanged and start # on the 23rd of October, 2011. +# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen: +# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate +# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st +# October 2012 and end at 3 am on Sunday 20th January 2013. +# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155 +# +# From Paul Eggert (2012-08-31): +# For now, guess a pattern of the penultimate Sundays in October and January. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 only - Oct 24 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun=18 2:00 1:00 S Rule Fiji 2011 only - Mar Sun=1 3:00 0 - -Rule Fiji 2011 only - Oct 23 2:00 1:00 S -Rule Fiji 2012 only - Jan 22 3:00 0 - +Rule Fiji 2012 max - Jan Sun=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:13:27 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1798 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.82 src/doc/CHANGES-5.0.3:1.1.2.83 --- src/doc/CHANGES-5.0.3:1.1.2.82 Sat Sep 15 09:27:22 2012 +++ src/doc/CHANGES-5.0.3 Sun Sep 30 18:13:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.82 2012/09/15 09:27:22 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.83 2012/09/30 18:13:27 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5110,3 +5110,13 @@ share/zoneinfo/zone.tab patch * Use a single version number for both code and data. [apb, ticket #1783] +doc/3RDPARTY 1.970 via patch +share/zoneinfo/australasia 1.27 via patch + + Merge tzdata2012f from + http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz + Changes from tzdata2012e to tzdata2012f: + * australasia (Pacific/Fiji): Fiji DST is October 21 through + January 20 this year. (Thanks to Steffen Thorsen.) + [apb, ticket #1798] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:26:30 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1783 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.6 -r1.647.2.6.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.6.1 -r1.1.1.27.6.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.16.2 -r1.1.1.17.16.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.6.2 -r1.1.1.44.6.3 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.2 -r1.17.6.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.19.6.1 -r1.1.1.19.6.2 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.28.1 -r1.1.1.6.28.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.38.6.2 -r1.1.1.38.6.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.28.1 -r1.1.1.3.28.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.17.6.1 -r1.1.1.17.6.2 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.15.6.2 -r1.1.1.15.6.3 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.42.6.3 -r1.1.1.42.6.4 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.6.2 -r1.1.1.42.6.3 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.28.1 -r1.1.1.4.28.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.28.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.33.6.3 -r1.1.1.33.6.4 src/share/zoneinfo/zone.tab 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.647.2.6.2.6 src/doc/3RDPARTY:1.647.2.6.2.7 --- src/doc/3RDPARTY:1.647.2.6.2.6 Fri Mar 2 17:43:43 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:26:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.6 2012/03/02 17:43:43 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.7 2012/09/15 09:26:27 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,16 +924,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site:
CVS commit: [netbsd-5-0] src/dist/bind
Module Name:src
Committed By: riz
Date: Fri Sep 14 00:00:44 UTC 2012
Modified Files:
src/dist/bind [netbsd-5-0]: CHANGES version
src/dist/bind/lib/dns [netbsd-5-0]: master.c rdata.c rdataslab.c
src/dist/bind/lib/dns/include/dns [netbsd-5-0]: rdata.h
Log Message:
Pull up following revision(s) (requested by 1796 in ticket #spz):
external/bsd/bind/dist/lib/dns/tests/rdata_test.c: revision 1.1
external/bsd/bind/dist/lib/dns/tests/testdata/master/master16.data:
revision 1.1
external/bsd/bind/dist/version: revision 1.3
external/bsd/bind/dist/lib/dns/rdataslab.c: revision 1.6
external/bsd/bind/dist/lib/dns/master.c: revision 1.7
external/bsd/bind/dist/lib/dns/include/dns/rdata.h: revision 1.5
external/bsd/bind/dist/CHANGES: revision 1.6
external/bsd/bind/dist/lib/dns/tests/master_test.c: revision 1.2
external/bsd/bind/dist/lib/dns/tests/testdata/master/master15.data:
revision 1.1
external/bsd/bind/dist/lib/dns/tests/Makefile.in: revision 1.2
external/bsd/bind/dist/lib/dns/rdata.c: revision 1.5
apply fix for CVE-2012-4244 from upstream
upstream changelog:
--- 9.9.1-P3 released ---
3364. [security] Named could die on specially crafted record.
[RT #30416]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11.8.7 -r1.1.1.11.8.8 src/dist/bind/CHANGES \
src/dist/bind/version
cvs rdiff -u -r1.2.8.4 -r1.2.8.5 src/dist/bind/lib/dns/master.c
cvs rdiff -u -r1.1.1.5.8.5 -r1.1.1.5.8.6 src/dist/bind/lib/dns/rdata.c \
src/dist/bind/lib/dns/rdataslab.c
cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \
src/dist/bind/lib/dns/include/dns/rdata.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/CHANGES
diff -u src/dist/bind/CHANGES:1.1.1.11.8.7 src/dist/bind/CHANGES:1.1.1.11.8.8
--- src/dist/bind/CHANGES:1.1.1.11.8.7 Wed Jul 25 12:02:34 2012
+++ src/dist/bind/CHANGES Fri Sep 14 00:00:41 2012
@@ -3,6 +3,11 @@
3331. [security] dns_rdataslab_fromrdataset could produce bad
rdataslabs. [RT #29644]
+ --- 9.7.6-P3 released ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.7.6-P2 released ---
3346. [security] Bad-cache data could be used before it was
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.11.8.7 src/dist/bind/version:1.1.1.11.8.8
--- src/dist/bind/version:1.1.1.11.8.7 Wed Jul 25 12:02:40 2012
+++ src/dist/bind/version Fri Sep 14 00:00:42 2012
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=7
PATCHVER=6
RELEASETYPE=-P
-RELEASEVER=2
+RELEASEVER=3
Index: src/dist/bind/lib/dns/master.c
diff -u src/dist/bind/lib/dns/master.c:1.2.8.4 src/dist/bind/lib/dns/master.c:1.2.8.5
--- src/dist/bind/lib/dns/master.c:1.2.8.4 Wed Jul 25 12:05:57 2012
+++ src/dist/bind/lib/dns/master.c Fri Sep 14 00:00:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.2.8.4 2012/07/25 12:05:57 jdc Exp $ */
+/* $NetBSD: master.c,v 1.2.8.5 2012/09/14 00:00:42 riz Exp $ */
/*
* Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. (ISC)
@@ -77,7 +77,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Index: src/dist/bind/lib/dns/rdata.c
diff -u src/dist/bind/lib/dns/rdata.c:1.1.1.5.8.5 src/dist/bind/lib/dns/rdata.c:1.1.1.5.8.6
--- src/dist/bind/lib/dns/rdata.c:1.1.1.5.8.5 Wed Jul 25 12:06:02 2012
+++ src/dist/bind/lib/dns/rdata.c Fri Sep 14 00:00:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.1.1.5.8.5 2012/07/25 12:06:02 jdc Exp $ */
+/* $NetBSD: rdata.c,v 1.1.1.5.8.6 2012/09/14 00:00:43 riz Exp $ */
/*
* Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. (ISC)
@@ -431,6 +431,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -461,6 +462,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+ * Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+ * as we cannot transmit it.
+ */
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = DNS_R_FORMERR;
+
+ /*
* We should have consumed all of our buffer.
*/
if (result == ISC_R_SUCCESS !buffer_empty(source))
@@ -468,8 +477,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
-isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
@@
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Sep 14 00:01:22 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1796. To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.80 src/doc/CHANGES-5.0.3:1.1.2.81 --- src/doc/CHANGES-5.0.3:1.1.2.80 Wed Aug 22 20:42:55 2012 +++ src/doc/CHANGES-5.0.3 Fri Sep 14 00:01:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.80 2012/08/22 20:42:55 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.81 2012/09/14 00:01:22 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5058,3 +5058,13 @@ gnu/usr.sbin/postfix/Makefile.inc patch in Cyrus SASL support, which is not compiled in netbsd-5-0 [spz, ticket #1779] +dist/bind/CHANGESpatch +dist/bind/versionpatch +dist/bind/lib/dns/master.c patch +dist/bind/lib/dns/rdata.c patch +dist/bind/lib/dns/rdataslab.c patch +dist/bind/lib/dns/include/dns/rdata.h patch + + Apply fix for CVE-2012-4244 from upstream. + [1796, ticket #spz] +
CVS commit: [netbsd-5-0] src/usr.bin/cksum
Module Name:src Committed By: bouyer Date: Wed Aug 22 20:36:25 UTC 2012 Modified Files: src/usr.bin/cksum [netbsd-5-0]: cksum.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1778): usr.bin/cksum/cksum.1: revision 1.44 via patch Omit outdated cryptographic claims as noted in PR 44160. Interested readers can follow the references or read Wikipedia; this is the wrong place to explain cryptographic hash functions and give security advice. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.26.1 src/usr.bin/cksum/cksum.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/cksum/cksum.1 diff -u src/usr.bin/cksum/cksum.1:1.40 src/usr.bin/cksum/cksum.1:1.40.26.1 --- src/usr.bin/cksum/cksum.1:1.40 Sat Sep 2 23:27:45 2006 +++ src/usr.bin/cksum/cksum.1 Wed Aug 22 20:36:25 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cksum.1,v 1.40 2006/09/02 23:27:45 wiz Exp $ +.\ $NetBSD: cksum.1,v 1.40.26.1 2012/08/22 20:36:25 bouyer Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)cksum.1 8.2 (Berkeley) 4/28/95 .\ -.Dd August 25, 2006 +.Dd June 24, 2012 .Dt CKSUM 1 .Os .Sh NAME @@ -127,38 +127,14 @@ described below. It is provided for compatibility only. .Pp The -.Nm md5 -utility takes as input a message of arbitrary length and produces -as output a 128-bit -.Dq fingerprint -or -.Dq message digest -of the input. -It is conjectured that it is computationally infeasible -to product two messages having the same message digest, or to produce -any message having a given prespecified target message digest. -The -MD5 algorithm is intended for digital signature applications, where -a large file must be -.Dq compressed -in a secure manner before being encrypted with a private (secret) -key under a public-key encryption system such as -.Pa RSA . -.Pp -The -.Nm md2 -and -.Nm md4 -utilities behave in exactly the same manner as -.Nm md5 -but use different algorithms. -.Pp -The -.Nm sha1 +.Nm md2 , +.Nm md4 , +.Nm md5 , +.Nm sha1 , and .Nm rmd160 -utilities also produce message digests, however the output from these -two programs is 160 bits in length, as opposed to 128. +utilities compute cryptographic hash functions, and write to standard +output the hexadecimal representation of the hash of their input. .Pp The options are as follows: .Bl -tag -width indent
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Aug 22 20:42:55 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1778, 1779 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.79 src/doc/CHANGES-5.0.3:1.1.2.80 --- src/doc/CHANGES-5.0.3:1.1.2.79 Wed Jul 25 12:16:25 2012 +++ src/doc/CHANGES-5.0.3 Wed Aug 22 20:42:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.79 2012/07/25 12:16:25 jdc Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.80 2012/08/22 20:42:55 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5047,3 +5047,14 @@ src/dist/bind/win32utils/win32-build.txt Update bind to bind-9.7.6-P2 (includes fix for CVE-2012-3817). [spz, ticket #1782] +usr.bin/cksum/cksum.11.44 via patch + + Omit outdated cryptographic claims as noted in PR 44160. + [dholland, ticket #1778] + +gnu/usr.sbin/postfix/Makefile.inc patch + + insert comment warning about postfix vulnerability CVE-2011-1720 + in Cyrus SASL support, which is not compiled in netbsd-5-0 + [spz, ticket #1779] +
CVS commit: [netbsd-5-0] src/sys/arch/amd64/amd64
Module Name:src Committed By: bouyer Date: Fri Jun 15 09:20:48 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-5-0]: trap.c Log Message: Fix build fallout from ticket #1772 for Xen kernels To generate a diff of this commit: cvs rdiff -u -r1.52.6.3 -r1.52.6.4 src/sys/arch/amd64/amd64/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/trap.c diff -u src/sys/arch/amd64/amd64/trap.c:1.52.6.3 src/sys/arch/amd64/amd64/trap.c:1.52.6.4 --- src/sys/arch/amd64/amd64/trap.c:1.52.6.3 Tue Jun 12 20:43:59 2012 +++ src/sys/arch/amd64/amd64/trap.c Fri Jun 15 09:20:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.52.6.3 2012/06/12 20:43:59 riz Exp $ */ +/* $NetBSD: trap.c,v 1.52.6.4 2012/06/15 09:20:48 bouyer Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.6.3 2012/06/12 20:43:59 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.6.4 2012/06/15 09:20:48 bouyer Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -183,7 +183,9 @@ trap(struct trapframe *frame) #if defined(COMPAT_10) || defined(COMPAT_IBCS2) extern char IDTVEC(oosyscall)[]; #endif +#ifndef XEN struct trapframe *vframe; +#endif void *onfault; int error; uint64_t cr2;
CVS commit: [netbsd-5-0] src/sys/arch/amd64
Module Name:src
Committed By: riz
Date: Tue Jun 12 20:43:59 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5-0]: trap.c vector.S
src/sys/arch/amd64/include [netbsd-5-0]: frameasm.h
Log Message:
Pull up following revision(s) (requested by spz in ticket #1772):
sys/arch/amd64/amd64/trap.c: revision 1.71 via patch
sys/arch/amd64/amd64/vector.S: revision 1.41 via patch
sys/arch/amd64/include/frameasm.h: patch
Treat traps in kernel mode during the 'return to user' iret sequence
as user faults.
Based heavily in the i386 code with the correct opcode bytes inserted.
iret path tested, arranging for segment register errors is harder.
User %fs and %gs (32bit apps) are loaded much earlier and any errors
will generate kernel panics - there is probably code to try to stop
the invalid values being set.
If we get a fault setting the user %gs, or on a iret that is returning
to userspace, we must do a 'swapgs' to reload the kernel %gs_base.
Also save the %ds, %es, %fs, %gs selector values in the frame so
they can be restored if we finally return to user (probably after
an application SIGSEGV handler has fixed the error).
Without this any such fault leaves the kernel running with the wrong
%gs offset and it will most likely fault again early in trap().
Repeats until the stack tramples on something important.
iret change works, invalid %gs is a little harder to arrange.
To generate a diff of this commit:
cvs rdiff -u -r1.52.6.2 -r1.52.6.3 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.28.6.1 -r1.28.6.1.2.1 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.12 -r1.12.14.1 src/sys/arch/amd64/include/frameasm.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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.52.6.2 src/sys/arch/amd64/amd64/trap.c:1.52.6.3
--- src/sys/arch/amd64/amd64/trap.c:1.52.6.2 Fri Aug 14 21:32:18 2009
+++ src/sys/arch/amd64/amd64/trap.c Tue Jun 12 20:43:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.52.6.2 2009/08/14 21:32:18 snj Exp $ */
+/* $NetBSD: trap.c,v 1.52.6.3 2012/06/12 20:43:59 riz Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.6.2 2009/08/14 21:32:18 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.6.3 2012/06/12 20:43:59 riz Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -124,6 +124,7 @@ __KERNEL_RCSID(0, $NetBSD: trap.c,v 1.5
#endif
void trap(struct trapframe *);
+void trap_return_fault_return(struct trapframe *) __dead;
const char *trap_type[] = {
privileged instruction fault, /* 0 T_PRIVINFLT */
@@ -178,16 +179,11 @@ trap(struct trapframe *frame)
struct proc *p;
int type = (int)frame-tf_trapno;
struct pcb *pcb;
- extern char fusuintrfailure[], kcopy_fault[],
- resume_iret[];
+ extern char fusuintrfailure[], kcopy_fault[];
#if defined(COMPAT_10) || defined(COMPAT_IBCS2)
extern char IDTVEC(oosyscall)[];
#endif
-#if 0
- extern char resume_pop_ds[], resume_pop_es[];
-#endif
struct trapframe *vframe;
- void *resume;
void *onfault;
int error;
uint64_t cr2;
@@ -274,50 +270,78 @@ copyfault:
/*
* Check for failure during return to user mode.
+ * This can happen loading invalid values into the segment
+ * registers, or during the 'iret' itself.
*
- * XXXfvdl check for rex prefix?
- *
- * We do this by looking at the instruction we faulted on. The
- * specific instructions we recognize only happen when
+ * We do this by looking at the instruction we faulted on.
+ * The specific instructions we recognize only happen when
* returning from a trap, syscall, or interrupt.
- *
- * XXX
- * The heuristic used here will currently fail for the case of
- * one of the 2 pop instructions faulting when returning from a
- * a fast interrupt. This should not be possible. It can be
- * fixed by rearranging the trap frame so that the stack format
- * at this point is the same as on exit from a `slow'
- * interrupt.
*/
- switch (*(u_char *)frame-tf_rip) {
- case 0xcf: /* iret */
- vframe = (void *)((uint64_t)frame-tf_rsp - 44);
- resume = resume_iret;
- break;
-/*
- * XXXfvdl these are illegal in long mode (not in compat mode, though)
- * and we do not take back the descriptors from the signal context anyway,
- * but may do so later for USER_LDT, in which case we need to intercept
- * other instructions (movl %eax, %Xs).
- */
-#if 0
- case 0x1f: /* popl %ds */
- vframe = (void *)((uint64_t)frame-tf_rsp - 4);
- resume = resume_pop_ds;
- break;
- case 0x07: /* popl %es */
- vframe = (void *)((uint64_t)frame-tf_rsp - 0);
- resume = resume_pop_es;
+
+kernelfault:
+#ifdef XEN
+ /*
+ * XXX: there has to be an equivalent 'problem'
+ * but I (dsl) don't know exactly what happens!
+ * For now panic the
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue Jun 12 20:44:47 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1772. To generate a diff of this commit: cvs rdiff -u -r1.1.2.76 -r1.1.2.77 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.76 src/doc/CHANGES-5.0.3:1.1.2.77 --- src/doc/CHANGES-5.0.3:1.1.2.76 Tue Jun 5 19:55:19 2012 +++ src/doc/CHANGES-5.0.3 Tue Jun 12 20:44:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.76 2012/06/05 19:55:19 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.77 2012/06/12 20:44:47 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3053,3 +3053,13 @@ dist/bind/lib/dns/rdataslab.cpatch rdataslabs. [RT #29644] [christos, ticket #1767] +sys/arch/amd64/amd64/trap.c 1.71 via patch +sys/arch/amd64/amd64/vector.S 1.41 via patch +sys/arch/amd64/include/frameasm.h patch + + Fix issues when amd64 manages to trap during 'return to user'. ie on + the 'iret' or while loading segment registers. + Also detects any fault loading %gs and re-instates the kernel gs_base + value before entering the trap handler. + [spz, ticket #1772] +
CVS commit: [netbsd-5-0] src/sys/arch/amd64/amd64
Module Name:src
Committed By: riz
Date: Tue Jun 12 23:17:58 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5-0]: machdep.c netbsd32_machdep.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1773):
sys/arch/amd64/amd64/machdep.c: revision 1.184
sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.77
If the user process provided a bogus signal handler address, kill it
now instead of trying to jump to the bogus address.
To generate a diff of this commit:
cvs rdiff -u -r1.102.4.10.2.1 -r1.102.4.10.2.2 \
src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.55.6.2 -r1.55.6.3 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.102.4.10.2.1 src/sys/arch/amd64/amd64/machdep.c:1.102.4.10.2.2
--- src/sys/arch/amd64/amd64/machdep.c:1.102.4.10.2.1 Fri Apr 23 04:17:29 2010
+++ src/sys/arch/amd64/amd64/machdep.c Tue Jun 12 23:17:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.102.4.10.2.1 2010/04/23 04:17:29 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.102.4.10.2.2 2012/06/12 23:17:57 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -112,7 +112,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.102.4.10.2.1 2010/04/23 04:17:29 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.102.4.10.2.2 2012/06/12 23:17:57 riz Exp $);
/* #define XENDEBUG_LOW */
@@ -628,6 +628,16 @@ sendsig(const ksiginfo_t *ksi, const sig
/* Remember that we're now on the signal stack. */
if (onstack)
l-l_sigstk.ss_flags |= SS_ONSTACK;
+
+ if ((vaddr_t)catcher = VM_MAXUSER_ADDRESS) {
+ /*
+ * process has given an invalid address for the
+ * handler. Stop it, but do not do it before so
+ * we can return the right info to userland (or in core dump)
+ */
+ sigexit(l, SIGILL);
+ /* NOTREACHED */
+ }
}
void
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.55.6.2 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.55.6.3
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.55.6.2 Tue Sep 7 19:38:44 2010
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Tue Jun 12 23:17:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.55.6.2 2010/09/07 19:38:44 bouyer Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.55.6.3 2012/06/12 23:17:58 riz Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.55.6.2 2010/09/07 19:38:44 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.55.6.3 2012/06/12 23:17:58 riz Exp $);
#include opt_compat_netbsd.h
#include opt_coredump.h
@@ -275,6 +275,16 @@ netbsd32_sendsig_sigcontext(const ksigin
/* Remember that we're now on the signal stack. */
if (onstack)
l-l_sigstk.ss_flags |= SS_ONSTACK;
+
+ if ((vaddr_t)catcher = VM_MAXUSER_ADDRESS32) {
+ /*
+ * process has given an invalid address for the
+ * handler. Stop it, but do not do it before so
+ * we can return the right info to userland (or in core dump)
+ */
+ sigexit(l, SIGILL);
+ /* NOTREACHED */
+ }
}
#endif
@@ -360,6 +370,16 @@ netbsd32_sendsig_siginfo(const ksiginfo_
/* Remember that we're now on the signal stack. */
if (onstack)
l-l_sigstk.ss_flags |= SS_ONSTACK;
+
+ if ((vaddr_t)catcher = VM_MAXUSER_ADDRESS32) {
+ /*
+ * process has given an invalid address for the
+ * handler. Stop it, but do not do it before so
+ * we can return the right info to userland (or in core dump)
+ */
+ sigexit(l, SIGILL);
+ /* NOTREACHED */
+ }
}
void
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue Jun 12 23:19:02 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1773 To generate a diff of this commit: cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.77 src/doc/CHANGES-5.0.3:1.1.2.78 --- src/doc/CHANGES-5.0.3:1.1.2.77 Tue Jun 12 20:44:47 2012 +++ src/doc/CHANGES-5.0.3 Tue Jun 12 23:19:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.77 2012/06/12 20:44:47 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.78 2012/06/12 23:19:01 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3063,3 +3063,10 @@ sys/arch/amd64/include/frameasm.h patch value before entering the trap handler. [spz, ticket #1772] +sys/arch/amd64/amd64/machdep.c 1.184 via patch +sys/arch/amd64/amd64/netbsd32_machdep.c 1.77 via patch + + If the user process provided a bogus signal handler address, kill it + now instead of trying to jump to the bogus address. + [spz, ticket #1773] +
CVS commit: [netbsd-5-0] src/dist/bind
Module Name:src Committed By: bouyer Date: Tue Jun 5 19:52:26 UTC 2012 Modified Files: src/dist/bind [netbsd-5-0]: CHANGES version src/dist/bind/bin/tests/system/unknown [netbsd-5-0]: clean.sh tests.sh src/dist/bind/bin/tests/system/unknown/ns1 [netbsd-5-0]: example-in.db src/dist/bind/lib/dns [netbsd-5-0]: rdata.c rdataslab.c Log Message: Apply patch, requested by christos in ticket #1767 src/dist/bind/CHANGES patch src/dist/bind/version patch src/dist/bind/bin/tests/system/unknown/clean.sh patch src/dist/bind/bin/tests/system/unknown/tests.sh patch src/dist/bind/bin/tests/system/unknown/ns1/example-in.dbpatch src/dist/bind/lib/dns/rdata.c patch src/dist/bind/lib/dns/rdataslab.c patch Update bind to 9.7.3-P4: 3331. [security] dns_rdataslab_fromrdataset could produce bad rdataslabs. [RT #29644] To generate a diff of this commit: cvs rdiff -u -r1.1.1.11.8.5 -r1.1.1.11.8.6 src/dist/bind/CHANGES \ src/dist/bind/version cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \ src/dist/bind/bin/tests/system/unknown/clean.sh \ src/dist/bind/bin/tests/system/unknown/tests.sh cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \ src/dist/bind/bin/tests/system/unknown/ns1/example-in.db cvs rdiff -u -r1.1.1.5.8.3 -r1.1.1.5.8.4 src/dist/bind/lib/dns/rdata.c \ src/dist/bind/lib/dns/rdataslab.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/bind/CHANGES diff -u src/dist/bind/CHANGES:1.1.1.11.8.5 src/dist/bind/CHANGES:1.1.1.11.8.6 --- src/dist/bind/CHANGES:1.1.1.11.8.5 Thu Jul 7 20:27:41 2011 +++ src/dist/bind/CHANGES Tue Jun 5 19:52:25 2012 @@ -1,3 +1,8 @@ + --- 9.7.3-P4 released --- + +3331. [security] dns_rdataslab_fromrdataset could produce bad + rdataslabs. [RT #29644] + --- 9.7.3-P3 released --- 3124. [bug] Use an rdataset attribute flag to indicate Index: src/dist/bind/version diff -u src/dist/bind/version:1.1.1.11.8.5 src/dist/bind/version:1.1.1.11.8.6 --- src/dist/bind/version:1.1.1.11.8.5 Thu Jul 7 20:27:41 2011 +++ src/dist/bind/version Tue Jun 5 19:52:25 2012 @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=7 PATCHVER=3 RELEASETYPE=-P -RELEASEVER=3 +RELEASEVER=4 Index: src/dist/bind/bin/tests/system/unknown/clean.sh diff -u src/dist/bind/bin/tests/system/unknown/clean.sh:1.1.1.5.8.1 src/dist/bind/bin/tests/system/unknown/clean.sh:1.1.1.5.8.2 --- src/dist/bind/bin/tests/system/unknown/clean.sh:1.1.1.5.8.1 Sat Jun 18 11:36:03 2011 +++ src/dist/bind/bin/tests/system/unknown/clean.sh Tue Jun 5 19:52:25 2012 @@ -19,3 +19,6 @@ rm -f dig.out rm -f */named.memstats +rm -f */*.bk +rm -f */*.bk.* +rm -f ns3/Kexample.* Index: src/dist/bind/bin/tests/system/unknown/tests.sh diff -u src/dist/bind/bin/tests/system/unknown/tests.sh:1.1.1.5.8.1 src/dist/bind/bin/tests/system/unknown/tests.sh:1.1.1.5.8.2 --- src/dist/bind/bin/tests/system/unknown/tests.sh:1.1.1.5.8.1 Sat Jun 18 11:36:03 2011 +++ src/dist/bind/bin/tests/system/unknown/tests.sh Tue Jun 5 19:52:25 2012 @@ -22,13 +22,13 @@ SYSTEMTESTTOP=.. status=0 -DIGOPTS=@10.53.0.1 -p 5300 +DIGOPTS=-p 5300 echo I:querying for various representations of an IN A record for i in 1 2 3 4 5 6 7 8 9 10 11 12 do ret=0 - $DIG +short $DIGOPTS a$i.example a in dig.out || ret=1 + $DIG +short $DIGOPTS @10.53.0.1 a$i.example a in dig.out || ret=1 echo 10.0.0.1 | diff - dig.out || ret=1 if [ $ret != 0 ] then @@ -41,7 +41,7 @@ echo I:querying for various representat for i in 1 2 3 4 5 6 7 do ret=0 - $DIG +short $DIGOPTS txt$i.example txt in dig.out || ret=1 + $DIG +short $DIGOPTS @10.53.0.1 txt$i.example txt in dig.out || ret=1 echo 'hello' | diff - dig.out || ret=1 if [ $ret != 0 ] then @@ -54,7 +54,7 @@ echo I:querying for various representat for i in 1 2 3 do ret=0 - $DIG +short $DIGOPTS unk$i.example type123 in dig.out || ret=1 + $DIG +short $DIGOPTS @10.53.0.1 unk$i.example type123 in dig.out || ret=1 echo '\# 1 00' | diff - dig.out || ret=1 if [ $ret != 0 ] then @@ -67,7 +67,7 @@ echo I:querying for various representat for i in 1 2 do ret=0 - $DIG +short $DIGOPTS a$i.example a class10 dig.out || ret=1 + $DIG +short $DIGOPTS @10.53.0.1 a$i.example a class10 dig.out || ret=1 echo '\# 4 0A01' | diff - dig.out || ret=1 if [ $ret != 0 ] then @@ -80,7 +80,7 @@ echo I:querying for various representat for i in 1 2 3 4 do ret=0 - $DIG +short $DIGOPTS txt$i.example txt class10 dig.out || ret=1 + $DIG +short $DIGOPTS @10.53.0.1 txt$i.example txt class10 dig.out || ret=1 echo 'hello' | diff - dig.out || ret=1 if [ $ret != 0 ] then @@ -93,7 +93,7 @@ echo I:querying for various representat for i in 1 2
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Tue Jun 5 19:55:20 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket #1767 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.75 src/doc/CHANGES-5.0.3:1.1.2.76 --- src/doc/CHANGES-5.0.3:1.1.2.75 Sun Jun 3 08:48:22 2012 +++ src/doc/CHANGES-5.0.3 Tue Jun 5 19:55:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.75 2012/06/03 08:48:22 jdc Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.76 2012/06/05 19:55:19 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3040,3 +3040,16 @@ sys/kern/uipc_usrreq.c1.137 via SCM_RIGHT anxiliary socket messages. [martin, ticket #1766] +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/bin/tests/system/unknown/clean.sh patch +dist/bind/bin/tests/system/unknown/tests.sh patch +dist/bind/bin/tests/system/unknown/ns1/example-in.db patch +dist/bind/lib/dns/rdata.cpatch +dist/bind/lib/dns/rdataslab.cpatch + + Update bind to 9.7.3-P4: + 3331. [security] dns_rdataslab_fromrdataset could produce bad + rdataslabs. [RT #29644] + [christos, ticket #1767] +
CVS commit: [netbsd-5-0] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:40 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5-0]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/x68k/x68k/clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/x68k/clock.c diff -u src/sys/arch/x68k/x68k/clock.c:1.28 src/sys/arch/x68k/x68k/clock.c:1.28.10.1 --- src/sys/arch/x68k/x68k/clock.c:1.28 Wed Jun 25 08:14:59 2008 +++ src/sys/arch/x68k/x68k/clock.c Sun Jun 3 08:46:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $ */ +/* $NetBSD: clock.c,v 1.28.10.1 2012/06/03 08:46:40 jdc Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28.10.1 2012/06/03 08:46:40 jdc Exp $); #include clock.h @@ -182,7 +182,7 @@ cpu_initclocks(void) mfp_set_tcdr(CLOCKS_PER_SEC / hz); mfp_bit_set_ierb(MFP_INTR_TIMER_C); - mfp_set_tddr(0xff); /* maximum free run -- only 8 bits wide */ + mfp_set_tddr(0); /* maximum free run -- only 8 bits wide */ mfp_set_tcdcr(mfp_get_tcdcr() | 0x07); /* 1/200 prescaler */ tc_init(tc);
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:22 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Tickets 1765 and 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.74 src/doc/CHANGES-5.0.3:1.1.2.75 --- src/doc/CHANGES-5.0.3:1.1.2.74 Tue May 22 18:53:10 2012 +++ src/doc/CHANGES-5.0.3 Sun Jun 3 08:48:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.74 2012/05/22 18:53:10 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.75 2012/06/03 08:48:22 jdc Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3028,3 +3028,15 @@ crypto/dist/openssl/ssl/d1_enc.c patch Address CVE-2012-2333. [drochner, ticket #1762] +sys/arch/x68k/x68k/clock.c 1.34 + With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) + in Timer-D. It fixes the clock ticked faster when timecounter uses + mfp (as default choice). It was introduced in rev 1.24 in 2006. + Thanks tsutsui@ for many comments. + [isaki, ticket #1765] + +sys/kern/uipc_usrreq.c1.137 + Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors + via SCM_RIGHT anxiliary socket messages. + [martin, ticket #1766] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Tue May 22 18:52:40 UTC 2012
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: d1_enc.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1762):
crypto/dist/openssl/ssl/d1_enc.c: patch
pull in upstream rev.22547:
Sanity check record length before skipping explicit IV in TLS 1.2, 1.1
and DTLS to fix DoS attack.
(CVE-2012-2333)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 src/crypto/dist/openssl/ssl/d1_enc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/d1_enc.c
diff -u src/crypto/dist/openssl/ssl/d1_enc.c:1.1.1.3 src/crypto/dist/openssl/ssl/d1_enc.c:1.1.1.3.8.1
--- src/crypto/dist/openssl/ssl/d1_enc.c:1.1.1.3 Fri May 9 21:34:43 2008
+++ src/crypto/dist/openssl/ssl/d1_enc.c Tue May 22 18:52:40 2012
@@ -254,7 +254,7 @@ int dtls1_enc(SSL *s, int send)
}
/* TLS 1.0 does not bound the number of padding bytes by the block size.
* All of them must have value 'padding_length'. */
- if (i (int)rec-length)
+ if (i + bs (int)rec-length)
{
/* Incorrect padding. SSLerr() and ssl3_alert are done
* by caller: we don't want to reveal whether this is
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue May 22 18:53:11 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: TIcket 1762. To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.73 src/doc/CHANGES-5.0.3:1.1.2.74 --- src/doc/CHANGES-5.0.3:1.1.2.73 Sat May 19 17:04:02 2012 +++ src/doc/CHANGES-5.0.3 Tue May 22 18:53:10 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.73 2012/05/19 17:04:02 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.74 2012/05/22 18:53:10 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3023,3 +3023,8 @@ sys/netsmb/subr_mchain.c 1.21 PR#44092. [nakayama, ticket #1758] +crypto/dist/openssl/ssl/d1_enc.c patch + + Address CVE-2012-2333. + [drochner, ticket #1762] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/buffer
Module Name:src
Committed By: riz
Date: Sat May 19 16:29:58 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto/buffer [netbsd-5-0]: buffer.c
Log Message:
crypto/dist/openssl/crypto/buffer/buffer.c patch
Minor error code fix for ticket #1750.
[drochner, ticket #1752]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \
src/crypto/dist/openssl/crypto/buffer/buffer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/buffer/buffer.c
diff -u src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.1 src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.2
--- src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.1 Sat Apr 21 15:54:03 2012
+++ src/crypto/dist/openssl/crypto/buffer/buffer.c Sat May 19 16:29:58 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
/* This limit is sufficient to ensure (len+3)/3*4 2**31 */
if (len LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:30:23 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1752. To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.71 src/doc/CHANGES-5.0.3:1.1.2.72 --- src/doc/CHANGES-5.0.3:1.1.2.71 Sat Apr 21 23:12:17 2012 +++ src/doc/CHANGES-5.0.3 Sat May 19 16:30:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.71 2012/04/21 23:12:17 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.72 2012/05/19 16:30:23 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3012,3 +3012,8 @@ crypto/dist/openssl/crypto/buffer/buffer Address CVE-2012-2110. [spz, ticket #1750] +crypto/dist/openssl/crypto/buffer/buffer.c patch + + Minor error code fix for ticket #1750. + [drochner, ticket #1752] +
CVS commit: [netbsd-5-0] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:03:45 UTC 2012 Modified Files: src/sys/netsmb [netbsd-5-0]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1758): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.15.12.1 -r1.15.12.2 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.15.12.1 src/sys/netsmb/subr_mchain.c:1.15.12.2 --- src/sys/netsmb/subr_mchain.c:1.15.12.1 Fri Jul 16 18:48:41 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:03:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.15.12.1 2010/07/16 18:48:41 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.15.12.2 2012/05/19 17:03:45 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.12.1 2010/07/16 18:48:41 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.12.2 2012/05/19 17:03:45 riz Exp $); #include sys/param.h #include sys/systm.h @@ -67,7 +67,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -89,7 +89,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:04:02 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1758. To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.72 src/doc/CHANGES-5.0.3:1.1.2.73 --- src/doc/CHANGES-5.0.3:1.1.2.72 Sat May 19 16:30:23 2012 +++ src/doc/CHANGES-5.0.3 Sat May 19 17:04:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.72 2012/05/19 16:30:23 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.73 2012/05/19 17:04:02 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3017,3 +3017,9 @@ crypto/dist/openssl/crypto/buffer/buffer Minor error code fix for ticket #1750. [drochner, ticket #1752] +sys/netsmb/subr_mchain.c 1.21 + + Fix a regression introduced in netsmb by ticket #1426. + PR#44092. + [nakayama, ticket #1758] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: riz
Date: Sat Apr 21 15:54:03 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto [netbsd-5-0]: mem.c
src/crypto/dist/openssl/crypto/asn1 [netbsd-5-0]: a_d2i_fp.c
src/crypto/dist/openssl/crypto/buffer [netbsd-5-0]: buffer.c
src/sys/miscfs/genfs [netbsd-5-0]: genfs_io.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1750):
crypto/dist/openssl/crypto/mem.cpatch
crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch
crypto/dist/openssl/crypto/buffer/buffer.c patch
sys/miscfs/genfs/genfs_io.c patch
Address CVE-2012-2110.
[spz, ticket #1750]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.8.1 src/crypto/dist/openssl/crypto/mem.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.30.1 \
src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.8.1 \
src/crypto/dist/openssl/crypto/buffer/buffer.c
cvs rdiff -u -r1.13.4.2.2.1 -r1.13.4.2.2.2 src/sys/miscfs/genfs/genfs_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/mem.c
diff -u src/crypto/dist/openssl/crypto/mem.c:1.1.1.8 src/crypto/dist/openssl/crypto/mem.c:1.1.1.8.8.1
--- src/crypto/dist/openssl/crypto/mem.c:1.1.1.8 Fri May 9 21:34:14 2008
+++ src/crypto/dist/openssl/crypto/mem.c Sat Apr 21 15:54:02 2012
@@ -354,6 +354,10 @@ void *CRYPTO_realloc_clean(void *str, in
if (num = 0) return NULL;
+ /* We don't support shrinking the buffer. Note the memcpy that copies
+ * |old_len| bytes to the new buffer, below. */
+ if (num old_len) return NULL;
+
if (realloc_debug_func != NULL)
realloc_debug_func(str, NULL, num, file, line, 0);
ret=malloc_ex_func(num,file,line);
Index: src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c
diff -u src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c:1.1.1.3 src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c:1.1.1.3.30.1
--- src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c:1.1.1.3 Fri Nov 25 03:04:06 2005
+++ src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c Sat Apr 21 15:54:03 2012
@@ -57,6 +57,7 @@
*/
#include stdio.h
+#include limits.h
#include cryptlib.h
#include openssl/buffer.h
#include openssl/asn1_mac.h
@@ -143,17 +144,11 @@ static int asn1_d2i_read_bio(BIO *in, BU
BUF_MEM *b;
unsigned char *p;
int i;
- int ret=-1;
ASN1_const_CTX c;
- int want=HEADER_SIZE;
+ size_t want=HEADER_SIZE;
int eos=0;
-#if defined(__GNUC__) defined(__ia64)
- /* pathetic compiler bug in all known versions as of Nov. 2002 */
- long off=0;
-#else
- int off=0;
-#endif
- int len=0;
+ size_t off=0;
+ size_t len=0;
b=BUF_MEM_new();
if (b == NULL)
@@ -169,7 +164,7 @@ static int asn1_d2i_read_bio(BIO *in, BU
{
want-=(len-off);
- if (!BUF_MEM_grow_clean(b,len+want))
+ if (len + want len || !BUF_MEM_grow_clean(b,len+want))
{
ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
goto err;
@@ -181,7 +176,14 @@ static int asn1_d2i_read_bio(BIO *in, BU
goto err;
}
if (i 0)
+{
+if (len+i len)
+ {
+ ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+ goto err;
+ }
len+=i;
+}
}
/* else data already loaded */
@@ -206,6 +208,11 @@ static int asn1_d2i_read_bio(BIO *in, BU
{
/* no data body so go round again */
eos++;
+ if (eos 0)
+{
+ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_HEADER_TOO_LONG);
+goto err;
+}
want=HEADER_SIZE;
}
else if (eos (c.slen == 0) (c.tag == V_ASN1_EOC))
@@ -220,10 +227,16 @@ static int asn1_d2i_read_bio(BIO *in, BU
else
{
/* suck in c.slen bytes of data */
- want=(int)c.slen;
+ want=c.slen;
if (want (len-off))
{
want-=(len-off);
+if (want INT_MAX /* BIO_read takes an int length */ ||
+ len+want len)
+ {
+ ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+ goto err;
+ }
if (!BUF_MEM_grow_clean(b,len+want))
{
ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
@@ -238,11 +251,18 @@ static int asn1_d2i_read_bio(BIO *in, BU
ASN1_R_NOT_ENOUGH_DATA);
goto err;
}
+ /* This can't overflow because
+ * |len+want| didn't overflow. */
len+=i;
- want -= i;
+ want-=i;
}
}
- off+=(int)c.slen;
+ if (off + c.slen off)
+{
+ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+goto err;
+}
+ off+=c.slen;
if (eos = 0)
{
break;
@@ -252,9 +272,15 @@ static int asn1_d2i_read_bio(BIO *in, BU
}
}
+ if (off INT_MAX)
+ {
+ ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+ goto err;
+ }
+
*pb = b;
return off;
err:
if (b != NULL) BUF_MEM_free(b);
- return(ret);
+ return -1;
}
Index: src/crypto/dist/openssl/crypto/buffer/buffer.c
diff -u src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sat Apr 21 15:54:27 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1750. To generate a diff of this commit: cvs rdiff -u -r1.1.2.69 -r1.1.2.70 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.69 src/doc/CHANGES-5.0.3:1.1.2.70 --- src/doc/CHANGES-5.0.3:1.1.2.69 Wed Mar 21 21:31:03 2012 +++ src/doc/CHANGES-5.0.3 Sat Apr 21 15:54:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.69 2012/03/21 21:31:03 jdc Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.70 2012/04/21 15:54:27 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3004,3 +3004,11 @@ sys/dev/wscons/wsksymdef.h 1.62 s/portugese/portuguese/, spotted by Ari Constancio in PR misc/40202. [bouyer, ticket #1727] +crypto/dist/openssl/crypto/mem.c patch +crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch +crypto/dist/openssl/crypto/buffer/buffer.c patch +sys/miscfs/genfs/genfs_io.c patch + + Address CVE-2012-2110. + [spz, ticket #1750] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: riz
Date: Sat Apr 21 23:12:17 UTC 2012
Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.3
src/sys/miscfs/genfs [netbsd-5-0]: genfs_io.c
Log Message:
Back out a commit included in the ticket 1750 patch which obviously
doesn't belong there.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.70 -r1.1.2.71 src/doc/CHANGES-5.0.3
cvs rdiff -u -r1.13.4.2.2.2 -r1.13.4.2.2.3 src/sys/miscfs/genfs/genfs_io.c
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.0.3
diff -u src/doc/CHANGES-5.0.3:1.1.2.70 src/doc/CHANGES-5.0.3:1.1.2.71
--- src/doc/CHANGES-5.0.3:1.1.2.70 Sat Apr 21 15:54:27 2012
+++ src/doc/CHANGES-5.0.3 Sat Apr 21 23:12:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.70 2012/04/21 15:54:27 riz Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.71 2012/04/21 23:12:17 riz Exp $
A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
release:
@@ -3004,10 +3004,10 @@ sys/dev/wscons/wsksymdef.h 1.62
s/portugese/portuguese/, spotted by Ari Constancio in PR misc/40202.
[bouyer, ticket #1727]
+
crypto/dist/openssl/crypto/mem.c patch
crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch
crypto/dist/openssl/crypto/buffer/buffer.c patch
-sys/miscfs/genfs/genfs_io.c patch
Address CVE-2012-2110.
[spz, ticket #1750]
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.2.2 src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.2.3
--- src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.2.2 Sat Apr 21 15:54:03 2012
+++ src/sys/miscfs/genfs/genfs_io.c Sat Apr 21 23:12:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.13.4.2.2.2 2012/04/21 15:54:03 riz Exp $ */
+/* $NetBSD: genfs_io.c,v 1.13.4.2.2.3 2012/04/21 23:12:17 riz Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.13.4.2.2.2 2012/04/21 15:54:03 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.13.4.2.2.3 2012/04/21 23:12:17 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -802,19 +802,7 @@ genfs_do_putpages(struct vnode *vp, off_
KASSERT(origflags (PGO_CLEANIT|PGO_FREE|PGO_DEACTIVATE));
KASSERT((startoff PAGE_MASK) == 0 (endoff PAGE_MASK) == 0);
-// KASSERT(startoff endoff || endoff == 0);
-
-// replacement for the previous KASSERT to get debug output, by rmind
- if (!(startoff endoff || endoff == 0)) {
- proc_t *p = curproc;
- mutex_exit(slock);
- printf(genfs_do_putpages: startoff 0x%lx, endoff 0x%lx vm_map %p\n, (uint64_t) startoff, (uint64_t) endoff, p-p_vmspace-vm_map);
- void uvm_map_printit(struct vm_map *, bool, void (*)(const char *, ...));
- uvm_map_printit(p-p_vmspace-vm_map, true, printf);
- KASSERT(p == l-l_proc);
- Debugger(); /* Bang ! */
- return EIO;
- }
+ KASSERT(startoff endoff || endoff == 0);
UVMHIST_LOG(ubchist, vp %p pages %d off 0x%x len 0x%x,
vp, uobj-uo_npages, startoff, endoff - startoff);
CVS commit: [netbsd-5-0] src/sys/dev/wscons
Module Name:src
Committed By: jdc
Date: Wed Mar 21 21:27:42 UTC 2012
Modified Files:
src/sys/dev/wscons [netbsd-5-0]: wsemul_vt100.c wsemul_vt100_chars.c
wsksymdef.h
Log Message:
Pull up revisions (requested by bouyer in ticket #1727):
src/sys/dev/wscons/wsemul_vt100.c 1.31
src/sys/dev/wscons/wsemul_vt100_chars.c 1.12
src/sys/dev/wscons/wsksymdef.h1.62
s/portugese/portuguese/, spotted by Ari Constancio in PR misc/40202.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.70.1 src/sys/dev/wscons/wsemul_vt100.c
cvs rdiff -u -r1.11 -r1.11.92.1 src/sys/dev/wscons/wsemul_vt100_chars.c
cvs rdiff -u -r1.61 -r1.61.14.1 src/sys/dev/wscons/wsksymdef.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/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.30 src/sys/dev/wscons/wsemul_vt100.c:1.30.70.1
--- src/sys/dev/wscons/wsemul_vt100.c:1.30 Thu Nov 16 01:33:31 2006
+++ src/sys/dev/wscons/wsemul_vt100.c Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.30.70.1 2012/03/21 21:27:42 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: wsemul_vt100.c,v 1.30.70.1 2012/03/21 21:27:42 jdc Exp $);
#include opt_wsmsgattrs.h
@@ -662,7 +662,7 @@ wsemul_vt100_output_scs96(struct wsemul_
int nrc;
switch (c) {
- case '%': /* probably portugese */
+ case '%': /* probably portuguese */
newstate = VT100_EMUL_STATE_SCS96_PERCENT;
break;
case 'A': /* ISO-latin-1 supplemental */
@@ -713,7 +713,7 @@ static u_int
wsemul_vt100_output_scs96_percent(struct wsemul_vt100_emuldata *edp, u_char c)
{
switch (c) {
- case '6': /* portugese */
+ case '6': /* portuguese */
vt100_setnrc(edp, 8);
break;
default:
Index: src/sys/dev/wscons/wsemul_vt100_chars.c
diff -u src/sys/dev/wscons/wsemul_vt100_chars.c:1.11 src/sys/dev/wscons/wsemul_vt100_chars.c:1.11.92.1
--- src/sys/dev/wscons/wsemul_vt100_chars.c:1.11 Sun Dec 11 12:24:12 2005
+++ src/sys/dev/wscons/wsemul_vt100_chars.c Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $ */
+/* $NetBSD: wsemul_vt100_chars.c,v 1.11.92.1 2012/03/21 21:27:42 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: wsemul_vt100_chars.c,v 1.11.92.1 2012/03/21 21:27:42 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -124,7 +124,7 @@ static const struct {
/* norwegian /danish */
{{0x0023, 0x0040, 0x00c6, 0x00d8, 0x00c5, 0x005e,
0x005f, 0x0060, 0x00e6, 0x00f8, 0x00e5, 0x007e}},
- /* portugese */
+ /* portuguese */
{{0x0023, 0x0040, 0x00c3, 0x00c7, 0x00d5, 0x005e,
0x005f, 0x0060, 0x00e3, 0x00e7, 0x00f5, 0x007e}},
/* spanish */
Index: src/sys/dev/wscons/wsksymdef.h
diff -u src/sys/dev/wscons/wsksymdef.h:1.61 src/sys/dev/wscons/wsksymdef.h:1.61.14.1
--- src/sys/dev/wscons/wsksymdef.h:1.61 Wed May 21 07:39:24 2008
+++ src/sys/dev/wscons/wsksymdef.h Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsksymdef.h,v 1.61 2008/05/21 07:39:24 ghen Exp $ */
+/* $NetBSD: wsksymdef.h,v 1.61.14.1 2012/03/21 21:27:42 jdc Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -590,7 +590,7 @@ action(KB_IT, 0, 0x0500, it, , Italia
action(KB_JP, 0, 0x0800, jp, , Japanese) \
action(KB_NO, 0, 0x0a00, no, , Norwegian) \
action(KB_PL, 0, 0x0d00, pl, , Polish) \
-action(KB_PT, 0, 0x1100, pt, , Portugese) \
+action(KB_PT, 0, 0x1100, pt, , Portuguese) \
action(KB_RU, 0, 0x0e00, ru, , Russian) \
action(KB_ES, 0, 0x0b00, es, , Spanish) \
action(KB_SV, 0, 0x0900, sv, , Swedish) \
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Wed Mar 21 21:31:04 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1727. To generate a diff of this commit: cvs rdiff -u -r1.1.2.68 -r1.1.2.69 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.68 src/doc/CHANGES-5.0.3:1.1.2.69 --- src/doc/CHANGES-5.0.3:1.1.2.68 Sat Mar 17 19:32:13 2012 +++ src/doc/CHANGES-5.0.3 Wed Mar 21 21:31:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.68 2012/03/17 19:32:13 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.69 2012/03/21 21:31:03 jdc Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2998,3 +2998,9 @@ sbin/mount/mount.81.73, 1.74 Clarify UFS2 superblock format stuff. Bump date. Fix PR 45166. [dholland, ticket #1743] +sys/dev/wscons/wsemul_vt100.c 1.31 +sys/dev/wscons/wsemul_vt100_chars.c 1.12 +sys/dev/wscons/wsksymdef.h 1.62 + + s/portugese/portuguese/, spotted by Ari Constancio in PR misc/40202. + [bouyer, ticket #1727]
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:45:10 UTC 2012
Modified Files:
src/doc [netbsd-5-0]: HACKS
src/sys/arch/sparc64/conf [netbsd-5-0]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-5-0]: locore.s
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1736):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.110.2.2 -r1.110.2.2.2.1 src/doc/HACKS
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.118 -r1.118.22.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.286.6.1 -r1.286.6.2 src/sys/arch/sparc64/sparc64/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.110.2.2 src/doc/HACKS:1.110.2.2.2.1
--- src/doc/HACKS:1.110.2.2 Sat Dec 6 21:27:36 2008
+++ src/doc/HACKS Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.110.2.2 2008/12/06 21:27:36 snj Exp $
+# $NetBSD: HACKS,v 1.110.2.2.2.1 2012/03/17 18:45:09 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -542,18 +542,6 @@ port m68000
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port mips
hack mips-shared-linker-load-address
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.8.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 Sat Aug 30 13:23:55 2008
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.67 2008/08/30 13:23:55 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.67.8.1 2012/03/17 18:45:09 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.118 src/sys/arch/sparc64/conf/files.sparc64:1.118.22.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.118 Wed Feb 20 21:43:35 2008
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.118 2008/02/20 21:43:35 drochner Exp $
+# $NetBSD: files.sparc64,v 1.118.22.1 2012/03/17 18:45:09 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -247,8 +247,5 @@ file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
-
# OpenFirmware convenience stuff
file dev/ofw/ofw_subr.c
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.286.6.1 src/sys/arch/sparc64/sparc64/locore.s:1.286.6.2
--- src/sys/arch/sparc64/sparc64/locore.s:1.286.6.1 Fri Jun 5 18:29:46 2009
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 18:45:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.286.6.1 2009/06/05 18:29:46 snj Exp $ */
+/* $NetBSD: locore.s,v 1.286.6.2 2012/03/17 18:45:10 bouyer Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo
CVS commit: [netbsd-5-0] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:45:46 UTC 2012
Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.3
Log Message:
ticket 1736
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-5.0.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.0.3
diff -u src/doc/CHANGES-5.0.3:1.1.2.64 src/doc/CHANGES-5.0.3:1.1.2.65
--- src/doc/CHANGES-5.0.3:1.1.2.64 Fri Mar 2 17:44:01 2012
+++ src/doc/CHANGES-5.0.3 Sat Mar 17 18:45:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.64 2012/03/02 17:44:01 riz Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.65 2012/03/17 18:45:45 bouyer Exp $
A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
release:
@@ -2962,3 +2962,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1734]
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1736]
+
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:14:15 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-0]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1741):
sys/kern/kern_sig.c: revision 1.300
kpsignal2: do not make the signal pending twice when tracing the process,
also update a comment and add an assert. Fixes PR/42309 by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.5.2.1 -r1.289.4.5.2.2 src/sys/kern/kern_sig.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/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.289.4.5.2.1 src/sys/kern/kern_sig.c:1.289.4.5.2.2
--- src/sys/kern/kern_sig.c:1.289.4.5.2.1 Sat Jan 16 17:32:45 2010
+++ src/sys/kern/kern_sig.c Sat Mar 17 19:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $ */
+/* $NetBSD: kern_sig.c,v 1.289.4.5.2.2 2012/03/17 19:14:15 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5.2.2 2012/03/17 19:14:15 bouyer Exp $);
#include opt_ptrace.h
#include opt_compat_sunos.h
@@ -1382,15 +1382,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
goto out;
} else {
/*
- * Process is stopped or stopping. If traced, then no
- * further action is necessary.
+ * Process is stopped or stopping.
+ * - If traced, then no action is needed, unless killing.
+ * - Run the process only if sending SIGCONT or SIGKILL.
*/
- if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL)
+ if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL) {
goto out;
-
- /*
- * Run the process only if sending SIGCONT or SIGKILL.
- */
+ }
if ((prop SA_CONT) != 0 || signo == SIGKILL) {
/*
* Re-adjust p_nstopchild if the process wasn't
@@ -1398,9 +1396,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
*/
p-p_stat = SACTIVE;
p-p_sflag = ~PS_STOPPING;
- if (!p-p_waited)
+ if (!p-p_waited) {
p-p_pptr-p_nstopchild--;
-
+ }
+ if (p-p_slflag PSL_TRACED) {
+KASSERT(signo == SIGKILL);
+goto deliver;
+ }
/*
* Do not make signal pending if SIGCONT is default.
*
@@ -1423,6 +1425,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
/*
* Make signal pending.
*/
+ KASSERT((p-p_slflag PSL_TRACED) == 0);
sigput(p-p_sigpend, p, kp);
deliver:
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:14:44 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1741 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.65 src/doc/CHANGES-5.0.3:1.1.2.66 --- src/doc/CHANGES-5.0.3:1.1.2.65 Sat Mar 17 18:45:45 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:14:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.65 2012/03/17 18:45:45 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.66 2012/03/17 19:14:44 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2980,3 +2980,10 @@ sys/arch/sparc64/sparc64/locore.s 1.340 result of pseg_get and pmap_extact sometimes gets screwed up. [nakayama, ticket #1736] +sys/kern/kern_sig.c1.300 + + kpsignal2: do not make the signal pending twice when tracing the + process, also update a comment and add an assert. + Fixes PR/42309 by Nicolas Joly. + [christos, ticket #1741] +
CVS commit: [netbsd-5-0] src/usr.bin/ktruss
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:23:29 UTC 2012
Modified Files:
src/usr.bin/ktruss [netbsd-5-0]: makeerrnos.sh
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #1742):
usr.bin/ktruss/makeerrnos.sh: revision 1.6
Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
portable. The latter is not supported by Mac OS X Lion.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/usr.bin/ktruss/makeerrnos.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.8.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 19:23:29 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.8.1 2012/03/17 19:23:29 bouyer Exp $
if [ $# -ne 3 ]; then
echo usage: makeerrnos.sh errno.h signal.h output
@@ -35,7 +35,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
elines=`grep '{ SIG' $CFILE | wc -l`
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:23:47 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1742 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.66 src/doc/CHANGES-5.0.3:1.1.2.67 --- src/doc/CHANGES-5.0.3:1.1.2.66 Sat Mar 17 19:14:44 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:23:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.66 2012/03/17 19:14:44 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.67 2012/03/17 19:23:46 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2987,3 +2987,9 @@ sys/kern/kern_sig.c1.300 Fixes PR/42309 by Nicolas Joly. [christos, ticket #1741] +usr.bin/ktruss/makeerrnos.sh 1.6 + + Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more + portable. The latter is not supported by Mac OS X Lion. + [dyoung, ticket #1742] +
CVS commit: [netbsd-5-0] src/sbin/mount
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:31:54 UTC 2012 Modified Files: src/sbin/mount [netbsd-5-0]: mount.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1743): sbin/mount/mount.8: revision 1.73 sbin/mount/mount.8: revision 1.74 Clarify UFS2 superblock format stuff. Bump date. Improve previous; thanks to tsutsui-san for reminding me of the proper reference. PR 45166 To generate a diff of this commit: cvs rdiff -u -r1.62.2.3 -r1.62.2.3.2.1 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.62.2.3 src/sbin/mount/mount.8:1.62.2.3.2.1 --- src/sbin/mount/mount.8:1.62.2.3 Thu Jan 22 23:03:17 2009 +++ src/sbin/mount/mount.8 Sat Mar 17 19:31:54 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.62.2.3 2009/01/22 23:03:17 snj Exp $ +.\ $NetBSD: mount.8,v 1.62.2.3.2.1 2012/03/17 19:31:54 bouyer Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.8 8.8 (Berkeley) 6/16/94 .\ -.Dd January 20, 2009 +.Dd July 22, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -292,7 +292,7 @@ It requires the .Dv SOFTDEP option to be enabled in the running kernel. .It Cm log -(FFS only with UFS2 superblock layout) +(FFS only) Mount the file system with .Xr wapbl 4 meta-data journaling. @@ -313,6 +313,16 @@ option to be enabled in the running kern See .Xr wapbl 4 for more information. +This option requires the +.Dq UFS2 +.Pq level 4 +superblock layout, which is the default for newly created FFSv1 and +FFSv2 file systems. +To update an old file system with an earlier superblock format, +use the +.Fl c +option of +.Xr fsck_ffs 8 . .It Cm symperm Recognize permission of symbolic link when reading or traversing link. .It Cm sync
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:32:13 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1743 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.67 src/doc/CHANGES-5.0.3:1.1.2.68 --- src/doc/CHANGES-5.0.3:1.1.2.67 Sat Mar 17 19:23:46 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:32:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.67 2012/03/17 19:23:46 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.68 2012/03/17 19:32:13 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2993,3 +2993,8 @@ usr.bin/ktruss/makeerrnos.sh 1.6 portable. The latter is not supported by Mac OS X Lion. [dyoung, ticket #1742] +sbin/mount/mount.81.73, 1.74 + + Clarify UFS2 superblock format stuff. Bump date. Fix PR 45166. + [dholland, ticket #1743] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 17:43:45 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: northamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1734): doc/3RDPARTY: revision 1.921 Import tzdata2012b from a rel=nofollow href=ftp://munnari.oz.au/pub/tzdata2012b.tar.gz;ftp://munnari.oz.au/pub/tzdata2012b.tar.gz/a. Changes since tzdata2012a: Most significantly, summer time in Cuba has been delayed 3 weeks (now starts April 1 rather than March 11). Since Mar 11 (the old start date, as listed in 2012a) is just a little over a week away, this change is urgent. Less importantly, an excess tab in one of the changes in zone.tab in 2012a has been removed. tzcode2012b and tzdata2012b ahve been released. We have updated to tzdata2012b. To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.5 -r1.647.2.6.2.6 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.42.6.2 -r1.1.1.42.6.3 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.33.6.2 -r1.1.1.33.6.3 src/share/zoneinfo/zone.tab 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.647.2.6.2.5 src/doc/3RDPARTY:1.647.2.6.2.6 --- src/doc/3RDPARTY:1.647.2.6.2.5 Fri Mar 2 06:41:24 2012 +++ src/doc/3RDPARTY Fri Mar 2 17:43:43 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.5 2012/03/02 06:41:24 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.6 2012/03/02 17:43:43 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012a / tzdata2012a -Current Vers: tzcode2011i / tzdata2012a +Version: tzcode2012b / tzdata2012b +Current Vers: tzcode2011i / tzdata2012b Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/northamerica diff -u src/share/zoneinfo/northamerica:1.1.1.42.6.2 src/share/zoneinfo/northamerica:1.1.1.42.6.3 --- src/share/zoneinfo/northamerica:1.1.1.42.6.2 Fri Mar 2 03:27:56 2012 +++ src/share/zoneinfo/northamerica Fri Mar 2 17:43:44 2012 @@ -1,5 +1,5 @@ # pre -# @(#)northamerica 8.52 +# @(#)northamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -2783,6 +2783,20 @@ Zone America/Costa_Rica -5:36:20 - LMT 1 # a href=http://www.timeanddate.com/news/time/cuba-time-changes-2011.html; # http://www.timeanddate.com/news/time/cuba-time-changes-2011.html # /a +# +# From Steffen Thorsen (2012-03-01) +# According to Radio Reloj, Cuba will start DST on Midnight between March +# 31 and April 1. +# +# Radio Reloj has the following info (Spanish): +# a href=http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril; +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril +# /a +# +# Our info on it: +# a href=http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html; +# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html +# /a # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D @@ -2820,8 +2834,9 @@ Rule Cuba 2008 only - Mar Sun=15 0:00s Rule Cuba 2009 2010 - Mar Sun=8 0:00s 1:00 D Rule Cuba 2011 only - Mar Sun=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S -Rule Cuba 2012 max - Mar Sun=8 0:00s 1:00 D +Rule Cuba 2012 only - Apr 1 0:00s 1:00 D Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2013 max - Mar Sun=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 Index: src/share/zoneinfo/zone.tab diff -u src/share/zoneinfo/zone.tab:1.1.1.33.6.2 src/share/zoneinfo/zone.tab:1.1.1.33.6.3 --- src/share/zoneinfo/zone.tab:1.1.1.33.6.2 Fri Mar 2 03:27:57 2012 +++ src/share/zoneinfo/zone.tab Fri Mar 2 17:43:44 2012 @@ -1,5 +1,5 @@ # pre -# @(#)zone.tab 8.54 +# @(#)zone.tab 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -131,7 +131,7 @@ CA +5333-11328 America/Edmonton Mountain CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories -CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia +CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek Fort Saint John, British Columbia CA +4916-12307 America/Vancouver Pacific
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 17:44:02 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1734. To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.63 src/doc/CHANGES-5.0.3:1.1.2.64 --- src/doc/CHANGES-5.0.3:1.1.2.63 Fri Mar 2 06:41:58 2012 +++ src/doc/CHANGES-5.0.3 Fri Mar 2 17:44:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.63 2012/03/02 06:41:58 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.64 2012/03/02 17:44:01 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2955,3 +2955,10 @@ share/zoneinfo/zone.tabpatch Update to tzdata2012a. [apb, ticket #1733] +doc/3RDPARTY 1.921 +share/zoneinfo/northamerica patch +share/zoneinfo/zone.tabpatch + + Update to tzdata2012b. + [apb, ticket #1734] +
CVS commit: [netbsd-5-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 2 03:27:57 UTC 2012 Modified Files: src/share/zoneinfo [netbsd-5-0]: antarctica asia australasia europe leapseconds northamerica southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1733): share/zoneinfo/antarctica: patch share/zoneinfo/asia: patch share/zoneinfo/australasia: patch share/zoneinfo/europe: patch share/zoneinfo/leapseconds: patch share/zoneinfo/northamerica: patch share/zoneinfo/southamerica: patch share/zoneinfo/zone.tab: patch Import tzdata2012a from ftp://munnari.oz.au/pub/tzdata2012a.tar.gz. Major changes since tzdata2011n: Chile 2011/2012 and 2012/2013 summer time date adjustments. Falkland Islands onto permanent summer time (were assuming for the foreseeable future, though 2012 is all were fairly certain of.) Armenia has abolished Summer Time. Tokelau jumped the International Date Line back last December (just the same as their near neighbour, Samoa). America/Creston is a new zone for a small area of British Columbia There will be a leapsecond 2012-06-30 23:59:60 UTC. To generate a diff of this commit: cvs rdiff -u -r1.1.1.17.16.1 -r1.1.1.17.16.2 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.6.1 -r1.1.1.44.6.2 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.1 -r1.17.6.2 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.6.1 -r1.1.1.38.6.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.15.6.1 -r1.1.1.15.6.2 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.42.6.1 -r1.1.1.42.6.2 src/share/zoneinfo/northamerica \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.6.1 -r1.1.1.33.6.2 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/antarctica diff -u src/share/zoneinfo/antarctica:1.1.1.17.16.1 src/share/zoneinfo/antarctica:1.1.1.17.16.2 --- src/share/zoneinfo/antarctica:1.1.1.17.16.1 Wed Nov 2 18:16:17 2011 +++ src/share/zoneinfo/antarctica Fri Mar 2 03:27:56 2012 @@ -1,5 +1,5 @@ # pre -# @(#)antarctica 8.9 +# @(#)antarctica 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -42,8 +42,19 @@ Rule ChileAQ 1997 only - Mar 30 3:00u 0 Rule ChileAQ 1998 only - Mar Sun=9 3:00u 0 - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - -Rule ChileAQ 1999 max - Oct Sun=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun=9 3:00u 0 - +Rule ChileAQ 1999 2010 - Oct Sun=9 4:00u 1:00 S +Rule ChileAQ 2000 2007 - Mar Sun=9 3:00u 0 - +# N.B.: the end of March 29 in Chile is March 30 in Universal time, +# which is used below in specifying the transition. +Rule ChileAQ 2008 only - Mar 30 3:00u 0 - +Rule ChileAQ 2009 only - Mar Sun=9 3:00u 0 - +Rule ChileAQ 2010 only - Apr Sun=1 3:00u 0 - +Rule ChileAQ 2011 only - May Sun=2 3:00u 0 - +Rule ChileAQ 2011 only - Aug Sun=16 4:00u 1:00 S +Rule ChileAQ 2012 only - Apr Sun=23 3:00u 0 - +Rule ChileAQ 2012 only - Sep Sun=2 4:00u 1:00 S +Rule ChileAQ 2013 max - Mar Sun=9 3:00u 0 - +Rule ChileAQ 2013 max - Oct Sun=9 4:00u 1:00 S # These rules are stolen from the `australasia' file. Rule AusAQ 1917 only - Jan 1 0:01 1:00 - @@ -142,12 +153,16 @@ Zone Antarctica/Casey 0 - zzz 1969 # Western (Aus) Standard Time 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - WST 2011 Oct 28 2:00 + 11:00 - CAST 2012 Feb 21 17:00u 8:00 - WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u + 7:00 - DAVT 2011 Oct 28 2:00 + 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00 - MAWT 2009 Oct 18 2:00 Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.1 src/share/zoneinfo/asia:1.1.1.44.6.2 --- src/share/zoneinfo/asia:1.1.1.44.6.1 Wed Nov 2 18:16:17 2011 +++ src/share/zoneinfo/asia Fri Mar 2 03:27:56 2012 @@ -1,4 +1,4 @@ -# @(#)asia 8.69 +# @(#)asia 8.70 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,10 +77,6 @@ Rule RussiaAsia 1993 max - Mar lastSun Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - -# From Arthur David Olson (2011-06-15): -# While Russia abandoned DST in 2011, Armenia may choose to -# follow Russia's old rules. - # Afghanistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 @@ -97,6 +93,21 @@ Zone Asia/Kabul 4:36:48 - LMT 1890 # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991, # but started switching at 3:00s in 1998. + +# From
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 03:28:21 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1733 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.61 src/doc/CHANGES-5.0.3:1.1.2.62 --- src/doc/CHANGES-5.0.3:1.1.2.61 Sun Feb 5 12:45:54 2012 +++ src/doc/CHANGES-5.0.3 Fri Mar 2 03:28:21 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.61 2012/02/05 12:45:54 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.62 2012/03/02 03:28:21 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2941,3 +2941,15 @@ sys/net/route.c 1.126 portion. [christos, ticket #1721] +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/leapseconds patch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch + + Update to tzdata2012a. + [apb, ticket #1733] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 06:41:26 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-5-0]: mi src/doc [netbsd-5-0]: 3RDPARTY Log Message: Pull up following revision(s) (requested by apb in ticket #1733): doc/3RDPARTY: revision 1.920 distrib/sets/lists/base/mi: revision 1.988 tzcode2012a and and tzdata2012a have been released. We have updated to tzdata2012a but still have tzcode2011i. Add Home Page: http://www.iana.org/time-zones;. Add apb to Responsible. Add usr/share/zoneinfo/America/Creston to set lists, after tzdata2012a update. To generate a diff of this commit: cvs rdiff -u -r1.780.2.6.2.4 -r1.780.2.6.2.5 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.647.2.6.2.4 -r1.647.2.6.2.5 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.6.2.4 src/distrib/sets/lists/base/mi:1.780.2.6.2.5 --- src/distrib/sets/lists/base/mi:1.780.2.6.2.4 Wed Nov 2 18:16:16 2011 +++ src/distrib/sets/lists/base/mi Fri Mar 2 06:41:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.6.2.4 2011/11/02 18:16:16 riz Exp $ +# $NetBSD: mi,v 1.780.2.6.2.5 2012/03/02 06:41:25 riz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4333,6 +4333,7 @@ ./usr/share/zoneinfo/America/Costa_Rica base-sys-share share ./usr/share/zoneinfo/America/Cuiaba base-sys-share share ./usr/share/zoneinfo/America/Curacao base-sys-share share +./usr/share/zoneinfo/America/Creston base-sys-share share ./usr/share/zoneinfo/America/Danmarkshavn base-sys-share share ./usr/share/zoneinfo/America/Dawson base-sys-share share ./usr/share/zoneinfo/America/Dawson_Creek base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.6.2.4 src/doc/3RDPARTY:1.647.2.6.2.5 --- src/doc/3RDPARTY:1.647.2.6.2.4 Wed Nov 2 18:16:15 2011 +++ src/doc/3RDPARTY Fri Mar 2 06:41:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.4 2011/11/02 18:16:15 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.5 2012/03/02 06:41:24 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,15 +924,15 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2011i / tzdata2011l -Current Vers: tzcode2011i / tzdata2011l +Version: tzcode2012a / tzdata2012a +Current Vers: tzcode2011i / tzdata2012a Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ -Home Page: +Home Page: http://www.iana.org/time-zones Mailing List: t...@iana.org -Responsible: kleink, christos +Responsible: kleink, christos, apb License: Public domain Notes: Use src/lib/libc/time/tzcode2netbsd to prepare the source tree
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 06:41:59 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1733 addendum. To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.62 src/doc/CHANGES-5.0.3:1.1.2.63 --- src/doc/CHANGES-5.0.3:1.1.2.62 Fri Mar 2 03:28:21 2012 +++ src/doc/CHANGES-5.0.3 Fri Mar 2 06:41:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.62 2012/03/02 03:28:21 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.63 2012/03/02 06:41:58 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2941,6 +2941,8 @@ sys/net/route.c 1.126 portion. [christos, ticket #1721] +distrib/sets/lists/base/mi 1.988 +doc/3RDPARTY 1.920 via patch share/zoneinfo/antarctica patch share/zoneinfo/asiapatch share/zoneinfo/australasia patch
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sun Feb 5 12:28:15 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-0]: kern_fork.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1628):
sys/kern/kern_fork.c: revision 1.184 via patch
fork1: fix stop-on-fork case, lend a correct lock to LWP for LSSTOP state.
Fixes PR/44935.
To generate a diff of this commit:
cvs rdiff -u -r1.171.8.1 -r1.171.8.2 src/sys/kern/kern_fork.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/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.171.8.1 src/sys/kern/kern_fork.c:1.171.8.2
--- src/sys/kern/kern_fork.c:1.171.8.1 Sat Jun 18 16:36:09 2011
+++ src/sys/kern/kern_fork.c Sun Feb 5 12:28:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.171.8.1 2011/06/18 16:36:09 bouyer Exp $ */
+/* $NetBSD: kern_fork.c,v 1.171.8.2 2012/02/05 12:28:14 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.8.1 2011/06/18 16:36:09 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.8.2 2012/02/05 12:28:14 bouyer Exp $);
#include opt_ktrace.h
@@ -509,13 +509,15 @@ fork1(struct lwp *l1, int flags, int exi
p2-p_acflag = AFORK;
lwp_lock(l2);
if (p2-p_sflag PS_STOPFORK) {
+ struct schedstate_percpu *spc = l2-l_cpu-ci_schedstate;
p2-p_nrlwps = 0;
p2-p_stat = SSTOP;
p2-p_waited = 0;
p1-p_nstopchild++;
l2-l_stat = LSSTOP;
l2-l_flag |= tmp;
- lwp_unlock(l2);
+ KASSERT(l2-l_wchan == NULL);
+ lwp_unlock_to(l2, spc-spc_lwplock);
} else {
p2-p_nrlwps = 1;
p2-p_stat = SACTIVE;
@@ -524,7 +526,6 @@ fork1(struct lwp *l1, int flags, int exi
sched_enqueue(l2, false);
lwp_unlock(l2);
}
-
mutex_exit(p2-p_lock);
/*
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:30:33 UTC 2012 Modified Files: src/sys/kern [netbsd-5-0]: vfs_bio.c Log Message: Pull up following revision(s) (requested by rmind in ticket #1718): sys/kern/vfs_bio.c: revision 1.233 sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.210.6.1 src/sys/kern/vfs_bio.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/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.210 src/sys/kern/vfs_bio.c:1.210.6.1 --- src/sys/kern/vfs_bio.c:1.210 Thu Sep 11 09:14:46 2008 +++ src/sys/kern/vfs_bio.c Sun Feb 5 12:30:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.210.6.1 2012/02/05 12:30:33 bouyer Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -109,7 +109,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210.6.1 2012/02/05 12:30:33 bouyer Exp $); #include fs_ffs.h #include opt_bufcache.h @@ -1788,6 +1788,7 @@ sysctl_dobuf(SYSCTLFN_ARGS) break; } mutex_exit(bufcache_lock); + sysctl_relock(); goto retry; } dp += elem_size;
CVS commit: [netbsd-5-0] src/sys/net
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:35:10 UTC 2012 Modified Files: src/sys/net [netbsd-5-0]: route.c Log Message: Pull up following revision(s) (requested by christos in ticket #1721): sys/net/route.c: revision 1.126 Count length from the beginning of the structure not the sa_data portion. =46rom skrll@ To generate a diff of this commit: cvs rdiff -u -r1.113.4.1 -r1.113.4.1.2.1 src/sys/net/route.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/route.c diff -u src/sys/net/route.c:1.113.4.1 src/sys/net/route.c:1.113.4.1.2.1 --- src/sys/net/route.c:1.113.4.1 Fri Apr 3 17:59:03 2009 +++ src/sys/net/route.c Sun Feb 5 12:35:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $ */ +/* $NetBSD: route.c,v 1.113.4.1.2.1 2012/02/05 12:35:10 bouyer Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ #include opt_route.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1.2.1 2012/02/05 12:35:10 bouyer Exp $); #include sys/param.h #include sys/sysctl.h @@ -847,8 +847,8 @@ rt_maskedcopy(const struct sockaddr *src const char *netmaskp = netmask-sa_data[0], *srcp = src-sa_data[0]; char *dstp = dst-sa_data[0]; - const char *maskend = dstp + MIN(netmask-sa_len, src-sa_len); - const char *srcend = dstp + src-sa_len; + const char *maskend = (char *)dst + MIN(netmask-sa_len, src-sa_len); + const char *srcend = (char *)dst + src-sa_len; dst-sa_len = src-sa_len; dst-sa_family = src-sa_family;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:45:54 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1628, 1718, 1721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.60 src/doc/CHANGES-5.0.3:1.1.2.61 --- src/doc/CHANGES-5.0.3:1.1.2.60 Fri Jan 27 19:32:31 2012 +++ src/doc/CHANGES-5.0.3 Sun Feb 5 12:45:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.60 2012/01/27 19:32:31 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.61 2012/02/05 12:45:54 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2923,3 +2923,21 @@ crypto/dist/ssh/auth-options.c patch Prevent minor information disclosure in ssh. [drochner, ticket #1717] +sys/kern/kern_fork.c1.184 via patch + + fork1: fix stop-on-fork case, lend a correct lock to LWP for + LSSTOP state. + Fixes PR/44935. + [rmind, ticket #1628] + +sys/kern/vfs_bio.c1.233 + + sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. + [rmind, ticket #1718] + +sys/net/route.c 1.126 + + Count length from the beginning of the structure not the sa_data + portion. + [christos, ticket #1721] +
CVS commit: [netbsd-5-0] src/crypto/dist/ssh
Module Name:src Committed By: riz Date: Fri Jan 27 19:32:10 UTC 2012 Modified Files: src/crypto/dist/ssh [netbsd-5-0]: auth-options.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1717): crypto/dist/ssh/auth-options.c patch Prevent minor information disclosure in ssh. [drochner, ticket #1717] To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.12.1 src/crypto/dist/ssh/auth-options.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ssh/auth-options.c diff -u src/crypto/dist/ssh/auth-options.c:1.9 src/crypto/dist/ssh/auth-options.c:1.9.12.1 --- src/crypto/dist/ssh/auth-options.c:1.9 Sun Apr 6 23:38:19 2008 +++ src/crypto/dist/ssh/auth-options.c Fri Jan 27 19:32:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: auth-options.c,v 1.9 2008/04/06 23:38:19 christos Exp $ */ +/* $NetBSD: auth-options.c,v 1.9.12.1 2012/01/27 19:32:10 riz Exp $ */ /* $OpenBSD: auth-options.c,v 1.41 2008/03/26 21:28:14 djm Exp $ */ /* * Author: Tatu Ylonen y...@cs.hut.fi @@ -12,7 +12,7 @@ */ #include includes.h -__RCSID($NetBSD: auth-options.c,v 1.9 2008/04/06 23:38:19 christos Exp $); +__RCSID($NetBSD: auth-options.c,v 1.9.12.1 2012/01/27 19:32:10 riz Exp $); #include sys/types.h #include netdb.h @@ -156,7 +156,7 @@ auth_parse_options(struct passwd *pw, ch goto bad_option; } forced_command[i] = '\0'; - auth_debug_add(Forced command: %.900s, forced_command); + auth_debug_add(Forced command.); opts++; goto next_option; }
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Wed Jan 25 18:55:04 UTC 2012
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: d1_pkt.c
Log Message:
Apply patch (requested by drochner in ticket #1710):
crypto/dist/openssl/ssl/d1_pkt.c
Address CVS-2012-0050.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 src/crypto/dist/openssl/ssl/d1_pkt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/d1_pkt.c
diff -u src/crypto/dist/openssl/ssl/d1_pkt.c:1.1.1.5.8.1 src/crypto/dist/openssl/ssl/d1_pkt.c:1.1.1.5.8.2
--- src/crypto/dist/openssl/ssl/d1_pkt.c:1.1.1.5.8.1 Sun Jul 5 00:31:20 2009
+++ src/crypto/dist/openssl/ssl/d1_pkt.c Wed Jan 25 18:55:04 2012
@@ -375,6 +375,8 @@ dtls1_process_record(SSL *s)
SSL3_RECORD *rr;
unsigned int mac_size;
unsigned char md[EVP_MAX_MD_SIZE];
+ int decryption_failed_or_bad_record_mac = 0;
+ unsigned char *mac = NULL;
rr= (s-s3-rrec);
@@ -409,12 +411,10 @@ dtls1_process_record(SSL *s)
enc_err = s-method-ssl3_enc-enc(s,0);
if (enc_err = 0)
{
- if (enc_err == 0)
- /* SSLerr() and ssl3_send_alert() have been called */
- goto err;
-
- /* otherwise enc_err == -1 */
- goto decryption_failed_or_bad_record_mac;
+ /* To minimize information leaked via timing, we will always
+ * perform all computations before discarding the message.
+ */
+ decryption_failed_or_bad_record_mac = 1;
}
#ifdef TLS_DEBUG
@@ -440,28 +440,32 @@ printf(\n);
SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_PRE_MAC_LENGTH_TOO_LONG);
goto f_err;
#else
- goto decryption_failed_or_bad_record_mac;
+ decryption_failed_or_bad_record_mac = 1;
#endif
}
/* check the MAC for rr-input (it's in mac_size bytes at the tail) */
- if (rr-length mac_size)
+ if (rr-length = mac_size)
{
-#if 0 /* OK only for stream ciphers */
- al=SSL_AD_DECODE_ERROR;
- SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_LENGTH_TOO_SHORT);
- goto f_err;
-#else
- goto decryption_failed_or_bad_record_mac;
-#endif
+ rr-length -= mac_size;
+ mac = rr-data[rr-length];
}
- rr-length-=mac_size;
+ else
+ rr-length = 0;
i=s-method-ssl3_enc-mac(s,md,0);
- if (memcmp(md,(rr-data[rr-length]),mac_size) != 0)
+ if (i 0 || mac == NULL || memcmp(md, mac, mac_size) != 0)
{
- goto decryption_failed_or_bad_record_mac;
+ decryption_failed_or_bad_record_mac = 1;
}
}
+ if (decryption_failed_or_bad_record_mac)
+ {
+ /* decryption failed, silently discard message */
+ rr-length = 0;
+ s-packet_length = 0;
+ goto err;
+ }
+
/* r-length is now just compressed */
if (s-expand != NULL)
{
@@ -500,14 +504,6 @@ printf(\n);
dtls1_record_bitmap_update(s, (s-d1-bitmap));/* Mark receipt of record. */
return(1);
-decryption_failed_or_bad_record_mac:
- /* Separate 'decryption_failed' alert was introduced with TLS 1.0,
- * SSL 3.0 only has 'bad_record_mac'. But unless a decryption
- * failure is directly visible from the ciphertext anyway,
- * we should not reveal which kind of error occured -- this
- * might become visible to an attacker (e.g. via logfile) */
- al=SSL_AD_BAD_RECORD_MAC;
- SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
f_err:
ssl3_send_alert(s,SSL3_AL_FATAL,al);
err:
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/x509v3
Module Name:src
Committed By: riz
Date: Wed Jan 25 20:18:49 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto/x509v3 [netbsd-5-0]: pcy_map.c
pcy_tree.c
Log Message:
Apply patch (requested by drochner in ticket #1711):
crypto/dist/openssl/crypto/x509v3/pcy_map.c patch
crypto/dist/openssl/crypto/x509v3/pcy_tree.cpatch
Address CVE-2011-4109.
[drochner, ticket #1711]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.30.1 \
src/crypto/dist/openssl/crypto/x509v3/pcy_map.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.8.1 \
src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/x509v3/pcy_map.c
diff -u src/crypto/dist/openssl/crypto/x509v3/pcy_map.c:1.1.1.1 src/crypto/dist/openssl/crypto/x509v3/pcy_map.c:1.1.1.1.30.1
--- src/crypto/dist/openssl/crypto/x509v3/pcy_map.c:1.1.1.1 Fri Nov 25 03:07:35 2005
+++ src/crypto/dist/openssl/crypto/x509v3/pcy_map.c Wed Jan 25 20:18:48 2012
@@ -70,8 +70,6 @@ static int ref_cmp(const X509_POLICY_REF
static void policy_map_free(X509_POLICY_REF *map)
{
- if (map-subjectDomainPolicy)
- ASN1_OBJECT_free(map-subjectDomainPolicy);
OPENSSL_free(map);
}
@@ -95,6 +93,7 @@ int policy_cache_set_mapping(X509 *x, PO
{
POLICY_MAPPING *map;
X509_POLICY_REF *ref = NULL;
+ ASN1_OBJECT *subjectDomainPolicyRef;
X509_POLICY_DATA *data;
X509_POLICY_CACHE *cache = x-policy_cache;
int i;
@@ -153,13 +152,16 @@ int policy_cache_set_mapping(X509 *x, PO
if (!sk_ASN1_OBJECT_push(data-expected_policy_set,
map-subjectDomainPolicy))
goto bad_mapping;
+ /* map-subjectDomainPolicy will be freed when
+ * cache-data is freed. Set it to NULL to avoid double-free. */
+ subjectDomainPolicyRef = map-subjectDomainPolicy;
+ map-subjectDomainPolicy = NULL;
ref = OPENSSL_malloc(sizeof(X509_POLICY_REF));
if (!ref)
goto bad_mapping;
- ref-subjectDomainPolicy = map-subjectDomainPolicy;
- map-subjectDomainPolicy = NULL;
+ ref-subjectDomainPolicy = subjectDomainPolicyRef;
ref-data = data;
if (!sk_X509_POLICY_REF_push(cache-maps, ref))
Index: src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c
diff -u src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c:1.1.1.4 src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c:1.1.1.4.8.1
--- src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c:1.1.1.4 Fri May 9 21:34:38 2008
+++ src/crypto/dist/openssl/crypto/x509v3/pcy_tree.c Wed Jan 25 20:18:48 2012
@@ -611,6 +611,10 @@ int X509_policy_check(X509_POLICY_TREE *
return 1;
/* Some internal error */
+ case -1:
+ return -1;
+
+ /* Some internal error */
case 0:
return 0;
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/engines/ccgost
Module Name:src
Committed By: riz
Date: Wed Jan 25 20:32:10 UTC 2012
Modified Files:
src/crypto/dist/openssl/engines/ccgost [netbsd-5-0]: gost2001_keyx.c
gost94_keyx.c
Log Message:
Apply patch (requested by drochner in ticket #1711):
crypto/dist/openssl/engines/ccgost/gost2001_keyx.c patch
crypto/dist/openssl/engines/ccgost/gost94_keyx.cpatch
Address CVE-2011-4109.
[drochner, ticket #1712]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.12.1 \
src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c \
src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c
diff -u src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c:1.1.1.1 src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c:1.1.1.1.12.1
--- src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c:1.1.1.1 Fri May 9 21:34:42 2008
+++ src/crypto/dist/openssl/engines/ccgost/gost2001_keyx.c Wed Jan 25 20:32:10 2012
@@ -253,6 +253,10 @@ int pkey_GOST01cp_decrypt(EVP_PKEY_CTX *
}
param = get_encryption_params(gkt-key_agreement_info-cipher);
+ if(!param){
+ goto err;
+ }
+
gost_init(ctx,param-sblock);
OPENSSL_assert(gkt-key_agreement_info-eph_iv-length==8);
memcpy(wrappedKey,gkt-key_agreement_info-eph_iv-data,8);
Index: src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c
diff -u src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c:1.1.1.1 src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c:1.1.1.1.12.1
--- src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c:1.1.1.1 Fri May 9 21:34:42 2008
+++ src/crypto/dist/openssl/engines/ccgost/gost94_keyx.c Wed Jan 25 20:32:10 2012
@@ -237,6 +237,10 @@ int pkey_GOST94cp_decrypt(EVP_PKEY_CTX *
param = get_encryption_params(gkt-key_agreement_info-cipher);
+ if(!param){
+ goto err;
+ }
+
gost_init(cctx,param-sblock);
OPENSSL_assert(gkt-key_agreement_info-eph_iv-length==8);
memcpy(wrappedKey,gkt-key_agreement_info-eph_iv-data,8);
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src Committed By: riz Date: Wed Jan 25 20:34:26 UTC 2012 Modified Files: src/crypto/dist/openssl/ssl [netbsd-5-0]: s3_enc.c Log Message: Apply patch (requested by drochner in ticket #1713): crypto/dist/openssl/ssl/s3_enc.cpatch Address CVE-2011-4576. [drochner, ticket #1713] To generate a diff of this commit: cvs rdiff -u -r1.1.1.12.8.1 -r1.1.1.12.8.2 \ src/crypto/dist/openssl/ssl/s3_enc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/s3_enc.c diff -u src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.8.1 src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.8.2 --- src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.8.1 Mon Apr 12 00:46:57 2010 +++ src/crypto/dist/openssl/ssl/s3_enc.c Wed Jan 25 20:34:26 2012 @@ -504,6 +504,9 @@ int ssl3_enc(SSL *s, int send) /* we need to add 'i-1' padding bytes */ l+=i; + /* the last of these zero bytes will be overwritten + * with the padding length. */ + memset(rec-input[rec-length], 0, i); rec-length+=i; rec-input[l-1]=(i-1); }
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Jan 25 20:49:03 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Tickets 1710-1713. To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.58 src/doc/CHANGES-5.0.3:1.1.2.59 --- src/doc/CHANGES-5.0.3:1.1.2.58 Mon Jan 2 23:55:31 2012 +++ src/doc/CHANGES-5.0.3 Wed Jan 25 20:49:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.58 2012/01/02 23:55:31 snj Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.59 2012/01/25 20:49:02 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2896,3 +2896,25 @@ xsrc/xfree/xc/programs/Xserver/mi/mispri CVE-2010-1166. [is, ticket #1707] +crypto/dist/openssl/ssl/d1_pkt.c patch + + Address CVE-2012-0050. + [drochner, ticket #1710] + +crypto/dist/openssl/crypto/x509v3/pcy_map.c patch +crypto/dist/openssl/crypto/x509v3/pcy_tree.c patch + + Address CVE-2011-4109. + [drochner, ticket #1711] + +crypto/dist/openssl/engines/ccgost/gost2001_keyx.c patch +crypto/dist/openssl/engines/ccgost/gost94_keyx.c patch + + Address CVE-2011-4109. + [drochner, ticket #1712] + +crypto/dist/openssl/ssl/s3_enc.cpatch + + Address CVE-2011-4576. + [drochner, ticket #1713] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Mon Jan 2 23:55:31 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: 1707 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.57 src/doc/CHANGES-5.0.3:1.1.2.58 --- src/doc/CHANGES-5.0.3:1.1.2.57 Sat Dec 31 20:03:50 2011 +++ src/doc/CHANGES-5.0.3 Mon Jan 2 23:55:31 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.57 2011/12/31 20:03:50 snj Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.58 2012/01/02 23:55:31 snj Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2886,3 +2886,13 @@ lib/libtelnet/encrypt.c1.15 Avoid buffer overflow, reported by Colin Percival at FreeBSD [christos, ticket #1704] +xsrc/xfree/xc/programs/Xserver/fb/fbpict.c 1.5 +xsrc/xfree/xc/programs/Xserver/mi/miarc.c 1.2 +xsrc/xfree/xc/programs/Xserver/mi/misprite.c 1.2 + + mod(a,b) used to be defined with a - in front of naked a, such that + uses of mod with certain arithmetic expressions as a led to + surprising results, namely the one in Xrender praised in + CVE-2010-1166. + [is, ticket #1707] +
CVS commit: [netbsd-5-0] src/lib/libtelnet
Module Name:src
Committed By: snj
Date: Sat Dec 31 20:03:28 UTC 2011
Modified Files:
src/lib/libtelnet [netbsd-5-0]: encrypt.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1704):
lib/libtelnet/encrypt.c: revision 1.15
Avoid buffer overflow, reported by Colin Percival at FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.22.1 src/lib/libtelnet/encrypt.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/libtelnet/encrypt.c
diff -u src/lib/libtelnet/encrypt.c:1.14 src/lib/libtelnet/encrypt.c:1.14.22.1
--- src/lib/libtelnet/encrypt.c:1.14 Wed Jan 17 23:24:22 2007
+++ src/lib/libtelnet/encrypt.c Sat Dec 31 20:03:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: encrypt.c,v 1.14 2007/01/17 23:24:22 hubertf Exp $ */
+/* $NetBSD: encrypt.c,v 1.14.22.1 2011/12/31 20:03:27 snj Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
#if 0
static char sccsid[] = @(#)encrypt.c 8.2 (Berkeley) 5/30/95;
#else
-__RCSID($NetBSD: encrypt.c,v 1.14 2007/01/17 23:24:22 hubertf Exp $);
+__RCSID($NetBSD: encrypt.c,v 1.14.22.1 2011/12/31 20:03:27 snj Exp $);
#endif /* not lint */
/*
@@ -765,6 +765,8 @@ encrypt_keyid(kp, keyid, len)
if (ep-keyid)
(void)(*ep-keyid)(dir, kp-keyid, kp-keylen);
+ } else if (len sizeof(kp-keyid)) {
+ return;
} else if ((len != kp-keylen) ||
(memcmp(keyid, kp-keyid, len) != 0)) {
/*
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:00:19 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1696 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.54 src/doc/CHANGES-5.0.3:1.1.2.55 --- src/doc/CHANGES-5.0.3:1.1.2.54 Fri Nov 18 23:08:39 2011 +++ src/doc/CHANGES-5.0.3 Sat Nov 19 14:00:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.54 2011/11/18 23:08:39 sborrill Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.55 2011/11/19 14:00:19 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2863,3 +2863,15 @@ dist/bind/lib/dns/rbtdb.c patch records, leading to an assertion failure. Fixes CVE-2011-4313. [christos, ticket #1692] +dist/openpam/lib/openpam_configure.c 1.6 + + Don't allow '/' characters in the service argument to pam_start() + The service is blindly appended to config directories (/etc/pam.d/), + and if a user can control the service it can get PAM to read config + files from any location. + This is not a problem with most software because the service is + usually a constant string. The check protects 3rd party software + from being abused. + (CVE-2011-4122) + [drochner, ticket #1696] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: sborrill
Date: Sat Nov 19 22:24:12 UTC 2011
Modified Files:
src/sys/kern [netbsd-5-0]: kern_event.c
Log Message:
Pull up the following revisions(s) (requested by rmind in ticket #1695):
sys/kern/kern_event.c: revision 1.74
kqueue_register: avoid calling fd_getfile() with filedesc_t::fd_lock held.
Fixes PR/45479 by KOGULE Ryo.
To generate a diff of this commit:
cvs rdiff -u -r1.60.6.1.2.1 -r1.60.6.1.2.2 src/sys/kern/kern_event.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/kern_event.c
diff -u src/sys/kern/kern_event.c:1.60.6.1.2.1 src/sys/kern/kern_event.c:1.60.6.1.2.2
--- src/sys/kern/kern_event.c:1.60.6.1.2.1 Sat Jan 9 01:10:52 2010
+++ src/sys/kern/kern_event.c Sat Nov 19 22:24:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.60.6.1.2.1 2010/01/09 01:10:52 snj Exp $ */
+/* $NetBSD: kern_event.c,v 1.60.6.1.2.2 2011/11/19 22:24:12 sborrill Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.60.6.1.2.1 2010/01/09 01:10:52 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.60.6.1.2.2 2011/11/19 22:24:12 sborrill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -866,18 +866,16 @@ kqueue_register(struct kqueue *kq, struc
return (EINVAL);
}
- mutex_enter(fdp-fd_lock);
-
/* search if knote already exists */
if (kfilter-filtops-f_isfd) {
/* monitoring a file descriptor */
fd = kev-ident;
if ((fp = fd_getfile(fd)) == NULL) {
- mutex_exit(fdp-fd_lock);
rw_exit(kqueue_filter_lock);
kmem_free(newkn, sizeof(*newkn));
return EBADF;
}
+ mutex_enter(fdp-fd_lock);
ff = fdp-fd_ofiles[fd];
if (fd = fdp-fd_lastkqfile) {
SLIST_FOREACH(kn, ff-ff_knlist, kn_link) {
@@ -891,6 +889,7 @@ kqueue_register(struct kqueue *kq, struc
* not monitoring a file descriptor, so
* lookup knotes in internal hash table
*/
+ mutex_enter(fdp-fd_lock);
if (fdp-fd_knhashmask != 0) {
list = fdp-fd_knhash[
KN_HASH((u_long)kev-ident, fdp-fd_knhashmask)];
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Sat Nov 19 22:26:58 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket #1695 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.55 src/doc/CHANGES-5.0.3:1.1.2.56 --- src/doc/CHANGES-5.0.3:1.1.2.55 Sat Nov 19 14:00:19 2011 +++ src/doc/CHANGES-5.0.3 Sat Nov 19 22:26:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.55 2011/11/19 14:00:19 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.56 2011/11/19 22:26:58 sborrill Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2875,3 +2875,9 @@ dist/openpam/lib/openpam_configure.c 1. (CVE-2011-4122) [drochner, ticket #1696] +sys/kern/kern_event.c1.74 + + kqueue_register: avoid calling fd_getfile() with + filedesc_t::fd_lock held. Fixes PR/45479 by KOGULE Ryo. + [rmind, ticket #1695] +
CVS commit: [netbsd-5-0] src/sys/uvm
Module Name:src Committed By: sborrill Date: Fri Nov 18 22:47:35 UTC 2011 Modified Files: src/sys/uvm [netbsd-5-0]: uvm_meter.c Log Message: Pull up the following revisions(s) (requested by christos in ticket #1691): sys/uvm/uvm_meter.c:revision 1.57 Dereference correct variable and thus stop a sysctl crash. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.14.1 src/sys/uvm/uvm_meter.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/uvm/uvm_meter.c diff -u src/sys/uvm/uvm_meter.c:1.49 src/sys/uvm/uvm_meter.c:1.49.14.1 --- src/sys/uvm/uvm_meter.c:1.49 Wed Jun 4 12:45:28 2008 +++ src/sys/uvm/uvm_meter.c Fri Nov 18 22:47:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_meter.c,v 1.49 2008/06/04 12:45:28 ad Exp $ */ +/* $NetBSD: uvm_meter.c,v 1.49.14.1 2011/11/18 22:47:35 sborrill Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.49 2008/06/04 12:45:28 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.49.14.1 2011/11/18 22:47:35 sborrill Exp $); #include sys/param.h #include sys/proc.h @@ -152,7 +152,7 @@ sysctl_vm_uvmexp(SYSCTLFN_ARGS) struct sysctlnode node; node = *rnode; - if (oldp) + if (oldlenp) node.sysctl_size = min(*oldlenp, node.sysctl_size); return (sysctl_lookup(SYSCTLFN_CALL(node)));
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 18 22:48:42 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticlet #1691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.52 src/doc/CHANGES-5.0.3:1.1.2.53 --- src/doc/CHANGES-5.0.3:1.1.2.52 Thu Nov 3 17:56:27 2011 +++ src/doc/CHANGES-5.0.3 Fri Nov 18 22:48:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.52 2011/11/03 17:56:27 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.53 2011/11/18 22:48:42 sborrill Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2851,3 +2851,8 @@ sys/arch/xen/xen/xbdback_xenbus.c 1.45 panic. PR#45158. [bouyer, ticket #1682] +sys/uvm/uvm_meter.c1.57 + + Dereference correct variable and thus stop a sysctl crash. + [christos, ticket #1691] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 18 23:08:39 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket #1692 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.53 src/doc/CHANGES-5.0.3:1.1.2.54 --- src/doc/CHANGES-5.0.3:1.1.2.53 Fri Nov 18 22:48:42 2011 +++ src/doc/CHANGES-5.0.3 Fri Nov 18 23:08:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.53 2011/11/18 22:48:42 sborrill Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.54 2011/11/18 23:08:39 sborrill Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2856,3 +2856,10 @@ sys/uvm/uvm_meter.c1.57 Dereference correct variable and thus stop a sysctl crash. [christos, ticket #1691] +dist/bind/bin/named/query.c patch +dist/bind/lib/dns/rbtdb.c patch + + Cache lookup could return RRSIG data associated with nonexistent + records, leading to an assertion failure. Fixes CVE-2011-4313. + [christos, ticket #1692] +
CVS commit: [netbsd-5-0] src/dist/bind
Module Name:src
Committed By: sborrill
Date: Fri Nov 18 23:05:07 UTC 2011
Modified Files:
src/dist/bind/bin/named [netbsd-5-0]: query.c
src/dist/bind/lib/dns [netbsd-5-0]: rbtdb.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1692):
dist/bind/bin/named/query.c patch
dist/bind/lib/dns/rbtdb.c patch
Cache lookup could return RRSIG data associated with nonexistent records,
leading to an assertion failure. Fixes CVE-2011-4313.
To generate a diff of this commit:
cvs rdiff -u -r1.8.8.4 -r1.8.8.5 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.6.8.5 -r1.1.1.6.8.6 src/dist/bind/lib/dns/rbtdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.8.4 src/dist/bind/bin/named/query.c:1.8.8.5
--- src/dist/bind/bin/named/query.c:1.8.8.4 Sat Jun 18 11:35:06 2011
+++ src/dist/bind/bin/named/query.c Fri Nov 18 23:05:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.8.4 2011/06/18 11:35:06 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.8.5 2011/11/18 23:05:07 sborrill Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -1282,11 +1282,9 @@ query_addadditional(void *arg, dns_name_
goto addname;
if (result == DNS_R_NCACHENXRRSET) {
dns_rdataset_disassociate(rdataset);
- /*
- * Negative cache entries don't have sigrdatasets.
- */
- INSIST(sigrdataset == NULL ||
- ! dns_rdataset_isassociated(sigrdataset));
+ if (sigrdataset != NULL
+ dns_rdataset_isassociated(sigrdataset))
+dns_rdataset_disassociate(sigrdataset);
}
if (result == ISC_R_SUCCESS) {
mname = NULL;
@@ -1327,8 +1325,9 @@ query_addadditional(void *arg, dns_name_
goto addname;
if (result == DNS_R_NCACHENXRRSET) {
dns_rdataset_disassociate(rdataset);
- INSIST(sigrdataset == NULL ||
- ! dns_rdataset_isassociated(sigrdataset));
+ if (sigrdataset != NULL
+ dns_rdataset_isassociated(sigrdataset))
+dns_rdataset_disassociate(sigrdataset);
}
if (result == ISC_R_SUCCESS) {
mname = NULL;
@@ -1777,10 +1776,8 @@ query_addadditional2(void *arg, dns_name
goto setcache;
if (result == DNS_R_NCACHENXRRSET) {
dns_rdataset_disassociate(rdataset);
- /*
- * Negative cache entries don't have sigrdatasets.
- */
- INSIST(! dns_rdataset_isassociated(sigrdataset));
+ if (dns_rdataset_isassociated(sigrdataset))
+ dns_rdataset_disassociate(sigrdataset);
}
if (result == ISC_R_SUCCESS) {
/* Remember the result as a cache */
Index: src/dist/bind/lib/dns/rbtdb.c
diff -u src/dist/bind/lib/dns/rbtdb.c:1.1.1.6.8.5 src/dist/bind/lib/dns/rbtdb.c:1.1.1.6.8.6
--- src/dist/bind/lib/dns/rbtdb.c:1.1.1.6.8.5 Thu Jul 7 20:27:41 2011
+++ src/dist/bind/lib/dns/rbtdb.c Fri Nov 18 23:05:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.1.1.6.8.5 2011/07/07 20:27:41 sborrill Exp $ */
+/* $NetBSD: rbtdb.c,v 1.1.1.6.8.6 2011/11/18 23:05:07 sborrill Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -4824,7 +4824,7 @@ cache_find(dns_db_t *db, dns_name_t *nam
rdataset);
if (need_headerupdate(found, search.now))
update = found;
- if (foundsig != NULL) {
+ if (!NEGATIVE(found) foundsig != NULL) {
bind_rdataset(search.rbtdb, node, foundsig, search.now,
sigrdataset);
if (need_headerupdate(foundsig, search.now))
@@ -5453,7 +5453,7 @@ cache_findrdataset(dns_db_t *db, dns_dbn
}
if (found != NULL) {
bind_rdataset(rbtdb, rbtnode, found, now, rdataset);
- if (foundsig != NULL)
+ if (!NEGATIVE(found) foundsig != NULL)
bind_rdataset(rbtdb, rbtnode, foundsig, now,
sigrdataset);
}
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: riz
Date: Thu Nov 3 17:56:27 UTC 2011
Modified Files:
src/distrib/sets [netbsd-5-0]: sets.subr
src/doc [netbsd-5-0]: CHANGES-5.0.3
src/sys/conf [netbsd-5-0]: osrelease.sh
Log Message:
Back out ticket #1681 - needs to be rethought, was causing build failures.
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.5.2.1 -r1.71.2.5.2.2 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-5.0.3
cvs rdiff -u -r1.115.10.1 -r1.115.10.2 src/sys/conf/osrelease.sh
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.71.2.5.2.1 src/distrib/sets/sets.subr:1.71.2.5.2.2
--- src/distrib/sets/sets.subr:1.71.2.5.2.1 Wed Nov 2 20:23:34 2011
+++ src/distrib/sets/sets.subr Thu Nov 3 17:56:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.71.2.5.2.1 2011/11/02 20:23:34 riz Exp $
+# $NetBSD: sets.subr,v 1.71.2.5.2.2 2011/11/03 17:56:27 riz Exp $
#
#
@@ -215,11 +215,7 @@ if [ ${MACHINE_ARCH} = m68000 ]; the
shlib=no # Turn off shlibs for some ports.
fi
-OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n`
-# for release branches, use X.Y version, for -current use X.Y.Z
-if [ ! ${OSRELEASE%.99} = ${OSRELEASE} ]; then
- OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
-fi
+OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
MODULEDIR=stand/${MACHINE}/${OSRELEASE}/modules
SUBST=s#@MODULEDIR@#${MODULEDIR}#g
SUBST=${SUBST};s#@OSRELEASE@#${OSRELEASE}#g
@@ -232,7 +228,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.71.2.5.2.1 2011/11/02 20:23:34 riz Exp $
+# # $NetBSD: sets.subr,v 1.71.2.5.2.2 2011/11/03 17:56:27 riz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/doc/CHANGES-5.0.3
diff -u src/doc/CHANGES-5.0.3:1.1.2.51 src/doc/CHANGES-5.0.3:1.1.2.52
--- src/doc/CHANGES-5.0.3:1.1.2.51 Wed Nov 2 20:31:31 2011
+++ src/doc/CHANGES-5.0.3 Thu Nov 3 17:56:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.51 2011/11/02 20:31:31 riz Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.52 2011/11/03 17:56:27 riz Exp $
A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
release:
@@ -2844,12 +2844,6 @@ share/zoneinfo/zone.tab patch
Update to tzdata2011n.
[apb, ticket #1684]
-distrib/sets/sets.subr1.133
-sys/conf/osrelease.sh1.116-1.117
-
- Fix module path logic for release branches.
- [jmcneill, ticket #1681]
-
sys/arch/xen/xen/xbdback_xenbus.c 1.45 via patch
Guard against spurious xbdback_backend_changed() calls which
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.115.10.1 src/sys/conf/osrelease.sh:1.115.10.2
--- src/sys/conf/osrelease.sh:1.115.10.1 Wed Nov 2 20:23:34 2011
+++ src/sys/conf/osrelease.sh Thu Nov 3 17:56:27 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.115.10.1 2011/11/02 20:23:34 riz Exp $
+# $NetBSD: osrelease.sh,v 1.115.10.2 2011/11/03 17:56:27 riz Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,18 +38,13 @@ PARAMH=`dirname $0`/../sys/param.h
release=`$AWK '/^#define[ ]*__NetBSD_Version__/ { print $6 }' $PARAMH`
# default: return nn.nn.nn
-# -m: return nn, representing only the major number; however, for -current,
-# return the next major number (e.g. for 5.99.nn, return 6)
-# -n: return nn.nn
+# -m: return the major number -- -current is the number of the next release
# -s: return nn (no dots)
case $1 in
-m)
echo $release | $AWK -F. '{print int($1+$2/100+0.01)}'
;;
--n)
- echo $release | $AWK -F. '{print $1 . $2}'
- ;;
-s)
echo $release | $SED -e 's,\.,,g'
;;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 2 18:17:43 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1684. To generate a diff of this commit: cvs rdiff -u -r1.1.2.48 -r1.1.2.49 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.48 src/doc/CHANGES-5.0.3:1.1.2.49 --- src/doc/CHANGES-5.0.3:1.1.2.48 Sun Oct 16 23:49:21 2011 +++ src/doc/CHANGES-5.0.3 Wed Nov 2 18:17:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.48 2011/10/16 23:49:21 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.49 2011/11/02 18:17:42 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2819,3 +2819,28 @@ sbin/ifconfig/carp.c1.13 Stop ifconfig dumping core when attaching carp to an interface. [bouyer, ticket #1670] +distrib/sets/lists/base/mi patch +doc/3RDPARTYpatch +share/zoneinfo/africa patch +share/zoneinfo/antarctica patch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/leapseconds patch +share/zoneinfo/northamerica patch +share/zoneinfo/pacificnew patch +share/zoneinfo/solar87 patch +share/zoneinfo/solar88 patch +share/zoneinfo/solar89 patch +share/zoneinfo/southamerica patch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.sh patch +share/zoneinfo/zone.tab patch + + Update to tzdata2011n. + [apb, ticket #1684] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: riz
Date: Wed Nov 2 20:23:34 UTC 2011
Modified Files:
src/distrib/sets [netbsd-5-0]: sets.subr
src/sys/conf [netbsd-5-0]: osrelease.sh
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1681):
distrib/sets/sets.subr: revision 1.133
sys/conf/osrelease.sh: revision 1.116
sys/conf/osrelease.sh: revision 1.117
try to match sys/kern/kern_module.c module path logic: for release branches,
use X.Y version (instead of eg. X.Y.0_PATCH or X.Y_STABLE) and for -current use
X.Y.Z.
ok zafer@
Add -n option to print major and minor version, e.g. 5.99 on -current.
Describe new -n option in a comment; improve description of -m option.
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.5 -r1.71.2.5.2.1 src/distrib/sets/sets.subr
cvs rdiff -u -r1.115 -r1.115.10.1 src/sys/conf/osrelease.sh
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.71.2.5 src/distrib/sets/sets.subr:1.71.2.5.2.1
--- src/distrib/sets/sets.subr:1.71.2.5 Wed Apr 8 00:09:27 2009
+++ src/distrib/sets/sets.subr Wed Nov 2 20:23:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.71.2.5 2009/04/08 00:09:27 snj Exp $
+# $NetBSD: sets.subr,v 1.71.2.5.2.1 2011/11/02 20:23:34 riz Exp $
#
#
@@ -215,7 +215,11 @@ if [ ${MACHINE_ARCH} = m68000 ]; the
shlib=no # Turn off shlibs for some ports.
fi
-OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
+OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n`
+# for release branches, use X.Y version, for -current use X.Y.Z
+if [ ! ${OSRELEASE%.99} = ${OSRELEASE} ]; then
+ OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
+fi
MODULEDIR=stand/${MACHINE}/${OSRELEASE}/modules
SUBST=s#@MODULEDIR@#${MODULEDIR}#g
SUBST=${SUBST};s#@OSRELEASE@#${OSRELEASE}#g
@@ -228,7 +232,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.71.2.5 2009/04/08 00:09:27 snj Exp $
+# # $NetBSD: sets.subr,v 1.71.2.5.2.1 2011/11/02 20:23:34 riz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.115 src/sys/conf/osrelease.sh:1.115.10.1
--- src/sys/conf/osrelease.sh:1.115 Tue Aug 5 08:26:05 2008
+++ src/sys/conf/osrelease.sh Wed Nov 2 20:23:34 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.115 2008/08/05 08:26:05 apb Exp $
+# $NetBSD: osrelease.sh,v 1.115.10.1 2011/11/02 20:23:34 riz Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,13 +38,18 @@ PARAMH=`dirname $0`/../sys/param.h
release=`$AWK '/^#define[ ]*__NetBSD_Version__/ { print $6 }' $PARAMH`
# default: return nn.nn.nn
-# -m: return the major number -- -current is the number of the next release
+# -m: return nn, representing only the major number; however, for -current,
+# return the next major number (e.g. for 5.99.nn, return 6)
+# -n: return nn.nn
# -s: return nn (no dots)
case $1 in
-m)
echo $release | $AWK -F. '{print int($1+$2/100+0.01)}'
;;
+-n)
+ echo $release | $AWK -F. '{print $1 . $2}'
+ ;;
-s)
echo $release | $SED -e 's,\.,,g'
;;
CVS commit: [netbsd-5-0] src/sys/arch/xen/xen
Module Name:src
Committed By: riz
Date: Wed Nov 2 20:31:18 UTC 2011
Modified Files:
src/sys/arch/xen/xen [netbsd-5-0]: xbdback_xenbus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1682):
sys/arch/xen/xen/xbdback_xenbus.c: revision 1.45
Guard against spurious xbdback_backend_changed() calls which would result
in the block device being opened twice. Fixes port-xen/45158,
although the underlying cause (multiple open of the same device not
properly handled any more) is not fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.6.1 src/sys/arch/xen/xen/xbdback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.20 src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.6.1
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.20 Fri Oct 24 18:02:58 2008
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Wed Nov 2 20:31:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.20 2008/10/24 18:02:58 jym Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.20.6.1 2011/11/02 20:31:18 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.20 2008/10/24 18:02:58 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.20.6.1 2011/11/02 20:31:18 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -624,10 +624,16 @@ xbdback_backend_changed(struct xenbus_wa
*/
if (err)
return;
- if (xbdi-xbdi_status == CONNECTED xbdi-xbdi_dev != dev) {
- printf(xbdback %s: changing physical device from 0x%x to
- 0x%lx not supported\n, xbusd-xbusd_path, xbdi-xbdi_dev,
- dev);
+ /*
+ * we can also fire up after having opened the device, don't try
+ * to do it twice.
+ */
+ if (xbdi-xbdi_vp != NULL) {
+ if (xbdi-xbdi_status == CONNECTED xbdi-xbdi_dev != dev) {
+ printf(xbdback %s: changing physical device from
+ 0x%x to 0x%lx not supported\n,
+ xbusd-xbusd_path, xbdi-xbdi_dev, dev);
+ }
return;
}
xbdi-xbdi_dev = dev;
CVS commit: [netbsd-5-0] src/sbin/ifconfig
Module Name:src
Committed By: riz
Date: Sun Oct 16 23:49:02 UTC 2011
Modified Files:
src/sbin/ifconfig [netbsd-5-0]: carp.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1670):
sbin/ifconfig/carp.c: revision 1.13
This should fix 'carpdev lt;ifnamegt;' or, at least, not break it more
badly than before.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.6.1 src/sbin/ifconfig/carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/carp.c
diff -u src/sbin/ifconfig/carp.c:1.12 src/sbin/ifconfig/carp.c:1.12.6.1
--- src/sbin/ifconfig/carp.c:1.12 Tue Jul 15 21:27:58 2008
+++ src/sbin/ifconfig/carp.c Sun Oct 16 23:49:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: carp.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $ */
+/* $NetBSD: carp.c,v 1.12.6.1 2011/10/16 23:49:02 riz Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: carp.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $);
+__RCSID($NetBSD: carp.c,v 1.12.6.1 2011/10/16 23:49:02 riz Exp $);
#endif /* not lint */
#include sys/param.h
@@ -257,18 +257,18 @@ int
setcarpdev(prop_dictionary_t env, prop_dictionary_t oenv)
{
struct carpreq carpr;
- prop_data_t data;
+ prop_string_t s;
- data = (prop_data_t)prop_dictionary_get(env, carpdev);
- if (data == NULL) {
+ s = (prop_string_t)prop_dictionary_get(env, carpdev);
+ if (s == NULL) {
errno = ENOENT;
return -1;
}
carp_get(env, carpr);
- strlcpy(carpr.carpr_carpdev, prop_data_data_nocopy(data),
- MIN(sizeof(carpr.carpr_carpdev), prop_data_size(data)));
+ strlcpy(carpr.carpr_carpdev, prop_string_cstring_nocopy(s),
+ sizeof(carpr.carpr_carpdev));
carp_set(env, carpr);
return 0;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sun Oct 16 23:49:21 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1670. To generate a diff of this commit: cvs rdiff -u -r1.1.2.47 -r1.1.2.48 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.47 src/doc/CHANGES-5.0.3:1.1.2.48 --- src/doc/CHANGES-5.0.3:1.1.2.47 Mon Aug 22 17:50:07 2011 +++ src/doc/CHANGES-5.0.3 Sun Oct 16 23:49:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.47 2011/08/22 17:50:07 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.48 2011/10/16 23:49:21 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2814,3 +2814,8 @@ xsrc/xfree/xc/lib/font/fontfile/decompre Address CVE-2011-2895, buffer overflow in decompression. [joerg, ticket #1661] +sbin/ifconfig/carp.c1.13 + + Stop ifconfig dumping core when attaching carp to an interface. + [bouyer, ticket #1670] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Mon Aug 22 17:50:07 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Adjust ticket 1661 entry for additional build-fix pullup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.46 src/doc/CHANGES-5.0.3:1.1.2.47 --- src/doc/CHANGES-5.0.3:1.1.2.46 Fri Aug 19 20:57:23 2011 +++ src/doc/CHANGES-5.0.3 Mon Aug 22 17:50:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.46 2011/08/19 20:57:23 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.47 2011/08/22 17:50:07 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2808,7 +2808,7 @@ xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c 1.2-1.3 src/usr.bin/compress/zopen.c 1.14-1.15 src/usr.bin/gzip/zuncompress.c 1.9-1.11 -xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c 1.2 +xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c 1.2-1.3 xsrc/xfree/xc/lib/font/fontfile/decompress.c 1.2 Address CVE-2011-2895, buffer overflow in decompression.
CVS commit: [netbsd-5-0] src/usr.bin
Module Name:src
Committed By: riz
Date: Fri Aug 19 20:57:01 UTC 2011
Modified Files:
src/usr.bin/compress [netbsd-5-0]: zopen.c
src/usr.bin/gzip [netbsd-5-0]: zuncompress.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1661):
xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c: revision 1.2
xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c: revision 1.3
src/usr.bin/gzip/zuncompress.c: revision 1.9-1.11
src/usr.bin/compress/zopen.c: revision 1.14-1.15
xsrc/xfree/xc/lib/font/fontfile/decompress.c: revision 1.2
xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c: revision 1.2
xsrc/external/mit/freetype/dist/src/lzw/ftzopen.c: revision 1.4
P
Fix CVS-2011-2895, buffer overflow in decompress
provisional fix for CVS-2011-2895, buffer overflow when uncompressing
provisional fix for CVE-2011-2895, buffer overflow in decompression
set errno on overflow return.
Do proper input validation without penalizing performance.
Do proper input validation. Allow decompressing all input streams.
Increase robustness of LZW decoding to avoid buffer overflow on
arbitrary manipulated input streams in combination with uninitalised
memory.
Increase strictness of LZW parser.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.14.1 src/usr.bin/compress/zopen.c
cvs rdiff -u -r1.6 -r1.6.32.1 src/usr.bin/gzip/zuncompress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/compress/zopen.c
diff -u src/usr.bin/compress/zopen.c:1.12 src/usr.bin/compress/zopen.c:1.12.14.1
--- src/usr.bin/compress/zopen.c:1.12 Thu Feb 21 02:50:11 2008
+++ src/usr.bin/compress/zopen.c Fri Aug 19 20:57:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zopen.c,v 1.12 2008/02/21 02:50:11 joerg Exp $ */
+/* $NetBSD: zopen.c,v 1.12.14.1 2011/08/19 20:57:00 riz Exp $ */
/*-
* Copyright (c) 1985, 1986, 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)zopen.c 8.1 (Berkeley) 6/27/93;
#else
-static char rcsid[] = $NetBSD: zopen.c,v 1.12 2008/02/21 02:50:11 joerg Exp $;
+static char rcsid[] = $NetBSD: zopen.c,v 1.12.14.1 2011/08/19 20:57:00 riz Exp $;
#endif
#endif /* LIBC_SCCS and not lint */
@@ -486,7 +486,7 @@
block_compress = maxbits BLOCK_MASK;
maxbits = BIT_MASK;
maxmaxcode = 1L maxbits;
- if (maxbits BITS) {
+ if (maxbits BITS || maxbits 12) {
errno = EFTYPE;
return (-1);
}
@@ -497,14 +497,7 @@
tab_suffixof(code) = (char_type) code;
}
free_ent = block_compress ? FIRST : 256;
-
- finchar = oldcode = getcode(zs);
- if (oldcode == -1) /* EOF already? */
- return (0); /* Get out of here */
-
- /* First code must be 8 bits = char. */
- *bp++ = (u_char)finchar;
- count--;
+ oldcode = -1;
stackp = de_stack;
while ((code = getcode(zs)) -1) {
@@ -513,17 +506,28 @@
for (code = 255; code = 0; code--)
tab_prefixof(code) = 0;
clear_flg = 1;
- free_ent = FIRST - 1;
- if ((code = getcode(zs)) == -1) /* O, untimely death! */
-break;
+ free_ent = FIRST;
+ oldcode = -1;
+ continue;
}
incode = code;
- /* Special case for KwKwK string. */
+ /* Special case for kWkWk string. */
if (code = free_ent) {
+ if (code free_ent || oldcode == -1) {
+/* Bad stream. */
+errno = EINVAL;
+return (-1);
+ }
*stackp++ = finchar;
code = oldcode;
}
+ /*
+ * The above condition ensures that code free_ent.
+ * The construction of tab_prefixof in turn guarantees that
+ * each iteration decreases code and therefore stack usage is
+ * bound by 1 BITS - 256.
+ */
/* Generate output characters in reverse order. */
while (code = 256) {
@@ -540,7 +544,7 @@
} while (stackp de_stack);
/* Generate the new entry. */
- if ((code = free_ent) maxmaxcode) {
+ if ((code = free_ent) maxmaxcode oldcode != -1) {
tab_prefixof(code) = (u_short) oldcode;
tab_suffixof(code) = finchar;
free_ent = code + 1;
Index: src/usr.bin/gzip/zuncompress.c
diff -u src/usr.bin/gzip/zuncompress.c:1.6 src/usr.bin/gzip/zuncompress.c:1.6.32.1
--- src/usr.bin/gzip/zuncompress.c:1.6 Tue Nov 22 09:05:30 2005
+++ src/usr.bin/gzip/zuncompress.c Fri Aug 19 20:57:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zuncompress.c,v 1.6 2005/11/22 09:05:30 mrg Exp $ */
+/* $NetBSD: zuncompress.c,v 1.6.32.1 2011/08/19 20:57:00 riz Exp $ */
/*-
* Copyright (c) 1985, 1986, 1992, 1993
@@ -246,7 +246,7 @@
zs-zs_block_compress = zs-zs_maxbits BLOCK_MASK;
zs-zs_maxbits = BIT_MASK;
zs-zs_maxmaxcode = 1L zs-zs_maxbits;
- if (zs-zs_maxbits BITS) {
+ if (zs-zs_maxbits BITS || zs-zs_maxbits 12) {
errno = EFTYPE;
return (-1);
}
@@ -258,13 +258,7 @@
}
zs-zs_free_ent = zs-zs_block_compress ? FIRST : 256;
- zs-u.r.zs_finchar = zs-u.r.zs_oldcode = getcode(zs);
- if (zs-u.r.zs_oldcode == -1) /* EOF already? */
- return (0); /* Get out of here */
-
- /* First code
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Aug 19 20:57:23 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1661. To generate a diff of this commit: cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.45 src/doc/CHANGES-5.0.3:1.1.2.46 --- src/doc/CHANGES-5.0.3:1.1.2.45 Mon Aug 8 19:36:22 2011 +++ src/doc/CHANGES-5.0.3 Fri Aug 19 20:57:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.45 2011/08/08 19:36:22 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.46 2011/08/19 20:57:23 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2804,3 +2804,13 @@ Prevent crash when using 'ifconfig destroy'. [sborrill, ticket #1643] +xsrc/external/mit/freetype/dist/src/lzw/ftzopen.c 1.4 +xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c 1.2-1.3 +src/usr.bin/compress/zopen.c 1.14-1.15 +src/usr.bin/gzip/zuncompress.c 1.9-1.11 +xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c 1.2 +xsrc/xfree/xc/lib/font/fontfile/decompress.c 1.2 + + Address CVE-2011-2895, buffer overflow in decompression. + [joerg, ticket #1661] +
CVS commit: [netbsd-5-0] src/sys/net
Module Name:src
Committed By: riz
Date: Mon Aug 8 19:36:02 UTC 2011
Modified Files:
src/sys/net [netbsd-5-0]: if.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1643):
sys/net/if.c: revision 1.243
Prevent if_detach() from crashing while it walks the routing table
to find and unlink routes that reference the detached ifnet: make
if_rt_walktree() return ERESTART whenever it has deleted a route.
Whenever rt_walktree() returns ERESTART, if_detach() restarts it.
I believe that this fix resembles one by Jonathan Kollasch or by someone
else, which has languished in a PR for too long. Sorry!
Tested by me and by Jeff Rizzo.
XXX It's supposed to be safe for rn_walktree() to apply to the routing
XXX table a routine that may delete routes. Why isn't it safe in
XXX practice?
To generate a diff of this commit:
cvs rdiff -u -r1.230.4.1 -r1.230.4.1.2.1 src/sys/net/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.230.4.1 src/sys/net/if.c:1.230.4.1.2.1
--- src/sys/net/if.c:1.230.4.1 Tue Feb 24 02:26:42 2009
+++ src/sys/net/if.c Mon Aug 8 19:36:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.230.4.1 2009/02/24 02:26:42 snj Exp $ */
+/* $NetBSD: if.c,v 1.230.4.1.2.1 2011/08/08 19:36:02 riz Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.230.4.1 2009/02/24 02:26:42 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.230.4.1.2.1 2011/08/08 19:36:02 riz Exp $);
#include opt_inet.h
@@ -726,8 +726,10 @@
if_free_sadl(ifp);
/* Walk the routing table looking for stragglers. */
- for (i = 0; i = AF_MAX; i++)
- (void)rt_walktree(i, if_rt_walktree, ifp);
+ for (i = 0; i = AF_MAX; i++) {
+ while (rt_walktree(i, if_rt_walktree, ifp) == ERESTART)
+ ;
+ }
DOMAIN_FOREACH(dp) {
if (dp-dom_ifdetach != NULL ifp-if_afdata[dp-dom_family])
@@ -838,7 +840,7 @@
if (error != 0)
printf(%s: warning: unable to delete rtentry @ %p,
error = %d\n, ifp-if_xname, rt, error);
- return 0;
+ return ERESTART;
}
/*
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Mon Aug 8 19:36:22 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1643. To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.44 src/doc/CHANGES-5.0.3:1.1.2.45 --- src/doc/CHANGES-5.0.3:1.1.2.44 Thu Jul 7 20:35:27 2011 +++ src/doc/CHANGES-5.0.3 Mon Aug 8 19:36:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.44 2011/07/07 20:35:27 sborrill Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.45 2011/08/08 19:36:22 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2799,3 +2799,8 @@ Update bind to 9.7.3-P3 fixing CVE-2011-2464 [spz, ticket #1647] +sys/net/if.c 1.243 + + Prevent crash when using 'ifconfig destroy'. + [sborrill, ticket #1643] +
