diff --git a/.gitignore b/.gitignore index 9e4f3dc..a593471 100644 --- a/.gitignore +++ b/.gitignore @@ -56,11 +56,8 @@ /container-selinux-dfaf8fd.tar.gz /container-selinux-8ecc282.tar.gz /container-selinux-0407867.tar.gz -<<<<<<< Updated upstream /container-selinux-042f7cf.tar.gz -======= /container-selinux-25277c8.tar.gz ->>>>>>> Stashed changes /container-selinux-c139a3d.tar.gz /container-selinux-452b90d.tar.gz /container-selinux-4e73492.tar.gz @@ -72,3 +69,4 @@ /container-selinux-5133af6.tar.gz /container-selinux-2c57a17.tar.gz /container-selinux-1362777.tar.gz +/container-selinux-6f01752.tar.gz diff --git a/container-selinux.spec b/container-selinux.spec index 9aa20cd..11005b1 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 2c57a17ab66c245a86dd00e03ec2b8e70ff76203 +%global commit0 6f01752858c0ee79dddf0e4c1bf845fb35d9eaf6 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # container-selinux stuff (prefix with ds_ for version/release etc.) @@ -26,8 +26,8 @@ Name: container-selinux %if 0%{?fedora} Epoch: 2 %endif -Version: 2.77 -Release: 2.git%{shortcommit0}%{?dist} +Version: 2.79 +Release: 1.git%{shortcommit0}%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -109,14 +109,13 @@ fi %{_datadir}/selinux/* %changelog -* Fri Jan 11 2019 Lokesh Mandvekar (Bot) - 2:2.77-2.git2c57a17 -- bump to 2.77 -- autobuilt 2c57a17 +* Fri Jan 11 2019 Dan Walsh - 2.79-1 +- Fix labeling on /var/lib/registries * Thu Jan 10 2019 Dan Walsh - 2.78-1 - Fix labeling for images in docker daemon user namespace -* Mon Dec 17 2018 Dan Walsh - 2.77-1.nightly.git2c57a17 +* Mon Dec 17 2018 Dan Walsh - 2.77-1 - Allow container-runtime to setattr on fifo_file handed into container runtime. * Tue Nov 13 2018 Lokesh Mandvekar (Bot) - 2:2.752.75-1.dev.git99e2cfd1 diff --git a/sources b/sources index 4ba60f5..f70aa72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (container-selinux-2c57a17.tar.gz) = a136937d766f2727d4ca51dd2ca73b16c484bf7a6ccd09634ce2b29d46620a8152b7535e5b4663fe10d9ac502493c680e0d35b2b0eea7bbec8d54fb7de12eef2 +SHA512 (container-selinux-6f01752.tar.gz) = eedd30e77a39667b0352279975858febe7f1eb9910a663de2ad7c12076ab5f345d2350c51c870778009047141dfbcfdd17fa11c105f6ea23f2dde0b6885d31c2