.gitignore

@@ -1,4 +1,2 @@
-/insights-client-*.tar.gz
+SOURCES/insights-client-3.1.7.tar.gz
-/insights-core.egg
+SOURCES/insights-core.egg
-/insights-core.egg.asc
-/v*.tar.gz

.insights-client.metadata

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

SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch

@@ -0,0 +1,26 @@
+From 844a3294541fb84bd742826ca8c110c05ad9b4fd 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]

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

SPECS/insights-client.spec

@@ -2,70 +2,68 @@
 
 Name:                   insights-client
 Summary:                Uploads Insights information to Red Hat on a periodic basis
-Version:                3.10.3
+Version:                3.1.7
-Release:                1%{?dist}
+Release:                12%{?dist}
-Source0:                https://github.com/RedHatInsights/insights-client/archive/refs/tags/v%{version}.tar.gz
+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
 Requires: python3-PyYAML
 Requires: python3-magic
 Requires: python3-six
+Requires: platform-python-setuptools
 Requires: coreutils
-Requires: ((selinux-policy >= 42.1.8-1) if selinux-policy)
-Requires: (python3-libselinux if selinux-policy)
-
-Requires: insights-core >= 3.6.7
-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} -Dcore_selinux_policy=insights_core_t
+%{configure} PYTHON=%{__python3}
-%{meson_build}
+%{__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/
@@ -76,41 +74,18 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/insights-client/
 %post
 %systemd_post %{name}.timer
 %systemd_post %{name}-boot.service
-
+if [ -d %{_sysconfdir}/motd.d ]; then
-# Remove legacy egg files from previous runtime installations
+    if [ ! -e %{_sysconfdir}/motd.d/insights-client -a ! -L %{_sysconfdir}/motd.d/insights-client ]; then
-rm -f %{_localstatedir}/lib/insights/*.egg
+        if [ -e %{_localstatedir}/lib/insights/newest.egg ]; then
-rm -f %{_localstatedir}/lib/insights/*.egg.asc
+            ln -sn /dev/null %{_sysconfdir}/motd.d/insights-client
-
+        else
-# Symlink the message of the day if the system has not been registered with Insights
+            ln -sn %{_sysconfdir}/insights-client/insights-client.motd %{_sysconfdir}/motd.d/insights-client
-_SHOULD_WRITE_MOTD=1
+        fi
-# MOTD directory doesn't exist for some reason; don't even try
-if [ ! -d %{_sysconfdir}/motd.d ]; then _SHOULD_WRITE_MOTD=0; fi
-# Message shouldn't be displayed if the system has ever been registered
-if [ -e %{_sysconfdir}/insights-client/.registered ]; then _SHOULD_WRITE_MOTD=0; fi
-if [ -e %{_sysconfdir}/insights-client/.unregistered ]; then _SHOULD_WRITE_MOTD=0; fi
-# Message file is already in place (as a file, or as a symlink)
-if [ -e %{_sysconfdir}/motd.d/insights-client -o -L %{_sysconfdir}/motd.d/insights-client ]; then _SHOULD_WRITE_MOTD=0; fi
-if [ "$_SHOULD_WRITE_MOTD" -eq 1 ]; then
-    ln -sn %{_sysconfdir}/insights-client/insights-client.motd %{_sysconfdir}/motd.d/insights-client
-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
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-rm -f /var/lib/pcp/config/pmlogger/config.ros
+    /usr/sbin/semanage permissive --add insights_client_t || true
-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
 fi
 
 %preun
@@ -123,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
@@ -132,22 +113,18 @@ 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}
-
-
 %files
 %config(noreplace) %{_sysconfdir}/insights-client/*.conf
 %{_sysconfdir}/insights-client/insights-client.motd
+%{_sysconfdir}/insights-client/.fallback.json*
+%{_sysconfdir}/insights-client/.exp.sed
+%{_sysconfdir}/insights-client/rpm.egg*
 %{_bindir}/*
 %{_unitdir}/*
 %attr(444,root,root) %{_sysconfdir}/insights-client/*.pem
+%attr(444,root,root) %{_sysconfdir}/insights-client/redhattools.pub.gpg
 %{python3_sitelib}/insights_client/
 %{_defaultdocdir}/%{name}
 %{_presetdir}/*.preset
@@ -155,155 +132,59 @@ 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)
 %{_mandir}/man8/*.8.gz
 %{_mandir}/man5/*.5.gz
 
-%files ros
 
 %changelog
-* Wed Jan 7 2026 Peter Koprda <pkoprda@redhat.com> - 0:3.10.3-1
+* Mon Jan 30 2023 Link Dupont <link@redhat.com> - 3.1.7-12
-- Updates message of the day from Insights to Lightspeed
+- Conditionally run semanage only when SELinux is enabled (RHBZ#2150908)
-- Resolves: RHEL-113967
-- Resolves: RHEL-122146
 
-* Wed Dec 3 2025 Peter Koprda <pkoprda@redhat.com> - 0:3.10.2-3
+* Fri Nov 11 2022 Alba Hita Catala <ahitacat@redhat.com> 0:3.1.7-11
-- Drop setuptools requirement (CCT-357)
+- Set SELinux policy to permissive for rhcd_t module (RHBZ#2141444)
 
-* Mon Oct 27 2025 Matyas Horky <mhorky@redhat.com> - 0:3.10.2-2
+* Tue Nov 08 2022 Link Dupont <link@redhat.com> 0:3.1.7-10
-- Require selinux-policy >= 42.1.8 (CCT-1737)
+- Include insights-core.egg as RPM source (RHBZ#2029395)
 
-* Wed Oct 1 2025 Matyas Horky <mhorky@redhat.com> - 0:3.10.2-1
+* Mon Sep 19 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
-- Depend on insights-core >= 3.6.7
+- Add /var/cache/insights-client/ directory in files directives (RHBZ#2127962)
 
-* Wed Aug 27 2025 Matyas Horky <mhorky@redhat.com> - 0:3.10.1-3
+* Wed Apr 13 2022 Link Dupont <link@sub-pop.net> 0:3.1.7-8
-- Depend on insights-core (via patch file; not yet merged upstream)
+- Ensure __python3 macro is globally set to platform-python (RHBZ#2069282)
-- Resolves: RHIN-1268
 
-* Tue Jul 8 2025 Peter Koprda <pkoprda@redhat.com> - 0:3.10.1-2
+* Thu Mar 31 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
-- Add dependency on insights-core-selinux
+- Add several insights /var directories in %files directives (RHBZ#2070588)
-- Resolves: RHEL-88179
 
-* Tue May 20 2025 Matyas Horky <mhorky@redhat.com> - 0:3.10.1-1
+* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-6
-- Update Core to 3.5.13
-- Resolves: RHEL-92658
-
-* Fri Jan 24 2025 Matyas Horky <mhorky@redhat.com> - 0:3.10.0-1
-- Update Core to 3.5.2
-- Resolves: RHEL-76024
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0:3.2.8-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* 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)
-
-* 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)
-
-* Wed Nov 09 2022 Link Dupont <link@redhat.com> 0:3.1.7-11
-- Include insights-core.egg as RPM source (RHBZ#2141087)
-
-* Thu Oct 20 2022 Link Dupont <link@redhat.com> 0:3.1.7-10
-- Ensure __python3 macro is globally set to platform-python (RHBZ#2075150)
-
-* Mon Sep 12 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
-- Add /var/cache/insights-client/ directory in files directives (RHBZ#2126105)
-
-* Fri Apr 08 2022 Gael Chamoulaud <gchamoul@redhat.com> 0:3.1.7-8
-- Add several insights /var directories in files directives
-
-* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
 - Update patches
 
-* Mon Mar 14 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-6
-- Update patches
-- Add DROP-IN-RPM patches_ignore rule for rdopkg
-
 * Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-5
-- Restore insights-client-boot.service preun/postun (RHBZ#2024836)
+- Add DROP-IN-RPM patches_ignore rule for rdopkg
 
-* Wed Feb 02 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-4
+* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-4
-- Renaming "cloud.redhat.com" to "console.redhat.com" (RHBZ#2013799)
+- Restore insights-client-boot.service preun/postun (RHBZ#2055036)
 
-* Mon Jan 31 2022 Link Dupont <link@redhat.com> - 3.1.7-3
+* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-3
-- Patch to fix an issue where insights-client continuously launches (RHBZ#2022191)
+- Remove scriptlets referencing nonexistent files (RHBZ#2055036)
 
-* Fri Jan 28 2022 Link Dupont <link@redhat.com> - 3.1.7-2
+* Thu Feb 10 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-2
-- Remove scriptlets referencing nonexistent files (RHBZ#2024836)
+- Rename "http://cloud.redhat.com" to "https://console.redhat.com" (RHBZ#2052875)
+- Clean superfluous %clean section - rpmlint error
 
 * Wed Oct 20 2021 Link Dupont <link@redhat.com> - 3.1.7-1
-- New upstream release (Resolves RHBZ#2013799)
+- New upstream version (Resolves RHBZ#2013800)
 - Disable client metrics collection
 - Create fallback.json dynamically at build time
 
-* Tue Aug 24 2021 Link Dupont <link@redhat.com> - 3.1.6-1
+* Fri Jun 25 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.5-1
-- New upstream version
+- Fix metrics auth and connection issues (RHBZ#1966761)
-
+- Disallow --offline and --unregister together (RHBZ#1920946)
-* Mon Aug  2 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.5-1
+- Do not modify motd if already set (RHBZ#1945481)
-- New upstream version
+- Enable insights-client-boot service on install (RHBZ#1951750)
-
-* Thu May 27 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.4-2
-- Replace platform-python-setuptools dependency with python3dist(setuptools)
-
-* Mon May 17 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.4-1
-- New upstream version
 
 * Tue Apr 20 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.2-1
 - New upstream version

gating.yaml

@@ -1,8 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  #- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: rhsmci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: rhsmci.brew-build.cloud.functional}

sources

@@ -1 +0,0 @@
-SHA512 (v3.10.3.tar.gz) = 42f90cca08bdaee5921cc56af0ee03d1b1881d75d007140131f3dbf141f7c48ea72d6c5f0592701c2febd0a6604b75e9a84474e6d83cb8944a31f237e6ea80f5