summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-06-17 13:27:12 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-06-17 13:27:12 +0000
commit03a4b9d64742419082d0d10d284e239d0a0c66b8 (patch)
treec355924122a69c1831eba4f61a4499f748e6dbfc /mail-mta
parentAdded newest version which fixes security bug mentioned in imagemagick change... (diff)
downloadgentoo-2-03a4b9d64742419082d0d10d284e239d0a0c66b8.tar.gz
gentoo-2-03a4b9d64742419082d0d10d284e239d0a0c66b8.tar.bz2
gentoo-2-03a4b9d64742419082d0d10d284e239d0a0c66b8.zip
enabled controldb unconditionally (doesn't compile otherwise, and falls back anyway)
(Portage version: 2.1.2.9)
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/qmail-ldap/ChangeLog6
-rw-r--r--mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild9
2 files changed, 9 insertions, 6 deletions
diff --git a/mail-mta/qmail-ldap/ChangeLog b/mail-mta/qmail-ldap/ChangeLog
index 9125fe180b51..1387b010d243 100644
--- a/mail-mta/qmail-ldap/ChangeLog
+++ b/mail-mta/qmail-ldap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-mta/qmail-ldap
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.18 2007/06/17 11:15:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.19 2007/06/17 13:27:12 hollow Exp $
+
+ 17 Jun 2007; Benedikt Böhm <hollow@gentoo.org> qmail-ldap-1.03-r6.ebuild:
+ enabled controldb unconditionally (doesn't compile otherwise, and falls back
+ anyway)
17 Jun 2007; Benedikt Böhm <hollow@gentoo.org> qmail-ldap-1.03-r6.ebuild:
install qmailControl.schema if controldb is in USE
diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild
index 263dea2c6e24..8c2ec93317dd 100644
--- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild
+++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild,v 1.2 2007/06/17 11:15:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r6.ebuild,v 1.3 2007/06/17 13:27:12 hollow Exp $
inherit eutils toolchain-funcs fixheadtails flag-o-matic
@@ -25,7 +25,7 @@ SRC_URI="
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cluster controldb gencertdaily highvolume mailwrapper qmail-spp rfc2307 rfc822 ssl zlib"
+IUSE="cluster gencertdaily highvolume mailwrapper qmail-spp rfc2307 rfc822 ssl zlib"
RESTRICT="test"
DEPEND="
@@ -97,14 +97,13 @@ src_unpack() {
local INCLUDES="-I/usr/include"
local LDAPLIBS="-L/usr/lib -lldap -llber"
local LDAPFLAGS="-DALTQUEUE -DEXTERNAL_TODO -DDASH_EXT -DSMTPEXECCHECK"
- local SECUREBIND= CONTROLDB= RFCFLAGS=
+ local CONTROLDB="-DUSE_CONTROLDB -DQLDAP_BAILOUT"
+ local SECUREBIND= RFCFLAGS=
use cluster && LDAPFLAGS="${LDAPFLAGS} -DQLDAP_CLUSTER"
use highvolume && LDAPFLAGS="${LDAPFLAGS} -DBIGTODO"
use zlib && LDAPFLAGS="${LDAPFLAGS} -DDATA_COMPRESS -D QMQP_COMPRESS"
- use controldb && CONTROLDB="-DUSE_CONTROLDB -DQLDAP_BAILOUT"
-
use rfc2307 && RFCFLAGS="${RFCFLAGS} -DRFC2307"
use rfc822 && RFCFLAGS="${RFCFLAGS} -DRFC822"