Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

3
.gitignore vendored

@ -1 +1,2 @@
SOURCES/v3.2.8.tar.gz
SOURCES/insights-client-3.1.7.tar.gz
SOURCES/insights-core.egg

@ -1 +1,2 @@
63a0576afe7e6d98f2652cfd4a8ef93097fb1f1f SOURCES/v3.2.8.tar.gz
0862807b4cb4e8bcbb6bad73e4d689da8f320bf8 SOURCES/insights-client-3.1.7.tar.gz
6113b8e15d58f13779a85f1e53773da28ec63ca7 SOURCES/insights-core.egg

@ -0,0 +1,26 @@
From 7caac84ed4119ff6013585d187720dff3fdd73fe Mon Sep 17 00:00:00 2001
From: Link Dupont <link@sub-pop.net>
Date: Mon, 31 Jan 2022 10:53:04 -0500
Subject: [PATCH] fix: remove PathExists condition from unit
The PathExists= directive in the Path section of the
insights-client-results.path unit is unnecessary.
Fixes: RHBZ#2022191
(cherry picked from commit ec3502eaef144838bec85dfed497de7a404a66bf)
---
data/systemd/insights-client-results.path.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/systemd/insights-client-results.path.in b/data/systemd/insights-client-results.path.in
index be53998..928296b 100644
--- a/data/systemd/insights-client-results.path.in
+++ b/data/systemd/insights-client-results.path.in
@@ -13,7 +13,6 @@ Documentation=man:insights-client(8)
PartOf=insights-client.timer
[Path]
-PathExists=@pkgsysconfdir@/.lastupload
PathModified=@pkgsysconfdir@/.lastupload
[Install]

@ -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-----

