From ba97a0b2c1bd8f2957e51a8e035493d4f12b27e1 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 18 Dec 2020 16:12:23 -0500 Subject: [PATCH] Split out -info subpackage This will allow environments where Python is not desirable to still make use of `cifs-utils`, such as Fedora CoreOS and other variants which value minimalism. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1909288 --- cifs-utils.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/cifs-utils.spec b/cifs-utils.spec index 61d731f..1ea0f6e 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -3,7 +3,7 @@ Name: cifs-utils Version: 6.11 -Release: 1%{pre_release}%{?dist} +Release: 2%{pre_release}%{?dist} Summary: Utilities for mounting and managing CIFS mounts License: GPLv3 @@ -18,6 +18,8 @@ Requires: keyutils Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives +Recommends: %{name}-info%{?_isa} = %{version}-%{release} + Source0: https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2 Patch0: cifs-utils-destdir.patch @@ -73,8 +75,6 @@ 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 @@ -84,8 +84,6 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir} %{_mandir}/man1/getcifsacl.* %{_mandir}/man1/setcifsacl.* %{_mandir}/man1/cifscreds.* -%{_mandir}/man1/smbinfo.* -%{_mandir}/man1/smb2-quota.* %{_mandir}/man8/cifs.upcall.* %{_mandir}/man8/cifs.idmap.* %{_mandir}/man8/mount.cifs.* @@ -111,7 +109,27 @@ fi %{_libdir}/security/pam_cifscreds.so %{_mandir}/man8/pam_cifscreds.8.gz +# This subpackage also serves the purpose of avoiding a Python dependency on +# the main package: https://bugzilla.redhat.com/show_bug.cgi?id=1909288. +%package info +Summary: Additional tools for querying information about CIFS mount +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description info +This subpackage includes additional tools for querying information +about CIFS mount. + +%files info +%{_bindir}/smb2-quota +%{_bindir}/smbinfo +%{_mandir}/man1/smb2-quota.* +%{_mandir}/man1/smbinfo.* + %changelog +* Fri Dec 18 2020 Jonathan Lebon - 6.11-2 +- Split out -info subpackage for smb2-quota and smbinfo + https://bugzilla.redhat.com/show_bug.cgi?id=1909288 + * Mon Nov 02 2020 Alexander Bokovoy - 6.11-1 - Update to v6.11 release - Resolves: rhbz#1876400 - CVE-2020-14342 - cifs-utils: shell command injection