Bump kernel patch to 1.2.8

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force

net-fs/nfs-utils/ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.215 2013/04/13 20:02:02 vapier Exp $
 
+  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com>
+  +files/nfs-utils-1.2.8-heimdal.patch, -files/nfs-utils-1.2.7-heimdal.patch,
+  nfs-utils-1.2.8-r1.ebuild, nfs-utils-1.2.9.ebuild:
+  Bump kernel patch to 1.2.8
+
 *nfs-utils-1.2.9 (21 Nov 2013)
 
   21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +nfs-utils-1.2.9.ebuild,

net-fs/nfs-utils/Manifest

@@ -1,7 +1,7 @@
 AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 WHIRLPOOL 7cc6b59c1f7013a0ad98518623b03d1cba784ecaf6d6a085b85282192c6f41ac1c649a39dc6e1b42ff38a571c00a85aed6e04ea57d6339a072cc4f2c41d5d74e
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3 SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 WHIRLPOOL c16ecee3228ad4522cf4ede1d05ca50cece3910955314c96eb88a61cfe07b7f6a95c42bb15a7f7f9fd211fa62cdcbb02925e68702d5066338b4543baf56fb2df
-AUX nfs-utils-1.2.7-heimdal.patch 6643 SHA256 f8845cb5471313516ebd389a1fb692b984f5f9f663923488a539d8adec8de247 SHA512 dea96554579dcb1b2404724ddcf68a27034cef7f5a0c3d4b6838e46abfcd9a05af3cd56c28f0878f1ec777ea0a2c43fb7c795adf74aa2080c8feb26e7e83d938 WHIRLPOOL cd783ee2b91332753abbf8de8125f6cebd36dd4852ce804d8822fd5cfc28d6d4f608634fcd00b4a30be5aeba9be97c2c122e3beb1d2961182f1bfce8c652e7d2
 AUX nfs-utils-1.2.8-cross-build.patch 1323 SHA256 281ae4f2af4d28adc936be961c2ab4aa4f77c4fb74ba08f2cef1038c6e03b30e SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a WHIRLPOOL 52f5704ec8b88eeb3fab37e4aa9a7ca64ca76f0665c66347ab663624cb3b70309a262d86b21882dc5f687741c73974dc6efbc01d6c386e3ea607bbdb89619edb
+AUX nfs-utils-1.2.8-heimdal.patch 2424 SHA256 a41cc8771cae79fd9c7689cb7d32ebe83fbd008d8d0a429411f758671c7b8c09 SHA512 e23e280292fecd4ba52f4e4f050fe7f547f7c0b8df564a1b9fac0eda5bf22bd313c0b76dea7ef95e849751fe0c4bdafd1b9500d3d9c57fdd1c42c913e14d0284 WHIRLPOOL 8406b2273da365bc88eab7cc4efcaacb9ce520d9380a2230cfc955c5af79e1c3da81cfa61c8208aa8e3c4f440bc92b0f4a5690a6e173a0f2fc063d07ded430c2
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
 AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
 AUX nfsd.service 339 SHA256 fada3d017779466e28a6b84c5adda1d9ef7c9b9e9458884f4456efc7e85a87c7 SHA512 4accd4aa77b3f91b1472b24ba5303cb5442aee1ecc1b813605bb4815320144cfe6505265659f8ec79ba6259c8e41ee968462d67b71981cc46dd830764fe786eb WHIRLPOOL 3fca5f83bf62f4d06854066940592cad2a3d636adf6a20e103c6344f8f3abdedfc94aeed280fa285b195b461f78674a07a334215048f83655c1f1bd17bbfc55a
@@ -16,7 +16,7 @@ AUX rpc.statd.initd 818 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf806
 AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677
 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
