Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0a8c798a8c3b80b77ab40cee89c6bd92c3757060)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0a8c798a8c3b80b77ab40cee89c6bd92c3757060)
  • Date: Wed, 8 May 2019 13:32:42 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/cryfs/BUILD | 2
crypto/cryfs/DETAILS | 8
crypto/cryfs/HISTORY | 7
crypto/cryfs/cryfs.gpg |binary
crypto/cryfs/patches/0001-cpp-utils-improvement.patch | 72 -----
crypto/cryfs/patches/0001-do-not-ref-vendor.patch | 195 +++++++++++++++
crypto/cryfs/patches/0002-cmake-improvements.patch | 109 --------
crypto/cryfs/patches/0002-fix-logging.patch | 75 +++++
crypto/cryfs/patches/0003-cmake-fixes.patch | 232
++++++++++++++++++
crypto/cryfs/patches/0003-fix-logging.patch | 40 ---
devel/qxmledit/DETAILS | 4
devel/qxmledit/HISTORY | 3
12 files changed, 521 insertions(+), 226 deletions(-)

New commits:
commit 0a8c798a8c3b80b77ab40cee89c6bd92c3757060
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cryfs: => 0.10.1

commit 913fa421ccd668f96192a599b73e689b3b816252
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qxmledit: => 0.9.13

diff --git a/crypto/cryfs/BUILD b/crypto/cryfs/BUILD
index 1e4a040..1eed65b 100755
--- a/crypto/cryfs/BUILD
+++ b/crypto/cryfs/BUILD
@@ -1,3 +1,5 @@
+CXXFLAGS+=' -fPIC' &&
OPTS+=' -DCRYFS_UPDATE_CHECKS=off' &&
+OPTS+=' -DBUILD_SHARED_LIBS=on' &&
OPTS+=' -DBoost_USE_STATIC_LIBS=off' &&
cmake_build
diff --git a/crypto/cryfs/DETAILS b/crypto/cryfs/DETAILS
index e373380..d7668d5 100755
--- a/crypto/cryfs/DETAILS
+++ b/crypto/cryfs/DETAILS
@@ -1,10 +1,12 @@
SPELL=cryfs
- VERSION=0.9.10
-
SOURCE_HASH=sha512:bc5d5e32e66bf5d32b34f5d5af3e896fcf5db9629dbd788cabfa1802bd5b21802752a75d66af03ca485ac80649c83945536393315695894f073b3823b56a353b
- VX=1.2.0 # embeded scrypt version
+ VERSION=0.10.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/cryfs/cryfs/releases/download/$VERSION/$SOURCE
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=cryfs.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=https://github.com/cryfs/cryfs
ENTERED=20170915
LICENSE[0]=LGPL
diff --git a/crypto/cryfs/HISTORY b/crypto/cryfs/HISTORY
index bc71abe..b5bbdb3 100644
--- a/crypto/cryfs/HISTORY
+++ b/crypto/cryfs/HISTORY
@@ -1,3 +1,10 @@
+2019-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.1
+ * DETAILS: add gpg checking
+ * cryfs.gpg: added
+ * patches: update and improve
+ * BUILD: tweak
+
2019-01-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.10

