Merge branch 'master' into master

CMakeLists.txt

@@ -10,7 +10,7 @@ project(EncFS C CXX)
 
 set (ENCFS_MAJOR 1)
 set (ENCFS_MINOR 9)
-set (ENCFS_PATCH 4)
+set (ENCFS_PATCH 5)
 set (ENCFS_VERSION "${ENCFS_MAJOR}.${ENCFS_MINOR}.${ENCFS_PATCH}")
 set (ENCFS_SOVERSION "${ENCFS_MAJOR}.${ENCFS_MINOR}")
 set (ENCFS_NAME "Encrypted Filesystem")

ChangeLog

@@ -1,3 +1,16 @@
+v1.9.5 / 2018-04-27
+===================
+	* Correct a int/off_t buffer overflow in getSize()
+	* Correct a possible write crash
+	* Correct encfsctl cat and add reverse cat
+	* Add -c & -u cmdline options
+	* Add --noattrcache & --nodatacache cmdline options
+	* Ignore .encfs6.xml file in reverse mode
+	* Do not count usage on root path (to avoid resetting the --idle option)
+	* Use stderr instead of stdout for error messages
+	* Add the ability to disable data encryption (absolutely discouraged)
+	* Add Cygwin support
+
 v1.9.4 / 2018-01-28
 ===================
 	* Fix packaging error leading to wrong version output

encfs/BlockFileIO.cpp

@@ -186,7 +186,7 @@ ssize_t BlockFileIO::read(const IORequest &req) const {
     ++blockNum;
     partialOffset = 0;
 
-    if (readSize < _blockSize) {
+    if ((size_t)readSize < _blockSize) {
       break;
     }
   }

package-source.sh

@@ -9,3 +9,6 @@ PREFIX="encfs-$VERSION"
 
 # Actually create archive
 git archive --prefix "$PREFIX/" -o $PREFIX.tar.gz HEAD
+
+gpg --list-secret-keys --keyid-format LONG
+echo "Hint for signing: gpg -u <user> --armor --detach-sig $PREFIX.tar.gz"