X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcyrus-sasl;h=757f7426b20927c05f1391a4547f385b25ce18bd;hb=b5aca95b9401ba610fad2f8bcb9b4862f98a4969;hp=47d4b9874ab688448ff36181ee5cb98992e87ea7;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d;p=ipfire-2.x.git

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 47d4b9874a..757f7426b2 100644
--- 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,21 +83,30 @@ $(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
+		            --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
+	-mkdir /var/run/saslauthd
+	cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,cyrus-sasl)
+
 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