diff --git a/.gitignore b/.gitignore index 6b8e258..903dd07 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/sources b/sources index 0bb3435..ee1c255 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stress-ng-0.15.00.tar.gz) = bef6785848c46e39debfc0c4e05e20fe1f443518d619d1ae50b2f9952939e1db964cec0755986a1dd4917e25f979c43d5808b1ff686a4471e8e8be8df9355c05 +SHA512 (stress-ng-0.15.05.tar.gz) = 654fff49ade6bc44c1f855cf5869255ef626180ca9b9d83374cd18c000a1b3f2e9c8b3b653592d2896d66d4cbb7dc0d60e67233af73fdc8039c2ba530d45fad4 diff --git a/stress-ng-c99-1.patch b/stress-ng-c99-1.patch deleted file mode 100644 index db837b5..0000000 --- a/stress-ng-c99-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -test-pidfd-getfd: Include if available for pidfd_getfd - -Submitted upstream: - - - -diff --git a/test/test-pidfd-getfd.c b/test/test-pidfd-getfd.c -index d55b6f9a28692417..317c5542b2c423ee 100644 ---- a/test/test-pidfd-getfd.c -+++ b/test/test-pidfd-getfd.c -@@ -20,6 +20,10 @@ - - #define _GNU_SOURCE - -+#if defined(__has_include) && __has_include() -+#include -+#endif -+ - int main(void) - { - /* We don't care about the args, we just want to see if it links */ diff --git a/stress-ng-c99-2.patch b/stress-ng-c99-2.patch deleted file mode 100644 index cf61944..0000000 --- a/stress-ng-c99-2.patch +++ /dev/null @@ -1,26 +0,0 @@ -test/test-float.c: Avoid tickling an implicit int error - -The new typedef ensures that ftype is known as a type, even if FLOAT -itself does not denote a type. This helps with efforts porting to -modern C, where all implicit ints are flagged for investigation. - -Submitted upstream: - - - -diff --git a/test/test-float.c b/test/test-float.c -index 06cb7f651fc7eb90..0483c9b587d9a4c3 100644 ---- a/test/test-float.c -+++ b/test/test-float.c -@@ -58,7 +58,10 @@ - b = d - (_type)1.0L; \ - } while (0) - --static FLOAT HOT OPTIMIZE3 test(void) -+/* Avoid implicit int in the definition of test even if FLOAT is not known. */ -+typedef FLOAT float_type; -+ -+static float_type HOT OPTIMIZE3 test(void) - { - FLOAT a = 0.0, b = 0.0, c = 0.0, d = 0.0; - diff --git a/stress-ng-c99-3.patch b/stress-ng-c99-3.patch deleted file mode 100644 index 455ae2d..0000000 --- a/stress-ng-c99-3.patch +++ /dev/null @@ -1,19 +0,0 @@ -test-fchmodat: Include for the fchmodat prototype - -Submitted upstream: - - - -diff --git a/test/test-fchmodat.c b/test/test-fchmodat.c -index 7a8f59de42716057..209e6841f3a738f1 100644 ---- a/test/test-fchmodat.c -+++ b/test/test-fchmodat.c -@@ -18,7 +18,7 @@ - * - */ - --#include -+#include - - int main(void) - { diff --git a/stress-ng-c99-4.patch b/stress-ng-c99-4.patch deleted file mode 100644 index 8808de9..0000000 --- a/stress-ng-c99-4.patch +++ /dev/null @@ -1,20 +0,0 @@ -test-aligned-alloc: Define _GNU_SOURCE for the aligned_alloc prototype - -Submitted upstream: - - - -diff --git a/test/test-aligned-alloc.c b/test/test-aligned-alloc.c -index 0ea91b6a7ccadf12..f29365530b9e5e52 100644 ---- a/test/test-aligned-alloc.c -+++ b/test/test-aligned-alloc.c -@@ -16,6 +16,9 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ -+ -+#define _GNU_SOURCE -+ - #include - - int main(void) diff --git a/stress-ng.spec b/stress-ng.spec index cee95cf..41b6f64 100644 --- a/stress-ng.spec +++ b/stress-ng.spec @@ -1,15 +1,11 @@ Name: stress-ng -Version: 0.15.00 -Release: 3%{?dist} +Version: 0.15.05 +Release: 1%{?dist} Summary: Stress test a computer system in various ways License: GPLv2+ URL: https://github.com/ColinIanKing/stress-ng Source0: https://github.com/ColinIanKing/stress-ng/archive/V%{version}/%{name}-%{version}.tar.gz -Patch0: stress-ng-c99-1.patch -Patch1: stress-ng-c99-2.patch -Patch2: stress-ng-c99-3.patch -Patch3: stress-ng-c99-4.patch BuildRequires: make BuildRequires: gcc @@ -32,7 +28,7 @@ various physical subsystems of a computer as well as the various operating system kernel interfaces. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -n %{name}-%{version} %build %make_build @@ -54,6 +50,10 @@ install -pm 644 bash-completion/%{name} \ %{_datadir}/bash-completion/completions/%{name} %changelog +* Sat Mar 11 2023 Fabio Alessandro Locati - 0.15.05-1 +- Update to 0.15.05 +- Fixes rhbz#2130476 + * Sat Jan 21 2023 Fedora Release Engineering - 0.15.00-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild