[PR PATCH] memtest86+: switch to upstream binary

[PR PATCH] memtest86+: switch to upstream binary

[yopito]

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages memtest86P.5.01.bin
https://github.com/void-linux/void-packages/pull/32616

memtest86+: switch to upstream binary
source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32616.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-memtest86P.5.01.bin-32616.patch --]
[-- Type: text/x-diff, Size: 10477 bytes --]

From f2ec7c6f48e77ae7561af7389c1fdcbc2b8c762f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 21 Aug 2021 17:52:02 +0200
Subject: [PATCH] memtest86+: switch to upstream binary

source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691
---
 .../patches/00.memtest86+-5.01-no-scp.patch   |  10 --
 .../01.memtest86+-5.01-no-optimization.patch  |  18 ----
 .../02.memtest86+-5.01-compile-fix.patch      |  27 -----
 .../03.memtest86+-5.01-crash-fix.patch        | 100 ------------------
 .../04.memtest86+-5.01-fgnu89-inline.patch    |  15 ---
 ....memtest86+-5.01-fno-stack-protector.patch |  11 --
 srcpkgs/memtest86+/template                   |  20 ++--
 7 files changed, 7 insertions(+), 194 deletions(-)
 delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
 delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
 delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
 delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch

diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
deleted file mode 100644
index d998fc5a418c..000000000000
--- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
deleted file mode 100644
index d6453654a2b4..000000000000
--- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile~	2014-01-08 01:30:11.355900076 +0000
-+++ b/Makefile	2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
deleted file mode 100644
index 348d5b152d22..000000000000
--- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/io.h~	2013-08-10 02:01:58.000000000 +0000
-+++ b/io.h	2014-01-08 01:29:12.404465515 +0000
-@@ -31,7 +31,7 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
- __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-@@ -43,7 +43,7 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
- __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
deleted file mode 100644
index 56f40d7bcfa6..000000000000
--- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/controller.c
-+++ b/controller.c
-@@ -2,6 +2,8 @@
-  * MemTest86+ V5 Specific code (GPL V2.0)
-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
-  * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
-  */
- 
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +329,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- 	unsigned long dramchr;
- 	float clockratio;
- 	double dramclock;
--	unsigned int dummy[3];
-+	unsigned int dummy[4];
- 	int ram_type;
- 
- 	float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
- 
- static void poll_timings_i875(void) {
- 
--	ulong dev6, dev62;
-+	ulong dev6;
- 	ulong temp;
- 	float cas;
- 	int rcd, rp, ras, chan;
- 	long *ptr, *ptr2;
- 
--	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- 	ptr2=(long*)(dev6+0x68);
- 
- 	/* Read the MMR Base Address & Define the pointer */
---- a/init.c
-+++ b/init.c
-@@ -7,6 +7,8 @@
-  *
-  * Released under version 2 of the Gnu Public License.
-  * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
-  */
-  
- 
-@@ -914,7 +916,6 @@ void cpu_type(void)
- 			default:
- 				cprint(0, COL_MID, "Unknown Intel");
-  				break;
--			break;
- 		    }
- 
- 		}
---- a/main.c
-+++ b/main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- 		//initialise_cpus();
- 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- 		/* Draw the screen and get system information */
--	  init();
-+		init();
- 
- 		/* Set defaults and initialize variables */
- 		set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- 			    /* Do the same test for each CPU */
- 			    if (++cpu_sel >= act_cpus) 
- 			    	{
--	            cpu_sel = 0;
-+				cpu_sel = 0;
- 			        next_test();
- 			    	} else {
- 			        continue;
diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
deleted file mode 100644
index d044e72094cd..000000000000
--- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-"Fix compilation of inline assembly with new gcc"
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ AS=as -32
- CC=gcc
- 
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
--	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
-+	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
deleted file mode 100644
index ddb3d5968682..000000000000
--- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2019-03-29 16:41:29.629879497 +0100
-+++ b/Makefile	2019-03-29 16:41:55.351031244 +0100
-@@ -53,7 +53,7 @@
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
- 
- random.o: random.c
- 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c4850769d62e..ecffaa62c401 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,26 +1,20 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=5.01
-revision=5
-archs="i686 x86_64"
-short_desc="Advanced Memory Diagnostic Tool"
+revision=6
+archs="i686* x86_64*"
+short_desc="Advanced Memory Diagnostic Tool - upstream binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
+distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
+checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
 
+create_wrksrc=yes
 nostrip=yes
 noverifyrdeps=yes
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="gcc-multilib"
-fi
-
-do_build() {
-	make
-}
 do_install() {
-	vinstall memtest.bin 755 boot memtest86+
+	vinstall memtest86+-5.01.bin 755 boot memtest86+
 	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }

Re: memtest86+: switch to upstream binary

[yopito]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/32616#issuecomment-903141752

Comment:
running fine on Intel(R) Core(TM) i5-5300U CPU @ 2.30GHz with 8GB RAM (2x 4GB SODIMM DDR3 Synchronous 1600 MHz)

Re: memtest86+: switch to upstream binary

[yopito]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/32616#issuecomment-903142069

Comment:
I wonder if package should be renamed to `memtest86+-bin` instead

Re: [PR PATCH] [Merged]: memtest86+: switch to upstream binary

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]

There's a merged pull request on the void-packages repository

memtest86+: switch to upstream binary
https://github.com/void-linux/void-packages/pull/32616

Description:
source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->