- 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
This commit is contained in:
parent
96aba2e36b
commit
612b8dda46
@ -1,19 +0,0 @@
|
|||||||
commit a863c150676f36f37b3b48bca9a85a9cafa78f7a
|
|
||||||
Author: Lars Müller <lars@samba.org>
|
|
||||||
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;
|
|
||||||
|
|
||||||
/*
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6
|
|
||||||
size 377435
|
|
3
cifs-utils-5.6.tar.bz2
Normal file
3
cifs-utils-5.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f1501a26a800a336baf53ba0ea383274361c86c4b50ec45c656b9810b84dc138
|
||||||
|
size 381098
|
@ -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
|
Tue Jun 12 20:05:38 UTC 2012 - lmuelle@suse.com
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cifs-utils
|
Name: cifs-utils
|
||||||
Version: 5.5
|
Version: 5.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste
|
Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
@ -27,8 +27,6 @@ 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: set-rc-libcap-toggle_dac_capability.diff
|
|
||||||
Patch1: a863c150676f36f37b3b48bca9a85a9cafa78f7a.diff
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
PreReq: insserv %{?fillup_prereq} mkinitrd
|
PreReq: insserv %{?fillup_prereq} mkinitrd
|
||||||
%else
|
%else
|
||||||
@ -75,8 +73,6 @@ the Linux CIFS filesystem.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p1
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"
|
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
From: Jeff Layton <jlayton@samba.org>
|
|
||||||
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 <roderburg@uni-koeln.de>
|
|
||||||
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
|
||||||
---
|
|
||||||
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
|
|
Loading…
Reference in New Issue
Block a user