d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the following options to enable/disable several features in the base system

Browse Source 
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

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-02-04 10:19:32 +00:00
parent 4025433eb2
commit 11981695fc
14 changed files with 104 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/Makefile
View File

@ -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

30
libexec/Makefile
View File

@ -5,18 +5,14 @@
SUBDIR= ${_atf} \
${_atrun} \
bootpd \
${_casper} \
${_comsat} \
${_dma} \
${_dma-mbox-create} \
fingerd \
ftpd \
getty \
${_mail.local} \
${_mknetid} \
${_pppoed} \
rbootd \
revnetgroup \
${_rlogind} \
rpc.rquotad \
@ -28,10 +24,8 @@ SUBDIR= ${_atf} \
${_rtld-elf} \
save-entropy \
${_smrsh} \
tcpd \
${_telnetd} \
${_tests} \
tftpd \
${_tftp-proxy} \
ulog-helper \
${_ypxfr}
@ -40,10 +34,22 @@ SUBDIR= ${_atf} \
_atrun= atrun
.endif
.if ${MK_BOOTPD} != "no"
SUBDIR+= bootpd
.endif
.if ${MK_CASPER} != "no"
_casper= casper
.endif
.if ${MK_FINGER} != "no"
SUBDIR+= fingerd
.endif
.if ${MK_FTP} != "no"
SUBDIR+= ftpd
.endif
.if ${MK_MAIL} != "no"
_comsat= comsat
.endif
@ -70,6 +76,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
@ -84,10 +94,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

9
share/mk/src.opts.mk
View File

@ -58,6 +58,8 @@ __DEFAULT_YES_OPTIONS = \
BINUTILS_BOOTSTRAP \
BLUETOOTH \
BOOT \
BOOTPARAMD \
BOOTPD \
BSD_CPIO \
BSDINSTALL \
BSNMP \
@ -81,11 +83,13 @@ __DEFAULT_YES_OPTIONS = \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
FINGER \
FLOPPY \
FMTREE \
FORTH \
FP_LIBC \
FREEBSD_UPDATE \
FTP \
GAMES \
GCOV \
GDB \
@ -100,6 +104,7 @@ __DEFAULT_YES_OPTIONS = \
ICONV \
INET \
INET6 \
INETD \
IPFILTER \
IPFW \
ISCSI \
@ -137,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \
QUOTAS \
RADIUS_SUPPORT \
RCMDS \
RBOOTD \
RCS \
RESCUE \
ROUTED \
@ -151,10 +157,13 @@ __DEFAULT_YES_OPTIONS = \
SYSCONS \
SYSINSTALL \
TALK \
TCP_WRAPPERS \
TCSH \
TELNET \
TESTS \
TEXTPROC \
TFTP \
TIMED \
UNBOUND \
USB \
UTMPX \

3
tools/build/options/WITHOUT_BOOTPARAMD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr bootparamd 8 .

3
tools/build/options/WITHOUT_BOOTPD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr bootpd 8 .

5
tools/build/options/WITHOUT_FINGER Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr finger 1
and
.Xr fingerd 8 .

5
tools/build/options/WITHOUT_FTP Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr ftp 1
and
.Xr ftpd 8 .

3
tools/build/options/WITHOUT_INETD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build
.Xr inetd 8 .

3
tools/build/options/WITHOUT_RBOOTD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr rbootd 8 .

4
tools/build/options/WITHOUT_TCP_WRAPPERS Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build or install
.Xr tcpd 8 ,
and related utilities.

5
tools/build/options/WITHOUT_TFTP Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr tftp 1
and
.Xr tftpd 8 .

3
tools/build/options/WITHOUT_TIMED Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr timed 8 .

15
usr.bin/Makefile
View File

@ -50,12 +50,10 @@ SUBDIR= ${_addr2line} \
fetch \
file \
find \
finger \
fmt \
fold \
fstat \
fsync \
ftp \
gcore \
gencat \
getconf \
@ -166,7 +164,6 @@ SUBDIR= ${_addr2line} \
tcopy \
tee \
${_tests} \
tftp \
time \
timeout \
tip \
@ -249,10 +246,18 @@ _size= size
_strings= strings
.endif
.if ${MK_FINGER} != "no"
SUBDIR+= finger
.endif
.if ${MK_FMAKE} != "no"
SUBDIR+= make
.endif
.if ${MK_FTP} != "no"
SUBDIR+= ftp
.endif
.if ${MK_GPL_DTC} != "yes"
SUBDIR+= dtc
.endif
@ -365,6 +370,10 @@ SUBDIR+= colcrt
SUBDIR+= ul
.endif
.if ${MK_TFTP} != "no"
SUBDIR+= tftp
.endif
.if ${MK_TOOLCHAIN} != "no"
SUBDIR+= ar
SUBDIR+= c89

22
usr.sbin/Makefile
View File

@ -6,7 +6,6 @@
SUBDIR= adduser \
arp \
binmiscctl \
bootparamd \
bsdconfig \
cdcontrol \
chkgrp \
@ -34,7 +33,6 @@ SUBDIR= adduser \
gstat \
i2c \
ifmcstat \
inetd \
iostat \
kldxref \
mailwrapper \
@ -82,11 +80,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
@ -179,6 +178,10 @@ SUBDIR+= rtsold
SUBDIR+= traceroute6
.endif
.if ${MK_INETD} != "no"
SUBDIR+= inetd
.endif
.if ${MK_IPFW} != "no"
SUBDIR+= ipfwpcap
.endif
@ -300,10 +303,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