summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2011-11-02 08:35:31 +0000
committerEray Aslan <eras@gentoo.org>2011-11-02 08:35:31 +0000
commitb057c1e0c1161a72f3a7a766138be35b91f8a42d (patch)
tree7c4b8a4e64047ed384b901f306db96bc867582e1 /net-libs/libgsasl
parentVersion bump mercurial to 2.0. (diff)
downloadgentoo-2-b057c1e0c1161a72f3a7a766138be35b91f8a42d.tar.gz
gentoo-2-b057c1e0c1161a72f3a7a766138be35b91f8a42d.tar.bz2
gentoo-2-b057c1e0c1161a72f3a7a766138be35b91f8a42d.zip
Fix compiling against heimdal - bug #359005. Thanks to Torsten Kurbad
(Portage version: 2.1.10.32/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libgsasl')
-rw-r--r--net-libs/libgsasl/ChangeLog6
-rw-r--r--net-libs/libgsasl/files/libgsasl-gss-extra.patch20
-rw-r--r--net-libs/libgsasl/libgsasl-1.6.1.ebuild6
3 files changed, 30 insertions, 2 deletions
diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index 74cbc9cef3de..3c1a07ed35ab 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.65 2011/09/12 21:02:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.66 2011/11/02 08:35:31 eras Exp $
+
+ 02 Nov 2011; Eray Aslan <eras@gentoo.org> libgsasl-1.6.1.ebuild,
+ +files/libgsasl-gss-extra.patch:
+ Fix compiling against heimdal - bug #359005. Thanks to Torsten Kurbad
12 Sep 2011; Markus Meier <maekke@gentoo.org> libgsasl-1.6.1.ebuild:
add ~arm, bug #381929
diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
new file mode 100644
index 000000000000..d3907be85554
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
@@ -0,0 +1,20 @@
+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
+
diff --git a/net-libs/libgsasl/libgsasl-1.6.1.ebuild b/net-libs/libgsasl/libgsasl-1.6.1.ebuild
index 76f06e716546..d172c9395ab1 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.7 2011/09/12 21:02:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.1.ebuild,v 1.8 2011/11/02 08:35:31 eras Exp $
EAPI="3"
@@ -25,6 +25,10 @@ DEPEND="
RDEPEND="${DEPEND}
!net-misc/gsasl"
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-gss-extra.patch"
+}
+
src_configure() {
econf \
$(use_with gcrypt libgcrypt) \