Attachment #171284 for bug #210196




# $FreeBSD$

PORTNAME=	encfs
PORTVERSION=	1.8.1
DISTVERSION=	v${PORTVERSION}
CATEGORIES=	sysutils
MASTER_SITES=	GOOGLE_CODE
PKGNAMEPREFIX=	fusefs-
GH_ACCOUNT=	vgough

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

BROKEN_powerpc64=	Does not build

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

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization
		--with-boost-system=boost_system \
		--with-boost-filesystem=boost_filesystem
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
USES=		fuse autoreconf libtool pkgconfig
USE_GITHUB=	yes
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
INSTALL_TARGET=	install-strip

NLS_USES=	gettext
NLS_CONFIGURE_ENABLE=	nls

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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)sysutils/fusefs-encfs/distinfo (-2 / +3 lines)
1	SHA256 (encfs-1.7.4.tgz) = 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8	1	TIMESTAMP = 1465595410
2	SIZE (encfs-1.7.4.tgz) = 931048	2	SHA256 (vgough-encfs-v1.8.1_GH0.tar.gz) = ed6b69d8aba06382ad01116bbce2e4ad49f8de85cdf4e2fab7ee4ac82af537e9
		3	SIZE (vgough-encfs-v1.8.1_GH0.tar.gz) = 316534




--- encfs/encfsctl.cpp.orig	2014-08-17 19:49:24 UTC
+++ encfs/encfsctl.cpp
@@ -40,7 +40,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef __FreeBSD__
-#include <libintl.h>
+#include "gettext.h"
+#include <climits>
 #endif
 
 #include "i18n.h"




--- encfs/encfs.cpp.orig	2016-06-10 22:56:50 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

