Attachment #177859 for bug #215204

View | Details | Raw Unified | Return to bug 215204
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	encfs
PORTVERSION=	1.9.1
DISTVERSIONPREFIX=	v
PORTREVISION=	2
CATEGORIES=	sysutils
PKGNAMEPREFIX=	fusefs-


COMMENT=	Encrypted pass-through FUSE filesystem

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

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

BROKEN_powerpc64=	does not build

USES=		cmake:outsource compiler:c++11-lib fuse ssl

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
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	BUNDLED_TINYXML MANPAGES NLS
OPTIONS_DEFAULT=	BUNDLED_TINYXML MANPAGES
OPTIONS_SUB=	yes

BUNDLED_TINYXML_DESC=	Use bundled TinyXML2 instead of textproc/tinyxml2
BUNDLED_TINYXML_CMAKE_BOOL=	USE_INTERNAL_TINYXML
BUNDLED_TINYXML_LIB_DEPENDS_OFF=	libtinyxml2.so:textproc/tinyxml2

MANPAGES_DESC=	Install manpages (requires Perl 5)
MANPAGES_USES=	perl5
MANPAGES_USE=	perl5=build

NLS_USES=	gettext
NLS_CMAKE_BOOL=	ENABLE_NLS

pre-configure:
	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
		${WRKSRC}/configure.ac

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)sysutils/fusefs-encfs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1465595410	1	TIMESTAMP = 1481339464
2	SHA256 (vgough-encfs-v1.8.1_GH0.tar.gz) = ed6b69d8aba06382ad01116bbce2e4ad49f8de85cdf4e2fab7ee4ac82af537e9	2	SHA256 (vgough-encfs-v1.9.1_GH0.tar.gz) = 67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4
3	SIZE (vgough-encfs-v1.8.1_GH0.tar.gz) = 316534	3	SIZE (vgough-encfs-v1.9.1_GH0.tar.gz) = 455910

Line 0 Link Here

(-)sysutils/fusefs-encfs/files/patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2016-12-10 16:58:46 UTC
	2	+++ CMakeLists.txt
	3	@@ -229,7 +229,7 @@ if (POD2MAN)
	4	${CMAKE_SOURCE_DIR}/encfs/encfsctl.pod encfsctl.1)
	5
	6	install (FILES ${CMAKE_BINARY_DIR}/encfs.1 ${CMAKE_BINARY_DIR}/encfsctl.1
	7	- DESTINATION share/man/man1)
	8	+ DESTINATION man/man1)
	9	endif (POD2MAN)
	10
	11	# Tests




--- encfs/encfs.cpp.orig	2016-09-18 20:16:04 UTC
+++ encfs/encfs.cpp
@@ -741,6 +741,6 @@ int encfs_removexattr(const char *path, 
                         bind(_do_removexattr, _1, _2, name));
 }
 
-}  // namespace encfs
-
 #endif  // HAVE_XATTR
+    return res;
+  }
+
+}  // namespace encfs
+}
+
 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

Lines 1-10 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_encfs.h (-10 lines)
1	--- encfs/encfs.h.orig 2015-03-24 20:45:16 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,




--- encfs/main.cpp.orig	2015-03-24 20:45:16 UTC
+++ encfs/main.cpp
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <cerrno>
 #include <cstring>
+#include <cstdlib>
 
 #include <getopt.h>
 