-EBUILD nfs-utils-1.2.8-r1.ebuild 4073 SHA256 d9ae4b31ed2f31425242bac2328d7a8cfad06a36ab22196992abf321e4f38461 SHA512 14a9574d6ef7818c355ee26217170d25cdbc954400beca795b6296f056d318888500c7e3c578cc20714015d39bde0c9346ad177cd78aeed13089a202be7213b0 WHIRLPOOL 99a2fb0b205cbada83c2fa3885c48a2797fff907f58cc2ac75a3e46a111c48f8a382834b8c88dd3d147fca6e975e34c18e415494da42f37f46db4222ab720a3c
+EBUILD nfs-utils-1.2.8-r1.ebuild 4073 SHA256 66b43a9e7ab5dd415eb5df366545a19c2ac13f4ca49ef1f59badab648a6184a7 SHA512 aaf943197b92f139bdbcbc9aae9add93a35a7e90d3fb91f8e1c34310eb587fbad834e69e2d112bdbaf396275f8331e07e29bb92069dfb75b032a78e0c3fb607a WHIRLPOOL 216592fa93e973c876955b82620a899563bff5207d61f2a5bdbf30e8c48fc3e7e15b2a70505b9c5cf2e09ec10e57882133c05f08b7a33288d7f70752bdab0a1d
-EBUILD nfs-utils-1.2.9.ebuild 4081 SHA256 7448469ae272a5fb3b95890c84da99932508a39d77c7a92ff8cc69248cf0bc73 SHA512 6b2bb4f998baa30bbe9fa7685273a88359f170e0f8274612e6fa64c31cfa72f31b0f880f97c6533fdab52f0b9e418d966754e189cd6f43e95fe1f0ec4fb95e0e WHIRLPOOL bcbf179803f737e0ea64375fadaa9395a666902fa173abacff68a40bb1a654cc4ca8f38d426dcb4f0efe69223b41fcf153ab753123679d25743b7af51ac97f30
+EBUILD nfs-utils-1.2.9.ebuild 4081 SHA256 c9d889d48837f1ac1d4c4c96690641d3239da910508941dc88f3f5b1f803766f SHA512 c5ab15ef07e874c681f13449f0040e7daf233d021dce4fd5fcf5e4f4187d2bd3bd1a7dda1553e532ad74a4abe280b18c419be3ecad892c1efa4f5172f838a3d8 WHIRLPOOL b8961cb81807c4edfc9347532a128bfea94c198782588a464b7d00cea9123c96b650bb1371e7057c21ca574017c73d744b5c0e0306d0691f6f0d479f659f86e6
-MISC ChangeLog 34769 SHA256 bcf310f6c19621d28281cff1b56b40083db0a0910b0746cb4cedc156d4fa235f SHA512 d9e25f6ad3a93d50e844b2f3c6d80b3a2a9b0133b9434ed996422953129dd3e2bd40123ccca39ca9b7af8e32dd6cb0e7da73067f0c9f275ffbaf5faeb3f81ffc WHIRLPOOL 96de1152714628daf5d29739c50ece8f727e89bdf939f462b303638c4c885039588e3559c7c62cff966413d27b8384a9ad2f28d21d4362be70a4f6cebe504303
+MISC ChangeLog 34981 SHA256 4aa915a2ee0b181c4ac10e23de6118d576ecd72b2a5196ec9877036168ccd41e SHA512 39f213044f8407c8c474a0938c9f4337f3c9fbfac9dc1d7e358c977cabcbb830daad62362e8d58cbb473b5a8bbec713e2e0048171d931e02611951ab04830662 WHIRLPOOL e8ab96f422bd16ae53720a83e179160f6f8919938817f6b6104c7e81802b1265db6f110c3f7751a86582ca3c2417c0b70ab9154dab4ee0b0e0ca27daf6c6ee83
 MISC metadata.xml 668 SHA256 d9ecc29c31ebf779ec222513db190cc0e9d0737f806aea26913d097b09bbfa47 SHA512 2b269153829d1d8df6e97871814479af8fbe18a48cf0b6a33947212264875a4002feda4163b465b4a67e253e5f27e47badc53d414ebb9f3281253f813fa1dacd WHIRLPOOL a53c14f8e6f7cce4f75a7fda60d8b9f96a57eb3a877470906fa1c40befcd9791411934e7ab610ce612f6d42d4d953e0a2a78ffc9e21e9b98328a395c4de7daa8

