Attachment #87361 for bug #123967

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




#

PORTNAME=	encfs
PORTVERSION=	1.4.2
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX=	fusefs-
DISTNAME=	encfs-${PORTVERSION}-1
EXTRACT_SUFX=	.tgz

MAINTAINER=	trasz@FreeBSD.org
COMMENT=	An encrypted pass-through FUSE filesystem

LIB_DEPENDS=	rlog:${PORTSDIR}/devel/rlog \
		boost_serialization:${PORTSDIR}/devel/boost
RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs



USE_AUTOTOOLS=	libtool:15
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization
CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
CFLAGS+=	${PTHREAD_LIBS} -liconv
USE_GMAKE=	yes
USE_GETTEXT=	yes
USE_LDCONFIG=	yes

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+=	NLS="@comment "
.else
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.endif

MAN1=		encfs.1 encfsctl.1


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (encfs-1.3.2-1.tgz) = 71482dbe0e158ee9ba522ae637337230	1	MD5 (encfs-1.4.2.tgz) = 61e42ab2093b9797b9c669b9a1ff665b
2	SHA256 (encfs-1.3.2-1.tgz) = 3825cf0724fcfdc4bd8073227f4437c3b25056571fb94709ba463fb1f70d0a85	2	SHA256 (encfs-1.4.2.tgz) = 8d0ebd0037248939eb791b3b1e0476befd99526657948702f4d74724c6571ee9
3	SIZE (encfs-1.3.2-1.tgz) = 711838	3	SIZE (encfs-1.4.2.tgz) = 893484




bin/encfs
bin/encfsctl
bin/encfssh
lib/libencfs.so.2
lib/libencfs.so
lib/libencfs.a
lib/libencfs.la
lib/libencfs.so
lib/libencfs.so.4
%%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/bs/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_CH/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/el/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/et/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/fi/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/gu/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/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/ms/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/nn/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/ro/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/sk/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
%%NLS%%share/locale/zh_CN/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/encfs.mo
%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/zh_HK
%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/te
%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/nds
%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/mr
%%NLS%%@dirrmtry share/locale/es_PE/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/es_PE
%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/de_DE
%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/de_CH




--- encfs/PtrImpl.h.orig	Wed Feb 14 22:36:56 2007
+++ encfs/PtrImpl.h	Thu Jun 14 18:04:10 2007
@@ -26,6 +26,20 @@
 
 #include "OpaqueValue.h"
 
