New Version bump, with fixes for bugs, 101948 110741 and 110234
authorColin Morey <peitolm@gentoo.org>
Mon, 28 Nov 2005 23:32:47 +0000 (23:32 +0000)
committerColin Morey <peitolm@gentoo.org>
Mon, 28 Nov 2005 23:32:47 +0000 (23:32 +0000)
Package-Manager: portage-2.0.51.22-r1

mail-mta/exim/ChangeLog
mail-mta/exim/Manifest
mail-mta/exim/exim-4.60.ebuild [new file with mode: 0644]
mail-mta/exim/files/digest-exim-4.60 [new file with mode: 0644]

index 54b79883f96c47056c538e4c28392103ddec9641..213f0cd290f4c9eca4c58cb00f17d3d536525630 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.56 2005/10/28 17:26:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.57 2005/11/28 23:32:47 peitolm Exp $
+
+*exim-4.60 (28 Nov 2005)
+
+  28 Nov 2005; Colin Morey <peitolm@gentoo.org> +exim-4.60.ebuild:
+  New Version bump, with fixes for bugs, 101948 110741 and 110234
 
   28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> exim-4.54.ebuild:
   Stable on sparc wrt #103894
index d0be968705c4c7f724f672877dd15622971245a7..4af84cb9ab3485118ceae7cee8d13e070d24b3be 100644 (file)
@@ -1,42 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6ac8b22a63f93ac9256fa8346cff67e2 ChangeLog 19780
+MD5 a6d09cd8eee4b8d7ee053b806b858e39 exim-4.60.ebuild 9027
 MD5 f850af9bb97ec3801c5f27cc6d6c7930 exim-4.50.ebuild 7923
 MD5 5faf10649096a3bc679e28b0c319eb6c exim-4.50-r2.ebuild 8497
 MD5 1e2488b29f4d874082d026bbf5e9027d exim-4.52.ebuild 8419
-MD5 c5d0c353ed73c403a957dc4f7ce88cf7 exim-4.50-r999.ebuild 7638
+MD5 9b839c970416e71bf6e0602bda37fa76 exim-4.50-r1.ebuild 7956
 MD5 b736c67bb1a5d294ee2df24413cf9100 exim-4.43-r2.ebuild 8033
+MD5 c5d0c353ed73c403a957dc4f7ce88cf7 exim-4.50-r999.ebuild 7638
 MD5 8b201c7f2e7a23dc49a3485fbf47c51f exim-4.54.ebuild 8658
-MD5 9b839c970416e71bf6e0602bda37fa76 exim-4.50-r1.ebuild 7956
-MD5 de6cf4d202c26540ffe11e17de9a7d92 ChangeLog 19621
 MD5 ee52da73838435e93e200a5cba155fa3 metadata.xml 1029
+MD5 882369ea2394b4dc12f0097f85687295 files/digest-exim-4.52 63
+MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
+MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r2 63
+MD5 328f709452c0c5b6d6839040fa967883 files/digest-exim-4.60 63
+MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50 63
+MD5 b26366d2ddeb6f737f97602be0a873b5 files/digest-exim-4.54 63
 MD5 dec246086bc5cef333efaa95785a4d5e files/exim-4.43-r2-host_aton-buff.patch 6444
+MD5 f05ff505c7b77a17696736e2730ae8d1 files/digest-exim-4.43-r2 133
+MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236
+MD5 8609e97b73196813ddfc2b3de6a2bbac files/exim.rc6 565
+MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r1 63
 MD5 67d515cfd03abf9c207c28c997de4177 files/exim-4.50-srs_update-1.0.patch 18372
-MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
-MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
 MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r999 63
+MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
+MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
+MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
 MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
-MD5 f05ff505c7b77a17696736e2730ae8d1 files/digest-exim-4.43-r2 133
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r1 63
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r2 63
-MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236
+MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
+MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
 MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
-MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
 MD5 49698cb738763bbaebbbe89470f914ef files/mailer.conf 169
-MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-MD5 8609e97b73196813ddfc2b3de6a2bbac files/exim.rc6 565
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50 63
-MD5 882369ea2394b4dc12f0097f85687295 files/digest-exim-4.52 63
-MD5 b26366d2ddeb6f737f97602be0a873b5 files/digest-exim-4.54 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDYl9GKRy60XGEcJIRArRPAJkBANCr9SozB6h7ZehkiSZL4l4M3QCfcqZL
-ew98xpfrcbaiR3FQXTvOcrY=
-=Ip4R
------END PGP SIGNATURE-----
+MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
diff --git a/mail-mta/exim/exim-4.60.ebuild b/mail-mta/exim/exim-4.60.ebuild
new file mode 100644 (file)
index 0000000..e6baea3
--- /dev/null
@@ -0,0 +1,298 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.60.ebuild,v 1.1 2005/11/28 23:32:47 peitolm Exp $
+
+inherit eutils
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs gnutls sqlite"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~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 )
+       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 )
+       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+       srs? ( mail-filter/libsrs_alt )
+       X? ( virtual/x11 )
+       sqlite? ( dev-db/sqlite )"
+       # 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 -e "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 [ -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
+
+
+       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 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
+# 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
+       dosym ../sbin/exim /usr/bin/mailq
+       dosym ../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
+       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
+       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
+
+       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."
+
+       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.60 b/mail-mta/exim/files/digest-exim-4.60
new file mode 100644 (file)
index 0000000..2b639eb
--- /dev/null
@@ -0,0 +1 @@
+MD5 eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 1554749