Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-fs/fuse
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-05-20 07:39:24 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-05-20 07:39:24 +0000
commit7e3361d87ec4a1b0896843455bcfc3184d91ff1c (patch)
tree06c80f65db23947c86fc9db70931179572df590d /sys-fs/fuse
parentadded ~amd64, bug 177102 (diff)
downloadhistorical-7e3361d87ec4a1b0896843455bcfc3184d91ff1c.tar.gz
historical-7e3361d87ec4a1b0896843455bcfc3184d91ff1c.tar.bz2
historical-7e3361d87ec4a1b0896843455bcfc3184d91ff1c.zip
make 2.6.22 ready thanks to Francois Chenier <belgix@kern.com.au> in bug 179085
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'sys-fs/fuse')
-rw-r--r--sys-fs/fuse/ChangeLog6
-rw-r--r--sys-fs/fuse/Manifest20
-rw-r--r--sys-fs/fuse/files/fuse-2.6.22.patch49
-rw-r--r--sys-fs/fuse/fuse-2.6.4-r1.ebuild3
4 files changed, 68 insertions, 10 deletions
diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index e1cb44f4050e..cae317519d7e 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/fuse
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.90 2007/05/12 02:15:15 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.91 2007/05/20 07:39:24 genstef Exp $
+
+ 20 May 2007; Stefan Schweizer <genstef@gentoo.org>
+ +files/fuse-2.6.22.patch, fuse-2.6.4-r1.ebuild:
+ make 2.6.22 ready thanks to Francois Chenier <belgix@kern.com.au> in bug 179085
12 May 2007; Daniel Drake <dsd@gentoo.org> metadata.xml:
Move from kernel to kernel-misc herd
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index c5001a6fa131..f5c3a8526814 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,3 +1,7 @@
+AUX fuse-2.6.22.patch 1563 RMD160 3996778eb4bff4f41b21c91b5f3d3de277821203 SHA1 ccd4d019cbe4aee21bcc6e2191753bb7753c0f8d SHA256 b089f376df3162923233a7e1633e9b00f20e551b6125a6a2a3b178d7fa9fed46
+MD5 6a7e50846bd28cecc34afdd32fc4520f files/fuse-2.6.22.patch 1563
+RMD160 3996778eb4bff4f41b21c91b5f3d3de277821203 files/fuse-2.6.22.patch 1563
+SHA256 b089f376df3162923233a7e1633e9b00f20e551b6125a6a2a3b178d7fa9fed46 files/fuse-2.6.22.patch 1563
AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
MD5 377334eb85baa4cefe0cb821d994907d files/fuse-fbsd.init 467
RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 files/fuse-fbsd.init 467
@@ -16,14 +20,14 @@ EBUILD fuse-2.6.3.ebuild 2075 RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 SH
MD5 44116824b9a059bce92435bbd571cef5 fuse-2.6.3.ebuild 2075
RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 fuse-2.6.3.ebuild 2075
SHA256 fd6a0364ed18b1152a5d04e2dfa14110c6a2c2f9979132c6901f5f5758848ce8 fuse-2.6.3.ebuild 2075
-EBUILD fuse-2.6.4-r1.ebuild 2172 RMD160 434e200c86187535218c94cca899cff95084eeb5 SHA1 e69a7b45f135efea2e2b0470e69092e0ddc6a13d SHA256 33a533864b39a3b494d31e20bd8dca7ad2232a79c949e455b7c9660b9be3060c
-MD5 c2f46b4728952dc99d364c6dc240a2de fuse-2.6.4-r1.ebuild 2172
-RMD160 434e200c86187535218c94cca899cff95084eeb5 fuse-2.6.4-r1.ebuild 2172
-SHA256 33a533864b39a3b494d31e20bd8dca7ad2232a79c949e455b7c9660b9be3060c fuse-2.6.4-r1.ebuild 2172
-MISC ChangeLog 12574 RMD160 6a9a6ebf3c0dbf42d761d805b1ce8bd0f5e36d59 SHA1 75b981baab93717c7fe8736ac0bb9eb8d2a23d1b SHA256 d53e00b8508d68049abcdd6b469062d37fb446bce3db30bf15922b24d3c9fcaf
-MD5 f7f933a911a698dd9206f739a428dbeb ChangeLog 12574
-RMD160 6a9a6ebf3c0dbf42d761d805b1ce8bd0f5e36d59 ChangeLog 12574
-SHA256 d53e00b8508d68049abcdd6b469062d37fb446bce3db30bf15922b24d3c9fcaf ChangeLog 12574
+EBUILD fuse-2.6.4-r1.ebuild 2216 RMD160 56d96c298da32c06f6ef85907770fa75d6edb630 SHA1 ff0340c5f061f1bbe2edf0f3be85ca29c4930625 SHA256 311e0ffdc0edacadf327ae18ba7135cb7d66752fb60923045a4291cde4428908
+MD5 5e11d67a430961798fa6c8b7610201e5 fuse-2.6.4-r1.ebuild 2216
+RMD160 56d96c298da32c06f6ef85907770fa75d6edb630 fuse-2.6.4-r1.ebuild 2216
+SHA256 311e0ffdc0edacadf327ae18ba7135cb7d66752fb60923045a4291cde4428908 fuse-2.6.4-r1.ebuild 2216
+MISC ChangeLog 12764 RMD160 9c74d546bdfd1eb91c70979fa143d6fe5c69cf4f SHA1 f30ca65628e6c423c6a800243eca23771b3b3e46 SHA256 79c737890c1e66169d3b2760734ab028c535127fcbb2a2dc8fb20149ab491329
+MD5 41ca8cc0f4b93accecfbd94315bda814 ChangeLog 12764
+RMD160 9c74d546bdfd1eb91c70979fa143d6fe5c69cf4f ChangeLog 12764
+SHA256 79c737890c1e66169d3b2760734ab028c535127fcbb2a2dc8fb20149ab491329 ChangeLog 12764
MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
diff --git a/sys-fs/fuse/files/fuse-2.6.22.patch b/sys-fs/fuse/files/fuse-2.6.22.patch
new file mode 100644
index 000000000000..fbb9cdff3d4f
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.6.22.patch
@@ -0,0 +1,49 @@
+--- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c 2007-05-19 19:54:45.000000000 +0930
++++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c 2007-05-19 19:58:40.000000000 +0930
+@@ -781,7 +781,8 @@
+
+ if (cmd == F_GETLK) {
+ if (fc->no_lock) {
+-#ifdef KERNEL_2_6_17_PLUS
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) && \
++ LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+ if (!posix_test_lock(file, fl, fl))
+ fl->fl_type = F_UNLCK;
+ #else
+--- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c 2007-05-20 09:13:34.000000000 +0930
++++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c 2007-05-20 09:18:33.000000000 +0930
+@@ -809,9 +809,13 @@
+ {
+ struct inode * inode = foo;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
++ inode_init_once(inode);
++#else
+ if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+ SLAB_CTOR_CONSTRUCTOR)
+ inode_init_once(inode);
++#endif
+ }
+
+ static int __init fuse_fs_init(void)
+@@ -860,12 +864,20 @@
+ if (err)
+ return err;
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
++ kobj_set_kset_s(&fuse_subsys, fs_subsys);
++#else
+ kset_set_kset_s(&fuse_subsys, fs_subsys);
++#endif
+ err = subsystem_register(&fuse_subsys);
+ if (err)
+ goto out_err;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
++ kobj_set_kset_s(&connections_subsys, fuse_subsys);
++#else
+ kset_set_kset_s(&connections_subsys, fuse_subsys);
++#endif
+ err = subsystem_register(&connections_subsys);
+ if (err)
+ goto out_fuse_unregister;
diff --git a/sys-fs/fuse/fuse-2.6.4-r1.ebuild b/sys-fs/fuse/fuse-2.6.4-r1.ebuild
index d1027c3d26fd..dc37e776b207 100644
--- a/sys-fs/fuse/fuse-2.6.4-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.6.4-r1.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/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.3 2007/05/03 02:21:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.4 2007/05/20 07:39:24 genstef Exp $
inherit linux-mod eutils libtool
@@ -36,6 +36,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
+ epatch "${FILESDIR}"/fuse-2.6.22.patch
sed -i -e "s:die {:die() {:" util/mount.fuse
elibtoolize
}