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)

2 files changed, 31 insertions, 0 deletions

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)