Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at 2012-02-23 15:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub (Old) and /work/SRC/openSUSE:Factory/.grub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/grub/grub.changes 2011-12-25 17:34:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub.new/grub.changes 2012-02-23 15:32:36.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 15 15:34:00 UTC 2012 - [email protected] + +- Remove silly MAP_GROWSDOWN flag when allocating scratch mem + for the grub shell (bnc#717836, bnc#640391) + +------------------------------------------------------------------- New: ---- no-MAP_GROWSDOWN ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.5Z9LvW/_old 2012-02-23 15:32:39.000000000 +0100 +++ /var/tmp/diff_new_pack.5Z9LvW/_new 2012-02-23 15:32:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package grub # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: grub BuildRequires: automake %ifarch x86_64 -BuildRequires: gcc41-32bit glibc-devel-32bit libncurses5-32bit ncurses-devel-32bit +BuildRequires: gcc41-32bit +BuildRequires: glibc-devel-32bit +BuildRequires: libncurses5-32bit +BuildRequires: ncurses-devel-32bit %else -BuildRequires: gcc41 glibc-devel libncurses5 ncurses-devel +BuildRequires: gcc41 +BuildRequires: glibc-devel +BuildRequires: libncurses5 +BuildRequires: ncurses-devel %endif -License: GPL-2.0+ -Group: System/Boot Version: 0.97 Release: 0 Source0: %{name}-%{version}.tar.gz @@ -70,9 +72,12 @@ Patch41: stage2-gfx-cmdline-len-fix.diff Patch42: nulterminate-configfile Patch43: handle-incomplete-last-track +Patch44: no-MAP_GROWSDOWN Url: http://www.gnu.org/software/grub/grub.en.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader +License: GPL-2.0+ +Group: System/Boot PreReq: fileutils sh-utils util-linux Conflicts: trustedgrub ExclusiveArch: %ix86 x86_64 @@ -130,6 +135,7 @@ %patch41 -p1 %patch42 -p1 %patch43 -p1 +%patch44 -p1 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi ++++++ no-MAP_GROWSDOWN ++++++ --- grub-0.97/grub/asmstub.c.orig 2011-09-12 12:02:32.000000000 +0200 +++ grub-0.97/grub/asmstub.c 2011-09-26 16:55:51.000000000 +0200 @@ -145,9 +145,9 @@ grub_stage2 (void) assert (grub_scratch_mem == 0); #ifdef MAP_32BIT -#define MY_MAP_SET MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_32BIT +#define MY_MAP_SET MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT #else -#define MY_MAP_SET MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS +#define MY_MAP_SET MAP_PRIVATE | MAP_ANONYMOUS #endif scratch = mmap(NULL, 0x100000 + EXTENDED_MEMSIZE + 15, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
