This commit is contained in:
Tom Callaway 2019-06-13 13:40:49 -04:00
parent e119932832
commit d47c53363b
4 changed files with 6 additions and 35 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/fuse-3.4.2.tar.gz /fuse-3.4.2.tar.gz
/fuse-3.5.0.tar.gz /fuse-3.5.0.tar.gz
/fuse-3.6.1.tar.gz

View File

@ -1,30 +0,0 @@
diff --git a/util/mount.fuse.c b/util/mount.fuse.c
index d49e5b2..5c7a8c1 100644
--- a/util/mount.fuse.c
+++ b/util/mount.fuse.c
@@ -23,6 +23,25 @@
#include <sys/syscall.h>
#include <linux/capability.h>
#include <linux/securebits.h>
+/* for 2.6 kernels */
+#if !defined(SECBIT_KEEP_CAPS) && defined(SECURE_KEEP_CAPS)
+#define SECBIT_KEEP_CAPS (issecure_mask(SECURE_KEEP_CAPS))
+#endif
+#if !defined(SECBIT_KEEP_CAPS_LOCKED) && defined(SECURE_KEEP_CAPS_LOCKED)
+#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
+#endif
+#if !defined(SECBIT_NO_SETUID_FIXUP) && defined(SECURE_NO_SETUID_FIXUP)
+#define SECBIT_NO_SETUID_FIXUP (issecure_mask(SECURE_NO_SETUID_FIXUP))
+#endif
+#if !defined(SECBIT_NO_SETUID_FIXUP_LOCKED) && defined(SECURE_NO_SETUID_FIXUP_LOCKED)
+#define SECBIT_NO_SETUID_FIXUP_LOCKED (issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
+#endif
+#if !defined(SECBIT_NOROOT) && defined(SECURE_NOROOT)
+#define SECBIT_NOROOT (issecure_mask(SECURE_NOROOT))
+#endif
+#if !defined(SECBIT_NOROOT_LOCKED) && defined(SECURE_NOROOT_LOCKED)
+#define SECBIT_NOROOT_LOCKED (issecure_mask(SECURE_NOROOT_LOCKED))
+#endif
#endif
#include "fuse.h"

View File

@ -1,5 +1,5 @@
Name: fuse3 Name: fuse3
Version: 3.5.0 Version: 3.6.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: File System in Userspace (FUSE) v3 utilities Summary: File System in Userspace (FUSE) v3 utilities
License: GPL+ License: GPL+
@ -9,8 +9,6 @@ Source1: fuse.conf
# https://github.com/libfuse/libfuse/pull/421 # https://github.com/libfuse/libfuse/pull/421
Patch1: fuse3-0001-no-chown-root.patch Patch1: fuse3-0001-no-chown-root.patch
# https://github.com/libfuse/libfuse/pull/409
Patch2: fuse3-0002-support-el6-kernel.patch
BuildRequires: which BuildRequires: which
%if ! 0%{?el6} %if ! 0%{?el6}
@ -72,7 +70,6 @@ Common files for FUSE v2 and FUSE v3.
%setup -n libfuse-fuse-%{version} %setup -n libfuse-fuse-%{version}
%patch1 -p1 -b .no_chown_root %patch1 -p1 -b .no_chown_root
%patch2 -p1 -b .el6_compile
%build %build
export LC_ALL=en_US.UTF-8 export LC_ALL=en_US.UTF-8
@ -154,6 +151,9 @@ rm -f %{buildroot}/usr/lib/udev/rules.d/99-fuse3.rules
%endif %endif
%changelog %changelog
* Thu Jun 13 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1
- Update to 3.6.1
* Fri May 24 2019 Dave Dykstra <dwd@fedoraproject.org> - 3.5.0-1 * Fri May 24 2019 Dave Dykstra <dwd@fedoraproject.org> - 3.5.0-1
- Upgrade to upstream 3.5.0 - Upgrade to upstream 3.5.0

View File

@ -1 +1 @@
SHA512 (fuse-3.5.0.tar.gz) = f890807f578c9c7215a1804a5fbb8f00df59b99709b04501b3824bc14100fac26f29f764c5f17a83d11f1486a0769da908983ef6b3c6860e6da14f86d8378c37 SHA512 (fuse-3.6.1.tar.gz) = ed075777956efd67f67d33d893c5e7f8fdc879a614c49437ad27845bc20b01f1de0bd88c1916167e48f6d98905086457e02ab3404e713408fdd670976491dae3