.gitignore

@@ -1 +1 @@
-SOURCES/stalld-1.19.6.tar.bz2
+SOURCES/stalld-1.19.1.tar.bz2

.stalld.metadata

@@ -1 +0,0 @@
-406389a8a23b5fa8c6511194461c4458120cc17e SOURCES/stalld-1.19.6.tar.bz2

SOURCES/Start-stalld-service-as-initrc_t.patch

@@ -0,0 +1,31 @@
+From c93cef85e7ec08d924ad6a4f90a8677cc1603950 Mon Sep 17 00:00:00 2001
+From: John Kacur <jkacur@redhat.com>
+Date: Wed, 14 Feb 2024 15:55:30 -0500
+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>
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ systemd/stalld.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/stalld.service b/systemd/stalld.service
+index d93110b1b43e..69f3ee728129 100644
+--- a/systemd/stalld.service
++++ b/systemd/stalld.service
+@@ -10,7 +10,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.43.0
+

SPECS/stalld.spec

@@ -1,6 +1,6 @@
 Name:		stalld
-Version:	1.19.6
+Version:	1.19.1
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Daemon that finds starving tasks and gives them a temporary boost
 
 License:	GPLv2
@@ -18,11 +18,12 @@ Requires:	systemd
 BuildRequires:	bpftool
 BuildRequires:	clang
 BuildRequires:	libbpf-devel
+BuildRequires:  llvm
 
 Requires:	libbpf
 %endif
 
-%define _hardened_build 1
+Patch0:	Start-stalld-service-as-initrc_t.patch
 
 %description
 The stalld program monitors the set of system threads,
@@ -36,7 +37,7 @@ allow 10 microseconds of runtime for 1 second of clock time.
 %autosetup -p1
 
 %build
-%make_build RPMCFLAGS="%{optflags} %{build_cflags} -DVERSION="\\\"%{version}\\\"""  RPMLDFLAGS="%{build_ldflags}"
+%make_build CFLAGS="%{optflags} %{build_cflags} -DVERSION="\\\"%{version}\\\"""  LDFLAGS="%{build_ldflags}"
 
 %install
 %make_install DOCDIR=%{_docdir} MANDIR=%{_mandir} BINDIR=%{_bindir} DATADIR=%{_datadir} VERSION=%{version}
@@ -61,40 +62,35 @@ allow 10 microseconds of runtime for 1 second of clock time.
 %systemd_postun_with_restart %{name}.service
 
 %changelog
-* Thu Aug 22 2024 Chris White <chwhite@redhat.com> - 1.19.6-1
+* Wed Feb 14 2024 John Kacur <jkacur@redhat.com> - 1.19.1-4
-- Makefile: add uninstall target
+- Put back patch to run stalld service as initrc_t
-- systemd: add BE environment variable to select backend
+Resolves: RHEL-8982
-Resolves: RHEL-33662
 
-* Wed Jul 31 2024 Chris White <chwhite@redhat.com> - 1.19.5-2
+* Mon Feb 12 2024 John Kacur <jkacur@redhat.com> - 1.19.1-3
-- Fix changelog to use RPMCFLAGS, allowing for bpf to be used
+- Copying over missing tests directory
-Resolves: RHEL-33662
+Resolves: RHEL-8982
 
-* Thu Jul 18 2024 Chris White <chwhite@redhat.com> - 1.19.5-1
+* Mon Feb 12 2024 John Kacur <jkacur@redhat.com> - 1.19.1-2
-- Updated compile options for annocheck hardening
+- Add llvm as a build requirement
-- Ensure we resolve library symbols at load time (-z now) and are a Position Independent Executable (-pie). Refactored compile options to better deal with arch differences.
+Resolves: RHEL-8982
-- Added an 'annocheck' makefile target for local checking.
-- Makefile: change build to use FORTIFY_SOURCE=3
-- src/utils.c: fix off-by-one error in buffer allocation
-Resolves: RHEL-33662
-
-* Wed Feb 21 2024 John Kacur <jkacur@redhat.com> - 1.19.1-2
--  Make fill_process_comm() open comm file as READ_ONLY
-Resolves: RHEL-25846
 
 * Fri Feb 09 2024 John Kacur <jkacur@redhat.com> - 1.19.1-1
