svn commit: r278182 - in head: . lib lib/libpam/modules share/mk tools/build/options usr.sbin/ppp

[Garrett Cooper]

Author: ngie
Date: Wed Feb  4 06:53:45 2015
New Revision: 278182
URL: https://svnweb.freebsd.org/changeset/base/278182

Log:
  Conditionalize building radius support into libpam, ppp, etc via
  MK_RADIUS_SUPPORT
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/tools/build/options/WITHOUT_RADIUS_SUPPORT   (contents, props changed)
Modified:
  head/Makefile.inc1
  head/lib/Makefile
  head/lib/libpam/modules/modules.inc
  head/share/mk/src.opts.mk
  head/usr.sbin/ppp/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Feb  4 04:55:04 2015	(r278181)
+++ head/Makefile.inc1	Wed Feb  4 06:53:45 2015	(r278182)
@@ -1634,7 +1634,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} \
@@ -1657,6 +1657,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: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Wed Feb  4 04:55:04 2015	(r278181)
+++ head/lib/Makefile	Wed Feb  4 06:53:45 2015	(r278182)
@@ -82,7 +82,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libpmc} \
 	${_libproc} \
 	libprocstat \
-	libradius \
+	${_libradius} \
 	librpcsvc \
 	librt \
 	${_librtld_db} \
@@ -142,7 +142,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
@@ -286,6 +286,10 @@ _libmp=		libmp
 _libpmc=	libpmc
 .endif
 
+.if ${MK_RADIUS_SUPPORT} != "no"
+_libradius=	libradius
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm

Modified: head/lib/libpam/modules/modules.inc
==============================================================================
--- head/lib/libpam/modules/modules.inc	Wed Feb  4 04:55:04 2015	(r278181)
+++ head/lib/libpam/modules/modules.inc	Wed Feb  4 06:53:45 2015	(r278182)
@@ -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: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Wed Feb  4 04:55:04 2015	(r278181)
+++ head/share/mk/src.opts.mk	Wed Feb  4 06:53:45 2015	(r278182)
@@ -135,6 +135,7 @@ __DEFAULT_YES_OPTIONS = \
     PORTSNAP \
     PPP \
     QUOTAS \
+    RADIUS_SUPPORT \
     RCMDS \
     RCS \
     RESCUE \

Added: head/tools/build/options/WITHOUT_RADIUS_SUPPORT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_RADIUS_SUPPORT	Wed Feb  4 06:53:45 2015	(r278182)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build radius support into various applications, like
+.Xr pam_radius 8
+and
+.Xr ppp 8 .

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Wed Feb  4 04:55:04 2015	(r278181)
+++ head/usr.sbin/ppp/Makefile	Wed Feb  4 06:53:45 2015	(r278182)
@@ -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=554