Version bump for bug #322665
authorFabian Groffen <grobian@gentoo.org>
Thu, 3 Jun 2010 19:23:55 +0000 (19:23 +0000)
committerFabian Groffen <grobian@gentoo.org>
Thu, 3 Jun 2010 19:23:55 +0000 (19:23 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

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

index 385b6fcb3a3763e0f0cc3e3289b48ba8256d7e7a..9cb5bce9ab84112bd13eeac21eb19fdf76c963a2 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.161 2010/02/13 15:46:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.162 2010/06/03 19:23:55 grobian Exp $
+
+*exim-4.72 (03 Jun 2010)
+
+  03 Jun 2010; Fabian Groffen <grobian@gentoo.org> +exim-4.72.ebuild:
+  Version bump for bug #322665
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> exim-4.71.ebuild:
   alpha/ia64/sparc stable wrt #300133
index 9aead05170a27330dc9f7a38521ffab07207c389..bc8e3f0a3d09db28aa627c65b07b704286ff08f2 100644 (file)
@@ -14,6 +14,7 @@ AUX mailer.conf 259 RMD160 6412ac421b836f9425af443084dbaa49feb14df6 SHA1 690b15b
 AUX pam.d-exim 101 RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 SHA1 bdca3fb37937baa5da5e656c07ec333abfaa0f7d SHA256 80d94cb0b3ded20ed1513f4d5627969c4ce85d3006c702eb24920ffa01eec674
 DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exim-4.71.tar.bz2 1560170 RMD160 22e4ad1d43693d61fa1f2f2de40dda647599a087 SHA1 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990 SHA256 e754756f1d6cf393a0d58a2569e7ef4860aa8f797d030ec9887c2b310030bbc5
+DIST exim-4.72.tar.bz2 1559031 RMD160 e3ae8dbb056890d49e21e2ba6eaf9cf789ca2c18 SHA1 3aab453faaa076a6b5f02320d7f8ad8aba21b347 SHA256 4299bc3dc84a82f5c94494006b49acba159ad8a1fe5dd647f7ee2f9bfe78920b
 DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2eb SHA1 3d1d7115dd80a974d40febbdef844d87860b8729 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
@@ -21,5 +22,6 @@ EBUILD exim-4.69-r3.ebuild 9858 RMD160 94d8246f56a582dab235058632964f1d4bdd8bc6
 EBUILD exim-4.69-r4.ebuild 9925 RMD160 74fa2da80bc46823bb9be8c5e2250be838034df9 SHA1 89849a8c8c669aa118d33d16f1b245457008ecd9 SHA256 cf2d76519d1f6244ceb5d19e136a7d0bb9c4ff56e71f37f399e15a2661e5eeca
 EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
 EBUILD exim-4.71.ebuild 10051 RMD160 16ed51c76c39b73aab8e4d52b25094e802e14441 SHA1 831f5c676eba21e2633df33b033c42c949d9124f SHA256 38f191588dec888117d81e51eff11cd644f98feab6837b8356aabf7607b6ae68
-MISC ChangeLog 35012 RMD160 1c16cb883843ec75764c09c154713ebf57a04c22 SHA1 0644eb881f8da712e181d26a01c96e8cf8cd50ed SHA256 90a3b695f3873051aceb31c6bfd4c075398c3c5ae8ee4fc7fedf760086e360b1
+EBUILD exim-4.72.ebuild 10211 RMD160 9067de1c44c050ad453ea8a49fdafac4aa3873fb SHA1 a8ea622188cac5b350417073927aeb282d9f283d SHA256 b141e0a90349a558405eafddc9b5ee4b1c0d3c8eed8d6b6d0da2d05c3651150f
+MISC ChangeLog 35140 RMD160 d7dc64d959dddf160b92db7e348be9ea66ecfec4 SHA1 e600fe1d9c1719b7b18f603b0f6940719777eac6 SHA256 2b15cf98c6005465032d70eb85779dd96f1e34cccd0e18f14a8474192fa482e8
 MISC metadata.xml 1792 RMD160 6220368a815bce6ab738abc114bad380853e17ae SHA1 0f0ceb106180c7f272f27af27ba1a700fa908d45 SHA256 08b60262a51b692d892ebdafceb4717c06ecfb33cd858d085e978ce28360d041
diff --git a/mail-mta/exim/exim-4.72.ebuild b/mail-mta/exim/exim-4.72.ebuild
new file mode 100644 (file)
index 0000000..38806d7
--- /dev/null
@@ -0,0 +1,318 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.72.ebuild,v 1.1 2010/06/03 19:23:55 grobian Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs multilib pam
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc dsn"
+
+DSN_EXIM_V=469
+DSN_V=1_3
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
+       mirror://gentoo/system_filter.exim.gz
+       dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )"
+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
+       >=sys-libs/db-3.2
+       dev-libs/libpcre
+       perl? ( sys-devel/libperl )
+       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 )
+       virtual/libiconv
+       "
+       # added X check for #57206
+RDEPEND="${DEPEND}
+       !virtual/mta
+       !net-mail/mailwrapper
+       >=net-mail/mailbase-0.00-r5
+       virtual/logger
+       dcc? ( mail-filter/dcc )
+       "
+
+src_prepare() {
+       epatch "${FILESDIR}"/exim-4.14-tail.patch
+       epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch
+       epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+       # for cross-compilation, but currently breaks normal compiles :/ #266591
+       #epatch "${FILESDIR}"/${P}-buildconfig-cross-compile.patch
+
+       use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
+       use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
+}
+
+src_configure() {
+       local myconf
+
+       sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/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=${EPREFIX}/usr/sbin:" \
+               -e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+               -e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+               -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
+               -e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+               -e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \
+               -e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \
+               -e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \
+               -e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/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=${EPREFIX}/bin/zcat:" \
+               -e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
+               src/EDITME > Local/Makefile
+
+       # exiscan-acl is now integrated - enable 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
+       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=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/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=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
+               sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
+       fi
+       if [[ -n ${myconf} ]] ; then
+               echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
+       fi
+
+       # make iconv usage explicit
+       echo "HAVE_ICONV=yes" >> Makefile
+       # if we use libiconv, now is the time to tell so
+       use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+       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${EROOT}usr/include/ldap"
+               LOOKUP_LIBS="-lldap -llber"
+       fi
+
+       if use mysql; then
+               sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
+               LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
+               LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
+       fi
+
+       if use postgres; then
+               sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
+               LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}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${EROOT}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 -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
+                       -e "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 dkim; then
+               # DKIM is enabled by default. We have to explicitly disable it.
+               echo "DISABLE_DKIM=yes">> Local/Makefile
+       fi
+       if use dcc; then
+               echo "EXPERIMENTAL_DCC=yes">> Local/Makefile
+       fi
+       if use dsn; then
+               sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Local/Makefile
+       fi
+
+       # use the "native" interface to the DBM library
+       echo "USE_DB=yes" >> "${S}"/Local/Makefile
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)" FULLECHO='' || 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 exim /usr/sbin/sendmail
+       dosym exim /usr/sbin/rsmtp
+       dosym exim /usr/sbin/rmail
+       dosym /usr/sbin/exim /usr/bin/mailq
+       dosym /usr/sbin/exim /usr/bin/newaliases
+       dosym /usr/sbin/sendmail /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 exiqgrep \
+               convert4r3 convert4r4 exipick
+       do
+               doexe $i
+       done
+
+       dodoc "${S}"/doc/*
+       doman "${S}"/doc/exim.8
+       use dsn && dodoc "${S}"/README.DSN
+
+       # 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 "${FILESDIR}"/auth_conf.sub
+
+       pamd_mimic system-auth exim auth account
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}/exim.logrotate" exim
+
+       newinitd "${FILESDIR}"/exim.rc6 exim
+
+       newconfd "${FILESDIR}"/exim.confd exim
+
+       DIROPTIONS="--mode=0750 --owner=mail --group=mail"
+       dodir /var/log/${PN}
+}
+
+pkg_postinst() {
+       einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+       einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+       einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+       if use dcc ; then
+               einfo "DCC support is experimental, you can find some limited"
+               einfo "documentation at the bottom of this prerelease message:"
+               einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+       fi
+}