diff --git a/.gitignore b/.gitignore index 295c3ed..f4e21ef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ cifs-utils-4.6.tar.bz2 /cifs-utils-4.8.1.tar.bz2 /cifs-utils-4.9.tar.bz2 /cifs-utils-5.0.tar.bz2 +/cifs-utils-5.1.tar.bz2 diff --git a/cifs-utils.spec b/cifs-utils.spec index 6f3c247..6925b04 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -2,8 +2,8 @@ %define pre_release %nil Name: cifs-utils -Version: 5.0 -Release: 2%{pre_release}%{?dist} +Version: 5.1 +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 -Patch0: mount.cifs-check_newline-returns-EX_USAGE-on-error-n.patch BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake samba-winbind-devel Requires: keyutils @@ -27,7 +26,6 @@ file system. %prep %setup -q -n %{name}-%{version}%{pre_release} -%patch0 -p1 %build %configure --prefix=/usr @@ -51,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man8/mount.cifs.8.gz %changelog +* Fri Sep 23 2011 Jeff Layton 5.1-1 +- update to 5.1 + * Fri Jul 29 2011 Jeff Layton 5.0-2 - mount.cifs: fix check_newline retcode check (bz# 726717) diff --git a/mount.cifs-check_newline-returns-EX_USAGE-on-error-n.patch b/mount.cifs-check_newline-returns-EX_USAGE-on-error-n.patch deleted file mode 100644 index f01b83e..0000000 --- a/mount.cifs-check_newline-returns-EX_USAGE-on-error-n.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1e7a32924b22d1f786b6f490ce8590656f578f91 Mon Sep 17 00:00:00 2001 -From: Jeff Layton -Date: Fri, 29 Jul 2011 07:12:48 -0400 -Subject: [PATCH] mount.cifs: check_newline returns EX_USAGE on error, not -1 - -Reported-by: Jan Lieskovsky -Signed-off-by: Jeff Layton ---- - mount.cifs.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 107a5a5..aa4581f 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -1419,8 +1419,7 @@ static int check_newline(const char *progname, const char *name) - static int check_mtab(const char *progname, const char *devname, - const char *dir) - { -- if (check_newline(progname, devname) == -1 || -- check_newline(progname, dir) == -1) -+ if (check_newline(progname, devname) || check_newline(progname, dir)) - return EX_USAGE; - return 0; - } --- -1.7.6 - diff --git a/sources b/sources index 6317edf..398c3d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50e55aed038e55b4a7668ee628f934e4 cifs-utils-5.0.tar.bz2 +b1b232adc042fd157d2f9848f4650fad cifs-utils-5.1.tar.bz2