From 8d19c163a68d3f6fed1b1df42b4628251df53b3e Mon Sep 17 00:00:00 2001
From: mrauch <mrauch@pkgsrc.org>
Date: Sun, 26 Oct 2003 12:28:50 +0000
Subject: Fix compilation on -current (gcc3): 1) remove superfluous long in
 stage2/fsys_reiserfs.c (forward port from    current version in grub CVS) 2)
 provide an explicit memcpy stub so the memcpy inserted by gcc3 as   
 consequence of a pass-by-value can be linked against (patch from    Joachim
 Kainz in grub bug report 3343)

---
 sysutils/grub/distinfo         |  4 +++-
 sysutils/grub/patches/patch-ak | 13 +++++++++++++
 sysutils/grub/patches/patch-al | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/grub/patches/patch-ak
 create mode 100644 sysutils/grub/patches/patch-al

(limited to 'sysutils/grub')

diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index a366e9701dc..c4f342e35f7 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/07/13 17:35:04 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/10/26 12:28:50 mrauch Exp $
 
 SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8
 Size (grub-0.93.tar.gz) = 891032 bytes
@@ -12,3 +12,5 @@ SHA1 (patch-ag) = ecbbcf164039cbc047b247036fa183bb8ae08a6f
 SHA1 (patch-ah) = cecaf3e1510a3fdba2d3412b59c434d5d247b11b
 SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
+SHA1 (patch-ak) = 24d59bdc00b35dee736196fcb937a4142c3392ca
+SHA1 (patch-al) = 1ec528662029be190c963e0425effb5bb54f1dcf
diff --git a/sysutils/grub/patches/patch-ak b/sysutils/grub/patches/patch-ak
new file mode 100644
index 00000000000..d664625008f
--- /dev/null
+++ b/sysutils/grub/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2003/10/26 12:28:50 mrauch Exp $
+
+--- stage2/fsys_reiserfs.c.orig	2002-11-29 18:46:01.000000000 +0100
++++ stage2/fsys_reiserfs.c
+@@ -112,7 +112,7 @@ struct reiserfs_journal_header {
+   /* offset in the log of where to start replay after a crash */
+   __u32 j_first_unflushed_offset;
+   /* mount id to detect very old transactions */
+-  __u32 long j_mount_id;
++  __u32 j_mount_id;
+ };
+ 
+ /* magic string to find desc blocks in the journal */
diff --git a/sysutils/grub/patches/patch-al b/sysutils/grub/patches/patch-al
new file mode 100644
index 00000000000..fdba7e4824d
--- /dev/null
+++ b/sysutils/grub/patches/patch-al
@@ -0,0 +1,18 @@
+$NetBSD: patch-al,v 1.1 2003/10/26 12:28:50 mrauch Exp $
+
+--- stage2/char_io.c.orig	2002-12-03 00:49:07.000000000 +0100
++++ stage2/char_io.c
+@@ -1257,6 +1257,13 @@ grub_memset (void *start, int c, int len
+   return errnum ? NULL : start;
+ }
+ 
++#undef memcpy
++void *
++memcpy (void *to, const void *from, int len)
++{
++return grub_memmove (to, from, len);
++} 
++
+ #ifndef STAGE1_5
+ char *
+ grub_strcpy (char *dest, const char *src)
-- 
cgit v1.2.3