From 0e7caa052359f1f705a8c0a10e182af37149bf58 Mon Sep 17 00:00:00 2001
From: Pavel Vondruska <dexter.cz@gmail.com>
Date: Mon, 11 Sep 2023 10:11:29 +0200
Subject: [PATCH] dalsi ZS patche

---
 make.sh                      |  7 +++++--
 zs5-add-missing-params.patch | 15 +++++++++++++++
 zs6-krb-rc-param.patch       |  9 +++++++++
 zs9-idmap-verbosity.patch    | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 zs5-add-missing-params.patch
 create mode 100644 zs6-krb-rc-param.patch
 create mode 100644 zs9-idmap-verbosity.patch

diff --git a/make.sh b/make.sh
index df8cc92..85cf5e9 100755
--- a/make.sh
+++ b/make.sh
@@ -39,9 +39,12 @@ zs1-n-option-impl
 zs2-idmap-init
 zs3-keyctl-order
 zs4-nfs4mount-strtok
-zs5-multhr-hostcache" >> debian/patches/series
+zs5-multhr-hostcache
+zs5-add-missing-params.patch
+zs6-krb-rc-param.patch
+zs9-idmap-verbosity.patch" >> debian/patches/series
 
-dch --newversion "1:1.3.4-6+zs8" "Apply local patches"
+dch --newversion "1:1.3.4-6+zs9" "Apply local patches"
 
 mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --yes' debian/control
 
diff --git a/zs5-add-missing-params.patch b/zs5-add-missing-params.patch
new file mode 100644
index 0000000..b81d441
--- /dev/null
+++ b/zs5-add-missing-params.patch
@@ -0,0 +1,15 @@
+Index: nfs-utils-1.3.4/debian/nfs-utils_env.sh
+===================================================================
+--- nfs-utils-1.3.4.orig/debian/nfs-utils_env.sh
++++ nfs-utils-1.3.4/debian/nfs-utils_env.sh
+@@ -25,7 +25,7 @@ echo SVCGSSDARGS=\"$RPCSVCGSSDOPTS\"
+ } > /run/sysconfig/nfs-utils
+ 
+ # the following are supported by the systemd units, but not exposed in default files
+-# echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
+-# echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
+-# echo BLKMAPDARGS=\"$BLKMAPDARGS\"
++echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
++echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
++echo BLKMAPDARGS=\"$BLKMAPDARGS\"
+ # echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"
diff --git a/zs6-krb-rc-param.patch b/zs6-krb-rc-param.patch
new file mode 100644
index 0000000..2b2ab87
--- /dev/null
+++ b/zs6-krb-rc-param.patch
@@ -0,0 +1,9 @@
+Index: nfs-utils-1.3.4/debian/nfs-utils_env.sh
+===================================================================
+--- nfs-utils-1.3.4.orig/debian/nfs-utils_env.sh
++++ nfs-utils-1.3.4/debian/nfs-utils_env.sh
+@@ -29,3 +29,4 @@ echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
+ echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
+ echo BLKMAPDARGS=\"$BLKMAPDARGS\"
+ # echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"
++echo KRB5RCACHEDIR=\"$KRB5RCACHEDIR\"
diff --git a/zs9-idmap-verbosity.patch b/zs9-idmap-verbosity.patch
new file mode 100644
index 0000000..11d3471
--- /dev/null
+++ b/zs9-idmap-verbosity.patch
@@ -0,0 +1,33 @@
+Index: nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c
+===================================================================
+--- nfs-utils-1.3.4.orig/utils/nfsidmap/nfsidmap.c
++++ nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c
+@@ -418,13 +418,15 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++	if (!verbose)
++		verbose = conf_get_num("General", "Verbosity", 0);
++	if (verbose)
++		nfs4_set_debug(verbose, NULL);
++
+ 	if ((rc = nfs4_init_name_mapping(PATH_IDMAPDCONF)))  {
+ 		xlog_errno(rc, "Unable to create name to user id mappings.");
+ 		return EXIT_FAILURE;
+ 	}
+-	if (!verbose)
+-		verbose = conf_get_num("General", "Verbosity", 0);
+-
+ 	if (display)
+ 		return display_default_domain();
+ 	if (list)
+@@ -444,9 +446,6 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
+-	if (verbose)
+-		nfs4_set_debug(verbose, NULL);
+-
+ 	key = strtol(argv[optind++], NULL, 10);
+ 
+ 	arg = strdup(argv[optind]);
-- 
GitLab