Skip to content

Commit

Permalink
sysutils/fusefs-encfs: 1.7.4 -> 1.8.1
Browse files Browse the repository at this point in the history
- submitter becomes maintainer
- reverse: re-enable kernel cache (bug #60)
- reverse mode: disable unique IV by default (was enabled in 1.8)
- add make benchmark-reverse
- remove -o default_permissions unless needed to improve performance
- add option --require-macs (bug #14)
- add per-file IVs based on the inode number to reverse mode to
  improve security
- add automatic benchmark (make benchmark)
- compare MAC in constant time ( fixes bug #12 )
- add --nocache option

PR:		210196
Submitted by:	Dmitri Goutnik <dg@syrec.org>
  • Loading branch information
opsec committed Jun 19, 2016
1 parent 7496373 commit a45dec1
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 80 deletions.
26 changes: 12 additions & 14 deletions sysutils/fusefs-encfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
# $FreeBSD$

PORTNAME= encfs
PORTVERSION= 1.7.4
PORTREVISION= 7
PORTVERSION= 1.8.1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-

MAINTAINER= ports@FreeBSD.org
MAINTAINER= dg@syrec.org
COMMENT= Encrypted pass-through FUSE filesystem

BROKEN_powerpc64= Does not build
LICENSE= GPLv3

LIB_DEPENDS= librlog.so:devel/rlog \
libboost_serialization.so:devel/boost-libs

BROKEN_sparc64= cannot link with boost
BROKEN_powerpc64= does not build
BROKEN_sparc64= cannot link with boost

WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}

USES= compiler:c++11-lib fuse autoreconf libtool pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= vgough
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \
--with-boost-system=boost_system \
--with-boost-filesystem=boost_filesystem
CONFIGURE_ARGS= --with-boost-serialization=boost_serialization
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USES= fuse gmake libtool pkgconfig tar:tgz
USE_LDCONFIG= yes
USE_OPENSSL= yes
INSTALL_TARGET= install-strip
Expand All @@ -36,10 +36,8 @@ OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls

post-patch:
pre-configure:
@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
${WRKSRC}/configure
@${FIND} ${WRKSRC}/encfs -type f | ${XARGS} ${REINPLACE_CMD} -E \
's/(^|[[:space:]])(shared_ptr)/\1boost::\2/g'
${WRKSRC}/configure.ac

.include <bsd.port.mk>
5 changes: 3 additions & 2 deletions sysutils/fusefs-encfs/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SHA256 (encfs-1.7.4.tgz) = 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
SIZE (encfs-1.7.4.tgz) = 931048
TIMESTAMP = 1465595410
SHA256 (vgough-encfs-v1.8.1_GH0.tar.gz) = ed6b69d8aba06382ad01116bbce2e4ad49f8de85cdf4e2fab7ee4ac82af537e9
SIZE (vgough-encfs-v1.8.1_GH0.tar.gz) = 316534
12 changes: 0 additions & 12 deletions sysutils/fusefs-encfs/files/patch-encfs__encfsctl.cpp

This file was deleted.

20 changes: 20 additions & 0 deletions sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- encfs/encfs.cpp.orig 2015-03-24 20:45:16 UTC
+++ encfs/encfs.cpp
@@ -529,6 +529,17 @@ int encfs_open(const char *path, struct
return res;
}

+int encfs_create(const char *path, mode_t mode, struct fuse_file_info *file)
+{
+ int res;
+
+ res = encfs_mknod(path, mode, 0);
+ if (res)
+ return res;
+
+ return encfs_open(path, file);
+}
+
int _do_flush(FileNode *fnode) {
/* Flush can be called multiple times for an open file, so it doesn't
close the file. However it is important to call close() for some
10 changes: 10 additions & 0 deletions sysutils/fusefs-encfs/files/patch-encfs_encfs.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- encfs/encfs.h.orig 2015-03-24 20:45:16 UTC
+++ encfs/encfs.h
@@ -74,6 +74,7 @@ int encfs_chown(const char *path, uid_t
int encfs_truncate(const char *path, off_t size);
int encfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi);
int encfs_utime(const char *path, struct utimbuf *buf);
+int encfs_create(const char *path, mode_t mode, struct fuse_file_info *info);
int encfs_open(const char *path, struct fuse_file_info *info);
int encfs_release(const char *path, struct fuse_file_info *info);
int encfs_read(const char *path, char *buf, size_t size, off_t offset,
10 changes: 10 additions & 0 deletions sysutils/fusefs-encfs/files/patch-encfs_main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- encfs/main.cpp.orig 2016-06-18 20:53:13 UTC
+++ encfs/main.cpp
@@ -27,6 +27,7 @@
#include <sys/time.h>
#include <cerrno>
#include <cstring>
+#include <cstdlib>

#include <getopt.h>

10 changes: 10 additions & 0 deletions sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- encfs/makeKey.cpp.orig 2016-06-18 20:53:44 UTC
+++ encfs/makeKey.cpp
@@ -25,6 +25,7 @@
#include "openssl.h"

#include <iostream>
+#include <cstdlib>

#include <sys/types.h>
#include <unistd.h>
46 changes: 0 additions & 46 deletions sysutils/fusefs-encfs/files/patch-implement-encf_create

This file was deleted.

7 changes: 1 addition & 6 deletions sysutils/fusefs-encfs/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bin/encfsctl
bin/encfssh
lib/libencfs.so
lib/libencfs.so.6
lib/libencfs.so.6.0.1
lib/libencfs.so.6.0.2
man/man1/encfs.1.gz
man/man1/encfsctl.1.gz
%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
Expand Down Expand Up @@ -31,17 +31,13 @@ man/man1/encfsctl.1.gz
%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/hi/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/hu/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/hu_HU/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/id/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/it/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ja/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ka/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ko/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/lv/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/mr/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/nb/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/nds/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/nl/LC_MESSAGES/encfs.mo
Expand All @@ -57,7 +53,6 @@ man/man1/encfsctl.1.gz
%%NLS%%share/locale/sr/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/sv/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ta/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/te/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/tr/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/uk/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/vi/LC_MESSAGES/encfs.mo
Expand Down

0 comments on commit a45dec1

Please sign in to comment.