extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-20 11:47:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

bump version to 1.7.5, revert unmount change

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@74 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2011-12-29 22:26:28 +00:00
parent 9fa5deb196
commit eccdf3c9e6
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,6 +1,22 @@
Mon Jun 13 2011 Valient Gough <vgough@pobox.com> Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
* fix for non-b64 conversions, issue 102 patch by gebart. * fix for non-b64 conversions, issue 102 patch by gebart.
Wed Dec 28 2011 Valient Gough <vgough@pobox.com>
* remove m4-local
* bump version to 1.7.5
Tue Dec 27 2011 Valient Gough <vgough@pobox.com>
* remove auto-generated libtool, add new m4 macros
* improve OSX setup
* wrap PUSHARG macro for correctness. Issue reported by Pedro Rocha.
Sun Oct 2 2011 Valient Gough <vgough@pobox.com>
* build on osx with osxfuse
* update boost m4 macros
Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
* fix for non-b64 conversions, issue 102 patch by gebart.
Tue Dec 7 2010 Valient Gough <vgough@pobox.com> Tue Dec 7 2010 Valient Gough <vgough@pobox.com>
* add annotation option, patch by Werner Koch. * add annotation option, patch by Werner Koch.

2
configure.ac
View File

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(encfs/encfs.h) dnl a source file from your sub dir AC_INIT(encfs/encfs.h) dnl a source file from your sub dir
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE(encfs, 1.7.4) dnl searches for some needed programs AM_INIT_AUTOMAKE(encfs, 1.7.5) dnl searches for some needed programs
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST AC_CANONICAL_HOST

2
encfs/Makefile.am
View File

@ -47,7 +47,7 @@ endif
# : : 0 => no new interfaces, but breaks old apps # : : 0 => no new interfaces, but breaks old apps
# : +1 : => internal changes, nothing breaks # : +1 : => internal changes, nothing breaks
# #
libencfs_la_LDFLAGS = -version-info 6:1:0 libencfs_la_LDFLAGS = -version-info 6:2:0
libencfs_la_LIBADD = @RLOG_LIBS@ \ libencfs_la_LIBADD = @RLOG_LIBS@ \
@OPENSSL_LIBS@ \ @OPENSSL_LIBS@ \
@BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@

7
encfs/main.cpp
View File

@ -55,6 +55,11 @@
#include "i18n.h" #include "i18n.h"
// Fuse version >= 26 requires another argument to fuse_unmount, which we
// don't have. So use the backward compatible call instead..
extern "C" void fuse_unmount_compat22(const char *mountpoint);
#define fuse_unmount fuse_unmount_compat22
#ifndef MAX #ifndef MAX
inline static int MAX(int a, int b) inline static int MAX(int a, int b)
{ {
@ -765,7 +770,7 @@ static bool unmountFS(EncFS_Context *ctx)
// xgroup(diag) // xgroup(diag)
rWarning(_("Unmounting filesystem %s due to inactivity"), rWarning(_("Unmounting filesystem %s due to inactivity"),
arg->mountPoint.c_str()); arg->mountPoint.c_str());
fuse_unmount( arg->mountPoint.c_str(), NULL ); fuse_unmount( arg->mountPoint.c_str() );
return true; return true;
} }
} }