Apply upstream patch to fix TFTP issue, bug 438612 by Alexander Zubkov.

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0xEA4843A4

5 files changed, 43 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 4ce33a6dbb8d..ac6f72094e69 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,13 @@
 # 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.238 2012/10/11 02:14:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.239 2012/10/16 20:42:15 floppym Exp $
+
+*grub-2.00-r1 (16 Oct 2012)
+
+  16 Oct 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/grub-2.00-tftp-endian.patch, +grub-2.00-r1.ebuild, -grub-2.00.ebuild,
+  grub-9999.ebuild:
+  Apply upstream patch to fix TFTP issue, bug 438612 by Alexander Zubkov.
 
   11 Oct 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 79eb01a74dcc..f3df3b7fbefe 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -10,6 +10,7 @@ AUX grub-0.97-gpt.patch 10682 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc35
 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-2.00-tftp-endian.patch 728 SHA256 4806fb14471fe6547cb69e6fab97e66c8245654acbc4738071cf2717368de458 SHA512 8fee95b06b50f8721d7013ecf8fb954e9b1ba83f99790e165ec334dfcd41fe7655f37868069a315acd4af97d3c4466aa36e0ab5a8b767faf862f1d71f88b3252 WHIRLPOOL 53779e4952049f069824eefcaaaa0e46fc9a7036ed0f9b67008e523f618105d760300ffcd315f861de786c63de02b2753d3ed14637b39fd7af47aadd02355695
 AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
 AUX grub.default 1254 SHA256 181bdb7433ebcbde635e7058a1febaf0100e4e9c83ea4fd222d7010c375882d8 SHA512 1cdce5d9c606a2cba29ec859df96de9e8c292301ee3f26dff848816cda950088c0660dbd3401eec97b15841a2544116664eeda6cb0be753f6d160a7e62578dbc WHIRLPOOL 03514e95078f4f4d176e85ba3a739105a7cbf58a6c3e2ba4a2c660c48329dcc78b968391ecb2d9821084ba4ddddbe03e41d9d6c36685f1db1d4a1f00a1e5d393
 AUX grub.default-2 1470 SHA256 fcef668c1316a38f6a1c784c489c2052b23b8e2b79dc1a940b5bda831947af74 SHA512 5c331323ef17683fdfc59b0057a6e89a451039febc4ff6242c17cd3aeda0ef60930a79dc52e180bf534f94867a8b4545655808ae5a7362643542fea42b6a0d91 WHIRLPOOL 5f8a1192763ee9089e48a7eff13ef75947e7f4db20ff873ae86fd99920b107de827588558bdc26d2bf5ee3da4f51a44d53470aa65bf73ab565cf23e84097de5c
