[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (29c739c4d345a0d520608c4051d32973d3b83a10)

Vlad Glagolev scm at sourcemage.org
Sat Nov 28 08:53:07 EST 2009


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

 collab/openldap/DEPENDS |    6 +++---
 collab/openldap/DETAILS |   11 ++++++++---
 collab/openldap/HISTORY |    5 +++++
 collab/openldap/PREPARE |    3 +++
 4 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 29c739c4d345a0d520608c4051d32973d3b83a10
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openldap: => 2.4.20, added multibranch support

diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index a06fbd6..268dc59 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -3,9 +3,9 @@ depends groff &&
 
 optional_depends  SYSTEM-LOGGER         \
                   '--enable-syslog'     \
-				  '--disable-syslog'    \
-				  'for syslog support'  &&
-                  
+                  '--disable-syslog'    \
+                  'for syslog support'  &&
+
 # TODO add gnutls here if it works, preferably using PROVIDES
 optional_depends  openssl                \
                   '--with-tls'           \
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 47a95ec..6f082a5 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,18 +1,23 @@
            SPELL=openldap
+if [[ $OPENLDAP_BRANCH == stable ]]; then
          VERSION=2.4.19
      SOURCE_HASH=sha512:f802fd91596aba9f406e68797008edaebbcc65f7c0a71088c792fa358553e787b82e087e4e2461a27db3f4ed7dd2fc6ac8dabb8a58788d84406061826651570d
+else
+         VERSION=2.4.20
+     SOURCE_HASH=sha512:2dad0d03c4361c35f54f31e45705b145af110543e628b05c9497e97d91f7d320c927fdff5af4eba4c90148129e9511e8c4efbf35787924d036ef53d655863201
+fi
           SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-      SOURCE_URI=$SPELL-release/$SOURCE
+      SOURCE_URI=$SPELL-$OPENLDAP_BRANCH/$SOURCE
    SOURCE_URL[0]=ftp://ftp.openldap.org/pub/OpenLDAP/$SOURCE_URI
    SOURCE_URL[1]=ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/$SOURCE_URI
    SOURCE_URL[2]=ftp://it.openldap.org/pub/OpenLDAP/$SOURCE_URI
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.openldap.org/
          ENTERED=20010922
       LICENSE[0]=http://www.openldap.org/software/release/license.html
         KEYWORDS="ldap collab"
   SECURITY_PATCH=1
-           SHORT="Fully featured open source LDAP software suite"
+           SHORT="fully featured open source LDAP software suite"
 cat << EOF
 The OpenLDAP Project is a collaborative effort to provide a robust,
 commercial-grade, fully featured, open source LDAP software suite. The
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 34ff571..b0f85d0 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,8 @@
+2009-11-28 Vlad Glagolev <stealth at sourcemage.org>
+	* PREPARE: added, for branch selection
+	* DETAILS: added release branch
+	* DEPENDS: removed tabs and extra spaces
+
 2009-10-27 Vlad Glagolev <stealth at sourcemage.org>
 	* CONFIGURE, DEPENDS: removed gdbm support -- isn't available anymore
 
diff --git a/collab/openldap/PREPARE b/collab/openldap/PREPARE
new file mode 100755
index 0000000..fe60ef1
--- /dev/null
+++ b/collab/openldap/PREPARE
@@ -0,0 +1,3 @@
+config_query_list OPENLDAP_BRANCH "Select which branch to build:" \
+                  stable \
+                  release



More information about the SM-Commit mailing list