Fix compiling against >=heimdal-1.4 - bug #389347. Thanks to Rafał Mużyło.

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

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 497919782b2b201961541afe64d0975353019c27..9f96bc758cca02ee331bd4080c3d26a70462bffa 100644 (file)
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.223 2011/11/06 20:09:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.224 2011/11/06 20:13:45 eras Exp $
+
+  06 Nov 2011; Eray Aslan <eras@gentoo.org> fetchmail-6.3.21.ebuild,
+  +files/fetchmail-gss_c_nt_hostbased_service.patch:
+  Fix compiling against >=heimdal-1.4 - bug #389347. Thanks to Rafał Mużyło.
 
   06 Nov 2011; Eray Aslan <eras@gentoo.org> -fetchmail-6.3.20.ebuild:
   remove old

diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 9836742e7a4d9b75ba4b900a29b7dc519b30d0f9..da20262240961c3db764331377911882f47e8c33 100644 (file)
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA256
 
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
+AUX fetchmail-gss_c_nt_hostbased_service.patch 963 RMD160 d72c7f934aa406f82de3015698427cad71b4e407 SHA1 0420c82801e435e84ebec314012f3d7b13536239 SHA256 4f7fdb461d111fa149bd73cc8d9c7d34f3791248329aa9f2d7240354993a2dd1
 AUX fetchmail.confd 410 RMD160 ff677f3525a63d810121e98cc565abc7c5357b25 SHA1 07842218def6ab1e7c7e2c7ca5078f9612405a1a SHA256 4a1958adc59910a0b4e74d25fff2934cf9d3a74014b75e1c0bfbd3b07032e1ab
 AUX fetchmail.initd 992 RMD160 74862f757e49bdd7971f90563515bc38440016fe SHA1 6739cb36cf9c51588047d69425890c5ace34fb11 SHA256 8afe0827ed0803c38bcfa7f7855ec3bfecf4ba9a12e3a10306082fcc45be039a
 AUX fetchmail.new 685 RMD160 356dc7d118a72f0e689dd51ac9317495fd8f2a18 SHA1 4da6d811dfeae4898c988739121e7d60f22dae1c SHA256 7704f4f4cb7110fcb50e2ab9f1bf6c4280d09367bacecd0491fdf548062a4e89
 DIST fetchmail-6.3.21.tar.bz2 1724445 RMD160 981084b384eb8f6f424af64ceb5922a030271519 SHA1 e32a0d40ec133d651782543ecd7bc9bbee52dff7 SHA256 9b20eededa7d15ab2bde2d4a0c2d169d4882021cd63042ecbed2f13999185502
-EBUILD fetchmail-6.3.21.ebuild 2282 RMD160 f5e8e01a5e13336c3f512860aa06166cdb2142e5 SHA1 a7aa89a12ba41061c1c5566906518eb42b15c71b SHA256 9d0d446e057f2bd79badf1651a0d9939836e6653cb15ff05d5001f4153a2f45d
-MISC ChangeLog 32027 RMD160 66d05e03dde39d9def4d028f5ec1076899bc6929 SHA1 66db092414f85ddc4eca25a58025fe73cd080572 SHA256 7d8b88eb5352ffc91ed6081c1aaf334ee8398f2613bab887ee69c19ed6665f28
+EBUILD fetchmail-6.3.21.ebuild 2363 RMD160 44266cd370e1d4aeccf3b9a77f77177cad598127 SHA1 f19960ea531bd6005e7a4798c914c81a8686fad6 SHA256 c9b2ab74bc917736ab4374b706ae60cef346aba397788cffa642257bce557e4c
+MISC ChangeLog 32230 RMD160 9998776148fda07c1e43efd424e9db6d94901bf0 SHA1 43453cda98b2b801858d366186dceceb0ab8c8c1 SHA256 43651a6787b77fdaeb754c34fd8ebefa4c4fcdbd68ae3ca0ea5e220ddbab87a1
 MISC metadata.xml 400 RMD160 5c52a6f03b82ae8546323884f788246fa4fdac71 SHA1 997df4c3c3b912534351b199ac3697ac71e76156 SHA256 83d55d3024d64b0e99ba051275b4173c0094135216d68b41d555c8ff424aab13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOtumSAAoJEHfx8XVYajsfYI8QAJQCQzonvD5ruQyrlYz5ITzI
