From 084c175e59e9ea61c68154ad9982adcd918cbfcf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 14 Oct 2010 00:21:10 +0200 Subject: make MacOS X works as build system for most of the packages, update some packages to latest stable upstream version --- package/grub/patches/patch-kern_misc_c.orig | 26 ---------------------- ...patch-lib_libgcrypt-grub_cipher_camellia_c.orig | 21 ----------------- 2 files changed, 47 deletions(-) delete mode 100644 package/grub/patches/patch-kern_misc_c.orig delete mode 100644 package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c.orig (limited to 'package/grub') diff --git a/package/grub/patches/patch-kern_misc_c.orig b/package/grub/patches/patch-kern_misc_c.orig deleted file mode 100644 index 52a7ed8ee..000000000 --- a/package/grub/patches/patch-kern_misc_c.orig +++ /dev/null @@ -1,26 +0,0 @@ ---- grub-1.98.orig/kern/misc.c 2010-03-06 21:51:37.000000000 +0100 -+++ grub-1.98/kern/misc.c 2010-06-26 19:44:00.999168677 +0200 -@@ -64,23 +64,6 @@ grub_memmove (void *dest, const void *sr - return dest; - } - --#ifndef APPLE_CC --void *memmove (void *dest, const void *src, grub_size_t n) -- __attribute__ ((alias ("grub_memmove"))); --/* GCC emits references to memcpy() for struct copies etc. */ --void *memcpy (void *dest, const void *src, grub_size_t n) -- __attribute__ ((alias ("grub_memmove"))); --#else --void *memcpy (void *dest, const void *src, grub_size_t n) --{ -- return grub_memmove (dest, src, n); --} --void *memmove (void *dest, const void *src, grub_size_t n) --{ -- return grub_memmove (dest, src, n); --} --#endif -- - char * - grub_strcpy (char *dest, const char *src) - { diff --git a/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c.orig b/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c.orig deleted file mode 100644 index 6e14215b4..000000000 --- a/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c.orig +++ /dev/null @@ -1,21 +0,0 @@ ---- grub-1.98.orig/lib/libgcrypt-grub/cipher/camellia.c 2010-03-06 21:52:26.000000000 +0100 -+++ grub-1.98/lib/libgcrypt-grub/cipher/camellia.c 2010-06-26 20:41:39.651169327 +0200 -@@ -946,13 +946,13 @@ void camellia_setup192(const unsigned ch - unsigned char kk[32]; - u32 krll, krlr, krrl,krrr; - -- memcpy(kk, key, 24); -- memcpy((unsigned char *)&krll, key+16,4); -- memcpy((unsigned char *)&krlr, key+20,4); -+ grub_memcpy(kk, key, 24); -+ grub_memcpy((unsigned char *)&krll, key+16,4); -+ grub_memcpy((unsigned char *)&krlr, key+20,4); - krrl = ~krll; - krrr = ~krlr; -- memcpy(kk+24, (unsigned char *)&krrl, 4); -- memcpy(kk+28, (unsigned char *)&krrr, 4); -+ grub_memcpy(kk+24, (unsigned char *)&krrl, 4); -+ grub_memcpy(kk+28, (unsigned char *)&krrr, 4); - camellia_setup256(kk, subkey); - return; - } -- cgit v1.2.3