summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2011-11-05 21:29:00 +0000
committerEray Aslan <eras@gentoo.org>2011-11-05 21:29:00 +0000
commitf04afed50539a1da73146bb3ca7ec84e16a2eaee (patch)
treeb6c8c62833c977480fc38d677bb742b56079f284 /net-libs
parentarm stable, bug #388373 (diff)
downloadgentoo-2-f04afed50539a1da73146bb3ca7ec84e16a2eaee.tar.gz
gentoo-2-f04afed50539a1da73146bb3ca7ec84e16a2eaee.tar.bz2
gentoo-2-f04afed50539a1da73146bb3ca7ec84e16a2eaee.zip
Better fix for heimdal - bug #359005. Thanks to Rafał Mużyło.
(Portage version: 2.1.10.32/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libgsasl/ChangeLog6
-rw-r--r--net-libs/libgsasl/files/libgsasl-gss-extra.patch41
-rw-r--r--net-libs/libgsasl/libgsasl-1.6.1.ebuild3
3 files changed, 28 insertions, 22 deletions
diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index 3c1a07ed35ab..9a47596f12c0 100644
--- 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/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
index d3907be85554..a0f134a229f8 100644
--- 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 d172c9395ab1..a5fc3bd928c5 100644
--- 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() {