Better fix for heimdal - bug #359005. Thanks to Rafał Mużyło.

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index 3c1a07ed35abd07d4601ab42e3c781dd7ea85a36..9a47596f12c04c22d18213ff28f472ec3d150ccd 100644 (file)
--- a/net-libs/libgsasl/ChangeLog
+++ b/net-libs/libgsasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libgsasl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.66 2011/11/02 08:35:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.67 2011/11/05 21:29:00 eras Exp $
+
+  05 Nov 2011; Eray Aslan <eras@gentoo.org> libgsasl-1.6.1.ebuild,
+  files/libgsasl-gss-extra.patch:
+  Better fix for heimdal - bug #359005. Thanks to Rafał Mużyło
 
   02 Nov 2011; Eray Aslan <eras@gentoo.org> libgsasl-1.6.1.ebuild,
   +files/libgsasl-gss-extra.patch:

diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 48cec9c60d728996a4f5a667f459abc0b722fe96..c0f673ec4369c89d1403065f424993ced3844dd5 100644 (file)
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgsasl-gss-extra.patch 487 RMD160 015538c8f85b9428b230bf89eb5f4546debf812b SHA1 117d14da06b6ee3a09dd7ed099da5029ecef8827 SHA256 dff6c5167b096668822fb42435f8574a900dce00b527e36569858bd8b7d57e07
+AUX libgsasl-gss-extra.patch 934 RMD160 2bcc883b16ef7694ad247845ef066e98feffdb34 SHA1 16f1751ffb34838956668811b7279fe37a2cebf1 SHA256 7e13a5aad53dbdbfae90020812711703a167d24ed97b1c9822091d18f22c0c20
 DIST libgsasl-1.6.1.tar.gz 1083155 RMD160 db576a3d365c9d6a8e4b7f9291b52d69bfa9c289 SHA1 2942886514f14801193e505fc5367330d5c6b7de SHA256 a2cf60232ed016d92b2bbab1a41a326a4695e3098d477dbb97e830c583d8da16
-EBUILD libgsasl-1.6.1.ebuild 1347 RMD160 3c841acfdc5b1624e50b9e3eedaf917402dc7bd0 SHA1 83609c772fb1701d10442c06d38f19b60fd2aa21 SHA256 62f2fa972e04a08becfcae9ea4876a38f5e925e136e13dd93279fc628313af58
-MISC ChangeLog 8266 RMD160 e7b7eeb3edb78a546965ef54063306a86b8b2594 SHA1 26eaa9e2d5ab39b20b31874d40e06517e0816f18 SHA256 6b6c1b2c8169e689dfcf1dd64d48b25938616881fdae7b3be129fa959ad79b94
+EBUILD libgsasl-1.6.1.ebuild 1360 RMD160 f05f5fa6ea68073c43d6c22ef0e7736b4dc82fdb SHA1 5c24e65f7d69c2c55cb1d24aa5a80af407b1943d SHA256 666ce536edd147860d565a87fee7afcf97b06cc22fd8f5f34840325addd84ae5
+MISC ChangeLog 8434 RMD160 c6a35e017b7a327dd9b79e2c83325c573716c255 SHA1 64cabbb86d67015515f0fcf721e573c656a489f3 SHA256 32cffdbe1b4bffe0e787e9b815750b467d798d9b1099d41c1d168a82303ea785
 MISC metadata.xml 257 RMD160 809532d8d8edbc45402f5ad65f9f55c3fbd94a56 SHA1 ac01878fb096e07a473eea8eeb3c0ad6317876bc SHA256 8ebd86dc3ffa92b4ae6b49a2944e1b5eed2311bfe3fc304459338fbeab8efed0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOsQDiAAoJEHfx8XVYajsfC80QAIdIz8mJ6gTNr1OkBy3grwMc
