Update to 5.3 release

This commit is contained in:
Jeff Layton 2012-01-28 09:03:37 -05:00
parent d39c0a1293
commit 9e09d11943
4 changed files with 10 additions and 58 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ cifs-utils-4.6.tar.bz2
/cifs-utils-5.0.tar.bz2
/cifs-utils-5.1.tar.bz2
/cifs-utils-5.2.tar.bz2
/cifs-utils-5.3.tar.bz2

View File

@ -1,52 +0,0 @@
From a58988c1b9b096da85f99e6fabb7a311bfa3e81d Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@samba.org>
Date: Fri, 9 Dec 2011 21:45:49 -0500
Subject: [PATCH] contrib: add a set of sample /etc/request-key.d files
Add a contrib directory, a set of sample /etc/request-key.d files and
a README that explains what they're for.
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
contrib/request-key.d/README | 7 +++++++
contrib/request-key.d/cifs.idmap.conf | 1 +
contrib/request-key.d/cifs.spnego.conf | 1 +
3 files changed, 9 insertions(+), 0 deletions(-)
create mode 100644 contrib/README
create mode 100644 contrib/request-key.d/README
create mode 100644 contrib/request-key.d/cifs.idmap.conf
create mode 100644 contrib/request-key.d/cifs.spnego.conf
diff --git a/contrib/README b/contrib/README
new file mode 100644
index 0000000..e69de29
diff --git a/contrib/request-key.d/README b/contrib/request-key.d/README
new file mode 100644
index 0000000..b605da7
--- /dev/null
+++ b/contrib/request-key.d/README
@@ -0,0 +1,7 @@
+As of version 1.5.5, prior to opening /etc/request-key.conf, the
+request-key utility will look first in /etc/request-key.d for a file of
+the key type name plus ".conf". These files are example config files
+that distro packagers can use to have request-key autoconfigured to
+use the cifs utilities that are installed. Typically, distro packagers
+will want to drop these into /etc/request-key.d.
+
diff --git a/contrib/request-key.d/cifs.idmap.conf b/contrib/request-key.d/cifs.idmap.conf
new file mode 100644
index 0000000..84d3d5e
--- /dev/null
+++ b/contrib/request-key.d/cifs.idmap.conf
@@ -0,0 +1 @@
+create cifs.idmap * * /usr/sbin/cifs.idmap %k
diff --git a/contrib/request-key.d/cifs.spnego.conf b/contrib/request-key.d/cifs.spnego.conf
new file mode 100644
index 0000000..a94afd8
--- /dev/null
+++ b/contrib/request-key.d/cifs.spnego.conf
@@ -0,0 +1 @@
+create cifs.spnego * * /usr/sbin/cifs.upcall %k
--
1.7.7.3

View File

@ -2,8 +2,8 @@
%define pre_release %nil
Name: cifs-utils
Version: 5.2
Release: 3%{pre_release}%{?dist}
Version: 5.3
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: 0001-contrib-add-a-set-of-sample-etc-request-key.d-files.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
@ -49,10 +47,12 @@ rm -rf %{buildroot}
/sbin/mount.cifs
%{_bindir}/getcifsacl
%{_bindir}/setcifsacl
%{_bindir}/cifscreds
%{_sbindir}/cifs.upcall
%{_sbindir}/cifs.idmap
%{_mandir}/man1/getcifsacl.1.gz
%{_mandir}/man1/setcifsacl.1.gz
%{_mandir}/man1/cifscreds.1.gz
%{_mandir}/man8/cifs.upcall.8.gz
%{_mandir}/man8/cifs.idmap.8.gz
%{_mandir}/man8/mount.cifs.8.gz
@ -60,6 +60,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
%changelog
* Sat Jan 28 2012 Jeff Layton <jlayton@redhat.com> 5.3-1
- update to 5.3
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View File

@ -1 +1 @@
2ca839553cccd0c3042f7dd8737cc9de cifs-utils-5.2.tar.bz2
e1a428558a96d2d28ccdaacdc47ea0b7 cifs-utils-5.3.tar.bz2