Update to 1.9.1

PR: 215204 Submitted by: dg@syrec.org (maintainer)
svn path=/head/; revision=428373
2024-12-03 01:23:49 +00:00 · 2016-12-11 18:01:05 +00:00 · 2016-12-11 18:01:05 +00:00 · 250c747006 · 2021-03-31 03:12:20 +00:00
commit 250c747006
parent bea6d782fc
8 changed files with 43 additions and 90 deletions
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@ -2,9 +2,8 @@
 # $FreeBSD$

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

@ -12,32 +11,27 @@ MAINTAINER=	dg@syrec.org
 COMMENT=	Encrypted pass-through FUSE filesystem

 LICENSE=	GPLv3
-
-LIB_DEPENDS=	librlog.so:devel/rlog \
-		libboost_serialization.so:devel/boost-libs
+LICENSE_FILE=	${WRKSRC}/COPYING

 BROKEN_powerpc64=	does not build

-WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
-
-USES=		compiler:c++11-lib fuse autoreconf libtool pkgconfig
+USES=		cmake:outsource compiler:c++11-lib fuse ssl
 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=	NLS
+OPTIONS_DEFINE=	BUNDLED_TINYXML MANPAGES NLS
+OPTIONS_DEFAULT=	BUNDLED_TINYXML MANPAGES
 OPTIONS_SUB=	yes
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls

-pre-configure:
-	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
-		${WRKSRC}/configure.ac
+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

 .include <bsd.port.mk>
--- a/sysutils/fusefs-encfs/distinfo
+++ b/sysutils/fusefs-encfs/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465595410
-SHA256 (vgough-encfs-v1.8.1_GH0.tar.gz) = ed6b69d8aba06382ad01116bbce2e4ad49f8de85cdf4e2fab7ee4ac82af537e9
-SIZE (vgough-encfs-v1.8.1_GH0.tar.gz) = 316534
+TIMESTAMP = 1481339464
+SHA256 (vgough-encfs-v1.9.1_GH0.tar.gz) = 67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4
+SIZE (vgough-encfs-v1.9.1_GH0.tar.gz) = 455910
--- a/sysutils/fusefs-encfs/files/patch-CMakeLists.txt
+++ b/sysutils/fusefs-encfs/files/patch-CMakeLists.txt
@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2016-12-10 16:58:46 UTC
+++ CMakeLists.txt
+@@ -229,7 +229,7 @@ if (POD2MAN)
+             ${CMAKE_SOURCE_DIR}/encfs/encfsctl.pod encfsctl.1)
+ 
+   install (FILES ${CMAKE_BINARY_DIR}/encfs.1 ${CMAKE_BINARY_DIR}/encfsctl.1
+-    DESTINATION share/man/man1)
+    DESTINATION man/man1)
+ endif (POD2MAN)
+ 
+ # Tests
--- a/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp
+++ b/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp
@ -1,18 +1,11 @@
--- encfs/encfs.cpp.orig	2015-03-24 20:45:16 UTC
+--- encfs/encfs.cpp.orig	2016-09-18 20:16:04 UTC
 +++ encfs/encfs.cpp
-@@ -529,6 +529,15 @@ int encfs_open(const char *path, struct 
-   return res;
+@@ -741,6 +741,6 @@ int encfs_removexattr(const char *path, 
+                         bind(_do_removexattr, _1, _2, name));
 }
 
-+int encfs_create(const char *path, mode_t mode, struct fuse_file_info *file) {
-+  int res = encfs_mknod(path, mode, 0);
-+  if (res) {
-+    return res;
-+  }
+-}  // namespace encfs
+-
+ #endif  // HAVE_XATTR
 +
-+  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
+}  // namespace encfs
--- a/sysutils/fusefs-encfs/files/patch-encfs_encfs.h
+++ b/sysutils/fusefs-encfs/files/patch-encfs_encfs.h
@ -1,10 +0,0 @@
--- 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,
--- a/sysutils/fusefs-encfs/files/patch-encfs_main.cpp
+++ b/sysutils/fusefs-encfs/files/patch-encfs_main.cpp
@ -1,19 +0,0 @@
--- 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;
--- a/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp
+++ b/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp
@ -1,10 +0,0 @@
--- encfs/makeKey.cpp.orig	2015-03-24 20:45:16 UTC
-+++ encfs/makeKey.cpp
-@@ -25,6 +25,7 @@
- #include "openssl.h"
- 
- #include <iostream>
-+#include <cstdlib>
- 
- #include <sys/types.h>
- #include <unistd.h>
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/sysutils/fusefs-encfs/pkg-plist
@ -1,11 +1,8 @@
 bin/encfs
 bin/encfsctl
 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
+%%MANPAGES%%man/man1/encfs.1.gz
+%%MANPAGES%%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
@ -13,22 +10,19 @@ man/man1/encfsctl.1.gz
 %%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/LC_MESSAGES/encfs.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/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
@ -44,9 +38,9 @@ man/man1/encfsctl.1.gz
 %%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