Skip to Content.
Sympa Menu

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

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 (de593f06fa0b441412eac2baa62c581871999985)
  • Date: Sun, 17 Sep 2017 12:21:02 +0000

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

ChangeLog | 3 +++
crypto/cryfs/BUILD | 2 ++
crypto/cryfs/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++
crypto/cryfs/CONFIGURE | 2 ++
crypto/cryfs/DEPENDS | 9 +++++++++
crypto/cryfs/DETAILS | 15 +++++++++++++++
crypto/cryfs/HISTORY | 6 ++++++
crypto/cryfs/INSTALL | 1 +
crypto/cryfs/PRE_BUILD | 20 ++++++++++++++++++++
9 files changed, 92 insertions(+)

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

cryfs-0.9.7

diff --git a/ChangeLog b/ChangeLog
index e3a029c..37853ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * crypto/cryfs: added, encrypted file system
+
2017-09-13 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-extra/libkvkontakte: added

diff --git a/crypto/cryfs/BUILD b/crypto/cryfs/BUILD
new file mode 100755
index 0000000..76fb726
--- /dev/null
+++ b/crypto/cryfs/BUILD
@@ -0,0 +1,2 @@
+OPTS+=' -DCRYFS_UPDATE_CHECKS=off'
+cmake_build
diff --git a/crypto/cryfs/CMakeLists.txt b/crypto/cryfs/CMakeLists.txt
new file mode 100644
index 0000000..fb95ad2
--- /dev/null
+++ b/crypto/cryfs/CMakeLists.txt
@@ -0,0 +1,34 @@
+# use own CMake script to build relevant bits of scrypt library
+project (scrypt C)
+set (SOURCES
+lib/crypto/crypto_scrypt.c
+lib/crypto/crypto_scrypt_smix.c
+lib/crypto/crypto_scrypt_smix_sse2.c
+
+libcperciva/alg/sha256.c
+libcperciva/cpusupport/cpusupport_x86_aesni.c
+libcperciva/cpusupport/cpusupport_x86_sse2.c
+libcperciva/crypto/crypto_aes_aesni.c
+libcperciva/crypto/crypto_aes.c
+libcperciva/crypto/crypto_aesctr.c
+libcperciva/crypto/crypto_entropy.c
+libcperciva/util/warnp.c
+libcperciva/util/insecure_memzero.c
+)
+
+add_library(${PROJECT_NAME} STATIC
+ ${SOURCES}
+)
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+ .
+ libcperciva/cpusupport
+ libcperciva/alg
+ libcperciva/util
+)
+
+target_compile_options(${PROJECT_NAME} PRIVATE
+# -DCPUSUPPORT_X86_SSE2
+ -DCONFIG_H_FILE="${CMAKE_CURRENT_SOURCE_DIR}/config.h"
+ -DCPUSUPPORT_CONFIG_FILE="${CMAKE_CURRENT_SOURCE_DIR}/cpusupport-config.h"
+)
diff --git a/crypto/cryfs/CONFIGURE b/crypto/cryfs/CONFIGURE
new file mode 100755
index 0000000..2cd78b0
--- /dev/null
+++ b/crypto/cryfs/CONFIGURE
@@ -0,0 +1,2 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
+
diff --git a/crypto/cryfs/DEPENDS b/crypto/cryfs/DEPENDS
new file mode 100755
index 0000000..4533047
--- /dev/null
+++ b/crypto/cryfs/DEPENDS
@@ -0,0 +1,9 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends -sub 'CHRONO FILESYSTEM PROGRAM_OPTIONS SYSTEM THREAD' boost '
-DBoost_USE_STATIC_LIBS=off' &&
+depends cryptopp &&
+depends curl &&
+depends SSL &&
+depends fmt &&
+depends fuse &&
+depends scrypt
+#depends spdlog ' -DCMAKE_CXX_FLAGS="-DSPDLOG_FMT_EXTERNAL"'
diff --git a/crypto/cryfs/DETAILS b/crypto/cryfs/DETAILS
new file mode 100755
index 0000000..1b48795
--- /dev/null
+++ b/crypto/cryfs/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=cryfs
+ VERSION=0.9.7
+
SOURCE_HASH=sha512:962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
+ VX=1.2.0 # embeded scrypt version
+ SOURCE=$SPELL-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=https://github.com/cryfs/cryfs/releases/download/$VERSION/$SOURCE
+ WEB_SITE=https://github.com/cryfs/cryfs
+ ENTERED=20170915
+ LICENSE[0]=LGPL
+ KEYWORDS="filesystem crypto"
+ SHORT="Cryptographic filesystem for the cloud"
+cat << EOF
+Cryptographic filesystem for the cloud
+EOF
diff --git a/crypto/cryfs/HISTORY b/crypto/cryfs/HISTORY
new file mode 100644
index 0000000..7478ff6
--- /dev/null
+++ b/crypto/cryfs/HISTORY
@@ -0,0 +1,6 @@
+2017-09-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.7
+ I had problems building the scrypt stuff using the project's scripts,
+ so I made some changes
+
+ spell created
diff --git a/crypto/cryfs/INSTALL b/crypto/cryfs/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/crypto/cryfs/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/crypto/cryfs/PRE_BUILD b/crypto/cryfs/PRE_BUILD
new file mode 100755
index 0000000..30f8b3a
--- /dev/null
+++ b/crypto/cryfs/PRE_BUILD
@@ -0,0 +1,20 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file &&
+#
+# the project's build system is broken, so do it myself
+#
+
+
+sed -i '/cpack/D' CMakeLists.txt &&
+SCRYPT=vendor/scrypt/scrypt-$VX &&
+cp $INSTALL_ROOT/usr/include/scrypt/*.h \
+ $SPELL_DIRECTORY/CMakeLists.txt \
+ $SCRYPT/scrypt &&
+sed -i "s|vendor|$SCRYPT/scrypt|" CMakeLists.txt &&
+sed -i "1i \
+include_directories(\${CMAKE_SOURCE_DIR}/$SCRYPT)" \
+ src/cpp-utils/CMakeLists.txt \
+ src/cryfs/CMakeLists.txt \
+ src/cryfs-cli/CMakeLists.txt &&
+sed -i 's/spdlog/fmt/' src/cpp-utils/CMakeLists.txt



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de593f06fa0b441412eac2baa62c581871999985), Treeve Jelbert, 09/17/2017

Archive powered by MHonArc 2.6.24.

Top of Page