From bd7396e70dea1094b23ad51f2fb528c543e3b152cbf60f24b95dfaf9b6004147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 5 May 2010 13:27:17 +0000 Subject: [PATCH 1/6] - BuildRequire libkeyutils-devel on Mandriva systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=19 --- cifs-utils.changes | 5 +++++ cifs-utils.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/cifs-utils.changes b/cifs-utils.changes index fc416f3..7af4930 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de + +- BuildRequire libkeyutils-devel on Mandriva systems. + ------------------------------------------------------------------- Tue May 4 10:36:02 UTC 2010 - sjayaraman@suse.de diff --git a/cifs-utils.spec b/cifs-utils.spec index f59949c..3885799 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -41,6 +41,9 @@ BuildRequires: krb5-devel libcap-devel libtalloc-devel %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif +%if 0%{?mandriva_version} +BuildRequires: libkeyutils-devel +%endif Requires: keyutils BuildRoot: %{_tmppath}/%{name}-%{version}-build From d38c63fff1b983f05deb132c84c97fa87b4f9dac59bbc4c74fad9b6150e4e275 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 7 May 2010 13:34:58 +0000 Subject: [PATCH 2/6] Accepting request 39375 from network:samba:STABLE checked in (request 39375) OBS-URL: https://build.opensuse.org/request/show/39375 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=20 --- ...se-atfooat-constructs-in-Makefile.am.patch | 42 +++++++++++++++++++ cifs-utils-4.3.tar.bz2 | 3 ++ cifs-utils-4.4.tar.bz2 | 3 -- cifs-utils.changes | 10 ----- cifs-utils.spec | 7 +++- 5 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch create mode 100644 cifs-utils-4.3.tar.bz2 delete mode 100644 cifs-utils-4.4.tar.bz2 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.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-4.4.tar.bz2 b/cifs-utils-4.4.tar.bz2 deleted file mode 100644 index 6b8e458..0000000 --- a/cifs-utils-4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39af3f581d97c69c2da40c0238e598417c426e0e194e27800e787d0652f36b39 -size 321180 diff --git a/cifs-utils.changes b/cifs-utils.changes index 7af4930..513b961 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -3,16 +3,6 @@ Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de - BuildRequire libkeyutils-devel on Mandriva systems. -------------------------------------------------------------------- -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 3885799..94c08aa 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.4) +# 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.4 +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 @@ -53,6 +55,7 @@ the Linux CIFS filesystem. %prep %setup -q +%patch -p1 %build %{?suse_update_config:%{suse_update_config -f}} From d2afae84519e194c9ab12a43c6e8a99532b74ce11ab6d4231d83d057ae18e652 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 7 May 2010 13:34:59 +0000 Subject: [PATCH 3/6] Updating link to change in openSUSE:Factory/cifs-utils revision 5.0 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=a01c2dc38b56f5634f8edf4e63e6a544 --- ...se-atfooat-constructs-in-Makefile.am.patch | 42 ------------------- cifs-utils-4.3.tar.bz2 | 3 -- cifs-utils-4.4.tar.bz2 | 3 ++ cifs-utils.changes | 10 +++++ cifs-utils.spec | 7 +--- 5 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch delete mode 100644 cifs-utils-4.3.tar.bz2 create mode 100644 cifs-utils-4.4.tar.bz2 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 513b961..7af4930 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -3,6 +3,16 @@ Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de - BuildRequire libkeyutils-devel on Mandriva systems. +------------------------------------------------------------------- +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 94c08aa..3885799 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.3) +# spec file for package cifs-utils (Version 4.4) # # 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.3 +Version: 4.4 Release: 1 License: GPLv3+ Group: System/Filesystems @@ -28,8 +28,6 @@ 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 @@ -55,7 +53,6 @@ the Linux CIFS filesystem. %prep %setup -q -%patch -p1 %build %{?suse_update_config:%{suse_update_config -f}} From 5359c53f90162267619290ead1d82034b2eae3a18e6a9a6232bfb0282bf9411d Mon Sep 17 00:00:00 2001 From: Suresh Jayaraman Date: Mon, 24 May 2010 04:35:59 +0000 Subject: [PATCH 4/6] - Update to cifs-utils 4.5. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=21 --- cifs-utils-4.4.tar.bz2 | 3 --- cifs-utils-4.5.tar.bz2 | 3 +++ cifs-utils.changes | 10 ++++++++++ cifs-utils.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 cifs-utils-4.4.tar.bz2 create mode 100644 cifs-utils-4.5.tar.bz2 diff --git a/cifs-utils-4.4.tar.bz2 b/cifs-utils-4.4.tar.bz2 deleted file mode 100644 index 6b8e458..0000000 --- a/cifs-utils-4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39af3f581d97c69c2da40c0238e598417c426e0e194e27800e787d0652f36b39 -size 321180 diff --git a/cifs-utils-4.5.tar.bz2 b/cifs-utils-4.5.tar.bz2 new file mode 100644 index 0000000..0725415 --- /dev/null +++ b/cifs-utils-4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8287996c59609d3042691ae412d289995d63e7eaf561117f0b9a1ba421ecf25b +size 321737 diff --git a/cifs-utils.changes b/cifs-utils.changes index 7af4930..e6999cf 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon May 24 04:19:38 UTC 2010 - sjayaraman@suse.de + +- Update to cifs-utils 4.5. + + strip leading delimiter off of prefixpath option in mount.cifs. + + remove magic number for max_username in parse_options. + + turn into a multicall binary for smb2. + + fix uninitialized variable in cred parsing error path. + + cleanup mount.cifs option parsing. + ------------------------------------------------------------------- Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de diff --git a/cifs-utils.spec b/cifs-utils.spec index 3885799..bfaf8aa 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.4) +# spec file for package cifs-utils (Version 4.5) # # 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.4 +Version: 4.5 Release: 1 License: GPLv3+ Group: System/Filesystems From 7dfcfb23b6429e97a8aa13fffae1f4d23058b2de8348fc474a23846c79b8601c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 11:17:53 +0000 Subject: [PATCH 5/6] Accepting request 40553 from network:samba:STABLE checked in (request 40553) OBS-URL: https://build.opensuse.org/request/show/40553 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=22 --- cifs-utils-4.4.tar.bz2 | 3 +++ cifs-utils-4.5.tar.bz2 | 3 --- cifs-utils.changes | 15 --------------- cifs-utils.spec | 7 ++----- 4 files changed, 5 insertions(+), 23 deletions(-) create mode 100644 cifs-utils-4.4.tar.bz2 delete mode 100644 cifs-utils-4.5.tar.bz2 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-4.5.tar.bz2 b/cifs-utils-4.5.tar.bz2 deleted file mode 100644 index 0725415..0000000 --- a/cifs-utils-4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8287996c59609d3042691ae412d289995d63e7eaf561117f0b9a1ba421ecf25b -size 321737 diff --git a/cifs-utils.changes b/cifs-utils.changes index e6999cf..fc416f3 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon May 24 04:19:38 UTC 2010 - sjayaraman@suse.de - -- Update to cifs-utils 4.5. - + strip leading delimiter off of prefixpath option in mount.cifs. - + remove magic number for max_username in parse_options. - + turn into a multicall binary for smb2. - + fix uninitialized variable in cred parsing error path. - + cleanup mount.cifs option parsing. - -------------------------------------------------------------------- -Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de - -- BuildRequire libkeyutils-devel on Mandriva systems. - ------------------------------------------------------------------- Tue May 4 10:36:02 UTC 2010 - sjayaraman@suse.de diff --git a/cifs-utils.spec b/cifs-utils.spec index bfaf8aa..f59949c 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.5) +# spec file for package cifs-utils (Version 4.4) # # 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.5 +Version: 4.4 Release: 1 License: GPLv3+ Group: System/Filesystems @@ -41,9 +41,6 @@ BuildRequires: krb5-devel libcap-devel libtalloc-devel %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif -%if 0%{?mandriva_version} -BuildRequires: libkeyutils-devel -%endif Requires: keyutils BuildRoot: %{_tmppath}/%{name}-%{version}-build From 69355c28dbbff0f0159485949c2db23e563da4a837485ca28cbea75cbf515105 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 25 May 2010 11:17:54 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/cifs-utils revision 6.0 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=88793fa66c7fab0eae6436c440170d48 --- cifs-utils-4.4.tar.bz2 | 3 --- cifs-utils-4.5.tar.bz2 | 3 +++ cifs-utils.changes | 15 +++++++++++++++ cifs-utils.spec | 7 +++++-- 4 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 cifs-utils-4.4.tar.bz2 create mode 100644 cifs-utils-4.5.tar.bz2 diff --git a/cifs-utils-4.4.tar.bz2 b/cifs-utils-4.4.tar.bz2 deleted file mode 100644 index 6b8e458..0000000 --- a/cifs-utils-4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39af3f581d97c69c2da40c0238e598417c426e0e194e27800e787d0652f36b39 -size 321180 diff --git a/cifs-utils-4.5.tar.bz2 b/cifs-utils-4.5.tar.bz2 new file mode 100644 index 0000000..0725415 --- /dev/null +++ b/cifs-utils-4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8287996c59609d3042691ae412d289995d63e7eaf561117f0b9a1ba421ecf25b +size 321737 diff --git a/cifs-utils.changes b/cifs-utils.changes index fc416f3..e6999cf 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon May 24 04:19:38 UTC 2010 - sjayaraman@suse.de + +- Update to cifs-utils 4.5. + + strip leading delimiter off of prefixpath option in mount.cifs. + + remove magic number for max_username in parse_options. + + turn into a multicall binary for smb2. + + fix uninitialized variable in cred parsing error path. + + cleanup mount.cifs option parsing. + +------------------------------------------------------------------- +Wed May 5 13:22:57 UTC 2010 - lmuelle@suse.de + +- BuildRequire libkeyutils-devel on Mandriva systems. + ------------------------------------------------------------------- Tue May 4 10:36:02 UTC 2010 - sjayaraman@suse.de diff --git a/cifs-utils.spec b/cifs-utils.spec index f59949c..bfaf8aa 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package cifs-utils (Version 4.4) +# spec file for package cifs-utils (Version 4.5) # # 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.4 +Version: 4.5 Release: 1 License: GPLv3+ Group: System/Filesystems @@ -41,6 +41,9 @@ BuildRequires: krb5-devel libcap-devel libtalloc-devel %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif +%if 0%{?mandriva_version} +BuildRequires: libkeyutils-devel +%endif Requires: keyutils BuildRoot: %{_tmppath}/%{name}-%{version}-build