Module Name: src
Committed By: bouyer
Date: Fri Jan 17 18:02:51 UTC 2014
Modified Files:
src/distrib/notes/common [netbsd-6-0]: main
src/doc [netbsd-6-0]: CHANGES-6.0.4 LAST_MINUTE
src/sys/sys [netbsd-6-0]: param.h
Log Message:
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]
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.4.2.5 -r1.484.2.4.2.6 src/distrib/notes/common/main
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-6.0.4
cvs rdiff -u -r1.2.40.1.4.3 -r1.2.40.1.4.4 src/doc/LAST_MINUTE
cvs rdiff -u -r1.408.2.6.2.7 -r1.408.2.6.2.8 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.484.2.4.2.5 src/distrib/notes/common/main:1.484.2.4.2.6
--- src/distrib/notes/common/main:1.484.2.4.2.5 Sun Jan 12 16:06:36 2014
+++ src/distrib/notes/common/main Fri Jan 17 18:02:51 2014
@@ -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 @@ ntpd used as DDoS amplifier
.
.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 :
Index: src/doc/CHANGES-6.0.4
diff -u src/doc/CHANGES-6.0.4:1.1.2.16 src/doc/CHANGES-6.0.4:1.1.2.17
--- src/doc/CHANGES-6.0.4:1.1.2.16 Wed Jan 15 10:07:49 2014
+++ src/doc/CHANGES-6.0.4 Fri Jan 17 18:02:51 2014
@@ -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 @@ external/bsd/bind/dist/bin/named/query.c
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]
+
Index: src/doc/LAST_MINUTE
diff -u src/doc/LAST_MINUTE:1.2.40.1.4.3 src/doc/LAST_MINUTE:1.2.40.1.4.4
--- src/doc/LAST_MINUTE:1.2.40.1.4.3 Thu Sep 26 15:41:52 2013
+++ src/doc/LAST_MINUTE Fri Jan 17 18:02:51 2014
@@ -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]
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.408.2.6.2.7 src/sys/sys/param.h:1.408.2.6.2.8
--- src/sys/sys/param.h:1.408.2.6.2.7 Sat Oct 12 18:53:18 2013
+++ src/sys/sys/param.h Fri Jan 17 18:02:51 2014
@@ -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__)
