| 1 |
grobian 11/02/01 12:56:28 |
| 2 |
|
| 3 |
Modified: exim-4.74-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Build related fixes for #287426 and possibly #352265 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 mail-mta/exim/exim-4.74-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: exim-4.74-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- exim-4.74-r1.ebuild 1 Feb 2011 11:42:02 -0000 1.1 |
| 23 |
+++ exim-4.74-r1.ebuild 1 Feb 2011 12:56:28 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.1 2011/02/01 11:42:02 grobian Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.2 2011/02/01 12:56:28 grobian Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
@@ -61,6 +61,7 @@ |
| 33 |
epatch "${FILESDIR}"/exim-4.14-tail.patch |
| 34 |
epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch |
| 35 |
epatch "${FILESDIR}"/exim-4.69-r1.27021.patch |
| 36 |
+ epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 |
| 37 |
# from upstream |
| 38 |
epatch "${FILESDIR}"/${P}-pcre.patch |
| 39 |
epatch "${FILESDIR}"/${P}-makefile-posix.patch |
| 40 |
@@ -76,7 +77,6 @@ |
| 41 |
sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default |
| 42 |
cp "${S}"/src/configure.default "${S}"/src/configure.default.orig |
| 43 |
|
| 44 |
- # includes typo fix for bug #47106 |
| 45 |
sed -e "48i\CFLAGS=${CFLAGS}" \ |
| 46 |
-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \ |
| 47 |
-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \ |
| 48 |
@@ -160,9 +160,7 @@ |
| 49 |
sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile |
| 50 |
sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile |
| 51 |
fi |
| 52 |
- if [[ -n ${myconf} ]] ; then |
| 53 |
- echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile |
| 54 |
- fi |
| 55 |
+ echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile |
| 56 |
|
| 57 |
# make iconv usage explicit |
| 58 |
echo "HAVE_ICONV=yes" >> Makefile |
| 59 |
@@ -205,11 +203,13 @@ |
| 60 |
LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql" |
| 61 |
LOOKUP_LIBS="$LOOKUP_LIBS -lpq" |
| 62 |
fi |
| 63 |
+ |
| 64 |
if use sqlite; then |
| 65 |
sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile |
| 66 |
LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/sqlite" |
| 67 |
LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3" |
| 68 |
fi |
| 69 |
+ |
| 70 |
if [[ -n ${LOOKUP_INCLUDE} ]]; then |
| 71 |
sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \ |
| 72 |
Local/Makefile |
| 73 |
@@ -248,7 +248,7 @@ |
| 74 |
fi |
| 75 |
|
| 76 |
# use the "native" interface to the DBM library |
| 77 |
- echo "USE_DB=yes" >> "${S}"/Local/Makefile |
| 78 |
+ echo "USE_DB=yes" >> Local/Makefile |
| 79 |
} |
| 80 |
|
| 81 |
src_compile() { |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.176 mail-mta/exim/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.176&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.176&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?r1=1.175&r2=1.176 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v |
| 94 |
retrieving revision 1.175 |
| 95 |
retrieving revision 1.176 |
| 96 |
diff -u -r1.175 -r1.176 |
| 97 |
--- ChangeLog 1 Feb 2011 11:42:02 -0000 1.175 |
| 98 |
+++ ChangeLog 1 Feb 2011 12:56:28 -0000 1.176 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for mail-mta/exim |
| 101 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.175 2011/02/01 11:42:02 grobian Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.176 2011/02/01 12:56:28 grobian Exp $ |
| 104 |
+ |
| 105 |
+ 01 Feb 2011; Fabian Groffen <grobian@g.o> exim-4.74-r1.ebuild, |
| 106 |
+ +files/exim-4.74-radius-db-ENV-clash.patch: |
| 107 |
+ Build related fixes for #287426 and possibly #352265 |
| 108 |
|
| 109 |
*exim-4.74-r1 (01 Feb 2011) |
Archives