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 624982e..dac999b 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 a06b8d7..de5fc5c 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,9 @@
+2012-07-07 Sukneet Basuta <sukneet AT 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 AT 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 05d02bc..131a9f3 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 &&
[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (7863c993cae5487870ab7307551069f2340fb975),
Sukneet Basuta, 07/07/2012