Bug #186391 - use krb5-config --cflags instead of hardcoding -I/usr/include/heimdal. Untested due to lack of kerberos systems.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

4 files changed, 27 insertions, 12 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 9dd18b59f850..938627c46a5c 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.335 2008/10/14 09:18:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.336 2008/10/14 10:08:38 robbat2 Exp $
+
+  14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild:
+  Bug #186391 - use krb5-config --cflags instead of hardcoding
+  -I/usr/include/heimdal. Untested due to lack of kerberos systems.
 
 *openldap-2.4.11-r1 (14 Oct 2008)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 8103017c4463..92b07fad48cd 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -22,11 +22,11 @@ EBUILD openldap-2.3.39-r2.ebuild 17585 RMD160 ddfd345419a591238c628b03904bb54bd8
 EBUILD openldap-2.3.40-r1.ebuild 17595 RMD160 723f7e06a6ab06227cd2ca4502780163516192f9 SHA1 f073d59465a93aaf60d2da85eded5ff98a8a8ad2 SHA256 3980c63c1f55b874313c6726cdaa8c460f67586ea7cd2f76b6123befcdab1d8d
 EBUILD openldap-2.3.41-r1.ebuild 17759 RMD160 d090cc892c2bfed850d84aa61d80683e6d104c6a SHA1 8372fe77cc4eef2827dcf7d2c1563e9e90652026 SHA256 dfc6f8a1a4df8fa74e2a4fdd3c2b1a002d737fc3ed80b6897a0588f8a77e85fe
 EBUILD openldap-2.3.41.ebuild 17656 RMD160 01abbed03acbbc3574c8ab533eefb3e22d5616ff SHA1 63a845b4ac83c058ac8d2e548ef3d25ab153c9f3 SHA256 f65fc3912368b1628cbfd47d929fdfe4327b146f13de6fb56e388489e43ca82b
-EBUILD openldap-2.3.43-r1.ebuild 17796 RMD160 df274823081fb94525a4249ab7f39772f50eb7d7 SHA1 9f93992c96b03bbd606c4b60ddc6d2ddc9d18338 SHA256 e0cb242aa05fff3b473e03e1ef8b88b0493817e3a4e2093ca74ed919e12dd4ea
+EBUILD openldap-2.3.43-r1.ebuild 17825 RMD160 b44b451264b8578bd6ca5c8244dcb76f15882235 SHA1 e62fbb796c0d03ff360c58823d5827eecfc6efe4 SHA256 8b52ab9767d9819695b1fad09fdee13712340ed9cb154ffea7db684478cb1826
 EBUILD openldap-2.3.43.ebuild 17750 RMD160 d413e98956f47b8b12e58d05f1fe7dc8635ee265 SHA1 591851f81fc3e25feb6646dfd27cd0e8d69aec11 SHA256 6068c190e12d339f976cc96a9d48baf987f6544ef9e688637740c93200e78c8c
 EBUILD openldap-2.4.10.ebuild 13887 RMD160 3a63c3a7270fdc0236922570b2b9b0bd233b75cb SHA1 6ad2722d0a1d11265e733d117d166589b18f5a6d SHA256 291ab646b54ac7f286f5c33dc9087921cd6a39957442540b4ed4f88d5e757aa3
-EBUILD openldap-2.4.11-r1.ebuild 14124 RMD160 2f6b01f53295d74e34a3211a654fff3ace4e7be5 SHA1 013aef84bdc33cf8f6c9221777dca0fd741e6466 SHA256 61b8f06396ffc662a6daa57214490def225b80c1a9123ce1883c5495ca9c8bad
+EBUILD openldap-2.4.11-r1.ebuild 14199 RMD160 32054ccf8695ce25f73e9e9a4de2655882a3a1e9 SHA1 01e19efc20eb8c917277c970e13aa73372dec9da SHA256 967ab68f4cd513ead7320dbacdbebda15cdd2a48d087e1d3543a1c01ac78ada5
 EBUILD openldap-2.4.11.ebuild 13885 RMD160 60891d864822b679200c8c6aca68275a307fb58f SHA1 93b50df0424a83e325f4a0ae6df4d40791314270 SHA256 749787c150151334ab7a424fc574453156b7720d9a313cd61e65c1adada2b977
 EBUILD openldap-2.4.7.ebuild 11106 RMD160 093948db1357a06b60826d76dbb870d49985409a SHA1 a8fc14a97e6b8a78ad9b11b69ac8408b8351c0bd SHA256 01b233c023499c7c423c838106b73ff9f620ba70d0b50dd954c843f6799f5305
