old

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 0 insertions, 210 deletions

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
deleted file mode 100644
index 85f9aff70b30..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/drmP.h
-+++ work/common/lib/modules/fglrx/build_mod/drmP.h
-@@ -42,7 +42,11 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -28,7 +28,11 @@
- #error Kernel versions older than 2.6.0 are no longer supported by this module.
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
-@@ -163,8 +167,12 @@
- 
- //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
- #ifndef UTS_RELEASE 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/utsrelease.h>
-+#else
- #include <linux/utsrelease.h>
- #endif
-+#endif
- 
- #if defined(__i386__)
- #ifndef do_div
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -15,7 +15,11 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/acpi.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/agp_backend.h>
- #include <linux/string.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -37,7 +37,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/poll.h>
- #include <linux/signal.h>
- #include <asm/io.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-+++ work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-@@ -20,7 +20,11 @@
- #define KCL_OSCONFIG_H
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
- #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_pci.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_pci.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_str.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_str.c
-@@ -30,7 +30,12 @@
-  *
-  */
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/string.h>
- #include <linux/module.h>
- 
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
deleted file mode 100644
index 1993d134c23c..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 20:02:46.494496561 +0200
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 19:52:00.054563389 +0200
-@@ -39,6 +39,7 @@
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-+#include <linux/slab.h>
-
- #include "kcl_config.h"
- #include "kcl_wait.h"
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch b/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch
deleted file mode 100644
index 5a71da10eb40..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
- *                                                                          *
- * Copyright 1999-2005 ATI Technologies Inc., Markham, Ontario, CANADA.     *
- * All Rights Reserved.                                                     *
- *                                                                          *
- * Your use and or redistribution of this software in source and \ or       *
- * binary form, with or without modification, is subject to: (i) your       *
- * ongoing acceptance of and compliance with the terms and conditions of    *
- * the ATI Technologies Inc. software End User License Agreement; and (ii)  *
- * your inclusion of this notice in any version of this software that you   *
- * use or redistribute.  A copy of the ATI Technologies Inc. software End   *
- * User License Agreement is included with this software and is also        *
- * available by contacting ATI Technologies Inc. at http://www.ati.com      *
- *                                                                          *
- ****************************************************************************/
-
---- common/lib/modules/fglrx/build_mod/kcl_ioctl.c.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-23 01:41:46.711844303 +0200
-@@ -35,6 +35,9 @@
- 
- #ifdef __x86_64__
- #   include "asm/compat.h"
-+#   if ARCH_COMPAT_ALLOC_USER_SPACE
-+#      include "linux/compat.h"
-+#   endif
- #   if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #       if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #           include "linux/ioctl32.h"
-@@ -193,7 +196,20 @@
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    void __user *ptr;
-+
-+    /* If size would occupy more than half of the entire compat space... */
-+    if (unlikely(size > (((compat_uptr_t)~0) >> 1)))
-+        return NULL;
-+#if ARCH_COMPAT_ALLOC_USER_SPACE
-+    ptr = arch_compat_alloc_user_space(size);
-+#else
-+    ptr = compat_alloc_user_space(size);
-+#endif
-+    if (unlikely(!access_ok(VERIFY_WRITE, ptr, size)))
-+        return NULL;
-+
-+    return ptr;
- }
- 
- #endif // __x86_64__
---- common/lib/modules/fglrx/build_mod/2.6.x/Makefile.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-23 01:47:46.533415019 +0200
-@@ -66,6 +66,7 @@
-                 -DFGL_GART_RESERVED_SLOT \
-                 -DFGL_LINUX253P1_VMA_API \
-                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DARCH_COMPAT_ALLOC_USER_SPACE=$(ARCH_COMPAT_ALLOC_USER_SPACE) \
- 
- ifeq ($(KERNELRELEASE),)
- # on first call from remote location we get into this path