[Midnightbsd-cvs] mports [20999] trunk/sysutils/fusefs-libs: fusefs libs 2.9.5
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 5 11:33:09 EST 2016
Revision: 20999
http://svnweb.midnightbsd.org/mports/?rev=20999
Author: laffer1
Date: 2016-02-05 11:33:08 -0500 (Fri, 05 Feb 2016)
Log Message:
-----------
fusefs libs 2.9.5
Modified Paths:
--------------
trunk/sysutils/fusefs-libs/Makefile
trunk/sysutils/fusefs-libs/distinfo
trunk/sysutils/fusefs-libs/files/patch-lib_helper.c
trunk/sysutils/fusefs-libs/pkg-plist
Added Paths:
-----------
trunk/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c
trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.c
trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.h
Removed Paths:
-------------
trunk/sysutils/fusefs-libs/files/patch-configure
trunk/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c
trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.c
trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.h
Property Changed:
----------------
trunk/sysutils/fusefs-libs/files/patch-lib_helper.c
Modified: trunk/sysutils/fusefs-libs/Makefile
===================================================================
--- trunk/sysutils/fusefs-libs/Makefile 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/Makefile 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,47 +1,41 @@
# $MidnightBSD$
PORTNAME= fusefs
-PORTVERSION= 2.7.4
-PORTREVISION= 1
+PORTVERSION= 2.9.5
CATEGORIES= sysutils
-MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION}
PKGNAMESUFFIX= -libs
-DISTNAME= fuse-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= FUSE allows filesystem implementation in userspace
-LICENSE= gpl2
+LICENSE= lgpl2.1
+LICENSE_FILE= ${WRKSRC}/COPYING.LIB
+OPTIONS_DEFINE= DOCS
+
+WRKSRC= ${WRKDIR}/libfuse-1ac9ca5
+
+USE_GITHUB= yes
+GH_ACCOUNT= libfuse
+GH_PROJECT= libfuse
+GH_TAGNAME= 1ac9ca5
+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-
-USES= iconv pkgconfig libtool
+CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+INSTALL_TARGET= install-strip
+USES= iconv libtool autoreconf gettext-tools
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \
- --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-TXT_DOCS= how-fuse-works \
- kernel.txt
-.include <bsd.port.pre.mk>
+PORTDOCS= *
-post-patch:
- ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \
- -e 's,-D_FILE_OFFSET_BITS=64,-D_FILE_OFFSET_BITS=64 ${PTHREAD_CFLAGS},' \
- ${WRKSRC}/fuse.pc.in
- ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \
- ${WRKSRC}/lib/Makefile.in \
- ${WRKSRC}/example/Makefile.in
+pre-configure:
+ ${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${PREFIX}/include/fuse
+ ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/include/fuse
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/libs
+ ${INSTALL_DATA} ${WRKSRC}/doc/how-fuse-works ${WRKSRC}/doc/kernel.txt ${STAGEDIR}${DOCSDIR}/libs
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}/libs
-.for i in ${TXT_DOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}/libs
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/sysutils/fusefs-libs/distinfo
===================================================================
--- trunk/sysutils/fusefs-libs/distinfo 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/distinfo 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,4 +1,2 @@
-MD5 (fuse-2.7.4.tar.gz) = 4879f06570d2225667534c37fea04213
-SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
-RMD160 (fuse-2.7.4.tar.gz) = fe1808cfd58ad6651259245b424301e99881faa2
-SIZE (fuse-2.7.4.tar.gz) = 506658
+SHA256 (fusefs-2.9.5_GH0.tar.gz) = 5573fd045691729f1df1dc8bd8ba4cc5f708c4f7d66b51ab208b3b91986573ea
+SIZE (fusefs-2.9.5_GH0.tar.gz) = 208839
Deleted: trunk/sysutils/fusefs-libs/files/patch-configure
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-configure 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/files/patch-configure 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,10 +0,0 @@
---- configure.orig 2008-06-05 13:58:44.000000000 -0700
-+++ configure 2008-06-05 14:00:32.000000000 -0700
-@@ -12201,6 +12201,7 @@
- _ACEOF
-
- 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; }
Modified: trunk/sysutils/fusefs-libs/files/patch-lib_helper.c
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_helper.c 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_helper.c 2016-02-05 16:33:08 UTC (rev 20999)
@@ -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 2015-05-22 09:24:02 UTC
++++ lib/helper.c
+@@ -31,7 +31,7 @@ enum {
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 @@ static const struct fuse_opt fuse_helper
+ 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 @@ static const struct fuse_opt fuse_helper
+ 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 @@ static int fuse_helper_opt_proc(void *da
}
}
@@ -59,7 +59,7 @@
return res;
}
-@@ -155,8 +153,8 @@
+@@ -156,8 +154,8 @@ int fuse_parse_cmdline(struct fuse_args
if (res == -1)
return -1;
Property changes on: trunk/sysutils/fusefs-libs/files/patch-lib_helper.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c (rev 0)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c 2016-02-05 16:33:08 UTC (rev 20999)
@@ -0,0 +1,77 @@
+--- lib/mount_bsd.c.orig 2015-05-22 09:24:02 UTC
++++ lib/mount_bsd.c
+@@ -10,6 +10,8 @@
+ #include "fuse_misc.h"
+ #include "fuse_opt.h"
+
++#include <sys/param.h>
++#include <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <sys/sysctl.h>
+@@ -78,6 +80,7 @@ static const struct fuse_opt fuse_mount_
+ FUSE_DUAL_OPT_KEY("ro", KEY_KERN),
+ FUSE_DUAL_OPT_KEY("rw", KEY_KERN),
+ FUSE_DUAL_OPT_KEY("auto", KEY_KERN),
++ FUSE_DUAL_OPT_KEY("automounted", KEY_KERN),
+ /* options supported under both Linux and FBSD */
+ FUSE_DUAL_OPT_KEY("allow_other", KEY_KERN),
+ FUSE_DUAL_OPT_KEY("default_permissions",KEY_KERN),
+@@ -192,56 +195,12 @@ void fuse_unmount_compat22(const char *m
+ free(umount_cmd);
+ }
+
+-static void do_unmount(char *dev, int fd)
+-{
+- char device_path[SPECNAMELEN + 12];
+- const char *argv[4];
+- const char umount_cmd[] = "/sbin/umount";
+- pid_t pid;
+-
+- snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev);
+-
+- argv[0] = umount_cmd;
+- argv[1] = "-f";
+- argv[2] = device_path;
+- argv[3] = NULL;
+-
+- pid = fork();
+-
+- if (pid == -1)
+- return;
+-
+- if (pid == 0) {
+- close(fd);
+- execvp(umount_cmd, (char **)argv);
+- exit(1);
+- }
+-
+- waitpid(pid, NULL, 0);
+-}
+-
+ void fuse_kern_unmount(const char *mountpoint, int fd)
+ {
+ char *ep, dev[128];
+ struct stat sbuf;
+
+- (void)mountpoint;
+-
+- if (fstat(fd, &sbuf) == -1)
+- goto out;
+-
+- devname_r(sbuf.st_rdev, S_IFCHR, dev, 128);
+-
+- if (strncmp(dev, "fuse", 4))
+- goto out;
+-
+- strtol(dev + 4, &ep, 10);
+- if (*ep != '\0')
+- goto out;
+-
+- do_unmount(dev, fd);
+-
+-out:
++ unmount(mountpoint, MNT_FORCE);
+ close(fd);
+ }
+
Property changes on: trunk/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.c
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.c (rev 0)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.c 2016-02-05 16:33:08 UTC (rev 20999)
@@ -0,0 +1,23 @@
+--- lib/mount_util.c.orig 2015-05-22 09:24:02 UTC
++++ lib/mount_util.c
+@@ -344,20 +344,3 @@ int fuse_mnt_check_empty(const char *pro
+ }
+ return 0;
+ }
+-
+-int fuse_mnt_check_fuseblk(void)
+-{
+- char buf[256];
+- FILE *f = fopen("/proc/filesystems", "r");
+- if (!f)
+- return 1;
+-
+- while (fgets(buf, sizeof(buf), f))
+- if (strstr(buf, "fuseblk\n")) {
+- fclose(f);
+- return 1;
+- }
+-
+- fclose(f);
+- return 0;
+-}
Property changes on: trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.h
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.h (rev 0)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.h 2016-02-05 16:33:08 UTC (rev 20999)
@@ -0,0 +1,7 @@
+--- lib/mount_util.h.orig 2015-05-22 09:24:02 UTC
++++ lib/mount_util.h
+@@ -16,4 +16,3 @@ int fuse_mnt_umount(const char *progname
+ char *fuse_mnt_resolve_path(const char *progname, const char *orig);
+ int fuse_mnt_check_empty(const char *progname, const char *mnt,
+ mode_t rootmode, off_t rootsize);
+-int fuse_mnt_check_fuseblk(void);
Property changes on: trunk/sysutils/fusefs-libs/files/patch-lib_mount__util.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,10 +0,0 @@
---- lib/mount_bsd.c.orig 2008-07-07 08:01:09.000000000 +0200
-+++ lib/mount_bsd.c 2008-07-07 08:01:59.000000000 +0200
-@@ -10,6 +10,7 @@
- #include "fuse_misc.h"
- #include "fuse_opt.h"
-
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/sysctl.h>
Deleted: trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.c
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.c 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.c 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,23 +0,0 @@
---- lib/mount_util.c.orig 2008-02-04 00:23:30.000000000 -0500
-+++ lib/mount_util.c 2008-02-04 00:23:58.000000000 -0500
-@@ -224,20 +224,3 @@
- }
- return 0;
- }
--
--int fuse_mnt_check_fuseblk(void)
--{
-- char buf[256];
-- FILE *f = fopen("/proc/filesystems", "r");
-- if (!f)
-- return 1;
--
-- while (fgets(buf, sizeof(buf), f))
-- if (strstr(buf, "fuseblk\n")) {
-- fclose(f);
-- return 1;
-- }
--
-- fclose(f);
-- return 0;
--}
Deleted: trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.h
===================================================================
--- trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.h 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/files/patch-lib_mount_util.h 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,7 +0,0 @@
---- lib/mount_util.h.orig 2008-02-04 00:24:07.000000000 -0500
-+++ lib/mount_util.h 2008-02-04 00:24:20.000000000 -0500
-@@ -14,4 +14,3 @@
- char *fuse_mnt_resolve_path(const char *progname, const char *orig);
- int fuse_mnt_check_empty(const char *progname, const char *mnt,
- mode_t rootmode, off_t rootsize);
--int fuse_mnt_check_fuseblk(void);
Modified: trunk/sysutils/fusefs-libs/pkg-plist
===================================================================
--- trunk/sysutils/fusefs-libs/pkg-plist 2016-02-05 00:16:16 UTC (rev 20998)
+++ trunk/sysutils/fusefs-libs/pkg-plist 2016-02-05 16:33:08 UTC (rev 20999)
@@ -1,24 +1,23 @@
+include/fuse.h
+include/fuse/cuse_lowlevel.h
include/fuse/fuse.h
-include/fuse/fuse_compat.h
include/fuse/fuse_common.h
include/fuse/fuse_common_compat.h
+include/fuse/fuse_compat.h
+include/fuse/fuse_kernel.h
include/fuse/fuse_lowlevel.h
include/fuse/fuse_lowlevel_compat.h
include/fuse/fuse_opt.h
-include/fuse/fuse_kernel.h
-include/fuse.h
include/ulockmgr.h
lib/libfuse.a
-lib/libfuse.la
lib/libfuse.so
lib/libfuse.so.2
-lib/libulockmgr.la
+lib/libfuse.so.2.9.4
lib/libulockmgr.a
lib/libulockmgr.so
lib/libulockmgr.so.1
+lib/libulockmgr.so.1.0.1
libdata/pkgconfig/fuse.pc
- at dirrm include/fuse
-%%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works
-%%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libs
- at dirrmtry %%DOCSDIR%%
+man/man1/fusermount.1.gz
+man/man1/ulockmgr_server.1.gz
+man/man8/mount.fuse.8.gz
More information about the Midnightbsd-cvs
mailing list