diff options
| -rw-r--r-- | sys-boot/grub/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 51 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-0.96-netboot-pic.patch | 15 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.96-r2.ebuild | 11 |
4 files changed, 48 insertions, 38 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 0386e9adf1b8..86289c92c2bf 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,11 @@ # 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.39 2005/05/08 02:55:53 swegener Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.40 2005/05/09 05:10:51 vapier Exp $ + + 09 May 2005; Mike Frysinger <vapier@gentoo.org> + +files/grub-0.96-netboot-pic.patch, grub-0.96-r2.ebuild: + Add patch by the PaX Team to fix PIC/PIE issues in the netboot code and + remove the chpax/paxctl stuff since the nxstack patch fixes hardened issues. *grub-0.96-r2 (08 May 2005) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 1c74dffb4ce8..a57ed5fc33a4 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,40 +1,31 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 138bf4b71e6daf1c47dd24c453f5faeb grub-0.94-r1.ebuild 3595 -MD5 f5abf2d00f837afaa4780d4712fb412f grub-0.96-r2.ebuild 5205 -MD5 d1b30a7ac2ffe9a7bc265739767f1e7d grub-0.96-r1.ebuild 5087 +MD5 fe5c57feda731b23bae46e5e579f3e85 ChangeLog 13181 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 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 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140 -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 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139 +MD5 d1b30a7ac2ffe9a7bc265739767f1e7d grub-0.96-r1.ebuild 5087 +MD5 b992ca57dedad689b4e2514062cd58c8 grub-0.96.ebuild 4173 +MD5 29e9d933de6944d32ec6178ad64af8db grub-0.96-r2.ebuild 5162 MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133 +MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139 +MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639 +MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856 MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131 +MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479 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 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574 +MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149 +MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529 +MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140 MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925 +MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r1 140 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 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCfX/GI1lqEGTUzyQRAvEKAKDY2xUUY4podf60QDG3THaMR4uBJQCgrrWu -68LAKNhOY095+FDumib6YnM= -=0dnm ------END PGP SIGNATURE----- +MD5 3f141147f2ded9c02b300eaf8361f3d5 files/grub-0.96-r1-gcc4.patch 5568 +MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r2 140 +MD5 fb0f1b7cf2bf8055ee45f1e44c793cb7 files/grub-0.96-xfs-writable-string.patch 519 +MD5 5c12894c0a8cfd4a46a67e631dd45804 files/grub-0.96-netboot-pic.patch 446 diff --git a/sys-boot/grub/files/grub-0.96-netboot-pic.patch b/sys-boot/grub/files/grub-0.96-netboot-pic.patch new file mode 100644 index 000000000000..5cac692bb201 --- /dev/null +++ b/sys-boot/grub/files/grub-0.96-netboot-pic.patch @@ -0,0 +1,15 @@ +Patch by the PaX Team to fix PIC/PIE problems. + +http://bugs.gentoo.org/show_bug.cgi?id=85566 + +--- netboot/main.c ++++ netboot/main.c +@@ -701,7 +701,7 @@ + "adcw %%ax,%0\n\t" /* add carry of previous iteration */ + "loop 1b\n\t" + "adcw $0,%0" /* add carry of last iteration */ +- : "=b" (*sum), "=S"(start), "=c"(len) ++ : "=r" (*sum), "=S"(start), "=c"(len) + : "0"(*sum), "1"(start), "2"(len) + : "ax", "cc" + ); diff --git a/sys-boot/grub/grub-0.96-r2.ebuild b/sys-boot/grub/grub-0.96-r2.ebuild index 1c734fc2ce83..8e77c2d43252 100644 --- a/sys-boot/grub/grub-0.96-r2.ebuild +++ b/sys-boot/grub/grub-0.96-r2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.2 2005/05/09 05:10:51 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -62,7 +62,10 @@ src_unpack() { epatch "${FILESDIR}"/${P}-xfs-writable-string.patch # gcc4 patches; bug #85016 - epatch ${FILESDIR}/${P}-r1-gcc4.patch + epatch "${FILESDIR}"/${P}-r1-gcc4.patch + + # fix PIC issues in netboot code #85566 + epatch "${FILESDIR}"/${P}-netboot-pic.patch # a bunch of patches apply to raw autotool files autoconf || die "autoconf failed" @@ -160,10 +163,6 @@ pkg_postinst() { [[ -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 \ |