fix bug 240956

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

4 files changed, 47 insertions, 5 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 445cc37d91e9..287e41f64b42 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.308 2011/01/27 16:44:03 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.309 2011/02/09 22:25:09 zorry Exp $
+
+*mesa-7.10-r1 (09 Feb 2011)
+
+  09 Feb 2011; Magnus Granberg <zorry@gentoo.org> -mesa-7.10.ebuild,
+  +mesa-7.10-r1.ebuild, +files/glx_ro_text_segm.patch:
+  Fix bug 240956 readonly text segment on x86
 
   27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> mesa-7.10.ebuild:
   Push Gentoo Prefix changes from x11 overlay, as approved
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index bfa7a8228015..23c95673cdd8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,15 +1,16 @@
 AUX eselect-mesa.conf.7.10 1670 RMD160 a500c3af1c036678a84548b92e348b12a72ec117 SHA1 38cc1b51398382f5a2d1b89da4f16d3fa0e55450 SHA256 3ff15cedc353feeb2da450533c2ea2efc33ed1c8434a7b3037999c4965907149
 AUX eselect-mesa.conf.7.9 1652 RMD160 922a0cc81e31548eacc7bc079448a93912124180 SHA1 2fb5a1fad37cc907871541ba8daca927dca968bb SHA256 bee4d061f1fb63c4c70d3f643fee7b53726c8826782f57b988f545e12eccd8c1
+AUX glx_ro_text_segm.patch 731 RMD160 6d2bd85591d6349fa45a5ee16c724859c640e902 SHA1 3015aa2bd139bcdf2c3fae61f460f0c5aaeb1df7 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c
 DIST MesaLib-7.10.tar.bz2 5842557 RMD160 211011257228352dd305b589f0eab3854a2b7e49 SHA1 3cc8a077a3668041eb7296a94afcd807a3b90379 SHA256 bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df6e0aca
 DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab7880 SHA1 31500d7e3e3bbf9288b3bee4fbddd26a5e0b7782 SHA256 dc44f73e50d2ccdb96e7b72cc71e56024c198a228112c69c5e86dbc610fd4e84
 DIST MesaLib-7.8.2.tar.bz2 5138463 RMD160 d06c95bc36304b8ef72211b5defd3ac338fe7956 SHA1 21de672a1cbe307135d7f172dc6952041a38e1c7 SHA256 505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d
 DIST MesaLib-7.9.1.tar.bz2 5640520 RMD160 5d83557160dc13f98647889bab351712c7b67316 SHA1 a442f77072c690ccd8c2659664929684f74d82fd SHA256 403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721
 DIST MesaLib-7.9.tar.bz2 5678494 RMD160 4aad7da22324556dcd3e833d149d8ae8de1fce7d SHA1 5afc7f6f4ee02a1ca39f29ef261cc14e8787d892 SHA256 e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
 DIST mesa-7.9.1-gentoo-patches-01.tar.bz2 2139 RMD160 9db0129c3aca3ed63c0b6665ac2f061997364c05 SHA1 b41022dfcf554d8460c96804d3d97224d05e7607 SHA256 b2b593a3cc529913a34a59c017dad4a51ae82e8b2dd4bf333a52260c3cab0aa1
-EBUILD mesa-7.10.ebuild 9287 RMD160 246f697b69a4f7e211e33e5cfc042e8e952b9784 SHA1 ce13b8a9208d78392b9b4d2cea4a4f0c08bb9b1f SHA256 cc616dd15bf90d29a0dcaf3a20c873227035f13d9dd8c3185274bc0831495f92
+EBUILD mesa-7.10-r1.ebuild 9459 RMD160 42a89f65e1095e4799b3957eb8b038486d3da2c3 SHA1 a6cd0fe392570c7f8cef06c4d6a9b40a9d3bade5 SHA256 2aa53c245fd6699b2fc6c8fc8cebc1e2adb9a2e21b4a0ed42a7bbbf683359f9c
 EBUILD mesa-7.7.1.ebuild 5919 RMD160 97633f16c396dea545630420c1b0e9c7a4cf1ead SHA1 7301512aed33c77a580580eadf7d8f8242d4a748 SHA256 c75b73aa1b31aeec6279aa8afc9eef8e0e154748bbdd5e8662bdb6b0a9b6af09
 EBUILD mesa-7.8.2.ebuild 6589 RMD160 fbcbf95df7b7876727bae39104609063fa7a75d3 SHA1 444761f93664438095caaa398b4a6cb68cc136ea SHA256 aa6b629f9b0bf603c7e5c1bec7e0d3f196df70b048bbf43e0e822e1f1cd52049
 EBUILD mesa-7.9.1.ebuild 8830 RMD160 73ea9156498e503068f5ae3a653b50b0026c9ee1 SHA1 11639ab09fcdf9d528c62845b156eb72847faf85 SHA256 bf4e4dbeafba6dbbf080386e12f8997021f74d08fa35189c2425a46c4ffe17ff
 EBUILD mesa-7.9.ebuild 8869 RMD160 59d6db323f0d44242d37edc6e0848ad6bcc5b5d5 SHA1 61a8806d4818f7e394b7ca5f5b47b959cc769150 SHA256 d63a341c6fde5fd3638fd9ff6dfb85baaa70e7859c6d93fe3759a859f7026561
