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 43C191381F3 for ; Sat, 15 Jun 2013 16:49:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C98D8E0969; Sat, 15 Jun 2013 16:49:37 +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 56E1BE0969 for ; Sat, 15 Jun 2013 16:49:37 +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 2324133E246 for ; Sat, 15 Jun 2013 16:49:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 88905E468F for ; Sat, 15 Jun 2013 16:49:33 +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: <1371314536.dffa21cd50ef2c8082a25561225d156601a147f1.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild x11-drivers/ati-drivers/ati-drivers-13.4.ebuild x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild x11-drivers/ati-drivers/files/linux-3.9-kuid.diff x11-drivers/ati-drivers/files/typesafe-kuid.diff X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: dffa21cd50ef2c8082a25561225d156601a147f1 X-VCS-Branch: master Date: Sat, 15 Jun 2013 16:49:33 +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: 3ffe9e51-4288-4ca0-9edd-94e6241368c5 X-Archives-Hash: 1e445ae7550acacc7d0e2f65dfcfb0ae commit: dffa21cd50ef2c8082a25561225d156601a147f1 Author: Emil Karlson gmail com> AuthorDate: Sat Jun 15 16:42:16 2013 +0000 Commit: Emil Karlson gmail com> CommitDate: Sat Jun 15 16:42:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=dffa21cd x11-drivers/ati-drivers: typesafe-kuid diff also needed for older kernels linux-3.5...3.8 --- .../ati-drivers/ati-drivers-13.1_pre897.ebuild | 2 +- x11-drivers/ati-drivers/ati-drivers-13.4.ebuild | 2 +- .../ati-drivers/ati-drivers-13.6_beta.ebuild | 2 +- x11-drivers/ati-drivers/files/linux-3.9-kuid.diff | 33 --------------------- x11-drivers/ati-drivers/files/typesafe-kuid.diff | 34 ++++++++++++++++++++++ 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild index 636830b..b95fad7 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild @@ -302,7 +302,7 @@ src_prepare() { use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/linux-3.9-kuid.diff" + epatch "${FILESDIR}/typesafe-kuid.diff" epatch "${FILESDIR}/linux-3.10-proc.diff" diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild index d8bfdb1..ad6484c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild @@ -313,7 +313,7 @@ src_prepare() { epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/linux-3.9-kuid.diff" + epatch "${FILESDIR}/typesafe-kuid.diff" epatch "${FILESDIR}/linux-3.10-proc.diff" diff --git a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild index 5c856fc..edd4825 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild @@ -313,7 +313,7 @@ src_prepare() { epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/linux-3.9-kuid.diff" + epatch "${FILESDIR}/typesafe-kuid.diff" epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff" diff --git a/x11-drivers/ati-drivers/files/linux-3.9-kuid.diff b/x11-drivers/ati-drivers/files/linux-3.9-kuid.diff deleted file mode 100644 index 7e910d9..0000000 --- a/x11-drivers/ati-drivers/files/linux-3.9-kuid.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur common/lib/modules/fglrx/build_mod/firegl_public.c common-r1/lib/modules/fglrx/build_mod/firegl_public.c ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2013-04-17 00:29:55.000000000 +0300 -+++ common-r1/lib/modules/fglrx/build_mod/firegl_public.c 2013-05-11 00:37:44.653966585 +0300 -@@ -34,6 +34,11 @@ - #include - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -+#include -+#endif -+ -+ - #if !defined(CONFIG_X86) - #if !defined(CONFIG_X86_PC) - #if !defined(CONFIG_X86_XEN) -@@ -1543,9 +1548,17 @@ - KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void) - { - #ifdef current_euid -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -+ return __kuid_val(current_euid()); -+# else - return current_euid(); -+# endif - #else -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -+ return __kuid_val(current->euid); -+# else - return current->euid; -+# endif - #endif - } - diff --git a/x11-drivers/ati-drivers/files/typesafe-kuid.diff b/x11-drivers/ati-drivers/files/typesafe-kuid.diff new file mode 100644 index 0000000..c226ea3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/typesafe-kuid.diff @@ -0,0 +1,34 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index d3ad3ce..9362b58 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -34,6 +34,11 @@ + #include + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) ++#include ++#endif ++ ++ + #if !defined(CONFIG_X86) + #if !defined(CONFIG_X86_PC) + #if !defined(CONFIG_X86_XEN) +@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void) + KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void) + { + #ifdef current_euid ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) ++ return __kuid_val(current_euid()); ++# else + return current_euid(); ++# endif + #else ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) ++ return __kuid_val(current->euid); ++# else + return current->euid; ++# endif + #endif + } +