vapier 14/06/06 01:42:41
Modified: qemu-9999.ebuild qemu-2.0.0.ebuild
qemu-2.0.0-r1.ebuild ChangeLog
Log:
Disable mprotect on qemu binaries #459348 by Alon Bar-Lev.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.75 app-emulation/qemu/qemu-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.75&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.75&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.74&r2=1.75
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- qemu-9999.ebuild 4 Jun 2014 20:45:06 -0000 1.74
+++ qemu-9999.ebuild 6 Jun 2014 01:42:41 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.74
2014/06/04 20:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.75
2014/06/06 01:42:41 vapier Exp $
EAPI=5
@@ -8,7 +8,7 @@
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo
+ user udev fcaps readme.gentoo pax-utils
BACKPORTS=
@@ -380,15 +380,21 @@
python_export_best
- softmmu_targets=
- user_targets=
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" &&
softmmu_targets+=",${target}-softmmu"
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
done
for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" &&
user_targets+=",${target}-linux-user"
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
done
[[ -n ${softmmu_targets} ]] && \
@@ -462,6 +468,11 @@
fi
fi
+ # Disable mprotect on the qemu binaries as they use JITs to be fast
#459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+ popd >/dev/null
+
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
1.13 app-emulation/qemu/qemu-2.0.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.13&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.13&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.12&r2=1.13
Index: qemu-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qemu-2.0.0.ebuild 4 Jun 2014 20:45:06 -0000 1.12
+++ qemu-2.0.0.ebuild 6 Jun 2014 01:42:41 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.12
2014/06/04 20:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.13
2014/06/06 01:42:41 vapier Exp $
EAPI=5
@@ -8,7 +8,7 @@
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo
+ user udev fcaps readme.gentoo pax-utils
BACKPORTS=
@@ -381,15 +381,21 @@
python_export_best
- softmmu_targets=
- user_targets=
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" &&
softmmu_targets+=",${target}-softmmu"
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
done
for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" &&
user_targets+=",${target}-linux-user"
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
done
[[ -n ${softmmu_targets} ]] && \
@@ -463,6 +469,11 @@
fi
fi
+ # Disable mprotect on the qemu binaries as they use JITs to be fast
#459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+ popd >/dev/null
+
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
1.5 app-emulation/qemu/qemu-2.0.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.4&r2=1.5
Index: qemu-2.0.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qemu-2.0.0-r1.ebuild 4 Jun 2014 20:45:06 -0000 1.4
+++ qemu-2.0.0-r1.ebuild 6 Jun 2014 01:42:41 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
1.4 2014/06/04 20:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
1.5 2014/06/06 01:42:41 vapier Exp $
EAPI=5
@@ -8,7 +8,7 @@
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo
+ user udev fcaps readme.gentoo pax-utils
BACKPORTS=
@@ -386,15 +386,21 @@
python_export_best
- softmmu_targets=
- user_targets=
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" &&
softmmu_targets+=",${target}-softmmu"
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
done
for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" &&
user_targets+=",${target}-linux-user"
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
done
[[ -n ${softmmu_targets} ]] && \
@@ -468,6 +474,11 @@
fi
fi
+ # Disable mprotect on the qemu binaries as they use JITs to be fast
#459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+ popd >/dev/null
+
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
1.268 app-emulation/qemu/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.268&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.268&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.267&r2=1.268
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- ChangeLog 4 Jun 2014 20:45:06 -0000 1.267
+++ ChangeLog 6 Jun 2014 01:42:41 -0000 1.268
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.267
2014/06/04 20:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.268
2014/06/06 01:42:41 vapier Exp $
+
+ 06 Jun 2014; Mike Frysinger <[email protected]> qemu-2.0.0-r1.ebuild,
+ qemu-2.0.0.ebuild, qemu-9999.ebuild:
+ Disable mprotect on qemu binaries #459348 by Alon Bar-Lev.
04 Jun 2014; Mike Frysinger <[email protected]> qemu-2.0.0-r1.ebuild,
qemu-2.0.0.ebuild, qemu-9999.ebuild:
