From 6621c050b1373b7aaece16b95288d3b83cf94094 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Fri, 2 Apr 2010 12:31:42 +0000 Subject: [PATCH] Update to 4.2 release --- .cvsignore | 2 +- cifs-utils-4.0-mount-cifs-addr-null-ptr.patch | 26 ------------------- cifs-utils.spec | 9 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 cifs-utils-4.0-mount-cifs-addr-null-ptr.patch diff --git a/.cvsignore b/.cvsignore index 24463bb..8e6726c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cifs-utils-4.1.tar.bz2 +cifs-utils-4.2.tar.bz2 diff --git a/cifs-utils-4.0-mount-cifs-addr-null-ptr.patch b/cifs-utils-4.0-mount-cifs-addr-null-ptr.patch deleted file mode 100644 index f34ba0a..0000000 --- a/cifs-utils-4.0-mount-cifs-addr-null-ptr.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cff3f7cb2b94aec118f27ee8dd904ef216489938 Mon Sep 17 00:00:00 2001 -From: Jeff Layton -Date: Sun, 7 Mar 2010 18:49:33 -0500 -Subject: [PATCH] mount.cifs: check for NULL addr pointer before handling scopeid - -Signed-off-by: Jeff Layton ---- - mount.cifs.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 5237476..4e38415 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -1604,7 +1604,7 @@ mount_retry: - } - } - -- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { -+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { - strlcat(options, "%", options_size); - current_len = strnlen(options, options_size); - optionstail = options + current_len; --- -1.6.6.1 - diff --git a/cifs-utils.spec b/cifs-utils.spec index 82f523a..cf56ce8 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -2,18 +2,18 @@ %define pre_release %nil Name: cifs-utils -Version: 4.1 +Version: 4.2 Release: 1%{pre_release}%{?dist} Summary: Utilities for mounting and managing CIFS mounts Group: System Environment/Daemons License: GPLv3 -URL: http://linux-cifs.samba.org/ +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 -BuildRequires: libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake +BuildRequires: libcap-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake Requires: keyutils %description @@ -47,6 +47,9 @@ rm -rf %{buildroot} %{_mandir}/man8/mount.cifs.8.gz %changelog +* Fri Apr 02 2010 Jeff Layton 4.2-1 +- update to 4.2 + * Tue Mar 23 2010 Jeff Layton 4.1-1 - update to 4.1 diff --git a/sources b/sources index d74249a..7cd49b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c58046f77a8bca89278e58ef3500b80 cifs-utils-4.1.tar.bz2 +095d5fac907e0b51c3d8f402991b4fb5 cifs-utils-4.2.tar.bz2