diff options
| author | Sukneet Basuta | 2012-07-07 12:25:46 -0400 |
|---|---|---|
| committer | Sukneet Basuta | 2012-07-07 12:25:46 -0400 |
| commit | 7863c993cae5487870ab7307551069f2340fb975 (patch) | |
| tree | eedd6a21a778a0c24872f42a30469c78a34e1264 /security-libs | |
| parent | d43334d6fb648b190aedfa9c50d5e3df827c7f6e (diff) | |
linux-pam: switch to optional_depends for selinux to pass proper flags
* CONFIGURE: remove config_query for SELINUX
* INSTALL: fix commented out check for libselinux in case someone needs it
Diffstat (limited to 'security-libs')
| -rwxr-xr-x | security-libs/linux-pam/CONFIGURE | 1 | ||||
| -rwxr-xr-x | security-libs/linux-pam/DEPENDS | 5 | ||||
| -rw-r--r-- | security-libs/linux-pam/HISTORY | 6 | ||||
| -rwxr-xr-x | security-libs/linux-pam/INSTALL | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/security-libs/linux-pam/CONFIGURE b/security-libs/linux-pam/CONFIGURE index 7be2652cb4..2d2a55e032 100755 --- a/security-libs/linux-pam/CONFIGURE +++ b/security-libs/linux-pam/CONFIGURE @@ -13,5 +13,4 @@ config_query PAM_CHKPWD_SUID \ $chkpwd_suid_default && config_query PAM_SECTTY "Install a default /etc/securetty?" n && -config_query PAM_SELINUX "Enable selinux support?" n && config_query PAM_DOCS "Build documentation?" n diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS index 624982e62c..dac999b7e7 100755 --- a/security-libs/linux-pam/DEPENDS +++ b/security-libs/linux-pam/DEPENDS @@ -4,13 +4,10 @@ depends cracklib && depends gnupg && depends smgl-fhs && -if [ "${PAM_SELINUX}" == "y" ]; then - depends libselinux -fi && - if [ "${PAM_DOCS}" == "y" ]; then depends texlive && depends linuxdoc-tools fi +optional_depends libselinux "--enable-selinux" "--disable-selinux" "for selinux support" && optional_depends libprelude "--enable-prelude" "--disable-prelude" "for prelude ids support" diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY index a06b8d7171..de5fc5c271 100644 --- a/security-libs/linux-pam/HISTORY +++ b/security-libs/linux-pam/HISTORY @@ -1,3 +1,9 @@ +2012-07-07 Sukneet Basuta <sukneet@sourcemage.org> + * CONFIGURE: remove config_query for SELINUX + * DEPENDS: switch to optional_depends for selinux to pass proper flags + * INSTALL: fix commented out check for libselinux in case + someone needs it + 2011-12-25 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.1.5, SECURITY_PATCH=3 http://www.redhat.com/archives/pam-list/2011-October/msg00019.html diff --git a/security-libs/linux-pam/INSTALL b/security-libs/linux-pam/INSTALL index 05d02bc0a2..131a9f33bb 100755 --- a/security-libs/linux-pam/INSTALL +++ b/security-libs/linux-pam/INSTALL @@ -6,7 +6,7 @@ fi && # this is a BUG, the SA should decide if/when selinux is configured # properly. Activating it before that breaks login, which is BAD. -#if [ "$PAM_SELINUX" == "y" ]; then +#if is_depends_enabled $SPELL libselinux; then # echo "session required pam_selinux.so multiple" >> /etc/pam.d/login #fi && |