From 4b3e8ccdf7fde71926d85cd0bf9894807228eb14 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 20 Mar 2019 15:41:00 -0400
Subject: [PATCH] Allow containers to mount and umount fuse file systems.  This
 will allow us to use buidlah within a user namespace separated container.

---
 .gitignore             |  4 +---
 container-selinux.spec | 16 +++++++---------
 sources                |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d78d12..5833226 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,10 +78,8 @@
 /container-selinux-eb60838.tar.gz
 /container-selinux-92af7fd.tar.gz
 /container-selinux-c178849.tar.gz
-<<<<<<< HEAD
-=======
 /container-selinux-891a85f.tar.gz
 /container-selinux-2c1a2ab.tar.gz
 /container-selinux-5c98b56.tar.gz
->>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 /container-selinux-2521d0d.tar.gz
+/container-selinux-619db17.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index ab784ad..3b292fe 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -2,7 +2,7 @@
 
 # container-selinux
 %global git0 https://github.com/projectatomic/container-selinux
-%global commit0 2521d0d6082ea9057d827d257d27291bf6219aba
+%global commit0 619db17b743ec8c75dabb0b08563f9ddad899ff2
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # container-selinux stuff (prefix with ds_ for version/release etc.)
@@ -26,12 +26,8 @@ Name: container-selinux
 %if 0%{?fedora}
 Epoch: 2
 %endif
-Version: 2.89
-<<<<<<< HEAD
+Version: 2.90
 Release: 1.git%{shortcommit0}%{?dist}
-=======
-Release: 5.git%{shortcommit0}%{?dist}
->>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 License: GPLv2
 URL: %{git0}
 Summary: SELinux policies for container runtimes
@@ -113,12 +109,15 @@ fi
 %{_datadir}/selinux/*
 
 %changelog
-<<<<<<< HEAD
+* Wed Mar 20 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2.90-1
+- Allow containers to mount and umount fuse file systems.  This will allow us
+- to use buidlah within a user namespace separated container.
+
 * Sat Mar 9 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2.89-1
 - Allow all container domains to have container file types entrypoint
 - Add new release to fix issues with udica
 - Allow container_runtime_t to dyntransition to container domains
-=======
+
 * Sat Mar 09 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.89-5.git2521d0d
 - bump to 2.89
 - autobuilt 2521d0d
@@ -133,7 +132,6 @@ fi
 * Sat Mar 02 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.87-2.git891a85f
 - bump to 2.87
 - autobuilt 891a85f
->>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 
 * Fri Mar 1 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2.86-1
 - Allow unconfined user and services to dyntrans to container domains, needed for CRIU
diff --git a/sources b/sources
index c9c3a02..fca6816 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (container-selinux-2521d0d.tar.gz) = 316c85c5b7d061d7691047f09c721dd85fd65ed306991b8c49b2ba4aa88d25ed8ef68a8a8d8a38d331066beab79918253df93e7daf246d5de7bb76741e082115
+SHA512 (container-selinux-619db17.tar.gz) = 958e7672a8a173b7b5d28c4a504d6c733292dfed7a850d81f8243c406eef497232dbaa7f6c6520054ef02e2d14a3a66b6e75035fa8177e145e94497f71ccaa40