Hello community,
here is the log from the commit of package lilo
checked in at Thu Oct 9 12:04:02 CEST 2008.
--------
--- arch/i386/lilo/lilo.changes 2008-10-06 13:05:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-10-09 11:46:13.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Oct 9 11:32:34 CEST 2008 - olh@suse.de
+
+- Avoid a division by zero on buggy BIOS (bnc#429544)
+
+-------------------------------------------------------------------
+Thu Oct 9 10:05:34 CEST 2008 - olh@suse.de
+
+- the ibm,client-architecture-support-reboot is in the /chosen node
+ not in the /options node (bnc#427960)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yaboot-22.8-r1144.tar.bz2
New:
----
lilo.x86.division-by-zero.patch
yaboot-22.8-r1151.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.K28223/_old 2008-10-09 12:03:47.000000000 +0200
+++ /var/tmp/diff_new_pack.K28223/_new 2008-10-09 12:03:47.000000000 +0200
@@ -21,7 +21,7 @@
Name: lilo
ExclusiveArch: ppc ppc64 %ix86 x86_64
-%define yaboot_vers 22.8-r1144
+%define yaboot_vers 22.8-r1151
Group: System/Boot
License: BSD 3-Clause
Summary: The Linux Loader, a Boot Menu
@@ -50,13 +50,14 @@
BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit
%endif
Version: 22.8
-Release: 29
+Release: 30
Source0: lilo-ppc-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
Source86: lilo-%{version}.src.tar.bz2
Patch8601: lilo.x86.mount_by_persistent_name.patch
Patch8602: lilo.x86.array-bounds.patch
-# $Id: lilo.spec 1095 2008-08-29 07:59:29Z olh $
+Patch8603: lilo.x86.division-by-zero.patch
+# $Id: lilo.spec 1152 2008-10-09 09:46:13Z olh $
%description
LILO boots Linux from your hard drive. It can also boot other operating
@@ -86,6 +87,7 @@
cd lilo-%{version}
%patch8601 -p1
%patch8602 -p1
+%patch8603 -p1
%build
%ifarch %ix86 x86_64
@@ -212,6 +214,11 @@
%endif
%doc %{_mandir}/*/*
%changelog
+* Thu Oct 09 2008 olh@suse.de
+- Avoid a division by zero on buggy BIOS (bnc#429544)
+* Thu Oct 09 2008 olh@suse.de
+- the ibm,client-architecture-support-reboot is in the /chosen node
+ not in the /options node (bnc#427960)
* Mon Oct 06 2008 olh@suse.de
- assign tftp filename correctly if options are incomplete
* Thu Oct 02 2008 olh@suse.de
++++++ lilo-ppc-22.8.tar.bz2 ++++++
++++++ lilo.x86.division-by-zero.patch ++++++
Bug 429544 - lilo fails with floating point exception
Avoid a division by zero on buggy BIOS
Index: lilo-22.8/probe.c
===================================================================
--- lilo-22.8.orig/probe.c
+++ lilo-22.8/probe.c
@@ -1039,7 +1039,10 @@ int bios_device(GEOMETRY *geo, int devic
geo->sectors = bdata.n_sect;
geo->heads = bdata.n_head;
if (bdata.n_total_blocks > nblocks) nblocks = bdata.n_total_blocks;
- geo->cylinders = nblocks / (bdata.n_head*bdata.n_sect);
+ if (bdata.n_head*bdata.n_sect)
+ geo->cylinders = nblocks / (bdata.n_head*bdata.n_sect);
+ else
+ geo->cylinders = nblocks;
#endif
}
return (geo->device = bios1);
++++++ yaboot-22.8-r1144.tar.bz2 -> yaboot-22.8-r1151.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/Changelog.SuSE new/yaboot-22.8-r1151/Changelog.SuSE
--- old/yaboot-22.8-r1144/Changelog.SuSE 2008-10-06 13:05:42.000000000 +0200
+++ new/yaboot-22.8-r1151/Changelog.SuSE 2008-10-09 10:06:27.000000000 +0200
@@ -1,4 +1,58 @@
------------------------------------------------------------------------
+r1151 | olh | 2008-10-09 08:06:27 +0000 (Thu, 09 Oct 2008) | 3 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/yaboot.c
+
++- the ibm,client-architecture-support-reboot is in the /chosen node
++ not in the /options node (bnc#427960)
+
+------------------------------------------------------------------------
+r1150 | olh | 2008-10-08 08:21:57 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+
+remove extra -g
+------------------------------------------------------------------------
+r1149 | olh | 2008-10-08 08:21:29 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+ M /trunk/yaboot/include/debug.h
+ M /trunk/yaboot/yaboot.deps
+
+rebuild files if DEBUG=n changes
+------------------------------------------------------------------------
+r1148 | olh | 2008-10-08 08:10:35 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/second/md5.c
+
+remove redefinitio of USE_MD5_PASSWORDS
+------------------------------------------------------------------------
+r1147 | olh | 2008-10-08 08:09:34 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+
+split cflags
+------------------------------------------------------------------------
+r1146 | olh | 2008-10-08 07:59:16 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+
+remove temporary files
+------------------------------------------------------------------------
+r1145 | olh | 2008-10-08 07:56:49 +0000 (Wed, 08 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+ M /trunk/yaboot/second/file.c
+ M /trunk/yaboot/second/fs_reiserfs.c
+ M /trunk/yaboot/second/fs_xfs.c
+ M /trunk/yaboot/second/md5.c
+ M /trunk/yaboot/second/prom.c
+ M /trunk/yaboot/second/yaboot.c
+ M /trunk/yaboot/yaboot.deps
+
+ handle feature defines to rebuild files if feature list changes
+------------------------------------------------------------------------
r1144 | olh | 2008-10-06 11:05:42 +0000 (Mon, 06 Oct 2008) | 2 lines
Changed paths:
M /trunk/lilo.changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/include/debug.h new/yaboot-22.8-r1151/include/debug.h
--- old/yaboot-22.8-r1144/include/debug.h 2008-09-19 13:12:51.000000000 +0200
+++ new/yaboot-22.8-r1151/include/debug.h 2008-10-08 10:21:29.000000000 +0200
@@ -18,6 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include
#ifdef DEBUG
# define DEBUG_ENTER prom_printf( "--> %s\n", __PRETTY_FUNCTION__ )
# define DEBUG_LEAVE(str) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/Makefile new/yaboot-22.8-r1151/Makefile
--- old/yaboot-22.8-r1144/Makefile 2008-10-02 15:17:04.000000000 +0200
+++ new/yaboot-22.8-r1151/Makefile 2008-10-08 10:21:57.000000000 +0200
@@ -6,7 +6,7 @@
include Config
-VERSION = 22.8-r1144
+VERSION = 22.8-r1151
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
@@ -23,35 +23,20 @@
# The flags for the yaboot binary.
#
-YBCFLAGS = -Os $(CFLAGS) -msoft-float -fno-builtin -nostdinc -Wall -isystem `gcc -print-file-name=include`
+YBCFLAGS = -Os
YBCFLAGS += -g
+ifneq ($(CFLAGS),)
+YBCFLAGS += $(CFLAGS)
+endif
+YBCFLAGS += -msoft-float
+YBCFLAGS += -fno-builtin
+YBCFLAGS += -nostdinc
+YBCFLAGS += -Wall
+YBCFLAGS += -isystem `gcc -print-file-name=include`
YBCFLAGS += -mcpu=powerpc
YBCFLAGS += -I ./include
-ifneq ($(DEBUG),0)
-YBCFLAGS += -DDEBUG=$(DEBUG)
-endif
ifeq ($(DEBUG),2)
-YBCFLAGS += -O1 -g
-endif
-
-ifeq ($(CONFIG_COLOR_TEXT),y)
-YBCFLAGS += -DCONFIG_COLOR_TEXT
-endif
-
-ifeq ($(CONFIG_SET_COLORMAP),y)
-YBCFLAGS += -DCONFIG_SET_COLORMAP
-endif
-
-ifeq ($(USE_MD5_PASSWORDS),y)
-YBCFLAGS += -DUSE_MD5_PASSWORDS
-endif
-
-ifeq ($(CONFIG_FS_XFS),y)
-YBCFLAGS += -DCONFIG_FS_XFS
-endif
-
-ifeq ($(CONFIG_FS_REISERFS),y)
-YBCFLAGS += -DCONFIG_FS_REISERFS
+YBCFLAGS += -O1
endif
# Link flags
@@ -89,17 +74,11 @@
second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
lib/nosys.o lib/misc.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-ifeq ($(USE_MD5_PASSWORDS),y)
OBJS += second/md5.o
-endif
-ifeq ($(CONFIG_FS_XFS),y)
OBJS += second/fs_xfs.o
-endif
-ifeq ($(CONFIG_FS_REISERFS),y)
OBJS += second/fs_reiserfs.o
-endif
# compilation
CC := $(CROSS)gcc
@@ -128,6 +107,7 @@
else \
cp -f $@~ $@ ; \
fi
+ @rm -f $@~
include/hardcoded_bootpath.h: FORCE
ifeq ($(HARD_CODED_BOOTPATH),)
@@ -142,6 +122,48 @@
else \
cp -f $@~ $@ ; \
fi
+ @rm -f $@~
+
+include/config.h: Config FORCE
+ @echo "/* autogenerated by make */" > $@~
+ifeq ($(CONFIG_COLOR_TEXT),y)
+ @echo "#define CONFIG_COLOR_TEXT 1" >> $@~
+else
+ @echo "#undef CONFIG_COLOR_TEXT" >> $@~
+endif
+ifeq ($(CONFIG_SET_COLORMAP),y)
+ @echo "#define CONFIG_SET_COLORMAP 1" >> $@~
+else
+ @echo "#undef CONFIG_SET_COLORMAP" >> $@~
+endif
+ifeq ($(USE_MD5_PASSWORDS),y)
+ @echo "#define USE_MD5_PASSWORDS 1" >> $@~
+else
+ @echo "#undef USE_MD5_PASSWORDS" >> $@~
+endif
+ifeq ($(CONFIG_FS_XFS),y)
+ @echo "#define CONFIG_FS_XFS 1" >> $@~
+else
+ @echo "#undef CONFIG_FS_XFS" >> $@~
+endif
+ifeq ($(CONFIG_FS_REISERFS),y)
+ @echo "#define CONFIG_FS_REISERFS 1" >> $@~
+else
+ @echo "#undef CONFIG_FS_REISERFS" >> $@~
+endif
+ifeq ($(DEBUG),0)
+ @echo "#undef DEBUG" >> $@~
+else
+ @echo "#define DEBUG $(DEBUG)" >> $@~
+endif
+ @if test -f $@ ; then \
+ if ! diff -u $@ $@~ ; then \
+ cp -f $@~ $@ ; \
+ fi ; \
+ else \
+ cp -f $@~ $@ ; \
+ fi
+ @rm -f $@~
second/empty.c:
rm -f $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/file.c new/yaboot-22.8-r1151/second/file.c
--- old/yaboot-22.8-r1144/second/file.c 2008-09-19 16:16:08.000000000 +0200
+++ new/yaboot-22.8-r1151/second/file.c 2008-10-08 09:56:49.000000000 +0200
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
extern const struct fs_t of_filesystem;
extern const struct fs_t of_net_filesystem;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/fs_reiserfs.c new/yaboot-22.8-r1151/second/fs_reiserfs.c
--- old/yaboot-22.8-r1144/second/fs_reiserfs.c 2006-11-14 22:02:28.000000000 +0100
+++ new/yaboot-22.8-r1151/second/fs_reiserfs.c 2008-10-08 09:56:49.000000000 +0200
@@ -30,7 +30,9 @@
#include
#include
#include
+#include
+#ifdef CONFIG_FS_REISERFS
static int reiserfs_read_super(void);
static int reiserfs_open_file(char *dirname);
static int reiserfs_read_data(char *buf, u32 len);
@@ -915,3 +917,4 @@
* c-basic-offset: 8
* End:
*/
+#endif /* CONFIG_FS_REISERFS */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/fs_xfs.c new/yaboot-22.8-r1151/second/fs_xfs.c
--- old/yaboot-22.8-r1144/second/fs_xfs.c 2006-09-22 23:54:56.000000000 +0200
+++ new/yaboot-22.8-r1151/second/fs_xfs.c 2008-10-08 09:56:49.000000000 +0200
@@ -30,7 +30,9 @@
#include
#include
#include
+#include
+#ifdef CONFIG_FS_XFS
#define SECTOR_BITS 9
static int xfs_mount(void);
@@ -721,3 +723,4 @@
* c-basic-offset: 8
* End:
*/
+#endif /* CONFIG_FS_XFS */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/md5.c new/yaboot-22.8-r1151/second/md5.c
--- old/yaboot-22.8-r1144/second/md5.c 2006-09-22 23:05:49.000000000 +0200
+++ new/yaboot-22.8-r1151/second/md5.c 2008-10-08 10:10:35.000000000 +0200
@@ -26,10 +26,10 @@
#include
#include
+#include
#ifdef TEST
# include
-# define USE_MD5_PASSWORDS
# define USE_MD5
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/prom.c new/yaboot-22.8-r1151/second/prom.c
--- old/yaboot-22.8-r1144/second/prom.c 2008-01-16 09:39:44.000000000 +0100
+++ new/yaboot-22.8-r1151/second/prom.c 2008-10-08 09:56:49.000000000 +0200
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#define READ_BLOCKS_USE_READ 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/second/yaboot.c new/yaboot-22.8-r1151/second/yaboot.c
--- old/yaboot-22.8-r1144/second/yaboot.c 2008-10-02 15:19:28.000000000 +0200
+++ new/yaboot-22.8-r1151/second/yaboot.c 2008-10-09 10:06:27.000000000 +0200
@@ -56,6 +56,8 @@
#include
#include
#include
+#include
+#include
static char *hard_coded_bootpath(char *bootpath)
{
@@ -71,9 +73,6 @@
#define CONFIG_FILE_MAX 0x8000 /* 32k */
-#ifdef USE_MD5_PASSWORDS
-#include
-#endif /* USE_MD5_PASSWORDS */
/* align addr on a size boundry - adjust address up if needed -- Cort */
#define _ALIGN(addr,size) (((addr)+size-1)&(~(size-1)))
@@ -1012,7 +1011,7 @@
gpr = GET_PARAMS_OK;
memset(fw_nbr_reboots, 0, sizeof(fw_nbr_reboots));
- if (prom_get_options("ibm,client-architecture-support-reboot", &fw_nbr_reboots, sizeof(fw_nbr_reboots)) == -1)
+ if (prom_get_chosen("ibm,client-architecture-support-reboot", &fw_nbr_reboots, sizeof(fw_nbr_reboots)) == -1)
prom_get_options("ibm,fw-nbr-reboots", &fw_nbr_reboots, sizeof(fw_nbr_reboots));
result = simple_strtol(fw_nbr_reboots, &msg, 10);
if (result > 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1144/yaboot.deps new/yaboot-22.8-r1151/yaboot.deps
--- old/yaboot-22.8-r1144/yaboot.deps 2008-10-02 15:17:04.000000000 +0200
+++ new/yaboot-22.8-r1151/yaboot.deps 2008-10-08 10:21:29.000000000 +0200
@@ -64,6 +64,7 @@
second/file.o: \
second/file.c \
+ include/config.h \
include/ctype.h \
include/types.h \
include/stdlib.h \
@@ -116,6 +117,7 @@
second/fs_reiserfs.o: \
second/fs_reiserfs.c \
+ include/config.h \
include/types.h \
include/ctype.h \
include/string.h \
@@ -132,6 +134,7 @@
second/fs_xfs.o: \
second/fs_xfs.c \
+ include/config.h \
include/types.h \
include/ctype.h \
include/string.h \
@@ -149,10 +152,16 @@
second/md5.o: \
second/md5.c \
+ include/config.h \
include/string.h \
include/types.h \
include/md5.h
+second/parse_device_path.o: \
+ include/file.h \
+ include/errors.h \
+ include/debug.h
+
second/partition.o: \
second/partition.c \
include/ctype.h \
@@ -170,6 +179,7 @@
second/prom.o: \
second/prom.c \
+ include/config.h \
include/prom.h \
include/stdlib.h \
include/string.h \
@@ -184,6 +194,7 @@
second/yaboot.o: \
second/yaboot.c \
+ include/config.h \
include/version.h \
include/hardcoded_bootpath.h \
include/string.h \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org