diff --git a/fix-multi-difine.patch b/fix-multi-difine.patch deleted file mode 100644 index e64b46df3a3121d404ed3b7b238dcdb3669781a5..0000000000000000000000000000000000000000 --- a/fix-multi-difine.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN memtester-4.3.0/tests.c memtester-4.3.0-bak/tests.c ---- memtester-4.3.0/tests.c 2012-06-10 05:45:22.000000000 +0800 -+++ memtester-4.3.0-bak/tests.c 2021-08-04 17:09:27.971110499 +0800 -@@ -27,6 +27,9 @@ - #define PROGRESSOFTEN 2500 - #define ONE 0x00000001L - -+type_mword8 mword8; -+type_mword16 mword16; -+ - /* Function definitions. */ - - int compare_regions(ulv *bufa, ulv *bufb, size_t count) { -diff -urN memtester-4.3.0/types.h memtester-4.3.0-bak/types.h ---- memtester-4.3.0/types.h 2012-06-10 05:45:22.000000000 +0800 -+++ memtester-4.3.0-bak/types.h 2021-08-04 17:09:10.390965532 +0800 -@@ -25,12 +25,15 @@ - int (*fp)(); - }; - --union { -+typedef union { - unsigned char bytes[UL_LEN/8]; - ul val; --} mword8; -+} type_mword8; - --union { -+typedef union { - unsigned short u16s[UL_LEN/16]; - ul val; --} mword16; -+} type_mword16; -+ -+extern type_mword8 mword8; -+extern type_mword16 mword16; diff --git a/memtester-4.3.0.tar.gz b/memtester-4.3.0.tar.gz deleted file mode 100644 index 2bd50f417ef6dd575ecd8d2452733c884eaf3424..0000000000000000000000000000000000000000 Binary files a/memtester-4.3.0.tar.gz and /dev/null differ diff --git a/memtester-4.5.1.tar.gz b/memtester-4.5.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7d95bf2f89123d1bcd673a2772f7ef41b00d4878 Binary files /dev/null and b/memtester-4.5.1.tar.gz differ diff --git a/memtester-fix-make-install-path.patch b/memtester-fix-make-install-path.patch index 7ed8c4f07dce4e3b9076c648829ab33889b27f3d..6d5181d9d90cd93c443c840c1e446b91c284bddc 100644 --- a/memtester-fix-make-install-path.patch +++ b/memtester-fix-make-install-path.patch @@ -1,23 +1,23 @@ -diff -urN memtester-4.3.0/Makefile memtester-4.3.0-bak/Makefile ---- memtester-4.3.0/Makefile 2012-06-10 05:45:22.000000000 +0800 -+++ memtester-4.3.0-bak/Makefile 2020-05-03 11:26:52.615501049 +0800 -@@ -17,7 +17,9 @@ +diff --color -urN memtester-4.5.1/Makefile memtester-4.5.1-new/Makefile +--- memtester-4.5.1/Makefile 2021-05-31 01:10:52.000000000 +0800 ++++ memtester-4.5.1-new/Makefile 2022-07-05 03:32:36.885577441 +0800 +@@ -17,7 +17,8 @@ OBJECTS = $(SOURCES:.c=.o) HEADERS = memtester.h TARGETS = *.o compile load auto-ccld.sh find-systype make-compile make-load systype extra-libs -INSTALLPATH = /usr/local -+ -+BINDIR = ${DESTDIR}/usr/bin -+MANDIR = ${DESTDIR}/usr/share/man/man8 ++BINDIR = ${DESTDIR}/usr/bin ++MANDIR = ${DESTDIR}/usr/share/man/man8 # # Targets -@@ -25,9 +27,10 @@ +@@ -25,10 +26,10 @@ all: memtester install: all -- mkdir -m 755 -p $(INSTALLPATH)/{bin,man/man8} +- mkdir -m 755 -p $(INSTALLPATH)/bin - install -m 755 memtester $(INSTALLPATH)/bin/ +- mkdir -m 755 -p $(INSTALLPATH)/man/man8 - gzip -c memtester.8 >memtester.8.gz ; install -m 644 memtester.8.gz $(INSTALLPATH)/man/man8/ + mkdir -m 755 -p $(BINDIR) + mkdir -m 755 -p $(MANDIR) diff --git a/memtester.spec b/memtester.spec index 6dbb3548aa2f9085494b7dd4a8ad5784cf610d6a..3b87c6b6293a9088bbf6adb4cf84c3265b4be581 100644 --- a/memtester.spec +++ b/memtester.spec @@ -1,15 +1,14 @@ %global debug_package %{nil} Name: memtester -Version: 4.3.0 -Release: 2 +Version: 4.5.1 +Release: 1 Summary: A userspace utility for testing the memory subsystem for faults License: GPLv2 URL: http://pyropus.ca/software/memtester/ Source0: http://pyropus.ca/software/memtester/old-versions/%{name}-%{version}.tar.gz Patch0: memtester-fix-make-install-path.patch -Patch1: fix-multi-difine.patch BuildRequires: gcc @@ -17,9 +16,7 @@ BuildRequires: gcc A userspace utility for testing the memory subsystem for faults. It's portable and should compile and work on any 32- or 64-bit Unix-like system. (Yes, even weird, proprietary Unices, and even Mac OS X.) For hardware developers, memtester can be told to test memory starting at a particular physical address as of memtester version 4.1.0. %prep -%setup -q -n %{name}-%{version}/ -%patch0 -p1 -%patch1 -p1 +%autosetup -n %{name}-%{version} -p1 %build %make_build @@ -41,6 +38,9 @@ make install DESTDIR="%{buildroot}" %{_mandir}/* %changelog +* Tue Jul 05 2022 YukariChiba - 4.5.1-1 +- Upgrade version to 4.5.1 + * Wed Aug 4 2021 Lu Weitao - fix compile failure by upgrade to GCC-10