Fixes for bugs 180894 (Broken symlinks) 184697 (missing -lcrypto when building with domainkeys)

Package-Manager: portage-2.1.2-r9

4 files changed, 343 insertions, 5 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index d9f814af44c6..4dd415d40ee5 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.97 2007/06/30 18:27:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.98 2007/07/19 21:59:57 peitolm Exp $
+
+*exim-4.67-r2 (19 Jul 2007)
+
+  19 Jul 2007; Colin Morey <peitolm@gentoo.org> +exim-4.67-r2.ebuild:
+  Fixes for bugs 180894 (Broken symlinks) 184697 (missing -lcrypto when
+  building with domainkeys)
 
   30 Jun 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
   Add ~alpha wrt #176487
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 5290de15b602..d79945fafb99 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -75,14 +75,18 @@ EBUILD exim-4.67-r1.ebuild 9759 RMD160 5665f664dbceb294739079e66ac1313ee49d98e4
 MD5 c8706554d3d0bdcb35ae72bad5d3d1eb exim-4.67-r1.ebuild 9759
 RMD160 5665f664dbceb294739079e66ac1313ee49d98e4 exim-4.67-r1.ebuild 9759
 SHA256 8fa32138ce6b503fcd840ac07e4ed6d4da394e43efec01268adc08fcb6331a8e exim-4.67-r1.ebuild 9759
+EBUILD exim-4.67-r2.ebuild 9769 RMD160 5c19bef78c53c2e8aedee45e8ba0038d53d6f2b6 SHA1 6f3e12a037f7c3149591e8cd7e7d8860e157507c SHA256 de7d7d6aab5bce6e7b89e4145c6bca2cc87826e3e4c6f4b083040d69826f82d6
+MD5 f329b2c10a6ce18abfb29cb60a2b891e exim-4.67-r2.ebuild 9769
+RMD160 5c19bef78c53c2e8aedee45e8ba0038d53d6f2b6 exim-4.67-r2.ebuild 9769
+SHA256 de7d7d6aab5bce6e7b89e4145c6bca2cc87826e3e4c6f4b083040d69826f82d6 exim-4.67-r2.ebuild 9769
 EBUILD exim-4.67.ebuild 9747 RMD160 dc32374fb0db2cba3cc0a86813cc06fe28fe2e2a SHA1 2c537ae8db663ad2fe571efe8e38e0bf61de849b SHA256 270dcc140f9a0ffea91cfb387dd81db87ef9f25c5f53a19d116979fa82fa7b42
 MD5 749b694d2e28fe5a8c22e9d64e6d98c5 exim-4.67.ebuild 9747
 RMD160 dc32374fb0db2cba3cc0a86813cc06fe28fe2e2a exim-4.67.ebuild 9747
 SHA256 270dcc140f9a0ffea91cfb387dd81db87ef9f25c5f53a19d116979fa82fa7b42 exim-4.67.ebuild 9747
-MISC ChangeLog 24915 RMD160 2a12a5affc7eac4f76c37292756b2cfb4cb2c916 SHA1 937c9829813e38bea6b3dba8690662024ece3b6f SHA256 62c192eb51569b9ff2d05ff22d62104d5979a0b996fe7e480ccb0c3c7f1708ef
-MD5 b946f36c96f11871c3904d66b2ad79f2 ChangeLog 24915
-RMD160 2a12a5affc7eac4f76c37292756b2cfb4cb2c916 ChangeLog 24915
-SHA256 62c192eb51569b9ff2d05ff22d62104d5979a0b996fe7e480ccb0c3c7f1708ef ChangeLog 24915
+MISC ChangeLog 25115 RMD160 2b564a1c5d54642ca2b19462581e94001a1a51fd SHA1 95905b949b921b485cc87e1ed1879e8eba678a2b SHA256 658bdf5e97270d035b844426c11927eec0887deb66f0d33cd06ce1d49532fffb
+MD5 04876bfc494e364aa9f93a956245d63d ChangeLog 25115
+RMD160 2b564a1c5d54642ca2b19462581e94001a1a51fd ChangeLog 25115
+SHA256 658bdf5e97270d035b844426c11927eec0887deb66f0d33cd06ce1d49532fffb ChangeLog 25115
 MISC metadata.xml 863 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 SHA1 096ec5e2f0957fc0dabc5d1145a73611fb048222 SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b
 MD5 b6c82f8f9ebef12d06ac62b268691bdd metadata.xml 863
 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 metadata.xml 863
@@ -102,3 +106,6 @@ SHA256 a3cae93912191285bc1a800613bf43bfeb554864882742caca7bafd89f24b059 files/di
 MD5 76dfeb37b079e99c4c48072dcb8b2663 files/digest-exim-4.67-r1 449
 RMD160 da722afaab529f47416d0d44dba78c5c208bd541 files/digest-exim-4.67-r1 449
 SHA256 a3cae93912191285bc1a800613bf43bfeb554864882742caca7bafd89f24b059 files/digest-exim-4.67-r1 449
