[packages/nfs-utils] - updated to 2.7.1, more heimdal adjustments needed

qboosh qboosh at pld-linux.org
Sun Sep 15 19:50:35 CEST 2024


commit 18b4b4729e6cb097c9e48d76c8ed7206dd12b09e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 15 19:53:29 2024 +0200

    - updated to 2.7.1, more heimdal adjustments needed

 nfs-utils-heimdal.patch | 29 +++++++++++++++++++++++++++++
 nfs-utils.spec          |  6 ++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 29312be..a217b39 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -10,12 +10,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:	2.6.4
+Version:	2.7.1
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	907f95977ccf7a522ee32af1534f0e4c
+# Source0-md5:	5ca9f2a5c49f0a19563f3f14e813af18
 #Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:	nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
@@ -499,6 +499,7 @@ fi
 %attr(755,root,root) %{_sbindir}/nfsdcld
 %attr(755,root,root) %{_sbindir}/nfsdclddb
 %attr(755,root,root) %{_sbindir}/nfsdclnts
+%attr(755,root,root) %{_sbindir}/nfsref
 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd
@@ -526,6 +527,7 @@ fi
 %{_mandir}/man8/nfsdclddb.8*
 %{_mandir}/man8/nfsdclnts.8*
 %{_mandir}/man8/nfsdcltrack.8*
+%{_mandir}/man8/nfsref.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index d2f288e..b6deba0 100644
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -93,3 +93,32 @@
  	return strdup(error_message(code));
  #else
  	if (context != NULL)
+@@ -1642,6 +1642,11 @@ get_allowed_enctypes(void)
+ 	struct conf_list_node *node;
+ 	char *buf = NULL, *old = NULL;
+ 	int len, ret = 0;
++	krb5_context ctx = NULL;
++
++	ret = krb5_init_context(&ctx);
++	if (ret != 0)
++		return ret;
+ 
+ 	allowed_etypes = conf_get_list("gssd", "allowed-enctypes");
+ 	if (allowed_etypes) {
+@@ -1653,7 +1658,7 @@ get_allowed_enctypes(void)
+ 				ret = ENOMEM;
+ 				goto out_err;
+ 			}
+-			ret = krb5_string_to_enctype(node->field,
++			ret = krb5_string_to_enctype(ctx, node->field,
+ 						     &allowed_enctypes[num_allowed_enctypes]);
+ 			if (ret) {
+ 				printerr(0, "%s: invalid enctype %s",
+@@ -1694,6 +1699,7 @@ out:
+ 		free(old);
+ 	if (allowed_etypes)
+ 		conf_free_list(allowed_etypes);
++	krb5_free_context(ctx);
+ 	return ret;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nfs-utils.git/commitdiff/18b4b4729e6cb097c9e48d76c8ed7206dd12b09e



More information about the pld-cvs-commit mailing list