Port tasklist_lock patch to 1.5 series

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 36 insertions, 10 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 247ec89c8334..5e55aa50c2a1 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.43 2006/12/03 08:14:42 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.44 2006/12/22 14:52:24 stefaan Exp $
+
+  22 Dec 2006; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/tasklist_lock_1.5.12.patch, openafs-kernel-1.5.12.ebuild:
+  Port tasklist_lock patch to 1.5 series
 
 *openafs-kernel-1.5.12 (03 Dec 2006)
 
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 7f8a3ebed36d..1f7a579ee2b1 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -2,6 +2,10 @@ AUX tasklist_lock.patch 1330 RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 SHA
 MD5 cc82a85a267672eb495404a080ccbdae files/tasklist_lock.patch 1330
 RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 files/tasklist_lock.patch 1330
 SHA256 ed2300a9f9a5baefd4a84dc81e1a7c4e2e19f2c5f9aada73989a95285ed72a89 files/tasklist_lock.patch 1330
+AUX tasklist_lock_1.5.12.patch 439 RMD160 437c5481022d67ad13b6c59c681f1609c320f6df SHA1 92c5817ca5cdee0c62bd764485112b56c3d76b10 SHA256 9b315524aa054e31dc40fd4bf642959d2f53df2ba5b80d5e142c578a6b6a2b7f
+MD5 f7dbe84e3964282021a7b4da076feff6 files/tasklist_lock_1.5.12.patch 439
+RMD160 437c5481022d67ad13b6c59c681f1609c320f6df files/tasklist_lock_1.5.12.patch 439
+SHA256 9b315524aa054e31dc40fd4bf642959d2f53df2ba5b80d5e142c578a6b6a2b7f files/tasklist_lock_1.5.12.patch 439
 DIST openafs-1.2.13-src.tar.bz2 10354615
 DIST openafs-1.4.0-src.tar.bz2 11268368 RMD160 96cac36c5f0e0891b8a77506003d9bda448dce23 SHA1 09839a6bc71da3902f591c4f4f3c27cb63168195 SHA256 439f4efee7f01f5859ae7b283df793c366e473a877cec687e58af02505a9e52c
 DIST openafs-1.4.1-src.tar.bz2 11244316 RMD160 f842cc0ba7c434eea82721528c0449a307aea62b SHA1 8f2ba479dfdc32e7471555f4a19493839bdd736f SHA256 9563259772342ce50c5efd1c2c96cf643f4e9c818e1922e48a3d9183bb7fece6
@@ -32,14 +36,14 @@ EBUILD openafs-kernel-1.4.2.ebuild 1442 RMD160 2bbea1ebab8336076f94b86fb31655087
 MD5 36adfb79c25d8e5d4f7e321692dc615d openafs-kernel-1.4.2.ebuild 1442
 RMD160 2bbea1ebab8336076f94b86fb31655087ccf9c4f openafs-kernel-1.4.2.ebuild 1442
 SHA256 976a099364d8e8579c2ec2230b79c03081e81c0b5a9fa704f78b93c06483c777 openafs-kernel-1.4.2.ebuild 1442
-EBUILD openafs-kernel-1.5.12.ebuild 1467 RMD160 3eea2aea1640b313df2ae32bae67f7b24eb5d079 SHA1 cce5d1be69f218d9570c68c19bfab2e11795fb7e SHA256 525c7599d8aaa734154a23ef7b8b61e77ffe4fc40f666bee521263b97f926c96
-MD5 de8a70d96e592ff74d1c48141df44907 openafs-kernel-1.5.12.ebuild 1467
-RMD160 3eea2aea1640b313df2ae32bae67f7b24eb5d079 openafs-kernel-1.5.12.ebuild 1467
-SHA256 525c7599d8aaa734154a23ef7b8b61e77ffe4fc40f666bee521263b97f926c96 openafs-kernel-1.5.12.ebuild 1467
-MISC ChangeLog 6695 RMD160 2d49c3fdff4b2fe3b092296f93105be029c697c9 SHA1 9b56bf00db38727adb3049700ee08c04bde47c2f SHA256 38503230da74190e420325ee57c40a8fdd619a798cb943400d12a1af139e874e
-MD5 80c81ac63d9135f651c52b8338e610fa ChangeLog 6695
-RMD160 2d49c3fdff4b2fe3b092296f93105be029c697c9 ChangeLog 6695
-SHA256 38503230da74190e420325ee57c40a8fdd619a798cb943400d12a1af139e874e ChangeLog 6695
+EBUILD openafs-kernel-1.5.12.ebuild 1563 RMD160 9af9c2dacf9cec8c4ecfd06e05af3562d9d13a58 SHA1 28499e97240258097d70b95b379590ddb5b0fcda SHA256 cda42ad95314c7176c47db09537130da5d7f10251fcfd3030874e675a0e445c6
+MD5 4195eb2791df811376530bf8600099a5 openafs-kernel-1.5.12.ebuild 1563
+RMD160 9af9c2dacf9cec8c4ecfd06e05af3562d9d13a58 openafs-kernel-1.5.12.ebuild 1563
+SHA256 cda42ad95314c7176c47db09537130da5d7f10251fcfd3030874e675a0e445c6 openafs-kernel-1.5.12.ebuild 1563
+MISC ChangeLog 6857 RMD160 596826d0b1575c610bc0b8ab9a535f0af300149d SHA1 1a354362b2104c144e2b71fb41ffac14113ca578 SHA256 ad78737b39789383711a9768d99ccda12d7e7b53878d3e4ef05112078fc0eda4
+MD5 909b826c340a6a6cbb95bb092590324d ChangeLog 6857
+RMD160 596826d0b1575c610bc0b8ab9a535f0af300149d ChangeLog 6857
+SHA256 ad78737b39789383711a9768d99ccda12d7e7b53878d3e4ef05112078fc0eda4 ChangeLog 6857
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254
 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254
diff --git a/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch b/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch
new file mode 100644
index 000000000000..72553d92f767
--- /dev/null
+++ b/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch
@@ -0,0 +1,15 @@
+--- src/afs/afs_osi_gcpags.c.old	2006-12-14 14:05:13.000000000 +0100
++++ src/afs/afs_osi_gcpags.c	2006-12-14 14:05:28.000000000 +0100
+@@ -226,11 +226,11 @@
+ #endif
+ 
+ #if defined(AFS_LINUX22_ENV)
++extern rwlock_t tasklist_lock __attribute__((weak));
+ void
+ afs_osi_TraverseProcTable()
+ {
+ #if !defined(LINUX_KEYRING_SUPPORT)
+-    extern rwlock_t tasklist_lock __attribute__((weak));
+     struct task_struct *p;
+  
+     if (&tasklist_lock)
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild
index 5141c2ebd6b9..c523f4a18674 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild,v 1.1 2006/12/03 08:14:42 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild,v 1.2 2006/12/22 14:52:24 stefaan Exp $
 
 inherit eutils linux-mod versionator toolchain-funcs
 
@@ -32,6 +32,9 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
 
+	# fix unresolved symbol on amd64 (bug #149274)
+	epatch ${FILESDIR}/tasklist_lock_1.5.12.patch
+
 	./regen.sh || die "Failed: regenerating configure script"
 }