From 26ba9883c9cf240f0697c5c609ca3c8b5257d8cb Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Fri, 9 Feb 2024 15:50:03 -0500
Subject: [PATCH] Rebase to v1.19.1 upstream

Resolves: RHEL-8982
Signed-off-by: John Kacur <jkacur@redhat.com>
---
 .gitignore                             |  1 +
 Start-stalld-service-as-initrc_t.patch | 27 --------------------------
 sources                                |  2 +-
 stalld.spec                            | 16 ++++++++++++---
 4 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 Start-stalld-service-as-initrc_t.patch

diff --git a/.gitignore b/.gitignore
index 07a581b..7ee35d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /stalld-1.16.tar.bz2
 /stalld-1.17.tar.xz
 /stalld-1.17.1.tar.bz2
+/stalld-1.19.1.tar.bz2
diff --git a/Start-stalld-service-as-initrc_t.patch b/Start-stalld-service-as-initrc_t.patch
deleted file mode 100644
index 4a88577..0000000
--- a/Start-stalld-service-as-initrc_t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 476152742021303d2defeb69f524bcc302618081 Mon Sep 17 00:00:00 2001
-From: Leah Leshchinsky <lleshchi@redhat.com>
-Date: Mon, 29 Aug 2022 14:07:39 -0400
-Subject: [PATCH] Start stalld service as initrc_t
-
-Stalld currently runs as an unconfined_service_t.
-
-Edit to service file so that the daemon is launched as an initrc_t.
-
-Signed-off-by: Leah Leshchinsky <lleshchi@redhat.com>
-
-diff --git a/redhat/stalld.service b/redhat/stalld.service
-index e0eb4b77b0a7..bcd4b767f629 100644
---- a/redhat/stalld.service
-+++ b/redhat/stalld.service
-@@ -9,7 +9,7 @@ ExecStartPre=/usr/bin/throttlectl off
- 
- # In case the regex passed to IT or IP includes C escape sequences,
- # use ${IT} or ${IP} instead of $IT or $IP
--ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP
-+ExecStart=/bin/sh -c "/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP"
- ExecStopPost=/usr/bin/throttlectl on
- CPUSchedulingPolicy=fifo
- CPUSchedulingPriority=10
--- 
-2.31.1
-
diff --git a/sources b/sources
index cab2e6c..9f85df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stalld-1.17.1.tar.bz2) = 78c4e1a707053cfc00792910441b672bd2af389124683ea0fd86db42636c580ce12e4c71de7f35fcb32906b8beaa90beec0c90d0b1a51cdbd14aad85f471d22a
+SHA512 (stalld-1.19.1.tar.bz2) = 3b5c8d1577fafa93dea44b299578b5f05764c4aa9770ccc4b54c8d247f80ab2da27fee61f9b462af0d1df49c5bebf6cb6fc5659d12c2627256c4dfc6250bd56b
diff --git a/stalld.spec b/stalld.spec
index b7acb9d..f0777e5 100644
--- a/stalld.spec
+++ b/stalld.spec
@@ -1,5 +1,5 @@
 Name:		stalld
-Version:	1.17.1
+Version:	1.19.1
 Release:	1%{?dist}
 Summary:	Daemon that finds starving tasks and gives them a temporary boost
 
@@ -14,7 +14,13 @@ BuildRequires:	systemd-rpm-macros
 
 Requires:	systemd
 
-Patch0:         Start-stalld-service-as-initrc_t.patch
+%ifnarch i686
+BuildRequires:	bpftool
+BuildRequires:	clang
+BuildRequires:	libbpf-devel
+
+Requires:	libbpf
+%endif
 
 %description
 The stalld program monitors the set of system threads,
@@ -32,7 +38,7 @@ allow 10 microseconds of runtime for 1 second of clock time.
 
 %install
 %make_install DOCDIR=%{_docdir} MANDIR=%{_mandir} BINDIR=%{_bindir} DATADIR=%{_datadir} VERSION=%{version}
-%make_install -C redhat UNITDIR=%{_unitdir}
+%make_install -C systemd UNITDIR=%{_unitdir}
 
 %files
 %{_bindir}/%{name}
@@ -53,6 +59,10 @@ allow 10 microseconds of runtime for 1 second of clock time.
 %systemd_postun_with_restart %{name}.service
 
 %changelog
+* Fri Feb 09 2024 John Kacur <jkacur@redhat.com> - 1.19.1-1
+- Rebase to v1.19.1 upstream
+Resolves: RHEL-8982
+
 * Tue Oct 18 2022 Leah Leshchinsky <lleshchi@redhat.com> - 1.17.1-1
 - stalld: Fix memory leak in print_boosted_info()
 - utils: Check if the system is in lockdown mode