From 96aba2e36b1ee3443935421b42495f8573970e17cb14e837dbd317d13e033010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 12 Jun 2012 21:06:37 +0000 Subject: [PATCH 1/2] mount.cifs: initialize oldfsgid to surpress a warning while building for RHEL 4 or CentOS 5. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=68 --- a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff | 19 +++++++++++++++++++ cifs-utils.changes | 6 ++++++ cifs-utils.spec | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff diff --git a/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff b/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff new file mode 100644 index 0000000..0e5f314 --- /dev/null +++ b/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff @@ -0,0 +1,19 @@ +commit a863c150676f36f37b3b48bca9a85a9cafa78f7a +Author: Lars Müller +Date: Tue Jun 12 18:24:15 2012 +0200 + + Initialize oldfsgid to surpress one warning while building for RHEL 4 + +diff --git a/mount.cifs.c b/mount.cifs.c +index a1b0454..d040b27 100644 +--- a/mount.cifs.c ++++ b/mount.cifs.c +@@ -1814,7 +1814,7 @@ acquire_mountpoint(char **mountpointp) + { + int rc, dacrc; + uid_t realuid, oldfsuid; +- gid_t oldfsgid; ++ gid_t oldfsgid = 0; + char *mountpoint; + + /* diff --git a/cifs-utils.changes b/cifs-utils.changes index 0228deb..43c8195 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 12 20:05:38 UTC 2012 - lmuelle@suse.com + +- mount.cifs: initialize oldfsgid to surpress a warning while building for + RHEL 4 or CentOS 5. + ------------------------------------------------------------------- Tue Jun 12 11:54:14 UTC 2012 - lmuelle@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index d5b62ca..1c7fce2 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -28,6 +28,7 @@ Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh Patch: set-rc-libcap-toggle_dac_capability.diff +Patch1: a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -75,6 +76,7 @@ the Linux CIFS filesystem. %prep %setup -q %patch -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie" From 612b8dda46d315a2991f98330a314fe0a2b50c8cc71d1eb8ef60273281fe9cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 8 Aug 2012 17:19:37 +0000 Subject: [PATCH 2/2] - Update to cifs-utils 5.6. + -Werror has been removed by default from CFLAGS + PIE and RELRO are enabled by default at build time + better integration with systemd by allowing the use of /bin/systemd-ask-password if available + better checks and warnings from cifscreds when used in environments that do not have a session keyring - No longer initialize oldfsgid inside acquire_mountpoint() of mount.cifs.c as -Werror got removed. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=70 --- a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff | 19 ---------- cifs-utils-5.5.tar.bz2 | 3 -- cifs-utils-5.6.tar.bz2 | 3 ++ cifs-utils.changes | 13 +++++++ cifs-utils.spec | 6 +-- set-rc-libcap-toggle_dac_capability.diff | 38 ------------------- 6 files changed, 17 insertions(+), 65 deletions(-) delete mode 100644 a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff delete mode 100644 cifs-utils-5.5.tar.bz2 create mode 100644 cifs-utils-5.6.tar.bz2 delete mode 100644 set-rc-libcap-toggle_dac_capability.diff diff --git a/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff b/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff deleted file mode 100644 index 0e5f314..0000000 --- a/a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff +++ /dev/null @@ -1,19 +0,0 @@ -commit a863c150676f36f37b3b48bca9a85a9cafa78f7a -Author: Lars Müller -Date: Tue Jun 12 18:24:15 2012 +0200 - - Initialize oldfsgid to surpress one warning while building for RHEL 4 - -diff --git a/mount.cifs.c b/mount.cifs.c -index a1b0454..d040b27 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -1814,7 +1814,7 @@ acquire_mountpoint(char **mountpointp) - { - int rc, dacrc; - uid_t realuid, oldfsuid; -- gid_t oldfsgid; -+ gid_t oldfsgid = 0; - char *mountpoint; - - /* diff --git a/cifs-utils-5.5.tar.bz2 b/cifs-utils-5.5.tar.bz2 deleted file mode 100644 index fa2adf7..0000000 --- a/cifs-utils-5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6 -size 377435 diff --git a/cifs-utils-5.6.tar.bz2 b/cifs-utils-5.6.tar.bz2 new file mode 100644 index 0000000..fef5b9e --- /dev/null +++ b/cifs-utils-5.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1501a26a800a336baf53ba0ea383274361c86c4b50ec45c656b9810b84dc138 +size 381098 diff --git a/cifs-utils.changes b/cifs-utils.changes index 43c8195..332cb3a 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Aug 8 17:09:22 UTC 2012 - lmuelle@suse.com + +- Update to cifs-utils 5.6. + + -Werror has been removed by default from CFLAGS + + PIE and RELRO are enabled by default at build time + + better integration with systemd by allowing the use of + /bin/systemd-ask-password if available + + better checks and warnings from cifscreds when used in environments that + do not have a session keyring +- No longer initialize oldfsgid inside acquire_mountpoint() of mount.cifs.c as + -Werror got removed. + ------------------------------------------------------------------- Tue Jun 12 20:05:38 UTC 2012 - lmuelle@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index 1c7fce2..014362d 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -17,7 +17,7 @@ Name: cifs-utils -Version: 5.5 +Version: 5.6 Release: 0 Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste License: GPL-3.0+ @@ -27,8 +27,6 @@ Source: %{name}-%{version}.tar.bz2 Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh -Patch: set-rc-libcap-toggle_dac_capability.diff -Patch1: a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -75,8 +73,6 @@ the Linux CIFS filesystem. %prep %setup -q -%patch -p1 -%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie" diff --git a/set-rc-libcap-toggle_dac_capability.diff b/set-rc-libcap-toggle_dac_capability.diff deleted file mode 100644 index d0fc6d6..0000000 --- a/set-rc-libcap-toggle_dac_capability.diff +++ /dev/null @@ -1,38 +0,0 @@ -From: Jeff Layton -To: linux-cifs@vger.kernel.org -Cc: roderburg@uni-koeln.de -Date: Tue, 12 Jun 2012 06:12:30 -0400 -Subject: [PATCH] mount.cifs: set rc to 0 in libcap toggle_dac_capability - -Thus spake Jochen: - -The mount.cifs program from the cifs-utils package 5.5 did not work on -my Linux system. It just exited without an error message and did not -mount anything. - -[...] - -I think, when this variable rc is now used in this function, it has also -to be properly initialized there. - -Reported-by: Jochen Roderburg -Signed-off-by: Jeff Layton ---- - mount.cifs.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index a1b0454..6f3f382 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -495,7 +495,7 @@ free_caps: - static int - toggle_dac_capability(int writable, int enable) - { -- int rc; -+ int rc = 0; - cap_t caps; - cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH; - --- -1.7.7.6