Merge from develop

ChangeLog.txt

@@ -14,13 +14,20 @@ New Features & Improvements:
 Fixed bugs:
 * `du` shows correct file system size on Mac OS X.
 
-Version 0.9.8 (unreleased)
+
+Version 0.9.8
 --------------
 Compatibility:
+* Runs on Debian with FreeBSD kernel
+* Runs on FreeBSD 11.1
 * Works with Crypto++ 6.0
 
+Improvements:
+* added a man page
+
 Fixed bugs:
 * `du` shows correct file system size
+* Updated spdlog dependency to fix build on newer systems
 
 Version 0.9.7
 --------------

README.md

@@ -8,12 +8,12 @@ See [https://www.cryfs.org](https://www.cryfs.org).
 Install latest release
 ======================
 
-Easy install (Ubuntu and Debian)
+Easy install (Ubuntu 17.04 and later, Debian Stretch and later)
 --------------------------------
 
-    wget -O - https://www.cryfs.org/install.sh | sudo bash
+    sudo apt install cryfs
 
-Manual install (Ubuntu)
+Manual install (older Ubuntu versions)
 -----------------------
 
     # Add apt key
@@ -26,7 +26,7 @@ Manual install (Ubuntu)
     sudo apt-get update
     sudo apt-get install cryfs
 
-Manual install (Debian)
+Manual install (older Debian versions)
 -----------------------
     # Add apt key
     wget -O - https://www.cryfs.org/apt.key | sudo apt-key add -
@@ -40,7 +40,9 @@ Manual install (Debian)
 
 GUI
 ===
-If you want to use a GUI to mount your CryFS volumes, take a look at the [SiriKali project](https://mhogomchungu.github.io/sirikali/). You have to install the GUI **and** also CryFS itself for it to work.
+Theres some GUI applications with CryFS support. You usually have to install the GUI **and** also CryFS itself for it to work.
+- [SiriKali](https://mhogomchungu.github.io/sirikali/)
+- [Plasma Vault](https://www.kde.org/announcements/plasma-5.11.0.php) in KDE Plasma >= 5.11
 
 Building from source
 ====================

src/cpp-utils/system/get_total_memory.cpp

@@ -1,6 +1,6 @@
 #include "get_total_memory.h"
-#include <sys/sysctl.h>
 #include <sys/types.h>
+#include <sys/sysctl.h>
 #include <unistd.h>
 #include <stdexcept>
 
@@ -8,13 +8,13 @@ namespace cpputils{
     namespace system {
         uint64_t get_total_memory() {
             uint64_t mem;
-#ifdef __APPLE__
+#if defined(__APPLE__)
             size_t size = sizeof(mem);
   int result = sysctlbyname("hw.memsize", &mem, &size, nullptr, 0);
   if (0 != result) {
     throw std::runtime_error("sysctlbyname syscall failed");
   }
-#elif __linux__ || __FreeBSD__
+#elif defined(__linux__) || defined(__FreeBSD__)
             long numRAMPages = sysconf(_SC_PHYS_PAGES);
             long pageSize = sysconf(_SC_PAGESIZE);
             mem = numRAMPages * pageSize;

src/fspp/fuse/params.h

@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FUSE_PARAMS_H_
 
 #define FUSE_USE_VERSION 26
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
 #include <fuse.h>
 #elif __APPLE__
 #include <osxfuse/fuse.h>