From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- sys-fs/cryfs/Manifest | 9 +- sys-fs/cryfs/cryfs-0.10.2-r1.ebuild | 99 ++++++++++++++++++++ sys-fs/cryfs/cryfs-0.10.2.ebuild | 99 -------------------- sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 102 +++++++++++++++++++++ sys-fs/cryfs/cryfs-0.10.3.ebuild | 102 --------------------- .../cryfs/files/cryfs-0.10.2-install-targets.patch | 2 + .../cryfs-0.10.3-fix-build-with-boost-1-77.patch | 26 ++++++ sys-fs/cryfs/metadata.xml | 3 - 8 files changed, 234 insertions(+), 208 deletions(-) create mode 100644 sys-fs/cryfs/cryfs-0.10.2-r1.ebuild delete mode 100644 sys-fs/cryfs/cryfs-0.10.2.ebuild create mode 100644 sys-fs/cryfs/cryfs-0.10.3-r1.ebuild delete mode 100644 sys-fs/cryfs/cryfs-0.10.3.ebuild create mode 100644 sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch (limited to 'sys-fs/cryfs') diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 37f0b0760e94..21746e028b86 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,8 +1,9 @@ -AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7 +AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680db38359f3e004ca0b08d8caf9ce6febde0cb816000d284696c76df84510f4ab64ee53821cd960311f8b66463ecf36ffdaec0 SHA512 cadf30d9d4228db4da6e5122bf1bb4daefce3ddfb2bc2c2d830d9d10c3d6b368c9dced69fe8675f5d9fda186725e489f819e934310f2a6040911b87b8e1f789d AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c +AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 -EBUILD cryfs-0.10.2.ebuild 2235 BLAKE2B 5a227f6b4f868c54714c9e92bbce5ed70fe5969b99369ffb899128c0396274d0df14372ce69edfabe1e62c823995d587e16c63fdd317230180f03f042ef29a32 SHA512 51bef48b570490b16949cfef42a4b1f8e164fd33666155401149e32c5aceaa9ba9198131923222ee479af436095892013349e14f0df8ceb0ef983abf47839c04 -EBUILD cryfs-0.10.3.ebuild 2312 BLAKE2B cbc726434fa65f78c3d8de05d4a84aaa9d8b631ae1211e720eab0bcb3e40b0ef48171abff626de4425316c465b0661b5aa097280bb34470aedc07106a4e51ae4 SHA512 c7983f54b60a9cbc9f59e5f0a9f6869d9f402aa2f70a1ea4865c50fd147243c2e6ce6258ea02187c40632975f444d9e20c18433f653c3fe313d47e72872ff8a0 -MISC metadata.xml 521 BLAKE2B 970f5ce1a602a65ecc2d123edc08386312fcafce936b679d4de8963e3336f9fdbf314ac3d166635270efe9b226ec801fca202dadb887d155edaf9daa64da60d9 SHA512 0aeb067ca8dd47ec21a9e9f786443e4e75c384b0a648b94ed9d7b29b1ae8850af78933198e1f20dafc700416e8a9c954fb9c4544db7399823bb38376805d6775 +EBUILD cryfs-0.10.2-r1.ebuild 2180 BLAKE2B bf826cc26d0ec5aeace2d411744192891aa3b14f6ae18e76d183b247b34eabf7809f9f7b9238ba2d705761fec12bffa1ef069657b2672145485e2f5f55a4216a SHA512 778e1d7bc641f0ba5bd428098c72b0079ad7db796394816e1d35e7db639fb661be9b90e8cdd6fd58855fcbc5634afb465b8c1b4e7c018d33eb60cf64980f0b4e +EBUILD cryfs-0.10.3-r1.ebuild 2316 BLAKE2B ce0c6f6a168d118e9afe04827bfb910751e3cb869268711792ff85b429b5e723f8bdb5dff242dc0505d04349767e2fc3e5c77057d2b1685e5ca84bd00f0f4d31 SHA512 c26e31859a327efce55fc8f8eaa6dacb6348143af1f3610b09cdb455be71230c9e3562027134bbe23054e6ce168c352d9b26016b76503fe4e6c6a967d198a0e6 +MISC metadata.xml 415 BLAKE2B e82538e202eeb7f38e85018e87794b77bc3ed222a7d9fb39f38a724c98e31a4bb500fc6e4d406c9d307d8abefcc3dadedc070d8ec4b4d96059eb9f39b7824b71 SHA512 3af43831416d6d20513090d8ce1d678c8084ce3cc4d63e8ee8aa45746c4694616b531048f45fcc9a7243320fa23fb1232e12b60e8477ede30471f6bb148014db diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild new file mode 100644 index 000000000000..5f06da1a12ff --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake flag-o-matic linux-info python-any-r1 + +if [[ ${PV} == 9999 ]] ; 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 ~ppc64 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-1.65.1:= + >=dev-libs/crypto++-8.2.0:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:0 + dev-libs/openssl:0= +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" +BDEPEND="${PYTHON_DEPS}" + +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_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 + + # /dev/fuse access denied + sed -e "/CliTest_IntegrityCheck/d" \ + -i test/cryfs-cli/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 debug || append-flags -DNDEBUG + + 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}" ) + done + + if [[ -n ${tests_failed[@]} ]] ; then + eerror "The following tests failed:" + eerror "${tests_failed[@]}" + die "At least one test failed" + fi +} + +src_install() { + cmake_src_install + doman doc/man/cryfs.1 +} diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild deleted file mode 100644 index feb0b0eec320..000000000000 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake flag-o-matic linux-info python-any-r1 - -if [[ ${PV} == 9999 ]] ; 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 ~ppc64 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 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/boost-1.65.1:= - >=dev-libs/crypto++-8.2.0:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - dev-libs/openssl:0= -" -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_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 - - # /dev/fuse access denied - sed -e "/CliTest_IntegrityCheck/d" \ - -i test/cryfs-cli/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 - use debug || append-flags -DNDEBUG - - 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}" ) - done - - if [[ -n ${tests_failed[@]} ]] ; then - eerror "The following tests failed:" - eerror "${tests_failed[@]}" - die "At least one test failed" - fi -} - -src_install() { - cmake_src_install - doman doc/man/cryfs.1 -} diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild new file mode 100644 index 000000000000..6b27028e16c2 --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake flag-o-matic linux-info python-any-r1 + +if [[ ${PV} == 9999 ]] ; 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 ~ppc64 ~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-1.65.1:= + >=dev-libs/crypto++-8.2.0:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:0 + dev-libs/openssl:0= +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + # TODO upstream: + "${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" + "${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.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_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 + + # /dev/fuse access denied + sed -e "/CliTest_IntegrityCheck/d" \ + -i test/cryfs-cli/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 debug || append-flags -DNDEBUG + + 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}" ) + done + + if [[ -n ${tests_failed[@]} ]] ; then + eerror "The following tests failed:" + eerror "${tests_failed[@]}" + die "At least one test failed" + fi +} + +src_install() { + cmake_src_install + doman doc/man/cryfs.1 +} diff --git a/sys-fs/cryfs/cryfs-0.10.3.ebuild b/sys-fs/cryfs/cryfs-0.10.3.ebuild deleted file mode 100644 index 05cf0d45dc4f..000000000000 --- a/sys-fs/cryfs/cryfs-0.10.3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake flag-o-matic linux-info python-any-r1 - -if [[ ${PV} == 9999 ]] ; 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 ~ppc64 ~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 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/boost-1.65.1:= - >=dev-libs/crypto++-8.2.0:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - dev-libs/openssl:0= -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - # TODO upstream: - "${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() { - local CONFIG_CHECK="~FUSE_FS" - local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support." - - check_extra_config -} - -src_prepare() { - cmake_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 - - # /dev/fuse access denied - sed -e "/CliTest_IntegrityCheck/d" \ - -i test/cryfs-cli/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 - use debug || append-flags -DNDEBUG - - 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}" ) - done - - if [[ -n ${tests_failed[@]} ]] ; then - eerror "The following tests failed:" - eerror "${tests_failed[@]}" - die "At least one test failed" - fi -} - -src_install() { - cmake_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 index 5f4881002c46..0c666448cc01 100644 --- a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch +++ b/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch @@ -1,3 +1,5 @@ +https://github.com/cryfs/cryfs/pull/396 + From 18503b00bd16d95dd2cf8a9047446f8be7289082 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 16 Jun 2019 19:35:49 +0200 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 000000000000..a9252e729fb6 --- /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 + diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 1bdfc250ad18..f34ba9731bbc 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -9,7 +9,4 @@ proxy-maint@gentoo.org Proxy Maintainers - - Use user-defined compiler optimization level - -- cgit v1.2.3