Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at Thu Feb 18 15:09:48 CET 2010. -------- --- grub/grub.changes 2010-01-25 14:48:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/grub/grub.changes 2010-02-18 15:09:17.148053000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 11 16:33:16 CET 2010 - duwe@suse.de + +- pull various fixes from SLES11-SP1: + + use gcc-4.1 to build, with known compiler flags + (bnc#178329, bnc#372024, bnc#339959, bnc#542099, + bnc#548600, bnc#548523) + + null-terminate the configfile (bnc#554546) + + use blkid instead of the vanished vol_id (bnc#555293) + + use xfs_freeze during %post + + make sure grubonce is executable (e.g. bnc#577897) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nulterminate-configfile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.ch871g/_old 2010-02-18 15:09:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ch871g/_new 2010-02-18 15:09:28.000000000 +0100 @@ -21,14 +21,14 @@ Name: grub %ifarch x86_64 -BuildRequires: gcc-32bit glibc-devel-32bit libncurses5-32bit ncurses-devel-32bit +BuildRequires: gcc41-32bit glibc-devel-32bit libncurses5-32bit ncurses-devel-32bit %else -BuildRequires: gcc glibc-devel libncurses5 ncurses-devel +BuildRequires: gcc41 glibc-devel libncurses5 ncurses-devel %endif License: GPLv2+ Group: System/Boot Version: 0.97 -Release: 163 +Release: 164 Source0: %{name}-%{version}.tar.gz Source1: installgrub Source2: grubonce @@ -68,10 +68,11 @@ Patch39: document-grub-install.unsupported Patch40: grub-iso-fixes Patch41: stage2-gfx-cmdline-len-fix.diff +Patch42: nulterminate-configfile Url: http://www.gnu.org/software/grub/grub.en.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader -PreReq: fileutils sh-utils udev +PreReq: fileutils sh-utils Conflicts: trustedgrub ExclusiveArch: %ix86 x86_64 @@ -141,18 +142,20 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi %{?suse_update_config:%{suse_update_config -l -f . }} +export CC="gcc-4.1" autoreconf --force --install %ifarch x86_64 EXTRACFLAGS=' -fno-stack-protector -fno-strict-aliasing -minline-all-stringops -m32 -fno-asynchronous-unwind-tables -fno-unwind-tables' %else EXTRACFLAGS=' -fno-stack-protector -fno-strict-aliasing -minline-all-stringops -fno-asynchronous-unwind-tables -fno-unwind-tables' %endif -export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-fomit-frame-pointer/} -CFLAGS="$RPM_OPT_FLAGS -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \ +# RPM_OPT_FLAGS considered harmful on 64-bit :-( +CFLAGS="-m32 -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \ --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} --datadir=/usr/lib \ --disable-auto-linux-mem-opt --enable-diskless \ --enable-{3c50{3,7},3c5{0,2}9,3c595,3c90x,cs89x0,davicom,depca,eepro{,100},epic100} \ @@ -162,7 +165,7 @@ (cd stage2; mv nbgrub pxegrub ..) mv stage2/stage2{,.netboot} make clean -CFLAGS="$RPM_OPT_FLAGS -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \ +CFLAGS="-m32 -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \ --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} --datadir=/usr/lib \ --disable-auto-linux-mem-opt --disable-ffs --disable-ufs2 make @@ -175,7 +178,7 @@ cp -p {nb,pxe}grub stage2/stage2{,.netboot} $RPM_BUILD_ROOT/usr/lib/grub mv $RPM_BUILD_ROOT/usr/sbin/grub-install{,.unsupported} mv $RPM_BUILD_ROOT/%{_mandir}/man8/grub-install{,.unsupported}.8 -cp -p %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/sbin/. +install -p -m 755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/sbin/. # This fine script used to do everything at once, which # isn't necessary any more with Yast2 support. # Kept only for reference and historical reasons. @@ -228,9 +231,11 @@ sync # sync may take much longer on XFS (Bug#223773) bootpart=`df /boot/. | perl -ane '$F[0] =~ m,/dev/[^\s]*, && print $F[0]'` -eval `PATH="$PATH":/lib/udev vol_id $bootpart` +eval `/sbin/blkid -u filesystem -o udev $bootpart` if [ "X$ID_FS_TYPE" = "X" -o "t_$ID_FS_TYPE" = "t_xfs" ]; then sync; sleep 5; sync; sleep 5; sync + (xfs_freeze -f /; xfs_freeze -f /boot) > /dev/null 2>&1 + (xfs_freeze -u /; xfs_freeze -u /boot) > /dev/null 2>&1 fi # command sequence to update-install stage1/stage2. # leave everything else alone ! ++++++ nulterminate-configfile ++++++ --- grub-0.97/stage2/builtins.c.orig 2010-01-14 18:08:51.000000000 +0100 +++ grub-0.97/stage2/builtins.c 2010-01-14 18:11:45.000000000 +0100 @@ -2126,8 +2126,11 @@ nul_terminate (config_filename); if (! is_stage1_5) - /* If it is a Stage 2, just copy PTR to CONFIG_FILE_LOCATION. */ - grub_strcpy (config_file_location, ptr); + { + /* If it is a Stage 2, just copy PTR to CONFIG_FILE_LOCATION. */ + grub_strcpy (config_file_location, ptr); + nul_terminate (config_file_location); + } else { char *real_config; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org