import cifs-utils-7.0-1.el8

.cifs-utils.metadata

@@ -1 +1 @@
-3440625e73a2e8ea58c63c61b46a61f5b7f95bac SOURCES/cifs-utils-6.8.tar.bz2
+9df055a73d89ed3d536828d0cea304c9e04139d4 SOURCES/cifs-utils-7.0.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/cifs-utils-6.8.tar.bz2
+SOURCES/cifs-utils-7.0.tar.bz2

SOURCES/0001-Use-explicit-usr-bin-python3.patch

@@ -0,0 +1,55 @@
+From 17162396d9ace9396c27826f1c62719186e29ae9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
+Date: Fri, 20 Jan 2023 20:53:44 +0100
+Subject: [PATCH] Use explicit #!/usr/bin/python3
+
+---
+ checkopts    | 2 +-
+ smb2-quota   | 2 +-
+ smb2-secdesc | 2 +-
+ smbinfo      | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/checkopts b/checkopts
+index 88e70b1..00c4cfd 100755
+--- a/checkopts
++++ b/checkopts
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/python3
+ #
+ # Script to check for inconsistencies between documented mount options
+ # and implemented kernel options.
+diff --git a/smb2-quota b/smb2-quota
+index 6d0b8a3..49207c7 100755
+--- a/smb2-quota
++++ b/smb2-quota
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # coding: utf-8
+ #
+ # smb2-quota is a cmdline tool to display quota information for the
+diff --git a/smb2-secdesc b/smb2-secdesc
+index 5886091..534dd92 100755
+--- a/smb2-secdesc
++++ b/smb2-secdesc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # coding: utf-8
+ 
+ import array
+diff --git a/smbinfo b/smbinfo
+index 73c5bb3..766024e 100755
+--- a/smbinfo
++++ b/smbinfo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ #
+ # smbinfo is a cmdline tool to query SMB-specific file and fs
+-- 
+2.38.1
+

SOURCES/cifs-utils-rst2man-3.patch

@@ -1,28 +0,0 @@
-From 9ef872e140e04864d6e8b42f75ba184357b79a05 Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <ab@samba.org>
-Date: Tue, 17 Jul 2018 08:22:23 +0300
-Subject: [PATCH] configure.ac: support using both rst2man and rst2man-3
-
-Python3 version of rst2man is called rst2man-3.
-
-Signed-off-by: Alexander Bokovoy <ab@samba.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b0bc2b9..26d60ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,7 +252,7 @@ fi
- 
- # if docs are not disabled, check if rst2man is available
- if test $enable_man != "no"; then
--	AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
-+	AC_CHECK_PROGS(have_rst2man, rst2man-3 rst2man, no)
- 	if test $have_rst2man = "no"; then
- 		if test $enable_man = "yes"; then
- 			AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.])
--- 
-2.17.1
-

SPECS/cifs-utils.spec

@@ -2,8 +2,8 @@
 %define pre_release %nil
 
 Name:            cifs-utils
-Version:         6.8
-Release:         2%{pre_release}%{?dist}
+Version:         7.0
+Release:         1%{pre_release}%{?dist}
 Summary:         Utilities for mounting and managing CIFS mounts
 
 Group:           System Environment/Daemons
@@ -18,7 +18,7 @@ Requires(post):  /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
 
 Source0:         https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2
-Patch0:          cifs-utils-rst2man-3.patch
+Patch1:          0001-Use-explicit-usr-bin-python3.patch
 
 %description
 The SMB/CIFS protocol is a standard file sharing protocol widely deployed
@@ -53,7 +53,7 @@ provide these credentials to the kernel automatically at login.
 
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
-%patch0 -p1
+%patch1 -p1
 
 %build
 autoreconf -i
@@ -74,7 +74,10 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_bindir}/cifscreds
+%{_bindir}/smbinfo
+%{_bindir}/smb2-quota
 %{_sbindir}/mount.cifs
+%{_sbindir}/mount.smb3
 %{_sbindir}/cifs.upcall
 %{_sbindir}/cifs.idmap
 %dir %{_libdir}/%{name}
@@ -82,9 +85,12 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
 %{_mandir}/man1/getcifsacl.1.gz
 %{_mandir}/man1/setcifsacl.1.gz
 %{_mandir}/man1/cifscreds.1.gz
+%{_mandir}/man1/smbinfo.1.gz 
+%{_mandir}/man1/smb2-quota.1.gz
 %{_mandir}/man8/cifs.upcall.8.gz
 %{_mandir}/man8/cifs.idmap.8.gz
 %{_mandir}/man8/mount.cifs.8.gz
+%{_mandir}/man8/mount.smb3.8.gz
 %{_mandir}/man8/idmapwb.8.gz
 %dir %{_sysconfdir}/cifs-utils
 %ghost %{_sysconfdir}/cifs-utils/idmap-plugin
@@ -107,6 +113,36 @@ fi
 %{_mandir}/man8/pam_cifscreds.8.gz
 
 %changelog
+* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 7.0-1
+- Update to cifs-utils-7.0
+- Resolves: rhbz#2163373
+
+* Thu Dec 12 2019 Sachin Prabhu <sprabhu@redhat.com> - 6.8-3
+- Add manual gating tests
+- docs: cleanup rst formating
+- mount.cifs.rst: document new (no)handlecache mount option
+- manpage: update mount.cifs manpage with info about rdma option
+- checkopts: add python script to cross check mount options
+- mount.cifs.rst: document missing options, correct wrong ones
+- checkopts: report duplicated options in man page
+- mount.cifs.rst: more cleanups
+- mount.cifs.rst: document vers=3 mount option
+- mount.cifs.rst: document vers=3.02 mount option
+- cifs: Allow DNS resolver key to expire
+- mount.cifs: be more verbose and helpful regarding mount errors
+- Update mount.cifs with vers=default mount option and SMBv3.0.2
+- mount.cifs.rst: update vers=3.1.1 option description
+- getcifsacl: Do not go to parse_sec_desc if getxattr fails.
+- getcifsacl: Improve help usage and add -h option.
+- setcifsacl: fix adding ACE when owner sid in unexpected location
+- cifs.upcall: fix a compiler warning
+- mount.cifs Add various missing parms from the help text
+- mount.cifs: add more options to help message
+- mount.cifs: detect GMT format of snapshot version
+- Update man page for mount.cifs to add new options
+- mount.cifs.rst: mention kernel version for snapshots
+- Fix authors and maintainers
+
 * Tue Jul 17 2018 Alexander Bokovoy <abokovoy@redhat.com> - 6.8-2
 - Use Python 3 version of rst2man utility for generating man pages