-Li0A1dLd8FREKvi+3SctS8CZMEFpddKq5Gy0HsRoePG1agfb8UVphskmPj45LG3t
-wDBhGaXAw6IwQF2Q9uW0Se9Fi9I0ErqfzwLdyI5VFjoRhL8UDN0tkkIBdZX0nTVz
-dokF+oUlE/sxgJNKoHYa8OqXXvVnkchEfMamZGlviWjUCa80QcembhSazKdOnBUo
-61Oob9Jz1AUtWzmS2VyS1PJxt5ML6Wf+7ICkoUm0WVxmGbedpAIa01JeA36UZQt+
-enJHFJlZwl+sTySG09Fk1k7fYkhKEaHowOt3FI6yDdpyUY8+3BcGwqiZZ1V6tyVw
-A/8JQs6DHBPOTAI45HS+mlT18B2Uag4yXLT37HcW5ltb5es0C7udOj1/S71cYyLW
-YqThYjJczvbmGbgNMPVNxauq9skgaQzhkdvIRG2x3HucnNHHayibqW/CemHLORxj
-lgRfCZ8dpvD/dcpoJXGhFa2EXf9kRBfVZ4GdZDNcqOv1a9Ak4Xm4pIGnn5i2MyP3
-Bk8PgmKM4z+a2Vf5K9C3UlGey/ao6eeyi6nThgyBIx/ibBbnWd8XYyZiD4B9cyfa
-gTIpacPbVcXgSc+jpuZFwAL1di705mhbvxRHokfqQZsl95YQ92EXbFE+uGqF691j
-rkEzDCE67fVq0hqVQsL0
-=wdA8
+iQIcBAEBCAAGBQJOtaqhAAoJEHfx8XVYajsf3YQP/1TjK8LGDzXuxqjm9Tm0c23o
+x5Am/9ToVe7QcPHLEjge4qxFanB4k53wxbl9VZRi1Tx+1cij2Vh4sHJwDy01iSQA
+cNzQR6wicvqyXSrWjQMSAml83qH2I7fN3xBs5BTMKDvBCHMae5NwlKni4/o7cJvq
+StAkjK4eLbsch7ej5Hd4tl3hzeyxYlti35q5dFI/IHRVqPW01jx/2rApQE8namuh
+Jqh4Fk06tQqf8fDJLGpg7RcJ4A0hWg/OpqO7YqRgWed8fG9hBJESfK/XFMkgt80c
+CU5/ojqcTjHahzLTBEteps4yPjZbg5w0/I8aY4I/02BdHzAksZ3e0veBgbNXPHX2
+wxWpmOnATqRr+dKAcC/3wWwucgSuvUQDVa7PPko8kmTK/P0iPNpDTjyQQBgZHL/v
+MbvCNPV2MtFEgDxXeO8X0tLH/l45xSSPopr0OYTNebbOPvj5yOUUs5B9odUCkbmQ
+goXKKbE+TKuLII3bd9V2q4LODhWd2fbcI2HMARkTkADfWvYOtMZIx1JptdWA7PIx
+orYAd+9JeXDsIVniHUC3eoeKkN2Msf7VMVz1KkWAuLBSh5W0SFFTaEQnJOrn04KS
+kujqFBIToeJX770YF3OqTVEJ4X4xgAk8GxdAiWIl1En3DFwj2mGlXIpTN3u+f4Im
+gz47O5UPjQjlWnj7GOlA
+=DmPF
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
index d3907be8555423e73dc604bc8f6d0b1ed65906b7..a0f134a229f8a17eb9e123ff5a40084deffb2629 100644 (file)
--- a/net-libs/libgsasl/files/libgsasl-gss-extra.patch
+++ b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
@@ -1,20 +1,21 @@
-Gentoo bug #359009
-
---- libgsasl-1.6.0/gl/gss-extra.c.orig 2011-03-15 18:08:06.534086334 +0100
-+++ libgsasl-1.6.0/gl/gss-extra.c      2011-03-15 18:08:50.114086334 +0100
-@@ -33,6 +33,7 @@
- /* Get malloc, free. */
- #include <stdlib.h>
- 
-+#if (defined _WIN32 || defined __WIN32__)
- #ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
- 
- /* MIT Kerberos for Windows version 3.2.2 lacks this. */
-@@ -43,6 +44,7 @@
- gss_OID GSS_C_NT_HOSTBASED_SERVICE = &tmp;
- 
- #endif
-+#endif
- 
- #ifndef HAVE_GSS_OID_EQUAL
- 
+Gentoo bug #359005
+--- gl/m4/gss-extra.m4.orig    2010-12-14 12:57:08.000000000 +0000
++++ 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 <gssapi.h>
++      #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-libs/libgsasl/libgsasl-1.6.1.ebuild b/net-libs/libgsasl/libgsasl-1.6.1.ebuild
index d172c9395ab11d9a2521e811aa8ac549d0295183..a5fc3bd928c50b89a8a149534da268d139ae591a 100644 (file)
--- a/net-libs/libgsasl/libgsasl-1.6.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-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-libs/libgsasl/libgsasl-1.6.1.ebuild,v 1.8 2011/11/02 08:35:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.1.ebuild,v 1.9 2011/11/05 21:29:00 eras Exp $
 
 EAPI="3"
 
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-gss-extra.patch"
+       eautoreconf
 }
 
 src_configure() {