From ac9620acb74c809bd308012259e65c83ee437801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Fri, 3 Jul 2015 20:03:26 +0300
Subject: [PATCH] cyrus-sasl fix deps, openldap dependency cause circledep,
 removed.

---
 server/auth/cyrus-sasl/actions.py |  7 +++++--
 server/auth/cyrus-sasl/pspec.xml  | 11 ++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/auth/cyrus-sasl/actions.py b/server/auth/cyrus-sasl/actions.py
index 283514a333..dff49fe666 100644
--- a/server/auth/cyrus-sasl/actions.py
+++ b/server/auth/cyrus-sasl/actions.py
@@ -32,7 +32,7 @@ def setup():
                          --with-plugindir=/usr/lib/sasl2 \
                          --with-dbpath=/etc/sasl2/sasldb2 \
                          --with-pam \
-                         --with-ldap \
+                         --without-ldap \
                          --with-openssl \
                          --with-dblib=gdbm \
                          --with-gss_impl=mit \
@@ -46,7 +46,7 @@ def setup():
                          --enable-login \
                          --enable-ntlm \
                          --enable-plain \
-                         --enable-ldapdb \
+                         --disable-ldapdb \
                          --enable-checkapop \
                          --enable-alwaystrue \
                          --disable-java \
@@ -57,6 +57,9 @@ def setup():
                          --disable-passdss \
                          --disable-macos-framework \
                          --disable-static")
+    
+    # for remove unused
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make("-j1")
diff --git a/server/auth/cyrus-sasl/pspec.xml b/server/auth/cyrus-sasl/pspec.xml
index b6ab0d7e00..53f3baca73 100644
--- a/server/auth/cyrus-sasl/pspec.xml
+++ b/server/auth/cyrus-sasl/pspec.xml
@@ -16,6 +16,11 @@
         <Archive sha1sum="d6669fb91434192529bd13ee95737a8a5040241c" type="targz">http://cyrusimap.org/releases/cyrus-sasl-2.1.26.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>mit-kerberos</Dependency>
+            <Dependency>pam-devel</Dependency>
+            <Dependency>gdbm-devel</Dependency>
+            <Dependency>e2fsprogs-devel</Dependency>
+            <Dependency>openssl-devel</Dependency>
+            <Dependency>groff</Dependency>
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">fix-linkage.patch</Patch-->
@@ -44,8 +49,12 @@
     <Package>
         <Name>cyrus-sasl</Name>
         <RuntimeDependencies>
-            <Dependency>openldap-client</Dependency>
+	  <!--<Dependency>openldap-client</Dependency>-->
             <Dependency>mit-kerberos</Dependency>
+            <Dependency>pam</Dependency>
+            <Dependency>gdbm</Dependency>
+            <Dependency>e2fsprogs</Dependency>
+            <Dependency>openssl</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>