Compare commits

..

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

10 changed files with 28 additions and 150 deletions

View File

@ -1 +0,0 @@
1

2
.gitignore vendored
View File

@ -1 +1 @@
/numad-0.5git.tar.xz SOURCES/numad-0.5git.tar.xz

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,9 +1,12 @@
%global systemctl_bin /usr/bin/systemctl
Name: numad Name: numad
Version: 0.5 Version: 0.5
Release: 46.20150602git%{?dist} Release: 27.20150602git%{?dist}
Summary: NUMA user daemon Summary: NUMA user daemon
License: LGPL-2.1-only License: LGPLv2
Group: System Environment/Daemons
URL: https://pagure.io/numad URL: https://pagure.io/numad
# The source for this package was pulled from upstream's vcs. Use the # The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: # following commands to generate the tarball:
@ -11,13 +14,16 @@ URL: https://pagure.io/numad
# tar --exclude-vcs -cJf numad-0.5git.tar.xz numad-0.5git/ # tar --exclude-vcs -cJf numad-0.5git.tar.xz numad-0.5git/
Source0: %{name}-%{version}git.tar.xz Source0: %{name}-%{version}git.tar.xz
Patch0: 0000-remove-conf.patch # RHEL-16506
Patch1: 0001-numad_log-fix-buffer-overflow.patch # Upstream commit: https://pagure.io/numad/c/cf6c2c029edc9c288122bcd603a72eb7f6d042d2
Patch2: 0002-recognize--m-option-correctly.patch Patch1: numad-0.5git-m-option.patch
BuildRequires: gcc Requires: systemd-units
BuildRequires: make Requires(post): systemd-units
BuildRequires: systemd-rpm-macros Requires(preun): systemd-units
BuildRequires: systemd-units
ExcludeArch: s390 %{arm}
%description %description
Numad, a daemon for NUMA (Non-Uniform Memory Architecture) systems, Numad, a daemon for NUMA (Non-Uniform Memory Architecture) systems,
@ -28,18 +34,22 @@ and memory to minimize memory latency and thus provide optimum performance.
%autosetup -n %{name}-%{version}git %autosetup -n %{name}-%{version}git
%build %build
%make_build CFLAGS="$CFLAGS" make CFLAGS="$RPM_OPT_FLAGS -std=gnu99" LDFLAGS="$RPM_LD_FLAGS -lpthread -lrt -lm"
%install %install
install -D -p -m 644 {,%{buildroot}%{_unitdir}/}numad.service mkdir -p %{buildroot}%{_bindir}
install -D -p -m 644 {,%{buildroot}%{_sysconfdir}/logrotate.d/%{name}/}numad.logrotate mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
%make_install prefix=%{buildroot}/usr mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_mandir}/man8/
install -p -m 644 numad.service %{buildroot}%{_unitdir}/
install -p -m 644 numad.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
make install prefix=%{buildroot}/usr
%files %files
%config(noreplace) %{_sysconfdir}/logrotate.d/numad
%{_bindir}/numad %{_bindir}/numad
%{_mandir}/man8/numad.8.*
%{_unitdir}/numad.service %{_unitdir}/numad.service
%config(noreplace) %{_sysconfdir}/logrotate.d/numad
%doc %{_mandir}/man8/numad.8.gz
%post %post
%systemd_post numad.service %systemd_post numad.service
@ -51,76 +61,11 @@ install -D -p -m 644 {,%{buildroot}%{_sysconfdir}/logrotate.d/%{name}/}numad.log
%systemd_postun numad.service %systemd_postun numad.service
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.5-46.20150602git * Wed Nov 15 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.5-27.20150602git
- Bump release for October 2024 mass rebuild: - recognize the -m option (RHEL-16506)
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.5-45.20150602git
- Bump release for June 2024 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
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-43.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Nov 21 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.5-42.20150602git
- recognize the -m option
- modernize the specfile
- use recommended systemd macros
- fix manual pages installation
- sort file list and BuildRequires
- use modern make macros
- simplify %%install section
* Wed Sep 06 2023 Lukas Nykryn <lnykryn@redhat.com> - 0.5-41.20150602git
- fix buffer overflow
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-40.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Apr 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.5-39.20150602git
- migrate to SPDX license format
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-38.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-37.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-36.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-35.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-34.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 24 2020 Jan Synáček <jsynacek@redhat.com> - 0.5-33.20150602git
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-32.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-31.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-30.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 26 2019 Jan Synáček <jsynacek@redhat.com> - 0.5-29.20150602git
- Remove all mentions of the default config file, which is not used anyway
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-28.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-27.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Jan Synáček <jsynacek@redhat.com> - 0.5-26.20150602git * Tue Jun 19 2018 Jan Synáček <jsynacek@redhat.com> - 0.5-26.20150602git
- Remove initscripts from Requires (#1592372) - Remove initscripts from Requires (#1610280)
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-25.20150602git * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-25.20150602git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

View File

@ -1,11 +0,0 @@
summary: Internal gating tests plan
discover:
- name: Internal gating tests
how: fmf
filter: 'tag: CI-Tier-1'
url: https://pkgs.devel.redhat.com/git/tests/numad
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

View File

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