summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefaan De Roeck <stefaan@gentoo.org>2007-10-13 14:45:38 +0000
committerStefaan De Roeck <stefaan@gentoo.org>2007-10-13 14:45:38 +0000
commit30cae37521c49f84ff449006b32069e20dd5eb3e (patch)
tree088d928955ed7e50fd1e874a014265afe6860dde /net-fs/openafs-kernel
parentFix testsuite. (diff)
downloadhistorical-30cae37521c49f84ff449006b32069e20dd5eb3e.tar.gz
historical-30cae37521c49f84ff449006b32069e20dd5eb3e.tar.bz2
historical-30cae37521c49f84ff449006b32069e20dd5eb3e.zip
Fix problem in combination with sys-kernel/vserver-sources, fixes bug #195407
Package-Manager: portage-2.1.3.12
Diffstat (limited to 'net-fs/openafs-kernel')
-rw-r--r--net-fs/openafs-kernel/ChangeLog6
-rw-r--r--net-fs/openafs-kernel/Manifest20
-rw-r--r--net-fs/openafs-kernel/files/openafs-vserver.patch15
-rw-r--r--net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild3
4 files changed, 34 insertions, 10 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index f8a7632ee133..df1449f5bb54 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.77 2007/10/13 14:19:33 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.78 2007/10/13 14:45:37 stefaan Exp $
+
+ 13 Oct 2007; Stefaan De Roeck <stefaan@gentoo.org>
+ +files/openafs-vserver.patch, openafs-kernel-1.4.5_pre1.ebuild:
+ Fix problem in combination with sys-kernel/vserver-sources, fixes bug #195407
*openafs-kernel-1.4.5_pre1 (13 Oct 2007)
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 961511dc3ee7..c6df9165c3d9 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -10,6 +10,10 @@ AUX openafs-sparc.patch 1562 RMD160 365a1db0b18e6f2bfe19aebd6d9cff466ab52478 SHA
MD5 6f01b51e8167bad1b54a595d9686bf8f files/openafs-sparc.patch 1562
RMD160 365a1db0b18e6f2bfe19aebd6d9cff466ab52478 files/openafs-sparc.patch 1562
SHA256 03c88fd87579aa1300af168b528e95f900df12a58d76f8e57a965542c4b93840 files/openafs-sparc.patch 1562
+AUX openafs-vserver.patch 378 RMD160 fef14b868d278529d01fe161601d762050720eea SHA1 90f8c2b2d33a1454d72a0663e17b01b806d5af34 SHA256 7aa0ce9c087d7539e40ae05fd1896ef81cd4c3b95b9ca87b298afe623e70b179
+MD5 ca5d84ec0b23115f15e40eebb1276e02 files/openafs-vserver.patch 378
+RMD160 fef14b868d278529d01fe161601d762050720eea files/openafs-vserver.patch 378
+SHA256 7aa0ce9c087d7539e40ae05fd1896ef81cd4c3b95b9ca87b298afe623e70b179 files/openafs-vserver.patch 378
AUX tasklist_lock.patch 1330 RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 SHA1 f568adfbbfe0121dfa46f3a9cb18a4722a297403 SHA256 ed2300a9f9a5baefd4a84dc81e1a7c4e2e19f2c5f9aada73989a95285ed72a89
MD5 cc82a85a267672eb495404a080ccbdae files/tasklist_lock.patch 1330
RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 files/tasklist_lock.patch 1330
@@ -68,18 +72,18 @@ EBUILD openafs-kernel-1.4.4_p20070724.ebuild 1707 RMD160 f7fe4401c8de9ebe2d9ca80
MD5 4ee51575f8bbfffeadecbb1976d7db5f openafs-kernel-1.4.4_p20070724.ebuild 1707
RMD160 f7fe4401c8de9ebe2d9ca80a96aeea4bb0cbb4ed openafs-kernel-1.4.4_p20070724.ebuild 1707
SHA256 60ccd6fbc3dd362d84d8ade588084ee49587e1e7e48666ee11c179c2df5ff334 openafs-kernel-1.4.4_p20070724.ebuild 1707
-EBUILD openafs-kernel-1.4.5_pre1.ebuild 1725 RMD160 9d536e6791689e6d47a1e1c8a55ec19c0d8494f8 SHA1 82a5599ebf2acdc53b01fdbeacac0f4e25cbf152 SHA256 baeb598ecaa5f4624f07490981876cad588540c49c0b2e04deca38f5c52f7d6c
-MD5 fc6c83aa11d2f35a4a5de2f6dab8d281 openafs-kernel-1.4.5_pre1.ebuild 1725
-RMD160 9d536e6791689e6d47a1e1c8a55ec19c0d8494f8 openafs-kernel-1.4.5_pre1.ebuild 1725
-SHA256 baeb598ecaa5f4624f07490981876cad588540c49c0b2e04deca38f5c52f7d6c openafs-kernel-1.4.5_pre1.ebuild 1725
+EBUILD openafs-kernel-1.4.5_pre1.ebuild 1769 RMD160 f6798c0ca8ed241e3bb3f784547527767b788c24 SHA1 83fd6c19a3fba05dac83de7cfab62c4ae37e8ba9 SHA256 8e973e3e551146278467d49f9860b52fa72a4880fa3fbfedc1ca79042abe1500
+MD5 72777f539169cc62b7c1f1032ce4fe0b openafs-kernel-1.4.5_pre1.ebuild 1769
+RMD160 f6798c0ca8ed241e3bb3f784547527767b788c24 openafs-kernel-1.4.5_pre1.ebuild 1769
+SHA256 8e973e3e551146278467d49f9860b52fa72a4880fa3fbfedc1ca79042abe1500 openafs-kernel-1.4.5_pre1.ebuild 1769
EBUILD openafs-kernel-1.5.19.ebuild 1509 RMD160 c3d61d83dc4bedb5aaf737190754487cea4543a0 SHA1 aea77c64f4f9efccc115fad44a4a1198940e2a6f SHA256 d63496f8936d9c879d23e59f6965027cf6134dd9907ae4308f2218cce49e4414
MD5 b93c39148bd46ee4e605225c1040b7af openafs-kernel-1.5.19.ebuild 1509
RMD160 c3d61d83dc4bedb5aaf737190754487cea4543a0 openafs-kernel-1.5.19.ebuild 1509
SHA256 d63496f8936d9c879d23e59f6965027cf6134dd9907ae4308f2218cce49e4414 openafs-kernel-1.5.19.ebuild 1509
-MISC ChangeLog 12368 RMD160 bcf5685ed85c76f2e531886fe6c3381ec3c6a117 SHA1 2874ea2ff98efcf090c98b1c0dbe58a3970a7269 SHA256 6ce28389d8655a5ed7360cb5d53251dca709827e7d47d2269df9c464b7804f6b
-MD5 91ca7f8c450392a9255b77d947c68da2 ChangeLog 12368
-RMD160 bcf5685ed85c76f2e531886fe6c3381ec3c6a117 ChangeLog 12368
-SHA256 6ce28389d8655a5ed7360cb5d53251dca709827e7d47d2269df9c464b7804f6b ChangeLog 12368
+MISC ChangeLog 12568 RMD160 7aa3b618fbd61e93ba5e8ead4f9a96b183ee38b1 SHA1 fe9ff5dec948931cd6cfbaf7a8d737b5a76a953f SHA256 d3d5aa6b4e867123e2cfa4e1e3bf5b2ad5c477dd4ff1f53e2c935b1b02047988
+MD5 e6cb6cc70300e274e626ad76f9022271 ChangeLog 12568
+RMD160 7aa3b618fbd61e93ba5e8ead4f9a96b183ee38b1 ChangeLog 12568
+SHA256 d3d5aa6b4e867123e2cfa4e1e3bf5b2ad5c477dd4ff1f53e2c935b1b02047988 ChangeLog 12568
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/openafs-vserver.patch b/net-fs/openafs-kernel/files/openafs-vserver.patch
new file mode 100644
index 000000000000..ff437ed5fe38
--- /dev/null
+++ b/net-fs/openafs-kernel/files/openafs-vserver.patch
@@ -0,0 +1,15 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=195407
+
+--- src/rx/LINUX/rx_knet.c.orig 2007-10-10 19:38:50.272683904 +0200
++++ src/rx/LINUX/rx_knet.c 2007-10-10 19:39:21.542465868 +0200
+@@ -26,6 +26,10 @@
+ #endif
+ #include <asm/uaccess.h>
+
++#if defined(CONFIG_VSERVER)
++#include <linux/vs_cvirt.h>
++#endif /* CONFIG_VSERVER */
++
+ /* rxk_NewSocket
+ * open and bind RX socket
+ */
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild
index 05889a0a06e8..abc6ba33826c 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.4.5_pre1.ebuild,v 1.1 2007/10/13 14:19:33 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild,v 1.2 2007/10/13 14:45:37 stefaan Exp $
inherit eutils linux-mod versionator toolchain-funcs
@@ -37,6 +37,7 @@ src_unpack() {
epatch "${FILESDIR}"/openafs-ppc64.patch
epatch "${FILESDIR}"/openafs-sparc.patch
+ epatch "${FILESDIR}"/openafs-vserver.patch
kernel_is ge 2 6 23 && epatch "${FILESDIR}"/openafs-linux-2.6.23.patch