sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 10:56:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- update sysutils/fusefs-libs to 2.9.1

Browse source 
- add a patch to sysutils/fusefs-kmod to make it compile with new fusefs-libs

Tested by:	pho, Kevin Oberman <kob6558@gmail.com>,
		Gustau Perez Querol <gperez@entel.upc.edu>
This commit is contained in:
Florian Smeets 2012-09-20 23:52:30 +00:00
parent 6b968aca1e
commit 9d5edfa301
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=304605
7 changed files with 49 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/fusefs-kmod/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= fusefs
DISTVERSION= 0.3.9-pre1.20080208
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= sysutils kld
MASTER_SITES= http://mercurial.creo.hu/repos/fuse4bsd-hg/index.cgi/archive/
PKGNAMESUFFIX= -kmod

13
sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c
View file

@ -1,5 +1,5 @@
--- fuse_module/fuse_vnops.c.orig 2008-02-05 00:25:57.000000000 -0500
+++ fuse_module/fuse_vnops.c 2008-10-29 19:21:51.000000000 -0400
--- ./fuse_module/fuse_vnops.c.orig 2012-09-19 06:04:10.512413490 +0200
+++ ./fuse_module/fuse_vnops.c 2012-09-19 06:20:44.949613892 +0200
@@ -799,8 +799,11 @@
struct vnode *vp = ap->a_vp;
struct vattr *vap = ap->a_vap;
@ -53,6 +53,15 @@
if (err)
return (err);
facp->facc_flags |= FACCESS_VA_VALID;
@@ -1544,7 +1561,7 @@
struct fuse_vnode_data *fvdat = VTOFUD(vp);
uint64_t parentid = fvdat->parent_nid;
struct componentname *cnp = fvdat->germcnp;
- struct fuse_open_in *foi;
+ struct fuse_create_in *foi;
struct fuse_entry_out *feo;
struct fuse_mknod_in fmni;
int err;
@@ -1929,7 +1946,11 @@
* It will not invalidate pages which are dirty, locked, under
* writeback or mapped into pagetables.")

8
sysutils/fusefs-libs/Makefile
View file

@ -5,7 +5,7 @@
#
PORTNAME= fusefs
PORTVERSION= 2.7.4
PORTVERSION= 2.9.1
CATEGORIES= sysutils
MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION}
PKGNAMESUFFIX= -libs
@ -20,7 +20,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
USE_LDCONFIG= yes
USE_PKGCONFIG= yes
USE_ICONV= yes
CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
TXT_DOCS= how-fuse-works \
kernel.txt
@ -43,4 +43,8 @@ post-install:
.endfor
.endif
MAN1= fusermount.1 \
ulockmgr_server.1
MAN8= mount.fuse.8
.include <bsd.port.mk>

4
sysutils/fusefs-libs/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
SIZE (fuse-2.7.4.tar.gz) = 506658
SHA256 (fuse-2.9.1.tar.gz) = 51803d8224bf6adab052b340614980b28861f317c261eab1f1e9c6cf17b3dd75
SIZE (fuse-2.9.1.tar.gz) = 559705

17
sysutils/fusefs-libs/files/patch-configure
View file

@ -1,10 +1,11 @@
--- configure.orig 2008-06-05 13:58:44.000000000 -0700
+++ configure 2008-06-05 14:00:32.000000000 -0700
@@ -12201,6 +12201,7 @@
_ACEOF
--- configure.orig 2012-08-08 11:08:24.244322974 +0200
+++ configure 2012-08-08 11:08:42.304569338 +0200
@@ -13237,7 +13237,7 @@
fi
+ LIBICONV=$LTLIBICONV
if test "$am_cv_lib_iconv" = yes; then
{ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-libfuse_libs=$libfuse_libs $LTLIBICONV
+libfuse_libs="$libfuse_libs $LTLIBICONV"
if test "$am_cv_func_iconv" = yes; then
ICONV_TRUE=
ICONV_FALSE='#'

38
sysutils/fusefs-libs/files/patch-lib_helper.c
View file

@ -1,6 +1,6 @@
--- lib/helper.c.orig 2007-12-12 09:33:35.000000000 -0500
+++ lib/helper.c 2008-02-04 00:22:51.000000000 -0500
@@ -30,7 +30,7 @@
--- lib/helper.c.orig 2012-04-10 15:28:55.000000000 +0200
+++ lib/helper.c 2012-07-31 00:06:11.384938678 +0200
@@ -31,7 +31,7 @@
struct helper_opts {
int singlethread;
int foreground;
@ -9,25 +9,25 @@
char *mountpoint;
};
@@ -41,8 +41,7 @@
FUSE_HELPER_OPT("debug", foreground),
FUSE_HELPER_OPT("-f", foreground),
FUSE_HELPER_OPT("-s", singlethread),
- FUSE_HELPER_OPT("fsname=", nodefault_subtype),
- FUSE_HELPER_OPT("subtype=", nodefault_subtype),
+ FUSE_HELPER_OPT("fsname=", fsname),
@@ -42,8 +42,7 @@
FUSE_HELPER_OPT("debug", foreground),
FUSE_HELPER_OPT("-f", foreground),
FUSE_HELPER_OPT("-s", singlethread),
- FUSE_HELPER_OPT("fsname=", nodefault_subtype),
- FUSE_HELPER_OPT("subtype=", nodefault_subtype),
+ FUSE_HELPER_OPT("fsname=", fsname),
FUSE_OPT_KEY("-h", KEY_HELP),
FUSE_OPT_KEY("--help", KEY_HELP),
@@ -52,7 +51,6 @@
FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
- FUSE_OPT_KEY("subtype=", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("-h", KEY_HELP),
FUSE_OPT_KEY("--help", KEY_HELP),
@@ -53,7 +52,6 @@
FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
- FUSE_OPT_KEY("subtype=", FUSE_OPT_KEY_KEEP),
FUSE_OPT_END
};
@@ -122,24 +120,24 @@
@@ -123,24 +121,24 @@
}
}
@ -59,7 +59,7 @@
return res;
}
@@ -155,8 +153,8 @@
@@ -156,8 +154,8 @@
if (res == -1)
return -1;

1
sysutils/fusefs-libs/pkg-plist
View file

@ -1,3 +1,4 @@
include/fuse/cuse_lowlevel.h
include/fuse/fuse.h
include/fuse/fuse_compat.h
include/fuse/fuse_common.h