diff --git a/crypto/cryfs/cryfs.gpg b/crypto/cryfs/cryfs.gpg
new file mode 100644
index 0000000..434e3e7
Binary files /dev/null and b/crypto/cryfs/cryfs.gpg differ
diff --git a/crypto/cryfs/patches/0001-cpp-utils-improvement.patch
b/crypto/cryfs/patches/0001-cpp-utils-improvement.patch
deleted file mode 100644
index 24a9fb1..0000000
--- a/crypto/cryfs/patches/0001-cpp-utils-improvement.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 68a2654ffdd5dd9bb31eaa505d50714f31c8a98f Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 13 Aug 2018 20:19:22 +0200
-Subject: [PATCH 1/3] cpp-utils improvement
-
----
- src/cpp-utils/CMakeLists.txt | 5 ++---
- src/cpp-utils/crypto/kdf/Scrypt.h | 2 +-
- src/cpp-utils/logging/Logger.h | 1 +
- src/cpp-utils/logging/logging.h | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
-index a934bfe..3a65348 100644
---- a/src/cpp-utils/CMakeLists.txt
-+++ b/src/cpp-utils/CMakeLists.txt
-@@ -39,12 +39,11 @@ set(SOURCES
- )
-
- add_library(${PROJECT_NAME} STATIC ${SOURCES})
--
--target_link_libraries(${PROJECT_NAME} PUBLIC pthread curl)
-+target_link_libraries(${PROJECT_NAME} PUBLIC curl pthread)
-
- # TODO From Crypto++ 5.7 on, it should support cmake with find_package()
instead of find_library().
- find_library_with_path(CryptoPP cryptopp CRYPTOPP_LIB_PATH)
--target_link_libraries(${PROJECT_NAME} PUBLIC ${CryptoPP} scrypt spdlog)
-+target_link_libraries(${PROJECT_NAME} PUBLIC ${CryptoPP} ${SCRYPT} fmt
${FMT_LIBRARIES})
-
- target_add_boost(${PROJECT_NAME} filesystem system thread)
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/src/cpp-utils/crypto/kdf/Scrypt.h
b/src/cpp-utils/crypto/kdf/Scrypt.h
-index 6578e95..9ca3150 100644
---- a/src/cpp-utils/crypto/kdf/Scrypt.h
-+++ b/src/cpp-utils/crypto/kdf/Scrypt.h
-@@ -8,7 +8,7 @@
- #include "PasswordBasedKDF.h"
-
- extern "C" {
-- #include <scrypt/lib/crypto/crypto_scrypt.h>
-+ #include <scrypto/crypto_scrypt.h>
- }
- #include <stdexcept>
- #include "SCryptParameters.h"
-diff --git a/src/cpp-utils/logging/Logger.h b/src/cpp-utils/logging/Logger.h
-index 45e515c..eabbf7d 100644
---- a/src/cpp-utils/logging/Logger.h
-+++ b/src/cpp-utils/logging/Logger.h
-@@ -4,6 +4,7 @@
-
- #define SPDLOG_ENABLE_SYSLOG
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-diff --git a/src/cpp-utils/logging/logging.h
b/src/cpp-utils/logging/logging.h
-index f98aa79..cf200ae 100644
---- a/src/cpp-utils/logging/logging.h
-+++ b/src/cpp-utils/logging/logging.h
-@@ -4,7 +4,7 @@
-
- #include "Logger.h"
- #include <stdexcept>
--#include <spdlog/fmt/ostr.h>
-+#include <fmt/ostream.h>
-
- namespace cpputils {
- namespace logging {
---
-2.18.0
-
diff --git a/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
b/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
new file mode 100644
index 0000000..efd003c
--- /dev/null
+++ b/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
@@ -0,0 +1,195 @@
+From d7f2ecd8485f7b972d333c6f80f0191b97cbd90e Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 13 Apr 2019 20:21:46 +0200
+Subject: [PATCH 1/3] do not ref vendor-
+
+---
+ .../implementations/compressing/compressors/Gzip.cpp | 2 +-
+ src/cpp-utils/crypto/cryptopp_byte.h | 2 +-
+ src/cpp-utils/crypto/hash/Hash.cpp | 2 +-
+ src/cpp-utils/crypto/kdf/Scrypt.cpp | 2 +-
+ src/cpp-utils/crypto/symmetric/CFB_Cipher.h | 2 +-
+ src/cpp-utils/crypto/symmetric/GCM_Cipher.h | 2 +-
+ src/cpp-utils/crypto/symmetric/ciphers.h | 10 +++++-----
+ src/cpp-utils/data/Data.cpp | 2 +-
+ src/cpp-utils/data/FixedSizeData.h | 2 +-
+ src/cpp-utils/random/OSRandomGenerator.h | 2 +-
+ src/cpp-utils/random/RandomGeneratorThread.h | 2 +-
+ src/cryfs/localstate/BasedirMetadata.cpp | 2 +-
+ test/cryfs/config/CompatibilityTest.cpp | 2 +-
+ 13 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+index 67b7f49..64f13e9 100644
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+@@ -1,6 +1,6 @@
+ #include "cpp-utils/crypto/cryptopp_byte.h"
+ #include "Gzip.h"
+-#include <vendor_cryptopp/gzip.h>
++#include <cryptopp/gzip.h>
+
+ using cpputils::Data;
+
+diff --git a/src/cpp-utils/crypto/cryptopp_byte.h
b/src/cpp-utils/crypto/cryptopp_byte.h
+index e00cf7c..363990e 100644
+--- a/src/cpp-utils/crypto/cryptopp_byte.h
++++ b/src/cpp-utils/crypto/cryptopp_byte.h
+@@ -2,7 +2,7 @@
+ #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
+ #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
+
+-#include <vendor_cryptopp/cryptlib.h>
++#include <cryptopp/cryptlib.h>
+
+ // If we're running an older CryptoPP version, CryptoPP::byte isn't defined
yet.
+ // Define it. Refer to "byte" type in the global namespace (placed by
CryptoPP).
+diff --git a/src/cpp-utils/crypto/hash/Hash.cpp
b/src/cpp-utils/crypto/hash/Hash.cpp
+index 696cdea..e07d28d 100644
+--- a/src/cpp-utils/crypto/hash/Hash.cpp
++++ b/src/cpp-utils/crypto/hash/Hash.cpp
+@@ -1,6 +1,6 @@
+ #include "Hash.h"
+ #include <cpp-utils/random/Random.h>
+-#include <vendor_cryptopp/sha.h>
++#include <cryptopp/sha.h>
+
+ using cpputils::Random;
+ using CryptoPP::SHA512;
+diff --git a/src/cpp-utils/crypto/kdf/Scrypt.cpp
b/src/cpp-utils/crypto/kdf/Scrypt.cpp
+index f97d694..e26db8d 100644
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp
+@@ -1,5 +1,5 @@
+ #include "Scrypt.h"
+-#include <vendor_cryptopp/scrypt.h>
++#include <cryptopp/scrypt.h>
+
+ using std::string;
+
+diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+index 4f91b89..971aa1d 100644
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+@@ -7,7 +7,7 @@
+ #include "../../data/Data.h"
+ #include "../../random/Random.h"
+ #include <boost/optional.hpp>
+-#include <vendor_cryptopp/modes.h>
++#include <cryptopp/modes.h>
+ #include "Cipher.h"
+ #include "EncryptionKey.h"
+
+diff --git a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+index 21d55fb..bc9a409 100644
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+@@ -6,7 +6,7 @@
+ #include "../../data/FixedSizeData.h"
+ #include "../../data/Data.h"
+ #include "../../random/Random.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+ #include "Cipher.h"
+ #include "EncryptionKey.h"
+
+diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h
b/src/cpp-utils/crypto/symmetric/ciphers.h
+index 7a8f8d4..61a6a25 100644
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h
+@@ -2,11 +2,11 @@
+ #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+
+-#include <vendor_cryptopp/aes.h>
+-#include <vendor_cryptopp/twofish.h>
+-#include <vendor_cryptopp/serpent.h>
+-#include <vendor_cryptopp/cast.h>
+-#include <vendor_cryptopp/mars.h>
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
+ #include "GCM_Cipher.h"
+ #include "CFB_Cipher.h"
+
+diff --git a/src/cpp-utils/data/Data.cpp b/src/cpp-utils/data/Data.cpp
+index c8a3a25..3a6d41e 100644
+--- a/src/cpp-utils/data/Data.cpp
++++ b/src/cpp-utils/data/Data.cpp
+@@ -1,6 +1,6 @@
+ #include "Data.h"
+ #include <stdexcept>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <cpp-utils/crypto/cryptopp_byte.h>
+
+ using std::istream;
+diff --git a/src/cpp-utils/data/FixedSizeData.h
b/src/cpp-utils/data/FixedSizeData.h
+index c4a88d7..a177ab2 100644
+--- a/src/cpp-utils/data/FixedSizeData.h
++++ b/src/cpp-utils/data/FixedSizeData.h
+@@ -2,7 +2,7 @@
+ #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+ #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <string>
+ #include <cstring>
+ #include "../assert/assert.h"
+diff --git a/src/cpp-utils/random/OSRandomGenerator.h
b/src/cpp-utils/random/OSRandomGenerator.h
+index 18a8002..8c8dc6f 100644
+--- a/src/cpp-utils/random/OSRandomGenerator.h
++++ b/src/cpp-utils/random/OSRandomGenerator.h
+@@ -4,7 +4,7 @@
+
+ #include "cpp-utils/crypto/cryptopp_byte.h"
+ #include "RandomGenerator.h"
+-#include <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+
+ namespace cpputils {
+ class OSRandomGenerator final : public RandomGenerator {
+diff --git a/src/cpp-utils/random/RandomGeneratorThread.h
b/src/cpp-utils/random/RandomGeneratorThread.h
+index 593750e..103c00d 100644
+--- a/src/cpp-utils/random/RandomGeneratorThread.h
++++ b/src/cpp-utils/random/RandomGeneratorThread.h
+@@ -4,7 +4,7 @@
+
+ #include "../thread/LoopThread.h"
+ #include "ThreadsafeRandomDataBuffer.h"
+-#include <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+
+ namespace cpputils {
+ //TODO Test
+diff --git a/src/cryfs/localstate/BasedirMetadata.cpp
b/src/cryfs/localstate/BasedirMetadata.cpp
+index 3477a8f..06d5228 100644
+--- a/src/cryfs/localstate/BasedirMetadata.cpp
++++ b/src/cryfs/localstate/BasedirMetadata.cpp
+@@ -1,7 +1,7 @@
+ #include "BasedirMetadata.h"
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
+-#include <vendor_cryptopp/sha.h>
++#include <cryptopp/sha.h>
+ #include <boost/filesystem/operations.hpp>
+ #include "LocalStateDir.h"
+
+diff --git a/test/cryfs/config/CompatibilityTest.cpp
b/test/cryfs/config/CompatibilityTest.cpp
+index 36c1871..a1d5f22 100644
+--- a/test/cryfs/config/CompatibilityTest.cpp
++++ b/test/cryfs/config/CompatibilityTest.cpp
+@@ -3,7 +3,7 @@
+ #include <vector>
+ #include <boost/filesystem.hpp>
+ #include <cpp-utils/data/Data.h>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <cpp-utils/crypto/symmetric/ciphers.h>
+ #include <cpp-utils/tempfile/TempFile.h>
+ #include <cryfs/config/CryConfigFile.h>
+--
+2.21.0
diff --git a/crypto/cryfs/patches/0002-cmake-improvements.patch
b/crypto/cryfs/patches/0002-cmake-improvements.patch
deleted file mode 100644
index c0d8214..0000000
--- a/crypto/cryfs/patches/0002-cmake-improvements.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 55f4325bc62a81d04996c92b1bb717f2a8bb71cc Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 13 Aug 2018 20:20:20 +0200
-Subject: [PATCH 2/3] cmake improvements
-
----
- CMakeLists.txt | 21 +++++----------------
- src/CMakeLists.txt | 10 ++++++++++
- src/cryfs-cli/CMakeLists.txt | 3 ++-
- utils.cmake | 11 ++---------
- 4 files changed, 19 insertions(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04ac2aa..50b9287 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,29 +1,18 @@
--cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-
- project(cryfs)
-+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-
- include(utils.cmake)
-
- require_gcc_version(4.8)
- require_clang_version(3.7)
-
--# Default value is not to build test cases
--if(NOT BUILD_TESTING)
-- set(BUILD_TESTING OFF CACHE BOOL "BUILD_TESTING")
--endif(NOT BUILD_TESTING)
-+option(BUILD_TESTING "build tests" OFF)
-
--# Default vaule is to build in release mode
--if(NOT CMAKE_BUILD_TYPE)
-- set(CMAKE_BUILD_TYPE Release CACHE INTERNAL "CMAKE_BUILD_TYPE")
--endif(NOT CMAKE_BUILD_TYPE)
-+option (CRYFS_UPDATE_CHECKS "allow online update checks" OFF)
-
--# Default value is to do update checks
--if(NOT CRYFS_UPDATE_CHECKS)
-- set(CRYFS_UPDATE_CHECKS ON CACHE BOOL "CRYFS_UPDATE_CHECKS")
--endif(NOT CRYFS_UPDATE_CHECKS)
--
--add_subdirectory(vendor)
- add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(test)
--add_subdirectory(cpack)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c74b486..37e0c54 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,14 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-+find_package(spdlog REQUIRED)
-+find_package(fmt REQUIRED)
-+add_definitions("-DSPDLOG_FMT_EXTERNAL=1")
-+#include_directories(${FMT_INCLUDE_DIR})
-+#include_directories(/usr/include)
-+
-+find_package(PkgConfig REQUIRED)
-+find_library(SCRYPT NAMES libpercival percival)
-+#pkg_search_module(scrypt)
-+#find_package(scrypt REQUIRED)
-
- add_subdirectory(gitversion)
- add_subdirectory(cpp-utils)
-diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt
-index 07a0ad5..21d7f18 100644
---- a/src/cryfs-cli/CMakeLists.txt
-+++ b/src/cryfs-cli/CMakeLists.txt
-@@ -15,7 +15,8 @@ add_library(${PROJECT_NAME} ${SOURCES})
- target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion)
- target_enable_style_warnings(${PROJECT_NAME})
- target_activate_cpp14(${PROJECT_NAME})
--
-+#add_definitions('-D_FILE_OFFSET_BITS=64')
-+target_compile_definitions(${PROJECT_NAME} PRIVATE -D_FILE_OFFSET_BITS=64)
- if(NOT CRYFS_UPDATE_CHECKS)
- target_compile_definitions(${PROJECT_NAME} PRIVATE
-DCRYFS_NO_UPDATE_CHECKS)
- endif(NOT CRYFS_UPDATE_CHECKS)
-diff --git a/utils.cmake b/utils.cmake
-index de03cdb..dd1d06a 100644
---- a/utils.cmake
-+++ b/utils.cmake
-@@ -49,15 +49,8 @@ endfunction(target_enable_style_warnings)
- ##################################################
- function(target_add_boost TARGET)
- # Load boost libraries
-- if(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-- # Many supported systems don't have boost >= 1.56. Better link it
statically.
-- message(STATUS "Boost will be statically linked")
-- set(Boost_USE_STATIC_LIBS ON)
-- else(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-- message(STATUS "Boost will be dynamically linked")
-- set(Boost_USE_STATIC_LIBS OFF)
-- endif(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-- find_package(Boost 1.56.0
-+ option(Boost_USE_STATIC_LIBS "use static Boost libraries" OFF)
-+ find_package(Boost 1.56.0
- REQUIRED
- COMPONENTS ${ARGN})
- target_include_directories(${TARGET} SYSTEM PUBLIC
${Boost_INCLUDE_DIRS})
---
-2.18.0
-
diff --git a/crypto/cryfs/patches/0002-fix-logging.patch
b/crypto/cryfs/patches/0002-fix-logging.patch
new file mode 100644
index 0000000..818c27b
--- /dev/null
+++ b/crypto/cryfs/patches/0002-fix-logging.patch
@@ -0,0 +1,75 @@
+From 7cac481febcd934ccc4cb8dc86cbe3d387321d3e Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 13 Apr 2019 13:25:18 +0200
+Subject: [PATCH 2/3] fix logging
+
+---
+ src/cpp-utils/logging/Logger.h | 2 ++
+ src/cpp-utils/logging/logging.h | 4 ++--
+ src/cryfs-cli/Cli.cpp | 8 ++++++--
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp-utils/logging/Logger.h b/src/cpp-utils/logging/Logger.h
+index ceff576..5851e06 100644
+--- a/src/cpp-utils/logging/Logger.h
++++ b/src/cpp-utils/logging/Logger.h
+@@ -7,6 +7,8 @@
+ #endif
+
+ #include <spdlog/spdlog.h>
++#include <spdlog/sinks/stdout_sinks.h>
++#include <spdlog/sinks/syslog_sink.h>
+ #include "../macros.h"
+
+ namespace cpputils {
+diff --git a/src/cpp-utils/logging/logging.h
b/src/cpp-utils/logging/logging.h
+index aed44db..b4ae276 100644
+--- a/src/cpp-utils/logging/logging.h
++++ b/src/cpp-utils/logging/logging.h
+@@ -4,7 +4,7 @@
+
+ #include "Logger.h"
+ #include <stdexcept>
+-#include <spdlog/fmt/ostr.h>
++#include <fmt/ostream.h>
+
+ #if defined(_MSC_VER)
+ #include <spdlog/sinks/msvc_sink.h>
+@@ -75,7 +75,7 @@ namespace cpputils {
+ #if defined(_MSC_VER)
+ return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
+ #else
+- return spdlog::syslog_logger(name, name, LOG_PID);
++ return spdlog::syslog_logger_mt(name, name, LOG_PID);
+ #endif
+ }
+ }
+diff --git a/src/cryfs-cli/Cli.cpp b/src/cryfs-cli/Cli.cpp
+index 261459f..abcaa8a 100644
+--- a/src/cryfs-cli/Cli.cpp
++++ b/src/cryfs-cli/Cli.cpp
+@@ -4,6 +4,10 @@
+ #include <cmath>
+ #include <cstdio>
+ #include <cstdlib>
++
++#include <spdlog/sinks/syslog_sink.h>
++#include <spdlog/sinks/basic_file_sink.h>
++
+ #include <cpp-utils/assert/backtrace.h>
+
+ #include <fspp/fuse/Fuse.h>
+@@ -310,9 +314,9 @@ namespace cryfs_cli {
+ //TODO Test that --logfile parameter works. Should be: file if
specified, otherwise stderr if foreground, else syslog.
+ if (options.logFile() != none) {
+ cpputils::logging::setLogger(
+-
spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs",
options.logFile()->string()));
++
spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs",
options.logFile()->string()));
+ } else if (options.foreground()) {
+- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
++ cpputils::logging::setLogger(spdlog::stderr_logger_st("cryfs"));
+ } else {
+
cpputils::logging::setLogger(cpputils::logging::system_logger("cryfs"));
+ }
+--
+2.21.0
diff --git a/crypto/cryfs/patches/0003-cmake-fixes.patch
b/crypto/cryfs/patches/0003-cmake-fixes.patch
new file mode 100644
index 0000000..78e15fb
--- /dev/null
+++ b/crypto/cryfs/patches/0003-cmake-fixes.patch
@@ -0,0 +1,232 @@
+From 11fe130e63197c465bb7863ee6963096d1f566d6 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 13 Apr 2019 13:26:15 +0200
+Subject: [PATCH 3/3] cmake fixes
+
+cmake tweaks
+
+clean & fix cmake
+---
+ CMakeLists.txt | 19 ++++++-------------
+ cmake-utils/utils.cmake | 11 ++---------
+ src/CMakeLists.txt | 9 +++++++++
+ src/cpp-utils/CMakeLists.txt | 2 +-
+ src/cryfs-cli/CMakeLists.txt | 14 +++++---------
+ src/cryfs-unmount/CMakeLists.txt | 12 ++++--------
+ src/cryfs/CMakeLists.txt | 12 ++++++------
+ src/fspp/fuse/CMakeLists.txt | 2 +-
+ src/stats/CMakeLists.txt | 1 +
+ 9 files changed, 35 insertions(+), 47 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fdbff71..330fa54 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+ cmake_policy(SET CMP0054 NEW)
+
+ # TODO Perf test:
+@@ -6,6 +6,8 @@ cmake_policy(SET CMP0054 NEW)
+ # -> if yes, offer a cmake option to enable both of these
+
+ project(cryfs)
++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake-utils)
+ include(utils)
+@@ -24,15 +26,6 @@ option(USE_CLANG_TIDY "build with clang-tidy checks
enabled" OFF)
+ option(USE_IWYU "build with iwyu checks enabled" OFF)
+ option(CLANG_TIDY_WARNINGS_AS_ERRORS "treat clang-tidy warnings as errors"
OFF)
+
+-if(USE_IWYU)
+- # note: for iwyu, we need cmake 3.3
+- cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+-endif()
+-if(USE_CLANG_TIDY)
+- # note: for clang-tidy, we need cmake 3.6, or (if the return code
should be handled correctly, e.g. on CI), we need 3.8.
+- cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
+-endif()
+-
+
+ if (MSVC)
+ option(DOKAN_PATH "Location of the Dokan library, e.g. C:\\Program
Files\\Dokan\\DokanLibrary-1.1.0" "")
+@@ -48,8 +41,8 @@ if(MSVC)
+ add_definitions(/bigobj)
+ endif()
+
+-add_subdirectory(vendor EXCLUDE_FROM_ALL)
++#add_subdirectory(vendor EXCLUDE_FROM_ALL)
+ add_subdirectory(src)
+ add_subdirectory(doc)
+-add_subdirectory(test)
+-add_subdirectory(cpack)
++#add_subdirectory(test)
++#add_subdirectory(cpack)
+diff --git a/cmake-utils/utils.cmake b/cmake-utils/utils.cmake
+index da4dff8..4b227b7 100644
+--- a/cmake-utils/utils.cmake
++++ b/cmake-utils/utils.cmake
+@@ -107,16 +107,9 @@ endfunction(target_enable_style_warnings)
+ ##################################################
+ function(target_add_boost TARGET)
+ # Load boost libraries
+- if(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
+- # Many supported systems don't have boost >= 1.65.1. Better link it
statically.
+- message(STATUS "Boost will be statically linked")
+- set(Boost_USE_STATIC_LIBS ON)
+- else(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
+- message(STATUS "Boost will be dynamically linked")
+- set(Boost_USE_STATIC_LIBS OFF)
+- endif(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
++ option(Boost_USE_STATIC_LIBS "use static Boost libraries" OFF)
+ set(BOOST_THREAD_VERSION 4)
+- find_package(Boost 1.65.1
++ find_package(Boost 1.70.0
+ REQUIRED
+ COMPONENTS ${ARGN})
+ target_include_directories(${TARGET} SYSTEM PUBLIC
${Boost_INCLUDE_DIRS})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a803b1c..c18c676 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,5 +1,14 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
++find_package(PkgConfig REQUIRED)
++find_package(spdlog REQUIRED)
++find_package(fmt REQUIRED)
++add_definitions("-DSPDLOG_FMT_EXTERNAL=1")
++#include_directories(${FMT_INCLUDE_DIR})
++#include_directories(/usr/include)
+
++#find_library(SCRYPT NAMES libpercival percival)
++pkg_search_module(SCRYPT REQUIRED libpercival)
++#find_package(scrypt REQUIRED)
+ add_subdirectory(gitversion)
+ add_subdirectory(cpp-utils)
+ add_subdirectory(fspp)
+diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
+index f66f99f..079ef18 100644
+--- a/src/cpp-utils/CMakeLists.txt
++++ b/src/cpp-utils/CMakeLists.txt
+@@ -89,7 +89,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
${CMAKE_THREAD_LIBS_INIT})
+
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
+
+-target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp)
++target_link_libraries(${PROJECT_NAME} PUBLIC cryptopp fmt)
+
+ target_add_boost(${PROJECT_NAME} filesystem system thread chrono)
+ target_enable_style_warnings(${PROJECT_NAME})
+diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt
+index 90edb22..5a5b0dc 100644
+--- a/src/cryfs-cli/CMakeLists.txt
++++ b/src/cryfs-cli/CMakeLists.txt
+@@ -11,8 +11,10 @@ set(SOURCES
+ program_options/Parser.cpp
+ )
+
+-add_library(${PROJECT_NAME} ${SOURCES})
++add_executable(${PROJECT_NAME} main.cpp ${SOURCES})
++target_compile_definitions(${PROJECT_NAME} PRIVATE -D_FILE_OFFSET_BITS=64)
+ target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion
fspp-fuse)
++target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_system boost_thread boost_chrono)
+ target_enable_style_warnings(${PROJECT_NAME})
+ target_activate_cpp14(${PROJECT_NAME})
+
+@@ -20,13 +22,7 @@ if(NOT CRYFS_UPDATE_CHECKS)
+ target_compile_definitions(${PROJECT_NAME} PRIVATE
-DCRYFS_NO_UPDATE_CHECKS)
+ endif(NOT CRYFS_UPDATE_CHECKS)
+
+-add_executable(${PROJECT_NAME}_bin main.cpp)
+-set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME cryfs)
+-target_link_libraries(${PROJECT_NAME}_bin PUBLIC ${PROJECT_NAME})
+-target_enable_style_warnings(${PROJECT_NAME}_bin)
+-target_activate_cpp14(${PROJECT_NAME}_bin)
+-
+-install(TARGETS ${PROJECT_NAME}_bin
++install(TARGETS ${PROJECT_NAME}
+ CONFIGURATIONS Debug Release RelWithDebInfo
+- DESTINATION ${CMAKE_INSTALL_BINDIR}
++ DESTINATION bin
+ )
+diff --git a/src/cryfs-unmount/CMakeLists.txt
b/src/cryfs-unmount/CMakeLists.txt
+index 0a246a7..b362807 100644
+--- a/src/cryfs-unmount/CMakeLists.txt
++++ b/src/cryfs-unmount/CMakeLists.txt
+@@ -7,18 +7,14 @@ set(SOURCES
+ Cli.cpp
+ )
+
+-add_library(${PROJECT_NAME} ${SOURCES})
++add_executable(${PROJECT_NAME} main_unmount.cpp ${SOURCES})
+ target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils cryfs fspp-fuse)
++target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_thread boost_chrono)
+ target_enable_style_warnings(${PROJECT_NAME})
+ target_activate_cpp14(${PROJECT_NAME})
+
+-add_executable(${PROJECT_NAME}_bin main_unmount.cpp)
+-set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME
cryfs-unmount)
+-target_link_libraries(${PROJECT_NAME}_bin PUBLIC ${PROJECT_NAME})
+-target_enable_style_warnings(${PROJECT_NAME}_bin)
+-target_activate_cpp14(${PROJECT_NAME}_bin)
+
+-install(TARGETS ${PROJECT_NAME}_bin
++install(TARGETS ${PROJECT_NAME}
+ CONFIGURATIONS Debug Release RelWithDebInfo
+- DESTINATION ${CMAKE_INSTALL_BINDIR}
++ DESTINATION bin
+ )
+diff --git a/src/cryfs/CMakeLists.txt b/src/cryfs/CMakeLists.txt
+index 62d358d..45358e9 100644
+--- a/src/cryfs/CMakeLists.txt
++++ b/src/cryfs/CMakeLists.txt
+@@ -49,13 +49,13 @@ set(LIB_SOURCES
+ localstate/BasedirMetadata.cpp
+ )
+
+-add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})
++add_library(${PROJECT_NAME} SHARED ${LIB_SOURCES})
+ target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils fspp-interface
blockstore blobstore gitversion)
+-target_add_boost(${PROJECT_NAME} program_options chrono) # TODO Check that
dependent projects don't get boost added (use PRIVATE here)
++target_add_boost(${PROJECT_NAME} filesystem program_options chrono thread)
# TODO Check that dependent projects don't get boost added (use PRIVATE here)
+ target_enable_style_warnings(${PROJECT_NAME})
+ target_activate_cpp14(${PROJECT_NAME})
+
+-#install(TARGETS ${PROJECT_NAME}
+-# DESTINATION lib
+-# CONFIGURATIONS Release
+-#)
++install(TARGETS ${PROJECT_NAME}
++ DESTINATION lib
++ CONFIGURATIONS Release
++)
+diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt
+index b991bd7..55197a2 100644
+--- a/src/fspp/fuse/CMakeLists.txt
++++ b/src/fspp/fuse/CMakeLists.txt
+@@ -32,7 +32,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ target_link_libraries(${PROJECT_NAME} PUBLIC
"${DOKAN_LIB_PATH}/lib/dokanfuse1.lib")
+
+ install(FILES "${DOKAN_LIB_PATH}/dokan1.dll"
"${DOKAN_LIB_PATH}/dokanfuse1.dll"
+- DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ DESTINATION bin
+ )
+
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+diff --git a/src/stats/CMakeLists.txt b/src/stats/CMakeLists.txt
+index c29f44e..d90bdb6 100644
+--- a/src/stats/CMakeLists.txt
++++ b/src/stats/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(SOURCES
+
+ add_executable(${PROJECT_NAME} ${SOURCES})
+ target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion)
++target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_thread boost_chrono)
+ target_enable_style_warnings(${PROJECT_NAME})
+ target_activate_cpp14(${PROJECT_NAME})
+ set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME cryfs-stats)
+--
+2.21.0
diff --git a/crypto/cryfs/patches/0003-fix-logging.patch
b/crypto/cryfs/patches/0003-fix-logging.patch
deleted file mode 100644
index 71dd573..0000000
--- a/crypto/cryfs/patches/0003-fix-logging.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c02cce52f3fba393f103db49082736c4a668125a Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 13 Aug 2018 20:47:56 +0200
-Subject: [PATCH 3/3] fix logging
-
----
- src/cryfs-cli/Cli.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/cryfs-cli/Cli.cpp b/src/cryfs-cli/Cli.cpp
-index 8a80a4d..cb56350 100644
---- a/src/cryfs-cli/Cli.cpp
-+++ b/src/cryfs-cli/Cli.cpp
-@@ -6,6 +6,9 @@
- #include <cmath>
- #include <cstdio>
- #include <cstdlib>
-+
-+#include <spdlog/sinks/syslog_sink.h>
-+#include <spdlog/sinks/basic_file_sink.h>
- #include <cpp-utils/assert/backtrace.h>
-
- #include <fspp/fuse/Fuse.h>
-@@ -282,11 +285,11 @@ namespace cryfs {
- //TODO Test that --logfile parameter works. Should be: file if
specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
--
spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs",
options.logFile()->native()));
-+
spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs",
options.logFile()->native()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
-- cpputils::logging::setLogger(spdlog::syslog_logger("cryfs",
"cryfs", LOG_PID));
-+ cpputils::logging::setLogger(spdlog::syslog_logger_mt("cryfs",
"cryfs", LOG_PID));
- }
- }
-
---
-2.18.0
-
diff --git a/devel/qxmledit/DETAILS b/devel/qxmledit/DETAILS
index bb4027d..429e39f 100755
--- a/devel/qxmledit/DETAILS
+++ b/devel/qxmledit/DETAILS
@@ -1,6 +1,6 @@
SPELL=qxmledit
- VERSION=0.9.12
-
SOURCE_HASH=sha512:996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc
+ VERSION=0.9.13
+
SOURCE_HASH=sha512:7b7c3afdf9c5ce051ea56af390be2605c4dfa2e4f77e94a3187fa685d81ed4dbc20aebd8762912ffa2e07cb154b7f4f80b08b5fb44b81080ae4f62a435a9a602
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://qxmledit.org
diff --git a/devel/qxmledit/HISTORY b/devel/qxmledit/HISTORY
index d7ecd35..35089b4 100644
--- a/devel/qxmledit/HISTORY
+++ b/devel/qxmledit/HISTORY
@@ -1,3 +1,6 @@
+2019-05-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.13
+
2018-11-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.12




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0a8c798a8c3b80b77ab40cee89c6bd92c3757060), Treeve Jelbert, 05/08/2019

Archive powered by MHonArc 2.6.24.

Top of Page