CVS commit: [netbsd-5-2] src/distrib/utils/x_gzip

2015-03-16 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Mon Mar 16 21:21:08 UTC 2015

Modified Files:
src/distrib/utils/x_gzip [netbsd-5-2]: Makefile

Log Message:
usr.bin/gzip/Makefile   patch
usr.bin/gzip/gzip.1 1.20-1.24
usr.bin/gzip/gzip.c 1.98-1.107
usr.bin/gzip/zuncompress.c  1.7-1.8
distrib/utils/x_gzip/Makefile   patch

Sync gzip core with HEAD.
[mrg, ticket #1951]


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.56.1 src/distrib/utils/x_gzip/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.7 src/distrib/utils/x_gzip/Makefile:1.7.56.1
--- src/distrib/utils/x_gzip/Makefile:1.7	Sun Mar 28 04:10:43 2004
+++ src/distrib/utils/x_gzip/Makefile	Mon Mar 16 21:21:08 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2004/03/28 04:10:43 mrg Exp $
+#	$NetBSD: Makefile,v 1.7.56.1 2015/03/16 21:21:08 bouyer Exp $
 # Build a tiny limited gzip (i.e. for tiny boot media)
 
 SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -6,7 +6,7 @@ SRCDIR= ${.CURDIR}/../../../usr.
 PROG=		gzip
 NOMAN=		# defined
 
-CPPFLAGS+=	-DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT
+CPPFLAGS+=	-DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT -DNO_XZ_SUPPORT
 
 DPADD=		${LIBZ}
 LDADD=		-lz



CVS commit: [netbsd-5-2] src/distrib/sets/lists/base

2014-11-22 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Sun Nov 23 04:59:33 UTC 2014

Modified Files:
src/distrib/sets/lists/base [netbsd-5-2]: mi

Log Message:
Pull up following revision(s) (requested by apb in ticket #1934):
distrib/sets/lists/base/mi: revision 1.1090
Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.25.2.3 -r1.780.2.25.2.4 src/distrib/sets/lists/base/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.25.2.3 src/distrib/sets/lists/base/mi:1.780.2.25.2.4
--- src/distrib/sets/lists/base/mi:1.780.2.25.2.3	Fri Aug 15 23:06:18 2014
+++ src/distrib/sets/lists/base/mi	Sun Nov 23 04:59:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.25.2.3 2014/08/15 23:06:18 riz Exp $
+# $NetBSD: mi,v 1.780.2.25.2.4 2014/11/23 04:59:32 snj Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -4880,6 +4880,7 @@
 ./usr/share/zoneinfo/Pacific			base-sys-share
 ./usr/share/zoneinfo/Pacific/Apia		base-sys-share		share
 ./usr/share/zoneinfo/Pacific/Auckland		base-sys-share		share
+./usr/share/zoneinfo/Pacific/Bougainville	base-sys-share		share
 ./usr/share/zoneinfo/Pacific/Chatham		base-sys-share		share
 ./usr/share/zoneinfo/Pacific/Chuuk		base-sys-share		share
 ./usr/share/zoneinfo/Pacific/Easter		base-sys-share		share



CVS commit: [netbsd-5-2] src/distrib

2014-11-08 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sat Nov  8 12:26:37 UTC 2014

Modified Files:
src/distrib/alpha/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/pmax/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/prep/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/sgimips/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/sparc/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/sparc64/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/sun3/cdroms/installcd [netbsd-5-2]: Makefile
src/distrib/vax/cdroms/installcd [netbsd-5-2]: Makefile

Log Message:
Pullup follwing revisions to fix build break of ticket 1931 on some archs.

distrib/alpha/cdroms/installcd/Makefile 1.2
distrib/pmax/cdroms/installcd/Makefile  1.2
distrib/prep/cdroms/installcd/Makefile  1.3
distrib/sgimips/cdroms/installcd/Makefile   1.2
distrib/sparc/cdroms/installcd/Makefile 1.2
distrib/sparc64/cdroms/installcd/Makefile   1.14
distrib/sun3/cdroms/installcd/Makefile  1.2
distrib/vax/cdroms/installcd/Makefile   1.2

Use ${CDIMAGE} instead of ${CDBASE}.iso.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/alpha/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/pmax/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.2.22.1 src/distrib/prep/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/sgimips/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/sparc/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.34.1 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/sun3/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/vax/cdroms/installcd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/alpha/cdroms/installcd/Makefile
diff -u src/distrib/alpha/cdroms/installcd/Makefile:1.1 src/distrib/alpha/cdroms/installcd/Makefile:1.1.40.1
--- src/distrib/alpha/cdroms/installcd/Makefile:1.1	Tue Mar  6 21:56:49 2007
+++ src/distrib/alpha/cdroms/installcd/Makefile	Sat Nov  8 12:26:36 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:56:49 bouyer Exp $
+#	$NetBSD: Makefile,v 1.1.40.1 2014/11/08 12:26:36 msaitoh Exp $
 CDBASE=		alphacd		# gives ${CDBASE}.iso
 CDINSTKERNEL=	../../instkernel/instkernel
 CDKERNELS=	netbsd netbsd
@@ -6,7 +6,7 @@ CDRELEASE=	true			# include $RELEASEDIR/
 
 #make the CD bootable
 image_md_post:
-	${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+	${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
 

Index: src/distrib/pmax/cdroms/installcd/Makefile
diff -u src/distrib/pmax/cdroms/installcd/Makefile:1.1 src/distrib/pmax/cdroms/installcd/Makefile:1.1.40.1
--- src/distrib/pmax/cdroms/installcd/Makefile:1.1	Tue Mar  6 21:57:16 2007
+++ src/distrib/pmax/cdroms/installcd/Makefile	Sat Nov  8 12:26:36 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:16 bouyer Exp $
+#	$NetBSD: Makefile,v 1.1.40.1 2014/11/08 12:26:36 msaitoh Exp $
 CDBASE=		pmaxcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
 CDKERNELS=	netbsd-INSTALL.gz netbsd
@@ -6,6 +6,6 @@ CDINSTKERNEL=	../../instkernel
 
 #make the CD bootable
 image_md_post:
-	${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+	${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"

Index: src/distrib/prep/cdroms/installcd/Makefile
diff -u src/distrib/prep/cdroms/installcd/Makefile:1.2 src/distrib/prep/cdroms/installcd/Makefile:1.2.22.1
--- src/distrib/prep/cdroms/installcd/Makefile:1.2	Wed Apr 30 08:08:32 2008
+++ src/distrib/prep/cdroms/installcd/Makefile	Sat Nov  8 12:26:37 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/04/30 08:08:32 garbled Exp $
+#	$NetBSD: Makefile,v 1.2.22.1 2014/11/08 12:26:37 msaitoh Exp $
 CDBASE=		prepcd		# gives ${CDBASE}.iso
 CDRELEASE=	true		# include $RELEASEDIR/$MACHINE
 CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
@@ -8,7 +8,7 @@ CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/
 # it.
 
 image_md_post:
-	${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -i ${CDBASE}.iso
-	${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -u ${CDBASE}.iso
+	${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -i ${CDIMAGE}
+	${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -u ${CDIMAGE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"

Index: src/distrib/sgimips/cdroms/installcd/Makefile
diff -u src/distrib/sgimips/cdroms/installcd/Makefile:1.1 src/distrib/sgimips/cdroms/installcd/Makefile:1.1.40.1
--- src/distrib/sgimips/cdroms/installcd/Makefile:1.1	Tue Mar  6 21:57:22 2007
+++ src/distrib/sgimips/cdroms/installcd/Makefile	Sat Nov  8 12:26:37 2014

CVS commit: [netbsd-5-2] src/distrib/notes/common

2014-01-18 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Sat Jan 18 11:23:44 UTC 2014

Modified Files:
src/distrib/notes/common [netbsd-5-2]: main

Log Message:
Update Date


To generate a diff of this commit:
cvs rdiff -u -r1.425.2.16.2.4 -r1.425.2.16.2.5 src/distrib/notes/common/main

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.16.2.4 src/distrib/notes/common/main:1.425.2.16.2.5
--- src/distrib/notes/common/main:1.425.2.16.2.4	Sat Jan 18 11:15:59 2014
+++ src/distrib/notes/common/main	Sat Jan 18 11:23:44 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.425.2.16.2.4 2014/01/18 11:15:59 bouyer Exp $
+.\"	$NetBSD: main,v 1.425.2.16.2.5 2014/01/18 11:23:44 bouyer 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 November 27, 2012
+.Dd January 18, 2014
 .Dt INSTALL 8
 .Os NetBSD
 .Sh NAME



CVS commit: [netbsd-5-2] src/distrib/notes/common

2014-01-18 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Sat Jan 18 11:15:59 UTC 2014

Modified Files:
src/distrib/notes/common [netbsd-5-2]: main

Log Message:
Also note CVE-2014-0591.


To generate a diff of this commit:
cvs rdiff -u -r1.425.2.16.2.3 -r1.425.2.16.2.4 src/distrib/notes/common/main

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.16.2.3 src/distrib/notes/common/main:1.425.2.16.2.4
--- src/distrib/notes/common/main:1.425.2.16.2.3	Fri Jan 17 17:00:03 2014
+++ src/distrib/notes/common/main	Sat Jan 18 11:15:59 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.425.2.16.2.3 2014/01/17 17:00:03 bouyer Exp $
+.\"	$NetBSD: main,v 1.425.2.16.2.4 2014/01/18 11:15:59 bouyer Exp $
 .\"
 .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -484,6 +484,11 @@ ntpd used as DDoS amplifier
 Advisories prior to NetBSD-SA2013-010 do not affect
 NetBSD 5.2.2:
 .Lk http://www.NetBSD.org/support/security/patches-5.2.2.html .
+.Ss2 Other Security Fixes
+.(bullet
+bind: Fix CVE-2014-0591. 
+.bullet)
+.
 .Ss2 Kernel
 .(bullet
 Xen: remove a bogus diagostic message spamming the console.  (PR#46313):



CVS commit: [netbsd-5-2] src/distrib/notes/common

2014-01-13 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Mon Jan 13 21:51:56 UTC 2014

Modified Files:
src/distrib/notes/common [netbsd-5-2]: main

Log Message:
Sync release notes with changes since 5.2.1


To generate a diff of this commit:
cvs rdiff -u -r1.425.2.16.2.1 -r1.425.2.16.2.2 src/distrib/notes/common/main

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.16.2.1 src/distrib/notes/common/main:1.425.2.16.2.2
--- src/distrib/notes/common/main:1.425.2.16.2.1	Sun Sep 22 22:43:10 2013
+++ src/distrib/notes/common/main	Mon Jan 13 21:51:56 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.425.2.16.2.1 2013/09/22 22:43:10 riz Exp $
+.\"	$NetBSD: main,v 1.425.2.16.2.2 2014/01/13 21:51:56 bouyer Exp $
 .\"
 .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -454,74 +454,40 @@ wouldn't exist.
 .if \n[FOR_RELEASE] \{\
 .Pp
 The complete list of changes can be found in the
-CHANGES-5.2.1:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.2.1/CHANGES-5.2.1
-file in the top level directory of the NetBSD 5.2.1 release tree. An abbreviated list is as follows:
+CHANGES-5.2.2:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.2.2/CHANGES-5.2.2
+file in the top level directory of the NetBSD 5.2.2 release tree. An abbreviated list is as follows:
 .Ss2 Security Advisory Fixes
 .(bullet
-NetBSD-SA2013-004:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-004.txt.asc
-Vulnerabilities in grep
-.It
-NetBSD-SA2013-005:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-005.txt.asc
-bind Denial of Service (CVE-2013-4854)
-.It
-NetBSD-SA2013-006:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-006.txt.asc
-Arbitrary Kernel Read with netstat -P
-.It
-NetBSD-SA2013-007:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-007.txt.asc
-Protocol handling issues in X Window System client libraries
-.It
-NetBSD-SA2013-009:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-009.txt.asc
-user settable small BPF buffer can cause a panic
+NetBSD-SA2013-010:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-010.txt.asc
+Use after free in Xserver handling of ImageText requests (CVE-2013-4396)
+.It
+NetBSD-SA2013-011:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-011.txt.asc
+embryonic TCP sockets local DoS
+.It
+NetBSD-SA2013-012:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-012.txt.asc
+Router Advertisement sysctl local Denial of Service
+.It
+NetBSD-SA2014-001:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-001.txt.asc
+Stack buffer overflow in libXfont (CVE-2013-6462)
+.It
+NetBSD-SA2014-002:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-002.txt.asc
+ntpd used as DDoS amplifier
 .bullet)
 .
 .Pp
-Advisories prior to NetBSD-SA2013-004 do not affect
+Advisories prior to NetBSD-SA2013-010 do not affect
 NetBSD 5.2.1:
 .Lk http://www.NetBSD.org/support/security/patches-5.2.1.html .
 .Ss2 Kernel
 .(bullet
-Fixed a panic triggered when killing a process waiting to start.
-(PR#44935):
-.Lk http://gnats.NetBSD.org/44935
-.It
-Fixed a LOCKDEBUG panic in sysctl path.
-(PR#45827):
-.Lk http://gnats.netbsd.org/45827
-.It
-Fixed diagnostic panic when killing a traced process.
-(PR#42309):
-.Lk http://gnats.netbsd.org/42309
-.bullet)
-.
-.Ss2 Networking
-.(bullet
-Include BRDADDR and NETMASK in the IPv4 ioctls we ban for IPv6.
-.bullet)
-.
-.Ss2 File Systems
-.(bullet
-.Xr fss 4 :
-Don't crash when running multiple "dump -X".
-(PR#47514):
-.Lk http://gnats.netbsd.org/47514
-.It
-.bullet)
-.
-.Ss2 Miscellaneous
-.(bullet
-Update tzdata to 2013e.
-.It
-Update IPv6 DNS servers in sysinst.
-.It
-MAKEDEV: the console major number is not always 0.
-.It
-Update some TNF ssh keys in /etc/ssh/ssh_known_hosts.
+Xen: remove a bogus diagostic message spamming the console.  (PR#46313):
+.Lk http://gnats.netbsd.org/46313 
 .bullet)
 .
 .\} \" \n[FOR_RELEASE]
@@ -606,6 +572,8 @@ Changes between the 5.0 and 5.1 releases
 Changes between the 5.1 and 5.2 releases.
 .It Li CHANGES-5.2.1
 Changes between the 5.2 and 5.2.1 releases.
+.It Li CHANGES-5.2.2
+Changes between the 5.2.1 and 5.2.2 releases.
 .It Li CHANGES.prev
 Changes in previous
 .Nx



CVS commit: [netbsd-5-2] src/distrib/ews4800mips

2014-01-06 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Mon Jan  6 19:26:54 UTC 2014

Modified Files:
src/distrib/ews4800mips [netbsd-5-2]: Makefile

Log Message:
Pull up following revision(s) (requested by apb in ticket #1894):
distrib/ews4800mips/Makefile: revision 1.3
Add "cdroms" to the SUBDIR list for src/distrib/ews4800mips.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.46.1 src/distrib/ews4800mips/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/ews4800mips/Makefile
diff -u src/distrib/ews4800mips/Makefile:1.2 src/distrib/ews4800mips/Makefile:1.2.46.1
--- src/distrib/ews4800mips/Makefile:1.2	Tue Mar  6 21:57:00 2007
+++ src/distrib/ews4800mips/Makefile	Mon Jan  6 19:26:54 2014
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2007/03/06 21:57:00 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2.46.1 2014/01/06 19:26:54 bouyer Exp $
 
-SUBDIR=		floppies
+SUBDIR=		floppies cdroms
 TARGETS+=	release
 
 iso_image:



CVS commit: [netbsd-5-2] src/distrib/utils/sysinst

2013-05-11 Thread Jeff Rizzo
Module Name:src
Committed By:   riz
Date:   Sat May 11 22:41:34 UTC 2013

Modified Files:
src/distrib/utils/sysinst [netbsd-5-2]: menus.mi

Log Message:
distrib/utils/sysinst/menus.mi  1.35, 1.43

Some v6 dns server are outdated, so replace them with google's
public servers.
[msaitoh, ticket #1846]


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.14.1 src/distrib/utils/sysinst/menus.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.33 src/distrib/utils/sysinst/menus.mi:1.33.14.1
--- src/distrib/utils/sysinst/menus.mi:1.33	Fri Aug  8 02:54:06 2008
+++ src/distrib/utils/sysinst/menus.mi	Sat May 11 22:41:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.mi,v 1.33 2008/08/08 02:54:06 simonb Exp $	*/
+/*	$NetBSD: menus.mi,v 1.33.14.1 2013/05/11 22:41:34 riz Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -347,28 +347,20 @@ menu localdirsource, y=-4, x=0, w=70, no
 		action { src_prompt(MSG_Set_dir, set_dir, 60); };
 
 menu namesrv6, title MSG_Select_IPv6_DNS_server;
-	option "ns9.iij.ad.jp", exit, action
+	option "google-public-dns-a.google.com", exit, action
 		{
 #ifdef INET6
-		  strlcpy(net_namesvr6, "2001:240::1", sizeof(net_namesvr6));
-		  yesno = 1;
-#else
-		  yesno = 0;
-#endif
-		}; 
-	option "ns-wide.wide.ad.jp", exit, action
-		{
-#ifdef INET6
-		  strlcpy(net_namesvr6, "2001:200:0:1::3", sizeof(net_namesvr6));
+		  strlcpy(net_namesvr6, "2001:4860:4860::",
+		  sizeof(net_namesvr6));
 		  yesno = 1;
 #else
 		  yesno = 0;
 #endif
 		}; 
-	option "light.imasy.or.jp", exit, action
+	option "google-public-dns-b.google.com", exit, action
 		{
 #ifdef INET6
-		  strlcpy(net_namesvr6, "3ffe:505:0:1:2a0:c9ff:fe61:6521",
+		  strlcpy(net_namesvr6, "2001:4860:4860::8844",
 		  sizeof(net_namesvr6));
 		  yesno = 1;
 #else