-MISC ChangeLog 56568 RMD160 8925e014560c8bd3cebed970780fc63a56c174fa SHA1 719cabd29a5e12a3c0aa734041a0ea6cd20b7e81 SHA256 37df9b8af2f98d1fd1cc4f563669d3e6ad995eb9a39af5ec9835534f7f394205
+MISC ChangeLog 56809 RMD160 2d920aded18b9bef2dccbbf71f0f0055e0de19ec SHA1 011a3e130e1d8b4b23a475f39e98b6a3b0117f16 SHA256 c548bc56322de044d4b6ac6b0296e372c16e818a0ba26766936e13a7c409e647
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index d06f3e91bdff..eb3aa148b22e 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.1 2008/10/14 08:59:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.2 2008/10/14 10:08:38 robbat2 Exp $
 
 EAPI="1"
 
@@ -327,6 +327,7 @@ src_compile() {
 			einfo "Building contributed pw-kerberos"
 			cd "${S}"/contrib/slapd-modules/passwd/ && \
 			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			$(krb5-config --cflags) \
 			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
 			die "failed to compile kerberos password module"
 		fi
@@ -345,7 +346,7 @@ src_compile() {
 			local mydef
 			local mykrb5inc
 			mydef="-DDO_SAMBA -DDO_KRB5"
-			mykrb5inc="-I/usr/include/heimdal/"
+			mykrb5inc="$(krb5-config --cflags)"
 			cd "${S}"/contrib/slapd-modules/smbk5pwd && \
 			libexecdir="/usr/$(get_libdir)/openldap" \
 			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
diff --git a/net-nds/openldap/openldap-2.4.11-r1.ebuild b/net-nds/openldap/openldap-2.4.11-r1.ebuild
index 9accd31a7cba..5a823d889d21 100644
--- a/net-nds/openldap/openldap-2.4.11-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.1 2008/10/14 09:18:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.2 2008/10/14 10:08:38 robbat2 Exp $
 
 EAPI="1"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -288,7 +288,7 @@ src_compile() {
 
 			emake \
 				DEFS="-DDO_SAMBA -DDO_KRB5" \
-				KRB5_INC="-I/usr/include/heimdal" \
+				KRB5_INC="$(krb5-config --cflags)" \
 				CC=$(tc-getCC) \
 				|| die "emake smbk5pwd failed"
 		fi
@@ -297,15 +297,24 @@ src_compile() {
 			cd "${S}/contrib/slapd-modules/passwd"
 			einfo "Building contrib-module: pw-kerberos"
 			$(tc-getCC) -shared \
-				-I../../../include ${CFLAGS} -DHAVE_KRB5 -fPIC \
-				${LDFLAGS} -o pw-kerberos.so kerberos.c || die "building pw-kerberos failed"
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 -fPIC \
+				${LDFLAGS} \
+				-o pw-kerberos.so \
+				kerberos.c || die "building pw-kerberos failed"
 		fi
 		# We could build pw-radius if GNURadius would install radlib.h
 		cd "${S}/contrib/slapd-modules/passwd"
 		einfo "Building contrib-module: pw-netscape"
 		$(tc-getCC) -shared \
-			-I../../../include ${CFLAGS} -fPIC \
-			${LDFLAGS} -o pw-netscape.so netscape.c || die "building pw-netscape failed"
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o pw-netscape.so \
+			netscape.c || die "building pw-netscape failed"
 
 		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
 		build_contrib_module "allop" "allop.c" "overlay-allop"