svn commit: r275166 - in projects/building-blocks: . lib lib/libpam/modules share/mk tools/build/options

[Garrett Cooper]

Author: ngie
Date: Thu Nov 27 04:16:47 2014
New Revision: 275166
URL: https://svnweb.freebsd.org/changeset/base/275166

Log:
  Implement MK_RADIUS_SUPPORT to make libradius and assorted support optional

Added:
  projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT   (contents, props changed)
Modified:
  projects/building-blocks/Makefile.inc1
  projects/building-blocks/lib/Makefile
  projects/building-blocks/lib/libpam/modules/modules.inc
  projects/building-blocks/share/mk/src.opts.mk

Modified: projects/building-blocks/Makefile.inc1
==============================================================================
--- projects/building-blocks/Makefile.inc1	Thu Nov 27 04:01:39 2014	(r275165)
+++ projects/building-blocks/Makefile.inc1	Thu Nov 27 04:16:47 2014	(r275166)
@@ -1605,7 +1605,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
-		lib/libradius lib/libsbuf lib/libtacplus \
+		${_lib_libradius} lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libuutil} \
@@ -1628,6 +1628,10 @@ lib/libgeom__L: lib/libexpat__L
 _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: projects/building-blocks/lib/Makefile
==============================================================================
--- projects/building-blocks/lib/Makefile	Thu Nov 27 04:01:39 2014	(r275165)
+++ projects/building-blocks/lib/Makefile	Thu Nov 27 04:16:47 2014	(r275166)
@@ -80,7 +80,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libpmc} \
 	${_libproc} \
 	libprocstat \
-	libradius \
+	${_libradius} \
 	librpcsvc \
 	librt \
 	${_librtld_db} \
@@ -140,7 +140,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssap
 SUBDIR_DEPEND_libmagic= libz
 SUBDIR_DEPEND_libmemstat= libkvm
 SUBDIR_DEPEND_libopie= libmd
-SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} 
+SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} 
 SUBDIR_DEPEND_libpjdlog= libutil
 SUBDIR_DEPEND_libprocstat= libkvm libutil
 SUBDIR_DEPEND_libradius= libmd
@@ -269,6 +269,10 @@ _libmp=		libmp
 _libpmc=	libpmc
 .endif
 
+.if ${MK_RADIUS} != "no"
+_libradius=	libradius
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm

Modified: projects/building-blocks/lib/libpam/modules/modules.inc
==============================================================================
--- projects/building-blocks/lib/libpam/modules/modules.inc	Thu Nov 27 04:01:39 2014	(r275165)
+++ projects/building-blocks/lib/libpam/modules/modules.inc	Thu Nov 27 04:16:47 2014	(r275166)
@@ -7,7 +7,9 @@ MODULES		+= pam_chroot
 MODULES		+= pam_deny
 MODULES		+= pam_echo
 MODULES		+= pam_exec
+.if ${MK_FTP} != "no"
 MODULES		+= pam_ftpusers
+.endif
 MODULES		+= pam_group
 MODULES		+= pam_guest
 .if ${MK_KERBEROS} != "no"
@@ -21,7 +23,9 @@ MODULES		+= pam_opie
 MODULES		+= pam_opieaccess
 MODULES		+= pam_passwdqc
 MODULES		+= pam_permit
+.if ${MK_RADIUS} != "no
 MODULES		+= pam_radius
+.endif
 MODULES		+= pam_rhosts
 MODULES		+= pam_rootok
 MODULES		+= pam_securetty

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Thu Nov 27 04:01:39 2014	(r275165)
+++ projects/building-blocks/share/mk/src.opts.mk	Thu Nov 27 04:16:47 2014	(r275166)
@@ -136,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \
     PORTSNAP \
     PPP \
     QUOTAS \
+    RADIUS_SUPPORT \
     RCMDS \
     RBOOTD \
     RCS \
@@ -310,6 +311,10 @@ MK_BLUETOOTH:=	no
 MK_NETGRAPH_SUPPORT:=	no
 .endif
 
+.if ${MK_NETGRAPH_SUPPORT} == "no"
+MK_RADIUS_SUPPORT:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no

Added: projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT	Thu Nov 27 04:16:47 2014	(r275166)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build radius support into various applications, like
+.Xr pam_radius 8
+and
+.Xr ppp 8 .