From d47c53363b8bd4173469260981581ae3abe0c9db Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 13 Jun 2019 13:40:49 -0400
Subject: [PATCH] 3.6.1

---
 .gitignore                          |  1 +
 fuse3-0002-support-el6-kernel.patch | 30 -----------------------------
 fuse3.spec                          |  8 ++++----
 sources                             |  2 +-
 4 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 fuse3-0002-support-el6-kernel.patch

diff --git a/.gitignore b/.gitignore
index 8d6f80f..99fab20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /fuse-3.4.2.tar.gz
 /fuse-3.5.0.tar.gz
+/fuse-3.6.1.tar.gz
diff --git a/fuse3-0002-support-el6-kernel.patch b/fuse3-0002-support-el6-kernel.patch
deleted file mode 100644
index f42dc5c..0000000
--- a/fuse3-0002-support-el6-kernel.patch
+++ /dev/null
@@ -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"
diff --git a/fuse3.spec b/fuse3.spec
index 87dea5e..ca767dd 100644
--- a/fuse3.spec
+++ b/fuse3.spec
@@ -1,5 +1,5 @@
 Name:		fuse3
-Version:	3.5.0
+Version:	3.6.1
 Release:	1%{?dist}
 Summary:	File System in Userspace (FUSE) v3 utilities
 License:	GPL+
@@ -9,8 +9,6 @@ Source1:	fuse.conf
 
 # https://github.com/libfuse/libfuse/pull/421
 Patch1: fuse3-0001-no-chown-root.patch
-# https://github.com/libfuse/libfuse/pull/409
-Patch2: fuse3-0002-support-el6-kernel.patch
 
 BuildRequires:	which
 %if ! 0%{?el6}
@@ -72,7 +70,6 @@ Common files for FUSE v2 and FUSE v3.
 %setup -n libfuse-fuse-%{version}
 
 %patch1 -p1 -b .no_chown_root
-%patch2 -p1 -b .el6_compile
 
 %build
 export LC_ALL=en_US.UTF-8 
@@ -154,6 +151,9 @@ rm -f %{buildroot}/usr/lib/udev/rules.d/99-fuse3.rules
 %endif
 
 %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
 - Upgrade to upstream 3.5.0
 
diff --git a/sources b/sources
index 15acc26..87e62ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fuse-3.5.0.tar.gz) = f890807f578c9c7215a1804a5fbb8f00df59b99709b04501b3824bc14100fac26f29f764c5f17a83d11f1486a0769da908983ef6b3c6860e6da14f86d8378c37
+SHA512 (fuse-3.6.1.tar.gz) = ed075777956efd67f67d33d893c5e7f8fdc879a614c49437ad27845bc20b01f1de0bd88c1916167e48f6d98905086457e02ab3404e713408fdd670976491dae3