Module Name: src
Committed By: snj
Date: Thu Feb 2 08:23:04 UTC 2012
Modified Files:
src/distrib/notes/common [netbsd-5-1]: main xfer
src/doc [netbsd-5-1]: CHANGES-5.1.2 LAST_MINUTE README.files
src/gnu/usr.bin/groff/tmac [netbsd-5-1]: mdoc.local
src/sys/sys [netbsd-5-1]: param.h
Log Message:
Welcome to 5.1.2!
To generate a diff of this commit:
cvs rdiff -u -r1.425.2.14.2.1 -r1.425.2.14.2.2 src/distrib/notes/common/main
cvs rdiff -u -r1.63.2.2.2.1 -r1.63.2.2.2.2 src/distrib/notes/common/xfer
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.1.2
cvs rdiff -u -r1.2.30.2.2.1 -r1.2.30.2.2.2 src/doc/LAST_MINUTE
cvs rdiff -u -r1.4.10.3.2.1 -r1.4.10.3.2.2 src/doc/README.files
cvs rdiff -u -r1.43.4.15.2.3 -r1.43.4.15.2.4 \
src/gnu/usr.bin/groff/tmac/mdoc.local
cvs rdiff -u -r1.330.4.15.2.3 -r1.330.4.15.2.4 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.14.2.1 src/distrib/notes/common/main:1.425.2.14.2.2
--- src/distrib/notes/common/main:1.425.2.14.2.1 Tue Jan 3 05:31:07 2012
+++ src/distrib/notes/common/main Thu Feb 2 08:23:02 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.425.2.14.2.1 2012/01/03 05:31:07 snj Exp $
+.\" $NetBSD: main,v 1.425.2.14.2.2 2012/02/02 08:23:02 snj Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,7 +50,7 @@
.as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
.so \*[.CURDIR]/../common/macros
.
-.Dd January 3, 2012
+.Dd February 2, 2012
.Dt INSTALL 8
.Os NetBSD
.Sh NAME
@@ -455,7 +455,7 @@ wouldn't exist.
.Pp
.
.Nx
-5.1.1 is dedicated to the memory of Yoshihiro Masuda, who passed away
+5.1.2 is dedicated to the memory of Yoshihiro Masuda, who passed away
in May 2011.
.Pp
He was a spiritual pillar of the BSD community in Japan.
@@ -464,11 +464,11 @@ to BSD developers.
We remember his passion and deep love for BSD.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between the NetBSD 5.1 and 5.1.1 Releases
+.Ss Changes Between the NetBSD 5.1 and 5.1.2 Releases
.Pp
.Nx
\*V
-is the first critical/security update of the NetBSD 5.1 release branch.
+is the second critical/security update of the NetBSD 5.1 release branch.
It represents a selected subset of fixes deemed critical for security or
stability reasons.
.Pp
@@ -479,9 +479,11 @@ These fixes also appear in minor release
.
.Pp
The complete list of changes can be found in the
-CHANGES-5.1.1:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.1.1/CHANGES-5.1.1
-file in the top level directory of the NetBSD 5.1.1 release tree.
+CHANGES-5.1.2:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.1.2/CHANGES-5.1.2
+file in the top level directory of the NetBSD 5.1.2 release tree.
+Note that since 5.1.1 was not announced, the changes below are relative to
+5.1, not 5.1.1.
An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
@@ -528,13 +530,14 @@ BIND resolver DoS.
.
.Pp
Advisories prior to NetBSD-SA2010-012 do not affect
-NetBSD 5.1.1:
-.Lk http://www.NetBSD.org/support/security/patches-5.1.1.html .
+NetBSD 5.1.2:
+.Lk http://www.NetBSD.org/support/security/patches-5.1.2.html .
.Ss2 Other Security Fixes
.(bullet
Fix a buffer overflow in libtelnet.
.It
-OpenSSL: Fix CVE-2010-4180.
+OpenSSL: Fix CVE-2010-4180, CVE-2012-0050, CVE-2011-4109, CVE-2011-4109,
+and CVE-2011-4576.
.It
Postfix: Update to 2.6.9, fixing CVE-2011-0411.
.It
@@ -544,6 +547,8 @@ xrdb: Fix CVE-2011-0465.
.It
.Xr glob 3 :
Prevent resource DoS from brace expansion.
+.It
+OpenSSH: Fix CVE-2012-0814.
.bullet)
.
.Ss2 Kernel
@@ -671,7 +676,9 @@ Changes between the initial 5.0 branch a
.It Li CHANGES-5.1
Changes between the 5.0 and 5.1 releases.
.It Li CHANGES-5.1.1
-Changes between the 5.1 adn 5.1.1 releases.
+Changes between the 5.1 and 5.1.1 releases.
+.It Li CHANGES-5.1.2
+Changes between the 5.1.1 and 5.1.2 releases.
.It Li CHANGES.prev
Changes in previous
.Nx
Index: src/distrib/notes/common/xfer
diff -u src/distrib/notes/common/xfer:1.63.2.2.2.1 src/distrib/notes/common/xfer:1.63.2.2.2.2
--- src/distrib/notes/common/xfer:1.63.2.2.2.1 Tue Jan 3 05:31:08 2012
+++ src/distrib/notes/common/xfer Thu Feb 2 08:23:03 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.63.2.2.2.1 2012/01/03 05:31:08 snj Exp $
+.\" $NetBSD: xfer,v 1.63.2.2.2.2 2012/02/02 08:23:03 snj Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -651,14 +651,6 @@ machine.
Finally, you need to know the numeric IP address of the
.Nx
machine itself.
-If you don't have access to a functioning nameserver during
-installation, the IPv4 address of
-.Sy ftp.NetBSD.org
-is
-.Li 199.233.217.249
-and the IPv6 address is
-.Li 2001:470:1f05:53::21
-(as of January, 2012).
.Pp
Once you have this information, you can proceed to the next
step in the installation or upgrade process.
Index: src/doc/CHANGES-5.1.2
diff -u src/doc/CHANGES-5.1.2:1.1.2.3 src/doc/CHANGES-5.1.2:1.1.2.4
--- src/doc/CHANGES-5.1.2:1.1.2.3 Fri Jan 27 19:33:06 2012
+++ src/doc/CHANGES-5.1.2 Thu Feb 2 08:23:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.2,v 1.1.2.3 2012/01/27 19:33:06 riz Exp $
+# $NetBSD: CHANGES-5.1.2,v 1.1.2.4 2012/02/02 08:23:03 snj Exp $
A complete list of changes from the NetBSD 5.1.1 release to the NetBSD 5.1.2
release:
@@ -9,7 +9,7 @@ sys/sys/param.h patched by hand
Welcome to 5.1.1_PATCH.
[snj]
-crypto/dist/openssl/ssl/d1_pkt.c patch
+crypto/dist/openssl/ssl/d1_pkt.c patch
Address CVE-2012-0050.
[drochner, ticket #1710]
@@ -26,13 +26,23 @@ crypto/dist/openssl/engines/ccgost/gost9
Address CVE-2011-4109.
[drochner, ticket #1712]
-crypto/dist/openssl/ssl/s3_enc.c patch
+crypto/dist/openssl/ssl/s3_enc.c patch
Address CVE-2011-4576.
[drochner, ticket #1713]
-crypto/dist/ssh/auth-options.c patch
+crypto/dist/ssh/auth-options.c patch
Prevent minor information disclosure in ssh.
[drochner, ticket #1717]
+distrib/notes/common/main patched by hand
+distrib/notes/common/xfer patched by hand
+doc/LAST_MINUTE patched by hand
+doc/README.files patched by hand
+gnu/usr.bin/groff/tmac/mdoc.local patched by hand
+sys/sys/param.h patched by hand
+
+ Welcome to 5.1.2!
+ [snj]
+
Index: src/doc/LAST_MINUTE
diff -u src/doc/LAST_MINUTE:1.2.30.2.2.1 src/doc/LAST_MINUTE:1.2.30.2.2.2
--- src/doc/LAST_MINUTE:1.2.30.2.2.1 Tue Jan 3 05:31:08 2012
+++ src/doc/LAST_MINUTE Thu Feb 2 08:23:03 2012
@@ -1,6 +1,6 @@
-# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.1 2012/01/03 05:31:08 snj Exp $
+# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.2 2012/02/02 08:23:03 snj Exp $
-This file contains important information on the NetBSD 5.1.1 release that
+This file contains important information on the NetBSD 5.1.2 release that
did not make it into the main documentation.
[all]
Index: src/doc/README.files
diff -u src/doc/README.files:1.4.10.3.2.1 src/doc/README.files:1.4.10.3.2.2
--- src/doc/README.files:1.4.10.3.2.1 Tue Jan 3 05:31:08 2012
+++ src/doc/README.files Thu Feb 2 08:23:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: README.files,v 1.4.10.3.2.1 2012/01/03 05:31:08 snj Exp $
+# $NetBSD: README.files,v 1.4.10.3.2.2 2012/02/02 08:23:03 snj Exp $
What's in this directory:
@@ -10,6 +10,8 @@ CHANGES-5.1 Changes between the 5.0 and
CHANGES-5.1.1 Changes between the 5.1 and 5.1.1 releases.
+CHANGES-5.1.2 Changes between the 5.1.1 and 5.1.2 releases.
+
CHANGES.prev Changes in previous NetBSD releases.
LAST_MINUTE Last minute changes and notes about the release.
@@ -24,7 +26,7 @@ source/sets/ Source distribution sets; s
In addition to the files and directories listed above, there is one
directory per architecture, for each of the architectures for which
-NetBSD 5.1.1 has a binary distribution. The contents of each
+NetBSD 5.1.2 has a binary distribution. The contents of each
architecture's directory are described in an "INSTALL" file found in
that directory.
Index: src/gnu/usr.bin/groff/tmac/mdoc.local
diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.3 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.4
--- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.3 Sat Jan 7 03:55:08 2012
+++ src/gnu/usr.bin/groff/tmac/mdoc.local Thu Feb 2 08:23:03 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.43.4.15.2.3 2012/01/07 03:55:08 snj Exp $
+.\" $NetBSD: mdoc.local,v 1.43.4.15.2.4 2012/02/02 08:23:03 snj Exp $
.\"
.\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -44,9 +44,9 @@
.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
.
.\" Default .Os value
-.ds doc-operating-system NetBSD\~5.1.1_PATCH
+.ds doc-operating-system NetBSD\~5.1.2
.\" Default footer operating system value
-.ds doc-default-operating-system NetBSD\~5.1.1_PATCH
+.ds doc-default-operating-system NetBSD\~5.1.2
.\" Other known versions, not yet in groff distribution
.ds doc-operating-system-NetBSD-1.3.3 1.3.3
.ds doc-operating-system-NetBSD-1.6.3 1.6.3
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.330.4.15.2.3 src/sys/sys/param.h:1.330.4.15.2.4
--- src/sys/sys/param.h:1.330.4.15.2.3 Sat Jan 7 03:55:08 2012
+++ src/sys/sys/param.h Thu Feb 2 08:23:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.330.4.15.2.3 2012/01/07 03:55:08 snj Exp $ */
+/* $NetBSD: param.h,v 1.330.4.15.2.4 2012/02/02 08:23:03 snj Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 501000000 /* NetBSD 5.1.1_PATCH */
+#define __NetBSD_Version__ 501000200 /* NetBSD 5.1.2 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
