Added a HID_MAX_USAGES definition to solve apcupsd compilation issues, bug #55951. AMD64 2.6.7 iptables issues as per bug #55928 should also now be solved. Added a fix to touch <linux/autoconf.h> in ${ROOT} if it does not exist before installation to solve the empty <linux/autoconf.h> issue - closes bug #51935.

2 files changed, 34 insertions, 6 deletions

diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.6-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.6-appCompat.patch
index 85b8947455eb..5f4dd16c1412 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.6-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.6-appCompat.patch
@@ -880,4 +880,15 @@ diff -ur linux-2.6.6/include/linux/percpu_counter.h linux-2.6.6-gentoo/include/l
  #include <linux/config.h>
  #include <linux/spinlock.h>
  #include <linux/smp.h>
-
+diff -ur linux-2.6.6/include/linux/hiddev.h linux-2.6.6-gentoo/include/linux/hiddev.h
+--- linux-2.6.6/include/linux/hiddev.h	2004-06-12 12:11:54.000000000 +0100
++++ linux-2.6.6-gentoo/include/linux/hiddev.h	2004-07-10 00:13:36.584448824 +0100
+@@ -33,6 +33,8 @@
+  * The event structure itself
+  */
+ 
++#define HID_MAX_USAGES 1024 /* From: drivers/usb/input/hid.h */
++
+ struct hiddev_event {
+ 	unsigned hid;
+ 	signed int value;
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
index 6b01dee8f017..9d8492cc2adf 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
@@ -799,23 +799,28 @@ diff -ur linux-2.6.6/include/linux/audit.h linux-2.6.6-gentoo/include/linux/audi
  struct audit_message {
  	struct nlmsghdr nlh;
  	char		data[1200];
-diff -ur linux-2.6.6/include/asm-x86_64/sigcontext.h linux-2.6.6-gentoo/include/asm-x86_64/sigcontext.h
---- linux-2.6.6/include/asm-x86_64/sigcontext.h	2004-05-25 17:47:07.000000000 +0100
-+++ linux-2.6.6-gentoo/include/asm-x86_64/sigcontext.h	2004-06-02 22:04:52.000000000 +0100
-@@ -6,6 +6,8 @@
+diff -ur linux-2.6.7/include/asm-x86_64/sigcontext.h linux-2.6.7-gentoo/include/asm-x86_64/sigcontext.h
+--- linux-2.6.7/include/asm-x86_64/sigcontext.h	2004-05-25 17:47:07.000000000 +0100
++++ linux-2.6.7-gentoo/include/asm-x86_64/sigcontext.h	2004-06-02 22:04:52.000000000 +0100
+@@ -7,6 +7,12 @@
  /* FXSAVE frame */
  /* Note: reserved1/2 may someday contain valuable data. Always save/restore
     them when you change signal frames. */
 +
++#ifndef __KERNEL__
++#include <signal.h> /* Pulls in <bits/sigcontext.h> which contains both /*
++                    /* of these structures... */
++#else
 +#ifndef _SIGNAL_H
  struct _fpstate {
  	__u16	cwd;
  	__u16	swd;
-@@ -52,3 +54,4 @@
+@@ -53,3 +59,5 @@
  };
  
  #endif
 +#endif
++#endif
 diff -ur linux-2.6.6/include/linux/gfp.h linux-2.6.6-gentoo/include/linux/gfp.h
 --- linux-2.6.6/include/linux/gfp.h	2004-04-04 04:36:52.000000000 +0100
 +++ linux-2.6.6-gentoo/include/linux/gfp.h	2004-05-11 19:51:06.412779200 +0100
@@ -986,3 +991,15 @@ diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/c
  #ifdef __KERNEL__
  
  #ifndef __ASSEMBLY__
+diff -ur linux-2.6.6/include/linux/hiddev.h linux-2.6.6-gentoo/include/linux/hiddev.h
+--- linux-2.6.6/include/linux/hiddev.h	2004-06-12 12:11:54.000000000 +0100
++++ linux-2.6.6-gentoo/include/linux/hiddev.h	2004-07-10 00:13:36.584448824 +0100
+@@ -33,6 +33,8 @@
+  * The event structure itself
+  */
+ 
++#define HID_MAX_USAGES 1024 /* From: drivers/usb/input/hid.h */
++
+ struct hiddev_event {
+ 	unsigned hid;
+ 	signed int value;