diff --git a/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch b/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch new file mode 100644 index 0000000..72f9f05 --- /dev/null +++ b/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch @@ -0,0 +1,42 @@ +From: Jeff Layton +To: linux-cifs-client@lists.samba.org +Cc: sjayaraman@suse.de, lars@samba.org +Date: Tue, 13 Apr 2010 10:26:11 -0400 +Subject: [PATCH] automake: don't use @foo@ constructs in Makefile.am +X-Mailer: git-send-email 1.6.6.1 + +...use $(foo) instead. That doesn't rely on an explicit AC_SUBST(). + +Reported-by: Lars Müller +Signed-off-by: Jeff Layton +--- + Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 01f1762..1cf7d23 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,14 +4,14 @@ 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) $(CAPNG_LDADD) + + man_MANS = mount.cifs.8 + + if CONFIG_CIFSUPCALL + sbin_PROGRAMS = cifs.upcall + cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c util.c +-cifs_upcall_LDADD = -ltalloc -lkeyutils @KRB5_LDADD@ ++cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) + man_MANS += cifs.upcall.8 + endif + +-- +1.6.6.1 + + + + 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..cc42c52 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,6 +1,26 @@ +------------------------------------------------------------------- +Tue Apr 13 14:59:16 UTC 2010 - lmuelle@suse.de + +- automake: don't use @foo@ constructs in Makefile.am. + +------------------------------------------------------------------- +Tue Apr 13 14:09:46 UTC 2010 - lmuelle@suse.de + +- autoconf: define CAPNG_LDADD even when it's not set. + +------------------------------------------------------------------- +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..f44ba0e 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.2) +# spec file for package cifs-utils (Version 4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem Name: cifs-utils -Version: 4.2 +Version: 4.3 Release: 1 License: GPLv3+ Group: System/Filesystems @@ -28,6 +28,8 @@ Source: %{name}-%{version}.tar.bz2 Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh +#Patch: 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch +Patch: 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -37,7 +39,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 +52,7 @@ the Linux CIFS filesystem. %prep %setup -q +%patch -p1 %build %{?suse_update_config:%{suse_update_config -f}}