diff --git a/SOURCES/memtest86+-5.01-serial-console-fix.patch b/SOURCES/memtest86+-5.01-serial-console-fix.patch new file mode 100644 index 0000000..2cacd12 --- /dev/null +++ b/SOURCES/memtest86+-5.01-serial-console-fix.patch @@ -0,0 +1,13 @@ +diff --git a/lib.c b/lib.c +index a2b829d..6a7e210 100644 +--- a/lib.c ++++ b/lib.c +@@ -1141,7 +1141,7 @@ void serial_console_setup(char *param) + + end++; + +- if (*end != '\0' || *end != ' ') ++ if (*end != '\0' && *end != ' ') + return; /* garbage at the end */ + + serial_bits = bits; diff --git a/SPECS/memtest86+.spec b/SPECS/memtest86+.spec index ad36e45..bdb71da 100644 --- a/SPECS/memtest86+.spec +++ b/SPECS/memtest86+.spec @@ -9,7 +9,7 @@ Name: memtest86+ Version: 5.01 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2 Summary: Stand-alone memory tester for x86 and x86-64 computers Group: System Environment/Base @@ -30,6 +30,7 @@ Patch1: memtest86+-5.01-no-optimization.patch Patch2: memtest86+-5.01-compile-fix.patch Patch3: memtest86+-5.01-crash-fix.patch Patch4: memtest86+-5.01-fgnu89-inline.patch +Patch5: memtest86+-5.01-serial-console-fix.patch URL: http://www.memtest.org # require glibc-devel.i386 via this file: BuildRequires: %{_includedir}/gnu/stubs-32.h @@ -59,6 +60,7 @@ cp -p %{SOURCE6} README.%{readme_suffix} %patch2 -p1 -b .compile-fix %patch3 -p1 -b .crash-fix %patch4 -p1 -b .fgnu89-inline +%patch5 -p1 -b .serial-console-fix #sed -i -e's,0x10000,0x100000,' memtest.lds %ifarch x86_64 @@ -121,6 +123,10 @@ fi %{_mandir}/man8/*.8.gz %changelog +* Thu Oct 22 2020 Jaroslav Škarvada - 5.01-20 +- Fixed serial console + Resolves: rhbz#1696877 + * Thu Feb 08 2018 Fedora Release Engineering - 5.01-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild