Expand the build patch to include -nopie, bug #206726

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 145 insertions, 6 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index a08a74e583e8..8b987841deb8 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.42 2013/10/10 18:38:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.43 2013/10/10 20:53:29 blueness Exp $
+
+*memtest86-4.3.3-r1 (10 Oct 2013)
+
+  10 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/memtest86-4.3.3-build-nopie.patch, +memtest86-4.3.3-r1.ebuild:
+  Expand the build patch to include -nopie, bug #206726
 
 *memtest86-4.3.3 (10 Oct 2013)
 
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 8be68adcdfb6..5cd305b553fe 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -5,6 +5,7 @@ AUX memtest86-3.2-solar.patch 821 SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec1
 AUX memtest86-3.3-funky-test.patch 374 SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc SHA512 3c64f49443b6b508957bcfac040f7d4ca31e52a26db688566d3780df235764af60208a4fed06c031ed0e1b78090496f7236e764921c0afff9a9b8f4f6456fa22 WHIRLPOOL 8800da7a1a564ed29459451983616b5c917420233a5fc637e73f761ee7af7d6de6c50b117fd33fa2afee8289ac2096c92fa8a104967948f6c95714a2940c502c
 AUX memtest86-3.3-gnu-hash.patch 297 SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05 SHA512 67eb9b639cc55bd8123cd6926b2ab49094b5183ecfc9171e4161e5d0d301d5ee48d8ade767e14fbd68f54cc9a8bedfd396b2d4cd1af4666642399e9356142d1b WHIRLPOOL 99ee88a62c5fc910da7550bd73a18db3fded268ffa55661cefe44e855ecdac386bebe96afb2b38f2b612a0a6434f4d6d5dda9561a39ab89312fbd4ed1b32968c
 AUX memtest86-4.0-build.patch 1368 SHA256 c7cf0ef0201fe70733e97abd8ad1f6fe7404726bc86f36fa0c4fe02835f61596 SHA512 1a058da83f24b526e3bce6c3db4451474560fa1dcac120dc9d28d654efebd4f3f67c8f839bfac53d595e745805c9c420fd6126a4e96cb25db9f53ace4f3258d9 WHIRLPOOL b6a0cb57560686526bef8473366fa1a3c5ad658a9b98a98c9fd7003a11479ebddd8ee6ff5d50d2c58b67bad1ddb6cbecd9257d76edaf39d46771d3f8eb7f1d81
+AUX memtest86-4.3.3-build-nopie.patch 1723 SHA256 8a6bb5e634ecc26c25deb72f16ad93d1cc34f74b75771a439aa96c52db2325f7 SHA512 9f0a1530827004668f294f8997593038043f8d917bdba1e9464d91da366f9c648deb933981131bb977427e5af5dca44d33183eee83c2785d860d945a6a207502 WHIRLPOOL 10ac73c0aefc321dfb0b126ddcf19bb26b6c2fcc4ed828e6721d5e13bc3726157545997f2053b2acb852d0f668c348197594f67fd0dc852693a2eddb11785147
 AUX memtest86-4.3.3-build.patch 1516 SHA256 66b4c2db5e97e428e1333580cd19f51f403d2a17cd37e0a7dadfbf8bde97325e SHA512 1c965fa05e295d95a653c5cbe363ae33d619c276baf457f6bcf3068c9a81abd06acf9091f96c4ac628c1f13806cae27cac0f5902fe535b38dff3ea3ea2a03396 WHIRLPOOL 21d55e6aeddebca374fa4e6391cddf3623cb173bfd70cd04eea66a9ee795fa9b4d9be525fb07af5273db6005e511503f1362dc23dc51526ececa2d0dec4f2820
 DIST memtest86-3.3.tar.gz 137922 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c
 DIST memtest86-4.0.tar.gz 134766 SHA256 a998d21d61d1d4f38856c1d840523bfcc4835799855c228dcf1d01e174424afc
