Update to 4.5 release.

This commit is contained in:
Jeff Layton 2010-05-25 20:02:37 +00:00
parent 7e0ecb5c02
commit 643170ba91
4 changed files with 7 additions and 53 deletions

View File

@ -1 +1 @@
cifs-utils-4.4.tar.bz2
cifs-utils-4.5.tar.bz2

View File

@ -1,47 +0,0 @@
From df6188fc6b3bcf4749cb76c755fe24241cf9455c Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@samba.org>
Date: Fri, 30 Apr 2010 07:19:53 -0400
Subject: [PATCH] mount.cifs: strip leading delimiter off of prefixpath option (try #2)
...the kernel doesn't expect to see it and it causes a regression
when mounting some UNCs.
Reported-by: Ales Zelinka <azelinka@redhat.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
mount.cifs.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/mount.cifs.c b/mount.cifs.c
index 1040e8b..c4eb59a 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -1169,6 +1169,9 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info
}
prepath = share + sharelen;
+ if (*prepath != '\0')
+ prepath++;
+
prepathlen = strlen(prepath);
if (prepathlen + 1 > sizeof(parsed_info->prefix)) {
@@ -1669,6 +1672,7 @@ int main(int argc, char **argv)
goto mount_exit;
}
+ /* lengths of different strings + slashes + trailing \0 */
dev_len = strnlen(parsed_info->host, sizeof(parsed_info->host)) +
strnlen(parsed_info->share, sizeof(parsed_info->share)) +
strnlen(parsed_info->prefix, sizeof(parsed_info->prefix)) +
@@ -1684,6 +1688,7 @@ int main(int argc, char **argv)
strlcat(dev_name, parsed_info->host, dev_len);
strlcat(dev_name, "/", dev_len);
strlcat(dev_name, parsed_info->share, dev_len);
+ strlcat(dev_name, "/", dev_len);
strlcat(dev_name, parsed_info->prefix, dev_len);
currentaddress = parsed_info->addrlist;
--
1.6.6.1

View File

@ -2,8 +2,8 @@
%define pre_release %nil
Name: cifs-utils
Version: 4.4
Release: 3%{pre_release}%{?dist}
Version: 4.5
Release: 1%{pre_release}%{?dist}
Summary: Utilities for mounting and managing CIFS mounts
Group: System Environment/Daemons
@ -12,7 +12,6 @@ URL: http://linux-cifs.samba.org/cifs-utils/
BuildRoot: %{_tmppath}/%{name}-%{version}%{pre_release}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}%{pre_release}.tar.bz2
Patch1: cifs-utils-mount.cifs-strip-leading-delimiter.patch
BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake
Requires: keyutils
@ -27,7 +26,6 @@ file system.
%prep
%setup -q -n %{name}-%{version}%{pre_release}
%patch1 -p1
%build
%configure --prefix=/usr
@ -49,6 +47,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/mount.cifs.8.gz
%changelog
* Tue May 25 2010 Jeff Layton <jlayton@redhat.com> 4.5-1
- update to 4.5
* Thu Apr 29 2010 Jeff Layton <jlayton@redhat.com> 4.4-3
- mount.cifs: fix regression in prefixpath patch

View File

@ -1 +1 @@
b9e20a4a0f3ee7e50426b974ef6feab4 cifs-utils-4.4.tar.bz2
2d428d20e035367fd767faf6b4a939c4 cifs-utils-4.5.tar.bz2