From f125881b180a81df193affaeaf895952fab0c61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Tue, 8 Oct 2024 14:40:20 +0200
Subject: [PATCH] resolves: RHEL-61731 - Update to version 7.1

---
 .gitignore                    |  1 +
 cifs-utils.spec               | 13 +++++++---
 smbinfo-bash-completion.patch | 47 +++++++++++++++++++++++++++++++++++
 sources                       |  2 +-
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 smbinfo-bash-completion.patch

diff --git a/.gitignore b/.gitignore
index 5ed7919..e90eddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ cifs-utils-4.6.tar.bz2
 /cifs-utils-6.14.tar.bz2
 /cifs-utils-6.15.tar.bz2
 /cifs-utils-7.0.tar.bz2
+/cifs-utils-7.1.tar.bz2
diff --git a/cifs-utils.spec b/cifs-utils.spec
index fcb8015..6269b23 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -1,8 +1,10 @@
 #% define pre_release rc1
 %define pre_release %nil
 
+%global bash_completion_dir %(pkg-config --variable=completionsdir bash-completion || echo /etc/bash_completion.d)
+
 Name:            cifs-utils
-Version:         7.0
+Version:         7.1
 Release:         %autorelease
 Summary:         Utilities for mounting and managing CIFS mounts
 
@@ -22,6 +24,8 @@ Recommends: %{name}-info%{?_isa} = %{version}-%{release}
 
 Source0:         https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2
 
+Patch0: smbinfo-bash-completion.patch
+
 %description
 The SMB/CIFS protocol is a standard file sharing protocol widely deployed
 on Microsoft Windows machines. This package contains tools for mounting
@@ -52,10 +56,10 @@ for each user from somewhere. The pam_cifscreds module can be used to
 provide these credentials to the kernel automatically at login.
 
 %prep
-%setup -q -n %{name}-%{version}%{pre_release}
+%autosetup -n %{name}-%{version}%{pre_release} -p1
 
 %build
-fgrep -r -l '/usr/bin/env python' | xargs -n1 sed -i 's@/usr/bin/env python.*@%python3@g'
+grep -F -r -l '/usr/bin/env python' | xargs --no-run-if-empty -n1 sed -i 's@/usr/bin/env python.*@%python3@g'
 autoreconf -i
 %configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
 make %{?_smp_mflags}
@@ -67,9 +71,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
 install -m 644 contrib/request-key.d/cifs.idmap.conf %{buildroot}%{_sysconfdir}/request-key.d
 install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}/request-key.d
+install -Dpm 644 bash-completion/smbinfo %{buildroot}%{_datadir}%{bash_completion_dir}/smbinfo
 
 %files
 %doc
+%license COPYING
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_bindir}/cifscreds
@@ -87,6 +93,7 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
 %{_mandir}/man8/mount.cifs.*
 %{_mandir}/man8/mount.smb3.*
 %{_mandir}/man8/idmapwb.*
+%{_datadir}%{bash_completion_dir}/smbinfo
 %dir %{_sysconfdir}/cifs-utils
 %ghost %{_sysconfdir}/cifs-utils/idmap-plugin
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
diff --git a/smbinfo-bash-completion.patch b/smbinfo-bash-completion.patch
new file mode 100644
index 0000000..384efd8
--- /dev/null
+++ b/smbinfo-bash-completion.patch
@@ -0,0 +1,47 @@
+From d69d2129c6476afbcbbe8dc6e2ed17f233084d85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
+Date: Mon, 7 Oct 2024 21:48:31 +0200
+Subject: [PATCH] smbinfo: add bash completion support for filestreaminfo,
+ keys, gettconinfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
+---
+ bash-completion/smbinfo | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/bash-completion/smbinfo b/bash-completion/smbinfo
+index d56b581..ec0d8a4 100644
+--- a/bash-completion/smbinfo
++++ b/bash-completion/smbinfo
+@@ -15,19 +15,22 @@ smb_info()
+ 	      filemodeinfo
+ 	      filepositioninfo
+ 	      filestandardinfo
++	      filestreaminfo
+ 	      fsctl-getobjid
+ 	      getcompression
+ 	      setcompression
+ 	      list-snapshots
+ 	      quota
+-	      secdesc"
++	      secdesc
++	      keys
++	      gettconinfo"
+ 	case $prev in
+ 		'-v'|'-h')
+ 			return 0
+ 			;;
+ 		'fileaccessinfo'|'filealigninfo'|'fileallinfo'|'filebasicinfo'|'fileeainfo'|'filefsfullsizeinfo'|\
+-		'fileinternalinfo'|'filemodeinfo'|'filepositioninfo'|'filestandardinfo'|'fsctl-getobjid'|\
+-		'getcompression'|'setcompression'|'list-snapshots'|'quota'|'secdesc')
++		'fileinternalinfo'|'filemodeinfo'|'filepositioninfo'|'filestandardinfo'|'filestreaminfo'|'fsctl-getobjid'|\
++		'getcompression'|'setcompression'|'list-snapshots'|'quota'|'secdesc'|'keys'|'gettconinfo')
+ 			local IFS=$'\n'
+ 			compopt -o filenames
+ 			COMPREPLY=( $(compgen -f -o dirnames -- ${cur:-""}) )
+-- 
+2.46.1
+
diff --git a/sources b/sources
index 242474a..a2bf2ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cifs-utils-7.0.tar.bz2) = 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb
+SHA512 (cifs-utils-7.1.tar.bz2) = 9eda85b2767cd19c7f69843750450c3862596debf47f41d9ce07f3d7438225b700b260be9585d2f7c9962d3f4dd8434b1b647c9ba670962cf136ce7ad86f92ab