6 changed files with 237 additions and 73 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,16 @@
 *.swp
 /stress-ng-*.tar.xz
+/stress-ng-0.13.11.tar.gz
+/stress-ng-0.14.02.tar.gz
+/stress-ng-0.14.05.tar.gz
+/stress-ng-0.15.00.tar.gz
+/stress-ng-0.15.05.tar.gz
+/stress-ng-0.15.06.tar.gz
+/stress-ng-0.15.10.tar.gz
+/stress-ng-0.16.00.tar.gz
+/stress-ng-0.16.02.tar.gz
+/stress-ng-0.16.04.tar.gz
+/stress-ng-0.16.05.tar.gz
+/stress-ng-0.17.01.tar.gz
+/stress-ng-0.17.03.tar.gz
+/stress-ng-0.17.08.tar.gz
--- a/core-stress-fflush-opened-writable-files.patch
+++ b/core-stress-fflush-opened-writable-files.patch
@ -0,0 +1,83 @@
+From 69d710955063add902754f2bd841f9b12e59cc16 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.i.king@gmail.com>
+Date: Fri, 1 Nov 2024 12:56:24 +0000
+Subject: [PATCH] core-*, stress-*: fflush opened writable files
+
+Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
+---
+ core-klog.c     | 2 ++
+ stress-jpeg.c   | 1 +
+ stress-ng.c     | 1 +
+ stress-opcode.c | 3 +++
+ stress-rename.c | 1 +
+ 5 files changed, 8 insertions(+)
+
+diff --git a/core-klog.c b/core-klog.c
+index 419e59b6f922..348608c28ac8 100644
+--- a/core-klog.c
+++ b/core-klog.c
+@@ -223,9 +223,11 @@ log_info:
+ 				last_logged = stress_time_now();
+ 			}
+ 		}
+		(void)fflush(klog_fp);
+ 		(void)fclose(klog_fp);
+ 		_exit(EXIT_SUCCESS);
+ 	}
+	(void)fflush(klog_fp);
+ 	(void)fclose(klog_fp);
+ #endif
+ }
+diff --git a/stress-jpeg.c b/stress-jpeg.c
+index 4afe5018bd4b..8a8104f37b2b 100644
+--- a/stress-jpeg.c
+++ b/stress-jpeg.c
+@@ -316,6 +316,7 @@ PRAGMA_UNROLL_N(8)
+ 
+ 	(void)jpeg_write_scanlines(&cinfo, row_pointer, (JDIMENSION)y_max);
+ 	jpeg_finish_compress(&cinfo);
+	(void)fflush(fp);
+ 	(void)fclose(fp);
+ 	jpeg_destroy_compress(&cinfo);
+ 	t2 = stress_time_now();
+diff --git a/stress-ng.c b/stress-ng.c
+index a1d38e79cfee..17bd2f42c300 100644
+--- a/stress-ng.c
+++ b/stress-ng.c
+@@ -3770,6 +3770,7 @@ static void stress_yaml_close(FILE *yaml)
+ {
+ 	if (yaml) {
+ 		pr_yaml(yaml, "...\n");
+		(void)fflush(yaml);
+ 		(void)fclose(yaml);
+ 	}
+ }
+diff --git a/stress-opcode.c b/stress-opcode.c
+index cec65ec51cde..c7c1a5b2e653 100644
+--- a/stress-opcode.c
+++ b/stress-opcode.c
+@@ -513,6 +513,9 @@ again:
+ 			 * corruption since the child will
+ 			 * die soon anyhow
+ 			 */
+			(void)fflush(stdout);
+			(void)fflush(stderr);
+
+ 			(void)fclose(stdin);
+ 			(void)fclose(stdout);
+ 			(void)fclose(stderr);
+diff --git a/stress-rename.c b/stress-rename.c
+index 0dee9e75f04a..b0b3d119e5b6 100644
+--- a/stress-rename.c
+++ b/stress-rename.c
+@@ -267,6 +267,7 @@ restart:
+ #endif
+ 		return rc;
+ 	}
+	(void)fflush(fp);
+ 	(void)fclose(fp);
+ 
+ 	while (stress_continue(args)) {
+-- 
+2.47.0
+
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,5 @@
+---
+inspections:
+    badfuncs: off
+annocheck:
+  - hardened: --skip-optimization --skip-cf-protection --skip-property-note 
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (stress-ng-0.17.01.tar.xz) = ee213e2217638976c0b9d96d66509f4fcafbd870cb0c92245d799c967690f4e2f95bdc978ba21d26552d6ca42c49f2a276205d1685facaf8c8101de971df29ef
+SHA512 (stress-ng-0.18.06.tar.xz) = 2b3da9ae31b7b766d7b727552286e3803a5a5099e844705a63d4952897920ed46deb3f657b48bebd97d7ddaaa2ce20a1037915e06f358aa3e041719fd15625b6
--- a/stress-ng.spec
+++ b/stress-ng.spec
@ -1,30 +1,31 @@
 Name:		stress-ng
-Version:	0.17.01
-Release:	1%{?dist}
+Version:	0.18.06
+Release:	0%{?dist}
 Summary:	Stress test a computer system in various ways

-License:	GPLv2+
-URL:		https://github.com/ColinIanKing/%{name}/tarball
-Source0:	https://github.com/ColinIanKing/%{name}/tarball/%{name}-%{version}.tar.xz
+License:	GPL-2.0-or-later
+URL:		https://github.com/ColinIanKing/stress-ng
+Source0:	https://github.com/ColinIanKing/stress-ng/archive/V%{version}/%{name}-%{version}.tar.xz

-# Work around for ld.gold error
-%undefine _package_note_flags
-
-BuildRequires: make
-BuildRequires: gcc
-BuildRequires: glibc-devel
-BuildRequires: kernel-headers
-BuildRequires: keyutils-libs-devel
-BuildRequires: libaio-devel
-BuildRequires: libattr-devel
-BuildRequires: libcap-devel
-BuildRequires: libgcrypt-devel
-BuildRequires: lksctp-tools-devel
-BuildRequires: libatomic
-BuildRequires: zlib-devel
-BuildRequires: Judy-devel
+BuildRequires:	make
+BuildRequires:	gcc
+BuildRequires:	glibc-devel
+BuildRequires:	kernel-headers
+BuildRequires:	keyutils-libs-devel
+BuildRequires:	libaio-devel
+BuildRequires:	libattr-devel
+%if %{undefined rhel}
+BuildRequires:	libbsd-devel
+%endif
+BuildRequires:	libcap-devel
+BuildRequires:	libgcrypt-devel
+BuildRequires:	lksctp-tools-devel
+BuildRequires:	libatomic
+BuildRequires:	zlib-devel
+BuildRequires:	Judy-devel

 # Patches
+Patch1: core-stress-fflush-opened-writable-files.patch

 %description
 Stress test a computer system in various ways. It was designed to exercise
@ -32,12 +33,10 @@ various physical subsystems of a computer as well as the various operating
 system kernel interfaces.

 %prep
-%setup -q
+%autosetup -n %{name}-%{version}

 %build
-export CFLAGS="%{optflags}"
-export LDFLAGS="%{__global_ldflags}"
-%make_build V=
+%make_build

 %install
 install -p -m 755 -D %{name} %{buildroot}%{_bindir}/%{name}
@ -56,65 +55,128 @@ install -pm 644 bash-completion/%{name} \
 %{_datadir}/bash-completion/completions/%{name}

 %changelog
-* Wed Nov 15 2023 John Kacur <jkacur@redhat.com> - 0.17.01-1
- Rebase to upstream V0.17.01
-Resolves: RHEL-8966
+* Fri Nov 01 2024 John Kacur <jkacur@redhat.com> - 0.18.06-1
+- Rebase to stress-ng to V0.18.06
+- Add single upstream patch
+Resolves:RHEL-65475

-* Tue Nov 22 2022 John Kacur <jkacur@redhat.com> - 0.15.00-1
- Rebase to upstream V0.15.00
- Add the following upstream patches
- stress-shm: move /dev/shm check to earlier in the setup phase
- stress-shm: skip stressor if /dev/shm is not mounted with tmpfs on linux
- stress-sysfs: check for zero sysfs entries after pruning the directory
-Resolves: rhbz#2144068
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.17.08-8
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018

-* Tue Oct 18 2022 John Kacur <jkacur@redhat.com> - 0.14.06-1
- Rebase to upstream V0.14.06
-Resolves: rhbz#2119872
+* Thu Aug 01 2024 John Kacur <jkacur@redhat.com> - 0.17.08-7
+- Turn off annocheck optimization, cf-protection and property-note checks
+Resolves: RHEL-33521

-* Wed Apr 20 2022 John Kacur <jkacur@redhat.com> - 0.14.00-1
- Rebase to upstream V0.14.00
- Update Source URLs
-Resolves: rhbz#2067584
+* Tue Jul 16 2024 John Kacur <jkacur@redhat.com> - 0.17.08-6
+- Add mising tests directory for gating
+Resolves: RHEL-48237

-* Fri Jan 14 2022 John Kacur <jkacur@redhat.com> - 0.13.10-1
- Rebase to upstream V0.13.10
-Resolves: rhbz#2028573
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.17.08-5
+- Bump release for June 2024 mass rebuild

-* Mon Dec 06 2021 John Kacur <jkacur@redhat.com> - 0.13.00-5
- Change gating.yaml to read rhel-8
-Resolves: rhbz#2017260
+* Mon Jun 17 2024 Anubhav <ashelat@redhat.com> - 0.17.08-4
+- Use rhel-10 in gating.yaml instead of rhel-9
+Resolves: RHEL-42975

-* Thu Nov 25 2021 John Kacur <jkacur@redhat.com> - 0.13.00-4
- Rebuild for rhel-8.6.0
-Resolves: rhbz#2015162
+* Thu May 23 2024 John Kacur <jkacur@redhat.com> - 0.17.08-3
+- Rebase to V0.17.08 Upstream
+- ARM: Don't declare inlined yield helper if yield not available
+Resolves: RHEL-33305

-* Mon Nov 01 2021 John Kacur <jkacur@redhat.com> - 0.13.00-3
- Rebuild for rhel-8.6.0
-Resolves: rhbz#2015162
+* Tue Mar 26 2024 John Kacur <jkacur@redhat.com> - 0.17.03-3
+- Added gating.yaml
+- Added rpminspect.yam
+- Added tests dir
+Resolves: RHEL-30434

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.00-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Tue Aug 03 2021 John Kacur <jkacur@redhat.com> - 0.13.00-1
- Rebase to stress-ng-0.13.00 to get fix for build break with glibc-2.34
-Resolves: rhbz#1984800
+* Sun Dec 17 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.17.03-1
+- Update to 0.17.03
+- Fixes rhbz#2253639

-* Tue Jun 15 2021 John Kacur <jkacur@redhat.com> - 0.12.04-3
- Bump release number
-Resolves: rhbz#1846033
+* Mon Dec 04 2023 John Kacur <jkacur@redhat.com> - 0.17.01-2
+- Update the License field to the SPDX format using the tools
+  license-fedora2spdx and verified by license-validate

-* Tue Jun 15 2021 John Kacur <jkacur@redhat.com> - 0.12.04-2
- Revert to  0.12.04 and just build without libbsd
-Resolves: rhbz#1846033
+* Sat Nov 11 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.17.01-1
+- Update to 0.17.01
+- Fixes rhbz#2242847

-* Wed May 26 2021 John Kacur <jkacur@redhat.com> - 0.12.09-1
- Rebase to 0.12.09 upstream, and build without libbsd
-Resolves: rhbz#1846033
+* Wed Oct 11 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.17.00-1
+- Update to 0.17.00
+- Fixes rhbz#2242847

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.12.04-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Sun Oct 01 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.16.05-1
+- Update to 0.16.05
+- Fixes rhbz#2237812
+
+* Mon Aug 14 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.16.04-1
+- Update to 0.16.04
+- Fixes rhbz#2231634
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 17 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.16.02-1
+- Update to 0.16.02
+- Fixes rhbz#2222484
+
+* Sat Jul 08 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.16.00-1
+- Update to 0.16.00
+- Fixes rhbz#2221348
+
+* Sat Jun 17 2023 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.15.10-1
+- Update to 0.15.10
+- Fixes rhbz#2186552
+
+* Mon Jun 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.15.06-2
+- Disable libbsd dependency in RHEL builds
+
+* Sat Mar 25 2023 Fabio Alessandro Locati <fale@fedoraproject.ora> - 0.15.06-1
+- Update to 0.15.06
+- Fixes rhbz#2179538
+
+* Sat Mar 11 2023 Fabio Alessandro Locati <fale@fedoraproject.ora> - 0.15.05-1
+- Update to 0.15.05
+- Fixes rhbz#2130476
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.00-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Dec 13 2022 Florian Weimer <fweimer@redhat.com> - 0.15.00-2
+- Improve compatibility with strict(er) C99 compilers
+
+* Wed Dec 07 2022 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.15.00-1
+- Update to 0.15.00
+
+* Sat Sep 17 2022 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.14.05-1
+- Update to 0.14.05
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul 10 2022 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.14.02-1
+- Update to 0.14.02
+
+* Wed Feb 02 2022 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.13.11-1
+- Update to 0.13.11
+- move source to github since the author changed company
+- clean the build process
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Aug 31 2021 Chris Brown <chris.brown@redhat.com> - 0.13.00-1
+- Update to 0.13.00
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 23 2021 Chris Brown <chris.brown@redhat.com> - 0.12.10-1
+- Update to 0.12.10

 * Mon Mar 1 2021 Chris Brown <chris.brown@redhat.com> - 0.12.04-1
 - Update to 0.12.04