CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:34:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1465] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.11 -r1.486.2.9.2.12 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.6 -r1.1.1.40.2.1.2.7 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.37.2.3.2.5 -r1.1.1.37.2.3.2.6 \ 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.486.2.9.2.11 src/doc/3RDPARTY:1.486.2.9.2.12 --- src/doc/3RDPARTY:1.486.2.9.2.11 Wed Oct 31 16:38:22 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:34:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.11 2012/10/31 16:38:22 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.12 2012/11/14 19:34:54 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,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.40.2.1.2.6 src/share/zoneinfo/asia:1.1.1.40.2.1.2.7 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.6 Wed Oct 31 16:38:23 2012 +++ src/share/zoneinfo/asia Wed Nov 14 19:34:54 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.37.2.3.2.5 src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.6 --- src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.5 Sat Sep 15 09:03:53 2012 +++ src/share/zoneinfo/northamerica Wed Nov 14 19:34:54 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-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:54:49 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1469] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.12 -r1.486.2.9.2.13 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.3 -r1.1.1.21.2.3.2.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.40.2.1.2.7 -r1.1.1.40.2.1.2.8 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.6 -r1.11.2.4.2.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.2.2.4 -r1.1.1.34.2.2.2.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.37.2.3.2.6 -r1.1.1.37.2.3.2.7 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.5 -r1.1.1.35.2.2.2.6 \ 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.486.2.9.2.12 src/doc/3RDPARTY:1.486.2.9.2.13 --- src/doc/3RDPARTY:1.486.2.9.2.12 Wed Nov 14 19:34:54 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:54:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.12 2012/11/14 19:34:54 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.13 2012/11/14 19:54:47 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,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.21.2.3.2.3 src/share/zoneinfo/africa:1.1.1.21.2.3.2.4 --- src/share/zoneinfo/africa:1.1.1.21.2.3.2.3 Sat Sep 15 09:03:52 2012 +++ src/share/zoneinfo/africa Wed Nov 14 19:54:47 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.40.2.1.2.7
CVS commit: [netbsd-4-0] src/sys
Module Name:src
Committed By: riz
Date: Wed Nov 14 20:15:37 UTC 2012
Modified Files:
src/sys/kern [netbsd-4-0]: vfs_lookup.c
src/sys/miscfs/genfs [netbsd-4-0]: layer_vnops.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1466):
sys/kern/vfs_lookup.c: revision 1.195
sys/miscfs/genfs/layer_vnops.c: revision 1.51
In layer_lookup(), clear *vpp before returning EROFS, as otherwise a
stale value can be returned and this causes a diagnostic panic in
namei.
In relookup(), clear *vpp before calling VOP_LOOKUP, as is done in
lookup_once(), as an additional precautionary measure.
(in theory both of these fixes are not required together)
Should fix PR 47040.
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.3 -r1.72.2.3.6.1 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.28.2.2 -r1.28.2.2.6.1 src/sys/miscfs/genfs/layer_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.72.2.3 src/sys/kern/vfs_lookup.c:1.72.2.3.6.1
--- src/sys/kern/vfs_lookup.c:1.72.2.3 Sat Feb 17 23:27:47 2007
+++ src/sys/kern/vfs_lookup.c Wed Nov 14 20:15:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.72.2.3 2007/02/17 23:27:47 tron Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.72.2.3.6.1 2012/11/14 20:15:36 riz Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.72.2.3 2007/02/17 23:27:47 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.72.2.3.6.1 2012/11/14 20:15:36 riz Exp $);
#include opt_ktrace.h
#include opt_systrace.h
@@ -941,6 +941,7 @@ relookup(struct vnode *dvp, struct vnode
/*
* We now have a segment name to search for, and a directory to search.
*/
+ *vpp = NULL;
if ((error = VOP_LOOKUP(dvp, vpp, cnp)) != 0) {
#ifdef DIAGNOSTIC
if (*vpp != NULL)
Index: src/sys/miscfs/genfs/layer_vnops.c
diff -u src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2 src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2.6.1
--- src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2 Mon Apr 16 20:01:13 2007
+++ src/sys/miscfs/genfs/layer_vnops.c Wed Nov 14 20:15:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $ */
+/* $NetBSD: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $ */
/*
* Copyright (c) 1999 National Aeronautics Space Administration
@@ -67,8 +67,8 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $
- * $Id: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $
+ * $Id: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $
+ * $Id: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*/
@@ -233,7 +233,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -436,8 +436,10 @@ layer_lookup(v)
dvp = ap-a_dvp;
if ((flags ISLASTCN) (dvp-v_mount-mnt_flag MNT_RDONLY)
- (cnp-cn_nameiop == DELETE || cnp-cn_nameiop == RENAME))
+ (cnp-cn_nameiop == DELETE || cnp-cn_nameiop == RENAME)) {
+ *ap-a_vpp = NULL;
return (EROFS);
+ }
ldvp = LAYERVPTOLOWERVP(dvp);
ap-a_dvp = ldvp;
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:26:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1465, 1466, 1469. To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.114 src/doc/CHANGES-4.0.2:1.1.2.115 --- src/doc/CHANGES-4.0.2:1.1.2.114 Wed Oct 31 16:39:29 2012 +++ src/doc/CHANGES-4.0.2 Wed Nov 14 20:26:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.114 2012/10/31 16:39:29 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.115 2012/11/14 20:26:54 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1523,3 +1523,36 @@ share/zoneinfo/southamerica patch Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) [apb, ticket #1464] +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 #1465] + +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 #1469] + +sys/kern/vfs_lookup.c1.195 via patch +sys/miscfs/genfs/layer_vnops.c 1.51 via patch + + Don't panic when renaming a mount point with a layerfs on it. + PR#47040. + [dholland, ticket #1466] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:34:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1465] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.11 -r1.486.2.9.2.12 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.6 -r1.1.1.40.2.1.2.7 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.37.2.3.2.5 -r1.1.1.37.2.3.2.6 \ src/share/zoneinfo/northamerica Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:54:49 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1469] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.12 -r1.486.2.9.2.13 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.3 -r1.1.1.21.2.3.2.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.40.2.1.2.7 -r1.1.1.40.2.1.2.8 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.6 -r1.11.2.4.2.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.2.2.4 -r1.1.1.34.2.2.2.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.37.2.3.2.6 -r1.1.1.37.2.3.2.7 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.5 -r1.1.1.35.2.2.2.6 \ src/share/zoneinfo/southamerica Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/sys
Module Name:src Committed By: riz Date: Wed Nov 14 20:15:37 UTC 2012 Modified Files: src/sys/kern [netbsd-4-0]: vfs_lookup.c src/sys/miscfs/genfs [netbsd-4-0]: layer_vnops.c Log Message: Pull up following revision(s) (requested by dholland in ticket #1466): sys/kern/vfs_lookup.c: revision 1.195 sys/miscfs/genfs/layer_vnops.c: revision 1.51 In layer_lookup(), clear *vpp before returning EROFS, as otherwise a stale value can be returned and this causes a diagnostic panic in namei. In relookup(), clear *vpp before calling VOP_LOOKUP, as is done in lookup_once(), as an additional precautionary measure. (in theory both of these fixes are not required together) Should fix PR 47040. To generate a diff of this commit: cvs rdiff -u -r1.72.2.3 -r1.72.2.3.6.1 src/sys/kern/vfs_lookup.c cvs rdiff -u -r1.28.2.2 -r1.28.2.2.6.1 src/sys/miscfs/genfs/layer_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:26:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1465, 1466, 1469. To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Oct 31 16:38:23 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1464] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.10 -r1.486.2.9.2.11 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.5 -r1.1.1.40.2.1.2.6 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.35.2.2.2.4 -r1.1.1.35.2.2.2.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.486.2.9.2.10 src/doc/3RDPARTY:1.486.2.9.2.11 --- src/doc/3RDPARTY:1.486.2.9.2.10 Tue Oct 23 23:44:16 2012 +++ src/doc/3RDPARTY Wed Oct 31 16:38:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.10 2012/10/23 23:44:16 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.11 2012/10/31 16:38:22 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012g -Current Vers: tzcode2012g / tzdata2012g +Version: tzcode2004a / tzdata2012h +Current Vers: tzcode2012h / tzdata2012h 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.40.2.1.2.5 src/share/zoneinfo/asia:1.1.1.40.2.1.2.6 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.5 Tue Oct 23 23:44:16 2012 +++ src/share/zoneinfo/asia Wed Oct 31 16:38:23 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, approved sending the proposed June 2011 changes to the Time +# Decree Law back to the Knesset for second and third (final)
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 31 16:39:30 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1464 To generate a diff of this commit: cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.113 src/doc/CHANGES-4.0.2:1.1.2.114 --- src/doc/CHANGES-4.0.2:1.1.2.113 Thu Oct 25 08:42:46 2012 +++ src/doc/CHANGES-4.0.2 Wed Oct 31 16:39:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.113 2012/10/25 08:42:46 sborrill Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.114 2012/10/31 16:39:29 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1510,3 +1510,16 @@ share/misc/bsd-family-tree 1.46-1.47 5.1.2. [riz, ticket #1463] +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 #1464] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Oct 31 16:38:23 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1464] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.10 -r1.486.2.9.2.11 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.5 -r1.1.1.40.2.1.2.6 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.35.2.2.2.4 -r1.1.1.35.2.2.2.5 \ src/share/zoneinfo/southamerica Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 31 16:39:30 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1464 To generate a diff of this commit: cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/share/misc
Module Name:src Committed By: sborrill Date: Thu Oct 25 08:42:09 UTC 2012 Modified Files: src/share/misc [netbsd-4-0]: bsd-family-tree Log Message: Pull up the following revisions(s) (requested by riz in ticket #1463): 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.37.8.1 -r1.37.8.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.37.8.1 src/share/misc/bsd-family-tree:1.37.8.2 --- src/share/misc/bsd-family-tree:1.37.8.1 Tue Oct 23 23:52:35 2012 +++ src/share/misc/bsd-family-tree Thu Oct 25 08:42:09 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-4-0] src/doc
Module Name:src Committed By: sborrill Date: Thu Oct 25 08:42:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket #1463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.112 src/doc/CHANGES-4.0.2:1.1.2.113 --- src/doc/CHANGES-4.0.2:1.1.2.112 Tue Oct 23 23:56:51 2012 +++ src/doc/CHANGES-4.0.2 Thu Oct 25 08:42:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.112 2012/10/23 23:56:51 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.113 2012/10/25 08:42:46 sborrill Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1503,3 +1503,10 @@ share/misc/bsd-family-tree 1.45 via pa Update the family tree for NetBSD 6. [jnemeth, ticket #1462] +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 #1463] +
CVS commit: [netbsd-4-0] src/share/misc
Module Name:src Committed By: sborrill Date: Thu Oct 25 08:42:09 UTC 2012 Modified Files: src/share/misc [netbsd-4-0]: bsd-family-tree Log Message: Pull up the following revisions(s) (requested by riz in ticket #1463): 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.37.8.1 -r1.37.8.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: sborrill Date: Thu Oct 25 08:42:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket #1463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:17 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1461] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.9 -r1.486.2.9.2.10 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.4 -r1.1.1.40.2.1.2.5 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.5 -r1.11.2.4.2.6 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.486.2.9.2.9 src/doc/3RDPARTY:1.486.2.9.2.10 --- src/doc/3RDPARTY:1.486.2.9.2.9 Sun Sep 30 18:23:36 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:44:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.9 2012/09/30 18:23:36 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.10 2012/10/23 23:44:16 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,10 +845,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.40.2.1.2.4 src/share/zoneinfo/asia:1.1.1.40.2.1.2.5 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.4 Sat Sep 15 09:03:52 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:44:16 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.11.2.4.2.5 src/share/zoneinfo/australasia:1.11.2.4.2.6 --- src/share/zoneinfo/australasia:1.11.2.4.2.5 Sun Sep 30 18:23:36 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:44:16 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-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:37 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1461. To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.110 src/doc/CHANGES-4.0.2:1.1.2.111 --- src/doc/CHANGES-4.0.2:1.1.2.110 Wed Oct 17 21:05:01 2012 +++ src/doc/CHANGES-4.0.2 Tue Oct 23 23:44:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.110 2012/10/17 21:05:01 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.111 2012/10/23 23:44:37 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1486,3 +1486,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1460] +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 #1461] +
CVS commit: [netbsd-4-0] src/share/misc
Module Name:src Committed By: riz Date: Tue Oct 23 23:52:35 UTC 2012 Modified Files: src/share/misc [netbsd-4-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1462): 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.37 -r1.37.8.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.37 src/share/misc/bsd-family-tree:1.37.8.1 --- src/share/misc/bsd-family-tree:1.37 Wed Aug 2 00:33:22 2006 +++ src/share/misc/bsd-family-tree Tue Oct 23 23:52:35 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 | | | | @@ -169,12 +169,12 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.10 | | | | | | | | | | | FreeBSD 4.11 | | | | - | | | | | | - | v `-|--|-|-. + | | | | | + | `-|--|-|-. || | | \ FreeBSD 5.0 | | | | || | | | -FreeBSD 5.1 | | | DragonFly 1.0 +FreeBSD 5.1 | | | DragonFly 1.0 | \ | | | | | - Mac OS X | | | | 10.3| | | @@ -185,7 +185,7 @@ FreeBSD 5.2 | | *---FreeBSD 5.3 | | | | | || | OpenBSD 3.6 | | || NetBSD 2.0 | | - | || | | || DragonFly 1.2.0 + | || | | ||DragonFly 1.2.0 | | Mac OS X | | NetBSD 2.0.2 | | | | 10.4| | || | | FreeBSD 5.4 | | | || | @@ -198,14 +198,67 @@ FreeBSD 5.2 | | | | || | NetBSD 2.1 | | | | || | | | | | || NetBSD 3.0 | | - | | || ||| DragonFly 1.4.0 - | | || ||OpenBSD 3.9 | - | FreeBSD || |||
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:56:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1462. To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.111 src/doc/CHANGES-4.0.2:1.1.2.112 --- src/doc/CHANGES-4.0.2:1.1.2.111 Tue Oct 23 23:44:37 2012 +++ src/doc/CHANGES-4.0.2 Tue Oct 23 23:56:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.111 2012/10/23 23:44:37 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.112 2012/10/23 23:56:51 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1498,3 +1498,8 @@ share/zoneinfo/australasia Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1461] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1462] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:17 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1461] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.9 -r1.486.2.9.2.10 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.4 -r1.1.1.40.2.1.2.5 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.5 -r1.11.2.4.2.6 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:37 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1461. To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/share/misc
Module Name:src Committed By: riz Date: Tue Oct 23 23:52:35 UTC 2012 Modified Files: src/share/misc [netbsd-4-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1462): 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.37 -r1.37.8.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:56:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1462. To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/usr.bin/calendar/calendars
Module Name:src Committed By: bouyer Date: Wed Oct 17 21:04:40 UTC 2012 Modified Files: src/usr.bin/calendar/calendars [netbsd-4-0]: calendar.netbsd Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1460): 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.14 -r1.14.10.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.14 src/usr.bin/calendar/calendars/calendar.netbsd:1.14.10.1 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.14 Mon Jan 9 18:45:00 2006 +++ src/usr.bin/calendar/calendars/calendar.netbsd Wed Oct 17 21:04:39 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-4-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Oct 17 21:05:02 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1460 To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.109 src/doc/CHANGES-4.0.2:1.1.2.110 --- src/doc/CHANGES-4.0.2:1.1.2.109 Sun Sep 30 18:23:53 2012 +++ src/doc/CHANGES-4.0.2 Wed Oct 17 21:05:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.109 2012/09/30 18:23:53 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.110 2012/10/17 21:05:01 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1481,3 +1481,8 @@ share/zoneinfo/australasia 1.27 via pa January 20 this year. (Thanks to Steffen Thorsen.) [apb, ticket #1458] +usr.bin/calendar/calendars/calendar.netbsd 1.22 + + note NetBSD 6.0 release + [jnemeth, ticket #1460] +
CVS commit: [netbsd-4-0] src/usr.bin/calendar/calendars
Module Name:src Committed By: bouyer Date: Wed Oct 17 21:04:40 UTC 2012 Modified Files: src/usr.bin/calendar/calendars [netbsd-4-0]: calendar.netbsd Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1460): 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.14 -r1.14.10.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Oct 17 21:05:02 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1460 To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:23:36 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1458): 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.486.2.9.2.8 -r1.486.2.9.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.11.2.4.2.4 -r1.11.2.4.2.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.486.2.9.2.8 src/doc/3RDPARTY:1.486.2.9.2.9 --- src/doc/3RDPARTY:1.486.2.9.2.8 Sat Sep 15 09:03:52 2012 +++ src/doc/3RDPARTY Sun Sep 30 18:23:36 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.8 2012/09/15 09:03:52 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.9 2012/09/30 18:23:36 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,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.11.2.4.2.4 src/share/zoneinfo/australasia:1.11.2.4.2.5 --- src/share/zoneinfo/australasia:1.11.2.4.2.4 Sat Sep 15 09:03:52 2012 +++ src/share/zoneinfo/australasia Sun Sep 30 18:23:36 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-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:23:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1458 To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.108 src/doc/CHANGES-4.0.2:1.1.2.109 --- src/doc/CHANGES-4.0.2:1.1.2.108 Sat Sep 15 09:24:50 2012 +++ src/doc/CHANGES-4.0.2 Sun Sep 30 18:23:53 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.108 2012/09/15 09:24:50 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.109 2012/09/30 18:23:53 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1471,3 +1471,13 @@ dist/bind/lib/dns/include/dns/rdata.h record) from upstream. [spz, ticket #1457] +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 #1458] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:23:36 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1458): 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.486.2.9.2.8 -r1.486.2.9.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.11.2.4.2.4 -r1.11.2.4.2.5 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Sep 30 18:23:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1458 To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:03:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1456 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.486.2.9.2.7 -r1.486.2.9.2.8 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.2 -r1.1.1.21.2.3.2.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.16.2.1.2.2 -r1.1.1.16.2.1.2.3 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.3 -r1.1.1.40.2.1.2.4 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.3 -r1.11.2.4.2.4 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.17.2.1.4.2 -r1.1.1.17.2.1.4.3 \ src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.12.1 -r1.1.1.6.12.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.34.2.2.2.3 -r1.1.1.34.2.2.2.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.12.1 -r1.1.1.3.12.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.15.2.1.4.2 -r1.1.1.15.2.1.4.3 \ src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.12.2.1.2.3 -r1.1.1.12.2.1.2.4 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.4 -r1.1.1.37.2.3.2.5 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.3 -r1.1.1.35.2.2.2.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.12.1 -r1.1.1.4.12.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.12.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.26.2.3.2.4 -r1.1.1.26.2.3.2.5 \ 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.486.2.9.2.7 src/doc/3RDPARTY:1.486.2.9.2.8 --- src/doc/3RDPARTY:1.486.2.9.2.7 Fri Mar 2 17:48:46 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:03:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.7 2012/03/02 17:48:46 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.8 2012/09/15 09:03:52 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,16 +845,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: ftp://ftp.iana.org/tz/releases/ Archive Site:
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:05:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.105 src/doc/CHANGES-4.0.2:1.1.2.106 --- src/doc/CHANGES-4.0.2:1.1.2.105 Wed Aug 22 20:02:18 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:05:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.105 2012/08/22 20:02:18 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.106 2012/09/15 09:05:52 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1418,3 +1418,54 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] +Apply patch, requested by apb in ticket #1456 + doc/3RDPARTY patch + share/zoneinfo/africapatch + share/zoneinfo/antarctica patch + share/zoneinfo/asiapatch + share/zoneinfo/australasia patch + share/zoneinfo/backwardpatch + share/zoneinfo/etceterapatch + share/zoneinfo/europepatch + share/zoneinfo/factorypatch + share/zoneinfo/iso3166.tab patch + share/zoneinfo/leapseconds patch + share/zoneinfo/northamerica patch + share/zoneinfo/pacificnew patch + share/zoneinfo/solar87patch + share/zoneinfo/solar88patch + share/zoneinfo/solar89patch + share/zoneinfo/southamerica patch + share/zoneinfo/systemvpatch + share/zoneinfo/yearistype.sh patch + share/zoneinfo/zone.tabpatch + +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. + +
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Sat Sep 15 09:09:24 UTC 2012
Modified Files:
src/dist/bind [netbsd-4-0]: CHANGES version
src/dist/bind/lib/dns [netbsd-4-0]: master.c rdata.c rdataslab.c
src/dist/bind/lib/dns/include/dns [netbsd-4-0]: rdata.h
Log Message:
Apply patch, requested by spz in ticket #1457
dist/bind/CHANGES patch
dist/bind/version patch
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 (Named could die on specially crafted
record) from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4.4.2.2.8 -r1.1.1.4.4.2.2.9 src/dist/bind/CHANGES
cvs rdiff -u -r1.1.1.4.4.3.2.7 -r1.1.1.4.4.3.2.8 src/dist/bind/version
cvs rdiff -u -r1.1.1.4.4.1.2.3 -r1.1.1.4.4.1.2.4 \
src/dist/bind/lib/dns/master.c
cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \
src/dist/bind/lib/dns/rdata.c
cvs rdiff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4 \
src/dist/bind/lib/dns/rdataslab.c
cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \
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.4.4.2.2.8 src/dist/bind/CHANGES:1.1.1.4.4.2.2.9
--- src/dist/bind/CHANGES:1.1.1.4.4.2.2.8 Tue Jul 24 20:41:15 2012
+++ src/dist/bind/CHANGES Sat Sep 15 09:09:22 2012
@@ -1,3 +1,8 @@
+--- 9.4-ESV-R4-P2nb2: added patches from 9.7.6-P3 ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.4-ESV-R4-P2nb1: added patches from 9.6-ESV-R7-P2 ---
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.4.4.3.2.7 src/dist/bind/version:1.1.1.4.4.3.2.8
--- src/dist/bind/version:1.1.1.4.4.3.2.7 Tue Jul 24 20:41:15 2012
+++ src/dist/bind/version Sat Sep 15 09:09:22 2012
@@ -1,4 +1,4 @@
-# $Id: version,v 1.1.1.4.4.3.2.7 2012/07/24 20:41:15 riz Exp $
+# $Id: version,v 1.1.1.4.4.3.2.8 2012/09/15 09:09:22 bouyer Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=4
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R4-P2nb1
+RELEASEVER=-R4-P2nb2
Index: src/dist/bind/lib/dns/master.c
diff -u src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.3 src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.4
--- src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.3 Sun Nov 20 13:02:16 2011
+++ src/dist/bind/lib/dns/master.c Sat Sep 15 09:09:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.1.1.4.4.1.2.3 2011/11/20 13:02:16 bouyer Exp $ */
+/* $NetBSD: master.c,v 1.1.1.4.4.1.2.4 2012/09/15 09:09:23 bouyer Exp $ */
/*
* Copyright (C) 2004-2009 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.3.4.1.2.2 src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.3
--- src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.2 Tue Jun 5 20:01:32 2012
+++ src/dist/bind/lib/dns/rdata.c Sat Sep 15 09:09:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.2 2012/06/05 20:01:32 bouyer Exp $ */
+/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.3 2012/09/15 09:09:23 bouyer Exp $ */
/*
* Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. (ISC)
@@ -407,6 +407,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) {
@@ -437,6 +438,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))
@@ -444,8 +453,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);
}
@@ -580,6 +588,7 @@
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:09:58 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.106 src/doc/CHANGES-4.0.2:1.1.2.107 --- src/doc/CHANGES-4.0.2:1.1.2.106 Sat Sep 15 09:05:52 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:09:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.106 2012/09/15 09:05:52 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.107 2012/09/15 09:09:58 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1469,3 +1469,14 @@ Major changes from tzdata2011d to tzdata * Use a single version number for both code and data. +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/lib/dns/master.cpatch +dist/bind/lib/dns/rdata.cpatch +dist/bind/lib/dns/rdataslab.cpatch +dist/bind/lib/dns/include/dns/rdata.h patch + + apply fix for CVE-2012-4244 (Named could die on specially crafted + record) from upstream. + [spz, ticket #1457] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:24:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Fix entry for ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.107 src/doc/CHANGES-4.0.2:1.1.2.108 --- src/doc/CHANGES-4.0.2:1.1.2.107 Sat Sep 15 09:09:58 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:24:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.107 2012/09/15 09:09:58 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.108 2012/09/15 09:24:50 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1418,55 +1418,46 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] -Apply patch, requested by apb in ticket #1456 - doc/3RDPARTY patch - share/zoneinfo/africapatch - share/zoneinfo/antarctica patch - share/zoneinfo/asiapatch - share/zoneinfo/australasia patch - share/zoneinfo/backwardpatch - share/zoneinfo/etceterapatch - share/zoneinfo/europepatch - share/zoneinfo/factorypatch - share/zoneinfo/iso3166.tab patch - share/zoneinfo/leapseconds patch - share/zoneinfo/northamerica patch - share/zoneinfo/pacificnew patch - share/zoneinfo/solar87patch - share/zoneinfo/solar88patch - share/zoneinfo/solar89patch - share/zoneinfo/southamerica patch - share/zoneinfo/systemvpatch - share/zoneinfo/yearistype.sh patch - share/zoneinfo/zone.tabpatch - -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: +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/backwardpatch +share/zoneinfo/etceterapatch +share/zoneinfo/europepatch +share/zoneinfo/factorypatch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/leapseconds patch +share/zoneinfo/northamerica patch +share/zoneinfo/pacificnew patch +share/zoneinfo/solar87patch +share/zoneinfo/solar88patch +share/zoneinfo/solar89patch +share/zoneinfo/southamerica patch +share/zoneinfo/systemvpatch +share/zoneinfo/yearistype.sh patch +share/zoneinfo/zone.tabpatch -* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. - (Thanks to Steffen Thorsen.) + 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]. + 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. -* Use a single version number for both code and data. + [apb, ticket #1456] dist/bind/CHANGES patch
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:03:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-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 #1456 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.486.2.9.2.7 -r1.486.2.9.2.8 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.2 -r1.1.1.21.2.3.2.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.16.2.1.2.2 -r1.1.1.16.2.1.2.3 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.3 -r1.1.1.40.2.1.2.4 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.3 -r1.11.2.4.2.4 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.17.2.1.4.2 -r1.1.1.17.2.1.4.3 \ src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.12.1 -r1.1.1.6.12.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.34.2.2.2.3 -r1.1.1.34.2.2.2.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.12.1 -r1.1.1.3.12.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.15.2.1.4.2 -r1.1.1.15.2.1.4.3 \ src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.12.2.1.2.3 -r1.1.1.12.2.1.2.4 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.4 -r1.1.1.37.2.3.2.5 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.3 -r1.1.1.35.2.2.2.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.12.1 -r1.1.1.4.12.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.12.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.26.2.3.2.4 -r1.1.1.26.2.3.2.5 \ src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:05:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:09:24 UTC 2012 Modified Files: src/dist/bind [netbsd-4-0]: CHANGES version src/dist/bind/lib/dns [netbsd-4-0]: master.c rdata.c rdataslab.c src/dist/bind/lib/dns/include/dns [netbsd-4-0]: rdata.h Log Message: Apply patch, requested by spz in ticket #1457 dist/bind/CHANGES patch dist/bind/version patch 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 (Named could die on specially crafted record) from upstream. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4.4.2.2.8 -r1.1.1.4.4.2.2.9 src/dist/bind/CHANGES cvs rdiff -u -r1.1.1.4.4.3.2.7 -r1.1.1.4.4.3.2.8 src/dist/bind/version cvs rdiff -u -r1.1.1.4.4.1.2.3 -r1.1.1.4.4.1.2.4 \ src/dist/bind/lib/dns/master.c cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \ src/dist/bind/lib/dns/rdata.c cvs rdiff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4 \ src/dist/bind/lib/dns/rdataslab.c cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \ 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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:09:58 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:24:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Fix entry for ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/gnu/dist/postfix
Module Name:src
Committed By: bouyer
Date: Wed Aug 22 19:43:49 UTC 2012
Modified Files:
src/gnu/dist/postfix/README_FILES [netbsd-4-0]: RELEASE_NOTES
src/gnu/dist/postfix/src/smtpd [netbsd-4-0]: smtpd_sasl_proto.c
Log Message:
Apply patch, requested by reed in ticket #1452:
src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c: patch
src/gnu/dist/postfix/README_FILES/RELEASE_NOTES:patch
Apply patch from upstream, fixing CVE-2011-1720
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.2 -r1.9.2.2.2.1 \
src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.14.1 \
src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.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/postfix/README_FILES/RELEASE_NOTES
diff -u src/gnu/dist/postfix/README_FILES/RELEASE_NOTES:1.9.2.2 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES:1.9.2.2.2.1
--- src/gnu/dist/postfix/README_FILES/RELEASE_NOTES:1.9.2.2 Mon Aug 6 11:06:13 2007
+++ src/gnu/dist/postfix/README_FILES/RELEASE_NOTES Wed Aug 22 19:43:49 2012
@@ -210,3 +210,11 @@ on/off configurable. This introduces ne
(default: disable_esmtp, delay_dotcrlf) and smtp_pix_workaround_maps
(workarounds indexed by server IP address). The default settings
are backwards compatible.
+
+
+NetBSD addition:
+
+This includes the bugfix for CVE-2011-1720 (Memory corruption in
+Postfix SMTP server Cyrus SASL support).
+http://www.postfix.org/CVE-2011-1720.html
+ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.3-2.5-cve-2011-1720-patch
Index: src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c
diff -u src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c:1.1.1.5 src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c:1.1.1.5.14.1
--- src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c:1.1.1.5 Wed Jul 19 01:17:47 2006
+++ src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c Wed Aug 22 19:43:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd_sasl_proto.c,v 1.1.1.5 2006/07/19 01:17:47 rpaulo Exp $ */
+/* $NetBSD: smtpd_sasl_proto.c,v 1.1.1.5.14.1 2012/08/22 19:43:49 bouyer Exp $ */
/*++
/* NAME
@@ -185,6 +185,27 @@ int smtpd_sasl_auth_cmd(SMTPD_STATE
return (-1);
}
+/* Don't reuse the SASL handle after authentication failure. */
+#ifndef SMTPD_FLAG_AUTH_USED
+#define SMTPD_FLAG_AUTH_USED (115)
+#endif
+#ifndef XSASL_TYPE_CYRUS
+#define XSASL_TYPE_CYRUS cyrus
+#endif
+if (state-flags SMTPD_FLAG_AUTH_USED) {
+ smtpd_sasl_disconnect(state);
+#ifdef USE_TLS
+ if (state-tls_context != 0)
+ smtpd_sasl_connect(state, VAR_SMTPD_SASL_TLS_OPTS,
+ var_smtpd_sasl_tls_opts);
+ else
+#endif
+ smtpd_sasl_connect(state, VAR_SMTPD_SASL_OPTS,
+ var_smtpd_sasl_opts);
+} else if (strcmp(var_smtpd_sasl_type, XSASL_TYPE_CYRUS) == 0) {
+ state-flags |= SMTPD_FLAG_AUTH_USED;
+}
+
/*
* All authentication failures shall be logged. The 5xx reply code from
* the SASL authentication routine triggers tar-pit delays, which help to
CVS commit: [netbsd-4-0] src/gnu/dist/postfix
Module Name:src Committed By: bouyer Date: Wed Aug 22 19:43:49 UTC 2012 Modified Files: src/gnu/dist/postfix/README_FILES [netbsd-4-0]: RELEASE_NOTES src/gnu/dist/postfix/src/smtpd [netbsd-4-0]: smtpd_sasl_proto.c Log Message: Apply patch, requested by reed in ticket #1452: src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c: patch src/gnu/dist/postfix/README_FILES/RELEASE_NOTES:patch Apply patch from upstream, fixing CVE-2011-1720 To generate a diff of this commit: cvs rdiff -u -r1.9.2.2 -r1.9.2.2.2.1 \ src/gnu/dist/postfix/README_FILES/RELEASE_NOTES cvs rdiff -u -r1.1.1.5 -r1.1.1.5.14.1 \ src/gnu/dist/postfix/src/smtpd/smtpd_sasl_proto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/usr.bin/cksum
Module Name:src Committed By: bouyer Date: Wed Aug 22 19:49:30 UTC 2012 Modified Files: src/usr.bin/cksum [netbsd-4-0]: cksum.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1453): 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.12.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.
CVS commit: [netbsd-4-0] src/sys/arch/amd64/amd64
Module Name:src Committed By: bouyer Date: Wed Aug 22 19:52:40 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-4-0]: trap.c Log Message: Apply patch, requested by spz in ticket #1454: sys/arch/amd64/amd64/trap.c:patch Fix potential stack frame corruption To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.14.1 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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Aug 22 20:02:18 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: tickets 1452, 1453, 1454 To generate a diff of this commit: cvs rdiff -u -r1.1.2.104 -r1.1.2.105 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src
Committed By: riz
Date: Tue Jul 24 20:41:16 UTC 2012
Modified Files:
src/dist/bind [netbsd-4-0]: CHANGES version
src/dist/bind/bin/tests/system/stub [netbsd-4-0]: tests.sh
src/dist/bind/lib/dns [netbsd-4-0]: resolver.c zone.c
src/dist/bind/lib/isc [netbsd-4-0]: random.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1455):
dist/bind/CHANGES
dist/bind/version
dist/bind/bin/tests/system/stub/tests.sh
dist/bind/lib/dns/resolver.c
dist/bind/lib/dns/zone.c
dist/bind/lib/isc/random.c
Address Heavy DNSSEC validation load can cause a bad cache assertion
failure in bind vulnerability.
It was generated out of the 9.6-ESV-R7-P1 patch from ISC
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4.4.2.2.7 -r1.1.1.4.4.2.2.8 src/dist/bind/CHANGES
cvs rdiff -u -r1.1.1.4.4.3.2.6 -r1.1.1.4.4.3.2.7 src/dist/bind/version
cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1 \
src/dist/bind/bin/tests/system/stub/tests.sh
cvs rdiff -u -r1.2.2.2.2.5 -r1.2.2.2.2.6 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.4.4.1.2.2 -r1.1.1.4.4.1.2.3 src/dist/bind/lib/dns/zone.c
cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \
src/dist/bind/lib/isc/random.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.4.4.2.2.7 src/dist/bind/CHANGES:1.1.1.4.4.2.2.8
--- src/dist/bind/CHANGES:1.1.1.4.4.2.2.7 Tue Jun 5 20:01:31 2012
+++ src/dist/bind/CHANGES Tue Jul 24 20:41:15 2012
@@ -1,3 +1,14 @@
+--- 9.4-ESV-R4-P2nb1: added patches from 9.6-ESV-R7-P2 ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3343. [bug] Relax isc_random_jitter() REQUIRE tests. [RT #29821]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.4-ESV-R4-P2 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.4.4.3.2.6 src/dist/bind/version:1.1.1.4.4.3.2.7
--- src/dist/bind/version:1.1.1.4.4.3.2.6 Tue Jun 5 20:01:32 2012
+++ src/dist/bind/version Tue Jul 24 20:41:15 2012
@@ -1,4 +1,4 @@
-# $Id: version,v 1.1.1.4.4.3.2.6 2012/06/05 20:01:32 bouyer Exp $
+# $Id: version,v 1.1.1.4.4.3.2.7 2012/07/24 20:41:15 riz Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=4
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R4-P2
+RELEASEVER=-R4-P2nb1
Index: src/dist/bind/bin/tests/system/stub/tests.sh
diff -u src/dist/bind/bin/tests/system/stub/tests.sh:1.1.1.3.4.1 src/dist/bind/bin/tests/system/stub/tests.sh:1.1.1.3.4.1.2.1
--- src/dist/bind/bin/tests/system/stub/tests.sh:1.1.1.3.4.1 Thu May 17 00:36:53 2007
+++ src/dist/bind/bin/tests/system/stub/tests.sh Tue Jul 24 20:41:15 2012
@@ -21,19 +21,38 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
status=0
+echo I:check that the stub zone has been saved to disk
+for i in 1 2 3 4 5 6 7 8 9 20
+do
+ [ -f ns3/child.example.st ] break
+ sleep 1
+done
+[ -f ns3/child.example.st ] || { status=1; echo I:failed; }
-echo I:trying an axfr that should be denied (NOTAUTH)
-$DIG +tcp data.child.example. @10.53.0.3 axfr -p 5300 dig.out.ns3 || status=1
+for pass in 1 2
+do
+
+echo I:trying an axfr that should be denied (NOTAUTH) (pass=$pass)
+$DIG +tcp child.example. @10.53.0.3 axfr -p 5300 dig.out.ns3 || status=1
grep ; Transfer failed. dig.out.ns3 /dev/null || status=1
-echo I:look for stub zone data without recursion (should not be found)
+echo I:look for stub zone data without recursion (should not be found) (pass=$pass)
$DIG +tcp +norec data.child.example. @10.53.0.3 txt -p 5300 dig.out.ns3 \
|| status=1
$PERL ../digcomp.pl knowngood.dig.out.norec dig.out.ns3 || status=1
-echo I:look for stub zone data with recursion (should be found)
+echo I:look for stub zone data with recursion (should be found) (pass=$pass)
$DIG +tcp data.child.example. @10.53.0.3 txt -p 5300 dig.out.ns3 || status=1
$PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3 || status=1
+[ $pass = 1 ] {
+ echo I:stopping stub server
+ $PERL $SYSTEMTESTTOP/stop.pl . ns3
+
+ echo I:re-starting stub server
+ $PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns3
+}
+done
+
echo I:exit status: $status
exit $status
Index: src/dist/bind/lib/dns/resolver.c
diff -u src/dist/bind/lib/dns/resolver.c:1.2.2.2.2.5 src/dist/bind/lib/dns/resolver.c:1.2.2.2.2.6
--- src/dist/bind/lib/dns/resolver.c:1.2.2.2.2.5 Sat Jul 16 00:44:45 2011
+++ src/dist/bind/lib/dns/resolver.c Tue Jul 24 20:41:16 2012
@@ -1,4 +1,4 @@
-/*$NetBSD: resolver.c,v 1.2.2.2.2.5 2011/07/16 00:44:45 riz Exp $ */
+/*$NetBSD: resolver.c,v 1.2.2.2.2.6 2012/07/24 20:41:16 riz Exp $ */
/*
* Copyright (C) 2004-2011
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Jul 24 20:42:02 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: TIcket 1455 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.103 src/doc/CHANGES-4.0.2:1.1.2.104 --- src/doc/CHANGES-4.0.2:1.1.2.103 Tue Jun 12 23:22:46 2012 +++ src/doc/CHANGES-4.0.2 Tue Jul 24 20:42:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.103 2012/06/12 23:22:46 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.104 2012/07/24 20:42:02 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1392,3 +1392,13 @@ sys/arch/amd64/amd64/netbsd32_machdep.c now instead of trying to jump to the bogus address. [spz, ticket #1450] +dist/bind/CHANGESpatch +dist/bind/versionpatch +dist/bind/bin/tests/system/stub/tests.sh patch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/zone.c patch +dist/bind/lib/isc/random.c patch + + Address bind CVE-2012-3817. + [spz, ticket #1455] +
CVS commit: [netbsd-4-0] src/sys/arch/amd64/amd64
Module Name:src
Committed By: riz
Date: Tue Jun 12 23:21:42 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-4-0]: machdep.c netbsd32_machdep.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1450):
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.44.2.3 -r1.44.2.3.6.1 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.30.2.1 -r1.30.2.1.6.1 \
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.44.2.3 src/sys/arch/amd64/amd64/machdep.c:1.44.2.3.6.1
--- src/sys/arch/amd64/amd64/machdep.c:1.44.2.3 Fri Apr 20 20:31:25 2007
+++ src/sys/arch/amd64/amd64/machdep.c Tue Jun 12 23:21:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44.2.3 2007/04/20 20:31:25 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.44.2.3.6.1 2012/06/12 23:21:42 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44.2.3 2007/04/20 20:31:25 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44.2.3.6.1 2012/06/12 23:21:42 riz Exp $);
#include opt_user_ldt.h
#include opt_ddb.h
@@ -522,6 +522,16 @@ sendsig(const ksiginfo_t *ksi, const sig
/* Remember that we're now on the signal stack. */
if (onstack)
p-p_sigctx.ps_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.30.2.1 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.30.2.1.6.1
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.30.2.1 Sat Jan 6 13:18:16 2007
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Tue Jun 12 23:21:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.30.2.1 2007/01/06 13:18:16 bouyer Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.30.2.1.6.1 2012/06/12 23:21:42 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.30.2.1 2007/01/06 13:18:16 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.30.2.1.6.1 2012/06/12 23:21:42 riz Exp $);
#include opt_compat_netbsd.h
#include opt_coredump.h
@@ -256,6 +256,16 @@ netbsd32_sendsig_sigcontext(const ksigin
/* Remember that we're now on the signal stack. */
if (onstack)
p-p_sigctx.ps_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 */
+ }
}
#endif
@@ -337,6 +347,16 @@ netbsd32_sendsig_siginfo(const ksiginfo_
/* Remember that we're now on the signal stack. */
if (onstack)
p-p_sigctx.ps_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
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Jun 12 23:22:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: TIcket 1450 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.102 src/doc/CHANGES-4.0.2:1.1.2.103 --- src/doc/CHANGES-4.0.2:1.1.2.102 Tue Jun 5 20:02:04 2012 +++ src/doc/CHANGES-4.0.2 Tue Jun 12 23:22:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.102 2012/06/05 20:02:04 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.103 2012/06/12 23:22:46 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1385,3 +1385,10 @@ dist/bind/lib/dns/rdataslab.cpatch rdataslabs. [RT #29644] [christos, ticket #1447] +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 #1450] +
CVS commit: [netbsd-4-0] src/sys/arch/amd64/amd64
Module Name:src Committed By: riz Date: Tue Jun 12 23:21:42 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-4-0]: machdep.c netbsd32_machdep.c Log Message: Pull up following revision(s) (requested by spz in ticket #1450): 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.44.2.3 -r1.44.2.3.6.1 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.30.2.1 -r1.30.2.1.6.1 \ 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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Jun 12 23:22:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: TIcket 1450 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Tue Jun 5 20:01:32 UTC 2012
Modified Files:
src/dist/bind [netbsd-4-0]: CHANGES version
src/dist/bind/lib/dns [netbsd-4-0]: rdata.c rdataslab.c
Log Message:
Apply patch, requested by christos in ticket #1447
dist/bind/CHANGES patch
dist/bind/version patch
dist/bind/lib/dns/rdata.c patch
dist/bind/lib/dns/rdataslab.c patch
Update bind to 9.4-ESV-R4-P2
3331. [security] dns_rdataslab_fromrdataset could produce bad
rdataslabs. [RT #29644]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4.4.2.2.6 -r1.1.1.4.4.2.2.7 src/dist/bind/CHANGES
cvs rdiff -u -r1.1.1.4.4.3.2.5 -r1.1.1.4.4.3.2.6 src/dist/bind/version
cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \
src/dist/bind/lib/dns/rdata.c
cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \
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.4.4.2.2.6 src/dist/bind/CHANGES:1.1.1.4.4.2.2.7
--- src/dist/bind/CHANGES:1.1.1.4.4.2.2.6 Sun Nov 20 13:02:15 2011
+++ src/dist/bind/CHANGES Tue Jun 5 20:01:31 2012
@@ -1,3 +1,8 @@
+ --- 9.4-ESV-R4-P2 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
3218. [security] Cache lookup could return RRSIG data associated with
nonexistent records, leading to an assertion
failure. [RT #26590]
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.4.4.3.2.5 src/dist/bind/version:1.1.1.4.4.3.2.6
--- src/dist/bind/version:1.1.1.4.4.3.2.5 Sat Jun 18 10:38:27 2011
+++ src/dist/bind/version Tue Jun 5 20:01:32 2012
@@ -1,4 +1,4 @@
-# $Id: version,v 1.1.1.4.4.3.2.5 2011/06/18 10:38:27 bouyer Exp $
+# $Id: version,v 1.1.1.4.4.3.2.6 2012/06/05 20:01:32 bouyer Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=4
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R4-P1
+RELEASEVER=-R4-P2
Index: src/dist/bind/lib/dns/rdata.c
diff -u src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.1 src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.2
--- src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.1 Sun Jan 23 21:52:12 2011
+++ src/dist/bind/lib/dns/rdata.c Tue Jun 5 20:01:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.1 2011/01/23 21:52:12 bouyer Exp $ */
+/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.2 2012/06/05 20:01:32 bouyer Exp $ */
/*
* Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. (ISC)
@@ -338,6 +338,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata2 != NULL);
REQUIRE(rdata1-data != NULL);
REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Index: src/dist/bind/lib/dns/rdataslab.c
diff -u src/dist/bind/lib/dns/rdataslab.c:1.1.1.3.4.1.2.2 src/dist/bind/lib/dns/rdataslab.c:1.1.1.3.4.1.2.3
--- src/dist/bind/lib/dns/rdataslab.c:1.1.1.3.4.1.2.2 Sun Jan 23 21:52:12 2011
+++ src/dist/bind/lib/dns/rdataslab.c Tue Jun 5 20:01:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdataslab.c,v 1.1.1.3.4.1.2.2 2011/01/23 21:52:12 bouyer Exp $ */
+/* $NetBSD: rdataslab.c,v 1.1.1.3.4.1.2.3 2012/06/05 20:01:32 bouyer Exp $ */
/*
* Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. (ISC)
@@ -130,6 +130,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+ * Use removed as a sentinal pointer for duplicate
+ * rdata as rdata.data == NULL is valid.
+ */
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -168,6 +173,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -200,8 +206,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -277,7 +282,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Tue Jun 5 20:02:04 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1447 To generate a diff of this commit: cvs rdiff -u -r1.1.2.101 -r1.1.2.102 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.101 src/doc/CHANGES-4.0.2:1.1.2.102 --- src/doc/CHANGES-4.0.2:1.1.2.101 Tue May 22 18:57:40 2012 +++ src/doc/CHANGES-4.0.2 Tue Jun 5 20:02:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.101 2012/05/22 18:57:40 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.102 2012/06/05 20:02:04 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1375,3 +1375,13 @@ crypto/dist/openssl/ssl/d1_enc.c patch Address CVE-2012-2333. [drochner, ticket #1446] +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/lib/dns/rdata.cpatch +dist/bind/lib/dns/rdataslab.cpatch + + Update bind to 9.4-ESV-R4-P2: + 3331. [security] dns_rdataslab_fromrdataset could produce bad + rdataslabs. [RT #29644] + [christos, ticket #1447] +
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src Committed By: bouyer Date: Tue Jun 5 20:01:32 UTC 2012 Modified Files: src/dist/bind [netbsd-4-0]: CHANGES version src/dist/bind/lib/dns [netbsd-4-0]: rdata.c rdataslab.c Log Message: Apply patch, requested by christos in ticket #1447 dist/bind/CHANGES patch dist/bind/version patch dist/bind/lib/dns/rdata.c patch dist/bind/lib/dns/rdataslab.c patch Update bind to 9.4-ESV-R4-P2 3331. [security] dns_rdataslab_fromrdataset could produce bad rdataslabs. [RT #29644] To generate a diff of this commit: cvs rdiff -u -r1.1.1.4.4.2.2.6 -r1.1.1.4.4.2.2.7 src/dist/bind/CHANGES cvs rdiff -u -r1.1.1.4.4.3.2.5 -r1.1.1.4.4.3.2.6 src/dist/bind/version cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \ src/dist/bind/lib/dns/rdata.c cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \ 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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Tue Jun 5 20:02:04 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1447 To generate a diff of this commit: cvs rdiff -u -r1.1.2.101 -r1.1.2.102 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue May 22 18:56:27 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1446. To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.99 src/doc/CHANGES-4.0.2:1.1.2.100 --- src/doc/CHANGES-4.0.2:1.1.2.99 Sat May 19 17:08:10 2012 +++ src/doc/CHANGES-4.0.2 Tue May 22 18:56:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.99 2012/05/19 17:08:10 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.100 2012/05/22 18:56:27 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1370,3 +1370,8 @@ sys/netsmb/subr_mchain.c 1.21 PR#44092. [nakayama, ticket #1445] +crypto/dist/openssl/ssl/d1_enc.c patch + + Address CVE-2012-2333. + [drochner, ticket #1762] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue May 22 18:57:40 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Fix error in last commit (ticket 1446, not 1762). To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.100 src/doc/CHANGES-4.0.2:1.1.2.101 --- src/doc/CHANGES-4.0.2:1.1.2.100 Tue May 22 18:56:27 2012 +++ src/doc/CHANGES-4.0.2 Tue May 22 18:57:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.100 2012/05/22 18:56:27 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.101 2012/05/22 18:57:40 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1373,5 +1373,5 @@ sys/netsmb/subr_mchain.c 1.21 crypto/dist/openssl/ssl/d1_enc.c patch Address CVE-2012-2333. - [drochner, ticket #1762] + [drochner, ticket #1446]
CVS commit: [netbsd-4-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Tue May 22 20:14:21 UTC 2012
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-4-0]: d1_enc.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1446):
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.2 -r1.1.1.2.14.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.2 src/crypto/dist/openssl/ssl/d1_enc.c:1.1.1.2.14.1
--- src/crypto/dist/openssl/ssl/d1_enc.c:1.1.1.2 Sat Jun 3 01:45:09 2006
+++ src/crypto/dist/openssl/ssl/d1_enc.c Tue May 22 20:14:20 2012
@@ -252,7 +252,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-4-0] src/crypto/dist/openssl/ssl
Module Name:src Committed By: riz Date: Tue May 22 20:14:21 UTC 2012 Modified Files: src/crypto/dist/openssl/ssl [netbsd-4-0]: d1_enc.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1446): 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.2 -r1.1.1.2.14.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.
CVS commit: [netbsd-4-0] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:07:50 UTC 2012 Modified Files: src/sys/netsmb [netbsd-4-0]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1445): 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.13.28.1 -r1.13.28.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.13.28.1 src/sys/netsmb/subr_mchain.c:1.13.28.2 --- src/sys/netsmb/subr_mchain.c:1.13.28.1 Thu Jul 22 20:34:16 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:07:50 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.13.28.1 2010/07/22 20:34:16 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.13.28.2 2012/05/19 17:07:50 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.13.28.1 2010/07/22 20:34:16 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.13.28.2 2012/05/19 17:07:50 riz Exp $); #include sys/param.h #include sys/systm.h @@ -70,7 +70,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); @@ -92,7 +92,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-4-0] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:07:50 UTC 2012 Modified Files: src/sys/netsmb [netbsd-4-0]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1445): 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.13.28.1 -r1.13.28.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.
CVS commit: [netbsd-4-0] src/crypto/dist/openssl/crypto
Module Name:src
Committed By: riz
Date: Fri May 11 17:18:35 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto [netbsd-4-0]: mem.c
src/crypto/dist/openssl/crypto/asn1 [netbsd-4-0]: a_d2i_fp.c
src/crypto/dist/openssl/crypto/buffer [netbsd-4-0]: buffer.c
Log Message:
Apply patch (requested by drochner in ticket #1444):
crypto/dist/openssl/crypto/mem.cpatch
crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch
crypto/dist/openssl/crypto/buffer/buffer.c patch
Address CVE-2012-2110.
[drochner, ticket #1444]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.14.1 src/crypto/dist/openssl/crypto/mem.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.14.1 \
src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.14.1 \
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/mem.c
diff -u src/crypto/dist/openssl/crypto/mem.c:1.1.1.7 src/crypto/dist/openssl/crypto/mem.c:1.1.1.7.14.1
--- src/crypto/dist/openssl/crypto/mem.c:1.1.1.7 Fri Nov 25 03:03:57 2005
+++ src/crypto/dist/openssl/crypto/mem.c Fri May 11 17:18:34 2012
@@ -348,6 +348,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.14.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 Fri May 11 17:18:35 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.4 src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.4.14.1
--- src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.4 Fri Nov 25 03:04:59 2005
+++ src/crypto/dist/openssl/crypto/buffer/buffer.c Fri May 11
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri May 11 19:11:07 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1444. To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.97 src/doc/CHANGES-4.0.2:1.1.2.98 --- src/doc/CHANGES-4.0.2:1.1.2.97 Sat Mar 17 19:40:06 2012 +++ src/doc/CHANGES-4.0.2 Fri May 11 19:11:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.97 2012/03/17 19:40:06 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.98 2012/05/11 19:11:07 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1357,3 +1357,10 @@ sys/arch/sparc64/sparc64/locore.s 1.340 result of pseg_get and pmap_extact sometimes gets screwed up. [nakayama, ticket #1443] +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 + + Address CVE-2012-2110. + [drochner, ticket #1444] +
CVS commit: [netbsd-4-0] src/crypto/dist/openssl/crypto
Module Name:src Committed By: riz Date: Fri May 11 17:18:35 UTC 2012 Modified Files: src/crypto/dist/openssl/crypto [netbsd-4-0]: mem.c src/crypto/dist/openssl/crypto/asn1 [netbsd-4-0]: a_d2i_fp.c src/crypto/dist/openssl/crypto/buffer [netbsd-4-0]: buffer.c Log Message: Apply patch (requested by drochner in ticket #1444): crypto/dist/openssl/crypto/mem.cpatch crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch crypto/dist/openssl/crypto/buffer/buffer.c patch Address CVE-2012-2110. [drochner, ticket #1444] To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.1.1.7.14.1 src/crypto/dist/openssl/crypto/mem.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.14.1 \ src/crypto/dist/openssl/crypto/asn1/a_d2i_fp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.14.1 \ 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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri May 11 19:11:07 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1444. To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:39:35 UTC 2012
Modified Files:
src/doc [netbsd-4-0]: HACKS
src/sys/arch/sparc64/conf [netbsd-4-0]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-4-0]: locore.s
Log Message:
Pull up following revision(s) via patch (requested by nakayama in ticket #1443):
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.91.2.2 -r1.91.2.2.2.1 src/doc/HACKS
cvs rdiff -u -r1.62.12.1 -r1.62.12.1.4.1 \
src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.107 -r1.107.8.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.232.2.2.4.1 -r1.232.2.2.4.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.91.2.2 src/doc/HACKS:1.91.2.2.2.1
--- src/doc/HACKS:1.91.2.2 Thu Jul 19 14:38:17 2007
+++ src/doc/HACKS Sat Mar 17 19:39:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.91.2.2 2007/07/19 14:38:17 liamjfoy Exp $
+# $NetBSD: HACKS,v 1.91.2.2.2.1 2012/03/17 19:39:34 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -569,18 +569,6 @@ port m68000
toolchains on sun2 with its maximum 4MB RAM)
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 macppc
hack remove inline from rotate_{left,right}
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1.4.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 Tue Jun 5 20:22:33 2007
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 19:39:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.62.12.1 2007/06/05 20:22:33 bouyer Exp $
+# $NetBSD: Makefile.sparc64,v 1.62.12.1.4.1 2012/03/17 19:39:32 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.107 src/sys/arch/sparc64/conf/files.sparc64:1.107.8.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.107 Thu Nov 9 15:08:04 2006
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 19:39:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.107 2006/11/09 15:08:04 tsutsui Exp $
+# $NetBSD: files.sparc64,v 1.107.8.1 2012/03/17 19:39:33 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -248,6 +248,3 @@ file netns/ns_cksum.c ns
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}
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.1 src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.2
--- src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.1 Sun Jul 6 17:32:51 2008
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 19:39:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.232.2.2.4.1 2008/07/06 17:32:51 bouyer Exp $ */
+/* $NetBSD:
CVS commit: [netbsd-4-0] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:40:06 UTC 2012
Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2
Log Message:
ticket 1443
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-4.0.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.96 src/doc/CHANGES-4.0.2:1.1.2.97
--- src/doc/CHANGES-4.0.2:1.1.2.96 Fri Mar 2 17:49:02 2012
+++ src/doc/CHANGES-4.0.2 Sat Mar 17 19:40:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.0.2,v 1.1.2.96 2012/03/02 17:49:02 riz Exp $
+# $NetBSD: CHANGES-4.0.2,v 1.1.2.97 2012/03/17 19:40:06 bouyer Exp $
A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
release:
@@ -1339,3 +1339,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1442]
+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 #1443]
+
CVS commit: [netbsd-4-0] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:39:35 UTC 2012
Modified Files:
src/doc [netbsd-4-0]: HACKS
src/sys/arch/sparc64/conf [netbsd-4-0]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-4-0]: locore.s
Log Message:
Pull up following revision(s) via patch (requested by nakayama in ticket #1443):
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.91.2.2 -r1.91.2.2.2.1 src/doc/HACKS
cvs rdiff -u -r1.62.12.1 -r1.62.12.1.4.1 \
src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.107 -r1.107.8.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.232.2.2.4.1 -r1.232.2.2.4.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.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 17:48:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: northamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1442): 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.486.2.9.2.6 -r1.486.2.9.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.37.2.3.2.3 -r1.1.1.37.2.3.2.4 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.26.2.3.2.3 -r1.1.1.26.2.3.2.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.486.2.9.2.6 src/doc/3RDPARTY:1.486.2.9.2.7 --- src/doc/3RDPARTY:1.486.2.9.2.6 Fri Mar 2 06:37:38 2012 +++ src/doc/3RDPARTY Fri Mar 2 17:48:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.6 2012/03/02 06:37:38 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.7 2012/03/02 17:48:46 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,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.37.2.3.2.3 src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.4 --- src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.3 Fri Mar 2 02:58:35 2012 +++ src/share/zoneinfo/northamerica Fri Mar 2 17:48:46 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.26.2.3.2.3 src/share/zoneinfo/zone.tab:1.1.1.26.2.3.2.4 --- src/share/zoneinfo/zone.tab:1.1.1.26.2.3.2.3 Fri Mar 2 02:58:36 2012 +++ src/share/zoneinfo/zone.tab Fri Mar 2 17:48:46 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
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 17:49:03 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1442. To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.95 src/doc/CHANGES-4.0.2:1.1.2.96 --- src/doc/CHANGES-4.0.2:1.1.2.95 Fri Mar 2 06:38:16 2012 +++ src/doc/CHANGES-4.0.2 Fri Mar 2 17:49:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.95 2012/03/02 06:38:16 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.96 2012/03/02 17:49:02 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1332,3 +1332,10 @@ share/zoneinfo/zone.tabpatch Update to tzdata2012a. [apb, ticket #1441] +doc/3RDPARTY 1.921 +share/zoneinfo/northamerica patch +share/zoneinfo/zone.tabpatch + + Update to tzdata2012b. + [apb, ticket #1442] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 17:48:46 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: northamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1442): 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.486.2.9.2.6 -r1.486.2.9.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.37.2.3.2.3 -r1.1.1.37.2.3.2.4 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.26.2.3.2.3 -r1.1.1.26.2.3.2.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 17:49:03 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1442. To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 2 02:58:36 UTC 2012 Modified Files: src/share/zoneinfo [netbsd-4-0]: antarctica asia australasia europe leapseconds northamerica southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1441): 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.16.2.1.2.1 -r1.1.1.16.2.1.2.2 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.2 -r1.1.1.40.2.1.2.3 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.2 -r1.11.2.4.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.2.2.2 -r1.1.1.34.2.2.2.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.12.2.1.2.2 -r1.1.1.12.2.1.2.3 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.2 -r1.1.1.37.2.3.2.3 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.2 -r1.1.1.35.2.2.2.3 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.26.2.3.2.2 -r1.1.1.26.2.3.2.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/share/zoneinfo/antarctica diff -u src/share/zoneinfo/antarctica:1.1.1.16.2.1.2.1 src/share/zoneinfo/antarctica:1.1.1.16.2.1.2.2 --- src/share/zoneinfo/antarctica:1.1.1.16.2.1.2.1 Wed Nov 2 18:29:53 2011 +++ src/share/zoneinfo/antarctica Fri Mar 2 02:58:35 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.40.2.1.2.2 src/share/zoneinfo/asia:1.1.1.40.2.1.2.3 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.2 Wed Nov 2 18:29:53 2011 +++ src/share/zoneinfo/asia Fri Mar 2 02:58:35 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
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 02:59:07 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1441. To generate a diff of this commit: cvs rdiff -u -r1.1.2.93 -r1.1.2.94 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.93 src/doc/CHANGES-4.0.2:1.1.2.94 --- src/doc/CHANGES-4.0.2:1.1.2.93 Sat Dec 31 20:52:39 2011 +++ src/doc/CHANGES-4.0.2 Fri Mar 2 02:59:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.93 2011/12/31 20:52:39 snj Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.94 2012/03/02 02:59:07 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1318,3 +1318,15 @@ lib/libtelnet/encrypt.c1.15 Avoid buffer overflow, reported by Colin Percival at FreeBSD [christos, ticket #1440] +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 #1441] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 06:37:39 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-4-0]: mi src/doc [netbsd-4-0]: 3RDPARTY Log Message: Pull up following revision(s) (requested by apb in ticket #1441): 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.678.2.10.2.3 -r1.678.2.10.2.4 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.486.2.9.2.5 -r1.486.2.9.2.6 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.678.2.10.2.3 src/distrib/sets/lists/base/mi:1.678.2.10.2.4 --- src/distrib/sets/lists/base/mi:1.678.2.10.2.3 Wed Nov 2 18:29:52 2011 +++ src/distrib/sets/lists/base/mi Fri Mar 2 06:37:38 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.678.2.10.2.3 2011/11/02 18:29:52 riz Exp $ +# $NetBSD: mi,v 1.678.2.10.2.4 2012/03/02 06:37:38 riz Exp $ . base-sys-root ./altroot base-sys-root ./bin base-sys-root @@ -3355,6 +3355,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.486.2.9.2.5 src/doc/3RDPARTY:1.486.2.9.2.6 --- src/doc/3RDPARTY:1.486.2.9.2.5 Wed Nov 2 18:29:52 2011 +++ src/doc/3RDPARTY Fri Mar 2 06:37:38 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.5 2011/11/02 18:29:52 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.6 2012/03/02 06:37:38 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,15 +845,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-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 06:38:16 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1441 addendum. To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.94 src/doc/CHANGES-4.0.2:1.1.2.95 --- src/doc/CHANGES-4.0.2:1.1.2.94 Fri Mar 2 02:59:07 2012 +++ src/doc/CHANGES-4.0.2 Fri Mar 2 06:38:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.94 2012/03/02 02:59:07 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.95 2012/03/02 06:38:16 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1318,6 +1318,8 @@ lib/libtelnet/encrypt.c1.15 Avoid buffer overflow, reported by Colin Percival at FreeBSD [christos, ticket #1440] +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-4-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 2 02:58:36 UTC 2012 Modified Files: src/share/zoneinfo [netbsd-4-0]: antarctica asia australasia europe leapseconds northamerica southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1441): 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.16.2.1.2.1 -r1.1.1.16.2.1.2.2 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.2 -r1.1.1.40.2.1.2.3 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.2 -r1.11.2.4.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.2.2.2 -r1.1.1.34.2.2.2.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.12.2.1.2.2 -r1.1.1.12.2.1.2.3 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.2 -r1.1.1.37.2.3.2.3 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.2 -r1.1.1.35.2.2.2.3 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.26.2.3.2.2 -r1.1.1.26.2.3.2.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 02:59:07 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1441. To generate a diff of this commit: cvs rdiff -u -r1.1.2.93 -r1.1.2.94 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Fri Mar 2 06:37:39 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-4-0]: mi src/doc [netbsd-4-0]: 3RDPARTY Log Message: Pull up following revision(s) (requested by apb in ticket #1441): 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.678.2.10.2.3 -r1.678.2.10.2.4 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.486.2.9.2.5 -r1.486.2.9.2.6 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 2 06:38:16 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1441 addendum. To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/lib/libtelnet
Module Name:src
Committed By: snj
Date: Sat Dec 31 20:52:16 UTC 2011
Modified Files:
src/lib/libtelnet [netbsd-4-0]: encrypt.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1440):
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.13 -r1.13.14.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.13 src/lib/libtelnet/encrypt.c:1.13.14.1
--- src/lib/libtelnet/encrypt.c:1.13 Sun Feb 6 05:53:07 2005
+++ src/lib/libtelnet/encrypt.c Sat Dec 31 20:52:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: encrypt.c,v 1.13 2005/02/06 05:53:07 perry Exp $ */
+/* $NetBSD: encrypt.c,v 1.13.14.1 2011/12/31 20:52:16 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.13 2005/02/06 05:53:07 perry Exp $);
+__RCSID($NetBSD: encrypt.c,v 1.13.14.1 2011/12/31 20:52:16 snj Exp $);
#endif /* not lint */
/*
@@ -767,6 +767,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-4-0] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 20:52:40 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: 1440 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.92 src/doc/CHANGES-4.0.2:1.1.2.93 --- src/doc/CHANGES-4.0.2:1.1.2.92 Sun Nov 20 13:04:55 2011 +++ src/doc/CHANGES-4.0.2 Sat Dec 31 20:52:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.92 2011/11/20 13:04:55 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.93 2011/12/31 20:52:39 snj Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1313,3 +1313,8 @@ src/dist/bind/lib/lwres/include/lwres/lw records, leading to an assertion failure. Fixes CVE-2011-4313. [christos, ticket #1437] +lib/libtelnet/encrypt.c1.15 + + Avoid buffer overflow, reported by Colin Percival at FreeBSD + [christos, ticket #1440] +
CVS commit: [netbsd-4-0] src/lib/libtelnet
Module Name:src Committed By: snj Date: Sat Dec 31 20:52:16 UTC 2011 Modified Files: src/lib/libtelnet [netbsd-4-0]: encrypt.c Log Message: Pull up following revision(s) (requested by christos in ticket #1440): 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.13 -r1.13.14.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.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 20:52:40 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: 1440 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Sun Nov 20 13:02:17 UTC 2011
Modified Files:
src/dist/bind [netbsd-4-0]: CHANGES
src/dist/bind/bin/named [netbsd-4-0]: query.c
src/dist/bind/bin/nsupdate [netbsd-4-0]: nsupdate.8
src/dist/bind/lib/dns [netbsd-4-0]: master.c rbtdb.c
src/dist/bind/lib/isc/nothreads [netbsd-4-0]: condition.c mutex.c
src/dist/bind/lib/isc/unix [netbsd-4-0]: time.c
src/dist/bind/lib/lwres/include/lwres [netbsd-4-0]: lwres.h
Log Message:
Apply patch, requested by christos in ticket #1437:
src/dist/bind/CHANGES
src/dist/bind/bin/named/query.c
src/dist/bind/bin/nsupdate/nsupdate.8
src/dist/bind/lib/dns/master.c
src/dist/bind/lib/dns/rbtdb.c
src/dist/bind/lib/isc/nothreads/condition.c
src/dist/bind/lib/isc/nothreads/mutex.c
src/dist/bind/lib/isc/unix/time.c
src/dist/bind/lib/lwres/include/lwres/lwres.h
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.1.1.4.4.2.2.5 -r1.1.1.4.4.2.2.6 src/dist/bind/CHANGES
cvs rdiff -u -r1.3.2.1.2.3 -r1.3.2.1.2.4 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \
src/dist/bind/bin/nsupdate/nsupdate.8
cvs rdiff -u -r1.1.1.4.4.1.2.2 -r1.1.1.4.4.1.2.3 \
src/dist/bind/lib/dns/master.c
cvs rdiff -u -r1.1.1.4.4.1.2.4 -r1.1.1.4.4.1.2.5 \
src/dist/bind/lib/dns/rbtdb.c
cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1 \
src/dist/bind/lib/isc/nothreads/condition.c \
src/dist/bind/lib/isc/nothreads/mutex.c
cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \
src/dist/bind/lib/isc/unix/time.c
cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1 \
src/dist/bind/lib/lwres/include/lwres/lwres.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.4.4.2.2.5 src/dist/bind/CHANGES:1.1.1.4.4.2.2.6
--- src/dist/bind/CHANGES:1.1.1.4.4.2.2.5 Sat Jun 18 10:38:27 2011
+++ src/dist/bind/CHANGES Sun Nov 20 13:02:15 2011
@@ -1,3 +1,7 @@
+3218. [security] Cache lookup could return RRSIG data associated with
+nonexistent records, leading to an assertion
+failure. [RT #26590]
+
--- 9.4-ESV-R4-P1 released ---
3121. [security] An authoritative name server sending a negative
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.3.2.1.2.3 src/dist/bind/bin/named/query.c:1.3.2.1.2.4
--- src/dist/bind/bin/named/query.c:1.3.2.1.2.3 Sun Jan 23 21:51:24 2011
+++ src/dist/bind/bin/named/query.c Sun Nov 20 13:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.3.2.1.2.3 2011/01/23 21:51:24 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.3.2.1.2.4 2011/11/20 13:02:15 bouyer Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -1253,11 +1253,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;
@@ -1298,8 +1296,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;
@@ -1748,10 +1747,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/bin/nsupdate/nsupdate.8
diff -u src/dist/bind/bin/nsupdate/nsupdate.8:1.1.1.3.4.1.2.2 src/dist/bind/bin/nsupdate/nsupdate.8:1.1.1.3.4.1.2.3
--- src/dist/bind/bin/nsupdate/nsupdate.8:1.1.1.3.4.1.2.2 Sun Jan 23 21:51:27 2011
+++ src/dist/bind/bin/nsupdate/nsupdate.8 Sun Nov 20 13:02:16 2011
@@ -1,2 +1,443 @@
-.\ $NetBSD: nsupdate.8,v 1.1.1.3.4.1.2.2 2011/01/23 21:51:27 bouyer Exp $
+.\ $NetBSD: nsupdate.8,v 1.1.1.3.4.1.2.3 2011/11/20 13:02:16 bouyer Exp $
.\
+.\ Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
+.\
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Nov 20 13:04:55 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1437 To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.91 src/doc/CHANGES-4.0.2:1.1.2.92 --- src/doc/CHANGES-4.0.2:1.1.2.91 Sat Nov 19 14:40:08 2011 +++ src/doc/CHANGES-4.0.2 Sun Nov 20 13:04:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.91 2011/11/19 14:40:08 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.92 2011/11/20 13:04:55 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1299,3 +1299,17 @@ dist/openpam/lib/openpam_configure.c 1. (CVE-2011-4122) [drochner, ticket #1439] +src/dist/bind/CHANGES patch +src/dist/bind/bin/named/query.c patch +src/dist/bind/bin/nsupdate/nsupdate.8patch +src/dist/bind/lib/dns/master.c patch +src/dist/bind/lib/dns/rbtdb.c patch +src/dist/bind/lib/isc/nothreads/condition.c patch +src/dist/bind/lib/isc/nothreads/mutex.cpatch +src/dist/bind/lib/isc/unix/time.cpatch +src/dist/bind/lib/lwres/include/lwres/lwres.h patch + + Cache lookup could return RRSIG data associated with nonexistent + records, leading to an assertion failure. Fixes CVE-2011-4313. + [christos, ticket #1437] +
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src Committed By: bouyer Date: Sun Nov 20 13:02:17 UTC 2011 Modified Files: src/dist/bind [netbsd-4-0]: CHANGES src/dist/bind/bin/named [netbsd-4-0]: query.c src/dist/bind/bin/nsupdate [netbsd-4-0]: nsupdate.8 src/dist/bind/lib/dns [netbsd-4-0]: master.c rbtdb.c src/dist/bind/lib/isc/nothreads [netbsd-4-0]: condition.c mutex.c src/dist/bind/lib/isc/unix [netbsd-4-0]: time.c src/dist/bind/lib/lwres/include/lwres [netbsd-4-0]: lwres.h Log Message: Apply patch, requested by christos in ticket #1437: src/dist/bind/CHANGES src/dist/bind/bin/named/query.c src/dist/bind/bin/nsupdate/nsupdate.8 src/dist/bind/lib/dns/master.c src/dist/bind/lib/dns/rbtdb.c src/dist/bind/lib/isc/nothreads/condition.c src/dist/bind/lib/isc/nothreads/mutex.c src/dist/bind/lib/isc/unix/time.c src/dist/bind/lib/lwres/include/lwres/lwres.h 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.1.1.4.4.2.2.5 -r1.1.1.4.4.2.2.6 src/dist/bind/CHANGES cvs rdiff -u -r1.3.2.1.2.3 -r1.3.2.1.2.4 src/dist/bind/bin/named/query.c cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \ src/dist/bind/bin/nsupdate/nsupdate.8 cvs rdiff -u -r1.1.1.4.4.1.2.2 -r1.1.1.4.4.1.2.3 \ src/dist/bind/lib/dns/master.c cvs rdiff -u -r1.1.1.4.4.1.2.4 -r1.1.1.4.4.1.2.5 \ src/dist/bind/lib/dns/rbtdb.c cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1 \ src/dist/bind/lib/isc/nothreads/condition.c \ src/dist/bind/lib/isc/nothreads/mutex.c cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \ src/dist/bind/lib/isc/unix/time.c cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1 \ src/dist/bind/lib/lwres/include/lwres/lwres.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Nov 20 13:04:55 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1437 To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/sys/uvm
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:21:43 UTC 2011 Modified Files: src/sys/uvm [netbsd-4-0]: uvm_meter.c Log Message: Pull up following revision(s) (requested by christos in ticket #1436): sys/uvm/uvm_meter.c: revision 1.57 via patch if you are going to dereference a variable, check the variable itself, not it cousin. To generate a diff of this commit: cvs rdiff -u -r1.43.2.1 -r1.43.2.1.4.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.43.2.1 src/sys/uvm/uvm_meter.c:1.43.2.1.4.1 --- src/sys/uvm/uvm_meter.c:1.43.2.1 Fri Oct 12 22:36:07 2007 +++ src/sys/uvm/uvm_meter.c Sat Nov 19 14:21:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_meter.c,v 1.43.2.1 2007/10/12 22:36:07 riz Exp $ */ +/* $NetBSD: uvm_meter.c,v 1.43.2.1.4.1 2011/11/19 14:21:43 bouyer 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.43.2.1 2007/10/12 22:36:07 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.43.2.1.4.1 2011/11/19 14:21:43 bouyer Exp $); #include sys/param.h #include sys/proc.h @@ -148,7 +148,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-4-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Nov 19 14:37:09 UTC 2011
Modified Files:
src/sys/kern [netbsd-4-0]: kern_event.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1438):
sys/kern/kern_event.c: revision 1.73
PR/45618: Motoyuki OHMORI: kqueue EVFILT_TIMER with smaller timeout value
makes DIAGNOSTIC kernel panic:
KASSERT((c-c_flags CALLOUT_PENDING) !=3D 0);
If the computed ticks are = 0 set it to 1
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 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.33 src/sys/kern/kern_event.c:1.33.8.1
--- src/sys/kern/kern_event.c:1.33 Wed Nov 1 10:17:58 2006
+++ src/sys/kern/kern_event.c Sat Nov 19 14:37:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.33 2006/11/01 10:17:58 yamt Exp $ */
+/* $NetBSD: kern_event.c,v 1.33.8.1 2011/11/19 14:37:09 bouyer Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon jle...@freebsd.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.33 2006/11/01 10:17:58 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.33.8.1 2011/11/19 14:37:09 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -505,6 +505,8 @@ filt_timerexpire(void *knx)
if ((kn-kn_flags EV_ONESHOT) == 0) {
tticks = mstohz(kn-kn_sdata);
+ if (tticks = 0)
+ tticks = 1;
callout_schedule((struct callout *)kn-kn_hook, tticks);
}
}
CVS commit: [netbsd-4-0] src/dist/openpam/lib
Module Name:src
Committed By: bouyer
Date: Sat Nov 19 14:38:31 UTC 2011
Modified Files:
src/dist/openpam/lib [netbsd-4-0]: openpam_configure.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1439):
dist/openpam/lib/openpam_configure.c: revision 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)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.20.1 src/dist/openpam/lib/openpam_configure.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/openpam/lib/openpam_configure.c
diff -u src/dist/openpam/lib/openpam_configure.c:1.4 src/dist/openpam/lib/openpam_configure.c:1.4.20.1
--- src/dist/openpam/lib/openpam_configure.c:1.4 Wed Mar 16 15:28:55 2005
+++ src/dist/openpam/lib/openpam_configure.c Sat Nov 19 14:38:31 2011
@@ -288,6 +288,12 @@ openpam_load_chain(pam_handle_t *pamh,
size_t len;
int r;
+ /* don't allow to escape from policy_path */
+ if (strchr(service, '/')) {
+ openpam_log(PAM_LOG_ERROR, illegal service \%s\, service);
+ return (-PAM_SYSTEM_ERR);
+ }
+
for (path = openpam_policy_path; *path != NULL; ++path) {
len = strlen(*path);
if ((*path)[len - 1] == '/') {
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:40:08 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1436, 1438, 1439 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.90 src/doc/CHANGES-4.0.2:1.1.2.91 --- src/doc/CHANGES-4.0.2:1.1.2.90 Wed Nov 2 18:30:16 2011 +++ src/doc/CHANGES-4.0.2 Sat Nov 19 14:40:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.90 2011/11/02 18:30:16 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.91 2011/11/19 14:40:08 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1273,3 +1273,29 @@ share/zoneinfo/zone.tab patch Update to tzdata2011n. [apb, ticket #1435] +sys/uvm/uvm_meter.c1.57 via patch + + if you are going to dereference a variable, check the variable itself, + not it cousin. + [christos, ticket #1436] + +sys/kern/kern_event.c1.73 + + PR/45618: Motoyuki OHMORI: kqueue EVFILT_TIMER with smaller timeout + value makes DIAGNOSTIC kernel panic: + KASSERT((c-c_flags CALLOUT_PENDING) !=3D 0); + If the computed ticks are = 0 set it to 1 + [christos, ticket #1438] + +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 #1439] +
CVS commit: [netbsd-4-0] src/sys/uvm
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:21:43 UTC 2011 Modified Files: src/sys/uvm [netbsd-4-0]: uvm_meter.c Log Message: Pull up following revision(s) (requested by christos in ticket #1436): sys/uvm/uvm_meter.c: revision 1.57 via patch if you are going to dereference a variable, check the variable itself, not it cousin. To generate a diff of this commit: cvs rdiff -u -r1.43.2.1 -r1.43.2.1.4.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.
CVS commit: [netbsd-4-0] src/sys/kern
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:37:09 UTC 2011 Modified Files: src/sys/kern [netbsd-4-0]: kern_event.c Log Message: Pull up following revision(s) (requested by christos in ticket #1438): sys/kern/kern_event.c: revision 1.73 PR/45618: Motoyuki OHMORI: kqueue EVFILT_TIMER with smaller timeout value makes DIAGNOSTIC kernel panic: KASSERT((c-c_flags CALLOUT_PENDING) !=3D 0); If the computed ticks are = 0 set it to 1 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.8.1 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.
CVS commit: [netbsd-4-0] src/dist/openpam/lib
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:38:31 UTC 2011 Modified Files: src/dist/openpam/lib [netbsd-4-0]: openpam_configure.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1439): dist/openpam/lib/openpam_configure.c: revision 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) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.20.1 src/dist/openpam/lib/openpam_configure.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Nov 19 14:40:08 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1436, 1438, 1439 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 2 18:30:16 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1435. To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.89 src/doc/CHANGES-4.0.2:1.1.2.90 --- src/doc/CHANGES-4.0.2:1.1.2.89 Mon Aug 22 17:55:44 2011 +++ src/doc/CHANGES-4.0.2 Wed Nov 2 18:30:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.89 2011/08/22 17:55:44 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.90 2011/11/02 18:30:16 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1248,3 +1248,28 @@ xsrc/xfree/xc/lib/font/fontfile/decompre Address CVE-2011-2895, buffer overflow in decompression. [joerg, ticket #1433] +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 #1435] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 2 18:29:55 UTC 2011 Modified Files: src/distrib/sets/lists/base [netbsd-4-0]: mi src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv zone.tab Log Message: Apply patch (requested by apb in ticket #1435): 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.shpatch share/zoneinfo/zone.tab patch Update to tzdata2011n. [apb, ticket #1435] To generate a diff of this commit: cvs rdiff -u -r1.678.2.10.2.2 -r1.678.2.10.2.3 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.486.2.9.2.4 -r1.486.2.9.2.5 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.1 -r1.1.1.21.2.3.2.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.16.2.1 -r1.1.1.16.2.1.2.1 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.1 -r1.1.1.40.2.1.2.2 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.1 -r1.11.2.4.2.2 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.17.2.1.4.1 -r1.1.1.17.2.1.4.2 \ src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6 -r1.1.1.6.12.1 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.34.2.2.2.1 -r1.1.1.34.2.2.2.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 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.15.2.1.4.1 -r1.1.1.15.2.1.4.2 \ src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.12.2.1.2.1 -r1.1.1.12.2.1.2.2 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.1 -r1.1.1.37.2.3.2.2 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.1 -r1.1.1.35.2.2.2.2 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 src/share/zoneinfo/systemv cvs rdiff -u -r1.1.1.26.2.3.2.1 -r1.1.1.26.2.3.2.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.
