encfs: update to 1.9.5

The patch is contributed by detlevd (Detlev Droege) in the Trac ticket
referenced below.

* OpenSSL 1.1 compatibility
* patch-encfs-encfssh.diff: not needed as encfssh is fixed since
  version 1.9 [1].
* patch-configure.ac.diff & configure-related settings: not needed as
  the latest encfs switches to CMake. It can find OSXFUSE and Boost
  installed by MacPorts without extra settings.

[1] https://github.com/vgough/encfs/commit/95d6ae8beceea60d9a7b0d5fa5473806ca1e7c9f

Closes: https://trac.macports.org/ticket/58991
This commit is contained in:
Chih-Hsuan Yen
2019-09-10 14:43:05 +08:00
parent 343e9ffbff
commit 4e8dcf9e89
3 changed files with 9 additions and 51 deletions
+9 -21
View File
@@ -3,9 +3,10 @@
PortSystem 1.0
PortGroup github 1.0
PortGroup cxx11 1.1
PortGroup cmake 1.1
github.setup vgough encfs 1.8.1 v
revision 4
github.setup vgough encfs 1.9.5 v
revision 0
categories fuse
platforms darwin
maintainers nomaintainer
@@ -23,26 +24,13 @@ long_description EncFS is an encrypted pass-through filesystem which \
homepage https://vgough.github.io/encfs/
github.tarball_from releases
checksums rmd160 206cc3779222cb6df5278d27ad4a58c25138ab02 \
sha256 8a0257ff500c14244ee99acdd472696966796e2a0931e4a132191f14a666d5d1
checksums rmd160 1e33b38569eb527546527e3a24b0d83608c06feb \
sha256 4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63 \
size 2798888
depends_build port:pkgconfig
depends_lib port:rlog path:lib/libssl.dylib:openssl port:osxfuse port:gettext port:boost
depends_build-append \
port:pkgconfig
depends_lib-append port:rlog path:lib/libssl.dylib:openssl port:osxfuse port:gettext port:boost
# osxfuse is not universal
universal_variant no
patchfiles patch-configure.ac.diff
platform darwin {
patchfiles-append patch-encfs-encfssh.diff
}
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure.ac
}
use_autoreconf yes
autoreconf.args -fvi
configure.args --with-boost=${prefix}
-21
View File
@@ -1,21 +0,0 @@
--- configure.ac.orig 2015-03-24 15:45:16.000000000 -0500
+++ configure.ac 2015-08-25 02:56:57.000000000 -0500
@@ -64,15 +64,11 @@
AX_CXX_COMPILE_STDCXX_11
dnl Look for fuse headers.
-AX_EXT_HAVE_HEADER(fuse.h, /usr/include/fuse /usr/local/include/fuse \
- /opt/include/fuse /opt/local/include/fuse \
- /usr/include/osxfuse /usr/local/include/osxfuse \
- /opt/local/include/osxfuse)
+AX_EXT_HAVE_HEADER(fuse.h,
+ @@PREFIX@@/include/osxfuse)
dnl Ensure the necessary paths are added to LDPATH
-AX_EXT_HAVE_LIB(/usr/lib /usr/local/lib /opt/lib /opt/local/lib, fuse,
- fuse_mount, [])
-AX_EXT_HAVE_LIB(/usr/lib /usr/local/lib /opt/lib /opt/local/lib, osxfuse,
+AX_EXT_HAVE_LIB(@@PREFIX@@/lib, osxfuse,
fuse_mount, [])
if test "$GXX" = "yes"; then
@@ -1,9 +0,0 @@
--- encfs/encfssh.orig 2015-03-24 15:45:16.000000000 -0500
+++ encfs/encfssh 2015-08-25 02:58:04.000000000 -0500
@@ -61,5 +61,5 @@
cd $unenc_dir
# Set the shell up
-exec /bin/sh -c "$SHELL ; cd $orig_dir ; fusermount -u $unenc_dir ; if ! $unenc_dir_given; then rmdir $unenc_dir; fi"
+exec /bin/sh -c "$SHELL ; cd $orig_dir ; umount $unenc_dir ; if ! $unenc_dir_given; then rmdir $unenc_dir; fi"