diff --git a/.gitignore b/.gitignore index cade3cf..713198b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /fapolicyd-1.0.tar.gz /fapolicyd-selinux-0.3.tar.gz /fapolicyd-1.0.1.tar.gz +/fapolicyd-1.0.2.tar.gz diff --git a/fapolicyd.spec b/fapolicyd.spec index bf1ac72..e73cf50 100644 --- a/fapolicyd.spec +++ b/fapolicyd.spec @@ -4,7 +4,7 @@ Summary: Application Whitelisting Daemon Name: fapolicyd -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} License: GPLv3+ URL: http://people.redhat.com/sgrubb/fapolicyd @@ -17,6 +17,7 @@ BuildRequires: systemd-devel libgcrypt-devel rpm-devel file-devel file BuildRequires: libcap-ng-devel libseccomp-devel lmdb-devel BuildRequires: python3-devel BuildRequires: uthash-devel +Requires: %{name}-plugin Recommends: %{name}-selinux Requires(pre): shadow-utils Requires(post): systemd-units @@ -44,6 +45,19 @@ BuildArch: noarch %description selinux The %{name}-selinux package contains selinux policy for the %{name} daemon. +%package dnf-plugin +Summary: Fapolicyd dnf plugin +Group: Applications/System +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +Provides: %{name}-plugin + +%description dnf-plugin +The %{name}-dnf-plugin notifies %{name} daemon about dnf update. +The dnf plugin will be replaced with rpm plugin later. +Don't use dnf and rpm plugin together. + + %prep %setup -q @@ -67,7 +81,6 @@ sed -i "s/%ld_so_path%/`find /usr/lib64/ -type f -name 'ld-2\.*.so' | sed 's/\// --with-rpm \ --disable-shared - make CFLAGS="%{optflags}" %{?_smp_mflags} # selinux @@ -75,6 +88,9 @@ pushd %{name}-selinux-%{semodule_version} make popd +%check +make check + # selinux %pre selinux %selinux_relabel_pre -s %{selinuxtype} @@ -133,9 +149,6 @@ getent passwd %{name} >/dev/null || useradd -r -M -d %{_localstatedir}/lib/%{nam %ghost /run/%{name}/%{name}.fifo %ghost %{_localstatedir}/lib/%{name}/data.mdb %ghost %{_localstatedir}/lib/%{name}/lock.mdb -%{python3_sitelib}/dnf-plugins/%{name}-dnf-plugin.py -%{python3_sitelib}/dnf-plugins/__pycache__/%{name}-dnf-plugin.*.pyc - %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 @@ -153,8 +166,17 @@ fi %posttrans selinux %selinux_relabel_post -s %{selinuxtype} +%files dnf-plugin +%{python3_sitelib}/dnf-plugins/%{name}-dnf-plugin.py +%{python3_sitelib}/dnf-plugins/__pycache__/%{name}-dnf-plugin.*.pyc + %changelog +* Wed Jan 06 2021 Radovan Sroka - 1.0.2-1 +- rebase to 1.0.2 +- enabled make check +- dnf-plugin is now required subpackage + * Mon Nov 16 2020 Radovan Sroka - 1.0.1-1 - rebase to 1.0.1 - introduced uthash dependency diff --git a/sources b/sources index 51db2ca..0e98135 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (fapolicyd-1.0.2.tar.gz) = 02f9a1681a948eefd856ca7e09c8dd06c5c1f0004e5f1c6d1513f79c1cb5d6bd31fa118a147ef9244b2146a3da1f525a4a329a37c969ce175a221e05d198bd1a SHA512 (fapolicyd-selinux-0.3.tar.gz) = 29895ee587294a275b3dbc712f915466758a3aabf7a692ed410ff91ae5d7dea936c231cde6aca5adf4edb9d9160450b65317ca9d1d6e76d687066d17d18495cd -SHA512 (fapolicyd-1.0.1.tar.gz) = 82e748ba34795548f94c85e5ef429a48a5240dfe8ef9f7ee1dad152442317694c66a24e7bd4c4c8012fb268c478bbd20f302e94a413c2392180ecd28a74ee469