[src/netbsd-6-0]: src distrib/notes/common/main patched...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7824cae7556d
branches:  netbsd-6-0
changeset: 774910:7824cae7556d
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Jan 17 18:02:51 2014 +0000

description:
distrib/notes/common/main                       patched by hand
doc/LAST_MINUTE                                 patched by hand
sys/sys/param.h                                 patched by hand

        Welcome to 6.0.4!
        [bouyer]

diffstat:

 distrib/notes/common/main |  6 +++---
 doc/CHANGES-6.0.4         |  9 ++++++++-
 doc/LAST_MINUTE           |  4 ++--
 sys/sys/param.h           |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r 55a82436e9ce -r 7824cae7556d distrib/notes/common/main
--- a/distrib/notes/common/main Wed Jan 15 10:07:49 2014 +0000
+++ b/distrib/notes/common/main Fri Jan 17 18:02:51 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: main,v 1.484.2.4.2.5 2014/01/12 16:06:36 bouyer Exp $
+.\"    $NetBSD: main,v 1.484.2.4.2.6 2014/01/17 18:02:51 bouyer Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -493,8 +493,8 @@
 .
 .Pp
 Advisories prior to NetBSD-SA2013-009 do not affect
-NetBSD 6.0.3:
-.Lk http://www.NetBSD.org/support/security/patches-6.0.3.html .
+NetBSD 6.0.4:
+.Lk http://www.NetBSD.org/support/security/patches-6.0.4.html .
 .Ss2 Kernel
 .(bullet
 .Xr pci 4 :
diff -r 55a82436e9ce -r 7824cae7556d doc/CHANGES-6.0.4
--- a/doc/CHANGES-6.0.4 Wed Jan 15 10:07:49 2014 +0000
+++ b/doc/CHANGES-6.0.4 Fri Jan 17 18:02:51 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.4,v 1.1.2.16 2014/01/15 10:07:49 bouyer Exp $
+# $NetBSD: CHANGES-6.0.4,v 1.1.2.17 2014/01/17 18:02:51 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4
 release:
@@ -175,3 +175,10 @@
                           when serving NSEC3 signed zones.  [RT #35120]
        [spz, ticket #1016]
 
+distrib/notes/common/main                       patched by hand
+doc/LAST_MINUTE                                 patched by hand
+sys/sys/param.h                                 patched by hand
+
+       Welcome to 6.0.4!
+       [bouyer]
+
diff -r 55a82436e9ce -r 7824cae7556d doc/LAST_MINUTE
--- a/doc/LAST_MINUTE   Wed Jan 15 10:07:49 2014 +0000
+++ b/doc/LAST_MINUTE   Fri Jan 17 18:02:51 2014 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: LAST_MINUTE,v 1.2.40.1.4.3 2013/09/26 15:41:52 riz Exp $
+#      $NetBSD: LAST_MINUTE,v 1.2.40.1.4.4 2014/01/17 18:02:51 bouyer Exp $
 
-This file contains important information on the NetBSD 6.0.3 release that
+This file contains important information on the NetBSD 6.0.4 release that
 did not make it into the main documentation.
 
 [all]
diff -r 55a82436e9ce -r 7824cae7556d sys/sys/param.h
--- a/sys/sys/param.h   Wed Jan 15 10:07:49 2014 +0000
+++ b/sys/sys/param.h   Fri Jan 17 18:02:51 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.408.2.6.2.7 2013/10/12 18:53:18 jdc Exp $  */
+/*     $NetBSD: param.h,v 1.408.2.6.2.8 2014/01/17 18:02:51 bouyer Exp $       */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
  *     2.99.9          (299000900)
  */
 
-#define        __NetBSD_Version__      600000301       /* NetBSD 6.0.3_PATCH */
+#define        __NetBSD_Version__      600000400       /* NetBSD 6.0.4 */
 
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)