Updated eximscan. closes bug #20613

4 files changed, 202 insertions, 2 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
index 63402d83c98e..c17066ac06e5 100644
--- a/net-mail/exim/ChangeLog
+++ b/net-mail/exim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2003/04/25 19:20:20 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.28 2003/05/31 05:03:01 jmorgan Exp $
+
+*exim-4.14 (30 My 2003)
+
+  30 May 2003; Jack Morgan <jmorgan@gentoo.org> exim-4.14.ebuild:
+  Updates exiscan, closes bug #20613 
 
 *exim-4.12 (28 Jan 2003)
 
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
index 097a59d7f63f..66245e6b47f2 100644
--- a/net-mail/exim/Manifest
+++ b/net-mail/exim/Manifest
@@ -1,6 +1,7 @@
-MD5 a2daf3a9e5ca3ccaf69e2cf80879bf66 ChangeLog 4787
+MD5 8de0065908b6dc195e23c9efb5904960 ChangeLog 4917
 MD5 ea8d4d3bdf95464d1afcb9c503696b21 exim-4.10.ebuild 6211
 MD5 d1323582ec8ef8dfdbc230560e99d857 exim-4.12.ebuild 5433
+MD5 346dc545948dbc5c2b71b03f19b0dd7c exim-4.14.ebuild 5328
 MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
 MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
@@ -12,3 +13,4 @@ MD5 c90e5fcc2a5dfdd3095c5619d9dcc389 files/exim.rc6 509
 MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
 MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
+MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
diff --git a/net-mail/exim/exim-4.14.ebuild b/net-mail/exim/exim-4.14.ebuild
new file mode 100644
index 000000000000..3e3f83cb1d59
--- /dev/null
+++ b/net-mail/exim/exim-4.14.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+
+IUSE="tcpd ssl postgres mysql ldap pam"
+
+EXISCAN_VER=${PV}-26
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
+	http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz"
+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 )"
+
+RDEPEND="${DEPEND}
+	!virtual/mta
+	>=net-mail/mailbase-0.00"
+
+src_unpack() {
+	unpack ${A}
+
+	local myconf
+
+	cd ${S}
+	einfo "Patching exiscan support into exim ${PV}.."
+	epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
+	
+	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=syslog:LOG_FILE_PATH=syslog:" \
+		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
+		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.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 tcpd; then
+		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
+		myconf="${myconf} -lwrap"
+	fi
+	if [ -n "$myconf" ] ; then
+		echo "EXTRALIBS=${myconf}" >> 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: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
+
+	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
+}
+
+src_compile() {
+	make || die
+}
+
+
+src_install () {
+
+	cd ${S}/build-exim-gentoo
+	insopts -o root -g root -m 4755
+	insinto /usr/sbin
+	doins exim
+
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/exim /usr/bin/mail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym exim /usr/sbin/sendmail
+	dosym /usr/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
+
+	dodir /etc/exim
+	
+	cd ${S}/src
+	cp configure.default ${D}/etc/exim/exim.conf.dist
+
+	dodoc ${S}/doc/*
+	doman ${S}/doc/exim.8
+	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+	insinto /etc/pam.d
+	doins ${FILESDIR}/pam.d-exim
+
+	# A nice filter for exim to protect your windows clients.
+	insinto /etc/exim
+	doins ${FILESDIR}/system_filter.exim
+	dodoc ${FILESDIR}/auth_conf.sub
+	doins ${FILESDIR}/exiscan.conf
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/exim.rc6 exim
+	insinto /etc/conf.d
+	newins ${FILESDIR}/exim.confd exim
+	fperms 644 /etc/conf.d/exim
+}
+
+
+pkg_config() {
+
+	${ROOT}/usr/sbin/rc-update add exim
+
+}
+
+pkg_postinst() {
+
+	einfo "Read the bottom of /etc/exim/system_filter.exim for usage."
+	einfo "/usr/share/doc/${P}/auth_conf.sub.gz 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.14 b/net-mail/exim/files/digest-exim-4.14
new file mode 100644
index 000000000000..bca81a3e6537
--- /dev/null
+++ b/net-mail/exim/files/digest-exim-4.14
@@ -0,0 +1,2 @@
+MD5 bebd65023b117e2fa7dcea46f1129556 exim-4.14.tar.gz 1504354
+MD5 3bd9b18f55c079bcd9af2eb07fec469b exiscan-4.14-26.tar.gz 63656