diff --git a/.gitignore b/.gitignore index a62c6ba..dc1fd79 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/insights-client-3.1.7.tar.gz +SOURCES/insights-core.egg diff --git a/.insights-client.metadata b/.insights-client.metadata index 85c6d92..acd34cb 100644 --- a/.insights-client.metadata +++ b/.insights-client.metadata @@ -1 +1,2 @@ 0862807b4cb4e8bcbb6bad73e4d689da8f320bf8 SOURCES/insights-client-3.1.7.tar.gz +6113b8e15d58f13779a85f1e53773da28ec63ca7 SOURCES/insights-core.egg diff --git a/SOURCES/insights-core.egg.asc b/SOURCES/insights-core.egg.asc new file mode 100644 index 0000000..65a9038 --- /dev/null +++ b/SOURCES/insights-core.egg.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIVAwUAY2PHlnUU932DZrDZAQipRg//erkkOLyV++i0nhK+AqOdvYNLzjPIGSas +p33F0n5nRYjE/pP/a5bOSrlIDqhx5W0L3obAxQqJ1WNfsTpi0e/ixKJFcM+vSDQC +xzMNoHmyaE+/SqaOgzaSciHPfFme+m30G2VaUV+tKK7/GSiqbsdYpQGTV+fEC3Kp +2kmB6udN2K7BK54yHEYPdaOoB1zkBDklwi/hgdKILMZ8Zyjrihj3ExUIz5prZBTy +XoYYFq+u+TJn7Abhb1xDneMqr2Aba42DfFahL4Jqek6cBPG58m1CVZ9tp7ajof53 +dTFimJVzTEVCVYY8D6grV0KosTDLYR/A8vRo/dtYf/F6SqoBA26c77p19oBaXG1O +OTS+36t+FHxvKNY0JYcpD9TwNxGk5VSqjJVxF0pFqHZfsX8ZxiT4oGdp4l10pQ1H +zqFNRB9QDMLKN+utK0BmpycVsWvxf0WWTFmtw3ysgsLtA+w9sYaSK21Uprti178o +jQF7KBIxTwFLRvJmxIJ9JaKnKSkOTw2TJw8RF9N4oCf582V7TmFifRVTx+L/SxiJ +tJx5P+aDzTI9HVwNKwiyy2uoXob3amqxs9fedvHhbIUe65ZWA705Tj8p3Y1NvKhE +cYvrkJ/QD+aiZA3XyO5nZcGkqz5TCKRJMR6T5VslZ8nHdR/Nsa7m/m1hoONOos1N +eUib1m4rXag= +=izRE +-----END PGP SIGNATURE----- diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec index 6762f0c..5bf1b21 100644 --- a/SPECS/insights-client.spec +++ b/SPECS/insights-client.spec @@ -3,8 +3,10 @@ Name: insights-client Summary: Uploads Insights information to Red Hat on a periodic basis Version: 3.1.7 -Release: 8%{?dist} +Release: 12%{?dist} Source0: https://github.com/RedHatInsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz +Source1: https://api.access.redhat.com/r/insights/v1/static/core/insights-core.egg +Source2: https://api.access.redhat.com/r/insights/v1/static/core/insights-core.egg.asc Epoch: 0 License: GPLv2+ URL: https://console.redhat.com/insights @@ -42,6 +44,7 @@ BuildRequires: python3-devel BuildRequires: platform-python-devel BuildRequires: systemd BuildRequires: pam +Requires(post): policycoreutils-python-utils %description @@ -59,11 +62,14 @@ Sends insightful information to Red Hat for automated analysis %install %{make_install} %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/data/insights-client.motd %{buildroot}/%{_sysconfdir}/insights-client/insights-client.motd +%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/insights-client/rpm.egg +%{__install} -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/insights-client/rpm.egg.asc # Create different insights directories in /var mkdir -p %{buildroot}%{_localstatedir}/log/insights-client/ mkdir -p %{buildroot}%{_localstatedir}/lib/insights/ mkdir -p %{buildroot}%{_localstatedir}/cache/insights/ +mkdir -p %{buildroot}%{_localstatedir}/cache/insights-client/ %post %systemd_post %{name}.timer @@ -78,6 +84,10 @@ if [ -d %{_sysconfdir}/motd.d ]; then fi fi +if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then + /usr/sbin/semanage permissive --add insights_client_t || true +fi + %preun %systemd_preun %{name}.timer %systemd_preun %{name}.service @@ -88,6 +98,12 @@ fi %systemd_postun %{name}.service %systemd_postun %{name}-boot.service +if [ $1 -eq 0 ]; then + if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then + /usr/sbin/semanage permissive --delete insights_client_t || true + fi +fi + # Clean up files created by insights-client that are unowned by the RPM if [ $1 -eq 0 ]; then rm -f %{_sysconfdir}/cron.daily/insights-client @@ -113,6 +129,7 @@ fi %{_defaultdocdir}/%{name} %{_presetdir}/*.preset %attr(700,root,root) %dir %{_localstatedir}/log/insights-client/ +%attr(700,root,root) %dir %{_localstatedir}/cache/insights-client/ %attr(750,root,root) %dir %{_localstatedir}/cache/insights/ %attr(750,root,root) %dir %{_localstatedir}/lib/insights/ @@ -124,6 +141,18 @@ fi %changelog +* Mon Jan 30 2023 Link Dupont - 3.1.7-12 +- Conditionally run semanage only when SELinux is enabled (RHBZ#2150908) + +* Fri Nov 11 2022 Alba Hita Catala 0:3.1.7-11 +- Set SELinux policy to permissive for rhcd_t module (RHBZ#2141444) + +* Tue Nov 08 2022 Link Dupont 0:3.1.7-10 +- Include insights-core.egg as RPM source (RHBZ#2029395) + +* Mon Sep 19 2022 Gael Chamoulaud 3.1.7-9 +- Add /var/cache/insights-client/ directory in files directives (RHBZ#2127962) + * Wed Apr 13 2022 Link Dupont 0:3.1.7-8 - Ensure __python3 macro is globally set to platform-python (RHBZ#2069282)