diff --git a/sysutils/memtester/Makefile b/sysutils/memtester/Makefile index 2d1201d64ef..afa1e44c2d7 100644 --- a/sysutils/memtester/Makefile +++ b/sysutils/memtester/Makefile @@ -1,6 +1,6 @@ COMMENT= utility to test for memory faults -DISTNAME= memtester-4.5.1 +DISTNAME= memtester-4.6.0 CATEGORIES= sysutils HOMEPAGE= http://pyropus.ca/software/memtester/ diff --git a/sysutils/memtester/distinfo b/sysutils/memtester/distinfo index 1bee049dc6c..613b82470d3 100644 --- a/sysutils/memtester/distinfo +++ b/sysutils/memtester/distinfo @@ -1,2 +1,2 @@ -SHA256 (memtester-4.5.1.tar.gz) = HF/COCV2wISzFM/TNNEnpmwgvWOJLKyfRFvB2LTKWkc= -SIZE (memtester-4.5.1.tar.gz) = 23655 +SHA256 (memtester-4.6.0.tar.gz) = yf5Ot+gMjO9SAvkGXEwGgvVhZkfARV6RalcA+Y49uy4= +SIZE (memtester-4.6.0.tar.gz) = 24229 diff --git a/sysutils/memtester/patches/patch-memtester_c b/sysutils/memtester/patches/patch-memtester_c index 21c44da88a9..49d14b1162c 100644 --- a/sysutils/memtester/patches/patch-memtester_c +++ b/sysutils/memtester/patches/patch-memtester_c @@ -1,6 +1,7 @@ ---- memtester.c.orig Sat Jun 9 23:45:22 2012 -+++ memtester.c Fri Aug 26 23:32:43 2016 -@@ -342,7 +342,7 @@ int main(int argc, char **argv) { +Index: memtester.c +--- memtester.c.orig ++++ memtester.c +@@ -343,7 +343,7 @@ int main(int argc, char **argv) { wantbytes = wantbytes_orig; break; default: diff --git a/sysutils/memtester/patches/patch-sizes_h b/sysutils/memtester/patches/patch-sizes_h index 808f0d338ea..7b68f5db19e 100644 --- a/sysutils/memtester/patches/patch-sizes_h +++ b/sysutils/memtester/patches/patch-sizes_h @@ -1,5 +1,6 @@ ---- sizes.h.orig Sun Feb 28 18:24:56 2010 -+++ sizes.h Tue Feb 17 22:36:10 2015 +Index: sizes.h +--- sizes.h.orig ++++ sizes.h @@ -14,7 +14,7 @@ #include @@ -8,4 +9,4 @@ +#define rand32() arc4random() #if (ULONG_MAX == 4294967295UL) - #define rand_ul() rand32() + #define FMT_TARGET "0x%08lx" diff --git a/sysutils/memtester/patches/patch-tests_c b/sysutils/memtester/patches/patch-tests_c deleted file mode 100644 index 3474b1f9b22..00000000000 --- a/sysutils/memtester/patches/patch-tests_c +++ /dev/null @@ -1,21 +0,0 @@ -Index: tests.c ---- tests.c.orig -+++ tests.c -@@ -52,7 +52,7 @@ int compare_regions(ulv *bufa, ulv *bufb, size_t count - physaddr = physaddrbase + (i * sizeof(ul)); - fprintf(stderr, - "FAILURE: 0x%08lx != 0x%08lx at physical address " -- "0x%08lx.\n", -+ "0x%08llx.\n", - (ul) *p1, (ul) *p2, physaddr); - } else { - fprintf(stderr, -@@ -93,7 +93,7 @@ int test_stuck_address(ulv *bufa, size_t count) { - physaddr = physaddrbase + (i * sizeof(ul)); - fprintf(stderr, - "FAILURE: possible bad address line at physical " -- "address 0x%08lx.\n", -+ "address 0x%08llx.\n", - physaddr); - } else { - fprintf(stderr,