-MISC ChangeLog 52385 RMD160 94a6fa6c648a7029447d430dfd155c1d8a5dec2a SHA1 29b3924c9e3ba9adcc6f6be6025654260f6eec97 SHA256 6e8cce65ed34cf2bafeee0bc35ced609363c4c1786e08199b245adf203eb4cc7
+MISC ChangeLog 52582 RMD160 c75f5810f70bd97303489b743a378a19f1f0a642 SHA1 3c51a81799bce8bb9ea74f1ae7d33da78c5d5b4e SHA256 949ee4c9037a6d9e98725d5d3638e400c3a2ed180bf9aca7ec94ff37a9f48c5a
 MISC metadata.xml 560 RMD160 7c8109dd5de8c3a809ae27690d50f9d85e201ac9 SHA1 6d640e373282205f6755c647bb907e9b66ab390a SHA256 67727cfae939284efe0ce0a48b1c5d54193bf5bf1c63f9b41b621dbc937f9f37
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch
new file mode 100644
index 000000000000..495b7dc4ac56
--- /dev/null
+++ b/media-libs/mesa/files/glx_ro_text_segm.patch
@@ -0,0 +1,28 @@
+2011-02-09	Jeremy Huddleston <jeremyhu@freedesktop.org
+
+	#240956
+	* configure.ac	add support to enable readonly test segment on x86
+
+--- configure.ac.orig	2008-11-17 23:19:38.000000000 +0100
++++ configure.ac	2008-11-17 23:20:17.000000000 +0100
+@@ -499,6 +499,20 @@
+     enable_xcb=no
+ fi
+ 
++
++dnl readonly text segment on x86 hardened platforms
++AC_ARG_ENABLE([glx_rts],
++    [AS_HELP_STRING([--enable-glx-rts],
++        [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
++    [enable_glx_rts="$enableval"],
++    [enable_glx_rts=no])
++if test "x$enable_glx_rts" = xyes; then
++    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
++else
++    enable_glx_rts=no
++fi
++
++
+ dnl
+ dnl libGL configuration per driver
+ dnl
diff --git a/media-libs/mesa/mesa-7.10.ebuild b/media-libs/mesa/mesa-7.10-r1.ebuild
index e4f80870b202..6e3c0b72ae24 100644
--- a/media-libs/mesa/mesa-7.10.ebuild
+++ b/media-libs/mesa/mesa-7.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.2 2011/01/27 16:44:03 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10-r1.ebuild,v 1.1 2011/02/09 22:25:09 zorry Exp $
 
 EAPI=3
 
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic debug +gallium gles llvm motif +nptl pic selinux kernel_FreeBSD"
+	+classic debug +gallium gles llvm motif +nptl pic selinux kernel_FreeBSD hardened"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.23"
 # keep correct libdrm and dri2proto dep
@@ -134,6 +134,10 @@ src_prepare() {
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
+
+	# bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+	
 	# FreeBSD 6.* doesn't have posix_memalign().
 	if [[ ${CHOST} == *-freebsd6.* ]]; then
 		sed -i \
@@ -218,6 +222,9 @@ src_configure() {
 		fi
 	fi
 
+	# bug 240956
+	use x86 && myconf="${myconf} $(use_enable hardened glx-rts)"
+
 	# --with-driver=dri|xlib|osmesa || do we need osmesa?
 	econf \
 		--disable-option-checking \