@@ -53,15 +54,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 8189 SHA256 66cb330da25f1b80a63a98e25aa4cedbae007fe22cf6bb48009ff6d0e5428aaa SHA512 6abd486e86a6eabfc1812dbbfb822f06a6d2fba06eae1e50364a07528f2e0a4455951f495e629d691bb8929dfa49f9ea509a523ad46c8a403e8ae55d877b315f WHIRLPOOL 76d3928f5b6454aee942e68da66ddb7dce1743ad5fe4eacfece7a90370d31e4e6e433188d3b94717a3d83cacbd52c62e4b031da427bfe1385d82d90140de4f63
+EBUILD grub-2.00-r1.ebuild 8246 SHA256 29094c7219706d17e40d51ed809669e6b0d0ab20e980461058e506cd526d671d SHA512 0deadb8c459998dc20bb702281a7562f49364cf410399d068b27ee94182e7ea3d07f59dcdeb876f84791f20b93255c9d32c240441308493dcb88acbd8dac5e2a WHIRLPOOL dfc981f06e4692afca3b4526a74a8cad4ce1beaf82fb5105528053a40c877ef434e6d201c86e8375fe9e9725ed91ebf52c83bbc07fe4a9247243d0cc41bbf9c5
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 8189 SHA256 6a9a424c6ea656952475ffe8e02b3f1decc7afe8fa0ae2016e783ce4d7b181ae SHA512 f155ed6fa900517aae8a4f211e95cf1c6b902ac132f1e5394c76439307bc4201b53a5a8bca01e1a3e7660058536130726cd40cb0475fff60595de0fb321e4103 WHIRLPOOL fd3380bbe9ab5824820f718db276492e0d809ae3d5f2926c64ecfeeda3edb106e707693c9bcbdb67e81fd65202a45238b8ec5879b761d8c5aed751515724ebfe
-MISC ChangeLog 46441 SHA256 1423ed26d57c6ae9b24a7c48c62dd057cf139543d2566be0e61697eb729a4984 SHA512 9ac404acb5ad66e2f88351b0399c47fef1f4489852ddf70d43eeb2caf573036153f846a302977aab827008a5022807712e28c6f708bb27357ab9d29c6abe1758 WHIRLPOOL 40812e3910a0d3eafb8bb8a4a8309ad611f5224480d9056a00870b0cca4f8992dee12c32d155966cc2fb7b741a4b95b6995a04fc76c59082a6ecb7ebcfc0f2fa
+EBUILD grub-9999.ebuild 8244 SHA256 278c5248274ed0aa52652b30b60506cfbc8c6a478304ad1eaedac9314dc9d470 SHA512 7b4f817e4e4954f1d78e1d3fdacd2e5c760948bf5643f48ac8088e98ebdad621f77d4b28c018437010c4fae3c7b7584c449d4de97650e5693ffb9a833aef219d WHIRLPOOL 7cb3a817a6d5cae8efb5ec7aed2d96606fce94c38d5592fdd191cfeacf5e0ee1329cf3361037adf4e1e1a951ca58163965b11cfb66bbe38191d3e63eefb73a04
+MISC ChangeLog 46693 SHA256 a457e7628615cce2cbc2fe6c5e93a1dd3d8bb1ff962268dbb3ccb614dfb104b3 SHA512 e96155d1a88ddb534c79fc030ec8382cae8eb20cc99210d2fed04f9370c09ab59a457b364e0dc2ccbf2f66ac4048d3caebaf9966d740e9d9695e7823b2371eb7 WHIRLPOOL 0a69cbb259e73597dc9277890ae8708de82cf4f9c43513a4ab63b5d106fce691a0543b3342f5c14bd83b06e56de3b12bc1ce3a84682ec9f822b688306a93ee4a
 MISC metadata.xml 683 SHA256 f2c66324ee4e6c4afd16d412888a9dc73227058546f5cb7dab89a3b110f5a2ab SHA512 fa9e843cf2ec3b240720a2b3167d05067810f0380ab5e7ebde7a96235562d926f1f25b7e8c4c150e98801d05051ab961d216efc9bc9a59a0b425245f78d96119 WHIRLPOOL fba7d83b868b2fa9821882b0948d67fead33e7b76c7384763a971f390bfb5c4c325b3de039df55a5ff09f4c58d30a67daf0fa7653b1ab5a1546ee4295d9c8f00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB2K3QACgkQC77qH+pIQ6QUNQD/T2s7U7KFhkApehLy5gIsckbP
-Pux/TjPz/yZbGhapD8kBAIKpAW6AmZF/C/GSHOo42DPtYOofmhscNZ5XZeqHfS9S
-=ZBn3
+iF4EAREIAAYFAlB9xqwACgkQC77qH+pIQ6T9gQD/Rhr8E/+CRyMt9DtrbLcarWRE
+IG2wKu2qgZyQJSU5NMsA/RlNPNYTKG8r2hMZx42dFTPWx/9SQgOiEUr9/ST4xIiR
+=BSAu
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-tftp-endian.patch b/sys-boot/grub/files/grub-2.00-tftp-endian.patch
new file mode 100644
index 000000000000..f4e56445dd59
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-tftp-endian.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=438612
+
+=== modified file 'grub-core/net/tftp.c'
+--- grub-core/net/tftp.c	2012-06-22 20:04:16 +0000
++++ grub-core/net/tftp.c	2012-07-02 09:22:50 +0000
+@@ -143,7 +143,7 @@
+ 
+   tftph_ack = (struct tftphdr *) nb_ack.data;
+   tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
+-  tftph_ack->u.ack.block = block;
++  tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
+ 
+   err = grub_net_send_udp_packet (data->sock, &nb_ack);
+   if (err)
+@@ -225,7 +225,7 @@
+ 	    grub_priority_queue_pop (data->pq);
+ 
+ 	    if (file->device->net->packs.count < 50)
+-	      err = ack (data, tftph->u.data.block);
++	      err = ack (data, data->block + 1);
+ 	    else
+ 	      {
+ 		file->device->net->stall = 1;
+
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00-r1.ebuild
index c30a0dd26021..6334155dfed8 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00-r1.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.17 2012/10/11 02:14:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r1.ebuild,v 1.1 2012/10/16 20:42:15 floppym Exp $
 
 EAPI=4
 
@@ -221,6 +221,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
 		epatch "${FILESDIR}/${P}-no-gets.patch" #424703
 		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
+		epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
 	fi
 
 	# fix texinfo file name, bug 416035
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6f08a45a86e0..75aa2cd6df6f 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.82 2012/10/11 02:14:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.83 2012/10/16 20:42:15 floppym Exp $
 
 EAPI=4
 
@@ -221,6 +221,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
 		epatch "${FILESDIR}/${P}-no-gets.patch" #424703
 		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
+		epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
 	fi
 
 	# fix texinfo file name, bug 416035