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
This commit is contained in:
Lars Müller 2010-04-13 13:30:50 +00:00 committed by Git OBS Bridge
parent e724d4c145
commit 1ccd8cb8c2
5 changed files with 37 additions and 7 deletions

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da820d8d216ae3beac8f57c4a82d9f3ed008a9dbf8825853a213ae54016dd798
size 314071

3
cifs-utils-4.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78483907ff9aa10d729ee9b7046a45d0d796d44ea0371d7b136ab9b140855495
size 320993

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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 Mon Apr 5 10:41:53 UTC 2010 - sjayaraman@suse.de

View File

@ -19,8 +19,8 @@
Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem
Name: cifs-utils Name: cifs-utils
Version: 4.2 Version: 4.3
Release: 1 Release: 0
License: GPLv3+ License: GPLv3+
Group: System/Filesystems Group: System/Filesystems
Url: http://www.samba.org/linux-cifs/cifs-utils/ Url: http://www.samba.org/linux-cifs/cifs-utils/
@ -28,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh
Patch: Makefile.am-wo_libcapng.diff
%if 0%{?suse_version} %if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd PreReq: insserv %{?fillup_prereq} mkinitrd
%else %else
@ -37,7 +38,7 @@ PreReq: /sbin/chkconfig
AutoReqProv: on AutoReqProv: on
Provides: cifs-mount = %{version} Provides: cifs-mount = %{version}
Obsoletes: cifs-mount < %{version} Obsoletes: cifs-mount < %{version}
BuildRequires: krb5-devel libtalloc-devel BuildRequires: krb5-devel libcap-devel libtalloc-devel
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
@ -50,6 +51,7 @@ the Linux CIFS filesystem.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}