pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/filesystems/fuse-encfs fuse-encfs: update to 1.9.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/3d712fe3f282
branches: trunk
changeset: 363959:3d712fe3f282
user: maya <maya%pkgsrc.org@localhost>
date: Mon Jun 19 18:41:39 2017 +0000
description:
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
diffstat:
filesystems/fuse-encfs/Makefile | 29 +++--
filesystems/fuse-encfs/PLIST | 57 ++++++++++-
filesystems/fuse-encfs/distinfo | 23 +--
filesystems/fuse-encfs/patches/patch-aa | 17 ---
filesystems/fuse-encfs/patches/patch-ab | 16 ---
filesystems/fuse-encfs/patches/patch-ac | 48 ---------
filesystems/fuse-encfs/patches/patch-ad | 14 --
filesystems/fuse-encfs/patches/patch-ae | 12 --
filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake | 17 +++
filesystems/fuse-encfs/patches/patch-encfs_Config.cpp | 12 --
filesystems/fuse-encfs/patches/patch-encfs_ConfigVar.cpp | 12 --
filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp | 27 +++++
filesystems/fuse-encfs/patches/patch-encfs_NameIO.cpp | 12 --
filesystems/fuse-encfs/patches/patch-encfs_OpaqueValue.h | 13 --
filesystems/fuse-encfs/patches/patch-encfs_main.cpp | 15 ++
filesystems/fuse-encfs/patches/patch-internal_easylogging++.h | 34 ++++++
16 files changed, 174 insertions(+), 184 deletions(-)
diffs (truncated from 439 to 300 lines):
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/Makefile
--- a/filesystems/fuse-encfs/Makefile Mon Jun 19 13:33:46 2017 +0000
+++ b/filesystems/fuse-encfs/Makefile Mon Jun 19 18:41:39 2017 +0000
@@ -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}
-.include "../../devel/librlog/buildlink3.mk"
+TEST_TARGET= test
+
+post-extract:
+ ${RUN} mkdir -p ${WRKDIR}/build
+
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/fuse.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/PLIST
--- a/filesystems/fuse-encfs/PLIST Mon Jun 19 13:33:46 2017 +0000
+++ b/filesystems/fuse-encfs/PLIST Mon Jun 19 18:41:39 2017 +0000
@@ -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
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/distinfo
--- a/filesystems/fuse-encfs/distinfo Mon Jun 19 13:33:46 2017 +0000
+++ b/filesystems/fuse-encfs/distinfo Mon Jun 19 18:41:39 2017 +0000
@@ -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
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-aa
--- a/filesystems/fuse-encfs/patches/patch-aa Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/FileUtils.cpp.orig 2007-03-01 01:02:48.000000000 +0100
-+++ encfs/FileUtils.cpp 2007-03-01 01:03:29.000000000 +0100
-@@ -50,10 +50,12 @@
- #include <sstream>
-
- #include "i18n.h"
-+#include "../intl/autosprintf.h"
-
- using namespace rel;
- using namespace rlog;
- using namespace std;
-+using gnu::autosprintf;
-
- static const int DefaultBlockSize = 512;
- // environment variable names for values encfs stores in the environment when
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-ab
--- a/filesystems/fuse-encfs/patches/patch-ab Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2012/08/17 15:15:27 marino Exp $
-
---- encfs/encfs.h.orig 2007-03-01 01:04:54.000000000 +0100
-+++ encfs/encfs.h 2007-03-01 01:05:30.000000000 +0100
-@@ -48,7 +48,11 @@
- struct fuse_file_info *info);
- int encfs_write(const char *path, const char *buf, size_t size, off_t offset,
- struct fuse_file_info *info);
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- int encfs_statfs(const char *, struct statfs *fst);
-+#else
-+int encfs_statfs(const char *, struct statvfs *fst);
-+#endif
- int encfs_fsync(const char *path, int flags, struct fuse_file_info *info);
-
- #ifdef HAVE_XATTR
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-ac
--- a/filesystems/fuse-encfs/patches/patch-ac Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2012/08/17 15:15:27 marino Exp $
-
---- encfs/encfs.cpp.orig 2007-03-01 01:05:53.000000000 +0100
-+++ encfs/encfs.cpp 2007-03-01 01:10:17.000000000 +0100
-@@ -23,7 +23,11 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <errno.h>
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- #include <sys/statfs.h>
-+#else
-+#include <sys/statvfs.h>
-+#endif
-
- #include <sys/types.h>
-
-@@ -497,7 +501,11 @@
- return res;
- }
-
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- int encfs_statfs(const char *path, struct statfs *st)
-+#else
-+int encfs_statfs(const char *path, struct statvfs *st)
-+#endif
- {
- int res = -EIO;
- try
-@@ -507,11 +515,19 @@
- string cyName = FSRoot->rootDirectory();
-
- rLog(Info, "doing statfs of %s", cyName.c_str());
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- res = statfs( cyName.c_str(), st );
-+#else
-+ res = statvfs(cyName.c_str(), st);
-+#endif
- if(!res)
- {
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- // adjust maximum name length..
- st->f_namelen = 6 * (st->f_namelen - 2) / 8; // approx..
-+#else
-+ st->f_namemax = 6 * (st->f_namemax - 2) / 8;
-+#endif
- }
- if(res == -1)
- res = -errno;
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-ad
--- a/filesystems/fuse-encfs/patches/patch-ad Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/encfs.h.orig 2007-03-01 01:13:44.000000000 +0100
-+++ encfs/encfs.h 2007-03-01 01:14:09.000000000 +0100
-@@ -22,6 +22,9 @@
- #include "config.h"
- #include <fuse.h>
- #include <unistd.h>
-+#include "../intl/autosprintf.h"
-+
-+using gnu::autosprintf;
-
- #if defined(HAVE_SYS_XATTR_H) | defined(HAVE_ATTR_XATTR_H)
- #define HAVE_XATTR
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-ae
--- a/filesystems/fuse-encfs/patches/patch-ae Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/encfsctl.cpp.orig 2007-03-01 01:23:48.000000000 +0100
-+++ encfs/encfsctl.cpp 2007-03-01 01:24:03.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <string>
-
- #include "i18n.h"
-+#include "../intl/gettext.h"
-
- #ifdef HAVE_SSL
- #define NO_DES
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake Mon Jun 19 18:41:39 2017 +0000
@@ -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
diff -r da9af980beca -r 3d712fe3f282 filesystems/fuse-encfs/patches/patch-encfs_Config.cpp
--- a/filesystems/fuse-encfs/patches/patch-encfs_Config.cpp Mon Jun 19 13:33:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-encfs_Config.cpp,v 1.1 2011/11/24 14:11:19 joerg Exp $
-
---- encfs/Config.cpp.orig 2011-11-24 00:20:46.000000000 +0000
-+++ encfs/Config.cpp
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <string.h>
- #include <unistd.h>
Home |
Main Index |
Thread Index |
Old Index