@@ -13,13 +14,24 @@ DIST memtest86-4.3.3-src.tar.gz 124056 SHA256 54273d21a29eef55847228ff894a444f91
 EBUILD memtest86-3.3.ebuild 1412 SHA256 29588ec71f40297aae8d44daaf3f403334715dcadedc70521f909e4216c4799f SHA512 03627579fac0b7ebf1e018ac3174a2b08c821c1f53fa9fd268136bde4348db52659eeb4eb470d53de4bade9b801c9e9fa6eb0f77796dbfe8e6dcc8e6eb89a6d0 WHIRLPOOL 9d4b83cd89d643fc25a2490104d8c94e6f6c7028e1b1113cda165e5591ae03661b8eefff48ca3e364f84aacaee18f78dd3aa8c8a02c3b949db66ebb08d5c6c96
 EBUILD memtest86-4.0.ebuild 1351 SHA256 10c8f70a31a957e5d2a4f8353b647bddb1d4161b4f86dfb7e4482c384fd6ef7f SHA512 c86f3267b6b6ad7328d203e06093d97abf6708bbd1508c98715f6acd70dce0c871d99cb71dfc13b0b19c0a789627acf592dcf09fd1385ddc0539e1fd51a405d8 WHIRLPOOL f8923ab3a79d4718d84d9304c0b39d6182e6c40735ab84f8e75882a313d1710a58b45e824e9bdb525bd9e9e78145246577e139f183409b4508ab510bea023d75
 EBUILD memtest86-4.0s.ebuild 1702 SHA256 968670c313a57ea5f3f3cbbd2fd1a659ad99aae69028a22427d0412a45e3b689 SHA512 3697655ca69d5dd418059b7d6dea182c132b4ff1f1dd7bc368e7af7addaa44acdebf4855a216b52598611ee9c161a5c01bbbbb4c11d31823670d555741cfd197 WHIRLPOOL 4b6a4e951ae41bc0ef486e5a416f1198612c6227d89fdd4fd6a83242d123ed92818d7f407ee882988a2b67ebf8aa593597a3b3fca5bb15919eebac36312cc665
+EBUILD memtest86-4.3.3-r1.ebuild 1749 SHA256 18079b9d0c04f6927ca4f164586313815ecd90c47146ce7b322fe7624247bd08 SHA512 df86dff56cd4a9ac9233d017847eb63da4a19ad45278973f6895d9adfabd388911810f8f1be67514e9c73c11c6041086233e765f456c1db8f20991ab47135a6b WHIRLPOOL 681c1dfa9e2f38ce7e53464655e4954802319a4f26deb5c691c1b09f144b784321a97e5d1f0708509f0139e05511319d7987c4c064e4c94038adf0014dfc3fc1
 EBUILD memtest86-4.3.3.ebuild 1730 SHA256 345f7bbd7aeb267f8bb6681ffb37a2d1d0a54866e73f68f7c2b4eb67cf945fac SHA512 4564c538fc619ecebe36deea4bb62bc8cdd147ae174f4e74264409a615594256ada273c6e4c5983b31790a9bbbd84a34aaab490d4e88c767d418037a7d72f64b WHIRLPOOL 28df2be8b3324969a469b6c62259e55832b660731915deb1beced6203bd701634981244f5dde587fe01215f074e22b5644f239e411886f3b04aa123e6123fbc9
-MISC ChangeLog 6659 SHA256 c6c2d577b08d2a5f0b36c48c5c486752882d9f34a3f44837dd485b716a29860a SHA512 f4819b928fa504cf6d2daa74e14c8d8aa79ffec224c534d8eab9fca7d173bb61a4766d0c39376dd464fbdb03c412c7e6d2a3edb6784efef35dddf1034bf30219 WHIRLPOOL 143d23747213d09c672e587f75ae6968a49be3bce1fd89d598a36836f5d99f9912a2a7aaf90628f3e276d947041c89f44116dcf47dc56d68304f3193dbaa7ea9
+MISC ChangeLog 6878 SHA256 e5a4649d5112d84a9cb2d23a0e763caeef189923df1e5e6d44037feb18c1b1ec SHA512 4b1fd2eb2e8e1ccf0d90abe4d14820d6dbdae042802af910920631bf862d8f9bd9a072124793017887b002ddbcddda9f317ccce4833593ce711b13e3ef529e70 WHIRLPOOL 6ab12d0f963dfd902a0bcd05ee9c31c66c172a53105b8404dd9a23f4ccccf0104c871393b0725d37c8ff6a1d80520d6a65b7f04d3f5520f20ee58aba3c3778e7
 MISC metadata.xml 241 SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e SHA512 1a7a7699749e1cfd73bc13f848c00fcb429550fa3dd178d78b7d5715710c63d39ab5b30108e951500ae832f438f7f6e6ab7fb96dd35c92246eb24d5a118af489 WHIRLPOOL e6d1b4b0d9219ebd833235d2c4d5d95a9adfe13212e103ffb19ce4b19758f0cec3111e95dea2a87d0dde0888e91ba9afb17ef1807265dbd0b9f462efdd00d411
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJW9SYACgkQp5vW4rUFj5oKWwCgmoc56BU2nlxPqrUlW51/O+bL
-TyMAn2XEztVfqUHd5WYVTBmAzROG4fSo
-=u35O
+iQIcBAEBCAAGBQJSVxQtAAoJEJOE+m71LUu691oP/Aw/z5J3sVEj5c2WpG9CXyuS
+G3Jv915D1Jxnx/cwrQlK5lLTCgOqMs11jqhs/GK6SLbp8s+nRoTEiuthTPbQm97f
+6GZjD7EfwyrnNkfi9cArhUo2kdXkoAm8i5kWB6ITo7Odg2ov+ltKLHhNlZYT/9Qk
+Ddx0Db/5obROTxzogxCAxgCZ9XfLqA1/Db8nm4XOJMCV9D3o6NJKHP6K1TfQ2AWH
+XiirnKnZkYPwbar9cBsKDsIeFNNm/nHASA/1NAzGtNHe70ix/1ExK7RnVdCayx+o
+rwobEhVtBwiC0Ux+ZK+DNWUmLDWw5Y5eNyHKWCB9PEUAKigEDJCSGZsDFmf5C5to
+aO0ey1QrlTneHCqnPPvp/CjvGP0ymQ8hLJzZ1X+3DOxE5ds2dcrbq8063Wsjb/0G
+by/LTNaJFosYEEPyyoV3o7f1JpmpsLV2sr8YzDC8SN29g22R1+2Iql1TpiTpUGUa
+rILJEzDuJ3fFVoTZSRa4mvl/sW2l8g+EEMezWvFgfcZQ0SBDjvL01HQmpFus4/Y+
+H4BjMQ6TEpMTjUhwnN5+MjJgHSws9IM7RCTwDZCpFdDTejTCUkqIZTkW8P8nHhqA
+5hSligBEnnntnYoDXXuXOkbvG4oOWorNa7+/C6WGJY026f1w094cvZMOG0Vxy02l
+OI5qyPJ6YgxxhzHiQT8L
+=pbXb
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
new file mode 100644
index 000000000000..ff898a562e4b
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
@@ -0,0 +1,47 @@
+diff -Naur src.orig/Makefile src/Makefile
+--- src.orig/Makefile	2013-10-10 16:52:14.292140058 -0400
++++ src/Makefile	2013-10-10 16:51:37.431138380 -0400
+@@ -8,11 +8,9 @@
+ #

