diff --git a/sysutils/usmb/Makefile b/sysutils/usmb/Makefile index fb66b961b94..c7955107db3 100644 --- a/sysutils/usmb/Makefile +++ b/sysutils/usmb/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2016/07/31 13:48:55 jca Exp $ +# $OpenBSD: Makefile,v 1.7 2017/05/18 21:27:47 espie Exp $ COMMENT= mount SMB shares from userland via FUSE DISTNAME= usmb-20130204 -REVISION= 3 +REVISION= 4 CATEGORIES= sysutils diff --git a/sysutils/usmb/patches/patch-usmb_c b/sysutils/usmb/patches/patch-usmb_c index 8b5fee29961..a3f462c6186 100644 --- a/sysutils/usmb/patches/patch-usmb_c +++ b/sysutils/usmb/patches/patch-usmb_c @@ -1,8 +1,9 @@ -$OpenBSD: patch-usmb_c,v 1.1 2016/07/31 13:48:55 jca Exp $ ---- usmb.c.orig Tue Jul 19 17:08:24 2016 -+++ usmb.c Tue Jul 19 17:08:55 2016 +$OpenBSD: patch-usmb_c,v 1.2 2017/05/18 21:27:47 espie Exp $ +Index: usmb.c +--- usmb.c.orig ++++ usmb.c @@ -315,8 +315,8 @@ int main (int argc, char **argv) - + if (umount) { - execlp ("fusermount", "fusermount", "-u", mountpoint, NULL); @@ -10,5 +11,5 @@ $OpenBSD: patch-usmb_c,v 1.1 2016/07/31 13:48:55 jca Exp $ + execlp ("umount", "umount", mountpoint, NULL); + perror ("Failed to execute umount"); } - + else if (create_share_name (server, sharename) && get_context()) diff --git a/sysutils/usmb/patches/patch-usmb_dir_c b/sysutils/usmb/patches/patch-usmb_dir_c index 5825f1e2436..a1e80ec556f 100644 --- a/sysutils/usmb/patches/patch-usmb_dir_c +++ b/sysutils/usmb/patches/patch-usmb_dir_c @@ -1,9 +1,10 @@ -$OpenBSD: patch-usmb_dir_c,v 1.1.1.1 2014/06/05 15:40:09 sthen Exp $ +$OpenBSD: patch-usmb_dir_c,v 1.2 2017/05/18 21:27:47 espie Exp $ allow readdir to work. ---- usmb_dir.c.orig Mon Feb 4 20:32:17 2013 -+++ usmb_dir.c Thu Jun 5 16:35:40 2014 +Index: usmb_dir.c +--- usmb_dir.c.orig ++++ usmb_dir.c @@ -30,6 +30,7 @@ #include "usmb.h" #include "utils.h" @@ -16,7 +17,7 @@ allow readdir to work. while (NULL != (dirent = smbc_getFunctionReaddir (ctx_) (ctx_, file))) { struct stat stbuf; -+ memset(&stbuf, 0, sizeof(&stbuf)); ++ memset(&stbuf, 0, sizeof(stbuf)); + stbuf.st_ino = arc4random(); switch (dirent->smbc_type)