Merge remote-tracking branch 'mfischer/slang' into next

[people/pmueller/ipfire-2.x.git] / lfs / cyrus-sasl

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index f7accb700d7764d0723be1b60bbbf9694d5ba6cf..84f49d93554194a139d9d4494da584f68e536c07 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.21
+VER        = 2.1.26
 
 THISAPP    = cyrus-sasl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dde02db234dea892bee298390890502e
+$(DL_FILE)_MD5 = a7f4e5e559a0e37b3ffc438c9456e425
 
 install : $(TARGET)
 
@@ -83,12 +83,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
-       cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
+       cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am
+       cd $(DIR_APP) && autoconf
 
 ifeq "$(PASS)" ""
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --with-dbpath=/var/lib/sasl/sasldb2 \
-                           --with-saslauthd=/var/run/saslauthd
+                           --with-saslauthd=/var/run/saslauthd \
+                           --with-des=no --with-rc4=no
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl
@@ -100,6 +102,7 @@ else
                            --with-dbpath=/var/lib/sasl/sasldb2 \
                            --with-saslauthd=/var/run \
                             --with-ldap --enable-ldapdb
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make -C include
        cd $(DIR_APP) && make -C sasldb
        cd $(DIR_APP) && make -C plugins