From 56ec89ebe8b5530f6ffd50bad1318620ecc5a0b4 Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Wed, 17 May 2006 12:44:06 +0000
Subject: [PATCH] =?utf8?q?Ge=C3=A4ndert:=20=20=20*=20CyrusIMAPd=20auf=20de?=
 =?utf8?q?n=20neuesten=20Stand=20gebracht.=20=20=20*=20Saslauthd=20=C3=BCb?=
 =?utf8?q?erarbeitet.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@120 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 lfs/cyrusimap |  4 ++--
 lfs/saslauthd | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lfs/cyrusimap b/lfs/cyrusimap
index 8466893cfd..5c50b71c42 100644
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.2.12
+VER        = 2.2.13
 
 THISAPP    = cyrus-imapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
+$(DL_FILE)_MD5 = 3ff679714836d1d7b1e1df0e026d4844
 
 install : $(TARGET)
 
diff --git a/lfs/saslauthd b/lfs/saslauthd
index c34c1f244f..1e92c4e4ac 100644
--- a/lfs/saslauthd
+++ b/lfs/saslauthd
@@ -83,16 +83,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(PASS)" "1"
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-sql --with-pam=/usr --without-pgsql --with-mysql=/opt/lampp --sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --with-dblib=berkeley --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run/saslauthd
 else
 	# WITH LDAP SUPPORT AT THIS TIME
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-ldap=/usr --enable-sql --with-pam=/usr --without-pgsql --with-mysql=/opt/lampp --sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+					--enable-anon --enable-plain \
+					--disable-krb4 --disable-otp --disable-cram --disable-digest \
+					--with-dblib=berkeley
+					--with-ldap=/usr \
+					--enable-sql \
+					--with-pam=/lib/security \
+					--with-openssl=/usr
+					--without-pgsql \
+					--with-mysql=/opt/lampp \
+					--sysconfdir=/etc \
+					--with-dbpath=/var/lib/sasl/sasldb2 \
+					--with-saslauthd=/var/run/saslauthd
 endif
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 #	install -v -m644 saslauthd/saslauthd.8 /usr/share/man/man8
 #	install -v -m755 -d /usr/share/doc/$(THISAPP)
 #	install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} saslauthd/LDAP_SASLAUTHD /usr/share/doc/$(THISAPP)
+ifeq "$(PASS)" "2"
 	install -v -m700 -d /var/lib/sasl
+	mkdir -p /var/run/saslauthd
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.39.2