diff --git a/.gitignore b/.gitignore index 095c46e..9d86592 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,29 @@ /container-selinux-0b25a4a.tar.gz /container-selinux-f958d0c.tar.gz /container-selinux-5624558.tar.gz +/container-selinux-b321ea4.tar.gz +/container-selinux-fde876b.tar.gz +/container-selinux-ae0720d.tar.gz +/container-selinux-867a377.tar.gz +/container-selinux-6caf15d.tar.gz +/container-selinux-363646f.tar.gz +/container-selinux-f00d1f4.tar.gz +/container-selinux-fd55ae0.tar.gz +/container-selinux-9ce0dac.tar.gz +/container-selinux-448dfbf.tar.gz +/container-selinux-0a878bd.tar.gz +/container-selinux-ff26015.tar.gz +/container-selinux-0d99e89.tar.gz +/container-selinux-441172a.tar.gz +/container-selinux-6b721da.tar.gz +/container-selinux-9884317.tar.gz +/container-selinux-8c26927.tar.gz +/container-selinux-965c7fb.tar.gz +/container-selinux-2750e78.tar.gz +/container-selinux-fe6a25c.tar.gz +/container-selinux-e2d5a9e.tar.gz +/container-selinux-3c361a2.tar.gz +/container-selinux-5d3c461.tar.gz +/container-selinux-aea4812.tar.gz +/v2.155.0.tar.gz +/v2.156.0.tar.gz diff --git a/container-selinux.spec b/container-selinux.spec index 4b9966a..f1fa4bc 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -2,8 +2,12 @@ # container-selinux %global git0 https://github.com/containers/container-selinux -%global commit0 562455891442021c87f1e191b74775b9975f587a -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%define built_tag v2.156.0 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz # container-selinux stuff (prefix with ds_ for version/release etc.) # Some bits borrowed from the openstack-selinux package @@ -16,41 +20,38 @@ # Format must contain '$x' somewhere to do anything useful %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; -# Version of SELinux we were using -%global selinux_policyver 3.14.4-43 - # Hooked up to autobuilder, please check with @lsm5 before updating Name: container-selinux %if 0%{?fedora} Epoch: 2 %endif -Version: 2.124.0 -Release: 4.dev.git%{shortcommit0}%{?dist} +Version: 2.156.0 +Release: 1%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source0: %{download_url} BuildArch: noarch -BuildRequires: git +BuildRequires: git-core BuildRequires: pkgconfig(systemd) -BuildRequires: selinux-policy >= %{selinux_policyver} -BuildRequires: selinux-policy-devel >= %{selinux_policyver} +BuildRequires: selinux-policy >= %_selinux_policy_version +BuildRequires: selinux-policy-devel >= %_selinux_policy_version # RE: rhbz#1195804 - ensure min NVR for selinux-policy -Requires: selinux-policy >= %{selinux_policyver} -Requires(post): selinux-policy-base >= %{selinux_policyver} -Requires(post): selinux-policy-targeted >= %{selinux_policyver} +Requires: selinux-policy >= %_selinux_policy_version +Requires(post): selinux-policy-base >= %_selinux_policy_version +Requires(post): selinux-policy-targeted >= %_selinux_policy_version Requires(post): policycoreutils Requires(post): libselinux-utils Requires(post): sed Obsoletes: %{name} <= 2:1.12.5-13 Obsoletes: docker-selinux <= 2:1.12.4-28 -Provides: docker-selinux = %{epoch}:%{version}-%{release} +Provides: docker-selinux = %{?epoch:%{epoch}:}%{version}-%{release} %description SELinux policy modules for use with container runtimes. %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit -n %{name}-%{built_tag_strip} %build make @@ -62,9 +63,8 @@ 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 - -# remove spec file -rm -rf container-selinux.spec +install -d %{buildroot}/%{_datadir}/containers/selinux +install -m 644 container_contexts %{buildroot}/%{_datadir}/containers/selinux/contexts %check @@ -99,9 +99,148 @@ fi %files %doc README.md %{_datadir}/selinux/* +%dir %{_datadir}/containers/selinux +%{_datadir}/containers/selinux/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 Jan 25 2021 RH Container Bot - 2:2.156.0-1 +- autobuilt v2.156.0 + +* Mon Jan 11 2021 Lokesh Mandvekar - 2:2.155.0-2 +- use correct tarball + +* Tue Jan 5 2021 RH Container Bot - 2:2.155.0-1 +- autobuilt v2.155.0 + +* Wed Dec 30 2020 RH Container Bot - 2:2.154.0-1 +- autobuilt v2.154.0 + +* Sat Dec 26 2020 RH Container Bot - 2:2.153.0-1 +- autobuilt v2.153.0 + +* Tue Dec 22 2020 RH Container Bot - 2:2.152.0-1 +- autobuilt v2.152.0 + +* Thu Nov 5 2020 RH Container Bot - 2:2.151.0-1 +- autobuilt v2.151.0 + +* Fri Oct 23 2020 RH Container Bot - 2:2.150.0-1 +- autobuilt v2.150.0 + +* Thu Sep 10 2020 RH Container Bot - 2:2.145.0-1 +- autobuilt v2.145.0 + +* Wed Sep 2 2020 RH Container Bot - 2:2.144.0-1 +- autobuilt v2.144.0 + +* Mon Aug 31 2020 Lokesh Mandvekar - 2:2.144.0-3 +- Resolves: #1797554 - use _selinux_policy_version macro + +* Fri Aug 28 2020 Lokesh Mandvekar - 2:2.144.0-2 +- Resolves: #1780129 - bump min selinux-policy + +* Mon Aug 17 2020 RH Container Bot - 2:2.144.0-1 +- autobuilt v2.144.0 + +* Wed Aug 05 2020 RH Container Bot - 2:2.143.0-2.dev.gite2d5a9e +- bump to 2.143.0 +- autobuilt e2d5a9e + +* Mon Jul 27 2020 Fedora Release Engineering - 2:2.142.0-3.dev.gitfe6a25c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 RH Container Bot - 2:2.142.0-2.dev.gitfe6a25c +- bump to 2.142.0 +- autobuilt fe6a25c + +* Fri Jul 24 2020 RH Container Bot - 2:2.141.0-2.dev.git2750e78 +- bump to 2.141.0 +- autobuilt 2750e78 + +* Thu Jul 23 2020 Merlin Mathesius - 2:2.140.0-2.dev.git965c7fb +- Cleanup usage of %%{epoch} macro to allow building for ELN + +* Thu Jul 23 2020 RH Container Bot - 2:2.140.0-2.dev.git965c7fb +- bump to 2.140.0 +- autobuilt 965c7fb + +* Sat Jul 18 2020 RH Container Bot - 2:2.139.0-2.dev.git8c26927 +- bump to 2.139.0 +- autobuilt 8c26927 + +* Thu Jul 09 2020 RH Container Bot - 2:2.138.0-2.dev.git9884317 +- bump to 2.138.0 +- autobuilt 9884317 + +* Thu Jun 11 2020 RH Container Bot - 2:2.137.0-2.dev.git6b721da +- bump to 2.137.0 +- autobuilt 6b721da + +* Thu Jun 11 2020 RH Container Bot - 2:2.136.0-2.dev.git441172a +- bump to 2.136.0 +- autobuilt 441172a + +* Fri May 29 2020 RH Container Bot - 2:2.135.0-2.dev.git0d99e89 +- bump to 2.135.0 +- autobuilt 0d99e89 + +* Thu May 28 2020 RH Container Bot - 2:2.134.0-2.dev.gitff26015 +- bump to 2.134.0 +- autobuilt ff26015 + +* Mon May 11 2020 RH Container Bot - 2:2.132.0-3.dev.git0a878bd +- autobuilt 0a878bd + +* Wed Apr 15 2020 RH Container Bot - 2:2.132.0-2.dev.git448dfbf +- bump to 2.132.0 +- autobuilt 448dfbf + +* Thu Apr 09 2020 RH Container Bot - 2:2.131.0-2.dev.git9ce0dac +- bump to 2.131.0 +- autobuilt 9ce0dac + +* Mon Apr 06 2020 RH Container Bot - 2:2.130.0-2.dev.gitfd55ae0 +- bump to 2.130.0 +- autobuilt fd55ae0 + +* Sun Mar 29 2020 RH Container Bot - 2:2.129.0-2.dev.gitf00d1f4 +- bump to 2.129.0 +- autobuilt f00d1f4 + +* Sun Mar 29 2020 RH Container Bot - 2:2.128.0-2.dev.git363646f +- bump to 2.128.0 +- autobuilt 363646f + +* Fri Mar 27 2020 RH Container Bot - 2:2.127.0-2.dev.git6caf15d +- bump to 2.127.0 +- autobuilt 6caf15d + +* Thu Mar 26 2020 Dan Walsh - 2:2.126.0-2.dev.git867a377 +- Install selinux contexts file into /usr/share/containers/selinux/contexts + +* Thu Mar 26 2020 RH Container Bot - 2:2.126.0-2.dev.git867a377 +- bump to 2.126.0 +- autobuilt 867a377 + +* Mon Mar 23 2020 Lokesh Mandvekar - 2:2.125.2-2.dev.gitae0720d +- bump release tag + +* 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 + +* Mon Mar 23 2020 Lokesh Mandvekar - 2:2.125.0-2.1.dev.gitb321ea4 +- bump release tag for smooth upgrade path + +* Fri Mar 20 2020 RH Container Bot - 2:2.125.0-0.1.dev.gitb321ea4 +- bump to 2.125.0 +- autobuilt b321ea4 + * Tue Feb 11 2020 Lokesh Mandvekar - 2:2.124.0-4.dev.git5624558 - keep functional upgrade path from f31 diff --git a/gating.yaml b/gating.yaml index 92d738a..c2182c7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - fedora-* decision_context: bodhi_update_push_stable rules: - - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/sources b/sources index 6e647c9..1d1c083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (container-selinux-5624558.tar.gz) = 9e43c2b2e9b2ff254bf00370bdef2b300ab926270468326a5270b9414fcc9c607c3683ebba428a368516c2a890200fd2ff717deb942333f5f39dbe4cda0c4ba0 +SHA512 (v2.156.0.tar.gz) = 792c4edb087204325255836e0adb356541d78551871a577cf2de0adfb87cef1d41904e479db86064ea596af356b4141f7e2557bbd1a27cbf0f82fa591fae3a6c