Fixed a few more asm-sparc / glibc problems. Not bumping because it's not affecting many packages and not many people are using 2.6 headers on sparc.

5 files changed, 132 insertions, 27 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 2a3750d11ac1..01570f456e28 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.37 2004/11/29 03:07:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.38 2004/12/07 23:42:08 eradicator Exp $
+
+  07 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch,
+  -files/linux26-headers-2.6.8.1-sparc-signal_h.patch,
+  linux26-headers-2.6.8.1-r1.ebuild:
+  Fixed a few more asm-sparc / glibc problems. Not bumping because it's not
+  affecting many packages and not many people are using 2.6 headers on sparc.
 
   28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/linux26-headers-2.6.8.1-sparc-signal_h.patch,
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index 14202b33818a..5a1c96705af9 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,38 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 10c84eaa24b525439885d4040b4fd216 ChangeLog 8616
+MD5 55fac499571e2eef86274fab2b9e34e0 ChangeLog 8976
 MD5 58516a09eebcaa2239ea0b70f310484e linux26-headers-2.6.8.1.ebuild 3895
+MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
+MD5 dfd568bac7a9a63656bb225c499b72fe linux26-headers-2.6.8.1-r1.ebuild 4779
 MD5 89403525f4da5e8458fd7f720d6de6ee linux26-headers-2.6.6-r1.ebuild 4223
 MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031
-MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
-MD5 8559f80e3a71510d73397917e8d01243 linux26-headers-2.6.8.1-r1.ebuild 4774
 MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1 68
 MD5 14a0de85d11206096f05e186cebab07b files/linux26-headers-2.6.8.1-appCompat.patch 53549
 MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
 MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
+MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
+MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631
 MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 602f7309c0163c018627f06b5f1ace3a files/linux26-headers-2.6.8.1-arm-float.patch 640
 MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
 MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608
-MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66
 MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978
+MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66
 MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
-MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68
-MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631
-MD5 9f83b3bf65ac599e58c5b96ed2569963 files/linux26-headers-2.6.8.1-sparc-signal_h.patch 298
-MD5 602f7309c0163c018627f06b5f1ace3a files/linux26-headers-2.6.8.1-arm-float.patch 640
+MD5 5c5cab42cc6280e956a081ef9a56223e files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch 2449
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBtVm1roRuSHgZdywRAvQUAJkBZLOGU6aQQPLSEBET1wU1BuBz+wCePPZE
-IG0BwApTqwg+FpDUOXJDkPg=
-=Qrmw
+iD8DBQFBtj/cArHZZzCEUG0RAhBgAKCAxEdts0CqUUjaUI30ZXEjwfO0wgCfdIS7
+Jk5a02nawCxe0UUzeLwAebs=
+=c636
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch
new file mode 100644
index 000000000000..04e26fd0d428
--- /dev/null
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch
@@ -0,0 +1,108 @@
+--- linux/include/asm-sparc/signal.h.orig	2004-12-07 14:53:47.747817312 -0800
++++ linux/include/asm-sparc/signal.h	2004-12-07 14:52:42.165787296 -0800
+@@ -3,6 +3,7 @@
+ #define _ASMSPARC_SIGNAL_H
+ 
+ #include <asm/sigcontext.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+@@ -113,11 +114,14 @@
+ 	unsigned long	sig[_NSIG_WORDS];
+ } __new_sigset_t;
+ 
++
++#ifndef _SIGNAL_H
+ /* A SunOS sigstack */
+ struct sigstack {
+ 	char *the_stack;
+ 	int   cur_status;
+ };
++#endif
+ 
+ /* Sigvec flags */
+ #define _SV_SSTACK    1u    /* This signal handler should use sig-stack */
+@@ -191,12 +195,14 @@
+ #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
+ #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
+ 
++#ifndef _SIGNAL_H
+ struct __new_sigaction {
+ 	__sighandler_t	sa_handler;
+ 	unsigned long	sa_flags;
+ 	void		(*sa_restorer)(void);	/* Not used by Linux/SPARC */
+ 	__new_sigset_t	sa_mask;
+ };
++#endif
+ 
+ #ifdef __KERNEL__
+ struct k_sigaction {
+@@ -205,6 +211,7 @@
+ };
+ #endif
+ 
++#ifndef _SIGNAL_H
+ struct __old_sigaction {
+ 	__sighandler_t	sa_handler;
+ 	__old_sigset_t	sa_mask;
+@@ -217,6 +224,7 @@
+ 	int		ss_flags;
+ 	size_t		ss_size;
+ } stack_t;
++#endif
+ 
+ #ifdef __KERNEL__
+ struct sparc_deliver_cookie {
+--- linux/include/asm-sparc/sigcontext.h.orig	2004-12-07 14:46:54.492641648 -0800
++++ linux/include/asm-sparc/sigcontext.h	2004-12-07 15:04:19.167826880 -0800
+@@ -4,9 +4,9 @@
+ 
+ #ifdef __KERNEL__
+ #include <asm/ptrace.h>
+-#endif
+ 
+ #ifndef __ASSEMBLY__
++#ifndef _SIGNAL_H
+ 
+ #define __SUNOS_MAXWIN   31
+ 
+@@ -57,8 +57,6 @@
+ 	} si_fpqueue [16];
+ } __siginfo_fpu_t;
+ 
+-#ifdef __KERNEL__
+-
+ /* This magic should be in g_upper[0] for all upper parts
+    to be valid.
+    This is generated by sparc64 only, but for 32bit processes,
+@@ -69,8 +67,13 @@
+ 	unsigned   int o_upper[8];
+ } siginfo_extra_v8plus_t;
+ 
+-#endif
++#endif /* !(_SIGNAL_H) */
+ 
+ #endif /* !(__ASSEMBLY__) */
+ 
++#else /* !(__KERNEL__) */
++#include <signal.h> /* Pulls in <bits/sigcontext.h> which contains both /*
++                    /* of these structures... */
++#endif
++
+ #endif /* !(__SPARC_SIGCONTEXT_H) */
+--- linux/include/asm-sparc/processor.h.orig	2004-12-07 15:14:37.267861392 -0800
++++ linux/include/asm-sparc/processor.h	2004-12-07 15:14:49.898941176 -0800
+@@ -43,10 +43,12 @@
+ 
+ struct task_struct;
+ 
++#ifndef _SYS_UCONTEXT_H
+ struct fpq {
+ 	unsigned long *insn_addr;
+ 	unsigned long insn;
+ };
++#endif
+ 
+ typedef struct {
+ 	int seg;
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-signal_h.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-signal_h.patch
deleted file mode 100644
index e8fce9ed4f95..000000000000
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-signal_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux/include/asm-sparc/signal.h.orig	2004-07-20 11:04:38.459721480 -0700
-+++ linux/include/asm-sparc/signal.h	2004-07-20 11:06:06.945067814 -0700
-@@ -3,6 +3,7 @@
- #define _ASMSPARC_SIGNAL_H
- 
- #include <asm/sigcontext.h>
-+#include <linux/compiler.h>
- 
- #ifdef __KERNEL__
- #ifndef __ASSEMBLY__
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
index 35ed1f9327de..83aa64f3a436 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.15 2004/12/07 07:18:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.16 2004/12/07 23:42:08 eradicator Exp $
 
 # What's in this kernel?
 
@@ -67,7 +67,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch
 	epatch ${FILESDIR}/${P}-strict-ansi-fix.patch
 	epatch ${FILESDIR}/${P}-appCompat.patch
-	epatch ${FILESDIR}/${P}-sparc-signal_h.patch
+	epatch ${FILESDIR}/${P}-sparc-glibcsafe.patch
 	epatch ${FILESDIR}/${PN}-soundcard-ppc64.patch
 	epatch ${FILESDIR}/${P}-arm-float.patch