net-fs/nfs-utils/files/nfs-utils-1.2.7-heimdal.patch

@@ -1,180 +0,0 @@
---- nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4	2010-10-03 14:53:06.379424854 +0200
-@@ -1,7 +1,10 @@
- dnl Checks librpcsec version
- AC_DEFUN([AC_RPCSEC_VERSION], [
- 
--  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+  dnl libgssglue is needed only for MIT Kerberos
-+  if test "$gssapi_lib" = gssapi_krb5; then
-+    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+  fi
- 
-   dnl TI-RPC replaces librpcsecgss
-   if test "$enable_tirpc" = no; then
---- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4	2010-10-03 14:13:17.274424855 +0200
-@@ -32,14 +32,14 @@
-     fi
-     if test "$K5CONFIG" != ""; then
-       KRBCFLAGS=`$K5CONFIG --cflags`
--      KRBLIBS=`$K5CONFIG --libs`
--      K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-+      KRBLIBS=`$K5CONFIG --libs gssapi`
-       AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-       if test -f $dir/include/gssapi/gssapi_krb5.h -a \
-                 \( -f $dir/lib/libgssapi_krb5.a -o \
-                    -f $dir/lib64/libgssapi_krb5.a -o \
-                    -f $dir/lib64/libgssapi_krb5.so -o \
-                    -f $dir/lib/libgssapi_krb5.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-          KRBDIR="$dir"
-   dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
-@@ -56,7 +56,11 @@
-       dnl of Heimdal Kerberos on SuSe
-       elif test \( -f $dir/include/heim_err.h -o\
-       		 -f $dir/include/heimdal/heim_err.h \) -a \
--                -f $dir/lib/libroken.a; then
-+                \( -f $dir/lib/libroken.a -o \
-+                   -f $dir/lib64/libroken.a -o \
-+                   -f $dir/lib64/libroken.so -o \
-+                   -f $dir/lib/libroken.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-          KRBDIR="$dir"
-          gssapi_lib=gssapi
---- nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c	2010-10-03 14:31:31.150424854 +0200
-@@ -267,8 +267,13 @@
- 	int retcode = 0;
- 
- 	printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
-+						1, &return_ctx);
-+#else
- 	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
- 						1, &return_ctx);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
-@@ -303,7 +308,11 @@
- 	else
- 		retcode = prepare_krb5_rfc4121_buffer(lctx, buf, endtime);
- 
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
-+#else
- 	maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
---- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c	2010-10-03 14:33:07.992424854 +0200
-@@ -115,7 +115,7 @@
- #include <errno.h>
- #include <time.h>
- #include <gssapi/gssapi.h>
--#ifdef USE_PRIVATE_KRB5_FUNCTIONS
-+#ifdef HAVE_HEIMDAL
- #include <gssapi/gssapi_krb5.h>
- #endif
- #include <krb5.h>
-@@ -927,9 +927,37 @@ 
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
--	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_const_realm client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_principal_get_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   client_realm, KRB5_TGS_NAME, client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -949,6 +977,7 @@ 
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -995,6 +1024,9 @@ 
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
-@@ -1316,12 +1316,21 @@
- 	 * If we failed for any reason to produce global
- 	 * list of supported enctypes, use local default here.
- 	 */
-+#ifdef HAVE_HEIMDAL
-+	if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
-+		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+					num_enctypes, enctypes);
-+	else
-+		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+					num_krb5_enctypes, krb5_enctypes);
-+#else
- 	if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
- 		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- 					&krb5oid, num_enctypes, enctypes);
- 	else
- 		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- 					&krb5oid, num_krb5_enctypes, krb5_enctypes);
-+#endif
- 
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_set_allowable_enctypes",
---- nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c~	2011-06-30 15:00:42.000000000 +0200
-+++ nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c	2011-08-03 12:40:53.865782009 +0200
-@@ -186,8 +186,13 @@
- 		num_enctypes = default_num_enctypes;
- 	}
- 
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
-+			num_enctypes, enctypes);
-+#else
- 	maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
- 			&krb5oid, num_enctypes, enctypes);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
- 		pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes",

