From a84537fe2cab90aa60e9bf721b34ccddadcfefb1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Feb 07 2017 23:01:19 +0000
Subject: Drop patch to chmod /tmp


Saw a report in the wild of this failing due to SELinux; anyways, it shouldn't
be necessary anymore. Anyone who is affected must have already upgraded, or used
a new image, or fixed it locally with chmod.

---

diff --git a/0001-ostree-remount-Explicitly-set-tmp-to-01777.patch b/0001-ostree-remount-Explicitly-set-tmp-to-01777.patch
deleted file mode 100644
index 2cbc15d..0000000
--- a/0001-ostree-remount-Explicitly-set-tmp-to-01777.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e7ef7ccc9540f493fe99037f3592f8b956d5edc6 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Fri, 13 Nov 2015 09:54:52 -0500
-Subject: [PATCH] [PATCH] ostree-remount: Explicitly set /tmp to 01777
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=1276775
----
- src/switchroot/ostree-remount.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
-index b8d3a96..9dff2a0 100644
---- a/src/switchroot/ostree-remount.c
-+++ b/src/switchroot/ostree-remount.c
-@@ -117,5 +117,13 @@ main(int argc, char *argv[])
- 
-   maybe_mount_tmpfs_on_var ();
- 
-+  /* Ensure /sysroot/tmp is world-writable.  Works around a bug
-+   * where init-fs left the directory writable only to root. */
-+  if (chmod ("/sysroot/tmp", 01777) == -1)
-+    {
-+      perror ("failed to chmod /sysroot/tmp");
-+      exit (EXIT_FAILURE);
-+    }
-+
-   exit (EXIT_SUCCESS);
- }
--- 
-2.5.0
-
diff --git a/ostree.spec b/ostree.spec
index 436b05b..2d109c0 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -8,9 +8,6 @@ Source1: 91-ostree.preset
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
-# Backported from upstream
-Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch
-
 BuildRequires: git
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool