diff options
Diffstat (limited to 'mail-mta')
-rw-r--r-- | mail-mta/exim/ChangeLog | 7 | ||||
-rw-r--r-- | mail-mta/exim/exim-4.69-r1.ebuild | 321 | ||||
-rw-r--r-- | mail-mta/exim/exim-4.69-r2.ebuild | 8 | ||||
-rw-r--r-- | mail-mta/exim/exim-4.69.ebuild | 8 | ||||
-rw-r--r-- | mail-mta/exim/metadata.xml | 2 |
5 files changed, 15 insertions, 331 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog index e6d8ec0992af..a2148262963a 100644 --- a/mail-mta/exim/ChangeLog +++ b/mail-mta/exim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/exim # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.133 2009/06/24 13:28:10 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.134 2009/07/02 19:58:07 grobian Exp $ + + 02 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69.ebuild, + -exim-4.69-r1.ebuild, exim-4.69-r2.ebuild, metadata.xml: + Take over maintainership, remove old (and masked), fix trivial bug + #275651, thanks Dmitri Bogomolov for pointing out 24 Jun 2009; Torsten Veller <tove@gentoo.org> metadata.xml: New maintainer needed as peitolm retires (#203843) diff --git a/mail-mta/exim/exim-4.69-r1.ebuild b/mail-mta/exim/exim-4.69-r1.ebuild deleted file mode 100644 index 11fb48b1e6e5..000000000000 --- a/mail-mta/exim/exim-4.69-r1.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r1.ebuild,v 1.6 2008/07/16 16:34:18 chtekk 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 dovecot-sasl radius domainkeys maildir" - -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 -mirror://gentoo/system_filter.exim.gz" -HOMEPAGE="http://www.exim.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -PROVIDE="virtual/mta" -DEPEND=">=sys-apps/sed-4.0.5 - perl? ( sys-devel/libperl ) - >=sys-libs/db-3.2 - pam? ( virtual/pam ) - 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? ( virtual/postgresql-base ) - 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 - ) - 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 - virtual/logger" - -src_unpack() { - unpack ${A} - cd "${S}" - - local myconf - - epatch "${FILESDIR}"/exim-4.14-tail.patch - epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch - epatch "${FILESDIR}"/exim-4.69-r1.27021.patch - epatch "${FILESDIR}"/exim-4.69-r1.boolean_redefine_protect.152706.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 - - # 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 "$WORKDIR"/system_filter.exim - doins "$DISTDIR"/auth_conf.sub - if use exiscan; then - newins "${S}"/src/configure.default exim.conf.exiscan - doins "${DISTDIR}"/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/exim-4.69-r2.ebuild b/mail-mta/exim/exim-4.69-r2.ebuild index 420cacc50add..7d90f72455b5 100644 --- a/mail-mta/exim/exim-4.69-r2.ebuild +++ b/mail-mta/exim/exim-4.69-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.1 2008/09/24 18:07:18 peitolm Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.2 2009/07/02 19:58:07 grobian Exp $ inherit eutils @@ -149,8 +149,8 @@ src_unpack() { 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 + sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:" Makefile + sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile fi if [ -n "$myconf" ] ; then diff --git a/mail-mta/exim/exim-4.69.ebuild b/mail-mta/exim/exim-4.69.ebuild index 2620d79aff0e..7c044ddba994 100644 --- a/mail-mta/exim/exim-4.69.ebuild +++ b/mail-mta/exim/exim-4.69.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.10 2008/07/16 16:34:18 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.11 2009/07/02 19:58:07 grobian Exp $ inherit eutils @@ -144,8 +144,8 @@ src_unpack() { 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 + sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:" Makefile + sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile fi if [ -n "$myconf" ] ; then diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml index e6e2d3c9c81e..3a0ab2d9a5cd 100644 --- a/mail-mta/exim/metadata.xml +++ b/mail-mta/exim/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>net-mail</herd> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>grobian@gentoo.org</email> </maintainer> <longdescription> Exim is a message transfer agent (MTA) developed at the University of Cambridge |