-- Rebase to upstream stalld-1.19.1
+- Rebase to v1.19.1 upstream
-Resolves: RHEL-7865
+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
 - stalld: print process comm and cpu when boosting
-Resolves: rhbz#2120799
+Resolves: rhbz#2120800
+
+* Thu Sep 08 2022 Leah Leshchinsky <lleshchi@redhat.com> - 1.17-2
+- Start stalld service as initrc_t
+Resolves:rhbz#2112366
 
 * Thu Jul 14 2022 John Kacur <jkacur@redhat.com> - 1.17-1
 - rebase to upstream v1.17
-Resolves:rhbz#2107275
+Resolves:rhbz#2107273
 
 * Thu Mar 31 2022 Fernando Pacheco <fpacheco@redhat.com> - 1.16-1
 - stald/utils: Space, lines and voids clenaups
@@ -103,7 +99,7 @@ Resolves:rhbz#2107275
 - src/utils: Comments cleanup
 - src/throttling: Comments cleanup
 - src/stalld.h Comments cleanup
-  Resolves: rhbz#2068550
+  Resolves: rhbz#2068549
 
 * Mon Nov 15 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.15-1
 - stalld: Fix incorrect open() return value checks
@@ -113,11 +109,7 @@ Resolves:rhbz#2107275
 - tests: Fix uninitialized value action.sa_mask
 - utils: Bail if malloc() returns null in parse_cpu_list()
 - stalld: Use correct format specifier for long types
-  Resolves: rhbz#2016010
+  Resolves: rhbz#1990057, rhbz#1996799, rhbz#1996825
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
 
 * Mon Jul 19 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.14.1-1
 - stalld: Coding style cleanup
@@ -130,7 +122,7 @@ Resolves:rhbz#2107275
 - stalld: Adjust variables in parse_old_task_format()
 - utils.c: Use MAX_PATH for pidfile
 - stalld.c: Remove variable declaration from the middle of  the function
-- stalld: Respect -l option in single threaded mode (1983103)
+- stalld: Respect -l option in single threaded mode (1983100)
 - utils: s/try_to_open_file/check_file_exists/
 - utils: use check_file_exists in setup_hr_tick()
 - utils: Check for the new sched_features path
@@ -141,22 +133,22 @@ Resolves:rhbz#2107275
 - stalld: Add the adaptive mode option
 - stalld: Use the last mode set in the cmdline
 - stalld: Fallback to the adaptive mode if force_fifo is selected
-- stalld: Make single-threaded mode the default one
+- stalld: Make single-threaded mode the default one (1920041)
 - stalld.service: Always restart stalld on exit
 - utils.c: Fail if user is not root
-- utils.c: Make the path to sched_debug path dynamic
+- utils.c: Make the path to sched_debug path dynamic (1977663)
 
 * Tue Jun 29 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.12-1
 - stalld.8: fix diff cruft left in manpage source
 - stalld.c: clean up handling of nr_running
-- stalld.c: remove duplicate parameter to fill_waiting_task()
+- stalld.c: remove duplicate parameter to fill_waiting_task() (1934582)
-- stalld: Add error handling in get_cpu_idle_time()
 - stalld.service: Run stalld as sched_fifo via systemd
-- packaging: clean up Makefiles and rpm specfile
+- stalld: Add error handling in get_cpu_idle_time() (1966259)
+- packaging: clean up Makefiles and rpm specfile (1972806)
 - stalld: Always print current function for info messages
 - stalld: Always print current function for warn messages
 - stalld: Always print current function for die messages
-- utils: change PATHMAX to 4096
+- utils: change PATHMAX to 4096 (1934581)
 
 * Thu May 13 2021 Clark Williams <williams@redhat.com> - 1.11-1
 - redhat/stalld.spec: pick up gating test version for changelog
@@ -168,9 +160,6 @@ Resolves:rhbz#2107275
 - stalld: Support denylisting of tasks in stalld
 - src/utils: use right argument for warning printf
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Wed Feb 17 2021 Clark Williams <williams@redhat.com> - 1.9-2
 - update to pick up latest gating test