[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: 24515f0803c027a23995d666117fca78f35f6f69
Author: Sam James gentoo org>
AuthorDate: Fri Sep 19 18:42:08 2025 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 19 18:42:08 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24515f08
sys-fs/cryfs: fix build w/ boost-1.89
Closes: https://bugs.gentoo.org/963108
Signed-off-by: Sam James gentoo.org>
sys-fs/cryfs/cryfs-1.0.1-r2.ebuild | 179
sys-fs/cryfs/files/cryfs-1.0.1-boost-1.89.patch | 26
2 files changed, 205 insertions(+)
diff --git a/sys-fs/cryfs/cryfs-1.0.1-r2.ebuild
b/sys-fs/cryfs/cryfs-1.0.1-r2.ebuild
new file mode 100644
index ..eac851af74f5
--- /dev/null
+++ b/sys-fs/cryfs/cryfs-1.0.1-r2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake eapi9-ver flag-o-matic linux-info python-any-r1
+
+if [[ ${PV} == ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cryfs/cryfs";
+else
+
SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz";
+ S=${WORKDIR}
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/";
+
+LICENSE="LGPL-3 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/boost-1.84.0:=
+ dev-libs/crypto++:=
+ dev-libs/libfmt:=
+ dev-libs/spdlog:=
+ >=sys-fs/fuse-2.8.6:0
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/range-v3
+ net-misc/curl
+ test? (
+ dev-cpp/gtest
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ $(python_gen_any_dep '
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=(
+ # TODO: upstream:
+ "${FILESDIR}"/cryfs-1.0.1-unbundle-vendored-libs.patch
+
+ # backports
+ "${FILESDIR}"/cryfs-1.0.1-boost-1.88.patch
+
+ # https://github.com/cryfs/cryfs/pull/500
+ "${FILESDIR}"/cryfs-1.0.1-boost-1.89.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="~FUSE_FS"
+ local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
+
+ check_extra_config
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # don't install compressed manpage
+ cmake_comment_add_subdirectory doc
+
+ # We use the package instead for >=py3.12 compat, bug #908997
+ rm src/gitversion/versioneer.py || die
+
+ # Hook up ctest properly for better maintainer quality of life
+ sed -i -e '/option(BUILD_TESTING/aenable_testing()' CMakeLists.txt ||
die
+ sed -i -e '/BUILD_TESTING/a include(GoogleTest)' test/CMakeLists.txt
|| die
+ sed -i -e 's/add_test/gtest_discover_tests/' test/*/CMakeLists.txt ||
die
+}
+
+src_configure() {
+ # ODR violations (bug #880563)
+ # ./CMakeLists.txt
+ # """
+ # We don't use LTO because crypto++ has problems with it,
+ # see https://github.com/weidai11/cryptopp/issues/1031 and
+ # https://www.cryptopp.com/wiki/Link_Time_Optimization
+ # """
+ filter-lto
+
+ local mycmakeargs=(
+ # Upstream inconsistently specifies their libraries as STATIC
+ # Leading to issues when static libraries without PIC are linked
+ # with PIC shared libraries.
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DCRYFS_UPDATE_CHECKS=OFF
+ -DUSE_SYSTEM_LIBS=ON
+ )
+
+ append-cppflags -DNDEBUG
+
+ # bug 907096
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+ cmake_src_configure
+}
+
+src_test() {
+ local TMPDIR="${T}"
+
+ local CMAKE_SKIP_TESTS=(
+ # Cannot test mounting filesystems in sandbox
+ # Filesystem did not call onMounted callback, probably wasn't
successfully mounted.
+ # bug #808849
+ CliTest.WorksWithCommasInBasedir
+ CliTest_IntegrityCheck.givenIncorrectFilesystemId_thenFails
+ CliTest_IntegrityCheck.givenIncorrectFilesystemKey_thenFails
+ CliTest_Setup.AutocreateBasedir
+ CliTest_Setup.AutocreateMountpoint
+ CliTest_Setup.ConfigfileGiven
+ CliTest_Setup.ExistingLogfileGiven
+ CliTest_Setup.NoSpecialOptions
+ CliTest_Setup.NotexistingLogfileGiven
+
CliTest_Unmount.givenMountedFilesystem_whenUnmounting_thenSucceeds
+
RunningInForeground/CliTest_WrongEnvironment.BaseDir_AllPermissions
+
RunningInForeground/CliTest_WrongEnvironment.BaseDir_DoesntExist_
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: 59f7dacfba80a9a08f7d6a38b41a3d5405f58095
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 5 12:33:10 2025 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 5 17:51:50 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f7dacf
sys-fs/cryfs: drop 0.11.4
Signed-off-by: Andreas Sturmlechner gentoo.org>
sys-fs/cryfs/Manifest | 1 -
sys-fs/cryfs/cryfs-0.11.4.ebuild | 171 ---
.../cryfs-0.11.4-unbundle-vendored-libs.patch | 315 -
3 files changed, 487 deletions(-)
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 7aa4f3bb30a1..334079ee7c36 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,2 +1 @@
-DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B
3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391
SHA512
a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea
DIST cryfs-1.0.1.tar.xz 7508060 BLAKE2B
21c2feba56181e51ec7799ccb90d604d6e183443ddf7ddaaa5e8952405d4b16382805c6c10affbd1e5ff251853bad53dcade9a1d004fa28220e0aa10c433f7c3
SHA512
e6bba11b0229cad75ae4383b04f73c436f5badf4b727a992cbef7071807049fa628768e375f057c54043af99bb9624ef0e69bcfa680dcc82ed6ed281887da11c
diff --git a/sys-fs/cryfs/cryfs-0.11.4.ebuild b/sys-fs/cryfs/cryfs-0.11.4.ebuild
deleted file mode 100644
index 367de758b356..
--- a/sys-fs/cryfs/cryfs-0.11.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cryfs/cryfs";
-else
- SRC_URI="
- https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz
- -> ${P}.tar.gz
- "
- KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/";
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/crypto++:=
- dev-libs/libfmt:=
- dev-libs/spdlog:=
- net-misc/curl
- >=sys-fs/fuse-2.8.6:0
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/range-v3
- test? (
- dev-cpp/gtest
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- $(python_gen_any_dep '
- dev-python/versioneer[${PYTHON_USEDEP}]
- ')
-"
-
-PATCHES=(
- # TODO: upstream:
- "${FILESDIR}"/cryfs-0.11.4-unbundle-vendored-libs.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- local CONFIG_CHECK="~FUSE_FS"
- local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
- check_extra_config
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # don't install compressed manpage
- cmake_comment_add_subdirectory doc
-
- # We use the package instead for >=py3.12 compat, bug #908997
- rm src/gitversion/versioneer.py || die
-
- # Hook up ctest properly for better maintainer quality of life
- sed -i -e '/option(BUILD_TESTING/aenable_testing()' CMakeLists.txt ||
die
- sed -i -e '/BUILD_TESTING/a include(GoogleTest)' test/CMakeLists.txt
|| die
- sed -i -e 's/add_test/gtest_discover_tests/' test/*/CMakeLists.txt ||
die
-}
-
-src_configure() {
- # ODR violations (bug #880563)
- # ./CMakeLists.txt
- # """
- # We don't use LTO because crypto++ has problems with it,
- # see https://github.com/weidai11/cryptopp/issues/1031 and
- # https://www.cryptopp.com/wiki/Link_Time_Optimization
- # """
- filter-lto
-
- local mycmakeargs=(
- # Upstream inconsistently specifies their libraries as STATIC
- # Leading to issues when static libraries without PIC are linked
- # with PIC shared libraries.
- -DBUILD_SHARED_LIBS=OFF
- -DBUILD_TESTING=$(usex test)
- -DCRYFS_UPDATE_CHECKS=OFF
- -DUSE_SYSTEM_LIBS=ON
- # Upstream offered method of using system packages for packages
installed via conan
- # This only affects those fetched via Conan not those bundled
in /vendor.
- # "Note that this is only provided as an example and not
officially supported."
- # bug #631196
-
-DDEPENDENCY_CONFIG="${S}/cmake-utils/DependenciesFromLocalSystem.cmake"
- )
-
- append-cppflags -DNDEBUG
-
- # bug 907096
- use elibc_musl && app
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: 5a2845f689cd15c181292cd5fba45f2b672480da
Author: Alfred Wingate protonmail com>
AuthorDate: Thu Jan 16 09:47:19 2025 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 24 04:07:30 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2845f6
sys-fs/cryfs: add 1.0.1
Closes: https://bugs.gentoo.org/946941
Signed-off-by: Alfred Wingate protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40286
Signed-off-by: Sam James gentoo.org>
sys-fs/cryfs/Manifest | 1 +
sys-fs/cryfs/cryfs-1.0.1.ebuild| 175 +
.../files/cryfs-1.0.1-unbundle-vendored-libs.patch | 209 +
3 files changed, 385 insertions(+)
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 44cb16c6f3c8..1a1b52c4e646 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1 +1,2 @@
DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B
3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391
SHA512
a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea
+DIST cryfs-1.0.1.tar.gz 9527514 BLAKE2B
6bf6d82bcca46e7db1583e997e979fb8977202f24ee113f137f301849c806ffb8120de002e92e1c15040bb5b74a78f7ce535f22c1c59874530c053257031d8fa
SHA512
04877832ad155806720fbfe27508ce546dd9dfdd4a44382412152459c24f509e5ae47447b85676acd26df800996893662b74c996da1edd52aa890ddb05cd34db
diff --git a/sys-fs/cryfs/cryfs-1.0.1.ebuild b/sys-fs/cryfs/cryfs-1.0.1.ebuild
new file mode 100644
index ..b57ab1729115
--- /dev/null
+++ b/sys-fs/cryfs/cryfs-1.0.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic linux-info python-any-r1
+
+if [[ ${PV} == ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cryfs/cryfs";
+else
+ SRC_URI="
+ https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz
+ -> ${P}.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/";
+
+LICENSE="LGPL-3 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/crypto++:=
+ dev-libs/libfmt:=
+ dev-libs/spdlog:=
+ >=sys-fs/fuse-2.8.6:0
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/range-v3
+ net-misc/curl
+ test? (
+ dev-cpp/gtest
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ $(python_gen_any_dep '
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=(
+ # TODO: upstream:
+ "${FILESDIR}"/cryfs-1.0.1-unbundle-vendored-libs.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="~FUSE_FS"
+ local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
+
+ check_extra_config
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # don't install compressed manpage
+ cmake_comment_add_subdirectory doc
+
+ # We use the package instead for >=py3.12 compat, bug #908997
+ rm src/gitversion/versioneer.py || die
+
+ # Hook up ctest properly for better maintainer quality of life
+ sed -i -e '/option(BUILD_TESTING/aenable_testing()' CMakeLists.txt ||
die
+ sed -i -e '/BUILD_TESTING/a include(GoogleTest)' test/CMakeLists.txt
|| die
+ sed -i -e 's/add_test/gtest_discover_tests/' test/*/CMakeLists.txt ||
die
+}
+
+src_configure() {
+ # ODR violations (bug #880563)
+ # ./CMakeLists.txt
+ # """
+ # We don't use LTO because crypto++ has problems with it,
+ # see https://github.com/weidai11/cryptopp/issues/1031 and
+ # https://www.cryptopp.com/wiki/Link_Time_Optimization
+ # """
+ filter-lto
+
+ local mycmakeargs=(
+ # Upstream inconsistently specifies their libraries as STATIC
+ # Leading to issues when static libraries without PIC are linked
+ # with PIC shared libraries.
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DCRYFS_UPDATE_CHECKS=OFF
+ -DUSE_SYSTEM_LIBS=ON
+ )
+
+ append-cppflags -DNDEBUG
+
+ # bug 907096
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+ cmake_src_configure
+}
+
+src_test() {
+ local TMPDIR="${T}"
+
+ local CMAKE_SKIP_TESTS=(
+ # Cannot test mounting filesystems in sandbox
+ # Filesystem did not call onMounted callback, probably wasn't
successful
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: c3eb169950075aba100e8d7f4e0b594998cf6fb7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Aug 30 13:16:04 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 30 14:40:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3eb1699
sys-fs/cryfs: drop 0.10.3-r1
Bug: https://bugs.gentoo.org/935420
Signed-off-by: Andreas Sturmlechner gentoo.org>
sys-fs/cryfs/Manifest | 1 -
sys-fs/cryfs/cryfs-0.10.3-r1.ebuild| 123 ---
.../cryfs/files/cryfs-0.10.2-install-targets.patch | 38 --
.../cryfs/files/cryfs-0.10.2-unbundle-libs.patch | 409 -
.../cryfs-0.10.3-fix-build-with-boost-1-77.patch | 26 --
sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch| 271 --
sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch| 11 -
7 files changed, 879 deletions(-)
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index d181c0076570..44cb16c6f3c8 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,2 +1 @@
-DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B
e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596
SHA512
a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B
3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391
SHA512
a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
deleted file mode 100644
index 80309d474e3f..
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cryfs/cryfs";
-else
-
SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz";
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
- S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/";
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- >=dev-libs/crypto++-8.2.0:=
- net-misc/curl:=
- >=sys-fs/fuse-2.8.6:0
- dev-libs/openssl:=
-"
-DEPEND="
- ${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/versioneer[${PYTHON_USEDEP}]
- ')
-"
-
-PATCHES=(
- # TODO upstream:
- "${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch"
- "${FILESDIR}/${PN}-0.10.2-install-targets.patch"
- "${FILESDIR}/${PN}-0.10.3-gcc13.patch"
- # From upstream
- "${FILESDIR}/${PN}-0.10.3-gcc11.patch"
- "${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- local CONFIG_CHECK="~FUSE_FS"
- local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
- check_extra_config
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # don't install compressed manpage
- cmake_comment_add_subdirectory doc
-
- # We use the package instead for >=py3.12 compat, bug #908997
- rm src/gitversion/versioneer.py || die
-
- # remove tests that require internet access to comply with Gentoo policy
- sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
- -i test/cpp-utils/CMakeLists.txt || die
-
- # /dev/fuse access denied
- sed -e "/CliTest_IntegrityCheck/d" \
- -i test/cryfs-cli/CMakeLists.txt || die
-}
-
-src_configure() {
- # ODR violations (bug #880563)
- filter-lto
-
- local mycmakeargs=(
- -DBoost_USE_STATIC_LIBS=OFF
- -DCRYFS_UPDATE_CHECKS=OFF
- -DBUILD_SHARED_LIBS=OFF
- -DUSE_SYSTEM_LIBS=ON
- -DBUILD_TESTING=$(usex test)
- )
-
- use debug || append-flags -DNDEBUG
-
- # bug 907096
- use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
- cmake_src_configure
-}
-
-src_test() {
- local TMPDIR="${T}"
- local tests_failed=()
-
- # fspp fuse tests hang, bug # 699044
- for i in gitversion cpp-utils parallelaccessstore blockstore blobstore
cryfs cryfs-cli ; do
- "${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: d9ff8f9b7363aee509e561b39b8fb99c6ce4de97
Author: Sam James gentoo org>
AuthorDate: Fri Aug 13 18:29:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 13 18:33:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ff8f9b
sys-fs/cryfs: fix build with Boost 1.77
Signed-off-by: Sam James gentoo.org>
sys-fs/cryfs/cryfs-0.10.3.ebuild | 1 +
.../cryfs-0.10.3-fix-build-with-boost-1-77.patch | 26 ++
2 files changed, 27 insertions(+)
diff --git a/sys-fs/cryfs/cryfs-0.10.3.ebuild b/sys-fs/cryfs/cryfs-0.10.3.ebuild
index 05cf0d45dc4..dbd42c68d85 100644
--- a/sys-fs/cryfs/cryfs-0.10.3.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.10.2-install-targets.patch"
# From upstream
"${FILESDIR}/${PN}-0.10.3-gcc11.patch"
+ "${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
)
pkg_setup() {
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch
b/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch
new file mode 100644
index 000..a9252e729fb
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch
@@ -0,0 +1,26 @@
+https://github.com/cryfs/cryfs/pull/395
+
+From dcc072d51d0bbb56c9d8709214ce49f8bd6de73c Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Fri, 13 Aug 2021 18:46:55 +0100
+Subject: [PATCH] Add missing memory.h include for std::shared_ptr
+
+---
+ src/fspp/fuse/Fuse.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fspp/fuse/Fuse.h b/src/fspp/fuse/Fuse.h
+index 0b384d8..2ed98da 100644
+--- a/src/fspp/fuse/Fuse.h
b/src/fspp/fuse/Fuse.h
+@@ -11,6 +11,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "stat_compatibility.h"
+
+ namespace fspp {
+--
+2.32.0
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: 3d938ca65dc367476475ef148fd20cb2cf1472f7
Author: Sam James gentoo org>
AuthorDate: Mon May 10 10:46:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon May 10 10:46:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d938ca6
sys-fs/cryfs: add GCC 11 patch
(And fix the paths from PR which I hadn't staged...)
Closes: https://bugs.gentoo.org/786459
Signed-off-by: Sam James gentoo.org>
sys-fs/cryfs/cryfs-0.10.3.ebuild| 7 +-
sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch | 271
2 files changed, 276 insertions(+), 2 deletions(-)
diff --git a/sys-fs/cryfs/cryfs-0.10.3.ebuild b/sys-fs/cryfs/cryfs-0.10.3.ebuild
index 16a91505cca..05cf0d45dc4 100644
--- a/sys-fs/cryfs/cryfs-0.10.3.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3.ebuild
@@ -37,8 +37,10 @@ DEPEND="${RDEPEND}
PATCHES=(
# TODO upstream:
- "${FILESDIR}/0.10.2-unbundle-libs.patch"
- "${FILESDIR}/0.10.2-install-targets.patch"
+ "${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch"
+ "${FILESDIR}/${PN}-0.10.2-install-targets.patch"
+ # From upstream
+ "${FILESDIR}/${PN}-0.10.3-gcc11.patch"
)
pkg_setup() {
@@ -71,6 +73,7 @@ src_configure() {
-DUSE_SYSTEM_LIBS=ON
-DBUILD_TESTING=$(usex test)
)
+
use custom-optimization || append-flags -O3
use debug || append-flags -DNDEBUG
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch
b/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch
new file mode 100644
index 000..9a7252ba506
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch
@@ -0,0 +1,271 @@
+https://github.com/cryfs/cryfs/commit/27587ea1acec5f939a31217f1c43953378f18821.patch
+https://bugs.gentoo.org/786459
+
+From 27587ea1acec5f939a31217f1c43953378f18821 Mon Sep 17 00:00:00 2001
+From: Sebastian Messmer
+Date: Sat, 8 May 2021 14:44:27 -0700
+Subject: [PATCH] Fixed an issue when compiling with GCC 11, see
+ https://github.com/cryfs/cryfs/issues/389
+
+---
+--- a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
+@@ -67,7 +67,7 @@ class DataNodeView final {
+
+ static DataNodeView create(blockstore::BlockStore *blockStore, const
DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size,
cpputils::Data data) {
+ ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for
node");
+-cpputils::Data serialized = _serialize(layout, formatVersion, depth,
size, std::move(data));
++cpputils::Data serialized = serialize_(layout, formatVersion, depth,
size, std::move(data));
+ ASSERT(serialized.size() == layout.blocksizeBytes(), "Wrong block size");
+ auto block = blockStore->create(serialized);
+ return DataNodeView(std::move(block));
+@@ -75,7 +75,7 @@ class DataNodeView final {
+
+ static DataNodeView initialize(cpputils::unique_ref
block, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth,
uint32_t size, cpputils::Data data) {
+ ASSERT(data.size() <= DataNodeLayout(block->size()).datasizeBytes(),
"Data is too large for node");
+-cpputils::Data serialized = _serialize(layout, formatVersion, depth,
size, std::move(data));
++cpputils::Data serialized = serialize_(layout, formatVersion, depth,
size, std::move(data));
+ ASSERT(serialized.size() == block->size(), "Block has wrong size");
+ block->write(serialized.data(), 0, serialized.size());
+ return DataNodeView(std::move(block));
+@@ -83,7 +83,7 @@ class DataNodeView final {
+
+ static DataNodeView overwrite(blockstore::BlockStore *blockStore, const
DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size,
const blockstore::BlockId &blockId, cpputils::Data data) {
+ ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for
node");
+-cpputils::Data serialized = _serialize(layout, formatVersion, depth,
size, std::move(data));
++cpputils::Data serialized = serialize_(layout, formatVersion, depth,
size, std::move(data));
+ auto block = blockStore->overwrite(blockId, std::move(serialized));
+ return DataNodeView(std::move(block));
+ }
+@@ -143,7 +143,7 @@ class DataNodeView final {
+ }
+
+ private:
+- static cpputils::Data _serialize(const DataNodeLayout &layout, uint16_t
formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
++ static cpputils::Data serialize_(const DataNodeLayout &layout, uint16_t
formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
+ cpputils::Data result(layout.blocksizeBytes());
+
cpputils::serialize(result.dataOffset(layout.FORMAT_VERSION_OFFSET_BYTES),
formatVersion);
+
cpputils::serialize(result.dataOffset(layout.DEPTH_OFFSET_BYTES),
depth);
+--- a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
+@@ -11,55 +11,55 @@
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/, sys-fs/cryfs/files/
commit: 192ac7421ddd4093125f4997898fb62e8a140a44
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 16 15:45:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jun 16 21:57:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192ac742
sys-fs/cryfs: 0.10.2 version bump
Add patch to unbundle:
dev-cpp/gtest
dev-libs/crypto++
Unfortunately spdlog in 0.10 branch is too old for dev-libs/spdlog to satisfy.
Add patch for install targets irrespective of CONFIGURATION
Bug: https://bugs.gentoo.org/631196
Bug: https://bugs.gentoo.org/678572
Closes: https://github.com/gentoo/gentoo/pull/11980
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner gentoo.org>
sys-fs/cryfs/Manifest | 1 +
sys-fs/cryfs/cryfs-0.10.2.ebuild | 97 +
.../cryfs/files/cryfs-0.10.2-install-targets.patch | 36 ++
.../cryfs/files/cryfs-0.10.2-unbundle-libs.patch | 409 +
4 files changed, 543 insertions(+)
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index ff47d4c0067..728ceadfdf6 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1 +1,2 @@
+DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B
704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd
SHA512
e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B
927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf
SHA512
18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
new file mode 100644
index 000..56ffbdfc545
--- /dev/null
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils flag-o-matic linux-info python-any-r1
+
+if [[ ${PV} == ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cryfs/cryfs";
+else
+
SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S="${WORKDIR}"
+fi
+
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/";
+
+LICENSE="LGPL-3 MIT"
+SLOT="0"
+IUSE="custom-optimization debug libressl test"
+
+RDEPEND="
+ >=dev-libs/boost-1.65.1:=
+ >=dev-libs/crypto++-8.2.0:=
+ net-misc/curl:=
+ >=sys-fs/fuse-2.8.6:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ # TODO upstream:
+ "${FILESDIR}/${P}-unbundle-libs.patch"
+ "${FILESDIR}/${P}-install-targets.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~FUSE_FS"
+ local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # don't install compressed manpage
+ cmake_comment_add_subdirectory doc
+
+ # remove tests that require internet access to comply with Gentoo policy
+ sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
+ -i test/cpp-utils/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBoost_USE_STATIC_LIBS=OFF
+ -DCRYFS_UPDATE_CHECKS=OFF
+ -DBUILD_SHARED_LIBS=OFF
+ -DUSE_SYSTEM_LIBS=ON
+ -DBUILD_TESTING=$(usex test)
+ )
+ use custom-optimization || append-flags -O3
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ local TMPDIR="${T}"
+ addread /dev/fuse
+ addwrite /dev/fuse
+ local tests_failed=()
+
+ for i in gitversion cpp-utils parallelaccessstore blockstore blobstore
fspp cryfs cryfs-cli ; do
+ "${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
+ done
+
+ adddeny /dev/fuse
+
+ if [[ -n ${tests_failed[@]} ]] ; then
+ eerror "The following tests failed:"
+ eerror "${tests_failed[@]}"
+ die "At least one test failed"
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ doman doc/man/cryfs.1
+}
diff --git a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch
b/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch
new file mode 100644
index 000..5f4881002c4
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch
@@ -0,0 +1,36 @@
+From 18503b00bd16d95dd2cf8a9047446f
