diff --git a/.cifs-utils.metadata b/.cifs-utils.metadata index 411b239..3668d66 100644 --- a/.cifs-utils.metadata +++ b/.cifs-utils.metadata @@ -1 +1 @@ -9df055a73d89ed3d536828d0cea304c9e04139d4 SOURCES/cifs-utils-7.0.tar.bz2 +5011edbd27bcb230aa5eef37296e588e390c058f SOURCES/cifs-utils-7.1.tar.bz2 diff --git a/.gitignore b/.gitignore index c5bb369..c358cd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cifs-utils-7.0.tar.bz2 +SOURCES/cifs-utils-7.1.tar.bz2 diff --git a/SOURCES/smbinfo-bash-completion.patch b/SOURCES/smbinfo-bash-completion.patch new file mode 100644 index 0000000..384efd8 --- /dev/null +++ b/SOURCES/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?= +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ý +--- + 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/SPECS/cifs-utils.spec b/SPECS/cifs-utils.spec index 9dad6cb..6465e31 100644 --- a/SPECS/cifs-utils.spec +++ b/SPECS/cifs-utils.spec @@ -1,9 +1,21 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + #% 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 -Release: 5%{pre_release}%{?dist} +Version: 7.1 +Release: %autorelease Summary: Utilities for mounting and managing CIFS mounts License: GPL-3.0-only @@ -22,6 +34,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 +66,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 +81,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 +103,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 @@ -124,9 +141,16 @@ about CIFS mount. %{_mandir}/man1/smbinfo.* %changelog -* Fri Oct 25 2024 MSVSphere Packaging Team - 7.0-5 +## START: Generated by rpmautospec +* Tue Oct 29 2024 Troy Dawson - 7.1-2 +- Bump release for October 2024 mass rebuild: + +* Fri Oct 25 2024 MSVSphere Packaging Team - 7.1-1 - Rebuilt for MSVSphere 10 +* Tue Oct 08 2024 Pavel Filipenský - 7.1-1 +- resolves: RHEL-61731 - Update to version 7.1 + * Mon Jun 24 2024 Troy Dawson - 7.0-5 - Bump release for June 2024 mass rebuild @@ -460,3 +484,4 @@ about CIFS mount. * Mon Feb 08 2010 Jeff Layton 4.0a1-1 - first RPM package build +## END: Generated by rpmautospec