diff options
| -rw-r--r-- | sys-fs/fuse/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/fuse/files/digest-fuse-2.6.1 | 3 | ||||
| -rw-r--r-- | sys-fs/fuse/files/digest-fuse-2.6.4 | 3 | ||||
| -rw-r--r-- | sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch | 18 | ||||
| -rw-r--r-- | sys-fs/fuse/files/fuse-2.6.20.patch | 35 | ||||
| -rw-r--r-- | sys-fs/fuse/fuse-2.6.4.ebuild (renamed from sys-fs/fuse/fuse-2.6.1.ebuild) | 11 |
6 files changed, 16 insertions, 63 deletions
diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog index 762c18b50f52..8e8d87f55c75 100644 --- a/sys-fs/fuse/ChangeLog +++ b/sys-fs/fuse/ChangeLog @@ -1,6 +1,13 @@ # 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.85 2007/04/24 18:55:18 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.86 2007/04/27 22:55:51 genstef Exp $ + +*fuse-2.6.4 (27 Apr 2007) + + 27 Apr 2007; Stefan Schweizer <genstef@gentoo.org> + -files/fuse-2.6.0_rc3-no-mknod.patch, -files/fuse-2.6.20.patch, + -fuse-2.6.1.ebuild, +fuse-2.6.4.ebuild: + version bump 24 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> fuse-2.6.3.ebuild: ppc stable, bug #172537 diff --git a/sys-fs/fuse/files/digest-fuse-2.6.1 b/sys-fs/fuse/files/digest-fuse-2.6.1 deleted file mode 100644 index 1ef700c6df42..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.6.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 13e1873086a1d7a95f470bbc7428c528 fuse-2.6.1.tar.gz 472606 -RMD160 99624de23edb634b5e92c86fb75fa266aeff5a65 fuse-2.6.1.tar.gz 472606 -SHA256 e5d039f1adcb5fcc16f5f3eb1c7d95918b62ace79f75d327c72707cafdd8be7c fuse-2.6.1.tar.gz 472606 diff --git a/sys-fs/fuse/files/digest-fuse-2.6.4 b/sys-fs/fuse/files/digest-fuse-2.6.4 new file mode 100644 index 000000000000..e65bf855d4b3 --- /dev/null +++ b/sys-fs/fuse/files/digest-fuse-2.6.4 @@ -0,0 +1,3 @@ +MD5 d21f9f01a2d9dabd2cf4a0299affb94d fuse-2.6.4.tar.gz 473689 +RMD160 38d83de8930b3e8f4b3a4e29036bc1260e69ff07 fuse-2.6.4.tar.gz 473689 +SHA256 c1eb7a8530315fd288a2c2e7449dfe4d2b491812902b2f151f8df41cfb5bd903 fuse-2.6.4.tar.gz 473689 diff --git a/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch b/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch deleted file mode 100644 index 0f06d385141a..000000000000 --- a/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch +++ /dev/null @@ -1,18 +0,0 @@ -let udev handle this - -http://bugs.gentoo.org/152032 - ---- util/Makefile.in -+++ util/Makefile.in -@@ -490,11 +490,6 @@ - install-exec-hook: - -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount -- @if test ! -e $(DESTDIR)/dev/fuse; then \ -- $(mkdir_p) $(DESTDIR)/dev; \ -- echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \ -- mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \ -- fi - - install-exec-local: - $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH) diff --git a/sys-fs/fuse/files/fuse-2.6.20.patch b/sys-fs/fuse/files/fuse-2.6.20.patch deleted file mode 100644 index 66b7df4dba9c..000000000000 --- a/sys-fs/fuse/files/fuse-2.6.20.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c ---- fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c 2006-11-19 17:02:34.000000000 +0100 -+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c 2006-12-30 18:52:07.000000000 +0100 -@@ -43,7 +43,7 @@ - - struct fuse_req *fuse_request_alloc(void) - { -- struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, SLAB_KERNEL); -+ struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, GFP_KERNEL); - if (req) - fuse_request_init(req); - return req; -diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/file.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c ---- fuse-2.6.1/work/fuse-2.6.1/kernel/file.c 2006-10-20 19:33:56.000000000 +0200 -+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c 2006-12-30 19:00:13.000000000 +0100 -@@ -501,7 +501,6 @@ - spin_unlock(&fc->lock); - - if (offset == 0 && to == PAGE_CACHE_SIZE) { -- clear_page_dirty(page); - SetPageUptodate(page); - } - } -diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c ---- fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c 2006-11-28 15:04:45.000000000 +0100 -+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c 2006-12-30 18:52:26.000000000 +0100 -@@ -52,7 +52,7 @@ - struct inode *inode; - struct fuse_inode *fi; - -- inode = kmem_cache_alloc(fuse_inode_cachep, SLAB_KERNEL); -+ inode = kmem_cache_alloc(fuse_inode_cachep, GFP_KERNEL); - if (!inode) - return NULL; - diff --git a/sys-fs/fuse/fuse-2.6.1.ebuild b/sys-fs/fuse/fuse-2.6.4.ebuild index 12c7a0f3efdd..7709d5e0779b 100644 --- a/sys-fs/fuse/fuse-2.6.1.ebuild +++ b/sys-fs/fuse/fuse-2.6.4.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.1.ebuild,v 1.11 2007/03/09 14:58:38 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4.ebuild,v 1.1 2007/04/27 22:55:51 genstef Exp $ inherit linux-mod eutils libtool @@ -9,7 +9,7 @@ DESCRIPTION="An interface for filesystems implemented in userspace." HOMEPAGE="http://fuse.sourceforge.net" SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="kernel_linux kernel_FreeBSD" S=${WORKDIR}/${MY_P} PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" @@ -26,7 +26,7 @@ pkg_setup() { older version from viewcvs" BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" + fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" BUILD_TARGETS="all" ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" fi @@ -36,7 +36,6 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch - epatch "${FILESDIR}"/fuse-2.6.20.patch elibtoolize } @@ -65,13 +64,13 @@ src_install() { if use kernel_linux ; then linux-mod_src_install + newinitd ${FILESDIR}/fuse.init fuse else insinto /usr/include/fuse doins include/fuse_kernel.h + newinitd ${FILESDIR}/fuse-fbsd.init fuse fi - newinitd ${FILESDIR}/fuse.init fuse - rm -rf "${D}/dev" } |