diff options
| -rw-r--r-- | mail-mta/exim/ChangeLog | 9 | ||||
| -rw-r--r-- | mail-mta/exim/Manifest | 40 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.50-r999.ebuild | 254 | ||||
| -rw-r--r-- | mail-mta/exim/files/digest-exim-4.50-r999 | 1 | ||||
| -rw-r--r-- | mail-mta/exim/files/mailer.conf | 37 |
5 files changed, 289 insertions, 52 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog index 423cf5adf9ff..e4175db4cc1d 100644 --- a/mail-mta/exim/ChangeLog +++ b/mail-mta/exim/ChangeLog @@ -1,6 +1,13 @@ # 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.34 2005/07/05 18:47:08 killerfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.35 2005/07/11 01:47:44 ticho Exp $ + +*exim-4.50-r999 (11 Jul 2005) + + 11 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/mailer.conf, + +exim-4.50-r999.ebuild: + Committed a mailer-config aware ebuild, to be masked until all other MTAs + are ready to be unmasked all at once. Bug #97657. 05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> exim-4.50-r1.ebuild: Stable on hppa. diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index e31157d3c789..d43e4afb8809 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -1,23 +1,35 @@ -MD5 1d7acf3699bc432628ed1de59966341a ChangeLog 16979 -MD5 b736c67bb1a5d294ee2df24413cf9100 exim-4.43-r2.ebuild 8033 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 f850af9bb97ec3801c5f27cc6d6c7930 exim-4.50.ebuild 7923 -MD5 3dcc3562423bb66d0c2ea93caf41a36a metadata.xml 994 +MD5 c5d0c353ed73c403a957dc4f7ce88cf7 exim-4.50-r999.ebuild 7638 +MD5 b736c67bb1a5d294ee2df24413cf9100 exim-4.43-r2.ebuild 8033 MD5 87c97e184e9ba99f8badec230f288397 exim-4.50-r1.ebuild 7961 -MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446 +MD5 21a21c26658637fab0d0f7d58d139ff8 ChangeLog 17228 +MD5 3dcc3562423bb66d0c2ea93caf41a36a metadata.xml 994 MD5 dec246086bc5cef333efaa95785a4d5e files/exim-4.43-r2-host_aton-buff.patch 6444 -MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101 -MD5 de6d33cbc3f6762f73fbe852c318e461 files/mailer.conf 1301 -MD5 f05ff505c7b77a17696736e2730ae8d1 files/digest-exim-4.43-r2 133 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 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 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775 -MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113 MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236 +MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113 +MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775 MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478 -MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887 -MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346 -MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50 63 +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 f442b68d435598831bab8536ade071b8 files/exim.confd 62 -MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889 +MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50 63 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFC0c/RQlM6RnzZP+IRAjb2AKCuu/l6heRx7LEAZkfDefOfoKiqkQCcDiSH +Egzz7HKPCRJ/DD+omZDustw= +=m7F/ +-----END PGP SIGNATURE----- diff --git a/mail-mta/exim/exim-4.50-r999.ebuild b/mail-mta/exim/exim-4.50-r999.ebuild new file mode 100644 index 000000000000..ec374552a1ba --- /dev/null +++ b/mail-mta/exim/exim-4.50-r999.ebuild @@ -0,0 +1,254 @@ +# 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.50-r999.ebuild,v 1.1 2005/07/11 01:47:44 ticho Exp $ + +inherit eutils mailer + +IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog" + +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 ~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 ) + 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 ) + X? ( virtual/x11 )" + # added X check for #57206 +RDEPEND="${DEPEND} + >=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 + epatch ${FILESDIR}/exim-4.30-conf.patch + + # 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=/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:# 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 + 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 + if use mbox; 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 + 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:" \ + -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 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 + einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail." + dosym exim /usr/sbin/rsmtp + + if use mailwrapper + then + mailer_install_conf + else + dosym exim /usr/sbin/sendmail + dosym /usr/sbin/sendmail /usr/lib/sendmail + dosym /usr/sbin/exim /usr/bin/mailq + dosym /usr/sbin/exim /usr/bin/newaliases + dosym /usr/sbin/exim /usr/bin/rmail + fi + + 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." + + mailer_pkg_postinst +} diff --git a/mail-mta/exim/files/digest-exim-4.50-r999 b/mail-mta/exim/files/digest-exim-4.50-r999 new file mode 100644 index 000000000000..a96f78c973a6 --- /dev/null +++ b/mail-mta/exim/files/digest-exim-4.50-r999 @@ -0,0 +1 @@ +MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928 diff --git a/mail-mta/exim/files/mailer.conf b/mail-mta/exim/files/mailer.conf index 766eaa7475e3..96175f37db1e 100644 --- a/mail-mta/exim/files/mailer.conf +++ b/mail-mta/exim/files/mailer.conf @@ -1,44 +1,7 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/mailer.conf,v 1.3 2004/07/18 03:25:14 dragonheart Exp $ -# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $ - # Execute the "real" sendmail program from exim, # named /usr/sbin/exim # sendmail /usr/sbin/exim -send-mail /usr/sbin/exim mailq /usr/sbin/exim newaliases /usr/sbin/exim -rsmtp /usr/sbin/exim rmail /usr/sbin/exim -mail /usr/sbin/exim - -# Execute the "real" sendmail program from nullmailer -# named /usr/sbin/sendmail.nullmailer -#sendmail /usr/sbin/sendmail.nullmailer -#mailq /usr/bin/mailq.nullmailer - -# Execute the "real" sendmail program from postfix, -# named /usr/sbin/sendmail.postfix -# -#sendmail /usr/sbin/sendmail.postfix -#send-mail /usr/sbin/sendmail.postfix -#mailq /usr/sbin/sendmail.postfix -#newaliases /usr/sbin/sendmail.postfix - -# Execute the "real" sendmail program from ssmtp, -# named /usr/sbin/ssmtp -# -#sendmail /usr/sbin/ssmtp -#send-mail /usr/sbin/ssmtp -#mailq /usr/sbin/ssmtp -#newaliases /usr/sbin/ssmtp - -# Execute the "real" sendmail program, named /usr/sbin/sendmail -# -#sendmail /usr/sbin/sendmail.sendmail -#send-mail /usr/sbin/sendmail.sendmail -#mailq /usr/sbin/sendmail.sendmail -#newaliases /usr/sbin/sendmail.sendmail -#hoststat /usr/sbin/sendmail.sendmail -#purgestat /usr/sbin/sendmail.sendmail - |