fixed bug #29881

4 files changed, 26 insertions, 10 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
index 7769c6a95bd2..a16dd0d77bc1 100644
--- a/net-mail/exim/ChangeLog
+++ b/net-mail/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/exim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.40 2003/11/05 14:15:41 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.41 2003/11/05 14:24:46 klieber Exp $
+
+  05 Nov 2003; Kurt Lieber <klieber@gentoo.org> exim-4.22.ebuild,
+  exim-4.24.ebuild:
+  fixed #29881.  thanks to Marcin Jurczuk <spock@stars.eu.org> for the patch
 
 *exim-4.24 (05 Nov 2003)
 
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
index 68c03bbed2b8..6e697e0b612a 100644
--- a/net-mail/exim/Manifest
+++ b/net-mail/exim/Manifest
@@ -1,4 +1,4 @@
-MD5 10e3ac593cf1167da4847488e87e1f51 ChangeLog 6925
+MD5 157842a41e11823ad2b3ba8618a19280 ChangeLog 7089
 MD5 b4546401419ab569939d6a7b97b117a0 exim-4.10.ebuild 6209
 MD5 552b6ba253f6d49c3ae0a92e3c867271 exim-4.12.ebuild 5436
 MD5 cb909c0ba85b24cd0c917682f780bee7 exim-4.14.ebuild 5483
@@ -6,9 +6,9 @@ MD5 6a279805f089c006ac5a0c242d68d86c exim-4.20-r1.ebuild 6235
 MD5 3cf81a767f62a64891a39ee698821f05 exim-4.20-r2.ebuild 6328
 MD5 fb49b47a884b048542837810acb08633 exim-4.20.ebuild 5569
 MD5 76850d186609333f5b5858a5d512a364 exim-4.21.ebuild 6141
-MD5 0e493b98f864a8ec0a074ba8a95586d8 exim-4.22.ebuild 6141
+MD5 e5754fa101873ae8932f66793cc50626 exim-4.22.ebuild 6356
 MD5 ea63797589f6933c74605b04fe13c299 metadata.xml 725
-MD5 e16d23d94f80b3471d355b5ff0321eeb exim-4.24.ebuild 6140
+MD5 5a76bab84c947dc380e3ce396016ea35 exim-4.24.ebuild 6356
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24 132
 MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
diff --git a/net-mail/exim/exim-4.22.ebuild b/net-mail/exim/exim-4.22.ebuild
index 594de76b2a99..2acd9a5a9c84 100644
--- a/net-mail/exim/exim-4.22.ebuild
+++ b/net-mail/exim/exim-4.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.22.ebuild,v 1.2 2003/09/05 09:16:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.22.ebuild,v 1.3 2003/11/05 14:24:46 klieber Exp $
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
 
 EXISCANACL_VER=${PV}-10
 
@@ -25,7 +25,8 @@ DEPEND=">=sys-apps/sed-4.0.5
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
 	mysql? ( >=dev-db/mysql-3.23.28 )
-	postgres? ( >=dev-db/postgresql-7 )"
+	postgres? ( >=dev-db/postgresql-7 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
 	!virtual/mta
 	>=net-mail/mailbase-0.00-r5"
@@ -76,6 +77,11 @@ src_unpack() {
 		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
 		myconf="${myconf} -lpam"
 	fi
+	if use sasl; then
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:" \
+		Makefile
+		myconf="${myconf} -lsasl2"
+	fi
 	if use tcpd; then
 		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
 		myconf="${myconf} -lwrap"
diff --git a/net-mail/exim/exim-4.24.ebuild b/net-mail/exim/exim-4.24.ebuild
index 12965adb32bc..a906ac70c452 100644
--- a/net-mail/exim/exim-4.24.ebuild
+++ b/net-mail/exim/exim-4.24.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.24.ebuild,v 1.1 2003/11/05 14:15:41 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.24.ebuild,v 1.2 2003/11/05 14:24:46 klieber Exp $
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
 
 EXISCANACL_VER=${PV}-13
 
@@ -25,7 +25,8 @@ DEPEND=">=sys-apps/sed-4.0.5
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
 	mysql? ( >=dev-db/mysql-3.23.28 )
-	postgres? ( >=dev-db/postgresql-7 )"
+	postgres? ( >=dev-db/postgresql-7 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
 	!virtual/mta
 	>=net-mail/mailbase-0.00-r5"
@@ -76,6 +77,11 @@ src_unpack() {
 		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
 		myconf="${myconf} -lpam"
 	fi
+	if use sasl; then
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:" \
+		Makefile
+		myconf="${myconf} -lsasl2"
+	fi
 	if use tcpd; then
 		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
 		myconf="${myconf} -lwrap"