From 18788bc3f875ad035566f000f1b00919e36448d0 Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 25 Sep 2017 16:55:15 -0400 Subject: [PATCH 01/10] Patch get_total_memory() for freebsd compatibility (#172) --- src/cpp-utils/system/get_total_memory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp-utils/system/get_total_memory.cpp b/src/cpp-utils/system/get_total_memory.cpp index 0be4086f..4eda6101 100644 --- a/src/cpp-utils/system/get_total_memory.cpp +++ b/src/cpp-utils/system/get_total_memory.cpp @@ -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; From 0e8622d7aeb61cb4ecd5a995f5b2e3340f56face Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Mon, 25 Sep 2017 13:57:01 -0700 Subject: [PATCH 02/10] Update ChangeLog.txt --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index c82c84b9..a3ba1440 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ Version 0.9.8 (unreleased) -------------- Compatibility: +* Runs on Debian with FreeBSD kernel * Works with Crypto++ 6.0 Fixed bugs: From a05e4733efdd05043422a2cef855c2c1f2cf5f4d Mon Sep 17 00:00:00 2001 From: Gerrit Toehgiono Date: Thu, 28 Sep 2017 19:18:02 +0200 Subject: [PATCH 03/10] Fixes compilation on FreeBSD 11.1 (RELEASE branch) (#173) * get_total_memory.cpp: include types.h before sysctl.h (fixes size_t unknown on FreeBSD * Include fuse.h also in FreeBSD * update 'defined'-style (src/spp/fuse/params.h) --- src/cpp-utils/system/get_total_memory.cpp | 2 +- src/fspp/fuse/params.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp-utils/system/get_total_memory.cpp b/src/cpp-utils/system/get_total_memory.cpp index 4eda6101..83abe6cd 100644 --- a/src/cpp-utils/system/get_total_memory.cpp +++ b/src/cpp-utils/system/get_total_memory.cpp @@ -1,6 +1,6 @@ #include "get_total_memory.h" -#include #include +#include #include #include diff --git a/src/fspp/fuse/params.h b/src/fspp/fuse/params.h index 7a078d32..3d8865b9 100644 --- a/src/fspp/fuse/params.h +++ b/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 #elif __APPLE__ #include From 170b3ed4661a6541c30d1a40e9ae7d33dfd40b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Thu, 28 Sep 2017 10:19:19 -0700 Subject: [PATCH 04/10] Update ChangeLog.txt --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index a3ba1440..c98360c9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,7 @@ Version 0.9.8 (unreleased) -------------- Compatibility: * Runs on Debian with FreeBSD kernel +* Runs on FreeBSD 11.1 * Works with Crypto++ 6.0 Fixed bugs: From 66698f7b3d7197612749f41324dd6404412e38c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Sat, 30 Sep 2017 06:17:34 +0100 Subject: [PATCH 05/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 846b4e50..d0fa0edc 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ 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) ----------------------- From e4b781ca940e11ca6e22a129e49ab8aaa3681207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Sat, 30 Sep 2017 06:18:51 +0100 Subject: [PATCH 06/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0fa0edc..350fd737 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Easy install (Ubuntu 17.04 and later, Debian Stretch and later) sudo apt install cryfs -Manual install (Ubuntu) +Manual install (older Ubuntu versions) ----------------------- # Add apt key @@ -23,7 +23,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 - From 0080adca73ece46023a9d08b068aef1ed496771f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Thu, 23 Nov 2017 01:56:01 +0000 Subject: [PATCH 07/10] Add Plasma Vault to GUI list --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 350fd737..34f94e91 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,9 @@ Manual install (older Debian versions) 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 ==================== From 8856b600477c03c5a8db582a4060d7aef2183d0d Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 12 Jan 2018 22:09:49 +0000 Subject: [PATCH 08/10] Mark 0.9.8 as released --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c98360c9..3b722982 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -Version 0.9.8 (unreleased) +Version 0.9.8 -------------- Compatibility: * Runs on Debian with FreeBSD kernel From db98e20e20181e2d9be8a6b0354a1d8b33d51a3d Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 12 Jan 2018 22:16:02 +0000 Subject: [PATCH 09/10] Complete ChangeLog --- ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3b722982..6e48f0ea 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,8 +5,12 @@ Compatibility: * 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 -------------- From 2afcaf4bba80c3b7e2e34b745b6d650dad7bbacb Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 12 Jan 2018 22:17:09 +0000 Subject: [PATCH 10/10] Prepare ChangeLog for 0.9.9 --- ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6e48f0ea..8a4ada4d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +Version 0.9.9 (unreleased) +-------------- + + Version 0.9.8 -------------- Compatibility: