Module Name: src
Committed By: nia
Date: Sun May 29 08:10:00 UTC 2022
Modified Files:
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/etc/rc.d: Makefile
src/external/bsd: Makefile
src/share/mk: bsd.README bsd.own.mk
Log Message:
mk: Add a MKPPP flag to exclude pppd(8) and related utilities from
the build
To generate a diff of this commit:
cvs rdiff -u -r1.1304 -r1.1305 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.383 -r1.384 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.268 -r1.269 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1745 -r1.1746 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.114 -r1.115 src/etc/rc.d/Makefile
cvs rdiff -u -r1.73 -r1.74 src/external/bsd/Makefile
cvs rdiff -u -r1.436 -r1.437 src/share/mk/bsd.README
cvs rdiff -u -r1.1282 -r1.1283 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1304 src/distrib/sets/lists/base/mi:1.1305
--- src/distrib/sets/lists/base/mi:1.1304 Sat May 28 14:31:11 2022
+++ src/distrib/sets/lists/base/mi Sun May 29 08:09:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1304 2022/05/28 14:31:11 nia Exp $
+# $NetBSD: mi,v 1.1305 2022/05/29 08:09:59 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1445,7 +1445,7 @@
./usr/sbin/btpand base-sysutil-bin
./usr/sbin/btuartd base-obsolete obsolete
./usr/sbin/catman base-man-bin
-./usr/sbin/chat base-ppp-bin
+./usr/sbin/chat base-ppp-bin ppp
./usr/sbin/chown base-sysutil-bin
./usr/sbin/chroot base-sysutil-bin
./usr/sbin/chrtbl base-obsolete obsolete
@@ -1668,10 +1668,10 @@
./usr/sbin/postsuper base-postfix-bin postfix
./usr/sbin/posttls-finger base-postfix-bin postfix
./usr/sbin/powerd base-sysutil-bin
-./usr/sbin/pppd base-ppp-bin
-./usr/sbin/pppdump base-ppp-bin
+./usr/sbin/pppd base-ppp-bin ppp
+./usr/sbin/pppdump base-ppp-bin ppp
./usr/sbin/pppoectl base-obsolete obsolete
-./usr/sbin/pppstats base-ppp-bin
+./usr/sbin/pppstats base-ppp-bin ppp
./usr/sbin/praliases base-obsolete obsolete
./usr/sbin/procsystime base-debug-bin dtrace
./usr/sbin/psrset base-sysutil-bin
@@ -1745,7 +1745,7 @@
./usr/sbin/setkey base-obsolete obsolete
./usr/sbin/setobjstat base-sysutil-bin
./usr/sbin/sliplogin base-slip-bin
-./usr/sbin/slstats base-slip-bin
+./usr/sbin/slstats base-slip-bin ppp
./usr/sbin/smrsh base-obsolete obsolete
./usr/sbin/sntp base-ntp-bin ntp
./usr/sbin/spamdb base-obsolete obsolete
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.383 src/distrib/sets/lists/debug/mi:1.384
--- src/distrib/sets/lists/debug/mi:1.383 Sat May 28 14:31:12 2022
+++ src/distrib/sets/lists/debug/mi Sun May 29 08:09:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.383 2022/05/28 14:31:12 nia Exp $
+# $NetBSD: mi,v 1.384 2022/05/29 08:09:59 nia 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
@@ -1076,7 +1076,7 @@
./usr/libdata/debug/usr/sbin/btpand.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/btuartd.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/catman.debug comp-man-debug debug
-./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug debug
+./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug ppp,debug
./usr/libdata/debug/usr/sbin/chown.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/chroot.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/chrtbl.debug comp-obsolete obsolete
@@ -1248,9 +1248,9 @@
./usr/libdata/debug/usr/sbin/postsuper.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/posttls-finger.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/powerd.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/pppd.debug comp-ppp-debug debug
-./usr/libdata/debug/usr/sbin/pppdump.debug comp-ppp-debug debug
-./usr/libdata/debug/usr/sbin/pppstats.debug comp-ppp-debug debug
+./usr/libdata/debug/usr/sbin/pppd.debug comp-ppp-debug ppp,debug
+./usr/libdata/debug/usr/sbin/pppdump.debug comp-ppp-debug ppp,debug
+./usr/libdata/debug/usr/sbin/pppstats.debug comp-ppp-debug ppp,debug
./usr/libdata/debug/usr/sbin/psrset.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pvcsif.debug comp-obsolete obsolete
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.268 src/distrib/sets/lists/etc/mi:1.269
--- src/distrib/sets/lists/etc/mi:1.268 Sat May 28 11:17:36 2022
+++ src/distrib/sets/lists/etc/mi Sun May 29 08:09:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.268 2022/05/28 11:17:36 nia Exp $
+# $NetBSD: mi,v 1.269 2022/05/29 08:09:59 nia Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -283,7 +283,7 @@
./etc/rc.d/poffd etc-obsolete obsolete
./etc/rc.d/postfix etc-postfix-rc
./etc/rc.d/powerd etc-sysutil-rc
-./etc/rc.d/ppp etc-ppp-rc
+./etc/rc.d/ppp etc-ppp-rc ppp
./etc/rc.d/pwcheck etc-sys-rc
./etc/rc.d/quota etc-sys-rc
./etc/rc.d/racoon etc-net-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1745 src/distrib/sets/lists/man/mi:1.1746
--- src/distrib/sets/lists/man/mi:1.1745 Sat May 28 14:31:12 2022
+++ src/distrib/sets/lists/man/mi Sun May 29 08:09:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1745 2022/05/28 14:31:12 nia Exp $
+# $NetBSD: mi,v 1.1746 2022/05/29 08:09:59 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2514,7 +2514,7 @@
./usr/share/man/cat8/cesfic/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/cesfic/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/cgdconfig.0 man-sysutil-catman .cat
-./usr/share/man/cat8/chat.0 man-ppp-catman .cat
+./usr/share/man/cat8/chat.0 man-ppp-catman ppp,.cat
./usr/share/man/cat8/chown.0 man-sysutil-catman .cat
./usr/share/man/cat8/chroot.0 man-sysutil-catman .cat
./usr/share/man/cat8/chrtbl.0 man-obsolete obsolete
@@ -3012,11 +3012,11 @@
./usr/share/man/cat8/postscreen.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/powerd.0 man-sysutil-catman .cat
./usr/share/man/cat8/poweroff.0 man-sysutil-catman .cat
-./usr/share/man/cat8/pppd.0 man-ppp-catman .cat
+./usr/share/man/cat8/pppd.0 man-ppp-catman ppp,.cat
./usr/share/man/cat8/pppd.cbcp.0 man-obsolete obsolete
-./usr/share/man/cat8/pppdump.0 man-ppp-catman .cat
+./usr/share/man/cat8/pppdump.0 man-ppp-catman ppp,.cat
./usr/share/man/cat8/pppoectl.0 man-sysutil-catman .cat
-./usr/share/man/cat8/pppstats.0 man-ppp-catman .cat
+./usr/share/man/cat8/pppstats.0 man-ppp-catman ppp,.cat
./usr/share/man/cat8/praliases.0 man-obsolete obsolete
./usr/share/man/cat8/prep/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/prep/boot.0 man-sys-catman .cat
@@ -3156,7 +3156,7 @@
./usr/share/man/cat8/slattach.0 man-slip-catman .cat
./usr/share/man/cat8/slip.0 man-obsolete obsolete
./usr/share/man/cat8/sliplogin.0 man-slip-catman .cat
-./usr/share/man/cat8/slstats.0 man-slip-catman .cat
+./usr/share/man/cat8/slstats.0 man-slip-catman ppp,.cat
./usr/share/man/cat8/smrsh.0 man-obsolete obsolete
./usr/share/man/cat8/smtp.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/smtpd.0 man-postfix-catman postfix,.cat
@@ -5633,7 +5633,7 @@
./usr/share/man/html8/catman.html man-man-htmlman html
./usr/share/man/html8/ccdconfig.html man-sysutil-htmlman html
./usr/share/man/html8/cgdconfig.html man-sysutil-htmlman html
-./usr/share/man/html8/chat.html man-ppp-htmlman html
+./usr/share/man/html8/chat.html man-ppp-htmlman ppp,html
./usr/share/man/html8/chown.html man-sysutil-htmlman html
./usr/share/man/html8/chroot.html man-sysutil-htmlman html
./usr/share/man/html8/chrtbl.html man-obsolete obsolete
@@ -6023,10 +6023,10 @@
./usr/share/man/html8/postscreen.html man-postfix-htmlman postfix,html
./usr/share/man/html8/powerd.html man-sysutil-htmlman html
./usr/share/man/html8/poweroff.html man-sysutil-htmlman html
-./usr/share/man/html8/pppd.html man-ppp-htmlman html
-./usr/share/man/html8/pppdump.html man-ppp-htmlman html
+./usr/share/man/html8/pppd.html man-ppp-htmlman ppp,html
+./usr/share/man/html8/pppdump.html man-ppp-htmlman ppp,html
./usr/share/man/html8/pppoectl.html man-sysutil-htmlman html
-./usr/share/man/html8/pppstats.html man-ppp-htmlman html
+./usr/share/man/html8/pppstats.html man-ppp-htmlman ppp,html
./usr/share/man/html8/prep/boot.html man-sys-htmlman html
./usr/share/man/html8/prep/mkbootimage.html man-sys-htmlman html
./usr/share/man/html8/proxymap.html man-postfix-htmlman postfix,html
@@ -6150,7 +6150,7 @@
./usr/share/man/html8/shutdown.html man-sysutil-htmlman html
./usr/share/man/html8/slattach.html man-slip-htmlman html
./usr/share/man/html8/sliplogin.html man-slip-htmlman html
-./usr/share/man/html8/slstats.html man-slip-htmlman html
+./usr/share/man/html8/slstats.html man-slip-htmlman ppp,html
./usr/share/man/html8/smtp.html man-postfix-htmlman postfix,html
./usr/share/man/html8/smtpd.html man-postfix-htmlman postfix,html
./usr/share/man/html8/sparc/binstall.html man-sysutil-htmlman html
@@ -8799,7 +8799,7 @@
./usr/share/man/man8/cesfic/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/cesfic/makedev.8 man-obsolete obsolete
./usr/share/man/man8/cgdconfig.8 man-sysutil-man .man
-./usr/share/man/man8/chat.8 man-ppp-man .man
+./usr/share/man/man8/chat.8 man-ppp-man ppp,.man
./usr/share/man/man8/chown.8 man-sysutil-man .man
./usr/share/man/man8/chroot.8 man-sysutil-man .man
./usr/share/man/man8/chrtbl.8 man-obsolete obsolete
@@ -9298,11 +9298,11 @@
./usr/share/man/man8/postscreen.8 man-postfix-man postfix,.man
./usr/share/man/man8/powerd.8 man-sysutil-man .man
./usr/share/man/man8/poweroff.8 man-sysutil-man .man
-./usr/share/man/man8/pppd.8 man-ppp-man .man
+./usr/share/man/man8/pppd.8 man-ppp-man ppp,.man
./usr/share/man/man8/pppd.cbcp.8 man-obsolete obsolete
-./usr/share/man/man8/pppdump.8 man-ppp-man .man
+./usr/share/man/man8/pppdump.8 man-ppp-man ppp,.man
./usr/share/man/man8/pppoectl.8 man-sysutil-man .man
-./usr/share/man/man8/pppstats.8 man-ppp-man .man
+./usr/share/man/man8/pppstats.8 man-ppp-man ppp,.man
./usr/share/man/man8/praliases.8 man-obsolete obsolete
./usr/share/man/man8/prep/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/prep/boot.8 man-sys-man .man
@@ -9442,7 +9442,7 @@
./usr/share/man/man8/slattach.8 man-slip-man .man
./usr/share/man/man8/slip.8 man-obsolete obsolete
./usr/share/man/man8/sliplogin.8 man-slip-man .man
-./usr/share/man/man8/slstats.8 man-slip-man .man
+./usr/share/man/man8/slstats.8 man-slip-man ppp,.man
./usr/share/man/man8/smrsh.8 man-obsolete obsolete
./usr/share/man/man8/smtp.8 man-postfix-man postfix,.man
./usr/share/man/man8/smtpd.8 man-postfix-man postfix,.man
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.114 src/etc/rc.d/Makefile:1.115
--- src/etc/rc.d/Makefile:1.114 Sat May 28 11:17:35 2022
+++ src/etc/rc.d/Makefile Sun May 29 08:10:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2022/05/28 11:17:35 nia Exp $
+# $NetBSD: Makefile,v 1.115 2022/05/29 08:10:00 nia Exp $
.include <bsd.own.mk>
@@ -32,7 +32,7 @@ CONFIGFILES=\
mountcritlocal mountcritremote mountd moused \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
npfd \
- perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
+ perusertmp pf pf_boot pflogd postfix powerd pwcheck \
quota \
racoon rpcbind raidframe raidframeparity random_seed rarpd \
rbootd resize_root rndctl root route6d routed rtadvd \
@@ -52,6 +52,10 @@ CONFIGFILES+= mrouted
CONFIGFILES+= ntpd ntpdate
.endif
+.if ${MKPPP} != "no"
+CONFIGFILES+= ppp
+.endif
+
.if ${MKYP} != "no"
CONFIGFILES+= ypbind yppasswdd ypserv
.endif
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.73 src/external/bsd/Makefile:1.74
--- src/external/bsd/Makefile:1.73 Sat May 28 11:17:35 2022
+++ src/external/bsd/Makefile Sun May 29 08:10:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/05/28 11:17:35 nia Exp $
+# $NetBSD: Makefile,v 1.74 2022/05/29 08:10:00 nia Exp $
.include <bsd.own.mk>
@@ -39,6 +39,9 @@ SUBDIR+= pam-u2f
.if (${MKPCC} != "no")
SUBDIR+= pcc
.endif
+.if (${MKPPP} != "no")
+SUBDIR+= ppp
+.endif
.if (${MKDTRACE} != "no")
SUBDIR+= libproc
SUBDIR+= librtld_db
@@ -50,6 +53,6 @@ SUBDIR+= tcpdump
SUBDIR+= unbound
.endif
-SUBDIR+= blocklist pdisk nvi ppp libnv
+SUBDIR+= blocklist pdisk nvi libnv
.include <bsd.subdir.mk>
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.436 src/share/mk/bsd.README:1.437
--- src/share/mk/bsd.README:1.436 Sat May 28 14:31:12 2022
+++ src/share/mk/bsd.README Sun May 29 08:10:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.436 2022/05/28 14:31:12 nia Exp $
+# $NetBSD: bsd.README,v 1.437 2022/05/29 08:10:00 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -451,6 +451,13 @@ MKPIGZGZIP If "no", only install pigz as
MKPOSTFIX If "no", don't build or install postfix(1).
Default: yes
+MKPPP If "no", disables building the Point-to-Point Protocol
+ daemon pppd(8), as well as related utilities chat(8),
+ pppdump(8), and pppstats(8).
+ This option has no effect on PPPoE (Point-to-Point over
+ Ethernet) support, but rather only affects serial links.
+ Default: yes
+
MKPROFILE If "no", don't build or install the profiling (*_p.a) libraries.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1282 src/share/mk/bsd.own.mk:1.1283
--- src/share/mk/bsd.own.mk:1.1282 Sat May 28 14:31:12 2022
+++ src/share/mk/bsd.own.mk Sun May 29 08:10:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1282 2022/05/28 14:31:12 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1283 2022/05/29 08:10:00 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1171,6 +1171,7 @@ _MKVARS.yes= \
MKOBJ \
MKPAM MKPERFUSE \
MKPF MKPIC MKPICLIB MKPOSTFIX MKPROFILE \
+ MKPPP \
MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
MKTALK \
