Date: Sun, 1 Mar 2015 22:03:53 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r279505 - in stable/10: etc libexec share/mk tools/build/options usr.bin usr.sbin Message-ID: <201503012203.t21M3rwL004826@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Mar 1 22:03:52 2015 New Revision: 279505 URL: https://svnweb.freebsd.org/changeset/base/279505 Log: MFC r278192: Add the following options to enable/disable several features in the base system WITHOUT_BOOTPARAMD - bootparamd WITHOUT_BOOTPD - bootpd WITHOUT_FINGER - finger, fingerd WITHOUT_FTP - ftp, ftpd WITHOUT_INETD - inetd WITHOUT_RBOOTD - rbootd WITHOUT_TCP_WRAPPERS - tcpd, et al WITHOUT_TFTP - tftp, tftp-server WITHOUT_TIMED - timed Sponsored by: EMC / Isilon Storage Division Added: stable/10/tools/build/options/WITHOUT_BOOTPARAMD - copied unchanged from r278192, head/tools/build/options/WITHOUT_BOOTPARAMD stable/10/tools/build/options/WITHOUT_BOOTPD - copied unchanged from r278192, head/tools/build/options/WITHOUT_BOOTPD stable/10/tools/build/options/WITHOUT_FINGER - copied unchanged from r278192, head/tools/build/options/WITHOUT_FINGER stable/10/tools/build/options/WITHOUT_FTP - copied unchanged from r278192, head/tools/build/options/WITHOUT_FTP stable/10/tools/build/options/WITHOUT_INETD - copied unchanged from r278192, head/tools/build/options/WITHOUT_INETD stable/10/tools/build/options/WITHOUT_RBOOTD - copied unchanged from r278192, head/tools/build/options/WITHOUT_RBOOTD stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS - copied unchanged from r278192, head/tools/build/options/WITHOUT_TCP_WRAPPERS stable/10/tools/build/options/WITHOUT_TFTP - copied unchanged from r278192, head/tools/build/options/WITHOUT_TFTP stable/10/tools/build/options/WITHOUT_TIMED - copied unchanged from r278192, head/tools/build/options/WITHOUT_TIMED Modified: stable/10/etc/Makefile stable/10/libexec/Makefile stable/10/share/mk/bsd.own.mk stable/10/usr.bin/Makefile stable/10/usr.sbin/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/Makefile ============================================================================== --- stable/10/etc/Makefile Sun Mar 1 21:47:38 2015 (r279504) +++ stable/10/etc/Makefile Sun Mar 1 22:03:52 2015 (r279505) @@ -21,13 +21,11 @@ BIN1= crontab \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -101,6 +99,14 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif Modified: stable/10/libexec/Makefile ============================================================================== --- stable/10/libexec/Makefile Sun Mar 1 21:47:38 2015 (r279504) +++ stable/10/libexec/Makefile Sun Mar 1 22:03:52 2015 (r279505) @@ -5,16 +5,12 @@ SUBDIR= ${_atf} \ ${_atrun} \ - bootpd \ ${_comsat} \ - fingerd \ - ftpd \ getty \ ${_hyperv} \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ - rbootd \ revnetgroup \ ${_rlogind} \ rpc.rquotad \ @@ -26,10 +22,8 @@ SUBDIR= ${_atf} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - tcpd \ ${_telnetd} \ ${_tests} \ - tftpd \ ${_tftp-proxy} \ ulog-helper \ ${_ypxfr} @@ -38,6 +32,18 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif +.if ${MK_BOOTPD} != "no" +SUBDIR+= bootpd +.endif + +.if ${MK_FINGER} != "no" +SUBDIR+= fingerd +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftpd +.endif + .if ${MK_MAIL} != "no" _comsat= comsat .endif @@ -63,6 +69,10 @@ _tftp-proxy= tftp-proxy _rtld-elf= rtld-elf .endif +.if ${MK_RBOOTD} != "no" +SUBDIR+= rbootd +.endif + .if ${MK_RCMDS} != "no" _rlogind= rlogind _rshd= rshd @@ -77,10 +87,18 @@ _smrsh= smrsh SUBDIR+= talkd .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpd +.endif + .if ${MK_TELNET} != "no" _telnetd= telnetd .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftpd +.endif + .if ${MK_TESTS} != "no" _atf= atf _tests= tests Modified: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Sun Mar 1 21:47:38 2015 (r279504) +++ stable/10/share/mk/bsd.own.mk Sun Mar 1 22:03:52 2015 (r279505) @@ -260,6 +260,8 @@ __DEFAULT_YES_OPTIONS = \ BLUETOOTH \ BMAKE \ BOOT \ + BOOTPARAMD \ + BOOTPD \ BSD_CPIO \ BSDINSTALL \ BSNMP \ @@ -278,12 +280,14 @@ __DEFAULT_YES_OPTIONS = \ ED_CRYPTO \ EE \ EXAMPLES \ + FINGER \ FLOPPY \ FMTREE \ FORMAT_EXTENSIONS \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ + FTP \ GAMES \ GCOV \ GDB \ @@ -297,6 +301,7 @@ __DEFAULT_YES_OPTIONS = \ ICONV \ INET \ INET6 \ + INETD \ INFO \ INSTALLLIB \ IPFILTER \ @@ -344,6 +349,7 @@ __DEFAULT_YES_OPTIONS = \ PROFILE \ QUOTAS \ RADIUS_SUPPORT \ + RBOOTD \ RCMDS \ RCS \ RESCUE \ @@ -361,8 +367,11 @@ __DEFAULT_YES_OPTIONS = \ SYSINSTALL \ TALK \ TCSH \ + TCP_WRAPPERS \ TELNET \ TEXTPROC \ + TFTP \ + TIMED \ TOOLCHAIN \ UNBOUND \ USB \ Copied: stable/10/tools/build/options/WITHOUT_BOOTPARAMD (from r278192, head/tools/build/options/WITHOUT_BOOTPARAMD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_BOOTPARAMD Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_BOOTPARAMD) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootparamd 8 . Copied: stable/10/tools/build/options/WITHOUT_BOOTPD (from r278192, head/tools/build/options/WITHOUT_BOOTPD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_BOOTPD Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_BOOTPD) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootpd 8 . Copied: stable/10/tools/build/options/WITHOUT_FINGER (from r278192, head/tools/build/options/WITHOUT_FINGER) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_FINGER Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_FINGER) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . Copied: stable/10/tools/build/options/WITHOUT_FTP (from r278192, head/tools/build/options/WITHOUT_FTP) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_FTP Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_FTP) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . Copied: stable/10/tools/build/options/WITHOUT_INETD (from r278192, head/tools/build/options/WITHOUT_INETD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_INETD Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_INETD) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . Copied: stable/10/tools/build/options/WITHOUT_RBOOTD (from r278192, head/tools/build/options/WITHOUT_RBOOTD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_RBOOTD Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_RBOOTD) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr rbootd 8 . Copied: stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS (from r278192, head/tools/build/options/WITHOUT_TCP_WRAPPERS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_TCP_WRAPPERS) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tcpd 8 , +and related utilities. Copied: stable/10/tools/build/options/WITHOUT_TFTP (from r278192, head/tools/build/options/WITHOUT_TFTP) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_TFTP Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_TFTP) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . Copied: stable/10/tools/build/options/WITHOUT_TIMED (from r278192, head/tools/build/options/WITHOUT_TIMED) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_TIMED Sun Mar 1 22:03:52 2015 (r279505, copy of r278192, head/tools/build/options/WITHOUT_TIMED) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr timed 8 . Modified: stable/10/usr.bin/Makefile ============================================================================== --- stable/10/usr.bin/Makefile Sun Mar 1 21:47:38 2015 (r279504) +++ stable/10/usr.bin/Makefile Sun Mar 1 22:03:52 2015 (r279505) @@ -47,12 +47,10 @@ SUBDIR= alias \ fetch \ file \ find \ - finger \ fmt \ fold \ fstat \ fsync \ - ftp \ gcore \ gencat \ getconf \ @@ -159,7 +157,6 @@ SUBDIR= alias \ tcopy \ tee \ ${_tests} \ - tftp \ time \ tip \ top \ @@ -233,6 +230,14 @@ _clang= clang SUBDIR+= ee .endif +.if ${MK_FINGER} != "no" +SUBDIR+= finger +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftp +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif @@ -353,6 +358,10 @@ SUBDIR+= colcrt SUBDIR+= ul .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftp +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 Modified: stable/10/usr.sbin/Makefile ============================================================================== --- stable/10/usr.sbin/Makefile Sun Mar 1 21:47:38 2015 (r279504) +++ stable/10/usr.sbin/Makefile Sun Mar 1 22:03:52 2015 (r279505) @@ -6,7 +6,6 @@ SUBDIR= adduser \ arp \ binmiscctl \ - bootparamd \ bsdconfig \ cdcontrol \ chkgrp \ @@ -35,7 +34,6 @@ SUBDIR= adduser \ gstat \ i2c \ ifmcstat \ - inetd \ iostat \ kldxref \ mailwrapper \ @@ -83,11 +81,8 @@ SUBDIR= adduser \ spray \ syslogd \ sysrc \ - tcpdchk \ - tcpdmatch \ tcpdrop \ tcpdump \ - timed \ traceroute \ trpt \ tzsetup \ @@ -131,6 +126,10 @@ SUBDIR+= autofs SUBDIR+= bluetooth .endif +.if ${MK_BOOTPARAMD} != "no" +SUBDIR+= bootparamd +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif @@ -180,6 +179,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif @@ -304,10 +307,19 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpdchk +SUBDIR+= tcpdmatch +.endif + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif +.if ${MK_TIMED} != "no" +SUBDIR+= timed +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503012203.t21M3rwL004826>