diff --git a/.cifs-utils.metadata b/.cifs-utils.metadata index 3668d66..14f2e5a 100644 --- a/.cifs-utils.metadata +++ b/.cifs-utils.metadata @@ -1 +1 @@ -5011edbd27bcb230aa5eef37296e588e390c058f SOURCES/cifs-utils-7.1.tar.bz2 +146b99b40e7fb58b7e65fa6b8649548517f30329 SOURCES/cifs-utils-7.2.tar.bz2 diff --git a/.gitignore b/.gitignore index c358cd4..c066f10 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cifs-utils-7.1.tar.bz2 +SOURCES/cifs-utils-7.2.tar.bz2 diff --git a/SOURCES/smbinfo-bash-completion.patch b/SOURCES/smbinfo-bash-completion.patch deleted file mode 100644 index 384efd8..0000000 --- a/SOURCES/smbinfo-bash-completion.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 5d8a2ba..bba8740 100644 --- a/SPECS/cifs-utils.spec +++ b/SPECS/cifs-utils.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -14,11 +14,11 @@ %global bash_completion_dir %(pkg-config --variable=completionsdir bash-completion || echo /etc/bash_completion.d) Name: cifs-utils -Version: 7.1 +Version: 7.2 Release: %autorelease Summary: Utilities for mounting and managing CIFS mounts -License: GPLv3 +License: GPL-3.0-only URL: http://linux-cifs.samba.org/cifs-utils/ BuildRequires: gcc @@ -34,8 +34,6 @@ 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 @@ -110,11 +108,11 @@ install -Dpm 644 bash-completion/smbinfo %{buildroot}%{_datadir}%{bash_completio %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf %post -/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/%{name}/idmapwb.so 10 +alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/%{name}/idmapwb.so 10 %preun if [ $1 = 0 ]; then - /usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/%{name}/idmapwb.so + alternatives --remove cifs-idmap-plugin %{_libdir}/%{name}/idmapwb.so fi %files devel @@ -142,6 +140,9 @@ about CIFS mount. %changelog ## START: Generated by rpmautospec +* Fri Mar 07 2025 Paulo Alcantara - 7.2-1 +- resolves: RHEL-82680 - Update to version 7.2 + * Wed Oct 09 2024 Pavel Filipenský - 7.1-2 - Fix damaged test filename