Version bump (bug #212927).

Package-Manager: portage-2.1.4.4

4 files changed, 113 insertions, 5 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 257c06858122..a2088e3920f6 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.39 2008/02/14 14:06:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.40 2008/03/11 20:14:19 spock Exp $
+
+*memtest86+-2.01 (11 Mar 2008)
+
+  11 Mar 2008; Michał Januszewski <spock@gentoo.org>
+  +files/memtest86+-2.01-hardcoded_cc.patch, +memtest86+-2.01.ebuild:
+  Version bump (bug #212927).
 
   14 Feb 2008; Michał Januszewski <spock@gentoo.org>
   files/memtest86+-2.00-hardcoded_cc.patch:
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 54df5182846f..590d6727c4c4 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -5,18 +5,21 @@ AUX memtest86+-1.50-hardened.patch 802 RMD160 9bdf9ce73cc7ef48501d9330449dcee7d4
 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 1187 RMD160 669cde820a98ad63f4cf2361fa9d40f039c047c5 SHA1 4f7d0f7c57ad433140831924a323b7f91926ec1e SHA256 22b39f7e01f6873c53e3f898920765cbba2399da82ad3f442ae4b0dd5954db8d
+AUX memtest86+-2.01-hardcoded_cc.patch 1209 RMD160 a09c97fd3c8079e4ff2b68659a9b53f50bd85088 SHA1 1bc62337d7c479ab35aafa7b1dc4fc4367229edb SHA256 be5cc900b4c7033ab93caa1394b86cd194d781b32c7d4b6c678b80c2128b1ab2
 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
+DIST memtest86+-2.01.tar.gz 165984 RMD160 cdd94d9ea1089387bba8bd024c5cb39b741cba9f SHA1 3420652300e397891af8b263318dc08144e8b4a4 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae
 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 6389 RMD160 5c64cd3818df60cb2fdde6455805cdc3566b1652 SHA1 0bca096a4317edf87f9f79c080434d782192ff2c SHA256 8e4a1a7bcea03f167f46e0c6b8833af1f30c193bcccff9e5461591c9a9a0b190
+EBUILD memtest86+-2.01.ebuild 1833 RMD160 a787ac5e22a22c1851e3515fee5b9e334b53c6ed SHA1 17d39b01a214e2c523e214d7b8e8e45288f2aa18 SHA256 891159baa600090f9a8ad4f92884f9847b13497fe93c9fc5c2480fcc146bd59d
+MISC ChangeLog 6576 RMD160 e3c3accb1fc8eaad149cd32a05c0f8a566829602 SHA1 e58bbd020ea1b505e2b9f89d201270737d00d954 SHA256 37c707fc73b947458de42bafb62d8d6d112aff59bf61371dcaae1305e018aa40
 MISC metadata.xml 259 RMD160 be7d072f3714a6a642c308963bae944249555ad3 SHA1 6487899a29d9e7a4ef5db6b8f48328fa4a529c52 SHA256 80deea66f2205dd3b6e83b31be319f33eef281cd0864f881a58f22eb0916165c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHtEqschej4aZK9/cRAlqwAJ491x4bpmI0cueEBAAgTWeQJw9L4ACePRFv
-2fOEXS4EDNGxo8Ob7M2r2wQ=
-=ONXH
+iD8DBQFH1ugochej4aZK9/cRApZqAJ9Km+XoZ+/69cGLFKzqpUfNGOMtIwCeIGxW
+OcN+jqRPSlEZNKTE6r09lFU=
+=PipY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
new file mode 100644
index 000000000000..c2e2ee491f70
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
@@ -0,0 +1,30 @@
+diff -Naurp memtest86+-2.01-orig/Makefile memtest86+-2.01/Makefile
+--- memtest86+-2.01-orig/Makefile	2008-03-11 21:04:28.000000000 +0100
++++ memtest86+-2.01/Makefile	2008-03-11 21:05:25.000000000 +0100
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
++CPPFLAGS=-m32
++CFLAGS=-Wall -m32 -march=i486 -Os -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 -Os -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.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
new file mode 100644
index 000000000000..964e6124eaed
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-2.01.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.01.ebuild,v 1.1 2008/03/11 20:14:19 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.01-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
+}