summaryrefslogtreecommitdiff
path: root/user/encfs
diff options
context:
space:
mode:
Diffstat (limited to 'user/encfs')
-rw-r--r--user/encfs/APKBUILD50
-rw-r--r--user/encfs/cmake.patch72
-rw-r--r--user/encfs/length.patch22
-rw-r--r--user/encfs/shell.patch22
-rw-r--r--user/encfs/typos.patch44
-rw-r--r--user/encfs/utimensat.patch22
6 files changed, 232 insertions, 0 deletions
diff --git a/user/encfs/APKBUILD b/user/encfs/APKBUILD
new file mode 100644
index 000000000..a20e1c888
--- /dev/null
+++ b/user/encfs/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=encfs
+pkgver=1.9.5
+pkgrel=0
+pkgdesc="Encrypted filesystem for FUSE"
+url="https://vgough.github.io/encfs/"
+arch="all"
+license="LGPL-3.0+ AND GPL-3.0+ AND MIT AND Zlib"
+depends=""
+makedepends="cmake fuse-dev openssl-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://github.com/vgough/encfs/releases/download/v$pkgver/encfs-$pkgver.tar.gz
+ cmake.patch
+ length.patch
+ shell.patch
+ typos.patch
+ utimensat.patch
+ "
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ -Bbuild .
+ make -C build
+}
+
+check() {
+ make -C build unittests
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
+}
+
+package() {
+ make DESTDIR="$pkgdir" -C build install
+}
+
+sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 encfs-1.9.5.tar.gz
+4810156ba2d61aef2f5c0c4cf8528596752309aacba5930aa6becfc6160b3c897df7570408b6431d5f09d6f85cd0fc41bd9127d47bdc9da6eb2e6321a9bda2f6 cmake.patch
+fa94088ad23ca9bdc2127f3025dc27fbf148ce94aad0378601cf0e0831039f654d74f2b3259d18ab448df3e3e63e96c59c73275abe0463504f91345d495f4375 length.patch
+c25a8c0a65c163ce87c3275261f0dae01df8d382a31a97efdc074a746cc8e8e2564e19568ca84e49c8c0c209406257dcd161784f47ec9fc78251e2c3175a3a82 shell.patch
+432199fddc361a8ace6c09a883261d07dc3aead6450584c52e98ddfaf310e5621fc9f3c3da48f012104690cc036a251919100c5d0ad17143e68ba07e826dafd9 typos.patch
+2e44c9808e065424c62d81f58798c25f5d749a5f12aa46d62385e610aff563a8730100035ac044d9ea00430cd275ced33184682d1d1b55a46ef8e22d821cc635 utimensat.patch"
diff --git a/user/encfs/cmake.patch b/user/encfs/cmake.patch
new file mode 100644
index 000000000..4e564d996
--- /dev/null
+++ b/user/encfs/cmake.patch
@@ -0,0 +1,72 @@
+From 4328178788c1adcdf431952b2723770607f3cbec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rogelio=20Dom=C3=ADnguez=20Hern=C3=A1ndez?=
+ <rogelio.dominguez@gmail.com>
+Date: Fri, 21 Feb 2020 15:48:12 -0600
+Subject: [PATCH] Remove "SYSTEM" from the include_directories() CMakeLists.txt
+ entries (#561)
+
+---
+ CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62a2ad0d..e90ce0c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ endif()
+
+ # Check for FUSE.
+ find_package (FUSE REQUIRED)
+-include_directories (SYSTEM ${FUSE_INCLUDE_DIR})
++include_directories (${FUSE_INCLUDE_DIR})
+ add_definitions (-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=29)
+ if (CYGWIN)
+ # Cygwin build is intended to use WinFsp
+@@ -105,7 +105,7 @@ endif()
+
+ # Check for OpenSSL.
+ find_package (OpenSSL REQUIRED)
+-include_directories (SYSTEM ${OPENSSL_INCLUDE_DIR})
++include_directories (${OPENSSL_INCLUDE_DIR})
+
+ find_program (POD2MAN pod2man)
+
+@@ -187,7 +187,7 @@ include_directories (${CMAKE_CURRENT_LIST_DIR})
+ if (ENABLE_NLS)
+ find_package (Intl)
+ if (Intl_FOUND)
+- include_directories (SYSTEM ${Intl_INCLUDE_DIRS})
++ include_directories (${Intl_INCLUDE_DIRS})
+ endif()
+
+ add_subdirectory(po)
+@@ -236,11 +236,11 @@ if (USE_INTERNAL_TINYXML)
+ endif ()
+ set(BUILD_TESTS OFF CACHE BOOL "build tests")
+ add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL)
+- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
+ link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})
+ else ()
+ find_package (TinyXML REQUIRED)
+- include_directories (SYSTEM ${TINYXML_INCLUDE_DIR})
++ include_directories (${TINYXML_INCLUDE_DIR})
+ endif ()
+
+ if (USE_INTERNAL_EASYLOGGING)
+@@ -248,13 +248,13 @@ if (USE_INTERNAL_EASYLOGGING)
+ set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp)
+ set(build_static_lib ON CACHE BOOL "build static libs")
+ add_subdirectory(${EASYLOGGING_DIR} EXCLUDE_FROM_ALL)
+- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
+ link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR})
+ set(EASYLOGGINGPP_LIBRARY easyloggingpp)
+ else ()
+ set(EASYLOGGINGPP_USE_SHARED_LIBS ON CACHE BOOL "look for shared lib")
+ find_package (EASYLOGGINGPP REQUIRED)
+- include_directories (SYSTEM ${EASYLOGGINGPP_INCLUDE_DIR})
++ include_directories (${EASYLOGGINGPP_INCLUDE_DIR})
+ endif ()
+
+ set(SOURCE_FILES
diff --git a/user/encfs/length.patch b/user/encfs/length.patch
new file mode 100644
index 000000000..be3f373c3
--- /dev/null
+++ b/user/encfs/length.patch
@@ -0,0 +1,22 @@
+From dafeb556d27076b0c6fa23e44e523bdd84598838 Mon Sep 17 00:00:00 2001
+From: Ben RUBSON <ben.rubson@gmail.com>
+Date: Sun, 9 Dec 2018 11:28:42 +0100
+Subject: [PATCH] Correct block filename max length (#540)
+
+---
+ encfs/encfs.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encfs/encfs.pod b/encfs/encfs.pod
+index 6cb5b8f5..d3831296 100644
+--- a/encfs/encfs.pod
++++ b/encfs/encfs.pod
+@@ -490,7 +490,7 @@ filenames for some reason.
+
+ Based on an underlying filesystem supporting a maximum of 255 characters in
+ filenames, here is the maximum possible filename length depending on the choosen
+-encoding scheme : stream (189), block (176), block32 (143). Note that we should
++encoding scheme : stream (189), block (175), block32 (143). Note that we should
+ rather talk about bytes, when filenames contain special (multi-bytes) characters.
+
+ Prior to version 1.1, only stream encoding was supported.
diff --git a/user/encfs/shell.patch b/user/encfs/shell.patch
new file mode 100644
index 000000000..40876ca9f
--- /dev/null
+++ b/user/encfs/shell.patch
@@ -0,0 +1,22 @@
+From 4f21701c1aaeb3e5b9822231e011ac3224026a4c Mon Sep 17 00:00:00 2001
+From: Daniel Santana <daniel@santana.tech>
+Date: Sun, 9 Dec 2018 08:37:12 -0200
+Subject: [PATCH] Use /bin/sh as a fallback to SHELL in encfssh (#538)
+
+---
+ encfs/encfssh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encfs/encfssh b/encfs/encfssh
+index fe7b502e..d9566f7d 100755
+--- a/encfs/encfssh
++++ b/encfs/encfssh
+@@ -77,7 +77,7 @@ fuse_umount() {
+ }
+
+ # Honor the SHELL environment variable to select a shell to run
+-"$SHELL"; retval=$?
++"${SHELL:-/bin/sh}"; retval=$?
+
+ # ensure that this shell isn't itself holding the mounted directory open
+ # ...but avoid terminating on failure, *or* causing a shellcheck warning for
diff --git a/user/encfs/typos.patch b/user/encfs/typos.patch
new file mode 100644
index 000000000..8809d8a1d
--- /dev/null
+++ b/user/encfs/typos.patch
@@ -0,0 +1,44 @@
+From 24af76d0d9503e1bd0725f6b448c8fecb603ab56 Mon Sep 17 00:00:00 2001
+From: Vasiliy Glazov <vascom2@gmail.com>
+Date: Tue, 3 Jul 2018 08:57:09 +0300
+Subject: [PATCH] Correct typo in russian translate (#528)
+
+---
+ po/ru.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/ru.po b/po/ru.po
+index 33ad129b..c0793cc8 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -448,7 +448,7 @@ msgstr ""
+ "Выберите одну из следующих букв:\n"
+ " введите \"x\" для режима эксперта,\n"
+ " введите \"p\" для режима максимальной секретности,\n"
+-" любой другая буква для выбора стандартного режима.\n"
++" любая другая буква для выбора стандартного режима.\n"
+ "?> "
+
+ #, c-format
+From ce200c83f0d9b5309f3e8fae7283c4cad598f637 Mon Sep 17 00:00:00 2001
+From: Shohei Kusakata <shohei@kusakata.com>
+Date: Thu, 18 Jul 2019 19:29:16 +0900
+Subject: [PATCH] Fix typo in japanese translation (#553)
+
+---
+ po/ja.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/ja.po b/po/ja.po
+index eccefb44..b089aadf 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -608,7 +608,7 @@ msgid ""
+ " - invalid options -- see usage message\n"
+ msgstr ""
+ "fuse が失敗しました。一般的な原因としては:\n"
+-" - fuse カーネルモジュールがインストールされていない (modeprobe fuse)\n"
++" - fuse カーネルモジュールがインストールされていない (modprobe fuse)\n"
+ " - 無効なオプション -- 使い方を参照してください\n"
+
+ #, c-format
diff --git a/user/encfs/utimensat.patch b/user/encfs/utimensat.patch
new file mode 100644
index 000000000..93c5378e1
--- /dev/null
+++ b/user/encfs/utimensat.patch
@@ -0,0 +1,22 @@
+From 3d060783eea3790b8d6ea9920db8a0dc6e73d184 Mon Sep 17 00:00:00 2001
+From: Russell Yanofsky <russ@yanofsky.org>
+Date: Sun, 16 Sep 2018 15:41:11 -0400
+Subject: [PATCH] Fix setting nanosecond times
+
+utimensat function was never being called due to missing cmake define
+---
+ config.h.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config.h.cmake b/config.h.cmake
+index 8548d706..32ddf2bb 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -6,6 +6,7 @@
+ #cmakedefine XATTR_LLIST
+
+ #cmakedefine HAVE_LCHMOD
++#cmakedefine HAVE_UTIMENSAT
+ #cmakedefine HAVE_FDATASYNC
+
+ #cmakedefine HAVE_DIRENT_D_TYPE