Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2013-03-12 15:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-03-08 09:12:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-03-12 15:02:27.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 11 06:52:58 UTC 2013 - [email protected] + +- add grub2-fix-tftp-endianness.patch from upstream (bnc#808582) +- add efinet and tftp to grub.efi (bnc#808582) + +------------------------------------------------------------------- +Thu Mar 7 15:39:50 UTC 2013 - [email protected] + +- convert spec file to UTF-8 + +------------------------------------------------------------------- New: ---- grub2-fix-tftp-endianness.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.nJ4QoZ/_old 2013-03-12 15:02:33.000000000 +0100 +++ /var/tmp/diff_new_pack.nJ4QoZ/_new 2013-03-12 15:02:33.000000000 +0100 @@ -134,6 +134,7 @@ Patch30: grub2-cdpath.patch Patch31: efidisk-ahci-workaround Patch32: grub2-grub-mount-return-failure-if-FUSE-failed.patch +Patch33: grub2-fix-tftp-endianness.patch PreReq: perl-Bootloader Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -167,7 +168,7 @@ Yoshinori K. Okuji Colin Watson Colin D. Bennett - Vesa J��skel�inen + Vesa Jääskeläinen Robert Millan Carles Pina @@ -205,7 +206,7 @@ Yoshinori K. Okuji Colin Watson Colin D. Bennett - Vesa J��skel�inen + Vesa Jääskeläinen Robert Millan Carles Pina %endif @@ -270,6 +271,7 @@ %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # README.openSUSE cp %{SOURCE3} . @@ -313,6 +315,7 @@ jpeg minicmd normal part_apple part_msdos part_gpt \ password_pbkdf2 png reboot search search_fs_uuid \ search_fs_file search_label sleep test video fat loadenv" +PXE_MODULES="efinet tftp" %ifarch x86_64 CD_MODULES="${CD_MODULES} linuxefi" @@ -320,7 +323,7 @@ CD_MODULES="${CD_MODULES} linux" %endif -GRUB_MODULES="${CD_MODULES} ${FS_MODULES} mdraid09 mdraid1x lvm" +GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} mdraid09 mdraid1x lvm" ./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \ -d grub-core ${GRUB_MODULES} #./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \ ++++++ grub2-fix-tftp-endianness.patch ++++++ From: Vladimir Serbinenko <[email protected]> Subject: grub-core/net/tftp.c: fix endianness problem. * grub-core/net/tftp.c (ack): Fix endianness problem. (tftp_receive): Likewise. Reported by: Michael Davidsave Signed-off-by: Michael Chang <[email protected]> --- grub-core/net/tftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c index 9c70efb..d0f39ea 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block) 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 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), 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; -- 1.7.3.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
