Version Bump, also provides fixes for, #40358 #28665 #27206

4 files changed, 267 insertions, 25 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
index afdf0694c894..be1b716391b0 100644
--- a/net-mail/exim/ChangeLog
+++ b/net-mail/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/exim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.49 2004/03/29 21:00:55 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.50 2004/03/29 23:19:19 peitolm Exp $
+
+*exim-4.31 (30 Mar 2004)
+
+  30 Mar 2004; Colin Morey <peitolm@gentoo.org> exim-4.31.ebuild:
+  Version Bump, also provides fixes for, #40358 #28665 #27206
 
 *exim-4.30 (29 Mar 2004)
 
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
index 88a0ee30d739..977385fe5a7c 100644
--- a/net-mail/exim/Manifest
+++ b/net-mail/exim/Manifest
@@ -1,39 +1,42 @@
-MD5 c26726d2d5ef7bbb41c66730352af883 exim-4.20-r2.ebuild 6327
-MD5 3d689d0f72e55820479ddb74857ddbb1 exim-4.30.ebuild 6294
-MD5 3abf347156b38b2f7fc72186463c9932 exim-4.21.ebuild 6142
-MD5 b7e54563b0e25ee0468e2eaa82d197c0 exim-4.12.ebuild 5435
+MD5 4622fd810f1f3e4fe72096d5e3cddbfe ChangeLog 8316
 MD5 03f9959005005fa089e318ade372f28b exim-4.14.ebuild 5482
-MD5 52b312b23ecff350c0382a6c7795a11d exim-4.24-r1.ebuild 6369
-MD5 507176d3a4c30b82a5cc247ef954eefe exim-4.20-r1.ebuild 6234
+MD5 e8d015031c1ba9f3fe8d6aff0da7c1eb exim-4.10.ebuild 6208
+MD5 b7e54563b0e25ee0468e2eaa82d197c0 exim-4.12.ebuild 5435
 MD5 4c62cac2e5849f5782f9f9a3f8431a16 exim-4.20.ebuild 5569
-MD5 1aeed57de2968663d6501e440ed6495d exim-4.24-r3.ebuild 6322
+MD5 507176d3a4c30b82a5cc247ef954eefe exim-4.20-r1.ebuild 6234
+MD5 c26726d2d5ef7bbb41c66730352af883 exim-4.20-r2.ebuild 6327
+MD5 3abf347156b38b2f7fc72186463c9932 exim-4.21.ebuild 6142
 MD5 36d23b53d50f8872dbc127f6540df527 exim-4.22.ebuild 6356
-MD5 27a0a2d29e9b142c1a684e8c1c507d15 exim-4.24.ebuild 6356
-MD5 e1b28c4d7df4b517b956ec54ee237c7a ChangeLog 8161
-MD5 e8d015031c1ba9f3fe8d6aff0da7c1eb exim-4.10.ebuild 6208
 MD5 d72918fcce5f904f2a7d0b5124a61e97 metadata.xml 886
+MD5 457b6248597f8d67ad52d2dc82c71887 exim-4.31.ebuild 7109
+MD5 52b312b23ecff350c0382a6c7795a11d exim-4.24-r1.ebuild 6369
+MD5 27a0a2d29e9b142c1a684e8c1c507d15 exim-4.24.ebuild 6356
 MD5 020b598eb5e644a8a9dd41ad7bf2bd58 exim-4.24-r2.ebuild 6276
-MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
+MD5 1aeed57de2968663d6501e440ed6495d exim-4.24-r3.ebuild 6322
+MD5 3d689d0f72e55820479ddb74857ddbb1 exim-4.30.ebuild 6294
+MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
+MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
+MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
+MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
 MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
-MD5 0cc15aecabaeace6ff4cdd1a462b9eb0 files/digest-exim-4.20-r2 62
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r1 132
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r2 132
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r3 132
+MD5 190c2d133e62eaba6ee4417721cb88c2 files/exim.rc6 512
 MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
-MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
-MD5 fd6118c0a56fcc3a96052bf1ff19fd1f files/mailer.conf 995
-MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-MD5 190c2d133e62eaba6ee4417721cb88c2 files/exim.rc6 512
-MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
-MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
-MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
+MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
 MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
+MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
+MD5 0cc15aecabaeace6ff4cdd1a462b9eb0 files/digest-exim-4.20-r2 62
 MD5 e62c9a744fd2c944af3dbc881156574b files/digest-exim-4.21 132
 MD5 9be54e4b44d4b7b6899302a1f3f74007 files/digest-exim-4.22 132
+MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
+MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24 132
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r1 132
+MD5 bf994e344cbca3ca289f3e94c579a32c files/digest-exim-4.31 62
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r2 132
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r3 132
+MD5 fd6118c0a56fcc3a96052bf1ff19fd1f files/mailer.conf 995
+MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
 MD5 11bc429bd869bdc9709fabe221ac29a7 files/digest-exim-4.30 132
