Revision bump to pull in my writable-string patch I submitted to upstream. Closes bug #90845.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 221 insertions, 20 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index cf236de41c4d..0386e9adf1b8 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/grub
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.38 2005/04/20 15:49:39 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.39 2005/05/08 02:55:53 swegener Exp $
+
+*grub-0.96-r2 (08 May 2005)
+
+  08 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/grub-0.96-xfs-writable-string.patch, +grub-0.96-r2.ebuild:
+  Revision bump to pull in my writable-string patch I submitted to upstream.
+  Closes bug #90845.
 
   20 Apr 2005; Stephen Bennett <spb@gentoo.org> grub-0.96-r1.ebuild:
   Stable x86; older versions break with hardened gcc.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c9d9a41cefbd..1c74dffb4ce8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,37 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9332cd2b07d5404dc6211d2ea0434c23 ChangeLog 12669
-MD5 3b7a994ffe338fd8de16df033684e924 grub-0.92-r1.ebuild 2519
-MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
 MD5 138bf4b71e6daf1c47dd24c453f5faeb grub-0.94-r1.ebuild 3595
-MD5 6f64ad4c1842218eafe2ebdd908fcc85 grub-0.94-r2.ebuild 3711
-MD5 a0f235ac986f99960ed542e2982c3640 grub-0.95.20040823.ebuild 4185
+MD5 f5abf2d00f837afaa4780d4712fb412f grub-0.96-r2.ebuild 5205
+MD5 d1b30a7ac2ffe9a7bc265739767f1e7d grub-0.96-r1.ebuild 5087
+MD5 3b7a994ffe338fd8de16df033684e924 grub-0.92-r1.ebuild 2519
 MD5 b992ca57dedad689b4e2514062cd58c8 grub-0.96.ebuild 4173
+MD5 6f64ad4c1842218eafe2ebdd908fcc85 grub-0.94-r2.ebuild 3711
+MD5 d8c4a4724592b9e82f5f0ba85c91e182 ChangeLog 12920
+MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
-MD5 d1b30a7ac2ffe9a7bc265739767f1e7d grub-0.96-r1.ebuild 5087
-MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
-MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
-MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
+MD5 a0f235ac986f99960ed542e2982c3640 grub-0.95.20040823.ebuild 4185
 MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
-MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
+MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
+MD5 3f141147f2ded9c02b300eaf8361f3d5 files/grub-0.96-r1-gcc4.patch 5568
+MD5 8082c035a4ba98d0935b6b045827fb2c files/grub-0.96-nxstack.patch 18920
+MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
+MD5 fb0f1b7cf2bf8055ee45f1e44c793cb7 files/grub-0.96-xfs-writable-string.patch 519
 MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
-MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
-MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
+MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
+MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
 MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r1 140
+MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r2 140
+MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
 MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925
 MD5 3f3995353a0995c56d996d2218570160 files/grub-0.96-i2o-raid.patch 1597
-MD5 8082c035a4ba98d0935b6b045827fb2c files/grub-0.96-nxstack.patch 18920
 MD5 e5978f58eb732289c47b1e0093db4e73 files/grub-0.96-bounced-checks.patch 505
 MD5 7c2804e6a538b2dbcbb851b9614424fd files/grub-0.96-gcc4.patch 6871
-MD5 3f141147f2ded9c02b300eaf8361f3d5 files/grub-0.96-r1-gcc4.patch 5568
+MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCZyn+CRZPokWLroQRAvSkAKCs13rk7tEKKhWdwp1WZ/NwpXo+4QCgz3pW
-NR3vFtjpnjLIyJgcKzlZILE=
-=ziBD
+iD8DBQFCfX/GI1lqEGTUzyQRAvEKAKDY2xUUY4podf60QDG3THaMR4uBJQCgrrWu
+68LAKNhOY095+FDumib6YnM=
+=0dnm
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/digest-grub-0.96-r2 b/sys-boot/grub/files/digest-grub-0.96-r2
new file mode 100644
index 000000000000..b43ad3d90a05
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.96-r2
@@ -0,0 +1,2 @@
+MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
+MD5 7d0c1f5a474a8877a6f38edc4599030a grub-0.95.20040823-splash.patch.bz2 40226
diff --git a/sys-boot/grub/files/grub-0.96-xfs-writable-string.patch b/sys-boot/grub/files/grub-0.96-xfs-writable-string.patch
new file mode 100644
index 000000000000..c46362598e83
--- /dev/null
+++ b/sys-boot/grub/files/grub-0.96-xfs-writable-string.patch
@@ -0,0 +1,17 @@
+Index: stage2/fsys_xfs.c
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/fsys_xfs.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -b -B -r1.4 -r1.5
+--- stage2/fsys_xfs.c	18 Jan 2004 19:47:18 -0000	1.4
++++ stage2/fsys_xfs.c	8 May 2005 02:18:14 -0000	1.5
+@@ -334,7 +334,7 @@
+ {
+ 	int namelen = 1;
+ 	int toread;
+-	static char *usual[2] = {".", ".."};
++	static char usual[2][3] = {".", ".."};
+ 	static xfs_dir2_sf_entry_t *sfe;
+ 	char *name = usual[0];
+ 
diff --git a/sys-boot/grub/grub-0.96-r2.ebuild b/sys-boot/grub/grub-0.96-r2.ebuild
new file mode 100644
index 000000000000..1c734fc2ce83
--- /dev/null
+++ b/sys-boot/grub/grub-0.96-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.1 2005/05/08 02:55:53 swegener Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-0.95.20040823-splash.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static netboot"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+	if use amd64; then
+		if ! has_m32; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/${PN}-0.95.20040823-splash.patch
+
+	# PIC patch by psm & kevin f. quinn #80693
+	epatch "${FILESDIR}"/${P}-PIC.patch
+
+	# disable testing of FFS and UFS2 images that always fail (bug #71811)
+	epatch "${FILESDIR}"/${P}-bounced-checks.patch
+
+	# i2o RAID support #76143
+	epatch "${FILESDIR}"/${P}-i2o-raid.patch
+
+	# -fwritable-strings is deprecated; testing to see if we need it any more
+	epatch "${FILESDIR}"/${PN}-0.95.20040823-warnings.patch
+
+	# should fix NX segfaulting on amd64 and x86_64 by Peter Jones
+	# http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html
+	epatch "${FILESDIR}"/${P}-nxstack.patch
+
+	# Remove writable-string code from xfs support code (#90845)
+	epatch "${FILESDIR}"/${P}-xfs-writable-string.patch
+
+	# gcc4 patches; bug #85016
+	epatch ${FILESDIR}/${P}-r1-gcc4.patch
+
+	# a bunch of patches apply to raw autotool files
+	autoconf || die "autoconf failed"
+	aclocal || die "aclocal failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	exeinto /usr/lib/grub
+	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
+
+	insinto /boot/grub
+	doins "${FILESDIR}"/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+
+	# change menu.lst to grub.conf
+	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /usr/lib/grub to /boot"
+	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} /boot/grub
+	done
+
+	# hardened voodoo
+	[[ -x /sbin/chpax ]] && /sbin/chpax -spme /sbin/grub
+	[[ -x /sbin/paxctl ]] && /sbin/paxctl -spme /sbin/grub
+
+	[[ -e /boot/grub/grub.conf ]] \
+		&& /sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}