Version bump.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27 x86_64

4 files changed, 113 insertions, 5 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 3a688c786264..2a63290c6c55 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2008/10/18 17:25:16 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.45 2008/11/27 13:04:04 spock Exp $
+
+*memtest86+-2.10 (27 Nov 2008)
+
+  27 Nov 2008; Michał Januszewski <spock@gentoo.org>
+  +files/memtest86+-2.10-hardcoded_cc.patch, +memtest86+-2.10.ebuild:
+  Version bump.
 
   18 Oct 2008; Michał Januszewski <spock@gentoo.org>
   -files/memtest86+-1.50-hardened.patch,
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index fc3547c6399f..ec18dc9c60e6 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 AUX memtest86+-1.70-gnu_hash.patch 485 RMD160 355648069f4b3f6234e770bbea30dcef10405376 SHA1 dd0d673b2fdee35b1522574b1499cd943820dca5 SHA256 07bb65affa496910f0c91457c5c21e31a0e523e0c360ebf602b47296748f4bac
 AUX memtest86+-2.01-hardcoded_cc.patch 1209 RMD160 00167b8e9f8eb49b3c291b63a754e415c7d0ad17 SHA1 e0efa4cfb820825bc2cc6c2488be18909db892cf SHA256 79de7846fc10bb70f018bda0daad82082600a5a7bc35d7715b25294018e47d97
+AUX memtest86+-2.10-hardcoded_cc.patch 1231 RMD160 9ffb4f5bdacff75ef09e6aa760186cdd1e29c71d SHA1 fa55e18966a7c5e35b091a9899cfe51d55ea83de SHA256 3f39a0495230cf45ea0666040b1bfefd00a86dbd91ec45428f181ed6c06a10a6
 DIST memtest86+-2.01.tar.gz 165984 RMD160 cdd94d9ea1089387bba8bd024c5cb39b741cba9f SHA1 3420652300e397891af8b263318dc08144e8b4a4 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae
+DIST memtest86+-2.10.tar.gz 165987 RMD160 e782d067899361bbf931206742318c136467c432 SHA1 a687513b118fc3d43c2b83d9baed835eb2380786 SHA256 d951e4888e8b793832ae1dad2716863fe6d96976a8cc258a7298e2cbfac8136e
 EBUILD memtest86+-2.01.ebuild 1832 RMD160 a686fbe4cfce6550159fb3549610206b62a4589f SHA1 fd8faf13b32a09f487b60aaff996024b556af7c4 SHA256 09e339dfe8e3adb3b57ddbece0f5b7a0fa604cf42ba2f7d5b265fb0461bc1e14
-MISC ChangeLog 7238 RMD160 248bde08fe63d8a96e14a90ea59674b01644d653 SHA1 cfe0841f709fe055aa36b11e92166aeeba7969a0 SHA256 6e9412f360f561f91369d5a38f6b27cf64c5de5c0f6f44a9e07e463ed2d9a614
+EBUILD memtest86+-2.10.ebuild 1833 RMD160 86b3710449841490ac0fbd7c86668a9521658688 SHA1 298850c738d010d5934e4cc1f29a55f1438d92e1 SHA256 368a88f29fe28f7a3293a88c4299f43e1c5ddda32c969c8cb8267e457b4ec1cb
+MISC ChangeLog 7411 RMD160 32aba34ac9b98c8d070136fadbda314d6943f734 SHA1 dfac7d7336807c47e660e5c08ffcc22df2408dde SHA256 e0a7a395dceedefd95631fb7906e107b7b2db2e529a532c0d7a0954b0632cbeb
 MISC metadata.xml 334 RMD160 5aa147c5b7c317b501281dcfbfdef447deaf4d09 SHA1 5dc1ab7bcf2e85590312e7cb7fa8dbea3deccf73 SHA256 3872db066e8e6a0f7a4e8b3ef82aa3b033d4fe0b88ba715ff79073c13db6a78e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj6HAQACgkQchej4aZK9/fAQACbBh5tMv30pzW3j50Gnn/1KXEp
-WFIAn3WwtXbJTQBEdFRcRkO5yohpAgw/
-=tYIF
+iEYEARECAAYFAkkumtEACgkQchej4aZK9/ewGQCeNS7XxER/5V82Oln+1KaRAxKU
+QNoAnignfMzXiEl9fBpSZhpabdxoVwcz
+=U7TC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch
new file mode 100644
index 000000000000..43e3fbb3fcc5
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch
@@ -0,0 +1,30 @@
+diff -Naurp memtest86+-2.10-orig/Makefile memtest86+-2.10/Makefile
+--- memtest86+-2.10-orig/Makefile	2008-11-27 13:54:49.000000000 +0100
++++ memtest86+-2.10/Makefile	2008-11-27 13:56:32.000000000 +0100
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS= -fno-stack-protector -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
++CPPFLAGS=-m32
++CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
++ASFLAGS=-32
+ 
+ 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 \
+@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
+ 	memtest_shared.bin -o memtest.bin
+ 
+ reloc.o: reloc.c
+-	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
++	$(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 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
+ 
+ clean:
+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild
new file mode 100644
index 000000000000..17548f8540ca
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-2.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.1 2008/11/27 13:04:04 spock Exp $
+
+inherit mount-boot eutils
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="serial"
+RESTRICT="test"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.10-hardcoded_cc.patch
+	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
+
+	if use serial ; then
+		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	insinto /boot/memtest86plus
+	doins memtest.bin || die
+	dodoc README README.build-process
+}
+
+pkg_postinst() {
+	einfo
+	einfo "memtest.bin has been installed in /boot/memtest86plus/"
+	einfo "You may wish to update your bootloader configs"
+	einfo "by adding these lines:"
+
+	# a little magic to make users' life as easy as possible ;)
+	local fstab=${ROOT}/etc/fstab
+	local root="(hd0,0)"
+	local res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
+	if [[ -z ${res} ]] ; then
+		res=$(awk '$2 == "/" {print $1}' "${fstab}")
+	fi
+	if [[ -n ${res} ]] ; then
+		# transform /dev/hd* magic into grub naming ...
+		#        /dev/hda1   ->         a1          ->      01
+		root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789)
+		root="(hd${root:0:1},$((${root:1:1}-1)))"
+	fi
+	einfo " - For grub:"
+	einfo "    > title=Memtest86Plus"
+	einfo "    > root ${root}"
+	einfo "    > kernel /boot/memtest86plus/memtest.bin"
+
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86plus/memtest.bin"
+	einfo "    > label  = Memtest86Plus"
+	einfo
+}