diff --git a/net-mail/exim/exim-4.31.ebuild b/net-mail/exim/exim-4.31.ebuild
new file mode 100644
index 000000000000..b22b7e2ba8ca
--- /dev/null
+++ b/net-mail/exim/exim-4.31.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.31.ebuild,v 1.1 2004/03/29 23:19:19 peitolm Exp $
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb"
+
+EXISCANACL_VER=${PV}-16
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
+	exiscan-acl? ( http://duncanthrax.net/exiscan-acl/exiscan-acl-${EXISCANACL_VER}.patch )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+PROVIDE="virtual/mta"
+DEPEND=">=sys-apps/sed-4.0.5
+	dev-lang/perl
+	>=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	pam? ( >=sys-libs/pam-0.75 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	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 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
+RDEPEND="${DEPEND}
+	net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local myconf
+
+	epatch ${FILESDIR}/exim-4.14-tail.patch
+
+	if use maildir; then
+		einfo "Patching maildir support into exim.conf"
+		epatch ${FILESDIR}/exim-4.20-maildir.patch
+	fi
+
+	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
+	cp ${S}/src/configure.default ${S}/src/configure.default.orig
+		epatch ${FILESDIR}/exim-4.30-conf.patch
+
+	if use exiscan-acl; then
+		einfo "Patching exican-acl support into exim ${PV}.."
+		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
+	fi
+
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
+		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
+		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
+		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \
+		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
+		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
+		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \
+		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \
+		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
+		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
+		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
+		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
+		-e "s:EXIM_USER=:EXIM_USER=mail:" \
+		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
+		src/EDITME > Local/Makefile
+
+	cd Local
+	if use pam; then
+		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"
+	fi
+	if use lmtp; then
+		sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile
+	fi
+	if use ipv6; then
+		echo "HAVE_IPV6=YES" >> Makefile
+	fi
+
+	if [ -n "$myconf" ] ; then
+		echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
+	fi
+
+	cd ${S}
+	if use ssl; then
+		sed -i \
+			-e "s:# \(SUPPORT_TLS=yes\):\1:" \
+			-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+	fi
+
+	LOOKUP_INCLUDE=
+	LOOKUP_LIBS=
+
+	if use ldap; then
+		sed -i \
+			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
+			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile
+		LOOKUP_INCLUDE="-I/usr/include/ldap"
+		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
+	fi
+
+	if use mysql; then
+		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
+	fi
+
+	if use postgres; then
+		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+	fi
+
+	if [ -n "$LOOKUP_INCLUDE" ]; then
+		sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
+			Local/Makefile
+	fi
+
+	if [ -n "$LOOKUP_LIBS" ]; then
+		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds:LOOKUP_LIBS=$LOOKUP_LIBS:" \
+			Local/Makefile
+	fi
+
+
+	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
+
+	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile
+	if use wildlsearch; then
+		sed -i \
+			-e "s:# LOOKUP_WILDLSEARCH=yes:LOOKUP_WILDLSEARCH=yes:" \
+			-e "s:# LOOKUP_NWILDLSEARCH=yes:LOOKUP_NWILDLSEARCH=yes:" Local/Makefile
+	fi
+
+	if use dnsdb; then
+		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile
+	fi
+	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
+
+	# Use the "native" interface to the DBM library
+	echo "USE_DB=yes" >> ${S}/Local/Makefile
+}
+
+src_compile() {
+	make || die "make failed"
+}
+
+
+src_install () {
+	cd ${S}/build-exim-gentoo
+	exeinto /usr/sbin
+	doexe exim
+	fperms 4755 /usr/sbin/exim
+
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	if \[ ! -e /usr/bin/mail \] && \[ ! -e /bin/mail \]; then
+		    einfo "Installing symbolic link /usr/bin/mail -> /usr/sbin/exim"
+		    einfo "If you install mailx please *REMOVE* that link, that way"
+		    einfo "scripts will use the mailx-binary instead of the exim-binary."
+		    dosym ../sbin/exim /usr/bin/mail
+		else
+		einfo "NOT installing symbolic link /usr/bin/mail -> /usr/sbin/exim,"
+		einfo "because you already have a mail-binary."
+	fi
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym exim /usr/sbin/sendmail
+	dosym ../sbin/exim /usr/lib/sendmail
+
+	exeinto /usr/sbin
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
+		convert4r3 convert4r4
+	do
+		doexe $i
+	done
+
+	dodoc ${S}/doc/*
+	doman ${S}/doc/exim.8
+
+	# conf files
+	insinto /etc/exim
+	newins ${S}/src/configure.default.orig exim.conf.dist
+	if use exiscan-acl; then
+		newins ${S}/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins ${FILESDIR}/system_filter.exim
+	doins ${FILESDIR}/auth_conf.sub
+	if use exiscan; then
+		newins ${S}/src/configure.default exim.conf.exiscan
+		doins ${FILESDIR}/exiscan.conf
+	fi
+
+	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+	insinto /etc/pam.d
+	newins ${FILESDIR}/pam.d-exim exim
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/exim.rc6 exim
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/exim.confd exim
+
+	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
+	dodir /var/log/${PN}
+}
+
+
+pkg_postinst() {
+	einfo "/etc/exim/system_filter.exim is a sample system_filter."
+	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
+}
+
+
diff --git a/net-mail/exim/files/digest-exim-4.31 b/net-mail/exim/files/digest-exim-4.31
new file mode 100644
index 000000000000..89e9745f7a2a
--- /dev/null
+++ b/net-mail/exim/files/digest-exim-4.31
@@ -0,0 +1 @@
+MD5 1bbc5823cd32d5a00175f32de104503f exim-4.31.tar.gz 1700513