-Wkn8EjCdR5t8yCi0/iUb/oNeNAaqmDizxFIwsS79ki2EzfCpi+zJNGLpmW6eAfY+
-ls8oNStugflNqBTJ/yrs1dnVOcRHc9NyLg6KOHzAR1JVx4HiGOgqVdefqFvoIGTk
-wYS6cE8pQEDsqpyH4Spj6CmchU8f6E6MRzVCrozH7VDMlciOPTi/Bw3J+rM6LqRk
-vIfKerx+hYqpbeqOJSh5/4fpNQ8qGxa7FBTb4T7QsKFJz/ZodVH5J4V02X3nUb+3
-6CSV3E+0GV6ZXVtbu4V3Ua8vpnl8NQFkHefgZli+BAlnPVt5nrN1fMIMGl2Q/ii5
-OIipglAqL7+jln2u81TVQk/78p1mBQbf1cIgshHiD9f2+52M3xqk3Rm4JXMci6Sn
-FnvDVDfi0HU3bO+WBqyhEQGIDcthdICjRpzeVwomk6WMKV4Gp4+HOMcSh71LaZOU
-gnt52GAsHZLUTQwqPR11TEXo/ZqdhUxQHwC8q5PS8M5J+Z09QHTAQAp3k+tzpCjP
-zoMv4SX0psMRaiZ7dAT4y060rXo8Ei1yDWC6wPg1PxaKBgoCLWknnxKjkMPMgE03
-JsglNORtk9RsseJehwgPyDIrmXXxSHBkjX9nYilBzNQILLw70IsC+v0TJEVnwtzo
-uPX6JUoG5eeeisK6Ophz
-=18oO
+iQIcBAEBCAAGBQJOtup/AAoJEHfx8XVYajsf7QcQAJvp3GsJBC+Ki+4H6FLHwxJF
+RDy34iMA5xi+d02BUJsaivp3o0jCa7zz9Yw91CnLeO+Fa/j7k2PY2pzvMdfR3AEt
+I+bqhG/hrCbkUT2YFFkb8RctGaiJl8ELihAjdFFomJK3XSHhn868iWThitjC7AKE
+jlM1PoA5zJ8BbyY1vy1ywzJemyk9SUkgT1kL2CL/e4N9s/7i17CA8D3R1mlEVQCM
+ObLhuI8R1fel8dNhzIjPzTyAJKe+H6vxc89VNix0CdgY8rCP/FXaaYISaypSlOeB
+5u6Wce5DERtn3HF2YyK3irhQGFNrrjpuBzhHfLibAjZr+tfLDvAJmHLUVEosjhNZ
+MNqHdmjzxpWvq8zWFjp2TFd3ZvIZ9Nkwwri7hvyS3rTGVyk7K7t/jw/jeVBFAnJn
+BjqraLedMWWbxSkeOxn6JNSJen4PKkGdpdO80AqlUEhuHKKn556Fqcr8R/kana6X
+suuAMuxHCPANVq3pPve5AF/aXWr7NNqJpnb/3eAAmkhae7tADtxf5kPbHmhJBN5g
+Ib06uQD06d5CFNrkvZyLxTJTdm6mhzXg9O9JWnKIZ/E3itxnAnltU/09Zj9dPUFS
+sH4M1L1Qy87yTyPG9iS6rp2WGx1FZRlO7PK2YqkXaDG3CCtf5J3nDYmjX/9eM0hG
+fmZgy+yfhhAA/xt15Ngk
+=zbzB
 -----END PGP SIGNATURE-----

diff --git a/net-mail/fetchmail/fetchmail-6.3.21.ebuild b/net-mail/fetchmail/fetchmail-6.3.21.ebuild
index 8fd71dacde512960fa576746c5fa85e902816c4f..035f608111b6432722302238d9692fbd0e5fd630 100644 (file)
--- a/net-mail/fetchmail/fetchmail-6.3.21.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.21.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-mail/fetchmail/fetchmail-6.3.21.ebuild,v 1.6 2011/08/27 11:30:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.21.ebuild,v 1.7 2011/11/06 20:13:45 eras Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="tk? 2"
 PYTHON_USE_WITH_OPT="tk"
 PYTHON_USE_WITH="tk"
 
-inherit python eutils
+inherit python eutils autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
 HOMEPAGE="http://fetchmail.berlios.de"
@@ -39,6 +39,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}/${PN}-gss_c_nt_hostbased_service.patch"
+       eautoreconf
        # dont compile during src_install
        : > "${S}"/py-compile
 }

diff --git a/net-mail/fetchmail/files/fetchmail-gss_c_nt_hostbased_service.patch b/net-mail/fetchmail/files/fetchmail-gss_c_nt_hostbased_service.patch
new file mode 100644 (file)
index 0000000..914642a
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-gss_c_nt_hostbased_service.patch
@@ -0,0 +1,21 @@
+Gentoo bug #389347
+--- configure.ac.orig  2011-08-21 13:35:05.000000000 +0000
++++ configure.ac       2011-11-06 19:46:07.000000000 +0000
+@@ -893,11 +893,12 @@
+     CPPFLAGS="$CPPFLAGS -I$with_gssapi/include"
+   fi
+   AC_CHECK_HEADERS(gss.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
+-  if test "$ac_cv_header_gssapi_h" = "yes"; then
+-    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,1,Define if you have MIT kerberos))
+-  else
+-    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
+-  fi
++  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,1,Define if your GSSAPI implemantation defines GSS_C_NT_HOSTBASED_SERVICE))
+ fi])
+ 
+ dnl ,------------------------------------------------------------------