Hello community, here is the log from the commit of package trustedgrub for openSUSE:Factory checked in at Fri Nov 20 15:33:36 CET 2009. -------- --- trustedgrub/trustedgrub.changes 2009-07-29 14:19:24.000000000 +0200 +++ trustedgrub/trustedgrub.changes 2009-11-15 17:00:22.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 15 17:00:06 CET 2009 - meissner@suse.de + +- refreshed all patches to fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trustedgrub.spec ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v2 or later Group: System/Boot Version: 1.1.3 -Release: 9 +Release: 10 Source0: TrustedGRUB-%{version}.tgz Source2: grubonce Source3: grub-install ++++++ bad-assert-sideeffect ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.95/lib/device.c.orig 2004-05-23 18:34:29.000000000 +0200 -+++ grub-0.95/lib/device.c 2004-09-21 18:15:23.785137837 +0200 -@@ -828,9 +828,11 @@ int +Index: TrustedGRUB-1.1.3/lib/device.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/lib/device.c ++++ TrustedGRUB-1.1.3/lib/device.c +@@ -835,9 +835,11 @@ int is_disk_device (char **map, int drive) { struct stat st; ++++++ chainloader-devicefix ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/builtins.c.orig 2005-02-15 22:58:23.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2006-04-19 16:26:33.000000000 +0200 -@@ -455,6 +455,10 @@ chainloader_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -463,6 +463,10 @@ if (perform_sha1) *((unsigned long *) (BOOTSEC_LOCATION + BOOTSEC_BPB_HIDDEN_SECTORS)) = part_start; ++++++ ext2-support-256byte-inodes ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,5 +1,7 @@ ---- grub-0.97.orig/stage2/fsys_ext2fs.c 2008-04-14 11:57:47.000000000 +0200 -+++ grub-0.97/stage2/fsys_ext2fs.c 2008-04-15 12:40:14.000000000 +0200 +Index: TrustedGRUB-1.1.3/stage2/fsys_ext2fs.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/fsys_ext2fs.c ++++ TrustedGRUB-1.1.3/stage2/fsys_ext2fs.c @@ -79,7 +79,50 @@ struct ext2_super_block __u32 s_rev_level; /* Revision level */ __u16 s_def_resuid; /* Default uid for reserved blocks */ @@ -52,9 +54,9 @@ }; struct ext2_group_desc -@@ -218,6 +260,9 @@ struct ext2_dir_entry +@@ -218,6 +261,9 @@ struct ext2_dir_entry #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) - #define EXT2_ADDR_PER_BLOCK_BITS(s) (grub_log2(EXT2_ADDR_PER_BLOCK(s))) + #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) +#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) +#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) @@ -62,7 +64,7 @@ /* linux/ext2_fs.h */ #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) /* kind of from ext2/super.c */ -@@ -555,7 +600,7 @@ ext2fs_dir (char *dirname) +@@ -555,7 +601,7 @@ ext2fs_dir (char *dirname) gdp = GROUP_DESC; ino_blk = gdp[desc].bg_inode_table + (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) @@ -71,7 +73,7 @@ #ifdef E2DEBUG printf ("inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ -@@ -567,13 +612,13 @@ ext2fs_dir (char *dirname) +@@ -567,13 +613,13 @@ ext2fs_dir (char *dirname) /* reset indirect blocks! */ mapblock2 = mapblock1 = -1; ++++++ grub-1.1.3-devicemap.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,7 @@ -diff -Burbp grub-0.93.orig/grub/main.c grub-0.93/grub/main.c ---- grub-0.93.orig/grub/main.c 2003-06-10 18:29:37.000000000 +0200 -+++ grub-0.93/grub/main.c 2003-06-10 18:30:36.000000000 +0200 +Index: TrustedGRUB-1.1.3/grub/main.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/grub/main.c ++++ TrustedGRUB-1.1.3/grub/main.c @@ -44,7 +44,7 @@ int use_curses = 0; int verbose = 0; int read_only = 0; @@ -10,10 +11,11 @@ static int default_boot_drive; static int default_install_partition; static char *default_config_file; -diff -Burbp grub-0.93.orig/lib/device.c grub-0.93/lib/device.c ---- grub-0.93.orig/lib/device.c 2003-06-10 18:29:37.000000000 +0200 -+++ grub-0.93/lib/device.c 2003-06-10 18:30:36.000000000 +0200 -@@ -382,6 +382,7 @@ read_device_map (FILE *fp, char **map, c +Index: TrustedGRUB-1.1.3/lib/device.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/lib/device.c ++++ TrustedGRUB-1.1.3/lib/device.c +@@ -519,6 +519,7 @@ read_device_map (FILE *fp, char **map, c probing devices. */ char buf[1024]; /* XXX */ int line_number = 0; @@ -21,7 +23,7 @@ while (fgets (buf, sizeof (buf), fp)) { -@@ -408,14 +409,14 @@ read_device_map (FILE *fp, char **map, c +@@ -545,14 +546,14 @@ read_device_map (FILE *fp, char **map, c if (*ptr != '(') { show_error (line_number, "No open parenthesis found"); @@ -38,16 +40,16 @@ } if (*ptr == 'f') -@@ -426,7 +427,7 @@ read_device_map (FILE *fp, char **map, c - if (drive < 0 || drive > 8) +@@ -563,7 +564,7 @@ read_device_map (FILE *fp, char **map, c + if (drive < 0) { show_error (line_number, "Bad device number"); - return 0; + continue; } - - if (! is_floppy) -@@ -435,7 +436,7 @@ read_device_map (FILE *fp, char **map, c + else if (drive > 127) + { +@@ -579,7 +580,7 @@ read_device_map (FILE *fp, char **map, c if (*ptr != ')') { show_error (line_number, "No close parenthesis found"); @@ -56,7 +58,7 @@ } ptr++; -@@ -446,7 +447,7 @@ read_device_map (FILE *fp, char **map, c +@@ -590,7 +591,7 @@ read_device_map (FILE *fp, char **map, c if (! *ptr) { show_error (line_number, "No filename found"); @@ -65,7 +67,7 @@ } /* Terminate the filename. */ -@@ -464,9 +465,11 @@ read_device_map (FILE *fp, char **map, c +@@ -608,9 +609,11 @@ read_device_map (FILE *fp, char **map, c map[drive] = strdup (ptr); assert (map[drive]); @@ -78,7 +80,7 @@ } /* Initialize the device map MAP. *MAP will be allocated from the heap -@@ -671,7 +674,7 @@ write_to_partition (char **map, int driv +@@ -849,7 +852,7 @@ write_to_partition (char **map, int driv int sector, int size, const char *buf) { char dev[PATH_MAX]; /* XXX */ @@ -87,7 +89,7 @@ if ((partition & 0x00FF00) != 0x00FF00) { -@@ -689,7 +692,16 @@ write_to_partition (char **map, int driv +@@ -867,7 +870,16 @@ write_to_partition (char **map, int driv if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) strcpy (dev + strlen(dev) - 5, "/part"); } @@ -105,9 +107,11 @@ /* Open the partition. */ fd = open (dev, O_RDWR); ---- grub-0.94/util/grub-md5-crypt.in.orig 2003-07-09 04:45:51.000000000 -0700 -+++ grub-0.94/util/grub-md5-crypt.in 2004-05-11 09:26:31.943224317 -0700 -@@ -88,7 +88,7 @@ +Index: TrustedGRUB-1.1.3/util/grub-md5-crypt.in +=================================================================== +--- TrustedGRUB-1.1.3.orig/util/grub-md5-crypt.in ++++ TrustedGRUB-1.1.3/util/grub-md5-crypt.in +@@ -88,7 +88,7 @@ if test "x$password" != "x$password2"; t fi # Run the grub shell. ++++++ grub-1.1.3-initrdaddr.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.96/stage2/boot.c -+++ grub-0.96/stage2/boot.c -@@ -824,8 +824,11 @@ +Index: TrustedGRUB-1.1.3/stage2/boot.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/boot.c ++++ TrustedGRUB-1.1.3/stage2/boot.c +@@ -1275,8 +1275,11 @@ load_initrd (char *initrd) moveto = (mbi.mem_upper + 0x400) << 10; moveto = (moveto - len) & 0xfffff000; ++++++ grub-R ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.96/stage2/builtins.c.orig 2004-06-20 15:33:04.000000000 +0200 -+++ grub-0.96/stage2/builtins.c 2005-09-02 14:38:53.000000000 +0200 -@@ -762,11 +762,11 @@ +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -787,11 +787,11 @@ static int default_func (char *arg, int flags) { #ifndef SUPPORT_DISKLESS @@ -15,7 +17,7 @@ #endif /* SUPPORT_DISKLESS */ if (! safe_parse_maxint (&arg, &default_entry)) -@@ -787,6 +787,22 @@ +@@ -812,6 +812,22 @@ static struct builtin builtin_default = #endif }; @@ -38,9 +40,11 @@  #ifdef GRUB_UTIL /* device */ ---- grub-0.96/stage2/stage2.c~ 2004-07-24 20:53:47.000000000 +0200 -+++ grub-0.96/stage2/stage2.c 2005-09-02 14:45:04.000000000 +0200 -@@ -827,6 +827,7 @@ +Index: TrustedGRUB-1.1.3/stage2/stage2.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/stage2.c ++++ TrustedGRUB-1.1.3/stage2/stage2.c +@@ -1217,6 +1217,7 @@ get_line_from_config (char *cmdline, int return pos; } @@ -48,7 +52,7 @@ /* This is the starting function in C. */ void -@@ -1048,7 +1049,9 @@ +@@ -1490,7 +1491,9 @@ cmain (void) } while (is_preset); } ++++++ grub-a20.patch ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/asm.S.orig 2007-08-24 13:03:39.000000000 +0200 -+++ grub-0.97/stage2/asm.S 2007-08-24 13:08:37.000000000 +0200 -@@ -1620,42 +1620,83 @@ ENTRY(set_vbe_mode) +Index: TrustedGRUB-1.1.3/stage2/asm.S +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/asm.S ++++ TrustedGRUB-1.1.3/stage2/asm.S +@@ -1805,42 +1805,83 @@ nopm: DATA32 call EXT_C(real_to_prot) * * Gate address-line 20 for high memory. * @@ -105,7 +107,7 @@ pushl %eax call gloop1 -@@ -1669,11 +1710,7 @@ gloopint1: +@@ -1854,11 +1895,7 @@ gloopint1: jnz gloopint1 movb $KB_OUTPUT_MASK, %al ++++++ grub-grubonce-no-wait ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -2,9 +2,11 @@ stage2/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/stage2/builtins.c -+++ b/stage2/builtins.c -@@ -4259,7 +4259,7 @@ terminal_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -4369,7 +4369,7 @@ terminal_func (char *arg, int flags) /* If multiple terminals are specified, wait until the user pushes any key on one of the terminals. */ ++++++ grub-long-commandline ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -12,9 +12,11 @@ stage2/shared.h | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) ---- a/stage2/boot.c -+++ b/stage2/boot.c -@@ -241,7 +241,7 @@ load_image (char *kernel, char *arg, ker +Index: TrustedGRUB-1.1.3/stage2/boot.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/boot.c ++++ TrustedGRUB-1.1.3/stage2/boot.c +@@ -512,7 +512,7 @@ load_image (char *kernel, char *arg, ker } if (lh->version >= 0x0202) @@ -23,7 +25,7 @@ else { lh->cl_magic = LINUX_CL_MAGIC; -@@ -407,6 +407,15 @@ load_image (char *kernel, char *arg, ker +@@ -682,6 +682,15 @@ load_image (char *kernel, char *arg, ker while (dest < linux_data_tmp_addr + LINUX_CL_END_OFFSET && *src) *(dest++) = *(src++); @@ -39,9 +41,11 @@ /* Old Linux kernels have problems determining the amount of the available memory. To work around this problem, we add the "mem" option to the kernel command line. This has its ---- a/stage2/shared.h -+++ b/stage2/shared.h -@@ -161,7 +161,9 @@ extern char *grub_scratch_mem; +Index: TrustedGRUB-1.1.3/stage2/shared.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/shared.h ++++ TrustedGRUB-1.1.3/stage2/shared.h +@@ -176,7 +176,9 @@ extern char *grub_scratch_mem; #define LINUX_CL_OFFSET 0x9000 #define LINUX_CL_END_OFFSET 0x90FF ++++++ grub-read-gpt ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,7 +1,8 @@ -diff -Nurp grub-0.97.old/stage2/builtins.c grub-0.97/stage2/builtins.c ---- grub-0.97.old/stage2/builtins.c 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2008-11-05 17:40:36.000000000 +0100 -@@ -1255,14 +1255,15 @@ find_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -1274,14 +1274,15 @@ find_func (char *arg, int flags) for (drive = 0x80; drive < 0x88; drive++) { unsigned long part = 0xFFFFFF; @@ -20,7 +21,7 @@ { if (type != PC_SLICE_TYPE_NONE && ! IS_PC_SLICE_TYPE_BSD (type) -@@ -2877,8 +2878,8 @@ parttype_func (char *arg, int flags) +@@ -2969,8 +2970,8 @@ parttype_func (char *arg, int flags) { int new_type; unsigned long part = 0xFFFFFF; @@ -31,7 +32,7 @@ char mbr[512]; /* Get the drive and the partition. */ -@@ -2915,8 +2916,15 @@ parttype_func (char *arg, int flags) +@@ -3007,8 +3008,15 @@ parttype_func (char *arg, int flags) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, @@ -48,18 +49,19 @@ if (part == current_partition) { /* Found. */ -diff -Nurp grub-0.97.old/stage2/disk_io.c grub-0.97/stage2/disk_io.c ---- grub-0.97.old/stage2/disk_io.c 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/disk_io.c 2008-11-05 17:40:36.000000000 +0100 -@@ -21,6 +21,7 @@ +Index: TrustedGRUB-1.1.3/stage2/disk_io.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/disk_io.c ++++ TrustedGRUB-1.1.3/stage2/disk_io.c +@@ -20,6 +20,7 @@ #include <shared.h> #include <filesys.h> +#include <gpt.h> #ifdef SUPPORT_NETBOOT # define GRUB 1 - -@@ -502,8 +503,8 @@ int + # include <etherboot.h> +@@ -520,8 +521,8 @@ int set_partition_hidden_flag (int hidden) { unsigned long part = 0xFFFFFF; @@ -70,7 +72,7 @@ char mbr[512]; /* The drive must be a hard disk. */ -@@ -524,8 +525,15 @@ set_partition_hidden_flag (int hidden) +@@ -542,8 +543,15 @@ set_partition_hidden_flag (int hidden) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, @@ -87,7 +89,7 @@ if (part == current_partition) { /* Found. */ -@@ -577,11 +585,14 @@ next_partition (unsigned long drive, uns +@@ -598,11 +606,14 @@ next_partition (unsigned long drive, uns unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, @@ -103,7 +105,7 @@ /* Get next BSD partition in current PC slice. */ int next_bsd_partition (void) -@@ -666,6 +677,40 @@ next_partition (unsigned long drive, uns +@@ -687,6 +698,40 @@ next_partition (unsigned long drive, uns return 0; } @@ -144,7 +146,7 @@ /* Increase the entry number. */ (*entry)++; -@@ -710,6 +755,43 @@ next_partition (unsigned long drive, uns +@@ -731,6 +776,43 @@ next_partition (unsigned long drive, uns return 1; } @@ -188,7 +190,7 @@ /* Start the body of this function. */ #ifndef STAGE1_5 -@@ -717,6 +799,9 @@ next_partition (unsigned long drive, uns +@@ -738,6 +820,9 @@ next_partition (unsigned long drive, uns return 0; #endif @@ -198,7 +200,7 @@ /* If previous partition is a BSD partition or a PC slice which contains BSD partitions... */ if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff)) -@@ -755,6 +840,9 @@ real_open_partition (int flags) +@@ -776,6 +861,9 @@ real_open_partition (int flags) unsigned long dest_partition = current_partition; unsigned long part_offset; unsigned long ext_offset; @@ -208,7 +210,7 @@ int entry; char buf[SECTOR_SIZE]; int bsd_part, pc_slice; -@@ -766,7 +854,8 @@ real_open_partition (int flags) +@@ -787,7 +875,8 @@ real_open_partition (int flags) int ret = next_partition (current_drive, dest_partition, ¤t_partition, ¤t_slice, &part_start, &part_length, @@ -218,9 +220,10 @@ bsd_part = (current_partition >> 8) & 0xFF; pc_slice = current_partition >> 16; return ret; -diff -Nurp grub-0.97.old/stage2/gpt.h grub-0.97/stage2/gpt.h ---- grub-0.97.old/stage2/gpt.h 1970-01-01 01:00:00.000000000 +0100 -+++ grub-0.97/stage2/gpt.h 2008-11-05 17:40:36.000000000 +0100 +Index: TrustedGRUB-1.1.3/stage2/gpt.h +=================================================================== +--- /dev/null ++++ TrustedGRUB-1.1.3/stage2/gpt.h @@ -0,0 +1,68 @@ +/* + * GRUB -- GRand Unified Bootloader @@ -290,9 +293,10 @@ + ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1) + +#endif /* _GPT_H */ -diff -Nurp grub-0.97.old/stage2/pc_slice.h grub-0.97/stage2/pc_slice.h ---- grub-0.97.old/stage2/pc_slice.h 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/pc_slice.h 2008-11-05 17:40:36.000000000 +0100 +Index: TrustedGRUB-1.1.3/stage2/pc_slice.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/pc_slice.h ++++ TrustedGRUB-1.1.3/stage2/pc_slice.h @@ -117,6 +117,7 @@ #define PC_SLICE_TYPE_ZEN 0xbc #define PC_SLICE_TYPE_ZEN_DISABLED 0xbd @@ -301,10 +305,11 @@ #define PC_SLICE_TYPE_LINUX_RAID 0xfd -diff -Nurp grub-0.97.old/stage2/shared.h grub-0.97/stage2/shared.h ---- grub-0.97.old/stage2/shared.h 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/shared.h 2008-11-05 17:40:36.000000000 +0100 -@@ -984,7 +984,9 @@ int next_partition (unsigned long drive, +Index: TrustedGRUB-1.1.3/stage2/shared.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/shared.h ++++ TrustedGRUB-1.1.3/stage2/shared.h +@@ -1034,7 +1034,9 @@ int next_partition (unsigned long drive, unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, ++++++ reiser-unpack ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.95/stage2/filesys.h.orig 2004-05-14 21:36:43.000000000 +0200 -+++ grub-0.95/stage2/filesys.h 2004-09-30 17:16:20.741176364 +0200 -@@ -73,6 +73,16 @@ +Index: TrustedGRUB-1.1.3/stage2/filesys.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/filesys.h ++++ TrustedGRUB-1.1.3/stage2/filesys.h +@@ -82,6 +82,16 @@ int reiserfs_mount (void); int reiserfs_read (char *buf, int len); int reiserfs_dir (char *dirname); int reiserfs_embed (int *start_sector, int needed_sectors); @@ -17,9 +19,11 @@ #else #define FSYS_REISERFS_NUM 0 #endif ---- grub-0.95/stage2/builtins.c.orig 2004-05-14 21:30:52.000000000 +0200 -+++ grub-0.95/stage2/builtins.c 2004-09-30 17:18:52.342818812 +0200 -@@ -1807,9 +1807,23 @@ +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -1879,9 +1879,23 @@ install_func (char *arg, int flags) #ifdef GRUB_UTIL else if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0) { ++++++ remove-buildid.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,4 +1,6 @@ ---- stage1/Makefile.am +Index: stage1/Makefile.am +=================================================================== +--- stage1/Makefile.am.orig +++ stage1/Makefile.am @@ -12,4 +12,4 @@ stage1_exec_SOURCES = stage1.S stage1.h @@ -6,9 +8,11 @@ .exec: - $(OBJCOPY) -O binary $< $@ + $(OBJCOPY) -R .note.gnu.build-id -O binary $< $@ ---- stage2/Makefile.am +Index: stage2/Makefile.am +=================================================================== +--- stage2/Makefile.am.orig +++ stage2/Makefile.am -@@ -269,4 +269,4 @@ pxegrub: pxeloader diskless +@@ -283,4 +283,4 @@ pxegrub: pxeloader diskless # General rule for making a raw binary. SUFFIXES = .exec .exec: ++++++ string-ops-fix ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/builtins.c.orig 2008-11-20 17:46:28.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2008-11-20 17:48:58.000000000 +0100 -@@ -3862,7 +3862,8 @@ setup_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -3971,7 +3971,8 @@ setup_func (char *arg, int flags) char config_filename[64]; char real_config_filename[64]; char cmd_arg[256]; @@ -10,7 +12,7 @@ char *buffer = (char *) RAW_ADDR (0x100000); int is_force_lba = 0; char *stage2_arg = 0; -@@ -3900,15 +3901,15 @@ setup_func (char *arg, int flags) +@@ -4009,15 +4010,15 @@ setup_func (char *arg, int flags) { char tmp[16]; grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF); @@ -29,7 +31,7 @@ } int embed_stage1_5 (char *stage1_5, int drive, int partition) -@@ -4125,6 +4126,7 @@ setup_func (char *arg, int flags) +@@ -4228,6 +4229,7 @@ setup_func (char *arg, int flags) config_filename, real_config_filename); #endif /* NOT USED */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org