+#include "config.h"
+#if defined(HAVE_ATOMIC_GCC) || defined(HAVE_ATOMIC_GCC_PRIVATE)
+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
+#include <ext/atomicity.h>
+#else
+#include <bits/atomicity.h>
+#endif
+#define HAVE_ATOMIC_FUNCS
+#endif
+
+#if defined(HAVE_ATOMIC_GCC_PRIVATE)
+using namespace __gnu_cxx;
+#endif
+
 namespace rel
 {
 
@@ -55,7 +69,12 @@
 	virtual void destroy() =0;
 
     protected:
+
+#ifdef HAVE_ATOMIC_FUNCS
+	volatile _Atomic_word refCnt;
+#else
 	int refCnt;
+#endif
     };
     
     /*




--- encfs/encfsctl.cpp.orig	2008-05-22 02:37:48.000000000 -0700
+++ encfs/encfsctl.cpp	2008-05-22 02:37:57.000000000 -0700
@@ -36,9 +36,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef __FreeBSD__
-#include <libintl.h>
+#include "gettext.h"
 #endif
 
 #include "i18n.h"
 

Return to bug 123967

Lines 6-23 Link Here

(-)Makefile (-7 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= encfs	8	PORTNAME= encfs
9	PORTVERSION= 1.3.2	9	PORTVERSION= 1.4.2
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://arg0.net/users/vgough/download/	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
13	PKGNAMEPREFIX= fusefs-	12	PKGNAMEPREFIX= fusefs-
14	DISTNAME= encfs-${PORTVERSION}-1
15	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
16		14
17	MAINTAINER= trasz@FreeBSD.org	15	MAINTAINER= trasz@FreeBSD.org
18	COMMENT= An encrypted pass-through FUSE filesystem	16	COMMENT= An encrypted pass-through FUSE filesystem
19		17
20	LIB_DEPENDS= rlog:${PORTSDIR}/devel/rlog	18	LIB_DEPENDS= rlog:${PORTSDIR}/devel/rlog \
		19	boost_serialization:${PORTSDIR}/devel/boost
21	RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod	20	RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
22	BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs	21	BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
23		22
Lines 25-36 Link Here
25		24
26	USE_AUTOTOOLS= libtool:15	25	USE_AUTOTOOLS= libtool:15
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib	27	CONFIGURE_ARGS= --with-boost-serialization=boost_serialization
		28	CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
29	CFLAGS+= ${PTHREAD_LIBS} -liconv	29	CFLAGS+= ${PTHREAD_LIBS} -liconv
30	USE_GMAKE= yes	30	USE_GMAKE= yes
31	USE_GETTEXT= yes
32	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
		32
		33	.if defined(WITHOUT_NLS)
		34	CONFIGURE_ARGS+=--disable-nls
		35	PLIST_SUB+= NLS="@comment "
		36	.else
33	USE_GETTEXT= yes	37	USE_GETTEXT= yes
		38	PLIST_SUB+= NLS=""
		39	.endif
34		40
35	MAN1= encfs.1 encfsctl.1	41	MAN1= encfs.1 encfsctl.1
36		42

Lines 1-49 Link Here

(-)pkg-plist (-44 / +70 lines)
1	bin/encfs	1	bin/encfs
2	bin/encfsctl	2	bin/encfsctl
3	bin/encfssh	3	bin/encfssh
4	lib/libencfs.so.2
5	lib/libencfs.so
6	lib/libencfs.a	4	lib/libencfs.a
7	lib/libencfs.la	5	lib/libencfs.la
8	share/locale/bg/LC_MESSAGES/encfs.mo	6	lib/libencfs.so
9	share/locale/da/LC_MESSAGES/encfs.mo	7	lib/libencfs.so.4
10	share/locale/de/LC_MESSAGES/encfs.mo	8	%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
11	share/locale/es/LC_MESSAGES/encfs.mo	9	%%NLS%%share/locale/be/LC_MESSAGES/encfs.mo
12	share/locale/es_ES/LC_MESSAGES/encfs.mo	10	%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo
13	share/locale/fr/LC_MESSAGES/encfs.mo	11	%%NLS%%share/locale/bs/LC_MESSAGES/encfs.mo
14	share/locale/he/LC_MESSAGES/encfs.mo	12	%%NLS%%share/locale/ca/LC_MESSAGES/encfs.mo
15	share/locale/hr/LC_MESSAGES/encfs.mo	13	%%NLS%%share/locale/cs/LC_MESSAGES/encfs.mo
16	share/locale/hu/LC_MESSAGES/encfs.mo	14	%%NLS%%share/locale/da/LC_MESSAGES/encfs.mo
17	share/locale/id/LC_MESSAGES/encfs.mo	15	%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
18	share/locale/it/LC_MESSAGES/encfs.mo	16	%%NLS%%share/locale/de_CH/LC_MESSAGES/encfs.mo
19	share/locale/ja/LC_MESSAGES/encfs.mo	17	%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo
20	share/locale/nb/LC_MESSAGES/encfs.mo	18	%%NLS%%share/locale/el/LC_MESSAGES/encfs.mo
21	share/locale/nl/LC_MESSAGES/encfs.mo	19	%%NLS%%share/locale/eo/LC_MESSAGES/encfs.mo
22	share/locale/pt_BR/LC_MESSAGES/encfs.mo	20	%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
23	share/locale/pt_PT/LC_MESSAGES/encfs.mo	21	%%NLS%%share/locale/es_ES/LC_MESSAGES/encfs.mo
24	share/locale/ru/LC_MESSAGES/encfs.mo	22	%%NLS%%share/locale/es_PE/LC_MESSAGES/encfs.mo
25	share/locale/sv/LC_MESSAGES/encfs.mo	23	%%NLS%%share/locale/et/LC_MESSAGES/encfs.mo
26	share/locale/tr/LC_MESSAGES/encfs.mo	24	%%NLS%%share/locale/fi/LC_MESSAGES/encfs.mo
27	share/locale/ca/LC_MESSAGES/encfs.mo	25	%%NLS%%share/locale/fr/LC_MESSAGES/encfs.mo
28	share/locale/cs/LC_MESSAGES/encfs.mo	26	%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
29	share/locale/de_CH/LC_MESSAGES/encfs.mo	27	%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo
30	share/locale/de_DE/LC_MESSAGES/encfs.mo	28	%%NLS%%share/locale/gu/LC_MESSAGES/encfs.mo
31	share/locale/fi/LC_MESSAGES/encfs.mo	29	%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo
32	share/locale/fr_FR/LC_MESSAGES/encfs.mo	30	%%NLS%%share/locale/hi/LC_MESSAGES/encfs.mo
33	share/locale/hu_HU/LC_MESSAGES/encfs.mo	31	%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo
34	share/locale/ko/LC_MESSAGES/encfs.mo	32	%%NLS%%share/locale/hu/LC_MESSAGES/encfs.mo
35	share/locale/pl/LC_MESSAGES/encfs.mo	33	%%NLS%%share/locale/id/LC_MESSAGES/encfs.mo
36	share/locale/pt/LC_MESSAGES/encfs.mo	34	%%NLS%%share/locale/it/LC_MESSAGES/encfs.mo
37	share/locale/ro/LC_MESSAGES/encfs.mo	35	%%NLS%%share/locale/ja/LC_MESSAGES/encfs.mo
38	share/locale/te/LC_MESSAGES/encfs.mo	36	%%NLS%%share/locale/ka/LC_MESSAGES/encfs.mo
39	share/locale/es_PE/LC_MESSAGES/encfs.mo	37	%%NLS%%share/locale/ko/LC_MESSAGES/encfs.mo
40	@dirrmtry share/locale/hu_HU/LC_MESSAGES	38	%%NLS%%share/locale/lv/LC_MESSAGES/encfs.mo
41	@dirrmtry share/locale/hu_HU	39	%%NLS%%share/locale/mr/LC_MESSAGES/encfs.mo
42	@dirrmtry share/locale/de_CH/LC_MESSAGES	40	%%NLS%%share/locale/ms/LC_MESSAGES/encfs.mo
43	@dirrmtry share/locale/de_CH	41	%%NLS%%share/locale/nb/LC_MESSAGES/encfs.mo
44	@dirrmtry share/locale/de_DE/LC_MESSAGES	42	%%NLS%%share/locale/nds/LC_MESSAGES/encfs.mo
45	@dirrmtry share/locale/de_DE	43	%%NLS%%share/locale/nl/LC_MESSAGES/encfs.mo
46	@dirrmtry share/locale/te/LC_MESSAGES	44	%%NLS%%share/locale/nn/LC_MESSAGES/encfs.mo
47	@dirrmtry share/locale/te	45	%%NLS%%share/locale/pl/LC_MESSAGES/encfs.mo
48	@dirrmtry share/locale/es_PE/LC_MESSAGES	46	%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
49	@dirrmtry share/locale/es_PE	47	%%NLS%%share/locale/pt_BR/LC_MESSAGES/encfs.mo
		48	%%NLS%%share/locale/pt_PT/LC_MESSAGES/encfs.mo
		49	%%NLS%%share/locale/ro/LC_MESSAGES/encfs.mo
		50	%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo
		51	%%NLS%%share/locale/sk/LC_MESSAGES/encfs.mo
		52	%%NLS%%share/locale/sr/LC_MESSAGES/encfs.mo
		53	%%NLS%%share/locale/sv/LC_MESSAGES/encfs.mo
		54	%%NLS%%share/locale/ta/LC_MESSAGES/encfs.mo
		55	%%NLS%%share/locale/te/LC_MESSAGES/encfs.mo
		56	%%NLS%%share/locale/tr/LC_MESSAGES/encfs.mo
		57	%%NLS%%share/locale/uk/LC_MESSAGES/encfs.mo
		58	%%NLS%%share/locale/vi/LC_MESSAGES/encfs.mo
		59	%%NLS%%share/locale/zh_CN/LC_MESSAGES/encfs.mo
		60	%%NLS%%share/locale/zh_HK/LC_MESSAGES/encfs.mo
		61	%%NLS%%share/locale/zh_TW/LC_MESSAGES/encfs.mo
		62	%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
		63	%%NLS%%@dirrmtry share/locale/zh_HK
		64	%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
		65	%%NLS%%@dirrmtry share/locale/te
		66	%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES
		67	%%NLS%%@dirrmtry share/locale/nds
		68	%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
		69	%%NLS%%@dirrmtry share/locale/mr
		70	%%NLS%%@dirrmtry share/locale/es_PE/LC_MESSAGES
		71	%%NLS%%@dirrmtry share/locale/es_PE
		72	%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
		73	%%NLS%%@dirrmtry share/locale/de_DE
		74	%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES
		75	%%NLS%%@dirrmtry share/locale/de_CH

Removed Link Here

(-)files/patch-encfs-PtrImpl.h (-36 lines)
1	--- encfs/PtrImpl.h.orig Wed Feb 14 22:36:56 2007
2	+++ encfs/PtrImpl.h Thu Jun 14 18:04:10 2007
3	@@ -26,6 +26,20 @@
4
5	#include "OpaqueValue.h"
6
7	+#include "config.h"
8	+#if defined(HAVE_ATOMIC_GCC) \|\| defined(HAVE_ATOMIC_GCC_PRIVATE)
9	+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
10	+#include <ext/atomicity.h>
11	+#else
12	+#include <bits/atomicity.h>
13	+#endif
14	+#define HAVE_ATOMIC_FUNCS
15	+#endif
16	+
17	+#if defined(HAVE_ATOMIC_GCC_PRIVATE)
18	+using namespace __gnu_cxx;
19	+#endif
20	+
21	namespace rel
22	{
23
24	@@ -55,7 +69,12 @@
25	virtual void destroy() =0;
26
27	protected:
28	+
29	+#ifdef HAVE_ATOMIC_FUNCS
30	+ volatile _Atomic_word refCnt;
31	+#else
32	int refCnt;
33	+#endif
34	};
35
36	/*

Added Link Here

(-)files/patch-encfs__encfsctl.cpp (+13 lines)
1	--- encfs/encfsctl.cpp.orig 2008-05-22 02:37:48.000000000 -0700
2	+++ encfs/encfsctl.cpp 2008-05-22 02:37:57.000000000 -0700
3	@@ -36,9 +36,9 @@
4	#include <sys/types.h>
5	#include <sys/stat.h>
6	#include <fcntl.h>
7	#ifdef __FreeBSD__
8	-#include <libintl.h>
9	+#include "gettext.h"
10	#endif
11
12	#include "i18n.h"
13