Module Name: src
Committed By: roy
Date: Fri Jun 29 12:34:15 UTC 2018
Modified Files:
src/distrib/notes/common: main
src/distrib/sets: comments deps descrs
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/syspkg/sets/base: Makefile
src/distrib/syspkg/sets/etc: Makefile
src/distrib/syspkg/sets/man: Makefile
src/etc/defaults: rc.conf
src/etc/mtree: special
src/etc/rc.d: Makefile network pf wpa_supplicant
src/external/mpl/dhcp/bin: Makefile
Removed Files:
src/distrib/syspkg/sets/base/base-dhclient-root: COMMENT DESCR Makefile
src/distrib/syspkg/sets/etc/etc-dhclient-etc: COMMENT DESCR Makefile
src/distrib/syspkg/sets/etc/etc-dhclient-rc: COMMENT DESCR Makefile
src/distrib/syspkg/sets/man/man-dhclient-catman: COMMENT DESCR Makefile
src/distrib/syspkg/sets/man/man-dhclient-man: COMMENT DESCR Makefile
src/etc/rc.d: dhclient
src/external/mpl/dhcp/bin/client: Makefile
src/external/mpl/dhcp/bin/clientscript: Makefile dhclient-script
Log Message:
Remove dhclient from the base system.
Discussed here:
https://mail-index.netbsd.org/tech-userlevel/2018/06/21/msg011233.html
To generate a diff of this commit:
cvs rdiff -u -r1.547 -r1.548 src/distrib/notes/common/main
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/comments
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/deps
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/descrs
cvs rdiff -u -r1.1177 -r1.1178 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.251 -r1.252 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1594 -r1.1595 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.11 -r1.12 src/distrib/syspkg/sets/base/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/distrib/syspkg/sets/base/base-dhclient-root/COMMENT \
src/distrib/syspkg/sets/base/base-dhclient-root/DESCR
cvs rdiff -u -r1.2 -r0 \
src/distrib/syspkg/sets/base/base-dhclient-root/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/syspkg/sets/etc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/distrib/syspkg/sets/etc/etc-dhclient-etc/COMMENT \
src/distrib/syspkg/sets/etc/etc-dhclient-etc/DESCR
cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/etc/etc-dhclient-etc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/distrib/syspkg/sets/etc/etc-dhclient-rc/COMMENT \
src/distrib/syspkg/sets/etc/etc-dhclient-rc/DESCR
cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/etc/etc-dhclient-rc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/syspkg/sets/man/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/distrib/syspkg/sets/man/man-dhclient-catman/COMMENT \
src/distrib/syspkg/sets/man/man-dhclient-catman/DESCR
cvs rdiff -u -r1.2 -r0 \
src/distrib/syspkg/sets/man/man-dhclient-catman/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/distrib/syspkg/sets/man/man-dhclient-man/COMMENT \
src/distrib/syspkg/sets/man/man-dhclient-man/DESCR
cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/man/man-dhclient-man/Makefile
cvs rdiff -u -r1.143 -r1.144 src/etc/defaults/rc.conf
cvs rdiff -u -r1.162 -r1.163 src/etc/mtree/special
cvs rdiff -u -r1.97 -r1.98 src/etc/rc.d/Makefile
cvs rdiff -u -r1.9 -r0 src/etc/rc.d/dhclient
cvs rdiff -u -r1.73 -r1.74 src/etc/rc.d/network
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/pf
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/wpa_supplicant
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bin/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mpl/dhcp/bin/client/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mpl/dhcp/bin/clientscript/Makefile \
src/external/mpl/dhcp/bin/clientscript/dhclient-script
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.547 src/distrib/notes/common/main:1.548
--- src/distrib/notes/common/main:1.547 Tue Jun 26 10:49:54 2018
+++ src/distrib/notes/common/main Fri Jun 29 12:34:13 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.547 2018/06/26 10:49:54 martin Exp $
+.\" $NetBSD: main,v 1.548 2018/06/29 12:34:13 roy Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -511,10 +511,6 @@ The following features are to be removed
.Nx
in the future:
.(bullet
-.Xr dhclient 8
-in favor of
-.Xr dhcpcd 8 .
-.It
.Xr groff 1 .
Man pages are now handled with
.Xr mandoc 1 ,
Index: src/distrib/sets/comments
diff -u src/distrib/sets/comments:1.18 src/distrib/sets/comments:1.19
--- src/distrib/sets/comments:1.18 Sun Nov 4 16:26:52 2012
+++ src/distrib/sets/comments Fri Jun 29 12:34:13 2018
@@ -19,7 +19,6 @@ base-crypto-root root file system direct
base-crypto-shlib shared library providing cryptographic routines
base-cxx-usr /usr file system directories required by C++ programming language utilities
base-debug-bin debugging utilities
-base-dhclient-root root file system support for DHCP client software
base-dhcpd-bin DHCP server
base-dhcpd-examples example configuration files for DHCP server
base-efs-root root file system support for efs file system
@@ -256,8 +255,6 @@ etc-bootserver-rc startup script for dis
etc-cron-log empty log file for cron(8)
etc-cron-rc startup script for cron(8) command scheduler
etc-cron-root root file system support for cron(8) command scheduler
-etc-dhclient-etc configuration files for DHCP dyanamic host configuration protocol client utilities
-etc-dhclient-rc startup script for DHCP dynamic host configuration protocol client
etc-dhcpd-rc startup script for DHCP dynamic host configuration protocol daemon
etc-extsrc-rc startup scripts for externally added programs
etc-games-etc configuration file for games
@@ -339,8 +336,6 @@ man-cxx-info texinfo documentation for t
man-debug-catman formatted manual pages for debugging utilities
man-debug-info texinfo documentation for debugging utilities
man-debug-man manual pages source for debugging utilities
-man-dhclient-catman formatted manual pages for DHCP (dynamic host configuration protocol) client utilities
-man-dhclient-man manual pages source for DHCP (dynamic host configuration protocol) client utilities
man-dhcpd-catman formatted manual pages for DHCP (dynamic host configuration protocol) server utilities
man-dhcpd-man manual pages source for DHCP (dynamic host configuration protocol) server utilities
man-efs-catman formatted manual pages for the Silicon Graphics efs file system support
Index: src/distrib/sets/deps
diff -u src/distrib/sets/deps:1.15 src/distrib/sets/deps:1.16
--- src/distrib/sets/deps:1.15 Sun Nov 4 16:26:52 2012
+++ src/distrib/sets/deps Fri Jun 29 12:34:13 2018
@@ -18,7 +18,6 @@ base-crypto-root base-sys-root
base-crypto-shlib base-sys-usr
base-cxx-usr base-c-usr
base-debug-bin base-sys-usr
-base-dhclient-root base-sys-root
base-dhcpd-bin base-sys-share
base-dhcpd-bin base-sys-usr
base-dhcpd-examples base-sys-share
@@ -286,7 +285,6 @@ etc-bootserver-rc base-sys-root
etc-cron-log base-sys-root
etc-cron-rc base-sys-root
etc-cron-root base-cron-root
-etc-dhclient-rc base-sys-root
etc-dhcpd-rc base-sys-root
etc-games-etc base-sys-root
etc-games-scores base-games-root
@@ -367,8 +365,6 @@ man-cvs-info base-texinfo-share
man-debug-catman base-man-share
man-debug-info base-texinfo-share
man-debug-man base-man-share
-man-dhclient-catman base-man-share
-man-dhclient-man base-man-share
man-dhcpd-catman base-man-share
man-dhcpd-man base-man-share
man-efs-catman base-man-share
Index: src/distrib/sets/descrs
diff -u src/distrib/sets/descrs:1.19 src/distrib/sets/descrs:1.20
--- src/distrib/sets/descrs:1.19 Sun Nov 4 16:26:52 2012
+++ src/distrib/sets/descrs Fri Jun 29 12:34:13 2018
@@ -19,7 +19,6 @@ base-crypto-root root file system direct
base-crypto-shlib shared library providing cryptographic routines
base-cxx-usr /usr file system directories required by C++ programming language utilities
base-debug-bin debugging utilities
-base-dhclient-root root file system support for DHCP client software
base-dhcpd-bin DHCP server
base-dhcpd-examples example configuration files for DHCP server
base-efs-root root file system support for efs file system
@@ -512,8 +511,6 @@ etc-bootserver-rc startup script for dis
etc-cron-log empty log file for cron(8)
etc-cron-rc startup script for cron(8) command scheduler
etc-cron-root root file system support for cron(8) command scheduler
-etc-dhclient-etc configuration files for DHCP dyanamic host configuration protocol client utilities
-etc-dhclient-rc startup script for DHCP dynamic host configuration protocol client
etc-dhcpd-rc startup script for DHCP dynamic host configuration protocol daemon
etc-extsrc-rc startup scripts for externally added programs
etc-games-etc configuration file for games
@@ -597,8 +594,6 @@ man-cxx-info texinfo documentation for t
man-debug-catman formatted manual pages for debugging utilities
man-debug-info texinfo documentation for debugging utilities
man-debug-man manual pages source for debugging utilities
-man-dhclient-catman formatted manual pages for DHCP (dynamic host configuration protocol) client utilities
-man-dhclient-man manual pages source for DHCP (dynamic host configuration protocol) client utilities
man-dhcpd-catman formatted manual pages for DHCP (dynamic host configuration protocol) server utilities
man-dhcpd-man manual pages source for DHCP (dynamic host configuration protocol) server utilities
man-efs-catman formatted manual pages for the Silicon Graphics EFS file system support
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1177 src/distrib/sets/lists/base/mi:1.1178
--- src/distrib/sets/lists/base/mi:1.1177 Thu May 31 05:27:45 2018
+++ src/distrib/sets/lists/base/mi Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1177 2018/05/31 05:27:45 mrg Exp $
+# $NetBSD: mi,v 1.1178 2018/06/29 12:34:14 roy Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -479,8 +479,8 @@
./sbin/chown base-sysutil-root
./sbin/clri base-sysutil-root
./sbin/devpubd base-sysutil-root
-./sbin/dhclient base-dhclient-root
-./sbin/dhclient-script base-dhclient-root
+./sbin/dhclient base-obsolete obsolete
+./sbin/dhclient-script base-obsolete obsolete
./sbin/dhcpcd base-dhcpcd-root
./sbin/disklabel base-sysutil-root
./sbin/dkctl base-sysutil-root
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.255 src/distrib/sets/lists/debug/mi:1.256
--- src/distrib/sets/lists/debug/mi:1.255 Thu Jun 28 10:14:01 2018
+++ src/distrib/sets/lists/debug/mi Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.255 2018/06/28 10:14:01 christos Exp $
+# $NetBSD: mi,v 1.256 2018/06/29 12:34:14 roy Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -319,7 +319,7 @@
./usr/libdata/debug/sbin/chown.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/clri.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/devpubd.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/dhclient.debug comp-dhclient-debug debug
+./usr/libdata/debug/sbin/dhclient.debug comp-obsolete obsolete
./usr/libdata/debug/sbin/dhcpcd.debug comp-dhcpcd-debug debug
./usr/libdata/debug/sbin/disklabel.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/dkctl.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.251 src/distrib/sets/lists/etc/mi:1.252
--- src/distrib/sets/lists/etc/mi:1.251 Sat Feb 17 03:02:04 2018
+++ src/distrib/sets/lists/etc/mi Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.251 2018/02/17 03:02:04 uwe Exp $
+# $NetBSD: mi,v 1.252 2018/06/29 12:34:14 roy Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -202,7 +202,7 @@
./etc/rc.d/cleartmp etc-sys-rc
./etc/rc.d/cron etc-cron-rc
./etc/rc.d/devpubd etc-sys-rc
-./etc/rc.d/dhclient etc-dhclient-rc
+./etc/rc.d/dhclient etc-obsolete obsolete
./etc/rc.d/dhcpcd etc-dhcpcd-rc
./etc/rc.d/dhcpd etc-dhcpd-rc
./etc/rc.d/dhcpd6 etc-dhcpd-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1594 src/distrib/sets/lists/man/mi:1.1595
--- src/distrib/sets/lists/man/mi:1.1594 Wed Jun 13 03:28:36 2018
+++ src/distrib/sets/lists/man/mi Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1594 2018/06/13 03:28:36 ozaki-r Exp $
+# $NetBSD: mi,v 1.1595 2018/06/29 12:34:14 roy Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2086,9 +2086,9 @@
./usr/share/man/cat5/ctf.0 man-sys-catman ctf,.cat
./usr/share/man/cat5/daily.0 man-sys-catman .cat
./usr/share/man/cat5/daily.conf.0 man-sys-catman .cat
-./usr/share/man/cat5/dhclient.conf.0 man-dhclient-catman .cat
-./usr/share/man/cat5/dhclient.leases.0 man-dhclient-catman .cat
-./usr/share/man/cat5/dhcp-eval.0 man-dhclient-catman .cat
+./usr/share/man/cat5/dhclient.conf.0 man-obsolete obsolete
+./usr/share/man/cat5/dhclient.leases.0 man-obsolete obsolete
+./usr/share/man/cat5/dhcp-eval.0 man-dhcpd-catman .cat
./usr/share/man/cat5/dhcp-options.0 man-dhcpd-catman .cat
./usr/share/man/cat5/dhcpcd.conf.0 man-dhcpcd-catman .cat
./usr/share/man/cat5/dhcpd.conf.0 man-dhcpd-catman .cat
@@ -2454,8 +2454,8 @@
./usr/share/man/cat8/defer.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/dev_mkdb.0 man-sysutil-catman .cat
./usr/share/man/cat8/devpubd.0 man-sysutil-catman .cat
-./usr/share/man/cat8/dhclient-script.0 man-dhclient-catman .cat
-./usr/share/man/cat8/dhclient.0 man-dhclient-catman .cat
+./usr/share/man/cat8/dhclient-script.0 man-obsolete obsolete
+./usr/share/man/cat8/dhclient.0 man-obsolete obsolete
./usr/share/man/cat8/dhcpcd-run-hooks.0 man-dhcpcd-catman .cat
./usr/share/man/cat8/dhcpcd.0 man-dhcpcd-catman .cat
./usr/share/man/cat8/dhcpd.0 man-dhcpd-catman .cat
@@ -5150,9 +5150,9 @@
./usr/share/man/html5/ctf.html man-sys-catman ctf,html
./usr/share/man/html5/daily.conf.html man-sys-htmlman html
./usr/share/man/html5/daily.html man-sys-htmlman html
-./usr/share/man/html5/dhclient.conf.html man-dhclient-htmlman html
-./usr/share/man/html5/dhclient.leases.html man-dhclient-htmlman html
-./usr/share/man/html5/dhcp-eval.html man-dhclient-htmlman html
+./usr/share/man/html5/dhclient.conf.html man-obsolete obsolete
+./usr/share/man/html5/dhclient.leases.html man-obsolete obsolete
+./usr/share/man/html5/dhcp-eval.html man-dhcpd-htmlman html
./usr/share/man/html5/dhcp-options.html man-dhcpd-htmlman html
./usr/share/man/html5/dhcpcd.conf.html man-dhcpcd-htmlman html
./usr/share/man/html5/dhcpd.conf.html man-dhcpd-htmlman html
@@ -5458,8 +5458,8 @@
./usr/share/man/html8/defer.html man-postfix-htmlman postfix,html
./usr/share/man/html8/dev_mkdb.html man-sysutil-htmlman html
./usr/share/man/html8/devpubd.html man-sysutil-htmlman html
-./usr/share/man/html8/dhclient-script.html man-dhclient-htmlman html
-./usr/share/man/html8/dhclient.html man-dhclient-htmlman html
+./usr/share/man/html8/dhclient-script.html man-obsolete obsolete
+./usr/share/man/html8/dhclient.html man-obsolete obsolete
./usr/share/man/html8/dhcpcd-run-hooks.html man-dhcpcd-htmlman html
./usr/share/man/html8/dhcpcd.html man-dhcpcd-htmlman html
./usr/share/man/html8/dhcpd.html man-dhcpd-htmlman html
@@ -8148,9 +8148,9 @@
./usr/share/man/man5/ctf.5 man-sys-man ctf,.man
./usr/share/man/man5/daily.5 man-sys-man .man
./usr/share/man/man5/daily.conf.5 man-sys-man .man
-./usr/share/man/man5/dhclient.conf.5 man-dhclient-man .man
-./usr/share/man/man5/dhclient.leases.5 man-dhclient-man .man
-./usr/share/man/man5/dhcp-eval.5 man-dhclient-man .man
+./usr/share/man/man5/dhclient.conf.5 man-obsolete obsolete
+./usr/share/man/man5/dhclient.leases.5 man-obsolete obsolete
+./usr/share/man/man5/dhcp-eval.5 man-dhcpd-man .man
./usr/share/man/man5/dhcp-options.5 man-dhcpd-man .man
./usr/share/man/man5/dhcpcd.conf.5 man-dhcpcd-man .man
./usr/share/man/man5/dhcpd.conf.5 man-dhcpd-man .man
@@ -8515,8 +8515,8 @@
./usr/share/man/man8/defer.8 man-postfix-man postfix,.man
./usr/share/man/man8/dev_mkdb.8 man-sysutil-man .man
./usr/share/man/man8/devpubd.8 man-sysutil-man .man
-./usr/share/man/man8/dhclient-script.8 man-dhclient-man .man
-./usr/share/man/man8/dhclient.8 man-dhclient-man .man
+./usr/share/man/man8/dhclient-script.8 man-obsolete obsolete
+./usr/share/man/man8/dhclient.8 man-obsolete obsolete
./usr/share/man/man8/dhcpcd-run-hooks.8 man-dhcpcd-man .man
./usr/share/man/man8/dhcpcd.8 man-dhcpcd-man .man
./usr/share/man/man8/dhcpd.8 man-dhcpd-man .man
Index: src/distrib/syspkg/sets/base/Makefile
diff -u src/distrib/syspkg/sets/base/Makefile:1.11 src/distrib/syspkg/sets/base/Makefile:1.12
--- src/distrib/syspkg/sets/base/Makefile:1.11 Sat Jan 16 16:10:39 2010
+++ src/distrib/syspkg/sets/base/Makefile Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/16 16:10:39 roy Exp $
+# $NetBSD: Makefile,v 1.12 2018/06/29 12:34:14 roy Exp $
SUBDIR+=base-adosfs-root
SUBDIR+=base-amd-bin
@@ -19,7 +19,6 @@ SUBDIR+=base-crypto-root
SUBDIR+=base-crypto-shlib
SUBDIR+=base-cxx-usr
SUBDIR+=base-debug-bin
-SUBDIR+=base-dhclient-root
SUBDIR+=base-dhcpd-bin
SUBDIR+=base-dhcpd-examples
SUBDIR+=base-ext2fs-root
Index: src/distrib/syspkg/sets/etc/Makefile
diff -u src/distrib/syspkg/sets/etc/Makefile:1.2 src/distrib/syspkg/sets/etc/Makefile:1.3
--- src/distrib/syspkg/sets/etc/Makefile:1.2 Wed Jun 30 03:37:50 2004
+++ src/distrib/syspkg/sets/etc/Makefile Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/06/30 03:37:50 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2018/06/29 12:34:14 roy Exp $
SUBDIR+=etc-bind-etc
SUBDIR+=etc-bind-rc
@@ -7,8 +7,6 @@ SUBDIR+=etc-bootserver-rc
SUBDIR+=etc-cron-log
SUBDIR+=etc-cron-rc
SUBDIR+=etc-cron-root
-SUBDIR+=etc-dhclient-etc
-SUBDIR+=etc-dhclient-rc
SUBDIR+=etc-dhcpd-rc
SUBDIR+=etc-games-etc
SUBDIR+=etc-games-scores
Index: src/distrib/syspkg/sets/man/Makefile
diff -u src/distrib/syspkg/sets/man/Makefile:1.6 src/distrib/syspkg/sets/man/Makefile:1.7
--- src/distrib/syspkg/sets/man/Makefile:1.6 Sat Jan 16 16:10:39 2010
+++ src/distrib/syspkg/sets/man/Makefile Fri Jun 29 12:34:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/16 16:10:39 roy Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/29 12:34:14 roy Exp $
SUBDIR+=man-adosfs-catman
SUBDIR+=man-adosfs-man
@@ -24,8 +24,6 @@ SUBDIR+=man-cxx-info
SUBDIR+=man-debug-catman
SUBDIR+=man-debug-info
SUBDIR+=man-debug-man
-SUBDIR+=man-dhclient-catman
-SUBDIR+=man-dhclient-man
SUBDIR+=man-dhcpd-catman
SUBDIR+=man-dhcpd-man
SUBDIR+=man-ext2fs-catman
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.143 src/etc/defaults/rc.conf:1.144
--- src/etc/defaults/rc.conf:1.143 Fri May 25 20:48:54 2018
+++ src/etc/defaults/rc.conf Fri Jun 29 12:34:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.143 2018/05/25 20:48:54 uwe Exp $
+# $NetBSD: rc.conf,v 1.144 2018/06/29 12:34:15 roy Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -86,7 +86,7 @@ domainname=""
# Filesystems to mount early in boot-up.
# Note that `/var' is needed in $critical_filesystems_local (or
# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
+# dhcpcd) may be needed to get the network operational enough to mount
# the $critical_filesystems_remote. Prepending "OPTIONAL:" means it
# will not be an error if that file system is not present in fstab(5).
#
@@ -185,10 +185,7 @@ racoon=NO # IKE daemon
auto_ifconfig=YES # config all avail. interfaces
net_interfaces="" # used only if above is NO
flushroutes=YES # flush routes in netstart
-dhcpcd=NO
- dhcpcd_flags="-qM" # For ifconfig_XXX=dhcp.
-dhclient=NO # behave as a DHCP client
- dhclient_flags="" # blank: config all interfaces
+dhcpcd=NO dhcpcd_flags="-qM" # For ifconfig_XXX=dhcp.
ntpdate=NO ntpdate_flags="-b -s" # May need '-u' thru firewall
ppp=YES ppp_peers="" # /etc/ppp/peers to call
ip6mode=host # host, autohost or router
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.162 src/etc/mtree/special:1.163
--- src/etc/mtree/special:1.162 Tue Jan 9 03:31:14 2018
+++ src/etc/mtree/special Fri Jun 29 12:34:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.162 2018/01/09 03:31:14 christos Exp $
+# $NetBSD: special,v 1.163 2018/06/29 12:34:15 roy Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -63,9 +63,6 @@
./etc/defaults/rc.conf type=file mode=0444
./etc/defaults/security.conf type=file mode=0444
./etc/defaults/weekly.conf type=file mode=0444
-./etc/dhclient-enter-hooks type=file mode=0644 optional
-./etc/dhclient-exit-hooks type=file mode=0644 optional
-./etc/dhclient.conf type=file mode=0644 optional
./etc/dhcpcd.conf type=file mode=0644
./etc/dhcpcd.duid type=file mode=0644 optional
./etc/dhcpcd.hook type=file mode=0644 optional
@@ -208,7 +205,6 @@
./etc/rc.d/cleartmp type=file mode=0555
./etc/rc.d/cron type=file mode=0555
./etc/rc.d/devpubd type=file mode=0555
-./etc/rc.d/dhclient type=file mode=0555
./etc/rc.d/dhcpcd type=file mode=0555
./etc/rc.d/dhcpd type=file mode=0555
./etc/rc.d/dhcpd6 type=file mode=0555
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.97 src/etc/rc.d/Makefile:1.98
--- src/etc/rc.d/Makefile:1.97 Sat Feb 17 03:02:04 2018
+++ src/etc/rc.d/Makefile Fri Jun 29 12:34:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2018/02/17 03:02:04 uwe Exp $
+# $NetBSD: Makefile,v 1.98 2018/06/29 12:34:15 roy Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ CONFIGFILES=\
accounting altqd amd apmd automount automountd autounmountd \
bluetooth bootconf.sh bootparams \
ccd cgd cleartmp cron \
- devpubd dhclient dhcpcd dhcpd dhcpd6 dhcrelay dmesg \
+ devpubd dhcpcd dhcpd dhcpd6 dhcrelay dmesg \
downinterfaces \
envsys \
fsck fsck_root ftp_proxy ftpd \
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.73 src/etc/rc.d/network:1.74
--- src/etc/rc.d/network:1.73 Thu Jul 6 09:49:39 2017
+++ src/etc/rc.d/network Fri Jun 29 12:34:15 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.73 2017/07/06 09:49:39 kre Exp $
+# $NetBSD: network,v 1.74 2018/06/29 12:34:15 roy Exp $
#
# PROVIDE: network
@@ -71,7 +71,7 @@ network_start_hostname()
# DHCP later, as we will probably get the
# hostname at that time.
#
- if ! checkyesno dhclient && ! checkyesno dhcpcd && \
+ if ! checkyesno dhcpcd && \
[ -z "$(hostname)" ]
then
warn "\$hostname not set."
@@ -539,7 +539,6 @@ network_stop_route()
}
load_rc_config $name
-load_rc_config_var dhclient dhclient
load_rc_config_var dhcpcd dhcpcd
load_rc_config_var ipfilter ipfilter
run_rc_command "$1"
Index: src/etc/rc.d/pf
diff -u src/etc/rc.d/pf:1.10 src/etc/rc.d/pf:1.11
--- src/etc/rc.d/pf:1.10 Mon Nov 21 20:56:21 2011
+++ src/etc/rc.d/pf Fri Jun 29 12:34:15 2018
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: pf,v 1.10 2011/11/21 20:56:21 darcy Exp $
+# $NetBSD: pf,v 1.11 2018/06/29 12:34:15 roy Exp $
#
# PROVIDE: pf
-# REQUIRE: root bootconf mountcritlocal tty network dhclient
+# REQUIRE: root bootconf mountcritlocal tty network dhcpcd
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.6 src/etc/rc.d/wpa_supplicant:1.7
--- src/etc/rc.d/wpa_supplicant:1.6 Thu Jan 22 19:50:21 2015
+++ src/etc/rc.d/wpa_supplicant Fri Jun 29 12:34:15 2018
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $NetBSD: wpa_supplicant,v 1.6 2015/01/22 19:50:21 jmcneill Exp $
+# $NetBSD: wpa_supplicant,v 1.7 2018/06/29 12:34:15 roy Exp $
#
# PROVIDE: wpa_supplicant
# REQUIRE: network mountcritlocal
-# BEFORE: NETWORKING dhclient
+# BEFORE: NETWORKING dhcpcd
#
# We need to run a command that resides in /usr/sbin, and the
# /usr file system is traditionally mounted by mountcritremote.
Index: src/external/mpl/dhcp/bin/Makefile
diff -u src/external/mpl/dhcp/bin/Makefile:1.1 src/external/mpl/dhcp/bin/Makefile:1.2
--- src/external/mpl/dhcp/bin/Makefile:1.1 Sat Apr 7 22:31:37 2018
+++ src/external/mpl/dhcp/bin/Makefile Fri Jun 29 12:34:15 2018
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2018/04/07 22:31:37 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/06/29 12:34:15 roy Exp $
-SUBDIR= clientscript server client relay omshell
+SUBDIR= server relay omshell
.include <bsd.subdir.mk>
