pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/filesystems/fuse-encfs
Module Name: pkgsrc
Committed By: maya
Date: Mon Jun 19 18:41:39 UTC 2017
Modified Files:
pkgsrc/filesystems/fuse-encfs: Makefile PLIST distinfo
Added Files:
pkgsrc/filesystems/fuse-encfs/patches: patch-cmake_FindFUSE.cmake
patch-encfs_DirNode.cpp patch-encfs_main.cpp
patch-internal_easylogging++.h
Removed Files:
pkgsrc/filesystems/fuse-encfs/patches: patch-aa patch-ab patch-ac
patch-ad patch-ae patch-encfs_Config.cpp patch-encfs_ConfigVar.cpp
patch-encfs_NameIO.cpp patch-encfs_OpaqueValue.h
Log Message:
fuse-encfs: update to 1.9.1
A decade of changes, please refer to the following link for changes:
https://github.com/vgough/encfs/blob/bf2cee54f53fc53910476fcd497782f3fd062923/ChangeLog
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/filesystems/fuse-encfs/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-encfs/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-encfs/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/filesystems/fuse-encfs/patches/patch-aa \
pkgsrc/filesystems/fuse-encfs/patches/patch-ad \
pkgsrc/filesystems/fuse-encfs/patches/patch-ae
cvs rdiff -u -r1.2 -r0 pkgsrc/filesystems/fuse-encfs/patches/patch-ab \
pkgsrc/filesystems/fuse-encfs/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp \
pkgsrc/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h
cvs rdiff -u -r1.1 -r0 \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_Config.cpp \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_ConfigVar.cpp \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_NameIO.cpp \
pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_OpaqueValue.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/filesystems/fuse-encfs/Makefile
diff -u pkgsrc/filesystems/fuse-encfs/Makefile:1.12 pkgsrc/filesystems/fuse-encfs/Makefile:1.13
--- pkgsrc/filesystems/fuse-encfs/Makefile:1.12 Sat Mar 5 11:28:29 2016
+++ pkgsrc/filesystems/fuse-encfs/Makefile Mon Jun 19 18:41:39 2017
@@ -1,25 +1,32 @@
-# $NetBSD: Makefile,v 1.12 2016/03/05 11:28:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2017/06/19 18:41:39 maya Exp $
#
-DISTNAME= encfs-1.2.0-2
-PKGNAME= fuse-${DISTNAME:S/-2/.2/}
-PKGREVISION= 5
+DISTNAME= encfs-1.9.1
+PKGNAME= fuse-${DISTNAME}
CATEGORIES= filesystems
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=encfs/}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.arg0.net/encfs
COMMENT= FUSE Encrypted Filesystem
+LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-2//}
-GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf gmake pkg-config
+GITHUB_PROJECT= encfs
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+
+USE_TOOLS+= autoconf cmake pkg-config
+USE_CMAKE= yes
USE_LANGUAGES= c c++
-CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE
+CONFIGURE_DIRS= ${WRKDIR}/build
+CMAKE_ARG_PATH= ${WRKSRC}
+
+TEST_TARGET= test
+
+post-extract:
+ ${RUN} mkdir -p ${WRKDIR}/build
-.include "../../devel/librlog/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/fuse.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/filesystems/fuse-encfs/PLIST
diff -u pkgsrc/filesystems/fuse-encfs/PLIST:1.1.1.1 pkgsrc/filesystems/fuse-encfs/PLIST:1.2
--- pkgsrc/filesystems/fuse-encfs/PLIST:1.1.1.1 Thu Mar 1 00:34:14 2007
+++ pkgsrc/filesystems/fuse-encfs/PLIST Mon Jun 19 18:41:39 2017
@@ -1,5 +1,56 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/06/19 18:41:39 maya Exp $
bin/encfs
bin/encfsctl
-man/man1/encfs.1
-man/man1/encfsctl.1
+bin/encfssh
+share/locale/ar/LC_MESSAGES/encfs.mo
+share/locale/be/LC_MESSAGES/encfs.mo
+share/locale/bg/LC_MESSAGES/encfs.mo
+share/locale/bs/LC_MESSAGES/encfs.mo
+share/locale/ca/LC_MESSAGES/encfs.mo
+share/locale/cs/LC_MESSAGES/encfs.mo
+share/locale/da/LC_MESSAGES/encfs.mo
+share/locale/de/LC_MESSAGES/encfs.mo
+share/locale/de_AT/LC_MESSAGES/encfs.mo
+share/locale/de_CH/LC_MESSAGES/encfs.mo
+share/locale/de_DE/LC_MESSAGES/encfs.mo
+share/locale/el/LC_MESSAGES/encfs.mo
+share/locale/eo/LC_MESSAGES/encfs.mo
+share/locale/es/LC_MESSAGES/encfs.mo
+share/locale/es_ES/LC_MESSAGES/encfs.mo
+share/locale/es_PE/LC_MESSAGES/encfs.mo
+share/locale/et/LC_MESSAGES/encfs.mo
+share/locale/fi/LC_MESSAGES/encfs.mo
+share/locale/fr/LC_MESSAGES/encfs.mo
+share/locale/fr_FR/LC_MESSAGES/encfs.mo
+share/locale/gl/LC_MESSAGES/encfs.mo
+share/locale/he/LC_MESSAGES/encfs.mo
+share/locale/hr/LC_MESSAGES/encfs.mo
+share/locale/hu/LC_MESSAGES/encfs.mo
+share/locale/id/LC_MESSAGES/encfs.mo
+share/locale/it/LC_MESSAGES/encfs.mo
+share/locale/ja/LC_MESSAGES/encfs.mo
+share/locale/ko/LC_MESSAGES/encfs.mo
+share/locale/lv/LC_MESSAGES/encfs.mo
+share/locale/nb/LC_MESSAGES/encfs.mo
+share/locale/nds/LC_MESSAGES/encfs.mo
+share/locale/nl/LC_MESSAGES/encfs.mo
+share/locale/nn/LC_MESSAGES/encfs.mo
+share/locale/oc/LC_MESSAGES/encfs.mo
+share/locale/pl/LC_MESSAGES/encfs.mo
+share/locale/pt/LC_MESSAGES/encfs.mo
+share/locale/pt_BR/LC_MESSAGES/encfs.mo
+share/locale/pt_PT/LC_MESSAGES/encfs.mo
+share/locale/ro/LC_MESSAGES/encfs.mo
+share/locale/ru/LC_MESSAGES/encfs.mo
+share/locale/sk/LC_MESSAGES/encfs.mo
+share/locale/sr/LC_MESSAGES/encfs.mo
+share/locale/sv/LC_MESSAGES/encfs.mo
+share/locale/ta/LC_MESSAGES/encfs.mo
+share/locale/tr/LC_MESSAGES/encfs.mo
+share/locale/uk/LC_MESSAGES/encfs.mo
+share/locale/vi/LC_MESSAGES/encfs.mo
+share/locale/zh_CN/LC_MESSAGES/encfs.mo
+share/locale/zh_HK/LC_MESSAGES/encfs.mo
+share/locale/zh_TW/LC_MESSAGES/encfs.mo
+share/man/man1/encfs.1
+share/man/man1/encfsctl.1
Index: pkgsrc/filesystems/fuse-encfs/distinfo
diff -u pkgsrc/filesystems/fuse-encfs/distinfo:1.5 pkgsrc/filesystems/fuse-encfs/distinfo:1.6
--- pkgsrc/filesystems/fuse-encfs/distinfo:1.5 Tue Nov 3 00:15:00 2015
+++ pkgsrc/filesystems/fuse-encfs/distinfo Mon Jun 19 18:41:39 2017
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:15:00 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/06/19 18:41:39 maya Exp $
-SHA1 (encfs-1.2.0-2.tgz) = 15e0037ef123ef3967d5c101d10f3643c33bcb68
-RMD160 (encfs-1.2.0-2.tgz) = 979fd6a11137c1acdabd3349302d8cd7e3b6625b
-SHA512 (encfs-1.2.0-2.tgz) = 7513d9892f050705ab19da801253e6b9031824c831b4fb4ae828eb6bd3c132be109b40cbd9393c45be2bef2ceeb7af8c963e0e96aeb2fc8786b3468831aa13dd
-Size (encfs-1.2.0-2.tgz) = 528039 bytes
-SHA1 (patch-aa) = 2e40cf7e222bfc3def5d1aa2c431854e9f59e0e9
-SHA1 (patch-ab) = 680eac660752826503aeed48995ca93b2f280f1a
-SHA1 (patch-ac) = ab7d063f8429f794c0ea81d30e051eb48c35e000
-SHA1 (patch-ad) = 4077b9cbd1bdf1f71029183acce6a8570dbbef7a
-SHA1 (patch-ae) = 48e06c61293a3280825df151df4670db1a3fbcc0
-SHA1 (patch-encfs_Config.cpp) = a868994c763821c40f9169965c5b2a80262a3c7d
-SHA1 (patch-encfs_ConfigVar.cpp) = 9806bc49f63bedd12c598515db854e061ac43895
-SHA1 (patch-encfs_NameIO.cpp) = 1d912b0575fea6d55c19d1d3930fd47c8f538722
-SHA1 (patch-encfs_OpaqueValue.h) = 3274bf118d14a544d775830fef2af51594e9635e
+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 (patch-encfs_DirNode.cpp) = 7c7ddc2a125e8dfb2373c700a2e5d1c5a69fab39
+SHA1 (patch-encfs_main.cpp) = a61e550a579e103a26b5c83b65604e85bb91ae84
+SHA1 (patch-internal_easylogging++.h) = ad330f9e667dda23db51332e7e94adc107f8c1e8
Added files:
Index: pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake:1.1
--- /dev/null Mon Jun 19 18:41:39 2017
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake Mon Jun 19 18:41:39 2017
@@ -0,0 +1,17 @@
+$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
Index: pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp:1.1
--- /dev/null Mon Jun 19 18:41:39 2017
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp Mon Jun 19 18:41:39 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-encfs_DirNode.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+Define _DIRENT_HAVE_D_TYPE at the top for all the OSes that support
+it. This is an untested functional change for FreeBSD and APPLE.
+
+--- encfs/DirNode.cpp.orig 2016-09-18 20:16:04.000000000 +0000
++++ encfs/DirNode.cpp
+@@ -42,6 +42,10 @@
+ #include "Error.h"
+ #include "Mutex.h"
+
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#define _DIRENT_HAVE_D_TYPE
++#endif
++
+ using namespace std;
+
+ namespace encfs {
+@@ -78,7 +82,7 @@ static bool _nextName(struct dirent *&de
+
+ if (de) {
+ if (fileType) {
+-#if defined(_DIRENT_HAVE_D_TYPE) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(_DIRENT_HAVE_D_TYPE)
+ *fileType = de->d_type;
+ #else
+ #warning "struct dirent.d_type not supported"
Index: pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp:1.1
--- /dev/null Mon Jun 19 18:41:39 2017
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp Mon Jun 19 18:41:39 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+--- encfs/main.cpp.orig 2016-09-18 20:16:04.000000000 +0000
++++ encfs/main.cpp
+@@ -488,8 +488,10 @@ static void *idleMonitor(void *);
+ void *encfs_init(fuse_conn_info *conn) {
+ EncFS_Context *ctx = (EncFS_Context *)fuse_get_context()->private_data;
+
++#ifndef __NetBSD__ /* XXX FUSE API too old */
+ // set fuse connection options
+ conn->async_read = true;
++#endif
+
+ if (ctx->args->isDaemon) {
+ // Switch to using syslog.
Index: pkgsrc/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h:1.1
--- /dev/null Mon Jun 19 18:41:39 2017
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h Mon Jun 19 18:41:39 2017
@@ -0,0 +1,34 @@
+$NetBSD: patch-internal_easylogging++.h,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+NetBSD support, it's a unixy OS.
+
+--- internal/easylogging++.h.orig 2016-09-18 20:16:04.000000000 +0000
++++ internal/easylogging++.h
+@@ -99,13 +99,19 @@
+ #else
+ # 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
+ #else
+ # 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
+ #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
Home |
Main Index |
Thread Index |
Old Index