From caa4be303e2280b4b3748b5cc7d6f014ad40a931 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 28 Apr 2007 20:25:08 +0000 Subject: Fix mount.fuse bug 176365 thanks to jakub (Portage version: 2.1.2.4) --- sys-fs/fuse/ChangeLog | 8 +++- sys-fs/fuse/files/digest-fuse-2.6.4 | 3 -- sys-fs/fuse/files/digest-fuse-2.6.4-r1 | 3 ++ sys-fs/fuse/fuse-2.6.4-r1.ebuild | 80 ++++++++++++++++++++++++++++++++++ sys-fs/fuse/fuse-2.6.4.ebuild | 79 --------------------------------- 5 files changed, 90 insertions(+), 83 deletions(-) delete mode 100644 sys-fs/fuse/files/digest-fuse-2.6.4 create mode 100644 sys-fs/fuse/files/digest-fuse-2.6.4-r1 create mode 100644 sys-fs/fuse/fuse-2.6.4-r1.ebuild delete mode 100644 sys-fs/fuse/fuse-2.6.4.ebuild (limited to 'sys-fs/fuse') diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog index 8e8d87f55c75..d32266bf3f51 100644 --- a/sys-fs/fuse/ChangeLog +++ b/sys-fs/fuse/ChangeLog @@ -1,6 +1,12 @@ # 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.86 2007/04/27 22:55:51 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.87 2007/04/28 20:25:08 genstef Exp $ + +*fuse-2.6.4-r1 (28 Apr 2007) + + 28 Apr 2007; Stefan Schweizer -fuse-2.6.4.ebuild, + +fuse-2.6.4-r1.ebuild: + Fix mount.fuse bug 176365 thanks to jakub *fuse-2.6.4 (27 Apr 2007) diff --git a/sys-fs/fuse/files/digest-fuse-2.6.4 b/sys-fs/fuse/files/digest-fuse-2.6.4 deleted file mode 100644 index e65bf855d4b3..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.6.4 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-fuse-2.6.4-r1 b/sys-fs/fuse/files/digest-fuse-2.6.4-r1 new file mode 100644 index 000000000000..e65bf855d4b3 --- /dev/null +++ b/sys-fs/fuse/files/digest-fuse-2.6.4-r1 @@ -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/fuse-2.6.4-r1.ebuild b/sys-fs/fuse/fuse-2.6.4-r1.ebuild new file mode 100644 index 000000000000..a6575200c49a --- /dev/null +++ b/sys-fs/fuse/fuse-2.6.4-r1.ebuild @@ -0,0 +1,80 @@ +# 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.1 2007/04/28 20:25:08 genstef Exp $ + +inherit linux-mod eutils libtool + +MY_P=${P/_/-} +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" +IUSE="kernel_linux kernel_FreeBSD" +S=${WORKDIR}/${MY_P} +PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" + +pkg_setup() { + if use kernel_linux ; then + MODULE_NAMES="fuse(fs:${S}/kernel)" + CONFIG_CHECK="@FUSE_FS:fuse" + FUSE_FS_ERROR="We have detected FUSE already built into the kernel. + We will continue, but we wont build the module this time." + + linux-mod_pkg_setup + kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an + older version from viewcvs" + + BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} + fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" + BUILD_TARGETS="all" + ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch + sed -i -e "s:die {:die() {:" util/mount.fuse + elibtoolize +} + +src_compile() { + econf \ + --disable-kernel-module \ + --disable-example \ + || die "econf failed for fuse userland" + emake || die "emake failed" + + if use kernel_linux ; then + cd "${S}" + sed -i -e 's/.*depmod.*//g' kernel/Makefile.in + convert_to_m kernel/Makefile.in + linux-mod_src_compile + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog Filesystems README README-2.4 \ + README.NFS NEWS doc/how-fuse-works + docinto example + dodoc example/* + + 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 + + rm -rf "${D}/dev" +} + +pkg_postinst() { + use kernel_linux && linux-mod_pkg_postinst +} diff --git a/sys-fs/fuse/fuse-2.6.4.ebuild b/sys-fs/fuse/fuse-2.6.4.ebuild deleted file mode 100644 index 7709d5e0779b..000000000000 --- a/sys-fs/fuse/fuse-2.6.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.ebuild,v 1.1 2007/04/27 22:55:51 genstef Exp $ - -inherit linux-mod eutils libtool - -MY_P=${P/_/-} -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" -IUSE="kernel_linux kernel_FreeBSD" -S=${WORKDIR}/${MY_P} -PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" - -pkg_setup() { - if use kernel_linux ; then - MODULE_NAMES="fuse(fs:${S}/kernel)" - CONFIG_CHECK="@FUSE_FS:fuse" - FUSE_FS_ERROR="We have detected FUSE already built into the kernel. - We will continue, but we wont build the module this time." - - linux-mod_pkg_setup - kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an - older version from viewcvs" - - BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" - BUILD_TARGETS="all" - ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch - elibtoolize -} - -src_compile() { - econf \ - --disable-kernel-module \ - --disable-example \ - || die "econf failed for fuse userland" - emake || die "emake failed" - - if use kernel_linux ; then - cd "${S}" - sed -i -e 's/.*depmod.*//g' kernel/Makefile.in - convert_to_m kernel/Makefile.in - linux-mod_src_compile - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog Filesystems README README-2.4 \ - README.NFS NEWS doc/how-fuse-works - docinto example - dodoc example/* - - 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 - - rm -rf "${D}/dev" -} - -pkg_postinst() { - use kernel_linux && linux-mod_pkg_postinst -} -- cgit v1.2.3-65-gdbad