From e8168b461d7a1af8bae70506fbf3e48ec72ba1c7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Wed, 29 Sep 2010 10:08:58 +0000
Subject: [PATCH] - updated to 1.2.3

Changed files:
    nfs-utils-heimdal_functions.patch -> 1.6
    nfs-utils-no_libgssapi.patch -> 1.5
    nfs-utils.spec -> 1.190
---
 nfs-utils-heimdal_functions.patch | 28 +++++++++++++---------------
 nfs-utils-no_libgssapi.patch      | 21 ++++++++++++++-------
 nfs-utils.spec                    | 10 +++++++---
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/nfs-utils-heimdal_functions.patch b/nfs-utils-heimdal_functions.patch
index bcffa4e..595c358 100644
--- a/nfs-utils-heimdal_functions.patch
+++ b/nfs-utils-heimdal_functions.patch
@@ -1,5 +1,15 @@
 --- utils/gssd/krb5_util.c	2008-10-17 14:20:09.000000000 +0000
 +++ utils/gssd/krb5_util.c	2008-11-22 13:52:42.000000000 +0000
+@@ -115,9 +115,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <gssapi/gssapi.h>
+-#ifdef USE_PRIVATE_KRB5_FUNCTIONS
+ #include <gssapi/gssapi_krb5.h>
+-#endif
+ #include <krb5.h>
+ #include <rpc/auth_gss.h>
+ 
 @@ -927,9 +927,37 @@ 
  {
  	krb5_error_code ret;
@@ -9,14 +19,14 @@
  
 +#ifdef HAVE_HEIMDAL
 +	krb5_creds pattern;
-+	krb5_realm *client_realm;
++	krb5_const_realm client_realm;
 +
 +	krb5_cc_clear_mcred(&pattern);
 +
-+	client_realm = krb5_princ_realm (context, principal);
++	client_realm = krb5_principal_get_realm (context, principal);
 +
 +	ret = krb5_make_principal (context, &pattern.server,
-+				   *client_realm, KRB5_TGS_NAME, *client_realm,
++				   client_realm, KRB5_TGS_NAME, client_realm,
 +				   NULL);
 +	if (ret)
 +	  krb5_err (context, 1, ret, "krb5_make_principal");
@@ -57,15 +67,3 @@
  	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
  	krb5_cc_close(context, ccache);
  err_cache:
-@@ -1262,7 +1294,11 @@
- 	if (context != NULL) {
- 		origmsg = krb5_get_error_message(context, code);
- 		msg = strdup(origmsg);
-+#ifdef HAVE_HEIMDAL
-+		krb5_free_error_string(context, origmsg);
-+#else
- 		krb5_free_error_message(context, origmsg);
-+#endif
- 	}
- #endif
- 	if (msg != NULL)
diff --git a/nfs-utils-no_libgssapi.patch b/nfs-utils-no_libgssapi.patch
index 51afd83..68a2b0e 100644
--- a/nfs-utils-no_libgssapi.patch
+++ b/nfs-utils-no_libgssapi.patch
@@ -16,7 +16,7 @@ Index: nfs-utils-1.1.0/utils/gssd/context_lucid.c
 @@ -171,10 +173,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
  	int retcode = 0;
  
- 	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
+ 	printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
 -	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
 +	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
  						1, &return_ctx);
@@ -42,13 +42,20 @@ Index: nfs-utils-1.1.0/utils/gssd/krb5_util.c
 ===================================================================
 --- nfs-utils-1.1.0.orig/utils/gssd/krb5_util.c
 +++ nfs-utils-1.1.0/utils/gssd/krb5_util.c
-@@ -294,10 +294,10 @@ limit_krb5_enctypes(struct rpc_gss_sec *
- 		return -1;
- 	}
+@@ -1317,13 +1317,13 @@ limit_krb5_enctypes(struct rpc_gss_sec *
+ 	 * list of supported enctypes, use local default here.
+ 	 */
+ 	if (krb5_enctypes == NULL)
+-		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+-					&krb5oid, num_enctypes, enctypes);
++		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++					num_enctypes, enctypes);
+ 	else
+-		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+-					&krb5oid, num_krb5_enctypes, krb5_enctypes);
++		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++					num_krb5_enctypes, krb5_enctypes);
  
--	maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
-+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
- 					     num_enctypes, &enctypes);
  	if (maj_stat != GSS_S_COMPLETE) {
 -		pgsserr("gss_set_allowable_enctypes",
 +		pgsserr("gss_krb5_set_allowable_enctypes",
diff --git a/nfs-utils.spec b/nfs-utils.spec
index df0cebe..92426fe 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8):	Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):	Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
-Version:	1.2.2
-Release:	4
+Version:	1.2.3
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5:	dad92f64db3266c7757f71bb53ee8f35
+# Source0-md5:	1131dc5f27c4f3905a6e7ee0d594fd4d
 #Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:	nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
@@ -384,11 +384,15 @@ fi
 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
+%attr(755,root,root) %{_sbindir}/mountstats
+%attr(755,root,root) %{_sbindir}/nfsiostat
 %attr(755,root,root) %{_sbindir}/showmount
 %attr(755,root,root) %{_sbindir}/rpc.gssd
 %attr(754,root,root) /etc/rc.d/init.d/gssd
 %{_mandir}/man8/gssd.8*
 %{_mandir}/man8/mount.nfs.8*
+%{_mandir}/man8/mountstats.8*
+%{_mandir}/man8/nfsiostat.8*
 %{_mandir}/man8/rpc.gssd.8*
 %{_mandir}/man8/showmount.8*
 %{_mandir}/man8/umount.nfs.8*
-- 
2.44.0