net-fs/nfs-utils/files/nfs-utils-1.2.8-heimdal.patch

@@ -0,0 +1,74 @@
+--- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~	2010-09-28 14:24:16.000000000 +0200
++++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4	2010-10-03 14:13:17.274424855 +0200
+@@ -56,7 +56,11 @@
+       dnl of Heimdal Kerberos on SuSe
+       elif test \( -f $dir/include/heim_err.h -o\
+       		 -f $dir/include/heimdal/heim_err.h \) -a \
+-                -f $dir/lib/libroken.a; then
++                \( -f $dir/lib/libroken.a -o \
++                   -f $dir/lib64/libroken.a -o \
++                   -f $dir/lib64/libroken.so -o \
++                   -f $dir/lib/libroken.so \) ; then
++         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
+          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
+          KRBDIR="$dir"
+          gssapi_lib=gssapi
+--- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig	2010-09-28 14:24:16.000000000 +0200
++++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c	2010-10-03 14:33:07.992424854 +0200
+@@ -927,9 +927,37 @@ 
+ {
+ 	krb5_error_code ret;
+ 	krb5_creds creds;
+-	krb5_cc_cursor cur;
+ 	int found = 0;
+ 
++#ifdef HAVE_HEIMDAL
++	krb5_creds pattern;
++	krb5_const_realm client_realm;
++
++	krb5_cc_clear_mcred(&pattern);
++
++	client_realm = krb5_principal_get_realm (context, principal);
++
++	ret = krb5_make_principal (context, &pattern.server,
++				   client_realm, KRB5_TGS_NAME, client_realm,
++				   NULL);
++	if (ret)
++	  krb5_err (context, 1, ret, "krb5_make_principal");
++	pattern.client = principal;
++
++	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
++	krb5_free_principal (context, pattern.server);
++	if (ret) {
++	  if (ret == KRB5_CC_END)
++            return 1;
++	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
++	}
++
++	found = creds.times.endtime > time(NULL);
++
++	krb5_free_cred_contents (context, &creds);
++#else
++	krb5_cc_cursor cur;
++
+ 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
+ 	if (ret) 
+ 		return 0;
+@@ -949,6 +977,7 @@ 
+ 		krb5_free_cred_contents(context, &creds);
+ 	}
+ 	krb5_cc_end_seq_get(context, ccache, &cur);
++#endif
+ 
+ 	return found;
+ }
+@@ -995,6 +1024,9 @@ 
+ 	}
+ 	krb5_free_principal(context, principal);
+ err_princ:
++#ifdef HAVE_HEIMDAL
++#define KRB5_TC_OPENCLOSE              0x00000001
++#endif
+ 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
+ 	krb5_cc_close(context, ccache);
+ err_cache:

net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild

@@ -57,7 +57,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
 	epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
 	epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
-	epatch "${FILESDIR}"/nfs-utils-1.2.7-heimdal.patch
+	epatch "${FILESDIR}"/nfs-utils-1.2.8-heimdal.patch
 	eautoreconf
 }
 

net-fs/nfs-utils/nfs-utils-1.2.9.ebuild

@@ -56,7 +56,7 @@ DEPEND="${DEPEND_COMMON}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	epatch "${FILESDIR}"/${PN}-1.2.7-heimdal.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-heimdal.patch
 	eautoreconf
 }