diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-10 10:32:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-10 10:32:18 +0000 |
| commit | 1ef73eff5236c0a02dbd10a30d4beb8edc8a45c9 (patch) | |
| tree | 0a55a0a1747e60e15408b9ea681e84819dcefca1 /net-nds/openldap | |
| parent | Version bumped. Fixed homepage URI. Added a glibc-2.10 patch, Bug #280305. (diff) | |
| download | gentoo-2-1ef73eff5236c0a02dbd10a30d4beb8edc8a45c9.tar.gz gentoo-2-1ef73eff5236c0a02dbd10a30d4beb8edc8a45c9.tar.bz2 gentoo-2-1ef73eff5236c0a02dbd10a30d4beb8edc8a45c9.zip | |
Fix building with GCC 4.4+ wrt #280988.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.17-gcc44.patch | 11 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.17-r1.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index edf3ae0ca429..4b0881b756cf 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.346 2009/07/28 21:49:10 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.347 2009/08/10 10:32:18 ssuominen Exp $ + + 10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + openldap-2.4.17-r1.ebuild, +files/openldap-2.4.17-gcc44.patch: + Fix building with GCC 4.4+ wrt #280988. 28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.3.39-r2.ebuild, -openldap-2.3.40-r1.ebuild, diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch new file mode 100644 index 000000000000..aa7fe7ac35f6 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch @@ -0,0 +1,11 @@ +diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp +--- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300 ++++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300 +@@ -13,6 +13,7 @@ + #include <termios.h> + #endif + ++#include <stdio.h> + #include <string.h> + #include "SaslInteractionHandler.h" + #include "SaslInteraction.h" diff --git a/net-nds/openldap/openldap-2.4.17-r1.ebuild b/net-nds/openldap/openldap-2.4.17-r1.ebuild index 329e84b0473c..5ece295f57eb 100644 --- a/net-nds/openldap/openldap-2.4.17-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.17-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.2 2009/07/29 00:21:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.3 2009/08/10 10:32:18 ssuominen Exp $ EAPI="2" inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs @@ -176,6 +176,8 @@ src_prepare() { sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ "${S}"/include/ldap_defaults.h + epatch "${FILESDIR}"/${P}-gcc44.patch + epatch \ "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch |