summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2010-03-09 00:43:13 +0000
committerDaniel Black <dragonheart@gentoo.org>2010-03-09 00:43:13 +0000
commit68b5c7bccfa909d4097969ec5e5ca30679c71049 (patch)
treed669fc9d7a6ce49d6add7823c6813d22b0d38a23
parentold (diff)
downloadgentoo-2-68b5c7bccfa909d4097969ec5e5ca30679c71049.tar.gz
gentoo-2-68b5c7bccfa909d4097969ec5e5ca30679c71049.tar.bz2
gentoo-2-68b5c7bccfa909d4097969ec5e5ca30679c71049.zip
fix for bug #308171 to enable compulation with USE=ldap,-lua. Thanks to Guillaume Castagnino
(Portage version: 2.2_rc65/cvs/Linux x86_64)
-rw-r--r--mail-filter/opendkim/ChangeLog7
-rw-r--r--mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch25
-rw-r--r--mail-filter/opendkim/opendkim-2.0.0.ebuild6
3 files changed, 35 insertions, 3 deletions
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index c24e71613f27..dd31246cfa9f 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-filter/opendkim
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.9 2010/03/05 19:29:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.10 2010/03/09 00:43:12 dragonheart Exp $
+
+ 09 Mar 2010; Daniel Black <dragonheart@gentoo.org> opendkim-2.0.0.ebuild,
+ +files/opendkim-2.0.0-lua-ldap.patch:
+ fix for bug #308171 to enable compulation with USE=ldap,-lua. Thanks to
+ Guillaume Castagnino
*opendkim-2.0.0 (05 Mar 2010)
diff --git a/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch b/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
new file mode 100644
index 000000000000..c80884d8870d
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
@@ -0,0 +1,25 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/opendkim/configure.ac,v
+retrieving revision 1.139
+retrieving revision 1.140
+diff -u -b -B -r1.139 -r1.140
+--- configure.ac 3 Mar 2010 16:32:55 -0000 1.139
++++ configure.ac 7 Mar 2010 17:17:57 -0000 1.140
+@@ -3,7 +3,7 @@
+ #
+ # Copyright (c) 2009, 2010 The OpenDKIM Project. All rights reserved.
+ #
+-# $Id: opendkim-2.0.0-lua-ldap.patch,v 1.1 2010/03/09 00:43:13 dragonheart Exp $
++# $Id: opendkim-2.0.0-lua-ldap.patch,v 1.1 2010/03/09 00:43:13 dragonheart Exp $
+
+ #
+ # Setup
+@@ -1063,7 +1063,6 @@
+ AC_MSG_RESULT([ok]),
+ AC_MSG_ERROR([OpenLDAP version 2.1.3 or later required]))
+ CPPFLAGS="$saved_CPPFLAGS"
+- AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
+ AC_DEFINE([USE_LDAP], 1, [OpenLDAP support for datasets enabled])
+ fi
+ AM_CONDITIONAL(USE_LDAP, test x"$ldap_found" = x"yes")
diff --git a/mail-filter/opendkim/opendkim-2.0.0.ebuild b/mail-filter/opendkim/opendkim-2.0.0.ebuild
index 238574cfc653..c371a1c1a4f8 100644
--- a/mail-filter/opendkim/opendkim-2.0.0.ebuild
+++ b/mail-filter/opendkim/opendkim-2.0.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.1 2010/03/05 19:29:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.2 2010/03/09 00:43:12 dragonheart Exp $
EAPI="2"
-inherit eutils
+inherit eutils autotools
# for betas
#MY_P=${P/_b/.B}
@@ -46,6 +46,8 @@ src_prepare() {
sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-e 's:/etc/mail:/etc/opendkim:g' \
opendkim/opendkim.conf.sample
+ epatch "${FILESDIR}"/${P}-lua-ldap.patch
+ eautoreconf
}
src_configure() {