Hello community,
here is the log from the commit of package grub for openSUSE:Factory
checked in at Mon Nov 16 15:07:14 CET 2009.
--------
--- grub/grub.changes 2009-08-26 13:54:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/grub/grub.changes 2009-11-15 11:25:13.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Nov 15 11:24:53 CET 2009 - meissner@suse.de
+
+- refresh patches with fuzz=0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub.spec ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.000000000 +0100
@@ -28,7 +28,7 @@
License: GPL v2 or later
Group: System/Boot
Version: 0.97
-Release: 161
+Release: 162
Source0: %{name}-%{version}.tar.gz
Source1: installgrub
Source2: grubonce
++++++ bad-assert-sideeffect ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.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: grub-0.97/lib/device.c
+===================================================================
+--- grub-0.97.orig/lib/device.c
++++ grub-0.97/lib/device.c
+@@ -831,9 +831,11 @@ int
is_disk_device (char **map, int drive)
{
struct stat st;
++++++ force-LBA-off.diff ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ur grub-0.93~/docs/grub.texi grub-0.93/docs/grub.texi
---- grub-0.93~/docs/grub.texi 2003-02-06 12:30:12.000000000 +0100
-+++ grub-0.93/docs/grub.texi 2003-02-06 14:15:30.000000000 +0100
-@@ -2632,7 +2632,7 @@
+Index: grub-0.97/docs/grub.texi
+===================================================================
+--- grub-0.97.orig/docs/grub.texi
++++ grub-0.97/docs/grub.texi
+@@ -2919,7 +2919,7 @@ appropriate parameters in the Linux setu
@node install
@subsection install
@@ -10,7 +11,7 @@
This command is fairly complex, and you should not use this command
unless you are familiar with GRUB. Use @command{setup} (@pxref{setup})
instead.
-@@ -2679,6 +2679,13 @@
+@@ -2966,6 +2966,13 @@ HP Vectra XU 6/200 BIOS version GG.06.11
bitmap even if they do have the support. So GRUB provides a solution to
ignore the wrong bitmap, that is, the option @option{--force-lba}. Don't
use this option if you know that your BIOS doesn't have LBA support.
@@ -24,10 +25,11 @@
@strong{Caution3:} You must specify the option @option{--stage2} in the
grub shell, if you cannot unmount the filesystem where your stage2 file
-diff -ur grub-0.93~/stage1/stage1.S grub-0.93/stage1/stage1.S
---- grub-0.93~/stage1/stage1.S 2002-09-08 03:58:08.000000000 +0200
-+++ grub-0.93/stage1/stage1.S 2003-02-06 13:19:50.000000000 +0100
-@@ -163,7 +163,11 @@
+Index: grub-0.97/stage1/stage1.S
+===================================================================
+--- grub-0.97.orig/stage1/stage1.S
++++ grub-0.97/stage1/stage1.S
+@@ -177,7 +177,11 @@ real_start:
/* check if AH=0x42 is supported if FORCE_LBA is zero */
MOV_MEM_TO_AL(ABS(force_lba)) /* movb ABS(force_lba), %al */
testb %al, %al
@@ -39,10 +41,11 @@
andw $1, %cx
jz chs_mode
-diff -ur grub-0.93~/stage2/asm.S grub-0.93/stage2/asm.S
---- grub-0.93~/stage2/asm.S 2003-02-06 12:30:12.000000000 +0100
-+++ grub-0.93/stage2/asm.S 2003-02-06 13:35:32.000000000 +0100
-@@ -1083,7 +1083,11 @@
+Index: grub-0.97/stage2/asm.S
+===================================================================
+--- grub-0.97.orig/stage2/asm.S
++++ grub-0.97/stage2/asm.S
+@@ -1091,7 +1091,11 @@ ENTRY(check_int13_extensions)
/* check if AH=0x42 is supported if FORCE_LBA is zero */
movb EXT_C(force_lba), %al
testb %al, %al
@@ -54,10 +57,11 @@
andw $1, %cx
jnz 2f
-diff -ur grub-0.93~/stage2/builtins.c grub-0.93/stage2/builtins.c
---- grub-0.93~/stage2/builtins.c 2003-02-06 12:30:12.000000000 +0100
-+++ grub-0.93/stage2/builtins.c 2003-02-06 13:56:01.000000000 +0100
-@@ -1832,7 +1832,12 @@
+Index: grub-0.97/stage2/builtins.c
+===================================================================
+--- grub-0.97.orig/stage2/builtins.c
++++ grub-0.97/stage2/builtins.c
+@@ -1876,7 +1876,12 @@ install_func (char *arg, int flags)
/* First, check the GNU-style long option. */
while (1)
{
@@ -71,7 +75,7 @@
{
is_force_lba = 1;
arg = skip_to (0, arg);
-@@ -2253,7 +2258,7 @@
+@@ -2319,7 +2324,7 @@ static struct builtin builtin_install =
"install",
install_func,
BUILTIN_CMDLINE,
@@ -80,7 +84,7 @@
"Install STAGE1 on DEVICE, and install a blocklist for loading STAGE2"
" as a Stage 2. If the option `d' is present, the Stage 1 will always"
" look for the disk where STAGE2 was installed, rather than using"
-@@ -2266,8 +2271,9 @@
+@@ -2332,8 +2337,9 @@ static struct builtin builtin_install =
" 1.5 and REAL_CONFIG_FILE is present, then the Stage 2 CONFIG_FILE is"
" patched with the configuration filename REAL_CONFIG_FILE."
" If the option `--force-lba' is specified, disable some sanity checks"
@@ -92,7 +96,7 @@
};
-@@ -3898,7 +3904,12 @@
+@@ -3946,7 +3952,12 @@ setup_func (char *arg, int flags)
/* Check if the user specifies --force-lba. */
while (1)
{
@@ -106,7 +110,7 @@
{
is_force_lba = 1;
arg = skip_to (0, arg);
-@@ -4026,7 +4037,9 @@
+@@ -4077,7 +4088,9 @@ setup_func (char *arg, int flags)
#if 1
/* Don't embed a drive number unnecessarily. */
grub_sprintf (cmd_arg, "%s%s%s%s %s%s %s p %s %s",
@@ -117,7 +121,7 @@
stage2_arg? stage2_arg : "",
stage2_arg? " " : "",
stage1,
-@@ -4079,17 +4092,18 @@
+@@ -4130,17 +4143,18 @@ static struct builtin builtin_setup =
"setup",
setup_func,
BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
++++++ grub-0.97-devicemap.diff ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.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: grub-0.97/grub/main.c
+===================================================================
+--- grub-0.97.orig/grub/main.c
++++ grub-0.97/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: grub-0.97/lib/device.c
+===================================================================
+--- grub-0.97.orig/lib/device.c
++++ grub-0.97/lib/device.c
+@@ -515,6 +515,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
+@@ -541,14 +542,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)
+@@ -559,7 +560,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)
+ {
+@@ -575,7 +576,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
+@@ -586,7 +587,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
+@@ -604,9 +605,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
+@@ -845,7 +848,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
+@@ -863,7 +866,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: grub-0.97/util/grub-md5-crypt.in
+===================================================================
+--- grub-0.97.orig/util/grub-md5-crypt.in
++++ grub-0.97/util/grub-md5-crypt.in
+@@ -88,7 +88,7 @@ if test "x$password" != "x$password2"; t
fi
# Run the grub shell.
++++++ grub-0.97-path-patch ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.000000000 +0100
@@ -1,25 +1,28 @@
-diff -ur grub-0.93/Makefile.am grub-0.93.new/Makefile.am
---- grub-0.93/Makefile.am 2002-07-01 16:15:36.000000000 +0200
-+++ grub-0.93.new/Makefile.am 2003-02-04 13:03:36.000000000 +0100
+Index: grub-0.97/Makefile.am
+===================================================================
+--- grub-0.97.orig/Makefile.am
++++ grub-0.97/Makefile.am
@@ -2,3 +2,4 @@
- AUTOMAKE_OPTIONS = 1.5
+ AUTOMAKE_OPTIONS = 1.7 gnu
SUBDIRS = netboot stage2 stage1 lib grub util docs
EXTRA_DIST = BUGS MAINTENANCE
+pkgdatadir=$(datadir)
-diff -ur grub-0.93/stage1/Makefile.am grub-0.93.new/stage1/Makefile.am
---- grub-0.93/stage1/Makefile.am 2002-09-08 03:58:08.000000000 +0200
-+++ grub-0.93.new/stage1/Makefile.am 2003-02-04 13:03:36.000000000 +0100
+Index: grub-0.97/stage1/Makefile.am
+===================================================================
+--- grub-0.97.orig/stage1/Makefile.am
++++ grub-0.97/stage1/Makefile.am
@@ -1,4 +1,4 @@
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = /usr/lib/grub
nodist_pkglib_DATA = stage1
CLEANFILES = $(nodist_pkglib_DATA)
-diff -ur grub-0.93/stage2/Makefile.am grub-0.93.new/stage2/Makefile.am
---- grub-0.93/stage2/Makefile.am 2002-11-29 19:00:53.000000000 +0100
-+++ grub-0.93.new/stage2/Makefile.am 2003-02-04 13:03:36.000000000 +0100
-@@ -26,7 +26,7 @@
- -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
+Index: grub-0.97/stage2/Makefile.am
+===================================================================
+--- grub-0.97.orig/stage2/Makefile.am
++++ grub-0.97/stage2/Makefile.am
+@@ -27,7 +27,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(to
+ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
# Stage 2 and Stage 1.5's.
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
@@ -27,10 +30,11 @@
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
-diff -ur grub-0.93/util/grub-install.in grub-0.93.new/util/grub-install.in
---- grub-0.93/util/grub-install.in 2002-05-20 13:21:50.000000000 +0200
-+++ grub-0.93.new/util/grub-install.in 2003-02-04 13:03:36.000000000 +0100
-@@ -27,7 +27,7 @@
+Index: grub-0.97/util/grub-install.in
+===================================================================
+--- grub-0.97.orig/util/grub-install.in
++++ grub-0.97/util/grub-install.in
+@@ -27,7 +27,7 @@ VERSION=@VERSION@
host_cpu=@host_cpu@
host_os=@host_os@
host_vendor=@host_vendor@
@@ -39,7 +43,7 @@
grub_shell=${sbindir}/grub
grub_set_default=${sbindir}/grub-set-default
-@@ -378,14 +378,19 @@
+@@ -406,14 +406,19 @@ EOF
exit 1
fi
@@ -65,6 +69,5 @@
+#done
+# <--uncut-->
- # Make sure that GRUB reads the same images as the host OS.
- test -n "$mkimg" && img_file=`$mkimg`
-Only in grub-0.93.new/util: grub-install.in.orig
+ # Make a default file.
+ ${grub_set_default} --root-directory=${rootdir} default
++++++ grub-0.97-protexec.patch ++++++
--- /var/tmp/diff_new_pack.N6NVzE/_old 2009-11-16 15:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.N6NVzE/_new 2009-11-16 15:05:31.000000000 +0100
@@ -1,6 +1,8 @@
---- grub-0.96/grub/asmstub.c
-+++ grub-0.96/grub/asmstub.c
-@@ -43,6 +43,8 @@
+Index: grub-0.97/grub/asmstub.c
+===================================================================
+--- grub-0.97.orig/grub/asmstub.c
++++ grub-0.97/grub/asmstub.c
+@@ -43,6 +43,8 @@ int grub_stage2 (void);
#include
participants (1)
-
root@Hilbert.suse.de