CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: msaitoh Date: Sun Nov 18 19:07:00 UTC 2012 Modified Files: src/etc [netbsd-6]: weekly Log Message: Pull up following revision(s) (requested by christos in ticket #675): etc/weekly: revision 1.27 PR/46521: Jim Bernard: remove duplicate -o To generate a diff of this commit: cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/weekly diff -u src/etc/weekly:1.25.2.2 src/etc/weekly:1.25.2.3 --- src/etc/weekly:1.25.2.2 Wed Aug 8 14:36:55 2012 +++ src/etc/weekly Sun Nov 18 19:07:00 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: weekly,v 1.25.2.2 2012/08/08 14:36:55 martin Exp $ +# $NetBSD: weekly,v 1.25.2.3 2012/11/18 19:07:00 msaitoh Exp $ # from: @(#)weekly 8.2 (Berkeley) 1/2/94 # @@ -81,7 +81,7 @@ fi if checkyesno rebuild_whatisdb; then echo "" - if [ -x /usr/libexec/makewhatis -a \( -f /etc/man.conf -o \ + if [ -x /usr/libexec/makewhatis -a \( -f /etc/man.conf \ -o -d /usr/share/man \) ]; then echo "Rebuilding whatis databases:" nice -n 5 /usr/libexec/makewhatis -f
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Fri Feb 8 23:01:49 UTC 2013 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #801): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.151.2.7 -r1.151.2.8 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.7 src/etc/MAKEDEV.tmpl:1.151.2.8 --- src/etc/MAKEDEV.tmpl:1.151.2.7 Wed Oct 24 03:23:45 2012 +++ src/etc/MAKEDEV.tmpl Fri Feb 8 23:01:49 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.7 2012/10/24 03:23:45 riz Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.8 2013/02/08 23:01:49 riz Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -2296,7 +2296,7 @@ create_mfs_dev() if $do_redirect; then # Redirect stdout and stderr to console - mknod -m 600 -g 0 -u 0 temp_console c 0 0 + mknod -m 600 -g 0 -u 0 temp_console c %CONSOLE_CMAJOR% 0 exec >temp_console 2>&1 rm temp_console fi
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: sborrill Date: Sat Feb 25 14:48:12 UTC 2012 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up the following revisions(s) (requested by tron in ticket #50): etc/MAKEDEV.tmpl: revision 1.152 Four instances of atabus(4) are not enough for modern systems as the system will report one instance for each SATA port. Create eight device nodes by default. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.151.2.1 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151 src/etc/MAKEDEV.tmpl:1.151.2.1 --- src/etc/MAKEDEV.tmpl:1.151 Fri Feb 10 20:54:11 2012 +++ src/etc/MAKEDEV.tmpl Sat Feb 25 14:48:12 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151 2012/02/10 20:54:11 nakayama Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.1 2012/02/25 14:48:12 sborrill Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -814,7 +814,7 @@ all) makedev tun0 tun1 tun2 tun3 makedev ipl pf crypto random makedev lockstat clockctl cpuctl - makedev atabus0 atabus1 atabus2 atabus3 + makedev atabus0 atabus1 atabus2 atabus3 atabus4 atabus5 atabus6 atabus7 makedev tap tap0 tap1 tap2 tap3 makedev gpio gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7 makedev pad pad0 pad1 pad2 pad3
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Mon Apr 9 18:05:29 UTC 2012 Modified Files: src/etc [netbsd-6]: rc.subr Log Message: Pull up following revision(s) (requested by apb in ticket #170): etc/rc.subr: revision 1.89 The error message when /var is not a file system chhanged from mount: unknown special file or file system `/var' to mount: Unknown special file or file system `/var' so match them both. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.88.4.1 src/etc/rc.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.subr diff -u src/etc/rc.subr:1.88 src/etc/rc.subr:1.88.4.1 --- src/etc/rc.subr:1.88 Thu Aug 11 22:52:47 2011 +++ src/etc/rc.subr Mon Apr 9 18:05:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: rc.subr,v 1.88 2011/08/11 22:52:47 apb Exp $ +# $NetBSD: rc.subr,v 1.88.4.1 2012/04/09 18:05:28 riz Exp $ # # Copyright (c) 1997-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -152,7 +152,7 @@ mount_critical_filesystems() # multiple lines can't be good, # not even if $_optional is true ;; - *'unknown special file or file system'*) + *[uU]'nknown special file or file system'*) if $_optional; then # ignore this error print_rc_metadata \
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Thu Jun 28 04:48:25 UTC 2012 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by tsutsui in ticket #358): etc/MAKEDEV.tmpl: revision 1.156 Invoke MAKEDEV.local via $HOST_SH (default ${HOST_SH:=sh}) instead of hardcoded "sh" to avoid unexpected errors on cross build hosts in src/distrib/common/Makefile.makedev etc. Should fix PR toolchain/46537, ok apb@ To generate a diff of this commit: cvs rdiff -u -r1.151.2.2 -r1.151.2.3 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.2 src/etc/MAKEDEV.tmpl:1.151.2.3 --- src/etc/MAKEDEV.tmpl:1.151.2.2 Wed May 30 08:06:26 2012 +++ src/etc/MAKEDEV.tmpl Thu Jun 28 04:48:25 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.2 2012/05/30 08:06:26 sborrill Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.3 2012/06/28 04:48:25 riz Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -421,6 +421,7 @@ setup() { PATH=/sbin:/usr/sbin:/bin:/usr/bin:/rescue + : ${HOST_SH:=sh} : ${TOOL_MKNOD:=mknod} : ${TOOL_MTREE:=mtree} : ${TOOL_PAX:=pax} @@ -2099,9 +2100,9 @@ local) umask 0 if [ -n "$count_nodes" ]; then count_nodes=$((count_nodes + \ - $(linecount "$(sh "$0.local" $opts -s all)") )) + $(linecount "$("$HOST_SH" "$0.local" $opts -s all)") )) else - sh "$0.local" $opts all + "$HOST_SH" "$0.local" $opts all fi umask 077 fi
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: jdc Date: Mon Jul 2 21:20:52 UTC 2012 Modified Files: src/etc [netbsd-6]: rc.shutdown Log Message: Pull up revision 1.9 (requested by jnemeth in ticket #375). PR/46601 - Jim Bernard -- add support for rc_directories To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.60.1 src/etc/rc.shutdown Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.shutdown diff -u src/etc/rc.shutdown:1.8 src/etc/rc.shutdown:1.8.60.1 --- src/etc/rc.shutdown:1.8 Sun May 19 01:01:33 2002 +++ src/etc/rc.shutdown Mon Jul 2 21:20:52 2012 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: rc.shutdown,v 1.8 2002/05/19 01:01:33 lukem Exp $ +# $NetBSD: rc.shutdown,v 1.8.60.1 2012/07/02 21:20:52 jdc Exp $ # # rc.shutdown -- # Run the scripts in /etc/rc.d with reverse rcorder. @@ -44,10 +44,12 @@ if [ -n "$rcshutdown_timeout" ]; then fi -# Determine the shutdown order of the /etc/rc.d scripts, +# Determine the shutdown order of the rc.d scripts, # and perform the operation # -files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} /etc/rc.d/*) +scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do + test -d ${rcd} && echo ${rcd}/*; done) +files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} ${scripts}) for _rc_elem in $(reverse_list $files); do run_rc_script $_rc_elem stop
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Fri Jul 20 23:16:29 UTC 2012 Modified Files: src/etc [netbsd-6]: master.passwd Log Message: Pull up following revision(s) (requested by gson in ticket #426): etc/master.passwd: revision 1.46 Change root's default shell to /bin/sh, to provide a default which has command line editing, tab completion, and other features users have come to expect from a modern OS. Discussed on current-users approximately two weeks ago. Should be pulled up for NetBSD 6.0. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/etc/master.passwd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/master.passwd diff -u src/etc/master.passwd:1.45 src/etc/master.passwd:1.45.2.1 --- src/etc/master.passwd:1.45 Sat Jan 28 02:17:29 2012 +++ src/etc/master.passwd Fri Jul 20 23:16:29 2012 @@ -1,4 +1,4 @@ -root::0:0::0:0:Charlie &:/root:/bin/csh +root::0:0::0:0:Charlie &:/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root:/bin/sh daemon:*:1:1::0:0:The devil himself:/:/sbin/nologin operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:31:33 UTC 2012 Modified Files: src/etc [netbsd-6]: daily src/etc/defaults [netbsd-6]: daily.conf Log Message: Pull up following revision(s) (requested by christos in ticket #457): etc/daily: revision 1.83 etc/defaults/daily.conf: revision 1.18 PR/46757: Edgar Fu�: Change default to pkg_vulnerabilities from NO to unset, and make unset insted of NO to produce warnings, so that setting it to NO does produce warnings (if it is inappropriate for the machine to warn about this). To generate a diff of this commit: cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/etc/daily cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/etc/defaults/daily.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/daily diff -u src/etc/daily:1.80.2.2 src/etc/daily:1.80.2.3 --- src/etc/daily:1.80.2.2 Wed Aug 8 14:26:49 2012 +++ src/etc/daily Wed Aug 8 14:31:33 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: daily,v 1.80.2.2 2012/08/08 14:26:49 martin Exp $ +# $NetBSD: daily,v 1.80.2.3 2012/08/08 14:31:33 martin Exp $ # @(#)daily 8.2 (Berkeley) 1/25/94 # @@ -263,9 +263,10 @@ if pkg_info ${_compat_K_flag} -q -E '*'; if checkyesno fetch_pkg_vulnerabilities; then ( umask 022 && pkg_admin ${_compat_K_flag} \ fetch-pkg-vulnerabilities -u ) - else - echo "fetch_pkg_vulnerabilities is set to NO in daily.conf(5)." - echo "You should set it to YES to enable vulnerability checks." + elif [ -z "$fetch_pkg_vulnerabilities" ]; then + echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)." + echo "You should set it to YES to enable vulnerability checks" + echo "or set it to NO to get rid of this warning." fi fi Index: src/etc/defaults/daily.conf diff -u src/etc/defaults/daily.conf:1.16.2.1 src/etc/defaults/daily.conf:1.16.2.2 --- src/etc/defaults/daily.conf:1.16.2.1 Wed Aug 8 14:26:49 2012 +++ src/etc/defaults/daily.conf Wed Aug 8 14:31:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: daily.conf,v 1.16.2.1 2012/08/08 14:26:49 martin Exp $ +# $NetBSD: daily.conf,v 1.16.2.2 2012/08/08 14:31:33 martin Exp $ # # /etc/defaults/daily.conf -- # default configuration of /etc/daily.conf @@ -31,6 +31,6 @@ run_rdist=YES run_security=YES separate_security_email=YES run_skeyaudit=YES -fetch_pkg_vulnerabilities=NO +fetch_pkg_vulnerabilities="" # set to NO to disable and not be warned about send_empty_security=NO
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:36:55 UTC 2012 Modified Files: src/etc [netbsd-6]: daily weekly Log Message: Pull up following revision(s) (requested by jdf in ticket #458): etc/weekly: revision 1.28 etc/daily: revision 1.84 Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fuss proposed for daily. Call `makemandb -q` instead of `makemandb`, as proposed by Edgar Fuss on tech-userlevel on 20th of July 2012, 12:38. To generate a diff of this commit: cvs rdiff -u -r1.80.2.3 -r1.80.2.4 src/etc/daily cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/daily diff -u src/etc/daily:1.80.2.3 src/etc/daily:1.80.2.4 --- src/etc/daily:1.80.2.3 Wed Aug 8 14:31:33 2012 +++ src/etc/daily Wed Aug 8 14:36:55 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: daily,v 1.80.2.3 2012/08/08 14:31:33 martin Exp $ +# $NetBSD: daily,v 1.80.2.4 2012/08/08 14:36:55 martin Exp $ # @(#)daily 8.2 (Berkeley) 1/25/94 # @@ -304,7 +304,7 @@ if checkyesno run_makemandb; then if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then echo "" echo "Updating man page index:" - (umask 022; nice -n 5 /usr/sbin/makemandb) + (umask 022; nice -n 5 /usr/sbin/makemandb -q) fi fi Index: src/etc/weekly diff -u src/etc/weekly:1.25.2.1 src/etc/weekly:1.25.2.2 --- src/etc/weekly:1.25.2.1 Thu Feb 16 19:56:43 2012 +++ src/etc/weekly Wed Aug 8 14:36:55 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: weekly,v 1.25.2.1 2012/02/16 19:56:43 riz Exp $ +# $NetBSD: weekly,v 1.25.2.2 2012/08/08 14:36:55 martin Exp $ # from: @(#)weekly 8.2 (Berkeley) 1/2/94 # @@ -94,7 +94,7 @@ if checkyesno rebuild_mandb; then echo "" if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then echo "Rebuilding man page index:" - (umask 022; nice -n 5 /usr/sbin/makemandb -f) + (umask 022; nice -n 5 /usr/sbin/makemandb -f -q) else echo "Not rebuilding man page index" fi
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:49:24 UTC 2012 Modified Files: src/etc [netbsd-6]: daily Log Message: Include rev 1.86 in the pullup of ticket 457 as well: only print "fetching" message, if we actually try to fetch the package vulnerabilities file. To generate a diff of this commit: cvs rdiff -u -r1.80.2.4 -r1.80.2.5 src/etc/daily Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/daily diff -u src/etc/daily:1.80.2.4 src/etc/daily:1.80.2.5 --- src/etc/daily:1.80.2.4 Wed Aug 8 14:36:55 2012 +++ src/etc/daily Wed Aug 8 14:49:24 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: daily,v 1.80.2.4 2012/08/08 14:36:55 martin Exp $ +# $NetBSD: daily,v 1.80.2.5 2012/08/08 14:49:24 martin Exp $ # @(#)daily 8.2 (Berkeley) 1/25/94 # @@ -246,8 +246,8 @@ if checkyesno run_fsck; then fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase' fi -echo "" if checkyesno run_rdist && [ -f /etc/Distfile ]; then + echo "" echo "Running rdist:" if [ -d /var/log/rdist ]; then logf="$(date +%Y.%b.%d)" @@ -258,15 +258,15 @@ if checkyesno run_rdist && [ -f /etc/Dis fi if pkg_info ${_compat_K_flag} -q -E '*'; then - echo "" - echo "Fetching package vulnerabilities database:" - if checkyesno fetch_pkg_vulnerabilities; then - ( umask 022 && pkg_admin ${_compat_K_flag} \ - fetch-pkg-vulnerabilities -u ) - elif [ -z "$fetch_pkg_vulnerabilities" ]; then + if [ -z "fetch_pkg_vulnerabilities" ]; then echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)." echo "You should set it to YES to enable vulnerability checks" echo "or set it to NO to get rid of this warning." + elif checkyesno fetch_pkg_vulnerabilities; then + echo "" + echo "Fetching package vulnerabilities database:" + ( umask 022 && pkg_admin ${_compat_K_flag} \ + fetch-pkg-vulnerabilities -u ) fi fi
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Mon Aug 13 19:52:30 UTC 2012 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by christos in ticket #490): etc/MAKEDEV.tmpl: revision 1.157 Don't create BSD style pty nodes by default anymore since ptyfs is mounted by default. Mention that this is a security issue, since it allows pty access through the old style node. While here, pull up revision 1.54 (wedges) to reduces diffs to -current To generate a diff of this commit: cvs rdiff -u -r1.151.2.3 -r1.151.2.4 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.3 src/etc/MAKEDEV.tmpl:1.151.2.4 --- src/etc/MAKEDEV.tmpl:1.151.2.3 Thu Jun 28 04:48:25 2012 +++ src/etc/MAKEDEV.tmpl Mon Aug 13 19:52:30 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.3 2012/06/28 04:48:25 riz Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.4 2012/08/13 19:52:30 riz Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -804,7 +804,9 @@ case $i in all) makedev all_md - makedev std fd ptm pty0 pty1 pty2 pty3 + makedev std fd ptm + makedev dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 + makedev dk8 dk9 dk10 dk11 dk12 dk13 dk14 dk15 makedev ccd0 ccd1 ccd2 ccd3 makedev cgd0 cgd1 cgd2 cgd3 makedev fss0 fss1 fss2 fss3 @@ -1269,6 +1271,7 @@ pty[0-9]*) # pty16 => 16 pairs, [tp]typg to [tp]typv # pty17 => 16 pairs, [tp]typw to [tp]typL # pty18 => 14 pairs, [tp]typM to [tp]typZ + warn "$i: creating BSD style tty nodes with ptyfs is a security issue" class=${i#pty} d1="p q r s t u v w x y z P Q R S T" if [ "$class" -ge 64 ]
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Mon Aug 13 19:55:10 UTC 2012 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Missed part of rev 1.154 from ticket #490. To generate a diff of this commit: cvs rdiff -u -r1.151.2.4 -r1.151.2.5 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.4 src/etc/MAKEDEV.tmpl:1.151.2.5 --- src/etc/MAKEDEV.tmpl:1.151.2.4 Mon Aug 13 19:52:30 2012 +++ src/etc/MAKEDEV.tmpl Mon Aug 13 19:55:10 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.4 2012/08/13 19:52:30 riz Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.5 2012/08/13 19:55:10 riz Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -57,6 +57,7 @@ # uu* TU58 cassettes on DL11 controller # # Disks: +# dk* wedge disk slices # ccd* concatenated disk devices # cd* SCSI or ATAPI CD-ROM # cgd* cryptographic disk devices
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Thu Sep 13 22:20:59 UTC 2012 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by martin in ticket #543): etc/MAKEDEV.tmpl: revision 1.158 Make the "init" target create optys as well - those were removed from "all", but we still need them in emergency setups and some install media. Should fix PR install/46902. To generate a diff of this commit: cvs rdiff -u -r1.151.2.5 -r1.151.2.6 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.5 src/etc/MAKEDEV.tmpl:1.151.2.6 --- src/etc/MAKEDEV.tmpl:1.151.2.5 Mon Aug 13 19:55:10 2012 +++ src/etc/MAKEDEV.tmpl Thu Sep 13 22:20:58 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.5 2012/08/13 19:55:10 riz Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.6 2012/09/13 22:20:58 riz Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -836,7 +836,7 @@ all) init) # unless overridden by MD entry, this is equal to 'all' - makedev all + makedev all opty ;; %MI_DEVICES_BEGIN%
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: bouyer Date: Sat Aug 27 13:20:19 UTC 2016 Modified Files: src/etc [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by christos in ticket #1369): etc/Makefile: revision 1.403 spwd.db should be 0600 (Brooks Davis) To generate a diff of this commit: cvs rdiff -u -r1.396.2.2 -r1.396.2.3 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile diff -u src/etc/Makefile:1.396.2.2 src/etc/Makefile:1.396.2.3 --- src/etc/Makefile:1.396.2.2 Mon Sep 17 19:00:34 2012 +++ src/etc/Makefile Sat Aug 27 13:20:19 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.396.2.2 2012/09/17 19:00:34 riz Exp $ +# $NetBSD: Makefile,v 1.396.2.3 2016/08/27 13:20:19 bouyer Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -288,8 +288,10 @@ install-etc-files: .PHONY .MAKE check_DE ${DESTDIR}/etc/master.passwd .if ${MKUNPRIVED} != "no" ( \ - for metaent in passwd pwd.db spwd.db; do \ - echo "./etc/$${metaent} type=file mode=0644 uname=root gname=wheel tags=etc_pkg"; \ + mode=0600; \ + for metaent in spwd.db passwd pwd.db; do \ + echo "./etc/$${metaent} type=file mode=$${mode} uname=root gname=wheel tags=etc_pkg"; \ + mode=0644; \ done; \ ) | ${METALOG.add} .endif # MKUNPRIVED != no
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:29:35 UTC 2013 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by martin in ticket #919): etc/MAKEDEV.tmpl: revision 1.166 Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12. This fixes install issues on new setups. To generate a diff of this commit: cvs rdiff -u -r1.151.2.9 -r1.151.2.10 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.151.2.9 src/etc/MAKEDEV.tmpl:1.151.2.10 --- src/etc/MAKEDEV.tmpl:1.151.2.9 Wed Feb 13 01:36:06 2013 +++ src/etc/MAKEDEV.tmpl Mon Jul 29 08:29:35 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.151.2.9 2013/02/13 01:36:06 riz Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.151.2.10 2013/07/29 08:29:35 msaitoh Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -2160,6 +2160,37 @@ makedisk_p8() mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator } +makedisk_p12high() +{ + ho=524280 # offset for partition 9 to 11 (same as ...p16high) + name="$1"; unit="$2"; blk="$3"; chr="$4" + + mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator + mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator + mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator + mkdev ${name}${unit}d b $blk $(($unit * 8 + 3)) 640 $g_operator + mkdev ${name}${unit}e b $blk $(($unit * 8 + 4)) 640 $g_operator + mkdev ${name}${unit}f b $blk $(($unit * 8 + 5)) 640 $g_operator + mkdev ${name}${unit}g b $blk $(($unit * 8 + 6)) 640 $g_operator + mkdev ${name}${unit}h b $blk $(($unit * 8 + 7)) 640 $g_operator + mkdev ${name}${unit}i b $blk $(($unit * 8 + $ho + 8)) 640 $g_operator + mkdev ${name}${unit}j b $blk $(($unit * 8 + $ho + 9)) 640 $g_operator + mkdev ${name}${unit}k b $blk $(($unit * 8 + $ho + 10)) 640 $g_operator + mkdev ${name}${unit}l b $blk $(($unit * 8 + $ho + 11)) 640 $g_operator + mkdev r${name}${unit}a c $chr $(($unit * 8 + 0)) 640 $g_operator + mkdev r${name}${unit}b c $chr $(($unit * 8 + 1)) 640 $g_operator + mkdev r${name}${unit}c c $chr $(($unit * 8 + 2)) 640 $g_operator + mkdev r${name}${unit}d c $chr $(($unit * 8 + 3)) 640 $g_operator + mkdev r${name}${unit}e c $chr $(($unit * 8 + 4)) 640 $g_operator + mkdev r${name}${unit}f c $chr $(($unit * 8 + 5)) 640 $g_operator + mkdev r${name}${unit}g c $chr $(($unit * 8 + 6)) 640 $g_operator + mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator + mkdev r${name}${unit}i c $chr $(($unit * 8 + $ho + 8)) 640 $g_operator + mkdev r${name}${unit}j c $chr $(($unit * 8 + $ho + 9)) 640 $g_operator + mkdev r${name}${unit}k c $chr $(($unit * 8 + $ho + 10)) 640 $g_operator + mkdev r${name}${unit}l c $chr $(($unit * 8 + $ho + 11)) 640 $g_operator +} + makedisk_p16() { name="$1"; unit="$2"; blk="$3"; chr="$4"
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: bouyer Date: Sun Jan 13 18:57:48 UTC 2013 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #781): etc/namedb/root.cache: revision 1.17 D.ROOT-SERVERS.NET changes IPv4 address. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.4.1 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16 src/etc/namedb/root.cache:1.16.4.1 --- src/etc/namedb/root.cache:1.16 Mon Aug 1 10:04:27 2011 +++ src/etc/namedb/root.cache Sun Jan 13 18:57:48 2013 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16 2011/08/01 10:04:27 taca Exp $ +; $NetBSD: root.cache,v 1.16.4.1 2013/01/13 18:57:48 bouyer Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jun 8, 2011 -; related version of root zone: 2011060800 +; last update:Jan 3, 2013 +; related version of root zone: 2013010300 ; ; formerly NS.INTERNIC.NET ; @@ -32,7 +32,7 @@ C.ROOT-SERVERS.NET. 360 A ; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. -D.ROOT-SERVERS.NET. 360 A 128.8.10.90 +D.ROOT-SERVERS.NET. 360 A 199.7.91.13 D.ROOT-SERVERS.NET. 360 2001:500:2D::D ; ; FORMERLY NS.NASA.GOV
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: riz Date: Sun Feb 10 20:18:53 UTC 2013 Modified Files: src/etc/rc.d [netbsd-6]: wpa_supplicant Log Message: Pull up following revision(s) (requested by tron in ticket #805): etc/rc.d/wpa_supplicant: revision 1.4 Make custom "reload" target work. Before this fix it would have tried to send a HUP signal to "wpa_supplicant" instead. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/etc/rc.d/wpa_supplicant Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/wpa_supplicant diff -u src/etc/rc.d/wpa_supplicant:1.3 src/etc/rc.d/wpa_supplicant:1.3.8.1 --- src/etc/rc.d/wpa_supplicant:1.3 Wed Sep 30 18:17:22 2009 +++ src/etc/rc.d/wpa_supplicant Sun Feb 10 20:18:53 2013 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: wpa_supplicant,v 1.3 2009/09/30 18:17:22 apb Exp $ +# $NetBSD: wpa_supplicant,v 1.3.8.1 2013/02/10 20:18:53 riz Exp $ # # PROVIDE: wpa_supplicant @@ -20,7 +20,7 @@ $_rc_subr_loaded . /etc/rc.subr name="wpa_supplicant" rcvar=$name command="/usr/sbin/wpa_supplicant" -reload_command="/usr/sbin/wpa_cli reconfigure" +reload_cmd="/usr/sbin/wpa_cli reconfigure" extra_commands="reload" load_rc_config $name
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: riz Date: Thu Feb 23 18:25:51 UTC 2012 Modified Files: src/etc/rc.d [netbsd-6]: sysdb Log Message: Pull up following revision(s) (requested by nakayama in ticket #27): etc/rc.d/sysdb: revision 1.23 Avoid rebuilding services database every boot time. The database has been renamed since the default was changed to CDB format. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.4.1 src/etc/rc.d/sysdb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/sysdb diff -u src/etc/rc.d/sysdb:1.22 src/etc/rc.d/sysdb:1.22.4.1 --- src/etc/rc.d/sysdb:1.22 Fri Sep 2 07:13:28 2011 +++ src/etc/rc.d/sysdb Thu Feb 23 18:25:51 2012 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: sysdb,v 1.22 2011/09/02 07:13:28 mbalmer Exp $ +# $NetBSD: sysdb,v 1.22.4.1 2012/02/23 18:25:51 riz Exp $ # # PROVIDE: sysdb @@ -52,7 +52,7 @@ check_file() build_services() { - check_file /etc/services /var/db/services.db services_mkdb -q + check_file /etc/services /var/db/services.cdb services_mkdb -q } build_netgroup()
CVS commit: [netbsd-6] src/etc/root
Module Name:src Committed By: bouyer Date: Sat Mar 17 17:22:54 UTC 2012 Modified Files: src/etc/root [netbsd-6]: dot.cshrc dot.profile Log Message: Pull up following revision(s) (requested by he in ticket #109): etc/root/dot.cshrc: revision 1.23 etc/root/dot.cshrc: revision 1.24 etc/root/dot.profile: revision 1.26 Can't use Bourne shell syntax here... (Even in comments, for PKG_PATH.) Point first to 6.0 packages, then to packages for 5.1 or 5.0. The latter have reduced usefullness in -current or netbsd-6 until we have a compat50 package. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.4.1 src/etc/root/dot.cshrc cvs rdiff -u -r1.25 -r1.25.4.1 src/etc/root/dot.profile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/root/dot.cshrc diff -u src/etc/root/dot.cshrc:1.22 src/etc/root/dot.cshrc:1.22.4.1 --- src/etc/root/dot.cshrc:1.22 Tue Jun 21 05:31:29 2011 +++ src/etc/root/dot.cshrc Sat Mar 17 17:22:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: dot.cshrc,v 1.22 2011/06/21 05:31:29 erh Exp $ +# $NetBSD: dot.cshrc,v 1.22.4.1 2012/03/17 17:22:54 bouyer Exp $ alias h history alias j jobs -l @@ -22,8 +22,9 @@ setenv BLOCKSIZE 1k # Uncomment the following line(s) to install binary packages # from ftp.NetBSD.org via pkg_add. (See also pkg_install.conf) -#setenv PKG_PATH "ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All" -#setenv PKG_PATH "${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All" +#setenv PKG_PATH "ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/6.0/All" +#setenv PKG_PATH "${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.1/All" +#setenv PKG_PATH "${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.0/All" set history=1000 set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/bin /usr/X11R7/bin /usr/X11R6/bin /usr/local/sbin /usr/local/bin) Index: src/etc/root/dot.profile diff -u src/etc/root/dot.profile:1.25 src/etc/root/dot.profile:1.25.4.1 --- src/etc/root/dot.profile:1.25 Tue Jun 21 05:31:29 2011 +++ src/etc/root/dot.profile Sat Mar 17 17:22:54 2012 @@ -1,11 +1,12 @@ -# $NetBSD: dot.profile,v 1.25 2011/06/21 05:31:29 erh Exp $ +# $NetBSD: dot.profile,v 1.25.4.1 2012/03/17 17:22:54 bouyer Exp $ export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin # Uncomment the following line(s) to install binary packages # from ftp.NetBSD.org via pkg_add. (See also pkg_install.conf) -#export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All" +#export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/6.0/All +#export PKG_PATH="${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All" #export PKG_PATH="${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All" export BLOCKSIZE=1k
CVS commit: [netbsd-6] src/etc/skel
Module Name:src Committed By: riz Date: Thu Apr 12 17:12:06 UTC 2012 Modified Files: src/etc/skel [netbsd-6]: dot.profile Log Message: Pull up following revision(s) (requested by dholland in ticket #178): etc/skel/dot.profile: revision 1.9 fix use of setenv in a comment, noted by "stu314" on freenode. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.4.1 src/etc/skel/dot.profile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/skel/dot.profile diff -u src/etc/skel/dot.profile:1.8 src/etc/skel/dot.profile:1.8.4.1 --- src/etc/skel/dot.profile:1.8 Wed Oct 19 14:42:37 2011 +++ src/etc/skel/dot.profile Thu Apr 12 17:12:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.8 2011/10/19 14:42:37 christos Exp $ +# $NetBSD: dot.profile,v 1.8.4.1 2012/04/12 17:12:06 riz Exp $ # # This is the default .profile file. # Users are expected to edit it to meet their own needs. @@ -29,7 +29,7 @@ export EDITOR=vi #export PAGER=more # Set your default printer, if desired. -#setenv PRINTER change-this-to-a-printer +#export PRINTER=change-this-to-a-printer # Set the search path for programs. PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R7/bin:/usr/X11R6/bin:/usr/pkg/bin
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: jdc Date: Sun Jun 24 16:31:52 UTC 2012 Modified Files: src/etc/rc.d [netbsd-6]: makemandb Log Message: Pull up revisions: src/etc/rc.d/makemandb revisions 1.2,1.3 (requested by isaki in ticket #350). Allows you to disable it if makemandb=NO in rc.conf. Thanks tsutsui@ and Yasushi Oshima. Remove unnecessary checkyesno which I commited before. ${rcvar}_start is skipped if rcvar is not set to YES. Pointed out by joerg@ and tsutsui@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.2.1 src/etc/rc.d/makemandb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/makemandb diff -u src/etc/rc.d/makemandb:1.1 src/etc/rc.d/makemandb:1.1.2.1 --- src/etc/rc.d/makemandb:1.1 Tue Feb 7 19:13:30 2012 +++ src/etc/rc.d/makemandb Sun Jun 24 16:31:52 2012 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: makemandb,v 1.1 2012/02/07 19:13:30 joerg Exp $ +# $NetBSD: makemandb,v 1.1.2.1 2012/06/24 16:31:52 jdc Exp $ # # PROVIDE: makemandb @@ -10,6 +10,7 @@ $_rc_subr_loaded . /etc/rc.subr name="makemandb" +rcvar=$name required_files="/etc/man.conf /usr/sbin/makemandb" start_cmd="makemandb_start" stop_cmd=":"
CVS commit: [netbsd-6] src/etc/mtree
Module Name:src Committed By: martin Date: Sun Aug 12 13:38:48 UTC 2012 Modified Files: src/etc/mtree [netbsd-6]: NetBSD.dist.base Log Message: Pull up following revision(s) (requested by msaitoh in ticket #473): etc/mtree/NetBSD.dist.base: revision 1.98 Do not create obsolete ./usr/include/quota directory anymore. To generate a diff of this commit: cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.97.2.1 src/etc/mtree/NetBSD.dist.base:1.97.2.2 --- src/etc/mtree/NetBSD.dist.base:1.97.2.1 Thu Jun 14 09:48:46 2012 +++ src/etc/mtree/NetBSD.dist.base Sun Aug 12 13:38:48 2012 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.97.2.1 2012/06/14 09:48:46 sborrill Exp $ +# $NetBSD: NetBSD.dist.base,v 1.97.2.2 2012/08/12 13:38:48 martin Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -173,7 +173,6 @@ ./usr/include/ppath ./usr/include/prop ./usr/include/protocols -./usr/include/quota ./usr/include/readline ./usr/include/rpc ./usr/include/rpcsvc
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: riz Date: Tue Oct 9 22:58:35 UTC 2012 Modified Files: src/etc/rc.d [netbsd-6]: named Log Message: Pull up following revision(s) (requested by christos in ticket #587): etc/rc.d/named: revision 1.23 PR/47024: Taylor R Campbell: handle "keys" directory and directory permissions in general To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.8.1 src/etc/rc.d/named Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/named diff -u src/etc/rc.d/named:1.22 src/etc/rc.d/named:1.22.8.1 --- src/etc/rc.d/named:1.22 Mon Aug 3 17:45:48 2009 +++ src/etc/rc.d/named Tue Oct 9 22:58:35 2012 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: named,v 1.22 2009/08/03 17:45:48 perry Exp $ +# $NetBSD: named,v 1.22.8.1 2012/10/09 22:58:35 riz Exp $ # # PROVIDE: named @@ -20,38 +20,43 @@ required_dirs="$named_chrootdir" # if it named_migrate() { - local src=$1 - local dst=$2$1 + local src="$1" + local dst="$2$1" echo "Migrating $src to $dst" ( diff=false - cd $src + cd "$src" + mkdir -p "$dst" for f in $(find . -type f) do - f=${f##./} - case $f in + f="${f##./}" + case "$f" in */*) - d=$dst/$(dirname $f) + ds="$(dirname "$f")" + dd="$dst/$ds" + mkdir -p "$dd" + chmod "$(stat -f "%p" "$ds" | + sed -e 's/.*\([0-7][0-7][0-7][0-7]\)$/\1/g')" "$dd" + chown "$(stat -f %u:%g "$ds")" "$dd" ;; - *) d=$dst + *) ;; esac - mkdir -p $d if [ -r "$dst/$f" ] then - if ! cmp $f $dst/$f; then + if ! cmp "$f" "$dst/$f"; then diff=true fi else - cp -p $f $dst/$f + cp -p "$f" "$dst/$f" fi done if $diff; then echo "Cannot complete migration because files are different" echo "Run 'diff -r $src $dst' resolve the differences" else - rm -fr $src - ln -s $dst $src + rm -fr "$src" + ln -s "$dst" "$src" fi ) } @@ -59,6 +64,10 @@ named_migrate() named_precmd() { if [ -z "$named_chrootdir" ]; then + if [ ! -d "/etc/namedb/keys" ]; then + mkdir -m 775 "/etc/namedb/keys" + chown named:named "/etc/namedb/keys" + fi return 0; fi @@ -87,8 +96,7 @@ named_precmd() ;; esac - for i in null random - do + for i in null random; do if [ ! -c "${named_chrootdir}/dev/$i" ]; then rm -f "${named_chrootdir}/dev/$i" (cd /dev && @@ -99,12 +107,15 @@ named_precmd() if [ ! -h /etc/namedb ]; then named_migrate /etc/namedb ${named_chrootdir} fi - if [ \( -r /etc/named.conf \) -a \( ! -h /etc/named.conf \) -a \ - \( ! -r ${named_chrootdir}/etc/named.conf \) ] - then - mv /etc/named.conf ${named_chrootdir}/etc/named.conf - ln -s ${named_chrootdir}/etc/named.conf /etc/named.conf - fi + + for i in named.conf rndc.key; do + if [ \( -r "/etc/$i" \) -a \( ! -h "/etc/$i" \) -a \ + \( ! -r "${named_chrootdir}/etc/$i" \) ]; then + mv "/etc/$i" "${named_chrootdir}/etc/$i" + ln -s "${named_chrootdir}/etc/$i" "/etc/$i" + fi + done + if [ \( ! -r ${named_chrootdir}/etc/named.conf \) -a \ \( -r ${named_chrootdir}/etc/namedb/named.conf \) ]; then ln -s namedb/named.conf ${named_chrootdir}/etc
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: snj Date: Fri May 6 18:33:30 UTC 2016 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1351): etc/namedb/root.cache: revision 1.19 Update to 2015120100. * Addresses of H.ROOT-SERVERS.NET has updated. * Make IPv6 address lower case. To generate a diff of this commit: cvs rdiff -u -r1.16.4.4 -r1.16.4.5 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.4 src/etc/namedb/root.cache:1.16.4.5 --- src/etc/namedb/root.cache:1.16.4.4 Thu Aug 7 06:52:53 2014 +++ src/etc/namedb/root.cache Fri May 6 18:33:30 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.4 2014/08/07 06:52:53 msaitoh Exp $ +; $NetBSD: root.cache,v 1.16.4.5 2016/05/06 18:33:30 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,32 +10,32 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:June 2, 2014 -; related version of root zone: 2014060201 +; last update:December 01, 2015 +; related version of root zone: 2015120100 ; ; formerly NS.INTERNIC.NET ; -.360 IN NSA.ROOT-SERVERS.NET. +.360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 -A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 +A.ROOT-SERVERS.NET. 360 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::B +B.ROOT-SERVERS.NET. 360 2001:500:84::b ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 -C.ROOT-SERVERS.NET. 360 2001:500:2::C +C.ROOT-SERVERS.NET. 360 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 -D.ROOT-SERVERS.NET. 360 2001:500:2D::D +D.ROOT-SERVERS.NET. 360 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; @@ -46,7 +46,7 @@ E.ROOT-SERVERS.NET. 360 A ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2F::F +F.ROOT-SERVERS.NET. 360 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; @@ -56,26 +56,26 @@ G.ROOT-SERVERS.NET. 360 A ; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 +H.ROOT-SERVERS.NET. 360 A 198.97.190.53 +H.ROOT-SERVERS.NET. 360 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 -I.ROOT-SERVERS.NET. 360 2001:7FE::53 +I.ROOT-SERVERS.NET. 360 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 -J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 +J.ROOT-SERVERS.NET. 360 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; .360 NSK.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 360 A 193.0.14.129 -K.ROOT-SERVERS.NET. 360 2001:7FD::1 +K.ROOT-SERVERS.NET. 360 2001:7fd::1 ; ; OPERATED BY ICANN ; @@ -87,5 +87,5 @@ L.ROOT-SERVERS.NET. 360 AA ; .360 NSM.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 360 A 202.12.27.33 -M.ROOT-SERVERS.NET. 360 2001:DC3::35 -; End of File +M.ROOT-SERVERS.NET. 360 2001:dc3::35 +; End of file
CVS commit: [netbsd-6] src/etc/ssh
Module Name:src Committed By: snj Date: Fri May 6 18:37:38 UTC 2016 Modified Files: src/etc/ssh [netbsd-6]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by wiz in ticket #1362): etc/ssh/ssh_known_hosts: revision 1.9 Add keys for wip.pkgsrc.org. To generate a diff of this commit: cvs rdiff -u -r1.7.6.1 -r1.7.6.2 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.6.1 src/etc/ssh/ssh_known_hosts:1.7.6.2 --- src/etc/ssh/ssh_known_hosts:1.7.6.1 Fri Sep 20 03:14:17 2013 +++ src/etc/ssh/ssh_known_hosts Fri May 6 18:37:38 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.6.1 2013/09/20 03:14:17 riz Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.6.2 2016/05/06 18:37:38 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg== # +wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17 +wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g== +#
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: snj Date: Fri Nov 11 06:59:50 UTC 2016 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1413): etc/namedb/root.cache: revision 1.21, 1.22 Update root.cache to 2016/3/23 version, l.root-servers.net's record has changed. -- Update root.cache to 2016102001 (October 20, 2016). To generate a diff of this commit: cvs rdiff -u -r1.16.4.6 -r1.16.4.7 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.6 src/etc/namedb/root.cache:1.16.4.7 --- src/etc/namedb/root.cache:1.16.4.6 Sat Sep 24 13:01:42 2016 +++ src/etc/namedb/root.cache Fri Nov 11 06:59:50 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.6 2016/09/24 13:01:42 bouyer Exp $ +; $NetBSD: root.cache,v 1.16.4.7 2016/11/11 06:59:50 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:December 01, 2015 -; related version of root zone: 2015120100 +; last update:October 20, 2016 +; related version of root zone: 2016102001 ; ; formerly NS.INTERNIC.NET ; @@ -53,6 +53,7 @@ F.ROOT-SERVERS.NET. 360 AA ; .360 NSG.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 360 A 192.112.36.4 +G.ROOT-SERVERS.NET. 360 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; @@ -82,7 +83,7 @@ K.ROOT-SERVERS.NET. 360 AA ; .360 NSL.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 360 A 199.7.83.42 -L.ROOT-SERVERS.NET. 360 2001:500:3::42 +L.ROOT-SERVERS.NET. 360 2001:500:9f::42 ; ; OPERATED BY WIDE ;
CVS commit: [netbsd-6] src/etc/root
Module Name:src Committed By: bouyer Date: Sun Aug 28 10:32:23 UTC 2016 Modified Files: src/etc/root [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by uwe in ticket #1368): etc/root/Makefile: revision 1.4 We don't need to include to install a few config files just and is enough. Noticed because sets LINKSMODE to BINMODE and that does the wrong thing at least for unprivileged builds. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/etc/root/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/root/Makefile diff -u src/etc/root/Makefile:1.3 src/etc/root/Makefile:1.3.8.1 --- src/etc/root/Makefile:1.3 Fri Feb 5 09:44:23 2010 +++ src/etc/root/Makefile Sun Aug 28 10:32:23 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/02/05 09:44:23 roy Exp $ +# $NetBSD: Makefile,v 1.3.8.1 2016/08/28 10:32:23 bouyer Exp $ CONFIGFILES= dot.cshrc dot.klogin dot.login dot.profile dot.shrc @@ -12,4 +12,5 @@ FILESNAME_${F}= ${F:S/dot//} CONFIGLINKS= /root/.cshrc /.cshrc \ /root/.profile /.profile -.include +.include +.include
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: bouyer Date: Sat Sep 24 13:01:42 UTC 2016 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1403): etc/namedb/root.cache: revision 1.21 Update root.cache to 2016/8/25 version, l.root-servers.net has record now. To generate a diff of this commit: cvs rdiff -u -r1.16.4.5 -r1.16.4.6 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.5 src/etc/namedb/root.cache:1.16.4.6 --- src/etc/namedb/root.cache:1.16.4.5 Fri May 6 18:33:30 2016 +++ src/etc/namedb/root.cache Sat Sep 24 13:01:42 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.5 2016/05/06 18:33:30 snj Exp $ +; $NetBSD: root.cache,v 1.16.4.6 2016/09/24 13:01:42 bouyer Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -41,6 +41,7 @@ D.ROOT-SERVERS.NET. 360 AA ; .360 NSE.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 360 A 192.203.230.10 +E.ROOT-SERVERS.NET. 360 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ;
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: he Date: Sun Dec 28 17:03:16 UTC 2014 Modified Files: src/etc/rc.d [netbsd-6]: ntpd Log Message: The new ntpd wants to translate ntp into a port number after chroot, so give it its own small copy of /etc/services in the chroot. [mlelstv, ticket 1223] To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.52.1 src/etc/rc.d/ntpd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/ntpd diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.13.52.1 --- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004 +++ src/etc/rc.d/ntpd Sun Dec 28 17:03:16 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $ +# $NetBSD: ntpd,v 1.13.52.1 2014/12/28 17:03:16 he Exp $ # # PROVIDE: ntpd @@ -49,6 +49,21 @@ ntpd_precmd() fi ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift + if [ ! -d "${ntpd_chrootdir}/etc" ]; then + mkdir "${ntpd_chrootdir}/etc" + fi + if [ ! -f "${ntpd_chrootdir}/etc/services" ]; then + getent services ntp/udp ntp/tcp \ + > "${ntpd_chrootdir}/etc/services" + fi + if [ ! -d "${ntpd_chrootdir}/var/db" ]; then + mkdir -p "${ntpd_chrootdir}/var/db" + fi + if [ ! -f "${ntpd_chrootdir}/var/db/services.cdb" ]; then + services_mkdb -o "${ntpd_chrootdir}/var/db/services.cdb" \ + "${ntpd_chrootdir}/etc/services" + fi + # Change run_rc_commands()'s internal copy of $ntpd_flags # rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
CVS commit: [netbsd-6] src/etc/mtree
Module Name:src Committed By: msaitoh Date: Mon Nov 3 21:17:45 UTC 2014 Modified Files: src/etc/mtree [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by gdt in ticket #1163): etc/mtree/Makefile: revision 1.24 silence is golden To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.4.1 src/etc/mtree/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/Makefile diff -u src/etc/mtree/Makefile:1.22 src/etc/mtree/Makefile:1.22.4.1 --- src/etc/mtree/Makefile:1.22 Sat Sep 10 17:02:46 2011 +++ src/etc/mtree/Makefile Mon Nov 3 21:17:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2011/09/10 17:02:46 apb Exp $ +# $NetBSD: Makefile,v 1.22.4.1 2014/11/03 21:17:45 msaitoh Exp $ .include @@ -52,7 +52,7 @@ TOOL_MTREE.unpriv= -W # the Makefile. # emit_dist_file: - cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES} + @cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES} distrib-dirs: .PHONY check_DESTDIR NetBSD.dist .if !defined(DISTRIBUTION_DONE) # {
CVS commit: [netbsd-6] src/etc/etc.x68k
Module Name:src Committed By: riz Date: Mon Apr 29 01:56:03 UTC 2013 Modified Files: src/etc/etc.x68k [netbsd-6]: MAKEDEV.conf Log Message: Pull up following revision(s) (requested by tsutsui in ticket #705): Additional pullup needed to fix ticket 705: etc/etc.x68k/MAKEDEV.conf: revision 1.14 Add 'bpf' to all ramdisk targets (*), or floppy targets if ramdisk calls that. Sort bpf to come directly after 'std' where relevant. * (apart from etc.evbppc who's ramdisk target *only* builds md0, which just doesn't make sense). Should allow a fighting chance for dhcpcd to get an IP address. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.2.1 src/etc/etc.x68k/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.x68k/MAKEDEV.conf diff -u src/etc/etc.x68k/MAKEDEV.conf:1.12 src/etc/etc.x68k/MAKEDEV.conf:1.12.2.1 --- src/etc/etc.x68k/MAKEDEV.conf:1.12 Sat Jan 21 02:52:50 2012 +++ src/etc/etc.x68k/MAKEDEV.conf Mon Apr 29 01:56:03 2013 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.12 2012/01/21 02:52:50 isaki Exp $ +# $NetBSD: MAKEDEV.conf,v 1.12.2.1 2013/04/29 01:56:03 riz Exp $ all_md) makedev std_x68k st0 st1 ttye0 ttye1 mouse0 mouse1 @@ -21,7 +21,7 @@ std_x68k) ;; floppy) - makedev std std_x68k fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6 + makedev std bpf std_x68k fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6 makedev tty00 cd0 ttye0 opty ;;
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: taca Date: Tue Jul 1 03:29:53 UTC 2014 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Update root.cache to 2014060201. Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an record. To generate a diff of this commit: cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.1 src/etc/namedb/root.cache:1.16.4.2 --- src/etc/namedb/root.cache:1.16.4.1 Sun Jan 13 18:57:48 2013 +++ src/etc/namedb/root.cache Tue Jul 1 03:29:53 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.1 2013/01/13 18:57:48 bouyer Exp $ +; $NetBSD: root.cache,v 1.16.4.2 2014/07/01 03:29:53 taca Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: taca Date: Tue Jul 1 03:31:38 UTC 2014 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Revert previous commit since wrong branch. To generate a diff of this commit: cvs rdiff -u -r1.16.4.2 -r1.16.4.3 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.2 src/etc/namedb/root.cache:1.16.4.3 --- src/etc/namedb/root.cache:1.16.4.2 Tue Jul 1 03:29:53 2014 +++ src/etc/namedb/root.cache Tue Jul 1 03:31:38 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.2 2014/07/01 03:29:53 taca Exp $ +; $NetBSD: root.cache,v 1.16.4.3 2014/07/01 03:31:38 taca Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:June 2, 2014 -; related version of root zone: 2014060201 +; last update:Jan 3, 2013 +; related version of root zone: 2013010300 ; ; formerly NS.INTERNIC.NET ; @@ -23,13 +23,11 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 -C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [netbsd-6] src/etc/ssh
Module Name:src Committed By: riz Date: Fri Sep 20 03:14:17 UTC 2013 Modified Files: src/etc/ssh [netbsd-6]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #947): etc/ssh/ssh_known_hosts: revision 1.8 fix narn-names -> mollari add ecdsa keys (in many cases, pre-emptive strikes) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.6.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7 src/etc/ssh/ssh_known_hosts:1.7.6.1 --- src/etc/ssh/ssh_known_hosts:1.7 Sun May 8 13:19:08 2011 +++ src/etc/ssh/ssh_known_hosts Fri Sep 20 03:14:17 2013 @@ -1,27 +1,51 @@ -# $NetBSD: ssh_known_hosts,v 1.7 2011/05/08 13:19:08 spz Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.6.1 2013/09/20 03:14:17 riz Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= +anoncvs.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFhP4E9+oDpCQZ9yVQA7OzDF0tHnL3eykrqEt3hS+rdHXA0Ak5uCaxi2Aj2JRnAKW1JYbjQ5hyKHYZ2o6SfDimqaQBAt18nWm4CCKc20UbSgyWaH/x+O3J68j5n43MY8gHycPKcLHly2FjhDhuhHuoYODfq9GYn3okYsMu2T/i6Tg+SKw== +# cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q== +# ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= -mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= -www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== +morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== +# +mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= + +mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ== +# pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= +pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ== +# build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= -blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAA
CVS commit: [netbsd-6] src/etc/ssh
Module Name:src Committed By: snj Date: Tue Jul 11 21:18:32 UTC 2017 Modified Files: src/etc/ssh [netbsd-6]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1447): etc/ssh/ssh_known_hosts: revision 1.10 add ssh-ed25519 keys verify keys (split vir functions off from mollari) To generate a diff of this commit: cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.6.2 src/etc/ssh/ssh_known_hosts:1.7.6.3 --- src/etc/ssh/ssh_known_hosts:1.7.6.2 Fri May 6 18:37:38 2016 +++ src/etc/ssh/ssh_known_hosts Tue Jul 11 21:18:32 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.6.2 2016/05/06 18:37:38 snj Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.6.3 2017/07/11 21:18:32 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -6,49 +6,85 @@ anoncvs.netbsd.org ecdsa-sha2-nistp521 A # cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IKs9vV7cSDdIw8hFUiIA+T9QIaZeLi963yuwe8zoCnsJ + cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q== # ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + +morden.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== # mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= +mail.netbsd.org,homeworld.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IFnVCBKDY0sNBJM4ip5Ql0KPsDAmQ+URkOelrQPO1ojv + mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ== # pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= +pkgbuild.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IINkiJ9FjD7QWexC7bssHKVe+ZbMYMWnltwzgZmloZKz + pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ== # build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= +build.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ICUM7QeCYsh/mqacK2ZARQrmYtTeB+PWg5FiMruS+xhz + build.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC3jNi2fWiW
CVS commit: [netbsd-6] src/etc/rc.d
Module Name:src Committed By: snj Date: Tue Aug 15 05:35:01 UTC 2017 Modified Files: src/etc/rc.d [netbsd-6]: sshd Log Message: Pull up following revision(s) (requested by mrg in ticket #1468): etc/rc.d/sshd: revision 1.22-1.23 PR/47540: Felix Deichmann: DSA keys can only be 1024 bits. -- Add new keytype, replace duplicated code with loop To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.4.1 src/etc/rc.d/sshd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/sshd diff -u src/etc/rc.d/sshd:1.21 src/etc/rc.d/sshd:1.21.4.1 --- src/etc/rc.d/sshd:1.21 Mon Jul 25 03:04:23 2011 +++ src/etc/rc.d/sshd Tue Aug 15 05:35:01 2017 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.21 2011/07/25 03:04:23 christos Exp $ +# $NetBSD: sshd,v 1.21.4.1 2017/08/15 05:35:01 snj Exp $ # # PROVIDE: sshd @@ -17,44 +17,31 @@ extra_commands="keygen reload" sshd_keygen() { - ( +( + keygen="/usr/bin/ssh-keygen" umask 022 - if [ -f /etc/ssh/ssh_host_key ]; then - echo "You already have an RSA host key" \ - "in /etc/ssh/ssh_host_key" - echo "Skipping protocol version 1 RSA Key Generation" - else - /usr/bin/ssh-keygen -t rsa1 ${ssh_keygen_flags} \ - -f /etc/ssh/ssh_host_key -N '' - fi - - if [ -f /etc/ssh/ssh_host_dsa_key ]; then - echo "You already have a DSA host key" \ - "in /etc/ssh/ssh_host_dsa_key" - echo "Skipping protocol version 2 DSA Key Generation" - else - /usr/bin/ssh-keygen -t dsa ${ssh_keygen_flags} \ - -f /etc/ssh/ssh_host_dsa_key -N '' - fi - - if [ -f /etc/ssh/ssh_host_ecdsa_key ]; then - echo "You already have a ECDSA host key" \ - "in /etc/ssh/ssh_host_ecdsa_key" - echo "Skipping protocol version 1 ECDSA Key Generation" - else - /usr/bin/ssh-keygen -t ecdsa -b 521 \ - -f /etc/ssh/ssh_host_ecdsa_key -N '' - fi - - if [ -f /etc/ssh/ssh_host_rsa_key ]; then - echo "You already have a RSA host key" \ - "in /etc/ssh/ssh_host_rsa_key" - echo "Skipping protocol version 2 RSA Key Generation" - else - /usr/bin/ssh-keygen -t rsa ${ssh_keygen_flags} \ - -f /etc/ssh/ssh_host_rsa_key -N '' - fi - ) + while read type bits filename version name; do + f="/etc/ssh/$filename" + if [ -f "$f" ]; then + echo "You already have an $name host key in $f" + echo "Skipping protocol version $version $name" \ + "Key Generation" + else + case "${bits}" in + -1) bitarg=;; + 0) bitarg="${ssh_keygen_flags}";; + *) bitarg="-b ${bits}";; + esac + "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' + fi + done << _EOF +rsa1 0 ssh_host_key 1 RSA +dsa 1024 ssh_host_dsa_key 2 DSA +ecdsa 521 ssh_host_ecdsa_key 1 ECDSA +ed25519 -1 ssh_host_ed25519_key 1 ED25519 +rsa 0 ssh_host_rsa_key 2 RSA +_EOF +) } sshd_precmd() @@ -62,6 +49,7 @@ sshd_precmd() if [ ! -f /etc/ssh/ssh_host_key -o \ ! -f /etc/ssh/ssh_host_dsa_key -o \ ! -f /etc/ssh/ssh_host_ecdsa_key -o \ + ! -f /etc/ssh/ssh_host_ed25519_key -o \ ! -f /etc/ssh/ssh_host_rsa_key ]; then run_rc_command keygen fi
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: snj Date: Sun Nov 5 19:55:18 UTC 2017 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1508): etc/namedb/root.cache: revision 1.23 Update root.cache to 2017102400 (October 24, 2017). B.ROOT-SERVERS.NET's IPv4 and IPv6 address has changed. To generate a diff of this commit: cvs rdiff -u -r1.16.4.7 -r1.16.4.8 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.7 src/etc/namedb/root.cache:1.16.4.8 --- src/etc/namedb/root.cache:1.16.4.7 Fri Nov 11 06:59:50 2016 +++ src/etc/namedb/root.cache Sun Nov 5 19:55:18 2017 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.7 2016/11/11 06:59:50 snj Exp $ +; $NetBSD: root.cache,v 1.16.4.8 2017/11/05 19:55:18 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,10 +10,10 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:October 20, 2016 -; related version of root zone: 2016102001 +; last update:October 24, 2017 +; related version of root zone: 2017102400 ; -; formerly NS.INTERNIC.NET +; FORMERLY NS.INTERNIC.NET ; .360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 @@ -22,8 +22,8 @@ A.ROOT-SERVERS.NET. 360 AA ; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::b +B.ROOT-SERVERS.NET. 360 A 199.9.14.201 +B.ROOT-SERVERS.NET. 360 2001:500:200::b ; ; FORMERLY C.PSI.NET ;
CVS commit: [netbsd-6] src/etc/powerd/scripts
Module Name:src Committed By: riz Date: Thu Apr 12 17:10:40 UTC 2012 Modified Files: src/etc/powerd/scripts [netbsd-6]: sensor_temperature Log Message: Pull up following revision(s) (requested by jruoho in ticket #177): etc/powerd/scripts/sensor_temperature: revision 1.4 Gracefully shutdown upon reaching critical temperature levels. Prevents few laptops (ThinkPad T61 and x61s, among others) from hitting the in-CPU reset. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.32.1 src/etc/powerd/scripts/sensor_temperature Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/powerd/scripts/sensor_temperature diff -u src/etc/powerd/scripts/sensor_temperature:1.3 src/etc/powerd/scripts/sensor_temperature:1.3.32.1 --- src/etc/powerd/scripts/sensor_temperature:1.3 Thu Oct 11 00:30:48 2007 +++ src/etc/powerd/scripts/sensor_temperature Thu Apr 12 17:10:40 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: sensor_temperature,v 1.3 2007/10/11 00:30:48 xtraeme Exp $ +# $NetBSD: sensor_temperature,v 1.3.32.1 2012/04/12 17:10:40 riz Exp $ # # Generic script for temperature sensors. # @@ -15,6 +15,7 @@ normal) ;; critical) logger -p warning "${0}: ($1) critical state entered [${3}]" >&1 + /sbin/shutdown -p now "${0}: CRITICAL TEMPERATURE! SHUTTING DOWN." exit 0 ;; critical-under) @@ -23,6 +24,7 @@ critical-under) ;; critical-over) logger -p warning "${0}: ($1) critical limit exceeded [${3}]" >&1 + /sbin/shutdown -p now "${0}: CRITICAL TEMPERATURE! SHUTTING DOWN." exit 0 ;; warning-under)