grobian 14/05/28 12:56:48 Modified: ChangeLog Added: exim-4.82.1.ebuild Log: Version bump for CVE-2014-2957 (Portage version: HEAD/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.275 mail-mta/exim/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.275&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.275&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?r1=1.274&r2=1.275 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- ChangeLog 4 Mar 2014 21:22:02 -0000 1.274 +++ ChangeLog 28 May 2014 12:56:48 -0000 1.275 @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/exim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.274 2014/03/04 21:22:02 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.275 2014/05/28 12:56:48 grobian Exp $ + +*exim-4.82.1 (28 May 2014) + + 28 May 2014; Fabian Groffen <[email protected]> +exim-4.82.1.ebuild: + Version bump for CVE-2014-2957 04 Mar 2014; Naohiro Aota <[email protected]> exim-4.82-r1.ebuild: Add ~x86-fbsd #489736 1.1 mail-mta/exim/exim-4.82.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.82.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.82.1.ebuild?rev=1.1&content-type=text/plain Index: exim-4.82.1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.1.ebuild,v 1.1 2014/05/28 12:56:48 grobian Exp $ EAPI="5" inherit eutils toolchain-funcs multilib pam systemd IUSE="dcc +dkim dlfunc dmarc dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres prdr radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X" REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )" DSN_EXIM_V=482 # local version patched by us DSN_V=1_3 COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)" DESCRIPTION="A highly configurable, drop-in replacement for sendmail" SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )" #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="~amd64 ~hppa ~x86-fbsd ~x86-solaris" COMMON_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 ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) selinux? ( sec-policy/selinux-exim ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) 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 DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) " S=${WORKDIR}/${P//rc/RC} src_prepare() { epatch "${FILESDIR}"/exim-4.14-tail.patch epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch epatch "${FILESDIR}"/exim-4.69-r1.27021.patch epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785 epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279 epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 if use maildir ; then epatch "${FILESDIR}"/exim-4.20-maildir.patch else epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 fi if use dsn ; then epatch "${FILESDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch fi # user Exim believes it should be MAILUSER=mail MAILGROUP=mail if use prefix && [[ ${EUID} != 0 ]] ; then MAILUSER=$(id -un) MAILGROUP=$(id -gn) fi } 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 sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile sed -e "48i\CFLAGS=${CFLAGS}" \ -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \ -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}/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=${MAILUSER}:" \ -e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \ -e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \ -e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \ -e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \ -e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \ -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ src/EDITME > Local/Makefile cd Local # 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:" Makefile sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile fi if use spf; then myconf="${myconf} -lspf2" sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Makefile mycflags="${mycflags} -DEXPERIMENTAL_SPF" fi if use dmarc; then myconf="${myconf} -lopendmarc" sed -i "s:# EXPERIMENTAL_DMARC=yes:EXPERIMENTAL_DMARC=yes:" Makefile mycflags="${mycflags} -DEXPERIMENTAL_DMARC" fi if use srs; then myconf="${myconf} -lsrs_alt" sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile fi # 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}/run/saslauthd/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:TRANSPORT_LMTP=yes:" 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 echo "EXTRALIBS=${myconf}" >> Makefile # 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 if use ssl; then echo "SUPPORT_TLS=yes" >> Makefile if use gnutls; then echo "USE_GNUTLS=yes" >> Makefile echo "USE_GNUTLS_PC=gnutls" >> Makefile use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile else echo "USE_OPENSSL_PC=openssl" >> 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:" Makefile LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap" LOOKUP_LIBS="-lldap -llber" fi if use redis; then sed -i "s:# EXPERIMENTAL_REDIS=yes:EXPERIMENTAL_REDIS=yes:" Makefile LOOKUP_LIBS="$LOOKUP_LIBS -lhiredis" fi if use mysql; then sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile LOOKUP_INCLUDE="$LOOKUP_INCLUDE $(mysql_config --include)" LOOKUP_LIBS="$LOOKUP_LIBS $(mysql_config --libs)" fi if use postgres; then sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I$(pg_config --includedir)" LOOKUP_LIBS="$LOOKUP_LIBS -L$(pg_config --libdir) -lpq" fi if use sqlite; then echo "LOOKUP_SQLITE=yes" >> Makefile echo "LOOKUP_SQLITE_PC=sqlite3" >> Makefile 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:" \ 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:" \ Makefile fi sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile if use dnsdb; then sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile fi sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile if use nis; then sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \ -e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile fi if use syslog; then sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile fi if ! use dkim; then # DKIM is enabled by default. We have to explicitly disable it. echo "DISABLE_DKIM=yes">> Makefile fi if use dcc; then echo "EXPERIMENTAL_DCC=yes">> Makefile fi if use dsn; then sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile fi if use dlfunc; then sed -i -e "/^# EXPAND_DLFUNC=yes/s/^# //" Makefile fi if use prdr; then sed -i -e "s:# EXPERIMENTAL_PRDR=yes:EXPERIMENTAL_PRDR=yes:" Makefile fi if use tpda; then sed -i -e "s:# EXPERIMENTAL_TPDA=yes:EXPERIMENTAL_TPDA=yes:" Makefile fi # use the "native" interface to the DBM library echo "USE_DB=yes" >> Makefile echo "DBMLIB=-ldb" >> Makefile } src_compile() { emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" 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 use doc && dohtml -r "${WORKDIR}"/${PN}-html-${PV//rc/RC}/doc/html/spec_html/* # 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 # headers, #436406 if use dlfunc ; then # fixup includes so they actually can be found when including sed -i \ -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \ local_scan.h || die insinto /usr/include/exim doins {config,local_scan}.h ../src/{mytypes,store}.h fi insinto /etc/logrotate.d newins "${FILESDIR}/exim.logrotate" exim newinitd "${FILESDIR}"/exim.rc8 exim newconfd "${FILESDIR}"/exim.confd exim systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket} systemd_newunit "${FILESDIR}"/exim_at.service '[email protected]' systemd_newunit "${FILESDIR}"/exim-submission_at.service '[email protected]' DIROPTIONS="-m 0750 -o ${MAILUSER} -g ${MAILGROUP}" dodir /var/log/${PN} } pkg_postinst() { if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then 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." fi 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 if use dmarc ; then einfo "DMARC support is experimental. See global settings to" einfo "configure DMARC, for usage see the documentation at " einfo "experimental-spec.txt." fi einfo "Exim maintains some db files under its spool directory that need" einfo "cleaning from time to time. (${EROOT}var/spool/exim/db)" einfo "Please use the exim_tidydb tool as documented in the Exim manual:" einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch-exim_utilities.html#SECThindatmai"; }
