[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4ce4f16fa84fd1c150ded90b6211ed67c2370205)

Vlad Glagolev scm at sourcemage.org
Fri Feb 6 12:14:06 EST 2009


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 collab/openldap/HISTORY         |    3 +++
 collab/openldap/PRE_SUB_DEPENDS |    5 +++++
 collab/openldap/SUB_DEPENDS     |    6 ++++++
 utils/sudo/DEPENDS              |   11 +++++++++++
 utils/sudo/HISTORY              |    4 ++++
 5 files changed, 29 insertions(+)

New commits:
commit 4ce4f16fa84fd1c150ded90b6211ed67c2370205
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sudo: needs OpenLDAP with cyrus-sasl support enabled

commit ad2c9f7d9a6cad69dec1e32e343064a86639f486
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openldap: added cyrus-sasl subdep

diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index bcc12d5..ed2e628 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,6 @@
+2009-02-06 Vlad Glagolev <stealth at sourcemage.org>
+	* [PRE_]SUB_DEPENDS: added cyrus-sasl subdep
+
 2008-11-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.13
 
diff --git a/collab/openldap/PRE_SUB_DEPENDS b/collab/openldap/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..bcf947c
--- /dev/null
+++ b/collab/openldap/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  SASL) is_depends_enabled $SPELL cyrus-sasl;;
+     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+        return 1;;
+esac
diff --git a/collab/openldap/SUB_DEPENDS b/collab/openldap/SUB_DEPENDS
new file mode 100755
index 0000000..69b3687
--- /dev/null
+++ b/collab/openldap/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  SASL) message "OpenLDAP with SASL support requested, forcing cyrus-sasl dependency" &&
+        depends cyrus-sasl "--with-cyrus-sasl";;
+     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+        return 1;;
+esac
diff --git a/utils/sudo/DEPENDS b/utils/sudo/DEPENDS
index 02d9788..0b48547 100755
--- a/utils/sudo/DEPENDS
+++ b/utils/sudo/DEPENDS
@@ -1,8 +1,14 @@
+message "NOTE: sudo needs OpenLDAP with cyrus-sasl support enabled" &&
+
 optional_depends openldap \
                  "--with-ldap" \
                  "--without-ldap" \
                  "for LDAP support" &&
 
+if is_depends_enabled $SPELL openldap; then
+  depends -sub SASL openldap
+fi &&
+
 optional_depends libselinux \
                  "--with-selinux" \
                  "--without-selinux" \
@@ -13,4 +19,9 @@ optional_depends linux-pam \
                  "--without-pam" \
                  "for optional pluggable authentication" &&
 
+optional_depends SENDMAIL \
+                 "--with-sendmail" \
+                 "--without-sendmail" \
+                 "for Sendmail usage" &&
+
 suggest_depends TEXT-EDITOR
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 2703094..0123c6a 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,7 @@
+2009-02-05 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added sendmail as opt dep; openldap is available only with
+	  cyrus-sasl enabled
+
 2008-12-20 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.7.0
 	* DEPENDS: added missing deps; optional->suggest for editor



More information about the SM-Commit mailing list