@ -1,23 +1,35 @@
%define _binaries_in_noarch_packages_terminate_build 0
Name: insights-client
Summary: Uploads Insights information to Red Hat on a periodic basis
Version: 3.2.8
Release: 1%{?dist}
Source0: https://github.com/RedHatInsights/insights-client/archive/refs/tags/v%{version}.tar.gz
Version: 3.1.7
Release: 12.1%{?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: GPL-2.0-or-later
License: GPLv2+
URL: https://console.redhat.com/insights
Group: Applications/System
Vendor: Red Hat, Inc.
#
# patches_ignore=DROP-IN-RPM
# patches_base=3.1.7
Patch0001: 0001-fix-remove-PathExists-condition-from-unit.patch
Provides: redhat-access-insights = %{version}-%{release}%{?dist}
Obsoletes: redhat-access-insights <= 1.0.13-2
Obsoletes: redhat-access-proactive <= 1.0.13-2
BuildArch: noarch
Requires: tar
Requires: gpg
Requires: pciutils
%global __python3 /usr/libexec/platform-python
%{?__python3:Requires: %{__python3}}
%{?systemd_requires}
Requires: python3-requests >= 2.6
@ -26,47 +38,32 @@ Requires: python3-magic
Requires: python3-six
Requires: python3dist(setuptools)
Requires: coreutils
Requires: ((selinux-policy >= 38.1.21-1) if selinux-policy)
Requires: subscription-manager
BuildRequires: wget
BuildRequires: binutils
BuildRequires: python3-devel
BuildRequires: platform-python-devel
BuildRequires: systemd
BuildRequires: pam
BuildRequires: meson
BuildRequires: python3-pytest
BuildRequires: systemd-rpm-macros
Requires(post): policycoreutils-python-utils
%description
Sends insightful information to Red Hat for automated analysis
%package ros
Requires: pcp-zeroconf
Requires: insights-client
Summary: The subpackage for Insights resource optimization service
%description ros
The ros subpackage add ros_collect configuration parameter to insights-client.conf file,
the parameter is set to True by default. The system starts sending PCP archives to
Resource Optimization service upon modifying ros_collect parameter to True.
%prep
%autosetup -p1
%build
%{meson} -Dpython=%{__python3}
%{meson_build}
%{configure} PYTHON=%{__python3}
%{__make}
%install
%{meson_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/
@ -87,23 +84,8 @@ if [ -d %{_sysconfdir}/motd.d ]; then
fi
fi
if [ $1 -eq 2 ]; then
/usr/sbin/semanage permissive --list | grep -q 'insights_client_t'
if [ $? -eq 0 ]; then
/usr/sbin/semanage permissive --delete insights_client_t &>/dev/null
fi
fi
%post ros
rm -f /var/lib/pcp/config/pmlogger/config.ros
sed -i "/PCP_LOG_DIR\/pmlogger\/ros/d" /etc/pcp/pmlogger/control.d/local
if ! grep -q "^ros_collect" %{_sysconfdir}/insights-client/insights-client.conf; then
cat <<EOF >> %{_sysconfdir}/insights-client/insights-client.conf
### Begin insights-client-ros ###
ros_collect=True
### End insights-client-ros ###
EOF
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
/usr/sbin/semanage permissive --add insights_client_t || true
fi
%preun
@ -116,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
@ -125,11 +113,8 @@ if [ $1 -eq 0 ]; then
rm -rf %{_localstatedir}/lib/insights
rm -rf %{_localstatedir}/log/insights-client
rm -f %{_sysconfdir}/insights-client/.*.etag
rm -f %{_sysconfdir}/logrotate.d/insights-client
fi
%postun ros
sed -i '/### Begin insights-client-ros ###/,/### End insights-client-ros ###/d;/ros_collect=True/d' %{_sysconfdir}/insights-client/insights-client.conf
%clean
rm -rf %{buildroot}
@ -152,8 +137,6 @@ rm -rf %{buildroot}
%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/
%{_sysconfdir}/logrotate.d/insights-client
%{_tmpfilesdir}/insights-client.conf
%doc
%defattr(-, root, root)
@ -161,63 +144,9 @@ rm -rf %{buildroot}
%{_mandir}/man5/*.5.gz
%files ros
%changelog
* Mon Aug 19 2024 Matyas Horky <mhorky@redhat.com> - 0:3.2.8-1
- Update version to 3.2.8
- Update Core to 3.4.9
* Tue Jul 30 2024 Pino Toscano <ptoscano@redhat.com> - 0:3.2.7-2
- Rebuild in CentOS Stream
* Mon Jul 22 2024 Matyas Horky <mhorky@redhat.com> - 0:3.2.7-1
- Update version to 3.2.7
- Update Core to 3.4.5
* Fri May 31 2024 Matyas Horky <mhorky@redhat.com> - 0:3.2.5-1
- Update version to 3.2.5
- New egg RPM version 3.3.24
- Improve GPG handling (RHEL-2480)
* Thu May 30 2024 Jiri Hnidek <jhnidek@redhat.com> - 0:3.2.2-5
- Convert license of insights-client to SPDX format (RHEL-39409)
* Fri Apr 05 2024 Link Dupont <link@redhat.com> - 0:3.2.2-4
- Use __python3 macro instead of redefining __python (RHEL-28748)
* Thu Feb 08 2024 Amit Upadhye <aupadhye@redhat.com> - 0:3.2.2-3
- Add ros subpackage for Insights resource optimization service (RHEL-30279)
* Fri Feb 02 2024 Pino Toscano <ptoscano@redhat.com> - 0:3.2.2-2
- Require subscription-manager, so CERT auth works by default (RHEL-18971)
* Thu Sep 14 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.2-1
- Update version to 3.2.2
- New egg RPM version 3.2.15 (RHEL-3307)
* Mon Sep 04 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.1-0
- Update version to 3.2.1
- New egg RPM version 3.2.9 (RHBZ#2236120)
* Thu Aug 24 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.0-4
- Remove printing to stdout semanage postscript
* Wed Aug 23 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.0-3
- Remove an option in the semanage command
* Wed Aug 23 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.0-2
- Remove setting selinux permissive insights_client_t scripts (RHBZ#2226684)
* Fri Jun 23 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.2.0-1
- Add logrotate (RHBZ#2189281)
- Fix constant not imported (RHBZ#2091919)
- Update to cgroupv2 (RHBZ#2148270)
- New upstream release
* Thu May 18 2023 Pino Toscano <ptoscano@redhat.com> - 0:3.1.7-13
- Conditionally run semanage only when SELinux is enabled (RHBZ#2196844)
* Fri May 26 2023 Pino Toscano <ptoscano@redhat.com> - 0:3.1.7-12.1
- Conditionally run semanage only when SELinux is enabled (RHBZ#2210269)
* Thu Nov 10 2022 Alba Hita Catala <ahitacat@redhat.com> 0:3.1.7-12
- Set SELinux policy to permissive for rhcd_t module (RHBZ#2141443)

Loading…
Cancel
Save