diff --git a/.gitignore b/.gitignore index 8162128..ef0cd66 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cifs-utils-4.5.tar.bz2 +cifs-utils-4.6.tar.bz2 diff --git a/cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch b/cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch deleted file mode 100644 index 3292d14..0000000 --- a/cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d3743bbfd82b058b68c1bcf6e3341966a3d9f707 Mon Sep 17 00:00:00 2001 -From: Jeff Layton -Date: Sun, 30 May 2010 07:47:26 -0400 -Subject: [PATCH] mount.cifs: fix parsing of "cred=" option - -When the mount option parsing was cleaned up recently, the detection of -the "cred=" option was dropped. - -Signed-off-by: Jeff Layton ---- - mount.cifs.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 326b94e..65754c0 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -800,6 +800,8 @@ static int parse_opt_token(const char *token) - return OPT_UNC; - if (strncmp(token, "dom", 3) == 0 || strncmp(token, "workg", 5) == 0) - return OPT_DOM; -+ if (strncmp(token, "cred", 4) == 0) -+ return OPT_CRED; - if (strncmp(token, "uid", 3) == 0) - return OPT_UID; - if (strncmp(token, "gid", 3) == 0) --- -1.6.6.1 - diff --git a/cifs-utils.spec b/cifs-utils.spec index f0cbeb7..8e1e046 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -2,8 +2,8 @@ %define pre_release %nil Name: cifs-utils -Version: 4.5 -Release: 2%{pre_release}%{?dist} +Version: 4.6 +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-4.5-mount.cifs-fix-parsing-of-cred-option.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 +* Fri Jul 30 2010 Jeff Layton 4.6-1 +- update to 4.6 + * Tue Jun 01 2010 Jeff Layton 4.5-2 - mount.cifs: fix parsing of cred= option (BZ#597756) diff --git a/sources b/sources index c514f2d..aed66d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d428d20e035367fd767faf6b4a939c4 cifs-utils-4.5.tar.bz2 +3b66d6efc69b9da57591988db470c545 cifs-utils-4.6.tar.bz2