+ FDISK=/dev/fd0

+ 

+-AS=as -32

+-CC=gcc

++ASFLAGS=-32

+ 

+-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \

+-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector

++CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -nopie $(SMP_FL)

+ 

+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \

+       config.o memsize.o error.o smp.o cpuid.o vmem.o random.o

+@@ -23,7 +21,7 @@
+ # symbols and then link it dynamically so I have full

+ # relocation information

+ memtest_shared: $(OBJS) memtest_shared.lds Makefile

+-	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \

++	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \

+ 	-o $@ $(OBJS) && \

+ 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)

+ 

+@@ -50,10 +48,10 @@
+ 	$(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 $(CFLAGS:-fPIC=) -o $@ $<

+ 

+ random.o: random.c

+-	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c

++	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -nopie random.c

+ 

+ clean:

+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \

+@@ -72,3 +70,7 @@
+ dos: all

+ 	cat mt86+_loader memtest.bin > memtest.exe

+ 

++head.o: head.s

++bootsect.o: bootsect.s

++setup.o: setup.s

++

diff --git a/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild b/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild
new file mode 100644
index 000000000000..7f18d80dc30b
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild,v 1.1 2013/10/10 20:53:29 blueness Exp $
+
+EAPI=5
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="A stand alone memory test for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="serial"
+S="${WORKDIR}/src"
+
+BOOTDIR=/boot/memtest86
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-nopie.patch #66630 + #206726
+
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+
+	if use serial ; then
+		sed -i \
+			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h \
+			|| die "sed failed"
+	fi
+
+	cat - > "${T}"/39_${PN} <<EOF
+#!/bin/sh
+exec tail -n +3 \$0
+
+menuentry "${PN} ${PV}" {
+	linux16 ${BOOTDIR}/memtest
+}
+EOF
+
+	tc-export AS CC LD
+}
+
+src_test() { :; }
+
+src_install() {
+	insinto ${BOOTDIR}
+	newins memtest.bin memtest
+	dosym memtest ${BOOTDIR}/memtest.bin
+
+	exeinto /etc/grub.d
+	doexe "${T}"/39_${PN}
+
+	dodoc README README.build-process README.background
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	elog
+	elog "memtest has been installed in ${BOOTDIR}/"
+	elog "You may wish to update your bootloader configs"
+	elog "by adding these lines:"
+	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+	elog "   as /etc/grub/39_${PN}"
+	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+	elog "    > title=${PN}"
+	elog "    > root (hd?,?)"
+	elog "    > kernel ${BOOTDIR}/memtest"
+	elog " - For lilo:"
+	elog "    > image  = ${BOOTDIR}/memtest"
+	elog "    > label  = ${PN}"
+	elog
+}