diff --git a/.gitignore b/.gitignore index e27bbaa..389f6b5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /v0.2.2.tar.gz /v0.2.3.tar.gz /v0.2.4.tar.gz +/v0.2.5.tar.gz +/v0.2.6.tar.gz diff --git a/sources b/sources index 54ee37a..b0e6d67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.2.4.tar.gz) = 17d4d33939e15a113badf7df17b55c51cdf2659b49f6ae90c8e2f0b741ffabed019ee2b9a1dd8123f5ca96f3f1111fcad74d8480fdf00bc1b10b6e2d5f2948a4 +SHA512 (v0.2.6.tar.gz) = 29295c9d95ecb15aed7e226d92a0b838046cf607e98956c66a83ad0f4ddf58b255586c24d407216ae9ddf5b11f502ae2b3a6822208d8dc8141124e68dac19265 diff --git a/tests/docker/runtest.sh b/tests/docker/runtest.sh index c2290d5..1850b3c 100755 --- a/tests/docker/runtest.sh +++ b/tests/docker/runtest.sh @@ -33,6 +33,7 @@ PACKAGE="udica" rlJournalStart rlPhaseStartSetup rlAssertRpm "udica" + rlAssertRpm "container-selinux" rlAssertRpm "policycoreutils" rlAssertRpm "podman" rlAssertRpm "docker" diff --git a/tests/sanity/runtest.sh b/tests/sanity/runtest.sh index c8c5f34..8a7cfb7 100755 --- a/tests/sanity/runtest.sh +++ b/tests/sanity/runtest.sh @@ -33,6 +33,7 @@ PACKAGE="udica" rlJournalStart rlPhaseStartSetup rlAssertRpm "udica" + rlAssertRpm "container-selinux" rlAssertRpm "policycoreutils" rlAssertRpm "podman" OUTPUT_FILE=$(mktemp) diff --git a/tests/tests.yml b/tests/tests.yml index 42a2022..e8388b7 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -8,6 +8,8 @@ - role: standard-test-basic required_packages: - python3 + - container-selinux + - git tests: - smoke: dir: ./source @@ -16,6 +18,11 @@ dir: ./source run: python3 tests/test_integration.py +- hosts: localhost + tags: + - classic + - container + roles: - role: standard-test-beakerlib tags: - classic @@ -23,3 +30,5 @@ - sanity required_packages: - podman + - udica + - container-selinux diff --git a/udica.spec b/udica.spec index eea4109..615c192 100644 --- a/udica.spec +++ b/udica.spec @@ -1,19 +1,20 @@ Summary: A tool for generating SELinux security policies for containers Name: udica -Version: 0.2.4 -Release: 3%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Source0: https://github.com/containers/udica/archive/v%{version}.tar.gz License: GPLv3+ BuildArch: noarch Url: https://github.com/containers/udica -BuildRequires: make %if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python3 python3-devel python3-setuptools python3-pyflakes black +BuildRequires: python3 python3-devel python3-setuptools Requires: python3 python3-libsemanage python3-libselinux %else BuildRequires: python2 python2-devel python2-setuptools Requires: python2 libsemanage-python libselinux-python %endif +# container-selinux provides policy templates +Requires: container-selinux >= 2.170.0-2 %description Tool for generating SELinux security profiles for containers based on @@ -30,8 +31,6 @@ inspection of container JSON file. %endif %install -install --directory %%{buildroot}%{_datadir}/udica/templates - %if 0%{?fedora} || 0%{?rhel} > 7 %{__python3} setup.py install --single-version-externally-managed --root=%{buildroot} %else @@ -41,17 +40,12 @@ install --directory %%{buildroot}%{_datadir}/udica/templates install --directory %{buildroot}%{_mandir}/man8 install -m 0644 udica/man/man8/udica.8 %{buildroot}%{_mandir}/man8/udica.8 -%check -make test - %files %{_mandir}/man8/udica.8* %{_bindir}/udica %dir %{_datadir}/udica %dir %{_datadir}/udica/ansible -%dir %{_datadir}/udica/templates %{_datadir}/udica/ansible/* -%{_datadir}/udica/templates/* %if 0%{?fedora} || 0%{?rhel} > 7 %license LICENSE @@ -64,6 +58,20 @@ make test %endif %changelog +* Mon Sep 13 2021 Vit Mojzis - 0.2.6-1 +- New release https://github.com/containers/udica/releases/tag/v0.2.6 +- Move policy templates to container-selinux repo + +* Wed Aug 25 2021 Vit Mojzis - 0.2.5-1 +- New rebase https://github.com/containers/udica/releases/tag/v0.2.5 +- Replace capability dictionary with str.lower() +- Enable udica to generate policies with fifo class +- Sort container inspect data before processing +- Update templates to work properly with new cil parser + +* Tue Mar 16 2021 Vit Mojzis - 0.2.4-4 +- Remove %check section + * Wed Jan 27 2021 Fedora Release Engineering - 0.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild