Author: ngie
Date: Tue Mar 24 07:11:54 2015
New Revision: 280421
URL: https://svnweb.freebsd.org/changeset/base/280421
Log:
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
Added:
stable/9/tools/build/options/WITHOUT_BOOTPARAMD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPARAMD
stable/9/tools/build/options/WITHOUT_BOOTPD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPD
stable/9/tools/build/options/WITHOUT_FILE
- copied unchanged from r279506, stable/10/tools/build/options/WITHOUT_FILE
stable/9/tools/build/options/WITHOUT_FINGER
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_FINGER
stable/9/tools/build/options/WITHOUT_FTP
- copied unchanged from r279505, stable/10/tools/build/options/WITHOUT_FTP
stable/9/tools/build/options/WITHOUT_INETD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_INETD
stable/9/tools/build/options/WITHOUT_RADIUS_SUPPORT
- copied unchanged from r278569,
stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT
stable/9/tools/build/options/WITHOUT_RBOOTD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_RBOOTD
stable/9/tools/build/options/WITHOUT_TCP_WRAPPERS
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS
stable/9/tools/build/options/WITHOUT_TFTP
- copied unchanged from r279505, stable/10/tools/build/options/WITHOUT_TFTP
stable/9/tools/build/options/WITHOUT_TIMED
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_TIMED
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/etc/Makefile
stable/9/lib/Makefile (contents, props changed)
stable/9/lib/libpam/modules/modules.inc
stable/9/libexec/Makefile
stable/9/share/mk/bsd.own.mk
stable/9/usr.bin/Makefile
stable/9/usr.sbin/Makefile (contents, props changed)
stable/9/usr.sbin/ppp/Makefile
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libpam/ (props changed)
stable/9/share/ (props changed)
stable/9/share/mk/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
stable/9/tools/build/options/ (props changed)
stable/9/usr.bin/ (props changed)
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/ppp/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/Makefile.inc1 Tue Mar 24 07:11:54 2015 (r280421)
@@ -1391,7 +1391,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
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
_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
Modified: stable/9/etc/Makefile
==============================================================================
--- stable/9/etc/Makefile Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/etc/Makefile Tue Mar 24 07:11:54 2015 (r280421)
@@ -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
Modified: stable/9/lib/Makefile
==============================================================================
--- stable/9/lib/Makefile Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/lib/Makefile Tue Mar 24 07:11:54 2015 (r280421)
@@ -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
Modified: stable/9/lib/libpam/modules/modules.inc
==============================================================================
--- stable/9/lib/libpam/modules/modules.inc Tue Mar 24 06:59:41 2015
(r280420)
+++ stable/9/lib/libpam/modules/modules.inc Tue Mar 24 07:11:54 2015
(r280421)
@@ -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
Modified: stable/9/libexec/Makefile
==============================================================================
--- stable/9/libexec/Makefile Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/libexec/Makefile Tue Mar 24 07:11:54 2015 (r280421)
@@ -4,15 +4,11 @@
.include <bsd.own.mk>
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 <bsd.subdir.mk>
Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk Tue Mar 24 06:59:41 2015
(r280420)
+++ stable/9/share/mk/bsd.own.mk Tue Mar 24 07:11:54 2015
(r280421)
@@ -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 \
Copied: stable/9/tools/build/options/WITHOUT_BOOTPARAMD (from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPARAMD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_BOOTPARAMD Tue Mar 24 07:11:54
2015 (r280421, copy of r279505,
stable/10/tools/build/options/WITHOUT_BOOTPARAMD)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootparamd 8 .
Copied: stable/9/tools/build/options/WITHOUT_BOOTPD (from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_BOOTPD Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/tools/build/options/WITHOUT_BOOTPD)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootpd 8 .
Copied: stable/9/tools/build/options/WITHOUT_FILE (from r279506,
stable/10/tools/build/options/WITHOUT_FILE)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_FILE Tue Mar 24 07:11:54 2015
(r280421, copy of r279506, stable/10/tools/build/options/WITHOUT_FILE)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr file 1
+and related programs.
Copied: stable/9/tools/build/options/WITHOUT_FINGER (from r279505,
stable/10/tools/build/options/WITHOUT_FINGER)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_FINGER Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/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/9/tools/build/options/WITHOUT_FTP (from r279505,
stable/10/tools/build/options/WITHOUT_FTP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_FTP Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/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/9/tools/build/options/WITHOUT_INETD (from r279505,
stable/10/tools/build/options/WITHOUT_INETD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_INETD Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/tools/build/options/WITHOUT_INETD)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr inetd 8 .
Copied: stable/9/tools/build/options/WITHOUT_RADIUS_SUPPORT (from r278569,
stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_RADIUS_SUPPORT Tue Mar 24 07:11:54
2015 (r280421, copy of r278569,
stable/10/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 .
Copied: stable/9/tools/build/options/WITHOUT_RBOOTD (from r279505,
stable/10/tools/build/options/WITHOUT_RBOOTD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_RBOOTD Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/tools/build/options/WITHOUT_RBOOTD)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr rbootd 8 .
Copied: stable/9/tools/build/options/WITHOUT_TCP_WRAPPERS (from r279505,
stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_TCP_WRAPPERS Tue Mar 24 07:11:54
2015 (r280421, copy of r279505,
stable/10/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/9/tools/build/options/WITHOUT_TFTP (from r279505,
stable/10/tools/build/options/WITHOUT_TFTP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_TFTP Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/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/9/tools/build/options/WITHOUT_TIMED (from r279505,
stable/10/tools/build/options/WITHOUT_TIMED)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_TIMED Tue Mar 24 07:11:54 2015
(r280421, copy of r279505, stable/10/tools/build/options/WITHOUT_TIMED)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr timed 8 .
Modified: stable/9/usr.bin/Makefile
==============================================================================
--- stable/9/usr.bin/Makefile Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/usr.bin/Makefile Tue Mar 24 07:11:54 2015 (r280421)
@@ -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
Modified: stable/9/usr.sbin/Makefile
==============================================================================
--- stable/9/usr.sbin/Makefile Tue Mar 24 06:59:41 2015 (r280420)
+++ stable/9/usr.sbin/Makefile Tue Mar 24 07:11:54 2015 (r280421)
@@ -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
Modified: stable/9/usr.sbin/ppp/Makefile
==============================================================================
--- stable/9/usr.sbin/ppp/Makefile Tue Mar 24 06:59:41 2015
(r280420)
+++ stable/9/usr.sbin/ppp/Makefile Tue Mar 24 07:11:54 2015
(r280421)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
