diff --git a/seeker-3.0-timeout-blockalign-623667.patch b/seeker-3.0-timeout-blockalign-623667.patch index 3256bb1..2c7ff6a 100644 --- a/seeker-3.0-timeout-blockalign-623667.patch +++ b/seeker-3.0-timeout-blockalign-623667.patch @@ -1,6 +1,10 @@ ---- seeker_baryluk.c~ 2009-09-15 09:10:05.000000000 +0300 -+++ seeker_baryluk.c 2010-08-19 12:33:45.151306691 +0300 -@@ -17,11 +17,12 @@ +--- seeker_baryluk.c~ 2009-09-15 15:10:05.000000000 +0900 ++++ seeker_baryluk.c 2021-02-14 21:53:03.620000000 +0900 +@@ -14,14 +14,16 @@ + #include + #include + #include ++#include #include #define BLOCKSIZE 512 @@ -14,7 +18,7 @@ time_t start; off64_t maxoffset = 0; off64_t minoffset = 249994674176000uLL; -@@ -90,7 +91,9 @@ +@@ -90,7 +92,9 @@ while (p->run) { offset = (off64_t) ( (unsigned long long) (p->numbytes * (rand_r(&(p->seed)) / (RAND_MAX + 1.0) ))); @@ -25,7 +29,7 @@ retval = lseek64(p->fd, offset, SEEK_SET); handle("lseek64", retval == (off64_t) -1); retval = read(p->fd, p->buffer, BLOCKSIZE); -@@ -121,22 +124,26 @@ +@@ -121,31 +125,30 @@ setvbuf(stdout, NULL, _IONBF, 0); @@ -56,15 +60,27 @@ + fd = open(argv[1], O_RDONLY | O_LARGEFILE | O_DIRECT); handle("open", fd < 0); - #ifdef BLKGETSIZE64 -@@ -177,7 +184,9 @@ +-#ifdef BLKGETSIZE64 + retval = ioctl(fd, BLKGETSIZE64, &ull); + numbytes = (unsigned long long)ull; +-#else +- retval = ioctl(fd, BLKGETSIZE, &ul); +- numbytes = (unsigned long long)ul; +-#endif + handle("ioctl", retval == -1); + retval = ioctl(fd, BLKBSZGET, &logical_sector_size); + handle("ioctl", retval == -1 && logical_sector_size > 0); +@@ -177,9 +180,11 @@ p[i].seed = rand()+i; p[i].fd = dup(fd); handle("dup", p[i].fd < 0); - p[i].buffer = malloc(sizeof(char)*BLOCKSIZE); -+ p[i].buffer = memalign(512*8, sizeof(char)*BLOCKSIZE); -+ //printf("\n%x\n", (int)(&(p[i].buffer))); ++ p[i].buffer = mmap(NULL, BLOCKSIZE, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p[i].numbytes = numbytes; - handle("malloc", p[i].buffer == NULL); +- handle("malloc", p[i].buffer == NULL); ++ handle("malloc", p[i].buffer == MAP_FAILED); p[i].run = 1; + p[i].count = 0; + p[i].minoffset = minoffset; diff --git a/seeker.spec b/seeker.spec index 6db11cd..667b134 100644 --- a/seeker.spec +++ b/seeker.spec @@ -3,10 +3,10 @@ Name: seeker Version: 3.0 -Release: 20%{?dist} +Release: 36%{?dist} Summary: Random access disk benchmark utility -License: GPLv2 and CC-BY-SA +License: GPL-2.0-only and CC-BY-SA-4.0 URL: http://www.linuxinsight.com/how_fast_is_your_disk.html # http://www.linuxinsight.com/how_fast_is_your_disk.html#comment-1583 Source0: http://smp.if.uj.edu.pl/~baryluk/seeker_baryluk.c @@ -30,12 +30,12 @@ by Witold Baryluk. %prep %setup -q -c -T -a 2 install -pm 644 %{SOURCE0} $(basename %{SOURCE0}) # for debuginfo, Patch0 -%patch0 +%patch -P0 cp -p %{SOURCE1} LICENSE %build -%{__cc} -D_GNU_SOURCE $RPM_OPT_FLAGS $RPM_LD_FLAGS -pthread \ +%{__cc} -D_GNU_SOURCE $RPM_OPT_FLAGS -std=gnu17 $RPM_LD_FLAGS -pthread \ $(basename %{SOURCE0}) -o seeker @@ -51,6 +51,54 @@ install -Dpm 755 seeker $RPM_BUILD_ROOT%{_sbindir}/seeker %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 3.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.0-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Mar 01 2023 Gwyn Ciesla - 3.0-29 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Feb 16 2021 Gwyn Ciesla - 3.0-24 +- Update patch for block alignment. + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 3.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild