Build related fixes for #287426 and possibly #352265

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 33 insertions, 7 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index e5ea63d449f6..01a6775a93bd 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.175 2011/02/01 11:42:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.176 2011/02/01 12:56:28 grobian Exp $
+
+  01 Feb 2011; Fabian Groffen <grobian@gentoo.org> exim-4.74-r1.ebuild,
+  +files/exim-4.74-radius-db-ENV-clash.patch:
+  Build related fixes for #287426 and possibly #352265
 
 *exim-4.74-r1 (01 Feb 2011)
 
diff --git a/mail-mta/exim/exim-4.74-r1.ebuild b/mail-mta/exim/exim-4.74-r1.ebuild
index 93b1036064a3..06317a8b64b0 100644
--- a/mail-mta/exim/exim-4.74-r1.ebuild
+++ b/mail-mta/exim/exim-4.74-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.1 2011/02/01 11:42:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.2 2011/02/01 12:56:28 grobian Exp $
 
 EAPI="3"
 
@@ -61,6 +61,7 @@ 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
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
 	# from upstream
 	epatch "${FILESDIR}"/${P}-pcre.patch
 	epatch "${FILESDIR}"/${P}-makefile-posix.patch
@@ -76,7 +77,6 @@ src_configure() {
 	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:" \
@@ -160,9 +160,7 @@ src_configure() {
 		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
+	echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
 
 	# make iconv usage explicit
 	echo "HAVE_ICONV=yes" >> Makefile
@@ -205,11 +203,13 @@ src_configure() {
 		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
@@ -248,7 +248,7 @@ src_configure() {
 	fi
 
 	# use the "native" interface to the DBM library
-	echo "USE_DB=yes" >> "${S}"/Local/Makefile
+	echo "USE_DB=yes" >> Local/Makefile
 }
 
 src_compile() {
diff --git a/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch b/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch
new file mode 100644
index 000000000000..247668ef3da3
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch
@@ -0,0 +1,22 @@
+Nasty workaround for
+http://bugs.gentoo.org/show_bug.cgi?id=287426
+
+--- src/auths/call_radius.c
++++ src/auths/call_radius.c
+@@ -10,6 +10,16 @@
+ /* This file was originally supplied by Ian Kirk. The libradius support came
+ from Alex Kiernan. */
+ 
++/* ugly hack to work around redefinition of ENV by radiusclient.h and
++ * db.h: define _DB_H_ so the db.h include thinks it's already included,
++ * we can get away with it like this, since this file doesn't use any db
++ * functions. */
++#ifndef _DB_H_
++#define _DB_H_ 1
++#define _DB_EXT_PROT_IN_ 1
++#define DB void
++#endif
++
+ #include "../exim.h"
+ 
+ /* This module contains functions that call the Radius authentication