Line 0 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_encfs.h (+10 lines)
	1	--- encfs/encfs.h.orig 2016-06-10 22:56:58 UTC
	2	+++ encfs/encfs.h
	3	@@ -74,6 +74,7 @@ int encfs_chown(const char *path, uid_t
	4	int encfs_truncate(const char *path, off_t size);
	5	int encfs_ftruncate(const char path, off_t size, struct fuse_file_info fi);
	6	int encfs_utime(const char path, struct utimbuf buf);
	7	+int encfs_create(const char path, mode_t mode, struct fuse_file_info info);
	8	int encfs_open(const char path, struct fuse_file_info info);
	9	int encfs_release(const char path, struct fuse_file_info info);
	10	int encfs_read(const char path, char buf, size_t size, off_t offset,

Line 0 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_main.cpp (+11 lines)
	1	--- encfs/main.cpp.orig 2016-06-10 22:57:08 UTC
	2	+++ encfs/main.cpp
	3	@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) {
	4	encfs_oper.init = encfs_init;
	5	encfs_oper.destroy = encfs_destroy;
	6	// encfs_oper.access = encfs_access;
	7	- // encfs_oper.create = encfs_create;
	8	+ encfs_oper.create = encfs_create;
	9	encfs_oper.ftruncate = encfs_ftruncate;
	10	encfs_oper.fgetattr = encfs_fgetattr;
	11	// encfs_oper.lock = encfs_lock;




As described in PR 192563

--- encfs/encfs.cpp.orig	2014-04-21 15:10:48.592664000 +0000
+++ encfs/encfs.cpp
@@ -587,6 +587,19 @@
     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;
+    
+    res = encfs_open(path, file);
+    
+    return res;
+}
+
 int _do_flush(FileNode *fnode, int )
 {
     /* Flush can be called multiple times for an open file, so it doesn't
--- encfs/encfs.h.orig	2014-04-21 15:10:48.592664000 +0000
+++ encfs/encfs.h
@@ -74,6 +74,7 @@
 	struct fuse_file_info *fi);
 int encfs_utime(const char *path, struct utimbuf *buf);
 int encfs_open(const char *path, struct fuse_file_info *info);
+int encfs_create(const char *path, mode_t mode, 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,
 	struct fuse_file_info *info);
diff -ur encfs-1.7.4.orig/encfs/main.cpp encfs-1.7.4/encfs/main.cpp
--- encfs/main.cpp.orig	2014-04-21 15:10:48.592664000 +0000
+++ encfs/main.cpp
@@ -563,7 +563,7 @@
     encfs_oper.init = encfs_init;
     encfs_oper.destroy = encfs_destroy;
     //encfs_oper.access = encfs_access;
-    //encfs_oper.create = encfs_create;
+    encfs_oper.create = encfs_create;
     encfs_oper.ftruncate = encfs_ftruncate;
     encfs_oper.fgetattr = encfs_fgetattr;
     //encfs_oper.lock = encfs_lock;




bin/encfssh
lib/libencfs.so
lib/libencfs.so.6
lib/libencfs.so.6.0.2
man/man1/encfs.1.gz
man/man1/encfsctl.1.gz
%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo

%%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

%%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

Return to bug 210196

Lines 2-14 Link Here

(-)sysutils/fusefs-encfs/Makefile (-12 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= encfs	4	PORTNAME= encfs
5	PORTVERSION= 1.7.4	5	PORTVERSION= 1.8.1
6	PORTREVISION= 7	6	DISTVERSION= v${PORTVERSION}
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= GOOGLE_CODE
9	PKGNAMEPREFIX= fusefs-	8	PKGNAMEPREFIX= fusefs-
		9	GH_ACCOUNT= vgough
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= dg@syrec.org
12	COMMENT= Encrypted pass-through FUSE filesystem	12	COMMENT= Encrypted pass-through FUSE filesystem
13		13
14	BROKEN_powerpc64= Does not build	14	BROKEN_powerpc64= Does not build
Lines 21-32 Link Here
21	WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}	21	WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}
22		22
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \	24	CONFIGURE_ARGS= --with-boost-serialization=boost_serialization
25	--with-boost-system=boost_system \
26	--with-boost-filesystem=boost_filesystem
27	CPPFLAGS+= -I${LOCALBASE}/include	25	CPPFLAGS+= -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	26	LDFLAGS+= -L${LOCALBASE}/lib
29	USES= fuse gmake libtool pkgconfig tar:tgz	27	USES= fuse autoreconf libtool pkgconfig
		28	USE_GITHUB= yes
30	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
31	USE_OPENSSL= yes	30	USE_OPENSSL= yes
32	INSTALL_TARGET= install-strip	31	INSTALL_TARGET= install-strip
Lines 36-45 Link Here
36	NLS_USES= gettext	35	NLS_USES= gettext
37	NLS_CONFIGURE_ENABLE= nls	36	NLS_CONFIGURE_ENABLE= nls
38		37
39	post-patch:	38	pre-configure:
40	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \	39	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
41	${WRKSRC}/configure	40	${WRKSRC}/configure.ac
42	@${FIND} ${WRKSRC}/encfs -type f \| ${XARGS} ${REINPLACE_CMD} -E \
43	's/(^\|[[:space:]])(shared_ptr)/\1boost::\2/g'
44		41
45	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs__encfsctl.cpp (-12 lines)
1	--- encfs/encfsctl.cpp.orig 2014-08-17 19:49:24 UTC
2	+++ encfs/encfsctl.cpp
3	@@ -40,7 +40,8 @@
4	#include <sys/stat.h>
5	#include <fcntl.h>
6	#ifdef __FreeBSD__
7	-#include <libintl.h>
8	+#include "gettext.h"
9	+#include <climits>
10	#endif
11
12	#include "i18n.h"

Line 0 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp (+20 lines)
	1	--- encfs/encfs.cpp.orig 2016-06-10 22:56:50 UTC
	2	+++ encfs/encfs.cpp
	3	@@ -529,6 +529,17 @@ int encfs_open(const char *path, struct
	4	return res;
	5	}
	6
	7	+int encfs_create(const char path, mode_t mode, struct fuse_file_info file)
	8	+{
	9	+ int res;
	10	+
	11	+ res = encfs_mknod(path, mode, 0);
	12	+ if (res)
	13	+ return res;
	14	+
	15	+ return encfs_open(path, file);
	16	+}
	17	+
	18	int _do_flush(FileNode *fnode) {
	19	/* Flush can be called multiple times for an open file, so it doesn't
	20	close the file. However it is important to call close() for some

Lines 1-46 Link Here

(-)sysutils/fusefs-encfs/files/patch-implement-encf_create (-46 lines)
1	As described in PR 192563
2
3	--- encfs/encfs.cpp.orig 2014-04-21 15:10:48.592664000 +0000
4	+++ encfs/encfs.cpp
5	@@ -587,6 +587,19 @@
6	return res;
7	}
8
9	+int encfs_create(const char path, mode_t mode, struct fuse_file_info file)
10	+{
11	+ int res;
12	+
13	+ res = encfs_mknod(path, mode, 0);
14	+ if (res)
15	+ return res;
16	+
17	+ res = encfs_open(path, file);
18	+
19	+ return res;
20	+}
21	+
22	int _do_flush(FileNode *fnode, int )
23	{
24	/* Flush can be called multiple times for an open file, so it doesn't
25	--- encfs/encfs.h.orig 2014-04-21 15:10:48.592664000 +0000
26	+++ encfs/encfs.h
27	@@ -74,6 +74,7 @@
28	struct fuse_file_info *fi);
29	int encfs_utime(const char path, struct utimbuf buf);
30	int encfs_open(const char path, struct fuse_file_info info);
31	+int encfs_create(const char path, mode_t mode, struct fuse_file_info info);
32	int encfs_release(const char path, struct fuse_file_info info);
33	int encfs_read(const char path, char buf, size_t size, off_t offset,
34	struct fuse_file_info *info);
35	diff -ur encfs-1.7.4.orig/encfs/main.cpp encfs-1.7.4/encfs/main.cpp
36	--- encfs/main.cpp.orig 2014-04-21 15:10:48.592664000 +0000
37	+++ encfs/main.cpp
38	@@ -563,7 +563,7 @@
39	encfs_oper.init = encfs_init;
40	encfs_oper.destroy = encfs_destroy;
41	//encfs_oper.access = encfs_access;
42	- //encfs_oper.create = encfs_create;
43	+ encfs_oper.create = encfs_create;
44	encfs_oper.ftruncate = encfs_ftruncate;
45	encfs_oper.fgetattr = encfs_fgetattr;
46	//encfs_oper.lock = encfs_lock;

Lines 3-9 Link Here

(-)sysutils/fusefs-encfs/pkg-plist (-6 / +1 lines)
3	bin/encfssh	3	bin/encfssh
4	lib/libencfs.so	4	lib/libencfs.so
5	lib/libencfs.so.6	5	lib/libencfs.so.6
6	lib/libencfs.so.6.0.1	6	lib/libencfs.so.6.0.2
7	man/man1/encfs.1.gz	7	man/man1/encfs.1.gz
8	man/man1/encfsctl.1.gz	8	man/man1/encfsctl.1.gz
9	%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo	9	%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
Lines 31-47 Link Here
31	%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo	31	%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
32	%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo	32	%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo
33	%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo	33	%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo
34	%%NLS%%share/locale/hi/LC_MESSAGES/encfs.mo
35	%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo	34	%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo
36	%%NLS%%share/locale/hu/LC_MESSAGES/encfs.mo	35	%%NLS%%share/locale/hu/LC_MESSAGES/encfs.mo
37	%%NLS%%share/locale/hu_HU/LC_MESSAGES/encfs.mo
38	%%NLS%%share/locale/id/LC_MESSAGES/encfs.mo	36	%%NLS%%share/locale/id/LC_MESSAGES/encfs.mo
39	%%NLS%%share/locale/it/LC_MESSAGES/encfs.mo	37	%%NLS%%share/locale/it/LC_MESSAGES/encfs.mo
40	%%NLS%%share/locale/ja/LC_MESSAGES/encfs.mo	38	%%NLS%%share/locale/ja/LC_MESSAGES/encfs.mo
41	%%NLS%%share/locale/ka/LC_MESSAGES/encfs.mo
42	%%NLS%%share/locale/ko/LC_MESSAGES/encfs.mo	39	%%NLS%%share/locale/ko/LC_MESSAGES/encfs.mo
43	%%NLS%%share/locale/lv/LC_MESSAGES/encfs.mo	40	%%NLS%%share/locale/lv/LC_MESSAGES/encfs.mo
44	%%NLS%%share/locale/mr/LC_MESSAGES/encfs.mo
45	%%NLS%%share/locale/nb/LC_MESSAGES/encfs.mo	41	%%NLS%%share/locale/nb/LC_MESSAGES/encfs.mo
46	%%NLS%%share/locale/nds/LC_MESSAGES/encfs.mo	42	%%NLS%%share/locale/nds/LC_MESSAGES/encfs.mo
47	%%NLS%%share/locale/nl/LC_MESSAGES/encfs.mo	43	%%NLS%%share/locale/nl/LC_MESSAGES/encfs.mo
Lines 57-63 Link Here
57	%%NLS%%share/locale/sr/LC_MESSAGES/encfs.mo	53	%%NLS%%share/locale/sr/LC_MESSAGES/encfs.mo
58	%%NLS%%share/locale/sv/LC_MESSAGES/encfs.mo	54	%%NLS%%share/locale/sv/LC_MESSAGES/encfs.mo
59	%%NLS%%share/locale/ta/LC_MESSAGES/encfs.mo	55	%%NLS%%share/locale/ta/LC_MESSAGES/encfs.mo
60	%%NLS%%share/locale/te/LC_MESSAGES/encfs.mo
61	%%NLS%%share/locale/tr/LC_MESSAGES/encfs.mo	56	%%NLS%%share/locale/tr/LC_MESSAGES/encfs.mo
62	%%NLS%%share/locale/uk/LC_MESSAGES/encfs.mo	57	%%NLS%%share/locale/uk/LC_MESSAGES/encfs.mo
63	%%NLS%%share/locale/vi/LC_MESSAGES/encfs.mo	58	%%NLS%%share/locale/vi/LC_MESSAGES/encfs.mo