[pkgsrc/trunk]: pkgsrc/sysutils/grub Solve the problem with the missing memcp...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55a5710b2638
branches:  trunk
changeset: 466934:55a5710b2638
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sat Jan 24 16:36:03 2004 +0000

description:
Solve the problem with the missing memcpy differently
(Forward patch from the fix that finally went into grub's CVS)
The old way had problems finding disks and formatting curses output properly.
Fixes PR pkg/24214.

diffstat:

 sysutils/grub/Makefile         |   4 ++--
 sysutils/grub/distinfo         |   6 ++++--
 sysutils/grub/patches/patch-al |  18 ------------------
 sysutils/grub/patches/patch-am |  19 +++++++++++++++++++
 sysutils/grub/patches/patch-an |  26 ++++++++++++++++++++++++++
 sysutils/grub/patches/patch-ao |  15 +++++++++++++++
 6 files changed, 66 insertions(+), 22 deletions(-)

diffs (125 lines):

diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/Makefile
--- a/sysutils/grub/Makefile    Sat Jan 24 16:34:19 2004 +0000
+++ b/sysutils/grub/Makefile    Sat Jan 24 16:36:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 16:36:03 mrauch Exp $
 #
 
 DISTNAME=      grub-0.93
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://alpha.gnu.org/gnu/grub/
 
diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/distinfo
--- a/sysutils/grub/distinfo    Sat Jan 24 16:34:19 2004 +0000
+++ b/sysutils/grub/distinfo    Sat Jan 24 16:36:03 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/10/26 12:28:50 mrauch Exp $
+$NetBSD: distinfo,v 1.7 2004/01/24 16:36:03 mrauch Exp $
 
 SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8
 Size (grub-0.93.tar.gz) = 891032 bytes
@@ -13,4 +13,6 @@
 SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
 SHA1 (patch-ak) = 24d59bdc00b35dee736196fcb937a4142c3392ca
-SHA1 (patch-al) = 1ec528662029be190c963e0425effb5bb54f1dcf
+SHA1 (patch-am) = b1fd1977b97dd7aa8056eeaa5beecb624b3374d0
+SHA1 (patch-an) = 64150a001f39d32f0c867b9818fcef4a8cd649b2
+SHA1 (patch-ao) = 59532f4f268286cedf8344df1ce34f57305fd994
diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/patches/patch-al
--- a/sysutils/grub/patches/patch-al    Sat Jan 24 16:34:19 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$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)
diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/grub/patches/patch-am    Sat Jan 24 16:36:03 2004 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-am,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/builtins.c.orig     2002-12-04 05:41:57.000000000 +0100
++++ stage2/builtins.c
+@@ -4202,12 +4202,12 @@ terminfo_func (char *arg, int flags)
+         return errnum;
+       }
+ 
+-      ti_set_term (term);
++      ti_set_term (&term);
+     }
+   else
+     {
+       /* No option specifies printing out current settings.  */
+-      term = ti_get_term ();
++      ti_get_term (&term);
+ 
+       grub_printf ("name=%s\n", term.name);
+       grub_printf ("cursor_address=%s\n", term.cursor_address);
diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/grub/patches/patch-an    Sat Jan 24 16:36:03 2004 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-an,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/terminfo.c.orig     2002-11-29 20:07:38.000000000 +0100
++++ stage2/terminfo.c
+@@ -245,15 +245,15 @@ ti_exit_standout_mode (void)
+ 
+ /* set the current terminal emulation to use */
+ void 
+-ti_set_term (struct terminfo new)
++ti_set_term (const struct terminfo *new)
+ {
+-  term = new;
++  grub_memmove (&term, new, sizeof (struct terminfo));
+ }
+ 
+-/* return the current terminal emulation */
+-struct terminfo
+-ti_get_term(void)
++/* get the current terminal emulation */
++void
++ti_get_term(struct terminfo *copy)
+ {
+-  return term;
++  grub_memmove (copy, &term, sizeof (struct terminfo));
+ }
+ 
diff -r 16a59bd4d92c -r 55a5710b2638 sysutils/grub/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/grub/patches/patch-ao    Sat Jan 24 16:36:03 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/terminfo.h.orig     2002-11-29 20:07:14.000000000 +0100
++++ stage2/terminfo.h
+@@ -40,8 +40,8 @@ char *ti_escape_string (const char *in);
+ char *ti_unescape_memory (const char *in, const char *end);
+ char *ti_unescape_string (const char *in);
+ 
+-void ti_set_term (struct terminfo term);
+-struct terminfo ti_get_term (void);
++void ti_set_term (const struct terminfo *new);
++void ti_get_term (struct terminfo *copy);
+ 
+ void ti_cursor_address (int x, int y);
+ void ti_clear_screen (void);