From 230c717ecff90fd2b9ed455a879b051e9ed19f3b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 23 Mar 2020 15:44:02 -0400 Subject: [PATCH] Install container_contexts file Signed-off-by: Daniel J Walsh --- .gitignore | 1 + container-selinux.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 621fae5..2b3693a 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ /container-selinux-5624558.tar.gz /container-selinux-b321ea4.tar.gz /container-selinux-fde876b.tar.gz +/container-selinux-ae0720d.tar.gz diff --git a/container-selinux.spec b/container-selinux.spec index 47ea97b..acba48c 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -2,7 +2,7 @@ # container-selinux %global git0 https://github.com/containers/container-selinux -%global commit0 fde876b2d81bfc0c943c99260d1a976f15ba7781 +%global commit0 ae0720d6ac32866b023babeff75e766870951f8f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # container-selinux stuff (prefix with ds_ for version/release etc.) @@ -24,8 +24,8 @@ Name: container-selinux %if 0%{?fedora} Epoch: 2 %endif -Version: 2.125.0 -Release: 3.1.dev.git%{shortcommit0}%{?dist} +Version: 2.125.2 +Release: 0.dev.git%{shortcommit0}%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -62,6 +62,11 @@ install -d %{buildroot}%{_datadir}/selinux/packages install -d -p %{buildroot}%{_datadir}/selinux/devel/include/services install -p -m 644 container.if %{buildroot}%{_datadir}/selinux/devel/include/services install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages +install -d %{buildroot}/%{_datadir}/containers +install -m 644 container_contexts %{buildroot}/%{_datadir}/containers +# Currently shipped as part of selinux-policy package +#install -d %{buildroot}/%{_datadir}/man/man8 +#install -m 644 container_selinux.8 %{buildroot}/%{_datadir}/man/man8 # remove spec file rm -rf container-selinux.spec @@ -99,9 +104,16 @@ fi %files %doc README.md %{_datadir}/selinux/* +%dir %{_datadir}/containers +%{_datadir}/containers/container_contexts +# Currently shipped in selinux-policy-doc +#%{_datadir}/man/man8/container_selinux.8.gz # Hooked up to autobuilder, please check with @lsm5 before updating %changelog +* Mon Mar 23 2020 Dan Walsh - 2:2.125.2-1.dev.gitae0720d +- Install container_contexts file + * Mon Mar 23 2020 RH Container Bot - 2:2.125.0-3.1.dev.gitfde876b - autobuilt fde876b diff --git a/sources b/sources index 027f473..842907b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (container-selinux-fde876b.tar.gz) = 35f27d423e0026b0d6db981536094a3fdc512f8b41a2e75ba21dcbb86bd21afdb66e5a34d39abde65f6ade1bf233a4e175fbe7e19033c387461c5212ce91bd33 +SHA512 (container-selinux-ae0720d.tar.gz) = dc2c2a7b1b3d7107d932bd5ba6e406ea038dc9b56062a0b5abb6282b08aec5219b72ee067e5d6c1abfcdb39755a21bf4f298547fd89cfc8216494913a5be37dd