diff --git a/0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch b/0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch deleted file mode 100644 index 36b9939964816b336c66b89ba6587b9d06d27312..0000000000000000000000000000000000000000 --- a/0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0540dfad55f8e668ef67b03ccc709e311ca9eb04 Mon Sep 17 00:00:00 2001 -From: Mikhail Novosyolov -Date: Thu, 16 Jul 2020 17:09:42 +0800 -Subject: [PATCH] cifs-utils: Respect DESTDIR when installing smb3 stuff - -When make install is run during package building, DESTDIR parameter is passed, e.g.: -$ rpm --eval %makeinstall_std -make DESTDIR=/root/rpmbuild/BUILDROOT/%{name}-%{version}-%{release}-rosa2016.1.x86_64-buildroot install - -Without DESTDIR build scripts tried to create symlinks outside of the build root: -make[3]: Entering directory '/tmp/abf/rpmbuild/BUILD/cifs-utils-6.10' -(cd /sbin && ln -sf mount.cifs mount.smb3) -ln: failed to create symbolic link 'mount.smb3': Permission denied - -The same fix was introduced in Arch Linux package when updating from 6.9 to 6.10: -https://git.archlinux.org/svntogit/packages.git/commit/trunk/PKGBUILD?h=packages/cifs-utils&id=c75b246a762ea9b90db404dfebc6d3 -5d5b16972f - -backport from: https://lists.samba.org/archive/samba-technical/2020-January/134770.html ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..09ef293 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,11 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -+ (cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) --- -1.8.3.1 - diff --git a/cifs-utils-6.10.tar.bz2 b/cifs-utils-6.10.tar.bz2 deleted file mode 100644 index 29344ede4147e627d123895e6ed833fd32633af2..0000000000000000000000000000000000000000 Binary files a/cifs-utils-6.10.tar.bz2 and /dev/null differ diff --git a/cifs-utils-6.12.tar.bz2 b/cifs-utils-6.12.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..14b119be661901955a7421e548dbec2b65be2391 Binary files /dev/null and b/cifs-utils-6.12.tar.bz2 differ diff --git a/cifs-utils.spec b/cifs-utils.spec index e4946f768f7c5b8dd5864d3e274b77cd00f86c9e..df5e94b3085ad2d6761bfc64f33539ce3b0ddd4b 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,13 +1,11 @@ Name: cifs-utils -Version: 6.10 +Version: 6.12 Release: 1 Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem License: GPLv3+ URL: http://linux-cifs.samba.org/cifs-utils/ Source0: https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2 -Patch1: 0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch - 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 Provides: pam_cifscreds @@ -77,6 +75,9 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir} %{_mandir}/man8/* %changelog +* Fri Jan 22 2021 yanglongkang - 6.12-1 +- update to latest v6.12 version + * Wed Jul 15 2020 Zhiqiang Liu - 6.10-1 - update to latest v6.10 version