pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2017Q4]: pkgsrc/sysutils/memtestplus Pullup ticket #5698 - req...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9b001873d9d6
branches: pkgsrc-2017Q4
changeset: 373132:9b001873d9d6
user: spz <spz%pkgsrc.org@localhost>
date: Thu Feb 08 22:00:59 2018 +0000
description:
Pullup ticket #5698 - requested by maya
sysutils/memtestplus: build fix
Revisions pulled up:
- sysutils/memtestplus/Makefile 1.25,1.23
- sysutils/memtestplus/distinfo 1.15,1.13
- sysutils/memtestplus/patches/patch-aa 1.7
- sysutils/memtestplus/patches/patch-controller.c 1.1
- sysutils/memtestplus/patches/patch-main.c 1.3
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: maya
Date: Mon Jan 29 14:23:26 UTC 2018
Modified Files:
pkgsrc/sysutils/memtestplus: Makefile distinfo
pkgsrc/sysutils/memtestplus/patches: patch-aa patch-main.c
Log Message:
memtestplus: revert previous, disable optimization.
Hack to fix PR pkg/52962. Now memtestplus functions correctly for sure.
Inspired by opensuse package.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/memtestplus/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/memtestplus/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/memtestplus/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/memtestplus/patches/patch-main.c
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: maya
Date: Mon Jan 29 11:52:11 UTC 2018
Modified Files:
pkgsrc/sysutils/memtestplus: Makefile distinfo
Added Files:
pkgsrc/sysutils/memtestplus/patches: patch-controller.c
Log Message:
memtestplus: spell arraycount correctly and avoid UB.
might help PR pkg/52962: memtestplus doesn't work if built with recent
compilers.
PKGREVISION++
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/memtestplus/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/memtestplus/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/memtestplus/patches/patch-controller.c
diffstat:
sysutils/memtestplus/Makefile | 4 +-
sysutils/memtestplus/distinfo | 7 ++-
sysutils/memtestplus/patches/patch-aa | 10 ++++-
sysutils/memtestplus/patches/patch-controller.c | 43 +++++++++++++++++++++++++
sysutils/memtestplus/patches/patch-main.c | 4 +-
5 files changed, 60 insertions(+), 8 deletions(-)
diffs (125 lines):
diff -r d61d0f7ecf1f -r 9b001873d9d6 sysutils/memtestplus/Makefile
--- a/sysutils/memtestplus/Makefile Mon Feb 05 09:40:23 2018 +0000
+++ b/sysutils/memtestplus/Makefile Thu Feb 08 22:00:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/07/07 22:44:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.21.6.1 2018/02/08 22:00:59 spz Exp $
#
# Note -- version number also in the do-install rule
@@ -7,7 +7,7 @@
DISTNAME= memtest86+-${MAJVER}.${MINVER}
PKGNAME= memtestplus-${MAJVER}.${MINVER}
-PKGREVISION= 1
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://www.memtest.org/download/${MAJVER}.${MINVER}/
diff -r d61d0f7ecf1f -r 9b001873d9d6 sysutils/memtestplus/distinfo
--- a/sysutils/memtestplus/distinfo Mon Feb 05 09:40:23 2018 +0000
+++ b/sysutils/memtestplus/distinfo Thu Feb 08 22:00:59 2018 +0000
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 01:32:21 agc Exp $
+$NetBSD: distinfo,v 1.12.20.1 2018/02/08 22:00:59 spz Exp $
SHA1 (memtest86+-5.01.tar.gz) = eb4b6d70114db3c9ed320785da44c0ba8349c10c
RMD160 (memtest86+-5.01.tar.gz) = 756b57d8f8a3b7408aba0b2fc0cadcdc1df966df
SHA512 (memtest86+-5.01.tar.gz) = d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
Size (memtest86+-5.01.tar.gz) = 214877 bytes
-SHA1 (patch-aa) = df9482d024449c6fc853f01a90b045e139d07430
+SHA1 (patch-aa) = df0b88c93ddf6c07066ef993db80cc1b2874337c
SHA1 (patch-ab) = 04ca819d23656c5a73625b457ad730c0cf33e751
SHA1 (patch-ac) = 9186952e34139b4d4aab6c266a224921a4d39659
SHA1 (patch-ad) = ab31fec30052fdd3c473ee885ba00d7e3676384f
-SHA1 (patch-main.c) = 82e1830d119394f83fa4fd69d492bcc38fe8946f
+SHA1 (patch-controller.c) = 8509599b72f1f11115dc58605b0f438ddfca9b4a
+SHA1 (patch-main.c) = 7f199aa47f429c21ceee127e19120b51a300feac
SHA1 (patch-makeiso.sh) = 939056a96a1384e4d27772bf5612a755deca8145
SHA1 (patch-nbstart.S) = d97a6e9c25a57d0f5510c3acf4dccf0f0c0c31b0
SHA1 (patch-reboot.c) = 8103cb52d1a6e2cdb9099ad3535115617746ed26
diff -r d61d0f7ecf1f -r 9b001873d9d6 sysutils/memtestplus/patches/patch-aa
--- a/sysutils/memtestplus/patches/patch-aa Mon Feb 05 09:40:23 2018 +0000
+++ b/sysutils/memtestplus/patches/patch-aa Thu Feb 08 22:00:59 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2015/03/21 02:18:39 tnn Exp $
+$NetBSD: patch-aa,v 1.6.26.1 2018/02/08 22:00:59 spz Exp $
--- Makefile.orig 2013-08-10 02:01:58.000000000 +0000
+++ Makefile
-@@ -7,7 +7,7 @@
+@@ -7,12 +7,12 @@
#
# Path for the floppy disk device
#
@@ -11,6 +11,12 @@
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 \
@@ -20,22 +20,24 @@ OBJS= head.o reloc.o main.o test.o init.
smp.o vmem.o random.o
diff -r d61d0f7ecf1f -r 9b001873d9d6 sysutils/memtestplus/patches/patch-controller.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/memtestplus/patches/patch-controller.c Thu Feb 08 22:00:59 2018 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-controller.c,v 1.1.2.2 2018/02/08 22:00:59 spz Exp $
+
+Avoid explicit out of bound read (undefined behaviour)
+fix whitespace
+
+--- controller.c.orig 2013-08-10 02:01:58.000000000 +0000
++++ controller.c
+@@ -292,15 +292,15 @@ 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;
+ did &= 0xFF00;
+ if(vid == 0x8086 && did >= 0x2C00) {
+ nhm_bus = possible_nhm_bus[i];
+- }
+-}
++ }
++ }
+
+ /* Now, we have the last IMC bus number in nhm_bus */
+ /* Check for ECC & Scrub */
+@@ -327,14 +327,14 @@ 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;
+ did &= 0xFF00;
+ if(vid == 0x8086 && did >= 0x2C00) {
+ nhm_bus = possible_nhm_bus[i];
+- }
++ }
+ }
+
+ /* Now, we have the last IMC bus number in nhm_bus */
diff -r d61d0f7ecf1f -r 9b001873d9d6 sysutils/memtestplus/patches/patch-main.c
--- a/sysutils/memtestplus/patches/patch-main.c Mon Feb 05 09:40:23 2018 +0000
+++ b/sysutils/memtestplus/patches/patch-main.c Thu Feb 08 22:00:59 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-main.c,v 1.1 2015/03/21 02:18:39 tnn Exp $
+$NetBSD: patch-main.c,v 1.1.26.1 2018/02/08 22:00:59 spz Exp $
+
+Clang fix.
--- main.c.orig 2013-08-10 02:01:58.000000000 +0000
+++ main.c
Home |
Main Index |
Thread Index |
Old Index