From 1ccd8cb8c235ca3883ce5ba9a6c71234c41f1532af0d08b0396caa0b34efb4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 13 Apr 2010 13:30:50 +0000
Subject: [PATCH] The patch to Makefile.am is hacky!

- Update to cifs-utils 4.3.
  + credential files accept parameter names consistent with mount options.
  + some problems with linking are fixed.
  + libcap-ng is used if it's available.
  + the capability bounding set is zeroed out for greater security.
  + CAP_DAC_OVERRIDE is only enabled when updating the mtab.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=12
---
 Makefile.am-wo_libcapng.diff | 18 ++++++++++++++++++
 cifs-utils-4.2.tar.bz2       |  3 ---
 cifs-utils-4.3.tar.bz2       |  3 +++
 cifs-utils.changes           | 12 +++++++++++-
 cifs-utils.spec              |  8 +++++---
 5 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 Makefile.am-wo_libcapng.diff
 delete mode 100644 cifs-utils-4.2.tar.bz2
 create mode 100644 cifs-utils-4.3.tar.bz2

diff --git a/Makefile.am-wo_libcapng.diff b/Makefile.am-wo_libcapng.diff
new file mode 100644
index 0000000..20fcc31
--- /dev/null
+++ b/Makefile.am-wo_libcapng.diff
@@ -0,0 +1,18 @@
+Author: Lars Mueller <lmuelle at suse dot de>
+Subject: Make cifs-utils 4.3 build on systems without libcap-ng
+X-Hack-Rate: 100%
+X-Reported-Upstream: No
+
+Index: cifs-utils-4.3/Makefile.am
+===================================================================
+--- cifs-utils-4.3.orig/Makefile.am
++++ cifs-utils-4.3/Makefile.am
+@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal
+ root_sbindir = "/sbin"
+ root_sbin_PROGRAMS = mount.cifs
+ mount_cifs_SOURCES = mount.cifs.c mtab.c util.c
+-mount_cifs_LDADD = @LIBCAP@ @CAPNG_LDADD@
++mount_cifs_LDADD = @LIBCAP@
+ 
+ man_MANS = mount.cifs.8
+ 
diff --git a/cifs-utils-4.2.tar.bz2 b/cifs-utils-4.2.tar.bz2
deleted file mode 100644
index 0f8ca21..0000000
--- a/cifs-utils-4.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da820d8d216ae3beac8f57c4a82d9f3ed008a9dbf8825853a213ae54016dd798
-size 314071
diff --git a/cifs-utils-4.3.tar.bz2 b/cifs-utils-4.3.tar.bz2
new file mode 100644
index 0000000..784db02
--- /dev/null
+++ b/cifs-utils-4.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78483907ff9aa10d729ee9b7046a45d0d796d44ea0371d7b136ab9b140855495
+size 320993
diff --git a/cifs-utils.changes b/cifs-utils.changes
index 5a855a9..f904d38 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,6 +1,16 @@
+-------------------------------------------------------------------
+Fri Apr  9 13:35:41 UTC 2010 - lmuelle@suse.de
+
+- Update to cifs-utils 4.3.
+  + credential files accept parameter names consistent with mount options.
+  + some problems with linking are fixed.
+  + libcap-ng is used if it's available.
+  + the capability bounding set is zeroed out for greater security.
+  + CAP_DAC_OVERRIDE is only enabled when updating the mtab.
+
 -------------------------------------------------------------------
 Mon Apr  5 10:41:53 UTC 2010 - sjayaraman@suse.de
- 
+
 - Update to cifs-utils 4.2.
   + significant overhaul of mount.cifs to make it setuid root safe.
   + mount.cifs now does privilege separation.
diff --git a/cifs-utils.spec b/cifs-utils.spec
index b8b8f82..979d0f6 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -19,8 +19,8 @@
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
 
 Name:           cifs-utils
-Version:        4.2
-Release:        1
+Version:        4.3
+Release:        0
 License:        GPLv3+
 Group:          System/Filesystems
 Url:            http://www.samba.org/linux-cifs/cifs-utils/
@@ -28,6 +28,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
+Patch:          Makefile.am-wo_libcapng.diff
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -37,7 +38,7 @@ PreReq:         /sbin/chkconfig
 AutoReqProv:    on
 Provides:       cifs-mount = %{version}
 Obsoletes:      cifs-mount < %{version}
-BuildRequires:  krb5-devel libtalloc-devel
+BuildRequires:  krb5-devel libcap-devel libtalloc-devel
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
 %endif
@@ -50,6 +51,7 @@ the Linux CIFS filesystem.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}