From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 28 Oct 2005 01:08:43 +0000 (+0000)
Subject: add back in pic patch and fix syscall6 #100659 Peter Beutner
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0c10e56c362370c60c17a8418e1d0d1382d134d;p=gentoo.git

add back in pic patch and fix syscall6 #100659 Peter Beutner
Package-Manager: portage-2.0.53_rc6
---

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index c0e3fa8b64f0..9db1d0374ddc 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3d1dbc6f5243c5668bed5cb7cddba3cf ChangeLog 29493
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
@@ -18,7 +21,7 @@ MD5 1c81c4ed9c2867aa281bbabbf507e096 files/linux-headers-2.4-arm-cris-ELF_DATA.p
 MD5 76c239f03201f79b357eafb37e213bb6 files/linux-headers-2.4-armeb-stat.patch 1406
 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
-MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
+MD5 833edf786e2038e76bf5de8de80a3b7a files/unistd.h-i386-pic.patch 4312
 MD5 716932740170ef6fda36c412ae06879a linux-headers-2.0.40.ebuild 1808
 MD5 1c43697b46cd87859708b7601424a258 linux-headers-2.2.26.ebuild 2502
 MD5 83dfc41af41e560a10c1f0ed5c2a8c11 linux-headers-2.4.21-r1.ebuild 3933
@@ -28,8 +31,15 @@ MD5 c29c48dc661695aeebaf78abbe8a81c3 linux-headers-2.4.22.ebuild 4017
 MD5 35c5f3bbb5efdf7b8c5fc97d27f32393 linux-headers-2.4.23.ebuild 3470
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
 MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
-MD5 344773c5cc23b2e4db19368f44b1206d linux-headers-2.4.26-r1.ebuild 517
+MD5 dcee8575f1f399a0b44307bbb839dbcc linux-headers-2.4.26-r1.ebuild 552
 MD5 6a3b45eded92aace1a5df1a478fa977b linux-headers-2.4.26.ebuild 3340
 MD5 316e0b929bc443b864614e9434445dd1 linux-headers-2.6.11-r2.ebuild 1536
 MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYXopgIKl8Uu19MoRArqmAJ976kj3KcsOEpPs3jVdG7el925JjACeNLDt
+w2eEaDrDF2EHtQaE6PPa+bA=
+=CqWm
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/files/unistd.h-i386-pic.patch b/sys-kernel/linux-headers/files/unistd.h-i386-pic.patch
index ab0b8ee31d0d..26559769e7c4 100644
--- a/sys-kernel/linux-headers/files/unistd.h-i386-pic.patch
+++ b/sys-kernel/linux-headers/files/unistd.h-i386-pic.patch
@@ -1,5 +1,5 @@
---- ./include/asm-i386/unistd.h.orig	2005-01-29 12:15:26.000000000 +0100
-+++ ./include/asm-i386/unistd.h	2005-01-29 14:41:17.445762872 +0100
+--- include/asm-i386/unistd.h
++++ include/asm-i386/unistd.h
 @@ -314,6 +314,21 @@
  __syscall_return(type,__res); \
  }
@@ -136,10 +136,10 @@
 +long __res; \
 +__asm__ volatile (\
 +	"pushl %%ebp\n\t" \
-+	"movl %%eax,%%ebp\n\t" \
-+	"movl %1,%%eax\n\t" \
 +	"pushl %%ebx\n\t" \
 +	"movl %2,%%ebx\n\t" \
++	"movl %%eax,%%ebp\n\t" \
++	"movl %1,%%eax\n\t" \
 +	"int $0x80\n\t" \
 +	"popl %%ebx\n\t" \
 +	"popl %%ebp\n\t" \
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
index fe307f335430..0139c87573fd 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild,v 1.8 2005/10/26 17:28:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild,v 1.9 2005/10/28 01:08:43 vapier Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="arm m68k sh sparc x86"
@@ -11,4 +11,5 @@ SRC_URI="${KERNEL_URI}"
 KEYWORDS="-* arm m68k sh ~sparc ~x86"
 
 UNIPATCH_LIST="${FILESDIR}/linux-headers-2.4-armeb-stat.patch
-	${FILESDIR}/linux-headers-2.4-arm-cris-ELF_DATA.patch"
+	${FILESDIR}/linux-headers-2.4-arm-cris-ELF_DATA.patch
+	${FILESDIR}/unistd.h-i386-pic.patch"