From a7bf6ce38d8edef86c7593b77a4c15af146a59bd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 18 2023 07:15:10 +0000
Subject: import insights-client-3.1.8-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index a62c6ba..ded5bd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/insights-client-3.1.7.tar.gz
+SOURCES/insights-client-3.1.8.tar.gz
diff --git a/.insights-client.metadata b/.insights-client.metadata
index 85c6d92..4548167 100644
--- a/.insights-client.metadata
+++ b/.insights-client.metadata
@@ -1 +1 @@
-0862807b4cb4e8bcbb6bad73e4d689da8f320bf8 SOURCES/insights-client-3.1.7.tar.gz
+1a90ba6a891f0a8fb2bb1be13c57c1b3d80ccc51 SOURCES/insights-client-3.1.8.tar.gz
diff --git a/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch b/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
deleted file mode 100644
index 5a1bb72..0000000
--- a/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 527cdf173a5c863622352e9f58a47cd7a18fac65 Mon Sep 17 00:00:00 2001
-From: ahitacat <ahitacat@redhat.com>
-Date: Wed, 23 Feb 2022 11:27:18 +0100
-Subject: [PATCH] [DOWNSTREAM-ONLY] remove cgroupv2 vars in systemd configfiles
-
-Resolves: RHBZ#1993731
----
- data/systemd/insights-client-boot.service | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/systemd/insights-client-boot.service b/data/systemd/insights-client-boot.service
-index 44eb46c..0d44ddb 100644
---- a/data/systemd/insights-client-boot.service
-+++ b/data/systemd/insights-client-boot.service
-@@ -19,8 +19,6 @@ ExecStart=/usr/bin/insights-client --retry 3
- Restart=no
- WatchdogSec=900
- CPUQuota=30%
--MemoryHigh=1G
--MemoryMax=2G
- MemoryLimit=2G
- TasksMax=300
- BlockIOWeight=100
diff --git a/SOURCES/0002-fix-remove-PathExists-condition-from-unit.patch b/SOURCES/0002-fix-remove-PathExists-condition-from-unit.patch
deleted file mode 100644
index 300589b..0000000
--- a/SOURCES/0002-fix-remove-PathExists-condition-from-unit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a69574b2a6c22ecaedf08c8648c89fed33e7eafc 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#2109244
-(cherry picked from commit ec3502eaef144838bec85dfed497de7a404a66bf)
-(cherry picked from commit 844a3294541fb84bd742826ca8c110c05ad9b4fd)
----
- 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]
diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec
index 77898ea..5e57b26 100644
--- a/SPECS/insights-client.spec
+++ b/SPECS/insights-client.spec
@@ -3,14 +3,9 @@
 
 Name:                   insights-client
 Summary:                Uploads Insights information to Red Hat on a periodic basis
-Version:                3.1.7
-Release:                2%{?dist}
+Version:                3.1.8
+Release:                1%{?dist}
 Source0:                https://github.com/redhatinsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz
-#
-# patches_ignore=DROP-IN-RPM
-# patches_base=3.1.7
-Patch0001: 0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
-Patch0002: 0002-fix-remove-PathExists-condition-from-unit.patch
 
 Epoch:                  0
 License:                GPLv2+
@@ -105,6 +100,9 @@ fi
 
 
 %changelog
+* Wed Jun 21 2023 Alba Hita Catala <ahitacat@redhat.com> - 0:3.1.8-1
+- Update to 3.1.8 (RHBZ#2212325)
+
 * Mon Sep 19 2022 Gael Chamoulaud <gchamoul@redhat.com> 0:3.1.7-2
 - fix: remove PathExists condition from unit (RHBZ#2109244)