A newer version of encfs is available (1.9.4), which fixes some issues.
Changelog can be found at https://github.com/vgough/encfs/releases
Regression test (there is only 1 unit test) succeeds. Tested lightly on
amd64.
Comments/OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/encfs/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 19 Jan 2018 15:37:34 -0000 1.16
+++ Makefile 12 Apr 2018 17:28:11 -0000
@@ -4,7 +4,7 @@ BROKEN-powerpc = undefined reference to
COMMENT = fuse-based cryptographic filesystem
-V = 1.9.2
+V = 1.9.4
DISTNAME = encfs-$V
CATEGORIES = security
@@ -21,6 +21,7 @@ MASTER_SITES = https://github.com/vgoug
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/cmake
+USE_NINJA = No
BUILD_DEPENDS = devel/gettext-tools
LIB_DEPENDS = devel/gettext \
textproc/tinyxml2
@@ -28,11 +29,6 @@ LIB_DEPENDS = devel/gettext \
CONFIGURE_ARGS = -DUSE_INTERNAL_TINYXML:Bool=Off
CONFIGURE_ENV = CXXFLAGS="-DHAVE_UTIMENSAT -D_DIRENT_HAVE_D_TYPE"
-# fixup, but those tests don't pass anyway
-post-extract:
- sed -i 's,\./build/,${WRKBUILD}/,g' ${WRKSRC}/tests/*.pl
-
-do-test:
- ${SETENV} ${MAKE_ENV} ${WRKBUILD}/checkops
+TEST_TARGET = unittests test
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/encfs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 22 Aug 2017 01:32:34 -0000 1.2
+++ distinfo 12 Apr 2018 17:28:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (encfs-1.9.2.tar.gz) = zZ6XLNlWXNwmRzyG0sd8mN4x/G9gT6fRSd1dbjXUbqo=
-SIZE (encfs-1.9.2.tar.gz) = 11043181
+SHA256 (encfs-1.9.4.tar.gz) = IGVrTq1Y69jV9JpcNGtZ5w3C3DEiAVnltaEVv6G8QNY=
+SIZE (encfs-1.9.4.tar.gz) = 2794574
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/security/encfs/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 22 Aug 2017 01:32:34 -0000 1.1
+++ patches/patch-CMakeLists_txt 12 Apr 2018 17:28:11 -0000
@@ -3,12 +3,21 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -244,7 +244,7 @@ if (POD2MAN)
- ${CMAKE_CURRENT_LIST_DIR}/encfs/encfsctl.pod encfsctl.1)
+@@ -120,6 +120,8 @@ if(LINKER_SUPPORTS_WLASNEEDED)
+ SET(EXTRA_LINKER_FLAGS "-Wl,--as-needed")
+ endif()
- install (FILES ${CMAKE_BINARY_DIR}/encfs.1 ${CMAKE_BINARY_DIR}/encfsctl.1
-- DESTINATION share/man/man1)
-+ DESTINATION man/man1)
- endif (POD2MAN)
++SET(EXTRA_LINKER_FLAGS "-L/usr/lib")
++
+ set(CMAKE_REQUIRED_FLAGS)
- # Tests
+ # Check if we have some standard functions.
+@@ -323,7 +325,7 @@ file (GLOB_RECURSE all_headers ${CMAKE_CURRENT_LIST_DI
+ add_custom_target (all_placeholder SOURCES ${all_headers})
+
+ if (POD2MAN)
+- set (MAN_DESTINATION "share/man/man1")
++ set (MAN_DESTINATION "man/man1")
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ set (MAN_DESTINATION "man/man1")
+ endif()
Index: patches/patch-encfs_SSL_Compat_h
===================================================================
RCS file: patches/patch-encfs_SSL_Compat_h
diff -N patches/patch-encfs_SSL_Compat_h
--- patches/patch-encfs_SSL_Compat_h 22 Aug 2017 01:32:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-encfs_SSL_Compat_h,v 1.1 2017/08/22 01:32:34 jca Exp $
-
-Index: encfs/SSL_Compat.h
---- encfs/SSL_Compat.h.orig
-+++ encfs/SSL_Compat.h
-@@ -22,7 +22,7 @@
- #define _SSL_Compat_incl_
-
- // OpenSSL < 1.1.0
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- // Equivalent methods
- #define EVP_MD_CTX_new EVP_MD_CTX_create
Index: patches/patch-internal_easylogging++_h
===================================================================
RCS file: patches/patch-internal_easylogging++_h
diff -N patches/patch-internal_easylogging++_h
--- patches/patch-internal_easylogging++_h 22 Aug 2017 01:32:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-internal_easylogging++_h,v 1.1 2017/08/22 01:32:34 jca Exp $
-
-Index: internal/easylogging++.h
---- internal/easylogging++.h.orig
-+++ internal/easylogging++.h
-@@ -98,13 +98,18 @@
- #else
- # define ELPP_OS_FREEBSD 0
-
No comments:
Post a Comment