!23 [sync] PR-19: Sync each branch submit

From: @openeuler-sync-bot
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2021-08-17 12:03:27 +00:00 committed by Gitee
commit caba941b07

View File

@ -1,6 +1,6 @@
Name: cifs-utils Name: cifs-utils
Version: 6.10 Version: 6.10
Release: 2 Release: 3
Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem
License: GPLv3+ License: GPLv3+
URL: http://linux-cifs.samba.org/cifs-utils/ URL: http://linux-cifs.samba.org/cifs-utils/
@ -10,7 +10,7 @@ Patch0: 0001-CVE-2020-14342-mount.cifs-fix-shell-command-injectio.patch
Patch1: 0002-CVE-2021-20208.patch Patch1: 0002-CVE-2021-20208.patch
BuildRequires: python3-docutils libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf BuildRequires: python3-docutils libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf
BuildRequires: automake libwbclient-devel pam-devel git python3-samba pkg-config fdupes gcc BuildRequires: automake libwbclient-devel pam-devel python3-samba pkg-config fdupes gcc
Provides: pam_cifscreds Provides: pam_cifscreds
Obsoletes: pam_cifscreds Obsoletes: pam_cifscreds
Requires: keyutils Requires: keyutils
@ -41,7 +41,7 @@ Requires: man
This contains man files for the using of cifs-utils. This contains man files for the using of cifs-utils.
%prep %prep
%autosetup -Sgit -n %{name}-%{version} %autosetup -n %{name}-%{version} -p1
%build %build
autoreconf -i autoreconf -i
@ -80,6 +80,9 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Tue Aug 17 2021 haowenchao <haowenchao@huawei.com> - 6.10-3
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Sat May 8 2021 yanglongkang <yanglongkang@huawei.com> - 6.10-2 * Sat May 8 2021 yanglongkang <yanglongkang@huawei.com> - 6.10-2
- Fix CVE-2021-20208 - Fix CVE-2021-20208