Fix GRUB device number translation code (bug #257767).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 24 insertions, 19 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index cdf713e41d73..8c550bf2a422 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.46 2009/01/03 12:38:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.47 2009/02/09 21:26:48 spock Exp $
+
+  09 Feb 2009; Michał Januszewski <spock@gentoo.org>
+  memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild:
+  Fix GRUB device number translation code (bug #257767).
 
 *memtest86+-2.11 (03 Jan 2009)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index bd646e48bfef..7e80bc1a03ad 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -8,15 +8,15 @@ AUX memtest86+-2.11-hardcoded_cc.patch 1210 RMD160 9f153d1d4e80b37479cdbebe760c4
 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
 DIST memtest86+-2.11.tar.gz 165937 RMD160 2f210dd17725ead0ef3daf1181184d2a7a071774 SHA1 5cebc90126403c1e918fd05670546800b66ed113 SHA256 43876a7221e39cde791f20d04ecb071adfa08975cac2e511d04359619ce16c0e
-EBUILD memtest86+-2.01.ebuild 1832 RMD160 a686fbe4cfce6550159fb3549610206b62a4589f SHA1 fd8faf13b32a09f487b60aaff996024b556af7c4 SHA256 09e339dfe8e3adb3b57ddbece0f5b7a0fa604cf42ba2f7d5b265fb0461bc1e14
-EBUILD memtest86+-2.10.ebuild 1833 RMD160 86b3710449841490ac0fbd7c86668a9521658688 SHA1 298850c738d010d5934e4cc1f29a55f1438d92e1 SHA256 368a88f29fe28f7a3293a88c4299f43e1c5ddda32c969c8cb8267e457b4ec1cb
-EBUILD memtest86+-2.11.ebuild 1833 RMD160 f9f13d6245d32e109e4a077d06fb59e8fc9b9fe6 SHA1 147791fd29e944471b0c53744c541bfc795487d4 SHA256 4dca0fb22b14859f6c760b39948dd522b78b1dc937e1583ebe52179eee6659f7
-MISC ChangeLog 7584 RMD160 ff68c5738925df7b67b4ffd68b4735c5769e57f5 SHA1 28855562f6421b29e495278ffe14c4fdb94e597f SHA256 a555ce57bbd0fbf97fe860366565fa69e8fadd7dae20d152df42be569571e0e3
+EBUILD memtest86+-2.01.ebuild 1833 RMD160 8dc6a35dc492629ce9e0597c71558605f54f3b67 SHA1 765bba2f2d607f027713d74732dc1a350a25d4f5 SHA256 6fcf9f3af52d56b951c672ec8ceb9592c6ce0f310d979d5720fd1c7b9ca13319
+EBUILD memtest86+-2.10.ebuild 1835 RMD160 21f52efcdbf3a64b2f469f77a967fbcacccad599 SHA1 fa2ee25625894f4213d5fcd1758900a11277fc08 SHA256 88e020caef33899a8cdecfa27b141a07a55dae8c6a11b60a1da9d8cd418f1db8
+EBUILD memtest86+-2.11.ebuild 1846 RMD160 b2d4bf8acc075768e28bc052a0cd67bc9d8d4029 SHA1 e3f04c829df0131413cc89b031aa148376a6e688 SHA256 143cd15cb68b53898d1b0736bfb01d6ac7c748798e7cb18b4b8a1cf31f9cf947
+MISC ChangeLog 7770 RMD160 fac25460c30ce4606dae9341213e604951c98a81 SHA1 6f4d138015cea153e32332c52e21ed23cd004603 SHA256 6f710d069fa19ea6b2305a557e9ebfa1871b8a07ee33b57447329d57a0fff2ab
 MISC metadata.xml 334 RMD160 5aa147c5b7c317b501281dcfbfdef447deaf4d09 SHA1 5dc1ab7bcf2e85590312e7cb7fa8dbea3deccf73 SHA256 3872db066e8e6a0f7a4e8b3ef82aa3b033d4fe0b88ba715ff79073c13db6a78e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklfXG8ACgkQchej4aZK9/d6xgCeOk8ipKMHU9Q0HG6KaPRJKhyK
-i6oAnA9PqU/zIwPCUofGyj1q6/JlMM/I
-=Ey/c
+iEYEARECAAYFAkmQn6oACgkQchej4aZK9/e6KwCfeCBs9DsuVgC/kVIffQaF8D76
+yeAAnR3hxZFBngUwFa3hmG78ktlMQEM5
+=wpvs
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
index 4b341969e6ff..797d0a371f28 100644
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/10/04 14:18:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.3 2009/02/09 21:26:48 spock Exp $
 
 inherit mount-boot eutils
 
@@ -54,8 +54,8 @@ pkg_postinst() {
 	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)))"
+		root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789)
+		root="(hd${root:0:1},$((${root:1:3}-1)))"
 	fi
 	einfo " - For grub:"
 	einfo "    > title=Memtest86Plus"
diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild
index 17548f8540ca..5057f465108e 100644
--- a/sys-apps/memtest86+/memtest86+-2.10.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $
 
 inherit mount-boot eutils
 
@@ -54,8 +54,8 @@ pkg_postinst() {
 	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)))"
+		root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789)
+		root="(hd${root:0:1},$((${root:1:3}-1)))"
 	fi
 	einfo " - For grub:"
 	einfo "    > title=Memtest86Plus"
diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild
index 00b90c523ea6..05e9a31a6751 100644
--- a/sys-apps/memtest86+/memtest86+-2.11.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.1 2009/01/03 12:38:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $
 
 inherit mount-boot eutils
 
@@ -15,6 +15,7 @@ IUSE="serial"
 RESTRICT="test"
 
 DEPEND=""
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -54,8 +55,8 @@ pkg_postinst() {
 	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)))"
+		root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789)
+		root="(hd${root:0:1},$((${root:1:3}-1)))"
 	fi
 	einfo " - For grub:"
 	einfo "    > title=Memtest86Plus"