summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2005-04-21 18:36:17 +0000
committerTim Yamin <plasmaroo@gentoo.org>2005-04-21 18:36:17 +0000
commit4e68e81048e31af2a5736f31f53ef14bc158d6f9 (patch)
treed361efdad830619259579f032b7162d083f8ab22 /sys-kernel/linux-headers
parentstable amd64 (diff)
downloadhistorical-4e68e81048e31af2a5736f31f53ef14bc158d6f9.tar.gz
historical-4e68e81048e31af2a5736f31f53ef14bc158d6f9.tar.bz2
historical-4e68e81048e31af2a5736f31f53ef14bc158d6f9.zip
Fix #89836.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/ChangeLog6
-rw-r--r--sys-kernel/linux-headers/Manifest4
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch10
3 files changed, 16 insertions, 4 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 3370b3682001..279fa041a477 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/linux-headers
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.116 2005/04/19 23:34:45 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.117 2005/04/21 18:36:17 plasmaroo Exp $
+
+ 21 Apr 2005; <plasmaroo@gentoo.org>
+ files/linux-headers-2.6.11-appCompat.patch:
+ Fix #89836.
20 Apr 2005; <plasmaroo@gentoo.org>
files/linux-headers-2.6.11-appCompat.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 7d86f96a2371..8dabbc89be0b 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 24c2104f56338cde6d2dec631d302c40 ChangeLog 25060
+MD5 8f6bd9c6589f405f2e938dc5da135847 ChangeLog 25159
MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
MD5 e9a0370039c1d4fe1b0f7c0be1eef478 linux-headers-2.6.11.ebuild 1522
@@ -18,7 +18,7 @@ MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
-MD5 f2325e7a77a6c1e7bdbef48ea85be4ee files/linux-headers-2.6.11-appCompat.patch 74767
+MD5 a327db63a1147273a4f33ad0efe7064a files/linux-headers-2.6.11-appCompat.patch 74903
MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
index f500f50f5237..52353f5d6d01 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
@@ -398,7 +398,7 @@ diff -ur linux-2.6.0/include/linux/types.h linux-2.6.0/include/linux.gentoo/type
#endif /* __KERNEL__ */
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-@@ -176,10 +157,8 @@
+@@ -176,16 +157,16 @@
typedef __u16 __bitwise __be16;
typedef __u32 __bitwise __le32;
typedef __u32 __bitwise __be32;
@@ -407,8 +407,16 @@ diff -ur linux-2.6.0/include/linux/types.h linux-2.6.0/include/linux.gentoo/type
typedef __u64 __bitwise __be64;
-#endif
++#ifndef _SYS_TYPES_H
struct ustat {
__kernel_daddr_t f_tfree;
+ __kernel_ino_t f_tinode;
+ char f_fname[6];
+ char f_fpack[6];
+ };
++#endif
+
+ #endif /* _LINUX_TYPES_H */
diff -ur linux-2.6.8.1/include/asm-generic/siginfo.h linux-2.6.8.1-gentoo/include/asm-generic/siginfo.h
--- linux-2.6.8.1/include/asm-generic/siginfo.h 2004-01-19 20:18:36.000000000 +0000
+++ linux-2.6.8.1-gentoo/include/asm-generic/siginfo.h 2004-01-19 20:01:11.000000000 +0000