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
commite1772bddac65f3c9ae6a14753e669fca9881973c (patch)
tree483286521469a6648b7b06167247bbfb040c7a8c /net-libs/libgsasl
parentVersion bump mercurial to 2.0. (diff)
downloadhistorical-e1772bddac65f3c9ae6a14753e669fca9881973c.tar.gz
historical-e1772bddac65f3c9ae6a14753e669fca9881973c.tar.bz2
historical-e1772bddac65f3c9ae6a14753e669fca9881973c.zip
Fix compiling against heimdal - bug #359005. Thanks to Torsten Kurbad
Package-Manager: portage-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/Manifest23
-rw-r--r--net-libs/libgsasl/files/libgsasl-gss-extra.patch20
-rw-r--r--net-libs/libgsasl/libgsasl-1.6.1.ebuild6
4 files changed, 47 insertions, 8 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/Manifest b/net-libs/libgsasl/Manifest
index 2d8e40126614..48cec9c60d72 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,14 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
+AUX libgsasl-gss-extra.patch 487 RMD160 015538c8f85b9428b230bf89eb5f4546debf812b SHA1 117d14da06b6ee3a09dd7ed099da5029ecef8827 SHA256 dff6c5167b096668822fb42435f8574a900dce00b527e36569858bd8b7d57e07
DIST libgsasl-1.6.1.tar.gz 1083155 RMD160 db576a3d365c9d6a8e4b7f9291b52d69bfa9c289 SHA1 2942886514f14801193e505fc5367330d5c6b7de SHA256 a2cf60232ed016d92b2bbab1a41a326a4695e3098d477dbb97e830c583d8da16
-EBUILD libgsasl-1.6.1.ebuild 1286 RMD160 0c20036fdfc43990aef15462aaac4a8716aaafbf SHA1 33c438c27c27ee9f3185b096042bbd70ba95402a SHA256 7f711a114610fdca0e7fb13f9c586bdf831e48e34b655621c3113083674f8e50
-MISC ChangeLog 8093 RMD160 221e0f96f0c9b8c5d33210ba5d33c03349f2ac1b SHA1 1e201df3aadd4a62919c0d6711dcc2b05a5fd145 SHA256 3fc78c49b54a44f16c0018fcd55a702010d51c650d168018eb172580276fa6c8
+EBUILD libgsasl-1.6.1.ebuild 1347 RMD160 3c841acfdc5b1624e50b9e3eedaf917402dc7bd0 SHA1 83609c772fb1701d10442c06d38f19b60fd2aa21 SHA256 62f2fa972e04a08becfcae9ea4876a38f5e925e136e13dd93279fc628313af58
+MISC ChangeLog 8266 RMD160 e7b7eeb3edb78a546965ef54063306a86b8b2594 SHA1 26eaa9e2d5ab39b20b31874d40e06517e0816f18 SHA256 6b6c1b2c8169e689dfcf1dd64d48b25938616881fdae7b3be129fa959ad79b94
MISC metadata.xml 257 RMD160 809532d8d8edbc45402f5ad65f9f55c3fbd94a56 SHA1 ac01878fb096e07a473eea8eeb3c0ad6317876bc SHA256 8ebd86dc3ffa92b4ae6b49a2944e1b5eed2311bfe3fc304459338fbeab8efed0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5uc6EACgkQkKaRLQcq0GKpEACgo5hRC1/j+xUVyfRdaf6lB8fX
-U9oAoJtWwt2QGuONa1wLvzueCJeD/mmL
-=t7Q4
+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
-----END PGP SIGNATURE-----
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) \