Date: Wed, 11 Feb 2015 08:52:30 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278569 - in stable/10: . lib lib/libpam/modules share/mk tools/build/options usr.sbin/ppp Message-ID: <201502110852.t1B8qUfk059454@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 11 08:52:29 2015 New Revision: 278569 URL: https://svnweb.freebsd.org/changeset/base/278569 Log: MFC r278182: r278182: Conditionalize building radius support into libpam, ppp, etc via MK_RADIUS_SUPPORT Sponsored by: EMC / Isilon Storage Division Added: stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT - copied unchanged from r278182, head/tools/build/options/WITHOUT_RADIUS_SUPPORT Modified: stable/10/Makefile.inc1 stable/10/lib/Makefile stable/10/lib/libpam/modules/modules.inc stable/10/share/mk/bsd.own.mk stable/10/usr.sbin/ppp/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Wed Feb 11 08:33:22 2015 (r278568) +++ stable/10/Makefile.inc1 Wed Feb 11 08:52:29 2015 (r278569) @@ -1537,7 +1537,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 \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1567,6 +1567,10 @@ _lib_atf= lib/atf _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/10/lib/Makefile ============================================================================== --- stable/10/lib/Makefile Wed Feb 11 08:33:22 2015 (r278568) +++ stable/10/lib/Makefile Wed Feb 11 08:52:29 2015 (r278569) @@ -75,7 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libpmc} \ ${_libproc} \ libprocstat \ - libradius \ + ${_libradius} \ librpcsvc \ librt \ ${_librtld_db} \ @@ -131,7 +131,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 @@ -258,6 +258,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm Modified: stable/10/lib/libpam/modules/modules.inc ============================================================================== --- stable/10/lib/libpam/modules/modules.inc Wed Feb 11 08:33:22 2015 (r278568) +++ stable/10/lib/libpam/modules/modules.inc Wed Feb 11 08:52:29 2015 (r278569) @@ -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/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Wed Feb 11 08:33:22 2015 (r278568) +++ stable/10/share/mk/bsd.own.mk Wed Feb 11 08:52:29 2015 (r278569) @@ -341,6 +341,7 @@ __DEFAULT_YES_OPTIONS = \ PPP \ PROFILE \ QUOTAS \ + RADIUS_SUPPORT \ RCMDS \ RCS \ RESCUE \ Copied: stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT (from r278182, head/tools/build/options/WITHOUT_RADIUS_SUPPORT) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT Wed Feb 11 08:52:29 2015 (r278569, copy of r278182, head/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 . Modified: stable/10/usr.sbin/ppp/Makefile ============================================================================== --- stable/10/usr.sbin/ppp/Makefile Wed Feb 11 08:33:22 2015 (r278568) +++ stable/10/usr.sbin/ppp/Makefile Wed Feb 11 08:52:29 2015 (r278569) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502110852.t1B8qUfk059454>