From: Eray Aslan Date: Sat, 5 Nov 2011 21:54:01 +0000 (+0000) Subject: Fix compiling against heimdal - bug #359005. Thanks to Rafał Mużyło. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dea42bdb4d5cef9e695cee49331aaa6e2e264500;p=gentoo.git Fix compiling against heimdal - bug #359005. Thanks to Rafał Mużyło. Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- diff --git a/net-misc/gsasl/ChangeLog b/net-misc/gsasl/ChangeLog index 2fde17326d54..7c3d9d11bf33 100644 --- a/net-misc/gsasl/ChangeLog +++ b/net-misc/gsasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/gsasl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.45 2011/08/06 16:33:51 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.46 2011/11/05 21:54:01 eras Exp $ + + 05 Nov 2011; Eray Aslan gsasl-1.6.1.ebuild, + +files/gsasl-gss-extra.patch: + Fix compiling against heimdal - bug #359005. Thanks to Rafał Mużyło. 06 Aug 2011; Eray Aslan -gsasl-0.2.4.ebuild, -gsasl-0.2.29.ebuild, -gsasl-1.1.ebuild, -gsasl-1.4.1.ebuild, diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest index 14a3f85f43a0..021d6f619e60 100644 --- a/net-misc/gsasl/Manifest +++ b/net-misc/gsasl/Manifest @@ -1,24 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX gsasl-gss-extra.patch 951 RMD160 b8475cd6d626ba9a1d7ec34c03574e44824b0906 SHA1 3f428ec77f7fa9ffd9cdb9cf41ad883319ab1cc3 SHA256 68223ba6c2367bd48afa18ed0470efd808b9a563c579920136507b202926dde8 DIST gsasl-1.6.1.tar.gz 4623634 RMD160 510661e88a41300ad3b32dd4a6bd6236aab28c78 SHA1 5439fd32ac975c36015263fafdc79ededdd57c72 SHA256 e68b7df563939b107a6e9bddae6ae587a3632405f856122e0233e239b4cab509 -EBUILD gsasl-1.6.1.ebuild 1453 RMD160 4f243080f8ff84434f09acc42b4f28c98b8793b5 SHA1 69600b439b53f3a6d6e319bcfb04a67b8a170f7d SHA256 3d038efec0ad7e98572c8f1bab9f52e6d4e34b733aba2bd962c19b3d4680d03d -MISC ChangeLog 6167 RMD160 78d38d425f6b5caad895b6221cb69f727bc5c28b SHA1 8d60bbee32d1e4297f805d760318738e90651c0c SHA256 2799df40e77d87697b9e56f10c74518f53496d3fbd7ca9cd1b1860920ccf5a09 +EBUILD gsasl-1.6.1.ebuild 1527 RMD160 44bda12874511c2701fe16d4c35ee7a77d73436f SHA1 c3bc9ab687d741c6f1d8f461151beb4e961307c9 SHA256 21a2d8c397959d877b17b99249b0b6c8b930a4b58d778850af5439df4ec04233 +MISC ChangeLog 6338 RMD160 a9e4e1b2697668b4a3ee7f6883544e6f3bedb748 SHA1 dddbd5a8d112dda69274819eb9278ae4379256c6 SHA256 13381b9afcceb4e8440e49a862c293d74767b68798bc03ede149590f14263e29 MISC metadata.xml 365 RMD160 a9616de37d5f2718e4e95825189c64a4f4398acd SHA1 c3333e09a308799c49f9bf48b7351e158aae9595 SHA256 69909f3d81df55423fb7cb4b87a8968972ddb092e117f317d79fcda8e3b4256b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOPWz0AAoJEHfx8XVYajsfK6kP/A0gFCotTODVm52GaApHRsgo -EWsFx6DFHg/kmN+C5nO3gYb8uO74KLW/Rx1fR1TNrzwOeyLGiJLT3275Ct/UwBnl -xfcg3IFCOen4dA7R3whXF+ggN5GQ8fQDICM9WFVHvw6KQvtf0deLhn8CTOG60XsI -4rAOyucaoM8WPrlU3Un4RkJ7TDZ8N6+y8C7MAUFoIcE+U/5tE8rgLPpUH969NhcH -QOGdhhLr/3UMjaj+TKYKav6gLn2/DFkMD3tohWUDeHM9EI7Imw366Yr4UuFLWGdm -XznlUJnWLzWiMjZQ5LAeOGHY+7NjvRfU+kES/wy4JnCDZbk4hk+cFQ0PDylFxCwL -2XqPoPAaDIEkP/uoE08j2Kfr7lJEa41wJGQ+LQUjt1RAxDrd1r9SsTqkPmauoOlx -Cgo2AiObPsLON/8FEDO9VexRugB6JweLnuhW4S75SVNzlNYOjHJBxIfJgSlwNOQB -OfI7XqGoTholO34urKlZkp5s6tzgApJKbk1FcnY7RPI3oHUkNaQ/k354TT4LsUsR -0V0zNkZuuCY5sBlBSC6Lwq0VgjHCBRSTjTCexY4hDo52jJX3rLVhzznZzfDlmFVK -/WQ598aKpzXJ4IFp6IKoC2KJogwl5sLFr/GCcsnp6vaaU1BQkkAd+B0G9kegkcZC -53Cw4ME9y3tg54zhoywL -=OL4/ +iQIcBAEBCAAGBQJOtbB/AAoJEHfx8XVYajsfINcP/32Vwk6+xCxmpUaT52Rl/536 +a4Xib9XPQFHBcRIR21ORN4WbB9VMngxoXDYJiKJiN9m2UMo/cuW4ouH/cswvL6zQ +JRWdW1RD9SP+/YUjLzAofHAi3sSi0+dBhrWUflVY5bfvDeDIozW20eI1u6rPJ6S0 +YQRs/wShSFmOGHfo0swOOiJMuYVmy/m8F64dAj7Ooyk6qnf0JG4Ak/WGf/9IeWE1 +28DLdPnU6JKfbMQnk326kL6DwpoDTRvYnRwcNY6oFIrADM2zFiYBhkDAUfa6LZWS +JjyCGSVX+oDrOdHmrc/5zD7AmlbJovi68AlxXTjUK/v0knETV3mOxR3IChhntkJH ++mYuZ4G5EeZFGUoclusGpzxCO4YGsgTlkyvmgJqcBWuCJUpFLCTX6jFwOH1oHQuO ++fEu6CaXpX+9YTzUFXpdf5zp91VU2yeCikADhEy7SNKlNzKgVKJOdQYxi8tH6e+P +j7zTnkRSnyx7awHKQBTApzvn/oSIo0HU/2WrMKNbtRn6gYxN12bAlFBW+FaPImAw +S5Y98xX2ubOp+GJ+9n4EPPgenAVUtVLU6rhEkIDffSPw68Lha+u07MEXz/9rXsra +608Ve7dEO31K1ksKmgGC8cLBsrAj+Nv5GCnwptofoIyYUmv6GagK7ggfG0NExfwT +5c3TbVwF4vcoZlywrZ8m +=vhC4 -----END PGP SIGNATURE----- diff --git a/net-misc/gsasl/files/gsasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-gss-extra.patch new file mode 100644 index 000000000000..e08a36ae5779 --- /dev/null +++ b/net-misc/gsasl/files/gsasl-gss-extra.patch @@ -0,0 +1,21 @@ +Based on gentoo bug #359005 +--- lib/gl/m4/gss-extra.m4.orig 2010-12-14 12:57:08.000000000 +0000 ++++ lib/gl/m4/gss-extra.m4 2011-11-05 21:11:54.000000000 +0000 +@@ -19,7 +19,16 @@ + AC_CHECK_FUNCS([gss_decapsulate_token]) + AC_CHECK_FUNCS([gss_oid_equal]) + AC_CHECK_FUNCS([gss_inquire_mech_for_saslname]) +- AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE]) ++ AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE]) ++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h, ++ [#include ++ #ifdef GSS_C_NT_HOSTBASED_SERVICE ++ hostbased_service_gss_nt_yes ++ #endif], ++ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, ++ [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE]) ++ AC_MSG_RESULT([yes])], ++ AC_MSG_RESULT([no])) + if test "$gssapi_impl" != "gss"; then + AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h]) + if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then diff --git a/net-misc/gsasl/gsasl-1.6.1.ebuild b/net-misc/gsasl/gsasl-1.6.1.ebuild index 33bbb32b8db7..91e823b3411b 100644 --- a/net-misc/gsasl/gsasl-1.6.1.ebuild +++ b/net-misc/gsasl/gsasl-1.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.5 2011/07/19 19:46:22 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.6 2011/11/05 21:54:01 eras Exp $ EAPI="2" @@ -23,6 +23,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}/${PN}-gss-extra.patch" + eautoreconf +} + src_configure() { econf \ --enable-client \