From c337b4b50903c3628dec872604ed697595cc18ce Mon Sep 17 00:00:00 2001 From: gdt Date: Sat, 11 Nov 2017 03:18:16 +0000 Subject: Update to 1.9.2: - fix a use-after-free bug that was introduced in v1.9-rc1 (#214) - cast booleans to int before writing the XML config (#343) - support reading the config file from pipes (#253) - add "-t" option to set syslog tag - allow read/write in standard reverse mode (#301) - reject empty passwords - support building with openssl 1.1 --- filesystems/fuse-encfs/Makefile | 4 ++-- filesystems/fuse-encfs/distinfo | 15 +++++++------- .../fuse-encfs/patches/patch-cmake_FindFUSE.cmake | 17 --------------- .../fuse-encfs/patches/patch-encfs_main.cpp | 8 ++++---- .../patches/patch-internal_easylogging++.h | 24 ++++++++-------------- 5 files changed, 21 insertions(+), 47 deletions(-) delete mode 100644 filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake diff --git a/filesystems/fuse-encfs/Makefile b/filesystems/fuse-encfs/Makefile index 53feb857929..caa77844b75 100644 --- a/filesystems/fuse-encfs/Makefile +++ b/filesystems/fuse-encfs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2017/06/19 18:41:39 maya Exp $ +# $NetBSD: Makefile,v 1.14 2017/11/11 03:18:16 gdt Exp $ # -DISTNAME= encfs-1.9.1 +DISTNAME= encfs-1.9.2 PKGNAME= fuse-${DISTNAME} CATEGORIES= filesystems MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/} diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo index d3b9fcf8dc4..a54855839f5 100644 --- a/filesystems/fuse-encfs/distinfo +++ b/filesystems/fuse-encfs/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.6 2017/06/19 18:41:39 maya Exp $ +$NetBSD: distinfo,v 1.7 2017/11/11 03:18:16 gdt Exp $ -SHA1 (encfs-1.9.1.tar.gz) = 4af5a44645d0dd37fe329c3ca834b8f18e8352f5 -RMD160 (encfs-1.9.1.tar.gz) = 6d12d47e1e24e849df76ee2aa0b442a1b01ded74 -SHA512 (encfs-1.9.1.tar.gz) = 7ac0d2495d28dbca9e4c23c8c82321cdab6c37e8e37daf88dc9b3fe8d8521a4fa8889e20cdbde1f94fb4c51d3c4b5ea5b30fa6e612258285cc284d61e5d377ea -Size (encfs-1.9.1.tar.gz) = 455910 bytes -SHA1 (patch-cmake_FindFUSE.cmake) = 96de3fd60209f7900295beb96bb89c918faad3d1 +SHA1 (encfs-1.9.2.tar.gz) = 63b065bfd1eedc4ac0dba48573df4f7ca2aa8d5b +RMD160 (encfs-1.9.2.tar.gz) = b0829b32ca6e78a748ba292cb61ee9e8a29319da +SHA512 (encfs-1.9.2.tar.gz) = 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5 +Size (encfs-1.9.2.tar.gz) = 11043181 bytes SHA1 (patch-encfs_DirNode.cpp) = 7c7ddc2a125e8dfb2373c700a2e5d1c5a69fab39 -SHA1 (patch-encfs_main.cpp) = a61e550a579e103a26b5c83b65604e85bb91ae84 -SHA1 (patch-internal_easylogging++.h) = ad330f9e667dda23db51332e7e94adc107f8c1e8 +SHA1 (patch-encfs_main.cpp) = b0d19b93f821b1c6147f59163cc7dad4eec8efb0 +SHA1 (patch-internal_easylogging++.h) = fa13f1fd0b3f6c88356b5ca7af334d701cf9a4cd diff --git a/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake b/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake deleted file mode 100644 index 9c39f1b3ffb..00000000000 --- a/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cmake_FindFUSE.cmake,v 1.1 2017/06/19 18:41:39 maya Exp $ - -Also try to find (netbsd) librefuse - ---- cmake/FindFUSE.cmake.orig 2016-09-18 20:16:04.000000000 +0000 -+++ cmake/FindFUSE.cmake -@@ -13,8 +13,8 @@ if (APPLE) - set (FUSE_NAMES libosxfuse.dylib fuse) - set (FUSE_SUFFIXES osxfuse fuse) - else (APPLE) -- set (FUSE_NAMES fuse) -- set (FUSE_SUFFIXES fuse) -+ set (FUSE_NAMES fuse refuse) -+ set (FUSE_SUFFIXES fuse refuse) - endif (APPLE) - - # find includes diff --git a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp index 09d61277c92..1b260c21e46 100644 --- a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp +++ b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $ +$NetBSD: patch-encfs_main.cpp,v 1.2 2017/11/11 03:18:16 gdt Exp $ ---- encfs/main.cpp.orig 2016-09-18 20:16:04.000000000 +0000 +--- encfs/main.cpp.orig 2017-07-25 18:26:45.000000000 +0000 +++ encfs/main.cpp @@ -488,8 +488,10 @@ static void *idleMonitor(void *); void *encfs_init(fuse_conn_info *conn) { @@ -11,5 +11,5 @@ $NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $ conn->async_read = true; +#endif - if (ctx->args->isDaemon) { - // Switch to using syslog. + // if an idle timeout is specified, then setup a thread to monitor the + // filesystem. diff --git a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h index ab68dbb8e85..f426e7c95d5 100644 --- a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h +++ b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h @@ -1,34 +1,26 @@ -$NetBSD: patch-internal_easylogging++.h,v 1.1 2017/06/19 18:41:39 maya Exp $ +$NetBSD: patch-internal_easylogging++.h,v 1.2 2017/11/11 03:18:16 gdt Exp $ NetBSD support, it's a unixy OS. ---- internal/easylogging++.h.orig 2016-09-18 20:16:04.000000000 +0000 +--- internal/easylogging++.h.orig 2017-07-25 18:26:45.000000000 +0000 +++ internal/easylogging++.h -@@ -99,13 +99,19 @@ +@@ -98,13 +98,18 @@ #else - # define ELPP_OS_FREEBSD 0 + # define ELPP_OS_FREEBSD 0 #endif +#if (defined(__NetBSD__)) +# define ELPP_OS_NETBSD 1 +#else +# define ELPP_OS_NETBSD 0 +#endif -+ #if (defined(__sun)) - # define ELPP_OS_SOLARIS 1 + # define ELPP_OS_SOLARIS 1 #else - # define ELPP_OS_SOLARIS 0 + # define ELPP_OS_SOLARIS 0 #endif // Unix -#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_SOLARIS) && (!ELPP_OS_WINDOWS)) +#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_NETBSD || ELPP_OS_SOLARIS) && (!ELPP_OS_WINDOWS)) - # define ELPP_OS_UNIX 1 + # define ELPP_OS_UNIX 1 #else - # define ELPP_OS_UNIX 0 -@@ -6692,4 +6698,4 @@ el::base::debug::CrashHandler elCrashHan - #else - # define START_EASYLOGGINGPP(argc, argv) el::Helpers::setArgs(argc, argv) - #endif // defined(ELPP_UNICODE) --#endif // EASYLOGGINGPP_H -\ No newline at end of file -+#endif // EASYLOGGINGPP_H + # define ELPP_OS_UNIX 0 -- cgit v1.2.3