From 9effbce036ef5b4817be06fc32d8884000b7b06c Mon Sep 17 00:00:00 2001 From: ngie Date: Tue, 24 Mar 2015 07:11:54 +0000 Subject: [PATCH] MFstable/10 r278569,r279505,r279506: r278569: MFC r278182: r278182: Conditionalize building radius support into libpam, ppp, etc via MK_RADIUS_SUPPORT Sponsored by: EMC / Isilon Storage Division r279505: 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 r279506: MFC r278193: Add MK_FILE to control whether or not to build file(1), libmagic(3), etc Sponsored by: EMC / Isilon Storage Division git-svn-id: svn://svn.freebsd.org/base/stable/9@280421 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- Makefile.inc1 | 6 ++++- etc/Makefile | 10 ++++++-- lib/Makefile | 12 +++++++-- lib/libpam/modules/modules.inc | 2 ++ libexec/Makefile | 30 +++++++++++++++++----- share/mk/bsd.own.mk | 11 ++++++++ tools/build/options/WITHOUT_BOOTPARAMD | 3 +++ tools/build/options/WITHOUT_BOOTPD | 3 +++ tools/build/options/WITHOUT_FILE | 4 +++ tools/build/options/WITHOUT_FINGER | 5 ++++ tools/build/options/WITHOUT_FTP | 5 ++++ tools/build/options/WITHOUT_INETD | 3 +++ tools/build/options/WITHOUT_RADIUS_SUPPORT | 5 ++++ tools/build/options/WITHOUT_RBOOTD | 3 +++ tools/build/options/WITHOUT_TCP_WRAPPERS | 4 +++ tools/build/options/WITHOUT_TFTP | 5 ++++ tools/build/options/WITHOUT_TIMED | 3 +++ usr.bin/Makefile | 28 ++++++++++++++------ usr.sbin/Makefile | 22 ++++++++++++---- usr.sbin/ppp/Makefile | 3 +++ 20 files changed, 143 insertions(+), 24 deletions(-) create mode 100644 tools/build/options/WITHOUT_BOOTPARAMD create mode 100644 tools/build/options/WITHOUT_BOOTPD create mode 100644 tools/build/options/WITHOUT_FILE create mode 100644 tools/build/options/WITHOUT_FINGER create mode 100644 tools/build/options/WITHOUT_FTP create mode 100644 tools/build/options/WITHOUT_INETD create mode 100644 tools/build/options/WITHOUT_RADIUS_SUPPORT create mode 100644 tools/build/options/WITHOUT_RBOOTD create mode 100644 tools/build/options/WITHOUT_TCP_WRAPPERS create mode 100644 tools/build/options/WITHOUT_TFTP create mode 100644 tools/build/options/WITHOUT_TIMED diff --git a/Makefile.inc1 b/Makefile.inc1 index ab6880156..b17dbb7f4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1391,7 +1391,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libavl} \ ${_cddl_lib_libzfs_core} \ @@ -1403,6 +1403,10 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif diff --git a/etc/Makefile b/etc/Makefile index daae9be6d..428bbe416 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -17,13 +17,11 @@ BIN1= crontab \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -93,6 +91,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 diff --git a/lib/Makefile b/lib/Makefile index 734bc0dc7..c635bade6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -43,7 +43,7 @@ SUBDIR_ORDERED= ${_csu} \ libmd \ ncurses \ ${_libnetgraph} \ - libradius \ + ${_libradius} \ librpcsvc \ libsbuf \ libtacplus \ @@ -82,7 +82,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libjail \ libkiconv \ liblzma \ - libmagic \ + ${_libmagic} \ libmemstat \ ${_libmilter} \ ${_libmp} \ @@ -153,6 +153,10 @@ _libbsnmp= libbsnmp _clang= clang .endif +.if ${MK_FILE} != "no" +_libmagic= libmagic +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif @@ -224,6 +228,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index c570cfd2f..2bddbe250 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -21,7 +21,9 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit +.if ${MK_RADIUS_SUPPORT} != "no" MODULES += pam_radius +.endif MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty diff --git a/libexec/Makefile b/libexec/Makefile index 052a23dfb..bf897a5c0 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -4,15 +4,11 @@ .include SUBDIR= ${_atrun} \ - bootpd \ ${_comsat} \ - fingerd \ - ftpd \ getty \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ - rbootd \ revnetgroup \ ${_rlogind} \ rpc.rquotad \ @@ -24,9 +20,7 @@ SUBDIR= ${_atrun} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - tcpd \ ${_telnetd} \ - tftpd \ ${_tftp-proxy} \ ulog-helper \ ${_ypxfr} @@ -35,6 +29,18 @@ SUBDIR= ${_atrun} \ _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 @@ -56,6 +62,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 @@ -70,8 +80,16 @@ _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 + .include diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6dda65a55..765a15494 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -343,6 +343,8 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS \ BLUETOOTH \ BOOT \ + BOOTPARAMD \ + BOOTPD \ BSD_CPIO \ BSDINSTALL \ BSNMP \ @@ -362,10 +364,13 @@ __DEFAULT_YES_OPTIONS = \ DYNAMICROOT \ EE \ EXAMPLES \ + FILE \ + FINGER \ FLOPPY \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ + FTP \ GAMES \ GCC \ GCOV \ @@ -378,6 +383,7 @@ __DEFAULT_YES_OPTIONS = \ HTML \ INET \ INET6 \ + INETD \ INFO \ INSTALLLIB \ IPFILTER \ @@ -419,6 +425,8 @@ __DEFAULT_YES_OPTIONS = \ PPP \ PROFILE \ QUOTAS \ + RADIUS_SUPPORT \ + RBOOTD \ RCMDS \ RCS \ RESCUE \ @@ -432,8 +440,11 @@ __DEFAULT_YES_OPTIONS = \ SYSCONS \ TALK \ TCSH \ + TCP_WRAPPERS \ TELNET \ TEXTPROC \ + TFTP \ + TIMED \ TOOLCHAIN \ USB \ UTMPX \ diff --git a/tools/build/options/WITHOUT_BOOTPARAMD b/tools/build/options/WITHOUT_BOOTPARAMD new file mode 100644 index 000000000..f9960830f --- /dev/null +++ b/tools/build/options/WITHOUT_BOOTPARAMD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootparamd 8 . diff --git a/tools/build/options/WITHOUT_BOOTPD b/tools/build/options/WITHOUT_BOOTPD new file mode 100644 index 000000000..6733d5a7b --- /dev/null +++ b/tools/build/options/WITHOUT_BOOTPD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootpd 8 . diff --git a/tools/build/options/WITHOUT_FILE b/tools/build/options/WITHOUT_FILE new file mode 100644 index 000000000..636d00a7f --- /dev/null +++ b/tools/build/options/WITHOUT_FILE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr file 1 +and related programs. diff --git a/tools/build/options/WITHOUT_FINGER b/tools/build/options/WITHOUT_FINGER new file mode 100644 index 000000000..7f654083a --- /dev/null +++ b/tools/build/options/WITHOUT_FINGER @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . diff --git a/tools/build/options/WITHOUT_FTP b/tools/build/options/WITHOUT_FTP new file mode 100644 index 000000000..5e0fc8eed --- /dev/null +++ b/tools/build/options/WITHOUT_FTP @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . diff --git a/tools/build/options/WITHOUT_INETD b/tools/build/options/WITHOUT_INETD new file mode 100644 index 000000000..b4fe5dce7 --- /dev/null +++ b/tools/build/options/WITHOUT_INETD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . diff --git a/tools/build/options/WITHOUT_RADIUS_SUPPORT b/tools/build/options/WITHOUT_RADIUS_SUPPORT new file mode 100644 index 000000000..31f5aab01 --- /dev/null +++ b/tools/build/options/WITHOUT_RADIUS_SUPPORT @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . diff --git a/tools/build/options/WITHOUT_RBOOTD b/tools/build/options/WITHOUT_RBOOTD new file mode 100644 index 000000000..f7c33e194 --- /dev/null +++ b/tools/build/options/WITHOUT_RBOOTD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr rbootd 8 . diff --git a/tools/build/options/WITHOUT_TCP_WRAPPERS b/tools/build/options/WITHOUT_TCP_WRAPPERS new file mode 100644 index 000000000..7c4119830 --- /dev/null +++ b/tools/build/options/WITHOUT_TCP_WRAPPERS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tcpd 8 , +and related utilities. diff --git a/tools/build/options/WITHOUT_TFTP b/tools/build/options/WITHOUT_TFTP new file mode 100644 index 000000000..bdb51ac7c --- /dev/null +++ b/tools/build/options/WITHOUT_TFTP @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . diff --git a/tools/build/options/WITHOUT_TIMED b/tools/build/options/WITHOUT_TIMED new file mode 100644 index 000000000..a1f4c6859 --- /dev/null +++ b/tools/build/options/WITHOUT_TIMED @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr timed 8 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 41dbc6ede..cb3a54510 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -44,14 +44,11 @@ SUBDIR= alias \ expand \ false \ fetch \ - file \ find \ - finger \ fmt \ fold \ fstat \ fsync \ - ftp \ gcore \ gencat \ getconf \ @@ -153,7 +150,6 @@ SUBDIR= alias \ tar \ tcopy \ tee \ - tftp \ time \ tip \ top \ @@ -238,6 +234,22 @@ _clang= clang SUBDIR+= ee .endif +.if ${MK_FILE} != "no" +SUBDIR+= file +.endif + +.if ${MK_FINGER} != "no" +SUBDIR+= finger +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftp +.endif + +.if ${MK_GROFF} != "no" +SUBDIR+= vgrind +.endif + .if ${MK_HESIOD} != "no" SUBDIR+= hesinfo .endif @@ -248,10 +260,6 @@ _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif -.if ${MK_GROFF} != "no" -SUBDIR+= vgrind -.endif - .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey @@ -324,6 +332,10 @@ SUBDIR+= colcrt SUBDIR+= ul .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftp +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5ceb56c65..333159df3 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -5,7 +5,6 @@ SUBDIR= adduser \ arp \ - bootparamd \ burncd \ bsdconfig \ cdcontrol \ @@ -33,7 +32,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 \ @@ -149,6 +144,10 @@ SUBDIR+= rndc-confgen SUBDIR+= bluetooth .endif +.if ${MK_BOOTPARAMD} != "no" +SUBDIR+= bootparamd +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif @@ -194,6 +193,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif @@ -313,6 +316,15 @@ SUBDIR+= sendmail SUBDIR+= sysinstall .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpdchk +SUBDIR+= tcpdmatch +.endif + +.if ${MK_TIMED} != "no" +SUBDIR+= timed +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 11003d750..165dc5a27 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -31,6 +31,9 @@ PPP_NO_NETGRAPH= .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif +.if ${MK_RADIUS_SUPPORT} == "no" +PPP_NO_RADIUS= +.endif .if defined(PPP_NO_SUID) BINMODE=550 -- 2.45.0