X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcyrus-sasl;h=af2b1488939563cbbe97351c33888524a280437d;hp=0b72836f01fc6771e2e6af715407392afcc43a9c;hb=65e77163342164e18d115f8dfa550f07dd216869;hpb=6f10c6a17d4678f52340ff06d28546a44d815f88

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 0b72836f0..af2b14889 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -82,8 +82,10 @@ $(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
+	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 \
@@ -92,12 +94,15 @@ ifeq "$(PASS)" ""
 	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