@@ -599,7 +600,7 @@ int main(int argc, char *argv[]) {
   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;

Lines 1-10 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp (-10 lines)
1	--- encfs/makeKey.cpp.orig 2015-03-24 20:45:16 UTC
2	+++ encfs/makeKey.cpp
3	@@ -25,6 +25,7 @@
4	#include "openssl.h"
5
6	#include <iostream>
7	+#include <cstdlib>
8
9	#include <sys/types.h>
10	#include <unistd.h>




bin/encfs
bin/encfsctl
bin/encfssh
%%MANPAGES%%man/man1/encfs.1.gz
%%MANPAGES%%man/man1/encfsctl.1.gz
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/be/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo

%%NLS%%share/locale/ca/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/cs/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/da/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de_AT/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de_CH/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/el/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/en_CA/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/eo/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/es_ES/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/es_PE/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/et/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/fi/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/fr/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/hr/LC_MESSAGES/encfs.mo

%%NLS%%share/locale/nn/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/oc/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/pl/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ro/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/sk/LC_MESSAGES/encfs.mo

Return to bug 215204

Lines 2-10 Link Here

(-)sysutils/fusefs-encfs/Makefile (-22 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= encfs	4	PORTNAME= encfs
5	PORTVERSION= 1.8.1	5	PORTVERSION= 1.9.1
6	DISTVERSIONPREFIX=v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 2
8	CATEGORIES= sysutils	7	CATEGORIES= sysutils
9	PKGNAMEPREFIX= fusefs-	8	PKGNAMEPREFIX= fusefs-
10		9
Lines 12-43 Link Here
12	COMMENT= Encrypted pass-through FUSE filesystem	11	COMMENT= Encrypted pass-through FUSE filesystem
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
		14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	LIB_DEPENDS= librlog.so:devel/rlog \
17	libboost_serialization.so:devel/boost-libs
18
19	BROKEN_powerpc64= does not build	16	BROKEN_powerpc64= does not build
20		17
21	WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}	18	USES= cmake:outsource compiler:c++11-lib fuse ssl
22
23	USES= compiler:c++11-lib fuse autoreconf libtool pkgconfig
24	USE_GITHUB= yes	19	USE_GITHUB= yes
25	GH_ACCOUNT= vgough	20	GH_ACCOUNT= vgough
26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --with-boost-serialization=boost_serialization
28	CPPFLAGS+= -I${LOCALBASE}/include
29	LDFLAGS+= -L${LOCALBASE}/lib
30	USE_LDCONFIG= yes
31	USE_OPENSSL= yes
32	INSTALL_TARGET= install-strip
33		21
34	OPTIONS_DEFINE= NLS	22	OPTIONS_DEFINE= BUNDLED_TINYXML MANPAGES NLS
		23	OPTIONS_DEFAULT= BUNDLED_TINYXML MANPAGES
35	OPTIONS_SUB= yes	24	OPTIONS_SUB= yes
		25
		26	BUNDLED_TINYXML_DESC= Use bundled TinyXML2 instead of textproc/tinyxml2
		27	BUNDLED_TINYXML_CMAKE_BOOL= USE_INTERNAL_TINYXML
		28	BUNDLED_TINYXML_LIB_DEPENDS_OFF= libtinyxml2.so:textproc/tinyxml2
		29
		30	MANPAGES_DESC= Install manpages (requires Perl 5)
		31	MANPAGES_USES= perl5
		32	MANPAGES_USE= perl5=build
		33
36	NLS_USES= gettext	34	NLS_USES= gettext
37	NLS_CONFIGURE_ENABLE= nls	35	NLS_CMAKE_BOOL= ENABLE_NLS
38		36
39	pre-configure:
40	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
41	${WRKSRC}/configure.ac
42
43	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp (-14 / +7 lines)
1	--- encfs/encfs.cpp.orig 2015-03-24 20:45:16 UTC	1	--- encfs/encfs.cpp.orig 2016-09-18 20:16:04 UTC
2	+++ encfs/encfs.cpp	2	+++ encfs/encfs.cpp
3	@@ -529,6 +529,15 @@ int encfs_open(const char *path, struct	3	@@ -741,6 +741,6 @@ int encfs_removexattr(const char *path,
4	return res;	4	bind(_do_removexattr, _1, _2, name));
5	}	5	}
6		6
7	+int encfs_create(const char path, mode_t mode, struct fuse_file_info file) {	7	-} // namespace encfs
8	+ int res = encfs_mknod(path, mode, 0);	8	-
9	+ if (res) {	9	#endif // HAVE_XATTR
10	+ return res;
11	+ }
12	+	10	+
13	+ return encfs_open(path, file);	11	+} // namespace encfs
14	+}
15	+
16	int _do_flush(FileNode *fnode) {
17	/* Flush can be called multiple times for an open file, so it doesn't
18	close the file. However it is important to call close() for some

Lines 1-19 Link Here

(-)sysutils/fusefs-encfs/files/patch-encfs_main.cpp (-19 lines)
1	--- encfs/main.cpp.orig 2015-03-24 20:45:16 UTC
2	+++ encfs/main.cpp
3	@@ -27,6 +27,7 @@
4	#include <sys/time.h>
5	#include <cerrno>
6	#include <cstring>
7	+#include <cstdlib>
8
9	#include <getopt.h>
10
11	@@ -599,7 +600,7 @@ int main(int argc, char *argv[]) {
12	encfs_oper.init = encfs_init;
13	encfs_oper.destroy = encfs_destroy;
14	// encfs_oper.access = encfs_access;
15	- // encfs_oper.create = encfs_create;
16	+ encfs_oper.create = encfs_create;
17	encfs_oper.ftruncate = encfs_ftruncate;
18	encfs_oper.fgetattr = encfs_fgetattr;
19	// encfs_oper.lock = encfs_lock;

Lines 1-11 Link Here

(-)sysutils/fusefs-encfs/pkg-plist (-12 / +6 lines)
1	bin/encfs	1	bin/encfs
2	bin/encfsctl	2	bin/encfsctl
3	bin/encfssh	3	bin/encfssh
4	lib/libencfs.so	4	%%MANPAGES%%man/man1/encfs.1.gz
5	lib/libencfs.so.6	5	%%MANPAGES%%man/man1/encfsctl.1.gz
6	lib/libencfs.so.6.0.2
7	man/man1/encfs.1.gz
8	man/man1/encfsctl.1.gz
9	%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo	6	%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
10	%%NLS%%share/locale/be/LC_MESSAGES/encfs.mo	7	%%NLS%%share/locale/be/LC_MESSAGES/encfs.mo
11	%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo	8	%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo
Lines 13-34 Link Here
13	%%NLS%%share/locale/ca/LC_MESSAGES/encfs.mo	10	%%NLS%%share/locale/ca/LC_MESSAGES/encfs.mo
14	%%NLS%%share/locale/cs/LC_MESSAGES/encfs.mo	11	%%NLS%%share/locale/cs/LC_MESSAGES/encfs.mo
15	%%NLS%%share/locale/da/LC_MESSAGES/encfs.mo	12	%%NLS%%share/locale/da/LC_MESSAGES/encfs.mo
16	%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
17	%%NLS%%share/locale/de_AT/LC_MESSAGES/encfs.mo	13	%%NLS%%share/locale/de_AT/LC_MESSAGES/encfs.mo
18	%%NLS%%share/locale/de_CH/LC_MESSAGES/encfs.mo	14	%%NLS%%share/locale/de_CH/LC_MESSAGES/encfs.mo
19	%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo	15	%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo
		16	%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
20	%%NLS%%share/locale/el/LC_MESSAGES/encfs.mo	17	%%NLS%%share/locale/el/LC_MESSAGES/encfs.mo
21	%%NLS%%share/locale/en_AU/LC_MESSAGES/encfs.mo
22	%%NLS%%share/locale/en_CA/LC_MESSAGES/encfs.mo
23	%%NLS%%share/locale/en_GB/LC_MESSAGES/encfs.mo
24	%%NLS%%share/locale/eo/LC_MESSAGES/encfs.mo	18	%%NLS%%share/locale/eo/LC_MESSAGES/encfs.mo
25	%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
26	%%NLS%%share/locale/es_ES/LC_MESSAGES/encfs.mo	19	%%NLS%%share/locale/es_ES/LC_MESSAGES/encfs.mo
27	%%NLS%%share/locale/es_PE/LC_MESSAGES/encfs.mo	20	%%NLS%%share/locale/es_PE/LC_MESSAGES/encfs.mo
		21	%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
28	%%NLS%%share/locale/et/LC_MESSAGES/encfs.mo	22	%%NLS%%share/locale/et/LC_MESSAGES/encfs.mo
29	%%NLS%%share/locale/fi/LC_MESSAGES/encfs.mo	23	%%NLS%%share/locale/fi/LC_MESSAGES/encfs.mo
		24	%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
30	%%NLS%%share/locale/fr/LC_MESSAGES/encfs.mo	25	%%NLS%%share/locale/fr/LC_MESSAGES/encfs.mo
31	%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
32	%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo	26	%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo
33	%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo	27	%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo
34	%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo	28	%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo
Lines 44-52 Link Here
44	%%NLS%%share/locale/nn/LC_MESSAGES/encfs.mo	38	%%NLS%%share/locale/nn/LC_MESSAGES/encfs.mo
45	%%NLS%%share/locale/oc/LC_MESSAGES/encfs.mo	39	%%NLS%%share/locale/oc/LC_MESSAGES/encfs.mo
46	%%NLS%%share/locale/pl/LC_MESSAGES/encfs.mo	40	%%NLS%%share/locale/pl/LC_MESSAGES/encfs.mo
47	%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
48	%%NLS%%share/locale/pt_BR/LC_MESSAGES/encfs.mo	41	%%NLS%%share/locale/pt_BR/LC_MESSAGES/encfs.mo
49	%%NLS%%share/locale/pt_PT/LC_MESSAGES/encfs.mo	42	%%NLS%%share/locale/pt_PT/LC_MESSAGES/encfs.mo
		43	%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
50	%%NLS%%share/locale/ro/LC_MESSAGES/encfs.mo	44	%%NLS%%share/locale/ro/LC_MESSAGES/encfs.mo
51	%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo	45	%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo
52	%%NLS%%share/locale/sk/LC_MESSAGES/encfs.mo	46	%%NLS%%share/locale/sk/LC_MESSAGES/encfs.mo