Fix bug #210019.

Package-Manager: portage-2.1.4.4

3 files changed, 18 insertions, 10 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index c8c60a28d31b..257c06858122 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.38 2008/02/10 19:18:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.39 2008/02/14 14:06:17 spock Exp $
+
+  14 Feb 2008; Michał Januszewski <spock@gentoo.org>
+  files/memtest86+-2.00-hardcoded_cc.patch:
+  Fix bug #210019.
 
 *memtest86+-2.00 (10 Feb 2008)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index bb83c72f196d..54df5182846f 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
 AUX memtest86+-1.50-hardened.patch 802 RMD160 9bdf9ce73cc7ef48501d9330449dcee7d45baee9 SHA1 839ae644e3730f1338bdab1b302390f76469f0b8 SHA256 00a40459c5c0f7d85e8fb1e9d5d9508f343de4042a51257c911e9736baa70045
 AUX memtest86+-1.70-gnu_hash.patch 485 RMD160 355648069f4b3f6234e770bbea30dcef10405376 SHA1 dd0d673b2fdee35b1522574b1499cd943820dca5 SHA256 07bb65affa496910f0c91457c5c21e31a0e523e0c360ebf602b47296748f4bac
 AUX memtest86+-1.70-hardcoded_cc.patch 1850 RMD160 6f750ba065d8e59e5779e0eadf47fff146761a83 SHA1 a79dbbf5829b4651d73cb89c8a236359cc28c811 SHA256 031fa546942e8b5584f799efd6ef93d4d8fa9934f1cd6b6c01f7e8667a6d03c0
-AUX memtest86+-2.00-hardcoded_cc.patch 978 RMD160 47871d11ea35a2dd888ba1d0a0430e7e2f6f331a SHA1 d80077a33bc8dfd7a7e216a3f0fc5eee766c0b5b SHA256 9c0f9cc3f62a91f478f49f1838f5322311360ae9b08b27d9879b9992e4d6402b
+AUX memtest86+-2.00-hardcoded_cc.patch 1187 RMD160 669cde820a98ad63f4cf2361fa9d40f039c047c5 SHA1 4f7d0f7c57ad433140831924a323b7f91926ec1e SHA256 22b39f7e01f6873c53e3f898920765cbba2399da82ad3f442ae4b0dd5954db8d
 DIST memtest86+-1.65.tar.gz 146203 RMD160 629379f7660dbc6ab071a9d9839ce0528752dda8 SHA1 f9c27f813cc9ada7efe98e6dc587ab6d2c496ba1 SHA256 fb27b1e0b65128921c551096a2e0f8ec51ffa27a45b1e76a54ca6b6685d0e980
 DIST memtest86+-1.70.tar.gz 150198 RMD160 2320f50eb20d31f110103fd14136f92ade627df2 SHA1 d090699df558fc7f48604955c91fba1d06754661 SHA256 dc6d244572f2a030a74cfef78b6e4b58d5f230597b4f80e4581c1373182492eb
 DIST memtest86+-2.00.tar.gz 148108 RMD160 89af71975d3105b24fe1ec9b265d5f486e2f66ca SHA1 59d10f5ea4d6b395baed792d00003dac0f8bd453 SHA256 f9b571711eacf497d3685ca2d73e257b89091747eac85f988b44b34c5fc72c24
 EBUILD memtest86+-1.65.ebuild 1778 RMD160 e0de6dbf447a83667f2928d6fd2feefcd0009cd2 SHA1 c28f4e6a0b945a9133ee60e11d9cebdf089dadd4 SHA256 256d84564c3fcb4a462ee573d0cdaade3b964d5aa2204b395dd711028c751ed1
 EBUILD memtest86+-1.70.ebuild 1832 RMD160 80a3180d1a4082c8ff102f55242caca73143d5b0 SHA1 c7d5541ad8162f30b008b1b367192c5ec1ef95c4 SHA256 5effe7e6b1610bff7e4d3a9d54e5d061b80cb80c04c4b7c8de98af671b7149c6
 EBUILD memtest86+-2.00.ebuild 1827 RMD160 157b3b4229bbca48c696c3946cc3ba33c18968a5 SHA1 9dedeabca71b40025a4b575d9502a5e99eb262f1 SHA256 839e6474d9f90326adfd9d5d1abe3b158243fffca3a4478c35566cee4f288bc2
-MISC ChangeLog 6271 RMD160 e23604d2d78ae37da5e76c524beb6e88657df119 SHA1 85eaa16f1c1804b32bddf4640a74b143c1acc950 SHA256 6c307447f2ba439cb1709c5c36ea62b9e2852d1b6f5775c6b123b74a89e14893
+MISC ChangeLog 6389 RMD160 5c64cd3818df60cb2fdde6455805cdc3566b1652 SHA1 0bca096a4317edf87f9f79c080434d782192ff2c SHA256 8e4a1a7bcea03f167f46e0c6b8833af1f30c193bcccff9e5461591c9a9a0b190
 MISC metadata.xml 259 RMD160 be7d072f3714a6a642c308963bae944249555ad3 SHA1 6487899a29d9e7a4ef5db6b8f48328fa4a529c52 SHA256 80deea66f2205dd3b6e83b31be319f33eef281cd0864f881a58f22eb0916165c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHr034chej4aZK9/cRAvtrAJ0XhYwG23NN5vbXWl60wCLfq6KQiACePnBr
-pxB9CY/Sfx+DeShgyXoTRI4=
-=RKvj
+iD8DBQFHtEqschej4aZK9/cRAlqwAJ491x4bpmI0cueEBAAgTWeQJw9L4ACePRFv
+2fOEXS4EDNGxo8Ob7M2r2wQ=
+=ONXH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
index 449b1bf3ddec..98b8f692a893 100644
--- a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
+++ b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
@@ -1,6 +1,6 @@
 diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile
---- memtest86+-2.00-orig/Makefile	2008-02-10 19:50:30.000000000 +0100
-+++ memtest86+-2.00/Makefile	2008-02-10 20:05:30.000000000 +0100
+--- memtest86+-2.00-orig/Makefile	2008-02-14 15:01:14.000000000 +0100
++++ memtest86+-2.00/Makefile	2008-02-14 15:03:00.000000000 +0100
 @@ -8,9 +8,9 @@
  #
  FDISK=/dev/fd0
@@ -14,7 +14,7 @@ diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile
  
  OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
        config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -37,7 +37,7 @@ memtest.bin: memtest_shared.bin bootsect
+@@ -37,10 +37,10 @@ memtest.bin: memtest_shared.bin bootsect
  	memtest_shared.bin -o memtest.bin
  
  reloc.o: reloc.c
@@ -22,4 +22,8 @@ diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile
 +	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
  
  test.o: test.c
- 	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
+-	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
+ 
+ clean:
+ 	rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin