Replace previous patch with better version from upstream.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 130 insertions, 26 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index daa172ac1276..421ccc0a5512 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.230 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.231 2012/07/22 18:29:50 floppym Exp $
+
+  22 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/grub-2.00-config-quoting.patch, -files/grub-2.00-gettext_printf.patch,
+  grub-2.00.ebuild, grub-9999.ebuild:
+  Replace previous patch with better version from upstream.
 
   22 Jul 2012; Mike Gilbert <floppym@gentoo.org>
   +files/grub-2.00-gettext_printf.patch, grub-2.00.ebuild, grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d91702f77f56..1a99684a6d36 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -7,7 +7,7 @@ AUX 1.99-improve_devmapper.patch 7134 SHA256 b12624944d129820966146d55693b325d48
 AUX 1.99-stat_root_device_properly-p1.patch 698 SHA256 1facf84e5195eb98b390e43e0a0d6f791e9500ef678b025e95f96d5a2769da5a SHA512 bb2b88d9c5ff6a37292c98ddc1e655076781ac485a5625d09f3cac596ba3aac4b06f9fb0fd250146dd3be1f9e0328085d3a6c52137a4ab5dd3961c53ba87e0ec WHIRLPOOL 92e0cd474b2277876037e602ed47b76b62fe2becc98a0704c9de7ca318f97d89c5a137473fbc558eeea7fed907e49293a61ae3c0a914ec365b2558db37cd4e04
 AUX 1.99-stat_root_device_properly-p2.patch 621 SHA256 431876459562c0aae6e854a97eeaf0cacdad8ceb5477788a4d691e4e6fa613eb SHA512 6953a5a7c48cd38ab41f60d3c4ef8fbeb413408fc749feca7cfffa0413e370c298f3fe3b6a01e457ec376524c9d40536258f7c0fde1e76991774291571117f76 WHIRLPOOL b94e253e2169e8b3a958cb49db81a86aa7d35de29b3fdfc9c58121f18496dcf440b4abe7b07c6d952f3f2172155958100b60795d96485108f874fa163d8c1883
 AUX grub-0.97-gpt.patch 10682 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389 SHA512 2fe10c839c4c575750f7eeb29953c00f232771a3143687aac21e3b90585ec59d6f7c0346db80c0aa3c18d27799d301711d6f995f6781ce8a148c7ce59004e1aa WHIRLPOOL 22b3d12124115ec78fff2b3699c44d3b2c0bb84bec673e36d66e73c9da89137d237b1c7681b671ce89b06b2f4d78f9999eca98f43aa284d2b610713fc4161226
-AUX grub-2.00-gettext_printf.patch 375 SHA256 f7c727c9999ed843c447232fcee8590ae7b58fc6a01e61f279aba7d5e8d406ca SHA512 44948167f50804a72d1e6a15c5fa72cefeb5418327b6ec81c0c3c92383b73b4145dc2e8123dab37400f8587274c85f3962c4102bc2e460c8773b18eb712fa286 WHIRLPOOL 354fccf98cc3cd62c2a612e27c77399ffd68f030e96eb2a14a8f62375aec6d3a84c63a9288a3488aec00de8f65a33f8d1106afef1c221f9792c5158799df560c
+AUX grub-2.00-config-quoting.patch 3934 SHA256 4f1bc29429a864731edf4a5a5fa53004dc67bf1225bd8fa81cb58b197df12510 SHA512 bed0fb1a8589c1979cf7162599e041c8b8eaa66bff3e8fa4a8b9929c8e8191ec1f85c129bcf2f7c9dcc75d5ea50330067ffd519835308460f7a194aab40bfc13 WHIRLPOOL 979234f1d3e1282d1e6d3ac4aa1e01c86082a3883abd452f0f1886181a6d46ccccd8e6b59628acfa8dc375ad9db1b35037d9483f87df2893a7398402dc7cb51a
 AUX grub-2.00-no-gets.patch 805 SHA256 054d85619905055a0ea0e5f9d27eb8c8596959598ac9a5bae7e82543c19adeaf SHA512 8b89fa40efe232474e7bb03d12542030d40fea1fe0839a9493f6704fbe6de77516b5976841bf652c7236104513f427750efc668248c71ba0ea7f676557e8c9e3 WHIRLPOOL 796a7bc4583829abd1a552f7d16d6cc4f2999707af1ae0b5231fa53e87ce22a265a35a3d0f486fcac2e74dbed5fd54e3a572186cc2ba1a849433adc021a0a65b
 AUX grub-2.00-parallel-make.patch 996 SHA256 351abb76af8469d4ecc35d55917821a2ab2e5bddc0634e6a5df85eeec34800ce SHA512 a97a5cf654c1b17918043fc6fa347f1473d5ce24280b9aedefb078abc1f43a4daacd5fc8889cf1dac46d9cf1bf755736e91745a15ac71ed01069ae76e083bd6a WHIRLPOOL 448aa705f15752071be6319314a733be120b95daeb10eaeefb2f52802f9ead3442c7b0598225c7f2d970db72b9dcfbbeb559bb00d8260dacc12363343b53e297
 AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
@@ -52,15 +52,15 @@ EBUILD grub-0.97-r8.ebuild 8948 SHA256 3eb9b11beeae64c986c9d27233f79525f271d0362
 EBUILD grub-0.97-r9.ebuild 9053 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726 SHA512 ddcf78c3d72f1bd854ed44753f4870fc9efd0cf69a28efb24423863c6ad740657affa74eff403484b4f30046e338d4a506a71e5d6b1818022377a1a77880b004 WHIRLPOOL 13d3adafd3814259081dd783067c077fbaebfa2974214d5b0249c818aa3cc004cb2bd526b18f1c1a46dfc0641325a92b87c8f73608972061c52c7ded99e95fe0
 EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1 SHA512 46d72cfaa5735d0b3d2d89a8e6ce83745e4645370cdbbfcffc37d1413ffeb2b1caafac8c7cc712925ffc09411870b06467eb50bc475997508e7beea8fa5172d7 WHIRLPOOL 4b6fe9a7300baf6364555858a49ae2775ea0da27291d5d48fa634097531ae3b6da445ee2f959ef584bf4c913aad5e689b77e7326af257549ef107704dc0d202e
 EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966
-EBUILD grub-2.00.ebuild 8167 SHA256 944375fd4b802056174827199f713e6435f5ea5dd679dd314b28a3f2b63db846 SHA512 42771fae3880d36c40dda5245ce6c8317fe34039f3c3be2f856545887a5d09efccb5ff51cfc42b8445fef7af6de596dbb6183f61236c01af3717f19f15a59ab0 WHIRLPOOL 4393cb1cf28e0064d79347a0718171b0b978e6fe5f82de761da0dd3751c9641d0d3e4b37da66b8e03fe9f0b83faccb588eca15ab4265eb4c713ac4a4b316e22d
+EBUILD grub-2.00.ebuild 8167 SHA256 d53b92f81ef51be633e7f9f880d1f9e67673a37a8dd47cd0c079c77bada0bdad SHA512 2cd34bbba2f440748c47e80b9053cef4348c7d9f94a56e88a54256cb515e925491e487fe9977cc02ef432b9ee729b07b193e307d2fef44fb315c4ddf433c29b3 WHIRLPOOL c63ff472880b84078e3ae55676e121ea4694bb88092f1dcaa6b17d600187c9dc0f4ab3a4cc7e9d1e8c45ebb5173496814f7fef28b33613f43d13adc2f2e1a5e5
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 8167 SHA256 f74d205808c56ee01dc75a01131fae08920e83366390d74cd8fe15deb274f070 SHA512 b20f1cf0e93f0284c8d826d3df37a3f7896a2b4e2d47d4915c197032cf3a8522dad616df7e06de09ae34c73b13394bef087e61406d1d96d302359cc556219875 WHIRLPOOL acd9ae8640ed6eb36848ffb4e1043453d915b5c8571b559af7dfaa10dd195413805e16148e43a66832203b5da54e9ca08d9b33f1d6b03d6fe976e130c9e971c2
-MISC ChangeLog 45292 SHA256 29e38afabeef498909940c6a743139656e8cab458a3b3a3947b2869c36e878df SHA512 0caff1a81a42239e71a38cf1c0e54b4b1381c453fce06c51e7eb3606a10b66082223bea5043e382ad98f9a1dc27dcabbe33de40d36f0f5e096ade31c53cabe10 WHIRLPOOL e9b35577ad5dda159f8533b7ac248ee936552b731257810bbd22e2610438139c7d8849e3a271d596bfab045d2a498fe60fd44902aee53b247bc06c4f6496cb0f
+EBUILD grub-9999.ebuild 8167 SHA256 58b9b6099fcb0f17a5bfd59f412c8fea80c10b17e79ad231327c871f8734167b SHA512 d0cf36393967713075fd0070b16146cd2729c25416960b240ad50b12e65dce9bf2c6cd64d1c0dc5f746d048542293ff2914492fb4841ec8a9ca111bbb33bb257 WHIRLPOOL f77488cd92c7b8b655431f43e421cf2bd02f55c6ff57b61debeabf0b2d2b69eb006b388813ff7e0e6dcba970a25acc0444efa240d4bf675b94a1f87eb537229e
+MISC ChangeLog 45520 SHA256 40dc902715ab7feaece59c6fb046968b249e766961d22ead923c7fb98b4aba43 SHA512 5f8a25e72fa40088720490dc33f4304467127e61bcbc87495b42a1aae47ec15cddbf26e566213247bc44f129f897aa09db3ae9c942980120516cef7c61a125cc WHIRLPOOL 7447558dc2fd7fb9ee1f71e33439c7eaa33dfa05be5e0532e281b4feb93d1738e840601b520260f1ab54f79817b1f444a2ae25448c7d70b24424e96e48ee2fe4
 MISC metadata.xml 607 SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8 SHA512 5aee5daf3e1b9a32ed3e09046bcc131145d9d24ad0ac46f2df9d4ff7e5245bdcbf37bb694080b6d206115c2c4a542eb6a954755b3a049fba8267981852d9ea72 WHIRLPOOL 173e6be80665e0605e174f61553677baff64fa4306ed5f1448fce9d9741cb36224e5db5fff33f9a58788232a977f9779d0f95c0039c552049394e87b8582477a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAMLaIACgkQC77qH+pIQ6SfwQD/VCQUYtUqHxdxg0INN7lv5bhV
-/LIEmFIZUU0OEGwmQugBAKfadnqnPXBDqSTlThITu9JyE3PNrleJW0ugJMHQywMV
-=3KBD
+iF4EAREIAAYFAlAMRqQACgkQC77qH+pIQ6S1MgD/RRI3PaMJCb5tElU3MDfyjsV5
+De69RrXO3BuDGE9e7/oBALdt5SwwjQRX/6/SvnmnI73z7xbruIEhllJS1zBN++Z4
+=DaZi
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-config-quoting.patch b/sys-boot/grub/files/grub-2.00-config-quoting.patch
new file mode 100644
index 000000000000..3b031c626456
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-config-quoting.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/show_bug.cgi?id=426364
+https://savannah.gnu.org/bugs/index.php?36839
+--- util/grub-mkconfig_lib.in
++++ util/grub-mkconfig_lib.in
+@@ -255,19 +255,19 @@
+   echo "$version_find_latest_a"
+ }
+ 
+-# One layer of quotation is eaten by "", the second by sed, and the third by
+-# printf; so this turns ' into \'.  Note that you must use the output of
++# One layer of quotation is eaten by "" and the second by
++# sed; so this turns ' into \'.  Note that you must use the output of
+ # this function in a printf format string.
+ 
+ grub_quote () {
+-  sed "s/'/'\\\\\\\\''/g"
++  sed "s/'/'\\\\''/g"
+ }
+ 
+ gettext_quoted () {
+-  gettext "$@" | sed "s/'/'\\\\\\\\''/g"
++  gettext "$@" | grub_quote
+ }
+ 
+-# Run the first argument through gettext_quoted, and then pass that and all
++# Run the first argument through gettext, and then pass that and all
+ # remaining arguments to printf.  This is a useful abbreviation and tends to
+ # be easier to type.
+ gettext_printf () {
+
+=== modified file 'util/grub.d/10_hurd.in'
+--- util/grub.d/10_hurd.in
++++ util/grub.d/10_hurd.in
+@@ -117,7 +117,7 @@
+       opts=
+   fi
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo		'$message'
++	echo		'$(echo "$message" | grub_quote)'
+ 	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} $opts ${GRUB_CMDLINE_GNUMACH}
+ EOF
+ 
+@@ -133,7 +133,7 @@
+   fi
+ 
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo		'$message'
++	echo		'$(echo "$message" | grub_quote)'
+ 	module		/hurd/${hurd_fs}.static ${hurd_fs} $opts \\
+ 			--multiboot-command-line='\${kernel-command-line}' \\
+ 			--host-priv-port='\${host-port}' \\
+--- util/grub.d/10_illumos.in
++++ util/grub.d/10_illumos.in
+@@ -46,6 +46,7 @@
+ 		ISADIR=
+ 	fi
+ 	zfs-bootfs $($grub_mkrelpath /) ZFS_BOOTFS
++        echo '$(echo "$message" | grub_quote)'
+ 	multiboot $($grub_mkrelpath /platform/i86pc/kernel)/\$ISADIR/unix /platform/i86pc/kernel/\$ISADIR/unix -B \$ZFS_BOOTFS,console=text
+ 	module $($grub_mkrelpath /platform/i86pc)/\$ISADIR/boot_archive /platform/i86pc/\$ISADIR/boot_archive
+ }
+--- util/grub.d/10_kfreebsd.in
++++ util/grub.d/10_kfreebsd.in
+@@ -100,7 +100,7 @@
+   printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+   message="$(gettext_printf "Loading kernel of FreeBSD %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo			'$message'
++	echo			'$(echo "$message" | grub_quote)'
+ 	kfreebsd		${rel_dirname}/${basename} ${args}
+ EOF
+ 
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
+@@ -134,14 +134,14 @@
+   fi
+   message="$(gettext_printf "Loading Linux %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$message'
++	echo	'$(echo "$message" | grub_quote)'
+ 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ EOF
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+     message="$(gettext_printf "Loading initial ramdisk ...")"
+     sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$message'
++	echo	'$(echo "$message" | grub_quote)'
+ 	initrd	${rel_dirname}/${initrd}
+ EOF
+   fi
+--- util/grub.d/20_linux_xen.in
++++ util/grub.d/20_linux_xen.in
+@@ -120,16 +120,16 @@
+   xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
+   lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$xmessage'
++	echo	'$(echo "$xmessage" | grub_quote)'
+ 	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+-	echo	'$lmessage'
++	echo	'$(echo "$lmessage" | grub_quote)'
+ 	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+ EOF
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+     message="$(gettext_printf "Loading initial ramdisk ...")"
+     sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$message'
++	echo	'$(echo "$message" | grub_quote)'
+ 	module	${rel_dirname}/${initrd}
+ EOF
+   fi
diff --git a/sys-boot/grub/files/grub-2.00-gettext_printf.patch b/sys-boot/grub/files/grub-2.00-gettext_printf.patch
deleted file mode 100644
index 41068c42216e..000000000000
--- a/sys-boot/grub/files/grub-2.00-gettext_printf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=426364
-https://savannah.gnu.org/bugs/index.php?36839
---- util/grub-mkconfig_lib.in
-+++ util/grub-mkconfig_lib.in
-@@ -273,7 +273,7 @@
- gettext_printf () {
-   gettext_printf_format="$1"
-   shift
--  printf "$(gettext "$gettext_printf_format")" "$@"
-+  printf "$(gettext_quoted "$gettext_printf_format")" "$@"
- }
- 
- uses_abstraction () {
-
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 0140ab3acc89..fa6a85b708a3 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.15 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.16 2012/07/22 18:29:50 floppym Exp $
 
 EAPI=4
 
@@ -219,7 +219,7 @@ src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
 		epatch "${FILESDIR}/${P}-no-gets.patch" #424703
-		epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
+		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
 	fi
 
 	# fix texinfo file name, bug 416035
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 9e9aab40d9e6..56daa8c45b3c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.80 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.81 2012/07/22 18:29:50 floppym Exp $
 
 EAPI=4
 
@@ -219,7 +219,7 @@ src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
 		epatch "${FILESDIR}/${P}-no-gets.patch" #424703
-		epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
+		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
 	fi
 
 	# fix texinfo file name, bug 416035