+MD5 76dfeb37b079e99c4c48072dcb8b2663 files/digest-exim-4.67-r2 449
+RMD160 da722afaab529f47416d0d44dba78c5c208bd541 files/digest-exim-4.67-r2 449
+SHA256 a3cae93912191285bc1a800613bf43bfeb554864882742caca7bafd89f24b059 files/digest-exim-4.67-r2 449
diff --git a/mail-mta/exim/exim-4.67-r2.ebuild b/mail-mta/exim/exim-4.67-r2.ebuild
new file mode 100644
index 000000000000..953855bb2974
--- /dev/null
+++ b/mail-mta/exim/exim-4.67-r2.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.67-r2.ebuild,v 1.1 2007/07/19 21:59:57 peitolm Exp $
+
+inherit eutils
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx mbox X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 mirror://gentoo/exiscan.conf"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+PROVIDE="virtual/mta"
+DEPEND=">=sys-apps/sed-4.0.5
+	perl? ( sys-devel/libperl )
+	>=sys-libs/db-3.2
+	pam? ( >=sys-libs/pam-0.75 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	gnutls? ( net-libs/gnutls
+			  dev-libs/libtasn1 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( virtual/mysql )
+	postgres? ( >=dev-db/postgresql-7 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	srs? ( mail-filter/libsrs_alt )
+	X? ( || ( (	x11-proto/xproto
+			x11-libs/libX11
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libXaw )
+		virtual/x11 )
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/radiusclient )
+	domainkeys? ( mail-filter/libdomainkeys )
+	"
+	# added X check for #57206
+RDEPEND="${DEPEND}
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	>=net-mail/mailbase-0.00-r5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local myconf
+
+	epatch ${FILESDIR}/exim-4.14-tail.patch
+	epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch
+
+	if ! use mbox; 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
+
+	# Includes Typo fix for bug 47106
+	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=/usr/bin/gzip:COMPRESS_COMMAND=/bin/gzip:" \
+		-e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=/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:# 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_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \
+		-e "s:EXIM_USER=:EXIM_USER=mail:" \
+		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
+		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
+		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
+		src/EDITME > Local/Makefile
+
+	# exiscan-acl is now integrated - enabled it when use-flag set
+	if use exiscan-acl; then
+		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile
+		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile
+	elif (use spf || use srs ) then
+		eerror SPF and SRS support require exiscan-acl to be enabled, please add
+		eerror to your USE settings.
+		exit 1
+	fi
+	if use spf; then
+		myconf="${myconf} -lspf2"
+		sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile
+		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
+	fi
+	if use srs; then
+		myconf="${myconf} -lsrs_alt"
+		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile
+	fi
+
+	cd Local
+	# enable optional exim_monitor support via X use flag bug #46778
+	if use X; then
+		einfo "Configuring eximon"
+		cp ../exim_monitor/EDITME eximon.conf
+		sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile
+	fi
+	#These next two should resolve 37964
+	if use perl; then
+		sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile
+	fi
+	# mbox useflag renamed, see bug 110741
+	if use mbx; then
+		sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile
+	fi
+	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
+		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" 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
+		#To fix bug 41196
+		echo "IPV6_USE_INET_PTON=yes" >> Makefile
+	fi
+
+	if use dovecot-sasl; then
+		sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Makefile
+	fi
+	if use radius; then
+		myconf="${myconf} -lradiusclient"
+		sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:" Local/Makefile
+		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Local/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:" Local/Makefile
+		if use gnutls; then
+			sed -i \
+				-e "s:# \(USE_GNUTLS=yes\):\1:" \
+				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile
+		else
+			sed -i \
+				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+		fi
+	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 use sqlite; then
+		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
+	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 -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \
+			Local/Makefile
+	fi
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
+
+	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile
+
+	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
+
+	if use nis; then
+		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
+		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
+	fi
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
+	fi
+	if use domainkeys; then
+		echo "
+		EXPERIMENTAL_DOMAINKEYS=yes
+		CFLAGS  += -I/usr/include/libdomainkeys
+		LDFLAGS += -lcrypto -ldomainkeys -L/usr/lib/libdomainkeys" >> Local/Makefile
+	fi
+
+# 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
+	if use X; then
+			doexe eximon.bin
+			doexe eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dodir /usr/bin /usr/sbin /usr/lib
+	if \[ ! -e /usr/lib/sendmail \];
+	then
+		dosym /usr/sbin/sendmail /usr/lib/sendmail
+	fi
+
+	if use mailwrapper
+	then
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dosym exim /usr/sbin/sendmail
+		dosym /usr/sbin/exim /usr/bin/mailq
+		dosym /usr/sbin/exim /usr/bin/newaliases
+		einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
+		dosym exim /usr/sbin/rsmtp
+		dosym exim /usr/sbin/rmail
+	fi
+
+	exeinto /usr/sbin
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	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
+
+	if use pam
+	then
+		# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+		insinto /etc/pam.d
+		newins ${FILESDIR}/pam.d-exim exim
+	fi
+
+	newinitd ${FILESDIR}/exim.rc6 exim
+
+	newconfd ${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."
+
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}
diff --git a/mail-mta/exim/files/digest-exim-4.67-r2 b/mail-mta/exim/files/digest-exim-4.67-r2
new file mode 100644
index 000000000000..ea4e7220db1e
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.67-r2
@@ -0,0 +1,6 @@
+MD5 9ee83186d9ac99e5ff297112aa6fddf0 exim-4.67.tar.bz2 1615325
+RMD160 22823f27ff7ce3fea5dba8b826c4fa06210b50be exim-4.67.tar.bz2 1615325
+SHA256 b17ac8b356caa3c08d50654660e7c5cf8e42e2a1292839c5706eb951a708b573 exim-4.67.tar.bz2 1615325
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
+RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113
+SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113