rebase numad to the newest version

Resolves: RHEL-139803
This commit is contained in:
Lukas Nykryn 2026-01-09 10:51:18 +01:00
parent bdaa68003e
commit 0953e0c7b6
5 changed files with 15 additions and 77 deletions

View File

@ -1,22 +0,0 @@
diff -rup numad-0.5git/numad.8 numad-0.5git-new/numad.8
--- numad-0.5git/numad.8 2015-06-02 13:16:31.000000000 +0200
+++ numad-0.5git-new/numad.8 2019-03-26 09:20:45.887766101 +0100
@@ -98,8 +98,7 @@ Sets the time interval that numad waits
<\fImin_interval\fP> is 5 seconds. Setting a <\fImax_interval\fP> of zero will
cause the daemon to exit. (This is the normal mechanism to terminate the
daemon.) A bigger <\fImax_interval\fP> will decrease numad overhead but also
-decrease responsiveness to changing loads. The default numad max_interval can
-be changed in the numad.conf file.
+decrease responsiveness to changing loads.
.TP
\fB\-K\fR <\fI0|1\fP>
This option controls whether numad keeps interleaved memory spread across NUMA
@@ -210,8 +209,6 @@ numad can manage.
.LP
\fI/usr/bin/numad\fP
.br
-\fI/etc/numad.conf\fP
-.br
\fI/var/log/numad.log\fP
.br
\fI/var/run/numad.pid\fP

View File

@ -1,25 +0,0 @@
From a9e6f292f4ce9443ee95c77c60dd8da68d0db7e9 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 6 Sep 2023 12:27:47 +0200
Subject: [PATCH] numad_log: fix buffer overflow
---
numad.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/numad.c b/numad.c
index 4c85486..2923842 100644
--- a/numad.c
+++ b/numad.c
@@ -153,7 +153,7 @@ void numad_log(int level, const char *fmt, ...) {
*p++ = ' ';
va_list ap;
va_start(ap, fmt);
- vsnprintf(p, BUF_SIZE, fmt, ap);
+ vsnprintf(p, BUF_SIZE - strlen(buf) , fmt, ap);
va_end(ap);
fprintf(log_fs, "%s", buf);
fflush(log_fs);
--
2.39.2

View File

@ -1,19 +0,0 @@
commit cf6c2c029edc9c288122bcd603a72eb7f6d042d2
Author: Jan Synacek <jsynacek@redhat.com>
Date: Mon Oct 30 11:37:45 2017 +0100
recognize -m option correctly
diff --git a/numad.c b/numad.c
index 4c85486..0721af4 100644
--- a/numad.c
+++ b/numad.c
@@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) {
int x_flag = 0;
int tmp_int = 0;
long list_pid = 0;
- while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:p:r:R:S:t:u:vVw:x:")) != -1) {
+ while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:m:p:r:R:S:t:u:vVw:x:")) != -1) {
switch (opt) {
case 'C':
C_flag = 1;

View File

@ -1,6 +1,6 @@
Name: numad
Version: 0.5
Release: 46.20150602git%{?dist}
Release: 49.20251104git%{?dist}
Summary: NUMA user daemon
License: LGPL-2.1-only
@ -11,10 +11,6 @@ URL: https://pagure.io/numad
# tar --exclude-vcs -cJf numad-0.5git.tar.xz numad-0.5git/
Source0: %{name}-%{version}git.tar.xz
Patch0: 0000-remove-conf.patch
Patch1: 0001-numad_log-fix-buffer-overflow.patch
Patch2: 0002-recognize--m-option-correctly.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: systemd-rpm-macros
@ -51,12 +47,20 @@ install -D -p -m 644 {,%{buildroot}%{_sysconfdir}/logrotate.d/%{name}/}numad.log
%systemd_postun numad.service
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.5-46.20150602git
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Nov 04 2025 Lukas Nykryn <lnykryn@redhat.com> - 0.5-49.20251031git
- improve single-node system support
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.5-45.20150602git
- Bump release for June 2024 mass rebuild
* Mon Nov 03 2025 Lukas Nykryn <lnykryn@redhat.com> - 0.5-48.20251031git
- numad v20251031
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-47.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-46.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-45.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-44.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (numad-0.5git.tar.xz) = 5f01bf8e8df1497fdf24f9a636035329eb69d28933bc448b87479c253023e25006dee071c582e63f8fdb9a16dce1c840a26059e231b5f58db3d4caa6ede0bebf
SHA512 (numad-0.5git.tar.xz) = a543779f35cc40b9965b83b182749c4d03493d695950b94fb85808fb9ee08f5a2b4dab07d86effe151ac706f3673fcd057301929497a08127dc1a101ed9d2783