Version bump. Upstream ipv6 and compile fixes among other things.

4 files changed, 221 insertions, 3 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
index 41bb3dbda7b7..a385460dd0e5 100644
--- a/net-mail/exim/ChangeLog
+++ b/net-mail/exim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2003/08/18 05:06:22 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.38 2003/08/19 00:16:31 g2boojum Exp $
+
+*exim-4.22 (18 Aug 2003)
+
+  18 Aug 2003; Nick Hadaway <raker@gentoo.org> exim-4.22.ebuild:
+  Upstream bug fixes for ipv6 and a compile warning among others.
+  No ebuild changes.
 
 *exim-4.21 (17 Aug 2003)
 
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
index fe2b89ce3252..1aef3a31b704 100644
--- a/net-mail/exim/Manifest
+++ b/net-mail/exim/Manifest
@@ -4,8 +4,8 @@ MD5 4d7cabe7d5b81708f2717fafd847ba2b exim-4.12.ebuild 5436
 MD5 b0ca08f26ccf5a73829c0169ad70c528 exim-4.14.ebuild 5483
 MD5 f37a9cb0060d8e3df038d704a933dcc9 exim-4.20-r1.ebuild 6234
 MD5 fb49b47a884b048542837810acb08633 exim-4.20.ebuild 5569
-MD5 73ad8ded8cea1ea2c53a9e95a5d9fa81 exim-4.22.ebuild 6142
-MD5 d46289435761a4753742959e02f14114 ChangeLog 6547
+MD5 b94490f123e4c87687d2520aa3cce8a2 exim-4.22.ebuild 6142
+MD5 960165c973c647af1b271f523197c76b ChangeLog 6726
 MD5 7d994463bbcad62d72ca937683c170fb exim-4.10.ebuild 6211
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 5898fa2e00e85c771cffe741f3198c07 files/exiscan-acl-4.20-09.patch 263216
diff --git a/net-mail/exim/exim-4.22.ebuild b/net-mail/exim/exim-4.22.ebuild
new file mode 100644
index 000000000000..3dabb3c713fc
--- /dev/null
+++ b/net-mail/exim/exim-4.22.ebuild
@@ -0,0 +1,210 @@
+# 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.1 2003/08/19 00:16:31 g2boojum Exp $
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6"
+
+EXISCANACL_VER=${PV}-10
+
+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 ~hppa ~ppc ~amd64"
+
+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-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
+
+	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 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}" >> 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
+
+	# 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
+	dosym ../sbin/exim /usr/bin/mail
+	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.22 b/net-mail/exim/files/digest-exim-4.22
new file mode 100644
index 000000000000..7e970affc9da
--- /dev/null
+++ b/net-mail/exim/files/digest-exim-4.22
@@ -0,0 +1,2 @@
+MD5 20df3d13b1d3cd2cd95312f2293e0b40 exim-4.22.tar.gz 1607027
+MD5 68f1643ac7de3b4c818916e714de8159 exiscan-acl-4.22-10.patch 286429