Merge remote-tracking branch 'stevee/dnsforward' into next

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

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 1e9151536780a4af75132772960af1d949a9689b..749011f26711a25e14aa26747da3a9357b89622d 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -39,6 +39,8 @@ else
        TARGET     = $(DIR_INFO)/$(THISAPP)-ldap
 endif
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -58,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist :
-       $(PAK)
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -80,22 +82,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
        cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
        cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
 
 ifeq "$(PASS)" ""
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --with-dbpath=/var/lib/sasl/sasldb2 \
-                           --with-saslauthd=/var/run
+                           --with-saslauthd=/var/run/saslauthd
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl
+       -mkdir /var/run/saslauthd
+       cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
 else
        # WITH LDAP SUPPORT AT THIS TIME
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --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