From eab5d1bf6871ce7f800da599907800ed291828cb Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 13 Dec 2004 16:24:45 +0000 Subject: [PATCH] Stefan Fiedler: update grub (0.95) Index: package/x86/grub/gcc34.patch =================================================================== [2004120701011505107] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5114 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x86/grub/gcc34.patch | 36 ------------------------------------ package/x86/grub/grub.desc | 4 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/x86/grub/gcc34.patch diff --git a/package/x86/grub/gcc34.patch b/package/x86/grub/gcc34.patch deleted file mode 100644 index f8bb644e2..000000000 --- a/package/x86/grub/gcc34.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x86/grub/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -=================================================================== -RCS file: /cvsroot/grub/cvsroot/grub/grub/stage2/char_io.c,v -retrieving revision 1.51 -retrieving revision 1.52 -diff -u -r1.51 -r1.52 ---- grub/stage2/char_io.c 2002/12/09 06:27:05 1.51 -+++ grub/stage2/char_io.c 2004/03/27 17:02:54 1.52 -@@ -1265,3 +1265,9 @@ - return dest; - } - #endif /* ! STAGE1_5 */ -+ -+#ifndef GRUB_UTIL -+# undef memcpy -+/* GCC emits references to memcpy() for struct copies etc. */ -+void *memcpy (void *dest, const void *src, int n) __attribute__ ((alias ("grub_memmove"))); -+#endif diff --git a/package/x86/grub/grub.desc b/package/x86/grub/grub.desc index fa20d588d..7334a5cf3 100644 --- a/package/x86/grub/grub.desc +++ b/package/x86/grub/grub.desc @@ -46,8 +46,8 @@ [L] GPL [S] Stable -[V] 0.94 +[V] 0.95 [P] X -?---5---9 202.200 -[D] 2577767961 grub-0.94.tar.gz ftp://alpha.gnu.org/gnu/grub/ +[D] 573949549 grub-0.95.tar.gz ftp://alpha.gnu.org/gnu/grub/