From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2A9DD198005 for ; Sat, 16 Mar 2013 19:30:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 018B4E058A; Sat, 16 Mar 2013 19:29:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78D37E058A for ; Sat, 16 Mar 2013 19:29:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F57233D3DA for ; Sat, 16 Mar 2013 19:29:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 94FCAE4079 for ; Sat, 16 Mar 2013 19:29:53 +0000 (UTC) From: "Emil Karlson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Emil Karlson" Message-ID: <1363462125.91c38c79280b01fed8607467f72a94c7de49f383.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: 91c38c79280b01fed8607467f72a94c7de49f383 X-VCS-Branch: master Date: Sat, 16 Mar 2013 19:29:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7dcc6aa-94a9-4027-bcf4-1213247643aa X-Archives-Hash: 04fe2fcb33803e476b3a464bb6fd25fa commit: 91c38c79280b01fed8607467f72a94c7de49f383 Author: Emil Karlson gmail com> AuthorDate: Sat Mar 16 19:28:45 2013 +0000 Commit: Emil Karlson gmail com> CommitDate: Sat Mar 16 19:28:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=91c38c79 ati-drivers: hardened updates. --- .../ati-drivers/ati-drivers-13.2_beta7.ebuild | 23 ++++++++++++++++++- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild index 103ef58..ce4783f 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator +inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com" @@ -145,7 +145,7 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP" +CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" use amd64 && CONFIG_CHECK="${CONFIG_CHECK} COMPAT" ERROR_MTRR="CONFIG_MTRR required for direct rendering." ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct @@ -153,6 +153,10 @@ ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded fo ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire as GPL-only. This prevents ${P} from compiling with an error like this: FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" +ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause + kernel to reject loading the fglrx module with + \"ERROR: could not insert 'fglrx': Exec format error.\" + You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." _check_kernel_config() { if ! linux_chkconfig_present AGP && \ @@ -550,6 +554,15 @@ src_install-libs() { #install xvba sdk headers doheader xvba_sdk/include/amdxvba.h + + if use pax_kernel; then + pax-mark Cm "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" + eqawarn "You have set USE=pax_kernel meaning that you intend to run" + eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" + eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is being broken by this modification," + eqawarn "please open a bug." + fi } pkg_postinst() { @@ -579,6 +592,12 @@ pkg_postinst() { ewarn "try disabling sna for xf86-video-intel." ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" fi + + if use pax_kernel; then + ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and" + ewarn "after you have run \"eselect opengl set ati\". Executacle" + ewarn "revdep-pax is part of package sys-apps/elfix." + fi } pkg_preinst() {