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 deleted file mode 100644 index 72f9f05..0000000 --- a/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.3.tar.bz2 b/cifs-utils-4.3.tar.bz2 deleted file mode 100644 index 784db02..0000000 --- a/cifs-utils-4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78483907ff9aa10d729ee9b7046a45d0d796d44ea0371d7b136ab9b140855495 -size 320993 diff --git a/cifs-utils-4.4.tar.bz2 b/cifs-utils-4.4.tar.bz2 new file mode 100644 index 0000000..6b8e458 --- /dev/null +++ b/cifs-utils-4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39af3f581d97c69c2da40c0238e598417c426e0e194e27800e787d0652f36b39 +size 321180 diff --git a/cifs-utils.changes b/cifs-utils.changes index cc42c52..fc416f3 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 4 10:36:02 UTC 2010 - sjayaraman@suse.de + +- Update to cifs-utils 4.4. + + fix a segfault that could occur when parsing the address list. + + fix autoconf/automake problem that could cause compilation to fail. + + acquire required capabilities before a couple of operations. + + ensure passwords are not left in memory. + + cleanup of credential file parsing. + ------------------------------------------------------------------- Tue Apr 13 14:59:16 UTC 2010 - lmuelle@suse.de diff --git a/cifs-utils.spec b/cifs-utils.spec index 6b2b3fd..bb65684 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -28,7 +28,6 @@ Source: %{name}-%{version}.tar.bz2 Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh -Patch: 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -51,7 +50,6 @@ the Linux CIFS filesystem. %prep %setup -q -%patch -p1 %build %{?suse_update_config:%{suse_update_config -f}}