diff options
| author |   Chris Bainbridge <chrb@gentoo.org> | 2006-04-11 10:08:54 +0000 |
|---|---|---|
| committer | Chris Bainbridge <chrb@gentoo.org> | 2006-04-11 10:08:54 +0000 |
| commit | 0d7b2e57ccac75887ea810bbc07041a70bdc9ad4 (patch) | |
| tree | 36254b251d16c87568b62185c9ced5f29eac3474 /app-emulation | |
| parent | downgraded portage to generate digests (diff) | |
| download | gentoo-2-0d7b2e57ccac75887ea810bbc07041a70bdc9ad4.tar.gz gentoo-2-0d7b2e57ccac75887ea810bbc07041a70bdc9ad4.tar.bz2 gentoo-2-0d7b2e57ccac75887ea810bbc07041a70bdc9ad4.zip | |
add hardened patch and IUSE flag, #129491
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/hardened-bx-clobber.patch | 16 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-3.0.2.ebuild | 8 |
3 files changed, 26 insertions, 4 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index c0e787645b67..19eb9dcba6bb 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.8 2006/04/10 18:51:09 chrb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.9 2006/04/11 10:08:54 chrb Exp $ + + 11 Apr 2006; <chrb@gentoo.org> +files/hardened-bx-clobber.patch, + xen-tools-3.0.2.ebuild: + add hardened patch and IUSE flag, #129491 10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild: Fix hardened flags for hvmloader and vmxassist, #129491 diff --git a/app-emulation/xen-tools/files/hardened-bx-clobber.patch b/app-emulation/xen-tools/files/hardened-bx-clobber.patch new file mode 100644 index 000000000000..a4baf196a5af --- /dev/null +++ b/app-emulation/xen-tools/files/hardened-bx-clobber.patch @@ -0,0 +1,16 @@ +diff -r 1f4ec950e186 -r 408f51a850f4 tools/ioemu/hw/vga.c +--- a/tools/ioemu/hw/vga.c Mon Apr 10 16:14:15 2006 ++++ b/tools/ioemu/hw/vga.c Mon Apr 10 16:14:36 2006 +@@ -1369,10 +1369,10 @@ + { + unsigned int eax, edx; + +- __asm__("cpuid" ++ __asm__("pushl %%ebx; cpuid; popl %%ebx" + : "=a" (eax), "=d" (edx) + : "0" (op) +- : "bx", "cx"); ++ : "cx"); + + return edx; + } diff --git a/app-emulation/xen-tools/xen-tools-3.0.2.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2.ebuild index 833cad948725..964b7b3bd261 100644 --- a/app-emulation/xen-tools/xen-tools-3.0.2.ebuild +++ b/app-emulation/xen-tools/xen-tools-3.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2.ebuild,v 1.5 2006/04/10 18:51:09 chrb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2.ebuild,v 1.6 2006/04/11 10:08:54 chrb Exp $ inherit mount-boot flag-o-matic eutils @@ -18,12 +18,12 @@ fi LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="doc debug screen custom-cflags" +IUSE="doc debug screen custom-cflags hardened" DEPEND="sys-devel/gcc dev-lang/python" -RDEPEND="!<app-emulation/xen-3.0.1-r5 +RDEPEND=">=app-emulation/xen-3.0.2 dev-lang/python sys-apps/iproute2 net-misc/bridge-utils @@ -58,6 +58,8 @@ src_unpack() { sed -e "s/CFLAGS :=/CFLAGS := ${HARDFLAGS}/" \ -i ${S}/tools/firmware/hvmloader/Makefile \ ${S}/tools/firmware/vmxassist/Makefile + cd ${S} + epatch ${FILESDIR}/hardened-bx-clobber.patch fi } |