[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ce78f2a20c27b329f4ceec42984bd84e6961b2a7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Mar 3 17:33:09 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Mar 3 17:33:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce78f2a2 sys-fs/cryfs: Apply musl-1.2.4 largefile workaround Bug: https://bugs.gentoo.org/907096 Signed-off-by: Andreas K. Hüttel gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 3bfd41cfff20..066345cf8c48 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -95,6 +95,9 @@ src_configure() { use debug || append-flags -DNDEBUG + # bug 907096 + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + cmake_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 19a3b024ad4252574c2a4b5de394f1d102544556 Author: Sam James gentoo org> AuthorDate: Wed Feb 28 22:55:50 2024 + Commit: Sam James gentoo org> CommitDate: Wed Feb 28 22:57:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a3b024 sys-fs/cryfs: filter LTO (ODR violations) Closes: https://bugs.gentoo.org/880563 Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 6ec74214a5c7..3bfd41cfff20 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -82,6 +82,9 @@ src_prepare() { } src_configure() { + # ODR violations (bug #880563) + filter-lto + local mycmakeargs=( -DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=OFF
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 1f8274eda8c1723e48a5dcad429724ea01ec4862 Author: Sam James gentoo org> AuthorDate: Tue Jun 27 07:06:12 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jun 27 07:06:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8274ed sys-fs/cryfs: fix python-any-r1 usage Closes: https://bugs.gentoo.org/908997 Closes: https://bugs.gentoo.org/880563 Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 321634245e9e..6ec74214a5c7 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then @@ -28,12 +28,18 @@ RDEPEND=" >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 - dev-libs/openssl:0= + dev-libs/openssl:= " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( dev-cpp/gtest ) " -BDEPEND="${PYTHON_DEPS}" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/versioneer[${PYTHON_USEDEP}] + ') +" PATCHES=( # TODO upstream: @@ -45,11 +51,16 @@ PATCHES=( "${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() { @@ -58,6 +69,9 @@ 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 08aaf8fb2da97a1c3bfbdcf4dbdc2adbf1cc0803 Author: Peter Levine gmail com> AuthorDate: Sat Apr 22 04:40:54 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:02:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08aaf8fb sys-fs/cryfs: enable py3.11 Closes: https://bugs.gentoo.org/897304 Closes: https://github.com/gentoo/gentoo/pull/30694 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index e3ce120c5ff7..321634245e9e 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/files/, sys-fs/cryfs/
commit: e71067dbade539090be50e3ddfc9fac889efc34e Author: Sam James gentoo org> AuthorDate: Mon Jan 23 02:14:18 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jan 23 02:32:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71067db sys-fs/cryfs: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/890847 Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 1 + sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch | 11 +++ 2 files changed, 12 insertions(+) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 6416dfd23725..e3ce120c5ff7 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -39,6 +39,7 @@ 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" diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch new file mode 100644 index ..33b6e95d1cea --- /dev/null +++ b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/890847 +--- a/src/cpp-utils/thread/LeftRight.h b/src/cpp-utils/thread/LeftRight.h +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include +
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 922dcf1311552e6000e2f6146d6aa785671e9845 Author: Sam James gentoo org> AuthorDate: Mon Jan 23 02:14:43 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jan 23 02:32:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922dcf13 sys-fs/cryfs: add github upstream metadata Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 29cb5df7d609..dce6d653fddc 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -9,4 +9,7 @@ proxy-ma...@gentoo.org Proxy Maintainers + +cryfs/cryfs +
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 31d72515def8c7af34ab0b84b8af39985ce4f6e8 Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 13:03:36 2022 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 13:03:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d72515 sys-fs/cryfs: remove stale boost lower bounds Signed-off-by: David Seifert gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 4e9c60bd68d7..70df4e49f50a 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -24,7 +24,7 @@ IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/boost-1.65.1:= + dev-libs/boost:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 96bcc607a724d972576cd1b1fe4d5f8ab30bd091 Author: WANG Xuerui gentoo org> AuthorDate: Tue Jun 28 04:17:45 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Tue Jun 28 04:18:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bcc607 sys-fs/cryfs: keyword 0.10.3-r1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index f209908d30e4..4e9c60bd68d7 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 2964a3113b753554ccb6df04440bb40778e32d2c Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Apr 18 18:55:43 2022 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Apr 18 18:56:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2964a311 sys-fs/cryfs: enable py3.10 Signed-off-by: Alexey Shvetsov gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 199c5a6badd1..f209908d30e4 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: aa3752d07ea66a451e156a5a1455061da9a059a1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 14 06:37:56 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 14 06:38:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3752d0 sys-fs/cryfs: Drop 0.10.2-r1 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/Manifest | 1 - sys-fs/cryfs/cryfs-0.10.2-r1.ebuild | 99 - 2 files changed, 100 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index f06ae97762b..8b4042ff25f 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,2 +1 @@ -DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild deleted file mode 100644 index 5f06da1a12f..000 --- a/sys-fs/cryfs/cryfs-0.10.2-r1.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} == ]] ; 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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ef8542684a4322ced9f19b8d5977b9bea7e8a89b Author: Sam James gentoo org> AuthorDate: Wed Oct 13 20:32:52 2021 + Commit: Sam James gentoo org> CommitDate: Wed Oct 13 20:32:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef854268 sys-fs/cryfs: Stabilize 0.10.3-r1 amd64, #789366 Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index e6d04c05f24..199c5a6badd 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 6ab2fc51530ef7eb6944bca8ba44a80d2ec03134 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Aug 29 10:01:28 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Aug 29 10:01:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab2fc51 sys-fs/cryfs: x86 stable wrt bug #789366 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 2e2611648fe..9d5f790f7ea 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: dd26d5e997529ad47b5d32c623f7ae0c5be42c30 Author: Alex Fan yahoo com> AuthorDate: Tue Aug 17 04:08:12 2021 + Commit: Yixun Lan gentoo org> CommitDate: Wed Aug 18 00:32:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd26d5e9 sys-fs/cryfs: keyword 0.10.3 for ~riscv Signed-off-by: Alex Fan yahoo.com> Signed-off-by: Yixun Lan gentoo.org> sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 6b27028e16c..2e2611648fe 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" S="${WORKDIR}" fi
[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/
commit: 07377faf3f43f6e29ba3438b655a4db238f5a024 Author: Sam James gentoo org> AuthorDate: Fri Aug 13 18:30:34 2021 + Commit: Sam James gentoo org> CommitDate: Fri Aug 13 18:33:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07377faf sys-fs/cryfs: drop IUSE="custom-optimization" (don't force -O3) We don't want to be forcing -O3 by default. Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/{cryfs-0.10.2.ebuild => cryfs-0.10.2-r1.ebuild} | 4 ++-- sys-fs/cryfs/{cryfs-0.10.3.ebuild => cryfs-0.10.3-r1.ebuild} | 3 +-- sys-fs/cryfs/metadata.xml| 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild similarity index 96% rename from sys-fs/cryfs/cryfs-0.10.2.ebuild rename to sys-fs/cryfs/cryfs-0.10.2-r1.ebuild index feb0b0eec32..64254d9ce02 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://www.cryfs.org/; LICENSE="LGPL-3 MIT" SLOT="0" -IUSE="custom-optimization debug test" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -71,7 +71,7 @@ src_configure() { -DUSE_SYSTEM_LIBS=ON -DBUILD_TESTING=$(usex test) ) - use custom-optimization || append-flags -O3 + use debug || append-flags -DNDEBUG cmake_src_configure diff --git a/sys-fs/cryfs/cryfs-0.10.3.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild similarity index 96% rename from sys-fs/cryfs/cryfs-0.10.3.ebuild rename to sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index dbd42c68d85..675a8c9967b 100644 --- a/sys-fs/cryfs/cryfs-0.10.3.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://www.cryfs.org/; LICENSE="LGPL-3 MIT" SLOT="0" -IUSE="custom-optimization debug test" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -75,7 +75,6 @@ src_configure() { -DBUILD_TESTING=$(usex test) ) - use custom-optimization || append-flags -O3 use debug || append-flags -DNDEBUG cmake_src_configure diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 1bdfc250ad1..f34ba9731bb 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -9,7 +9,4 @@ proxy-ma...@gentoo.org Proxy Maintainers - -Use user-defined compiler optimization level -
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/files/
commit: e08645e9915d7d540b89c7a70c61d9619e9b725e Author: Sam James gentoo org> AuthorDate: Fri Aug 13 18:31:58 2021 + Commit: Sam James gentoo org> CommitDate: Fri Aug 13 18:33:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08645e9 sys-fs/cryfs: add link to upstream PR for targets install patch Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch | 2 ++ 1 file changed, 2 insertions(+) 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 5f4881002c4..0c666448cc0 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 10c7a9f67aa11fa7ca87b46c753232286a006696 Author: Sam James gentoo org> AuthorDate: Fri Aug 13 18:31:23 2021 + Commit: Sam James gentoo org> CommitDate: Fri Aug 13 18:33:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c7a9f6 sys-fs/cryfs: use BDEPEND for ${PYTHON_DEPS} Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/cryfs-0.10.2-r1.ebuild | 2 +- sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild index 64254d9ce02..5f06da1a12f 100644 --- a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild @@ -31,9 +31,9 @@ RDEPEND=" dev-libs/openssl:0= " DEPEND="${RDEPEND} - ${PYTHON_DEPS} test? ( dev-cpp/gtest ) " +BDEPEND="${PYTHON_DEPS}" PATCHES=( # TODO upstream: diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 675a8c9967b..6b27028e16c 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -31,9 +31,9 @@ RDEPEND=" dev-libs/openssl:0= " DEPEND="${RDEPEND} - ${PYTHON_DEPS} test? ( dev-cpp/gtest ) " +BDEPEND="${PYTHON_DEPS}" PATCHES=( # TODO upstream:
[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 , 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 , 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 , uint16_t formatVersion, uint8_t depth, uint32_t size, const blockstore::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 , uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { ++ static cpputils::Data serialize_(const DataNodeLayout , 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 @@ namespace cryfs { + + namespace {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: df47ec0c68cf4108f869e285009f6e304ec41551 Author: Matthew Bakhtiari mtbk me> AuthorDate: Sun May 9 09:02:21 2021 + Commit: Sam James gentoo org> CommitDate: Mon May 10 09:36:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df47ec0c sys-fs/cryfs: bump to 0.10.3 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Matthew Bakhtiari mtbk.me> Closes: https://github.com/gentoo/gentoo/pull/20733 Signed-off-by: Sam James gentoo.org> sys-fs/cryfs/Manifest| 1 + sys-fs/cryfs/cryfs-0.10.3.ebuild | 99 2 files changed, 100 insertions(+) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index bb4b24ade0c..f06ae97762b 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.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 diff --git a/sys-fs/cryfs/cryfs-0.10.3.ebuild b/sys-fs/cryfs/cryfs-0.10.3.ebuild new file mode 100644 index 000..16a91505cca --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.10.3.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} == ]] ; 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}/0.10.2-unbundle-libs.patch" + "${FILESDIR}/0.10.2-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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ce22a67d0afd009b4fc09d3d0ab4cc7f6866a28e Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 2 17:43:01 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 2 17:43:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce22a67d sys-fs/cryfs: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index fb7866b6393..feb0b0eec32 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://www.cryfs.org/; LICENSE="LGPL-3 MIT" SLOT="0" -IUSE="custom-optimization debug libressl test" +IUSE="custom-optimization debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -28,8 +28,7 @@ RDEPEND=" >=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:= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND} ${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: b036f46c37f0671902fa41df6452d1bdadc009d6 Author: Nicholas Meyer gmail com> AuthorDate: Mon Dec 21 08:02:02 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Jan 18 08:54:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b036f46c sys-fs/cryfs: add python3_9 to PYTHON_COMPAT Closes: https://bugs.gentoo.org/760507 Signed-off-by: Nicholas Meyer gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18742 Signed-off-by: Joonas Niilola gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 5ab97c61f31..65463581b24 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: e1b4322ae72c88dbd03fb66cd1c60a7e04a07a93 Author: Nicholas Meyer gmail com> AuthorDate: Sat Oct 31 22:34:34 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Nov 5 12:32:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b4322a sys-fs/cryfs: remove debug warning on sys-fs/cryfs[-debug] Closes: https://bugs.gentoo.org/747376 Signed-off-by: Nicholas Meyer gmail.com> Signed-off-by: Joonas Niilola gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 3ed998a2671..5ab97c61f31 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -73,6 +73,7 @@ src_configure() { -DBUILD_TESTING=$(usex test) ) use custom-optimization || append-flags -O3 + use debug || append-flags -DNDEBUG cmake_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 8cebe67bf80a41fd9535a4c0ccd24daf0b014192 Author: Nicholas Meyer gmail com> AuthorDate: Sun Nov 1 01:06:31 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Nov 5 12:32:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cebe67b sys-fs/cryfs: add myself as a proxy maintainer Signed-off-by: Nicholas Meyer gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18096 Signed-off-by: Joonas Niilola gentoo.org> sys-fs/cryfs/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index cf73e5490d6..a4e7e74cd60 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -1,7 +1,14 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + +nickaristocra...@gmail.com +Nicholas Meyer + + +proxy-ma...@gentoo.org +Proxy Maintainers + Use user-defined compiler optimization level
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: e4ccf171101644e170f31f07752e4ef87bb12375 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Oct 16 11:11:23 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Oct 16 11:12:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ccf171 sys-fs/cryfs: add ~ppc64 keyword Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 5ddc187c331..3ed998a2671 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 55c502229fabbf457a462b4c698df5d3a28b53ab Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 4 20:57:15 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 4 20:57:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c50222 sys-fs/cryfs: Remove unmaintained live ebuild Bug: https://bugs.gentoo.org/705404 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-.ebuild | 97 -- 1 file changed, 97 deletions(-) diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild deleted file mode 100644 index 0292d83f5f3..000 --- a/sys-fs/cryfs/cryfs-.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{6,7} ) -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 ~x86" - S="${WORKDIR}" -fi - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -# cryfs - LGPL-3 -# spdlog - MIT -# crypto++ - Boost-1.0 -LICENSE="LGPL-3 MIT Boost-1.0" -SLOT="0" -IUSE="custom-optimization debug libressl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/boost-1.65.1:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} -" - -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 - -DBUILD_TESTING=$(usex test) - ) - use custom-optimization || append-flags -O3 - - 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() { - # work around upstream issue with cmake not creating install target - # in Makefile if we enable BUILD_TESTING - dobin "${BUILD_DIR}/src/cryfs-cli/cryfs" - doman doc/man/cryfs.1 - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 061ca6ea82c0fc168307c010d1139fd0880135e0 Author: Joonas Niilola gentoo org> AuthorDate: Sat May 16 07:08:56 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sat May 16 07:08:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061ca6ea sys-fs/cryfs: RedundantLongDescription Signed-off-by: Joonas Niilola gentoo.org> sys-fs/cryfs/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 5079d22c2ab..cf73e5490d6 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -5,5 +5,4 @@ Use user-defined compiler optimization level - Encrypted FUSE filesystem that conceals metadata
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 17bcc020d1170ffba137c9f5afebcff8a9ce3650 Author: Joonas Niilola gentoo org> AuthorDate: Sat May 16 06:56:03 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sat May 16 06:56:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bcc020 sys-fs/cryfs: drop to m-n Signed-off-by: Joonas Niilola gentoo.org> sys-fs/cryfs/metadata.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 9d9b4938e31..5079d22c2ab 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -1,12 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -adeb...@gmail.com - - -proxy-ma...@gentoo.org - + Use user-defined compiler optimization level
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ab683bb7d24a06e790a2a50447ef9edb61579907 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 15:21:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 15:56:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab683bb7 sys-fs/cryfs: python3_8 support Tests passed. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 8bae478822f..5ddc187c331 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: e637c947785e0e509d2ccd48df47db518d675de5 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 13:06:11 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 13:26:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e637c947 sys-fs/cryfs: Remove py2 where possible Signed-off-by: Michał Górny gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 384dc785fe0..8bae478822f 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 3e2d65b43018ad7af8f31ff0a97d75414612d44b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 18 22:50:31 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 18 23:08:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2d65b4 sys-fs/cryfs: Drop 0.9.9-r1 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/Manifest | 1 - sys-fs/cryfs/cryfs-0.9.9-r1.ebuild | 94 -- sys-fs/cryfs/metadata.xml | 1 - 3 files changed, 96 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 728ceadfdf6..bb4b24ade0c 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,2 +1 @@ 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.9.9-r1.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild deleted file mode 100644 index 2a9e7684358..000 --- a/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python{2_7,3_6} ) - -inherit cmake-utils python-any-r1 flag-o-matic - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -SLOT=0 -IUSE="custom-optimization libressl test update-check" -RESTRICT="!test? ( test )" - -LICENSE="LGPL-3 BSD-2 MIT" -# cryfs - LGPL-3 -# scrypt - BSD-2 -# spdlog - MIT - -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 - -RDEPEND=">=dev-libs/boost-1.56:= - >=dev-libs/crypto++-5.6.3:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -src_prepare() { - cmake-utils_src_prepare - - # remove tests that require internet access to comply with Gentoo policy - sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die - - # remove non-applicable warning - sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die -} - -src_configure() { - # upstream restricts installing files to Release configuration - # (CMAKE_BUILD_TYPE does not affect anything else) - local CMAKE_BUILD_TYPE - local -a mycmakeargs - CMAKE_BUILD_TYPE=Release - mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" - "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" - "-DBUILD_TESTING=$(usex test)" - ) - use custom-optimization || append-flags -O3 - - cmake-utils_src_configure -} - -src_test() { - local TMPDIR - TMPDIR="${T}" - addread /dev/fuse - addwrite /dev/fuse - local -a tests_failed - 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() { - # work around upstream issue with cmake not creating install target - # in Makefile if we enable BUILD_TESTING - dobin "${BUILD_DIR}/src/cryfs-cli/cryfs" - gzip -cd "${BUILD_DIR}/doc/cryfs.1.gz" > "${T}/cryfs.1" || die - doman "${T}/cryfs.1" - einstalldocs -} diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index 177b7e18c57..9d9b4938e31 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -9,7 +9,6 @@ Use user-defined compiler optimization level -Enable automatic checking for updates and security vulnerabilities Encrypted FUSE filesystem that conceals metadata
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 124d1146f18d7434f65abc50b3971a356d0fc195 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 18 22:46:58 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 18 23:08:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124d1146 sys-fs/cryfs: Drop python2_7 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- sys-fs/cryfs/cryfs-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 43b3ce951a1..384dc785fe0 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index ac222bf5bcf..0292d83f5f3 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 7ea75541b0cd2a785417fa2fe1d72f7429dab98e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 18 22:45:37 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 18 23:08:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea75541 sys-fs/cryfs: Switch to cmake.eclass Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 8 sys-fs/cryfs/cryfs-.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index a348a7b36d9..43b3ce951a1 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -inherit cmake-utils flag-o-matic linux-info python-any-r1 +inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then inherit git-r3 @@ -50,7 +50,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # don't install compressed manpage cmake_comment_add_subdirectory doc @@ -74,7 +74,7 @@ src_configure() { ) use custom-optimization || append-flags -O3 - cmake-utils_src_configure + cmake_src_configure } src_test() { @@ -94,6 +94,6 @@ src_test() { } src_install() { - cmake-utils_src_install + cmake_src_install doman doc/man/cryfs.1 } diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index e51d307230e..ac222bf5bcf 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -inherit cmake-utils flag-o-matic linux-info python-any-r1 +inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then inherit git-r3 @@ -46,7 +46,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # don't install compressed manpage cmake_comment_add_subdirectory doc @@ -69,7 +69,7 @@ src_configure() { ) use custom-optimization || append-flags -O3 - cmake-utils_src_configure + cmake_src_configure } src_test() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: b139a45050957f8bdf44a5ade6d8f524afebba97 Author: Aaron Bauman gentoo org> AuthorDate: Wed Nov 13 02:51:32 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Nov 13 02:51:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b139a450 sys-fs/cryfs: arm64 stable (bug #689034) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.79, Repoman-2.3.18 sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index c9fb983741f..4844d38e718 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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" + KEYWORDS="amd64 ~arm arm64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: bdfe8df2c1ec055fedc3d3493a9db8cfe079c873 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Nov 2 08:40:25 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Nov 2 08:40:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfe8df2 sys-fs/cryfs: amd64 stable wrt bug #689034 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 54a1c3c354d..c9fb983741f 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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" + KEYWORDS="amd64 ~arm ~arm64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: c20f670118629ffd6b1ce1e421ccc824df26099e Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 1 23:48:33 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 1 23:51:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20f6701 sys-fs/cryfs: x86 stable (bug #689034) Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index b305bf454db..54a1c3c354d 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]] ; then 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" + KEYWORDS="~amd64 ~arm ~arm64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: bdc5fe9844e7008398befa52f8187849d9014b7d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 31 20:41:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 1 08:53:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc5fe98 sys-fs/cryfs: Disable hanging tests Closes: https://bugs.gentoo.org/699044 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.10.2.ebuild | 11 ++- sys-fs/cryfs/cryfs-.ebuild | 11 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 56ffbdfc545..b305bf454db 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -57,6 +57,10 @@ src_prepare() { # 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() { @@ -74,16 +78,13 @@ 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 + # 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 - adddeny /dev/fuse - if [[ -n ${tests_failed[@]} ]] ; then eerror "The following tests failed:" eerror "${tests_failed[@]}" diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index d401918aecc..5cd7961f399 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -53,6 +53,10 @@ src_prepare() { # 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() { @@ -69,16 +73,13 @@ 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 + # 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 - adddeny /dev/fuse - if [[ -n ${tests_failed[@]} ]] ; then eerror "The following tests failed:" eerror "${tests_failed[@]}"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: d40770ae848b72096491ed82797ec7e22c43571e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 26 21:14:26 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 26 21:14:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40770ae sys-fs/cryfs: Revbump to make sure to resolve nicely Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/{cryfs-0.9.9.ebuild => cryfs-0.9.9-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild similarity index 100% rename from sys-fs/cryfs/cryfs-0.9.9.ebuild rename to sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ea15f6e53ae58b4f7144ad127f6f24b6e46512fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 26 21:05:58 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 26 21:06:39 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea15f6e5 sys-fs/cryfs: Pin to sys-fs/fuse slot 0 Closes: https://bugs.gentoo.org/673668 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 61780cc28cc..d3e493e3ecb 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -30,7 +30,7 @@ fi RDEPEND=">=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= - >=sys-fs/fuse-2.8.6:= + >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ef111452b8fc7243d3a69e51bcc396498a01a50f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 26 20:07:22 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 26 20:15:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef111452 sys-fs/cryfs: Revert "Add upper bound on boost-1.70" It appears to build just fine against boost-1.71.0. This reverts commit 4f8c83514f1d7664bcccdba3d8ffd3de7ef5325b. Bug: https://bugs.gentoo.org/690324 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 6410d2cde5d..61780cc28cc 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -27,7 +27,7 @@ else S="${WORKDIR}" fi -RDEPEND="=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:=
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 7ec5affdc707863c7ca84720fe75ed45cb730085 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 18:08:53 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec5affd sys-fs/cryfs: EAPI-7 bump, python3_7 Disable CRYFS_UPDATE_CHECKS Drop dev-libs/crypto++, 8.2 is bundled upstream Fix sys-fs/fuse SLOT, bug 673668 Raise dev-libs/boost minimum dep to >=1.65.1 Sync KEYWORDS from latest release Update LICENSE, bundled scrypt was dropped, add Boost-1.0 for crypto++ Bug: https://bugs.gentoo.org/673668 Thanks-to: Alex deBeus gmail.com> Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-.ebuild | 65 +++--- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index a40f623dfb9..81dc60b0bcd 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -1,40 +1,41 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) +EAPI=7 -inherit cmake-utils python-any-r1 flag-o-matic +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +inherit cmake-utils flag-o-matic python-any-r1 -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -SLOT=0 -IUSE="custom-optimization debug libressl test update-check" - -LICENSE="LGPL-3 BSD-2 MIT" -# cryfs - LGPL-3 -# scrypt - BSD-2 -# spdlog - MIT - -if [[ "${PV}" == ]] ; then +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 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}" fi -RDEPEND=">=dev-libs/boost-1.56:= - >=dev-libs/crypto++-5.6.3:= +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/; + +# cryfs - LGPL-3 +# spdlog - MIT +# crypto++ - Boost-1.0 +LICENSE="LGPL-3 MIT Boost-1.0" +SLOT="0" +IUSE="custom-optimization debug libressl test" + +RDEPEND=" + >=dev-libs/boost-1.65.1:= net-misc/curl:= - >=sys-fs/fuse-2.8.6:= + >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" + libressl? ( dev-libs/libressl:= ) +" DEPEND="${RDEPEND} - ${PYTHON_DEPS}" + ${PYTHON_DEPS} +" src_prepare() { cmake-utils_src_prepare @@ -48,15 +49,11 @@ src_prepare() { } src_configure() { - # upstream restricts installing files to Release configuration - # (CMAKE_BUILD_TYPE does not affect anything else) - local CMAKE_BUILD_TYPE - local -a mycmakeargs - CMAKE_BUILD_TYPE=Release - mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" - "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" - "-DBUILD_TESTING=$(usex test)" + local mycmakeargs=( + -DBoost_USE_STATIC_LIBS=OFF + -DCRYFS_UPDATE_CHECKS=OFF + -DBUILD_SHARED_LIBS=OFF + -DBUILD_TESTING=$(usex test) ) use custom-optimization || append-flags -O3 @@ -64,12 +61,10 @@ src_configure() { } src_test() { - local TMPDIR - TMPDIR="${T}" + local TMPDIR="${T}" addread /dev/fuse addwrite /dev/fuse - local -a tests_failed - tests_failed=() + 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}" )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 82edda722cbfdcdb1e5448087a833695954e9dae Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 19:07:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82edda72 sys-fs/cryfs: Drop 0.9.7 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/Manifest | 2 - sys-fs/cryfs/cryfs-0.9.7.ebuild | 86 - 2 files changed, 88 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 3889148971d..ff47d4c0067 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,3 +1 @@ -DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 -DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild deleted file mode 100644 index fa5832c7cd9..000 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) - -inherit cmake-utils python-any-r1 - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -SLOT=0 -IUSE="libressl test update-check" - -LICENSE="LGPL-3 BSD-2 MIT" -# cryfs - LGPL-3 -# scrypt - BSD-2 -# spdlog - MIT - -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 - https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; - KEYWORDS="amd64 ~arm x86" - S="${WORKDIR}" -fi - -RDEPEND=">=dev-libs/boost-1.56:= - >=dev-libs/crypto++-5.6.3:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -PATCHES=( "${WORKDIR}/${P}-spdlog.patch" ) - -# tests work, but let install fail -# revisit with 0.9.8 version bump. -RESTRICT="test" - -src_prepare() { - cmake-utils_src_prepare - - # remove tests that require internet access to comply with Gentoo policy - sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die - - # remove non-applicable warning - sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die -} - -src_configure() { - # upstream restricts installing files to Release configuration - # (CMAKE_BUILD_TYPE does not affect anything else) - local CMAKE_BUILD_TYPE=Release - local mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" - "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" - "-DBUILD_TESTING=$(usex test)" - ) - - 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 -}
[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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: ab971009926b4f69c8864993c31bafe7064a601c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 18:01:00 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab971009 sys-fs/cryfs: Manually install manpage, don't compress/uncompress Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 0162f8ddc28..a40f623dfb9 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -39,6 +39,9 @@ DEPEND="${RDEPEND} 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 @@ -85,7 +88,6 @@ src_install() { # work around upstream issue with cmake not creating install target # in Makefile if we enable BUILD_TESTING dobin "${BUILD_DIR}/src/cryfs-cli/cryfs" - gzip -cd "${BUILD_DIR}/doc/cryfs.1.gz" > "${T}/cryfs.1" || die - doman "${T}/cryfs.1" + doman doc/man/cryfs.1 einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: a5ee2ff0859c29312d43d35fa2386fda8c3ca8f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 17:55:07 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ee2ff0 sys-fs/cryfs: Add USE debug cmake-utils.eclass will add -DNDEBUG which makes one sed obsolete. Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-.ebuild | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 12a15789f0d..0162f8ddc28 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" HOMEPAGE="https://www.cryfs.org/; SLOT=0 -IUSE="custom-optimization libressl test update-check" +IUSE="custom-optimization debug libressl test update-check" LICENSE="LGPL-3 BSD-2 MIT" # cryfs - LGPL-3 @@ -40,10 +40,8 @@ src_prepare() { cmake-utils_src_prepare # remove tests that require internet access to comply with Gentoo policy - sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die - - # remove non-applicable warning - sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die + sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \ + -i test/cpp-utils/CMakeLists.txt || die } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: cdb9958212931adc465934e7694a855f117ec525 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 18:21:01 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb99582 sys-fs/cryfs: Add linux-info for CONFIG_FUSE_FS check Thanks-to: Yury Martynov linxon.ru> Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-.ebuild | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 81dc60b0bcd..d401918aecc 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils flag-o-matic python-any-r1 +inherit cmake-utils flag-o-matic linux-info python-any-r1 if [[ ${PV} == ]] ; then inherit git-r3 @@ -37,6 +37,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} " +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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 4f8c83514f1d7664bcccdba3d8ffd3de7ef5325b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 16 19:09:44 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:57:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8c8351 sys-fs/cryfs: Add upper bound on boost-1.70 Bug: https://bugs.gentoo.org/678572 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 61780cc28cc..6410d2cde5d 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -27,7 +27,7 @@ else S="${WORKDIR}" fi -RDEPEND=">=dev-libs/boost-1.56:= +RDEPEND="=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:=
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: a09be1b4b06640da9e16961efdc7141961ff8c92 Author: Aaron Bauman gentoo org> AuthorDate: Tue May 28 02:29:39 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Tue May 28 02:35:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09be1b4 sys-fs/cryfs: arm64 stable Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.12 RepoMan-Options: --include-arches="arm64" sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 73f1da161ea..61780cc28cc 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then 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" + KEYWORDS="amd64 ~arm arm64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: b6ec50da55616df4a243dcf683e859f5ec500ab2 Author: Roy Bamford gentoo org> AuthorDate: Mon Feb 18 11:09:48 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 19 18:04:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ec50da sys-fs/cryfs: added ~arm64 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Roy Bamford gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> sys-fs/cryfs/cryfs-0.9.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 9c4d393486a..4140cf41b08 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then 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 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: af5dda9bed27a812a02d77425f03bcce127d765f Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Sep 24 01:49:23 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Sep 24 01:49:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5dda9b sys-fs/cryfs: x86 stable (bug #666336) Package-Manager: Portage-2.3.49, Repoman-2.3.10 sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 9891e7645f1..9c4d393486a 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then 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 ~x86" + KEYWORDS="amd64 ~arm x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 1a5f252feb04b230d5b9f9e8c1f24b4e7b7591ba Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 16 17:50:55 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 16 17:50:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5f252f sys-fs/cryfs: amd64 stable wrt bug #666336 Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-fs/cryfs/cryfs-0.9.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 6501bc524ca..9891e7645f1 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then 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 ~x86" + KEYWORDS="amd64 ~arm ~x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 4711906580f34d5726060a07460238b8e4f4b686 Author: Mike Gilbert gentoo org> AuthorDate: Sat Aug 11 17:03:05 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Aug 11 17:03:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47119065 sys-fs/cryfs: always use emake Bug: https://bugs.gentoo.org/634392 Package-Manager: Portage-2.3.45_p0_p305925, Repoman-2.3.10_p30_p305925 sys-fs/cryfs/cryfs-0.9.7.ebuild | 1 + sys-fs/cryfs/cryfs-0.9.9.ebuild | 1 + sys-fs/cryfs/cryfs-.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 093fb5152d9..9731773b949 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +CMAKE_MAKEFILE_GENERATOR=emake PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) inherit cmake-utils python-any-r1 diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild index 3e5dfe1b37b..6501bc524ca 100644 --- a/sys-fs/cryfs/cryfs-0.9.9.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +CMAKE_MAKEFILE_GENERATOR=emake PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) inherit cmake-utils python-any-r1 flag-o-matic diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 3e5dfe1b37b..6501bc524ca 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +CMAKE_MAKEFILE_GENERATOR=emake PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) inherit cmake-utils python-any-r1 flag-o-matic
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: e5940ff991028cfdb04a615d43ee622e956899ce Author: automorphism88 gmail com> AuthorDate: Tue Mar 27 17:35:21 2018 + Commit: Patrice Clement gentoo org> CommitDate: Wed Apr 11 22:47:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5940ff9 sys-fs/cryfs: version bump to 0.9.9. Closes: https://github.com/gentoo/gentoo/pull/7659 sys-fs/cryfs/Manifest | 1 + .../{cryfs-.ebuild => cryfs-0.9.9.ebuild} | 32 -- sys-fs/cryfs/cryfs-.ebuild | 32 -- sys-fs/cryfs/metadata.xml | 1 + 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 0dd4c3b50f0..3889148971d 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,2 +1,3 @@ DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b +DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild similarity index 71% copy from sys-fs/cryfs/cryfs-.ebuild copy to sys-fs/cryfs/cryfs-0.9.9.ebuild index 3689ed8b7db..3e5dfe1b37b 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit cmake-utils python-any-r1 +inherit cmake-utils python-any-r1 flag-o-matic DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" HOMEPAGE="https://www.cryfs.org/; SLOT=0 -IUSE="libressl test update-check" +IUSE="custom-optimization libressl test update-check" LICENSE="LGPL-3 BSD-2 MIT" # cryfs - LGPL-3 @@ -22,7 +22,7 @@ if [[ "${PV}" == ]] ; then EGIT_REPO_URI="https://github.com/cryfs/cryfs; else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~x86" S="${WORKDIR}" fi @@ -48,21 +48,26 @@ src_prepare() { src_configure() { # upstream restricts installing files to Release configuration # (CMAKE_BUILD_TYPE does not affect anything else) - local CMAKE_BUILD_TYPE=Release - local mycmakeargs=( + local CMAKE_BUILD_TYPE + local -a mycmakeargs + CMAKE_BUILD_TYPE=Release + mycmakeargs=( "-DBoost_USE_STATIC_LIBS=off" "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" "-DBUILD_TESTING=$(usex test)" ) + use custom-optimization || append-flags -O3 cmake-utils_src_configure } src_test() { - local TMPDIR="${T}" + local TMPDIR + TMPDIR="${T}" addread /dev/fuse addwrite /dev/fuse - local tests_failed=() + local -a tests_failed + 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}" ) @@ -72,7 +77,16 @@ src_test() { if [[ -n ${tests_failed[@]} ]] ; then eerror "The following tests failed:" - eerror "$tests_failed[@]" + eerror "${tests_failed[@]}" die "At least one test failed" fi } + +src_install() { + # work around upstream issue with cmake not creating install target + # in Makefile if we enable BUILD_TESTING + dobin "${BUILD_DIR}/src/cryfs-cli/cryfs" + gzip -cd "${BUILD_DIR}/doc/cryfs.1.gz" > "${T}/cryfs.1" || die + doman "${T}/cryfs.1" + einstalldocs +} diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 3689ed8b7db..3e5dfe1b37b 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 092b4e5f3e114b48562ea7ef5510fbac2e4a5afe Author: Markus Meier gentoo org> AuthorDate: Thu Mar 15 20:16:35 2018 + Commit: Markus Meier gentoo org> CommitDate: Thu Mar 15 20:16:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092b4e5f sys-fs/cryfs: add ~arm, bug #633882 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="arm" sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 334af780fba..093fb5152d9 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 1b0e9de32f5982ddec26ac7c0cfb56bfb189a83f Author: Michael Palimaka gentoo org> AuthorDate: Sun Jan 21 05:02:46 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jan 21 05:03:19 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0e9de3 sys-fs/cryfs: stabilise 0.9.7 for x86 Bug: https://bugs.gentoo.org/644722 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 0c24d0a7e63..334af780fba 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 5cea370fed6335eac0710926f8b832180683b579 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Jan 18 16:07:02 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Jan 18 16:07:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cea370f sys-fs/cryfs: amd64 stable wrt bug #644722 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index edb997aab25..0c24d0a7e63 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == ]] ; then else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 94ca302243dd9225c904971ddd149a4239c126d9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 17 10:49:15 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 17 10:49:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ca3022 sys-fs/cryfs: RESTRICT=test for 0.9.7 We know they work, but the build system screws up install. Task for 0.9.8 version bump. Closes: https://bugs.gentoo.org/644836 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-fs/cryfs/cryfs-0.9.7.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index a8e370eff00..edb997aab25 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,6 +38,10 @@ DEPEND="${RDEPEND} PATCHES=( "${WORKDIR}/${P}-spdlog.patch" ) +# tests work, but let install fail +# revisit with 0.9.8 version bump. +RESTRICT="test" + src_prepare() { cmake-utils_src_prepare
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 3f3cbd0450b9aeb2ebfc1c5719545ca70b88780c Author: Johannes Huber gentoo org> AuthorDate: Wed Oct 11 18:07:03 2017 + Commit: Johannes Huber gentoo org> CommitDate: Wed Oct 11 19:15:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3cbd04 sys-fs/cryfs: Fix build Adds upstream patch to update internal copy of spdlog. Reported-by: Toralf Förster gentoo.org> Thanks-to: Jerzy Kołosowski kolosowscy.pl> Closes: https://bugs.gentoo.org/619602 Package-Manager: Portage-2.3.11, Repoman-2.3.3 sys-fs/cryfs/Manifest | 1 + sys-fs/cryfs/cryfs-0.9.7.ebuild | 9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 476a301fd0c..92d692c7af8 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1 +1,2 @@ +DIST cryfs-0.9.7-spdlog.patch.xz 28204 SHA256 8b88dd29c16edde13cb421778a927d46822e79d9f8031f0da80fd3375798cc44 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 WHIRLPOOL 5b5255b54fae22b9426811879ef83e61b82eaac627cc9bb03b136765de62828760124bc7136f9b948704a2ffbc7f7fe3febe7b7dcb075901b556abadb5bae9bd DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19 diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index cc9eea2b0e7..a275fa9d2e7 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -23,7 +23,8 @@ if [[ "${PV}" == ]] ; then SRC_URI="" KEYWORDS="" else - SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; + SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz + https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; KEYWORDS="~amd64 ~x86" S="${WORKDIR}" fi @@ -36,14 +37,16 @@ RDEPEND=">=dev-libs/boost-1.56:= DEPEND="${RDEPEND} ${PYTHON_DEPS}" +PATCHES=( "${WORKDIR}/${P}-spdlog.patch" ) + src_prepare() { + cmake-utils_src_prepare + # remove tests that require internet access to comply with Gentoo policy sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die # remove non-applicable warning sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die - - cmake-utils_src_prepare } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: dd513e00cf08b21901d657f361a20a3448717bb7 Author: Johannes Huber gentoo org> AuthorDate: Wed Oct 11 18:09:02 2017 + Commit: Johannes Huber gentoo org> CommitDate: Wed Oct 11 19:15:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd513e00 sys-fs/cryfs: Drop superfluous vars Package-Manager: Portage-2.3.11, Repoman-2.3.3 sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 -- sys-fs/cryfs/cryfs-.ebuild | 6 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index a275fa9d2e7..8ec33b43416 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -20,8 +20,6 @@ LICENSE="LGPL-3 BSD-2 MIT" if [[ "${PV}" == ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/cryfs/cryfs; - SRC_URI="" - KEYWORDS="" else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz; diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index cc9eea2b0e7..f669b893699 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -20,8 +20,6 @@ LICENSE="LGPL-3 BSD-2 MIT" if [[ "${PV}" == ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/cryfs/cryfs; - SRC_URI="" - KEYWORDS="" else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; KEYWORDS="~amd64 ~x86" @@ -37,13 +35,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS}" src_prepare() { + cmake-utils_src_prepare + # remove tests that require internet access to comply with Gentoo policy sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die # remove non-applicable warning sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die - - cmake-utils_src_prepare } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: dc601d267fa6bed2b3f6657464043ba1fcffa6dc Author: Johannes Huber gentoo org> AuthorDate: Wed Oct 11 19:11:31 2017 + Commit: Johannes Huber gentoo org> CommitDate: Wed Oct 11 19:15:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc601d26 sys-fs/cryfs: Add libressl support Reported-by: Johannes Hirte datenkhaos.de> Closes: https://bugs.gentoo.org/631014 Package-Manager: Portage-2.3.11, Repoman-2.3.3 sys-fs/cryfs/cryfs-0.9.7.ebuild | 5 +++-- sys-fs/cryfs/cryfs-.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 8ec33b43416..a8e370eff00 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" HOMEPAGE="https://www.cryfs.org/; SLOT=0 -IUSE="test update-check" +IUSE="libressl test update-check" LICENSE="LGPL-3 BSD-2 MIT" # cryfs - LGPL-3 @@ -31,7 +31,8 @@ RDEPEND=">=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= - dev-libs/openssl:0=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= )" DEPEND="${RDEPEND} ${PYTHON_DEPS}" diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index f669b893699..3689ed8b7db 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" HOMEPAGE="https://www.cryfs.org/; SLOT=0 -IUSE="test update-check" +IUSE="libressl test update-check" LICENSE="LGPL-3 BSD-2 MIT" # cryfs - LGPL-3 @@ -30,7 +30,8 @@ RDEPEND=">=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= - dev-libs/openssl:0=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= )" DEPEND="${RDEPEND} ${PYTHON_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 1fb5c82d7099477affb6b584c589da11c8f48195 Author: automorphism88 gmail com> AuthorDate: Fri May 26 17:49:47 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat May 27 13:48:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb5c82d sys-fs/cryfs: Added ~x86 keyword sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 +- sys-fs/cryfs/cryfs-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 1f52af3e6b4..d0bef5d4f3d 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -24,7 +24,7 @@ if [[ "${PV}" == ]] ; then KEYWORDS="" else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}" fi diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index 1f52af3e6b4..d0bef5d4f3d 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -24,7 +24,7 @@ if [[ "${PV}" == ]] ; then KEYWORDS="" else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}" fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 5af88e69ef3826b61570fcd49368cfc229fc0524 Author: automorphism88 gmail com> AuthorDate: Fri May 26 18:08:24 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat May 27 13:48:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af88e69 sys-fs/cryfs: Fix inapplicable performance warning Closes: https://github.com/gentoo/gentoo/pull/4772 sys-fs/cryfs/cryfs-0.9.7.ebuild | 3 +++ sys-fs/cryfs/cryfs-.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index d0bef5d4f3d..cc9eea2b0e7 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -40,6 +40,9 @@ src_prepare() { # remove tests that require internet access to comply with Gentoo policy sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + # remove non-applicable warning + sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die + cmake-utils_src_prepare } diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild index d0bef5d4f3d..cc9eea2b0e7 100644 --- a/sys-fs/cryfs/cryfs-.ebuild +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -40,6 +40,9 @@ src_prepare() { # remove tests that require internet access to comply with Gentoo policy sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + # remove non-applicable warning + sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die + cmake-utils_src_prepare }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 4ae0218825519003d6651d4ff7333d9fde60b872 Author: automorphism88 gmail com> AuthorDate: Sun May 14 04:49:18 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 17:12:15 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae02188 sys-fs/cryfs: New package, #612688 Closes: https://github.com/gentoo/gentoo/pull/4624 sys-fs/cryfs/Manifest | 1 + sys-fs/cryfs/cryfs-0.9.7.ebuild | 76 + sys-fs/cryfs/cryfs-.ebuild | 76 + sys-fs/cryfs/metadata.xml | 14 4 files changed, 167 insertions(+) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest new file mode 100644 index 000..476a301fd0c --- /dev/null +++ b/sys-fs/cryfs/Manifest @@ -0,0 +1 @@ +DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19 diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild new file mode 100644 index 000..1f52af3e6b4 --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit cmake-utils python-any-r1 + +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/; + +SLOT=0 +IUSE="test update-check" + +LICENSE="LGPL-3 BSD-2 MIT" +# cryfs - LGPL-3 +# scrypt - BSD-2 +# spdlog - MIT + +if [[ "${PV}" == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cryfs/cryfs; + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; + KEYWORDS="~amd64" + S="${WORKDIR}" +fi + +RDEPEND=">=dev-libs/boost-1.56:= + >=dev-libs/crypto++-5.6.3:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +src_prepare() { + # remove tests that require internet access to comply with Gentoo policy + sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + # upstream restricts installing files to Release configuration + # (CMAKE_BUILD_TYPE does not affect anything else) + local CMAKE_BUILD_TYPE=Release + local mycmakeargs=( + "-DBoost_USE_STATIC_LIBS=off" + "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" + "-DBUILD_TESTING=$(usex test)" + ) + + 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 +} diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild new file mode 100644 index 000..1f52af3e6b4 --- /dev/null +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit cmake-utils python-any-r1 + +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/; + +SLOT=0 +IUSE="test update-check" + +LICENSE="LGPL-3 BSD-2 MIT" +# cryfs - LGPL-3 +# scrypt - BSD-2 +# spdlog - MIT + +if [[ "${PV}" == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cryfs/cryfs; + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; + KEYWORDS="~amd64" + S="${WORKDIR}" +fi + +RDEPEND=">=dev-libs/boost-1.56:= + >=dev-libs/crypto++-5.6.3:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +src_prepare() { + # remove tests that require internet access to comply with Gentoo policy + sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + # upstream restricts installing files to
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: d7ea6242b789efd4b30d889c26e6df0280500945 Author: Michał Górny gentoo org> AuthorDate: Wed May 24 17:07:23 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 17:07:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ea6242 sys-fs/cryfs: Revert "New package, #612688" Accidentally merged an older version. Will recommit. sys-fs/cryfs/Manifest | 1 - sys-fs/cryfs/cryfs-0.9.7.ebuild | 78 - sys-fs/cryfs/cryfs-.ebuild | 78 - sys-fs/cryfs/metadata.xml | 14 4 files changed, 171 deletions(-) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest deleted file mode 100644 index 476a301fd0c..000 --- a/sys-fs/cryfs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19 diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild deleted file mode 100644 index 7d375df40b9..000 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit cmake-utils python-any-r1 - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -SLOT=0 -IUSE="test update-check" - -LICENSE="LGPL-3 BSD-2 MIT" -# cryfs - LGPL-3 -# scrypt - BSD-2 -# spdlog - MIT - -if [[ "${PV}" == ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cryfs/cryfs; - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; - KEYWORDS="~amd64" - S="${WORKDIR}" -fi - -RDEPEND=">=dev-libs/boost-1.56:= - >=dev-libs/crypto++-5.6.3:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:= - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -src_prepare() { - # remove tests that require internet access to comply with Gentoo policy - sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" - "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" - "-DBUILD_TESTING=$(usex test)" - ) - - 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() { - dobin "${BUILD_DIR}"/src/cryfs-cli/cryfs - cmake-utils_src_install -} diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild deleted file mode 100644 index 7d375df40b9..000 --- a/sys-fs/cryfs/cryfs-.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit cmake-utils python-any-r1 - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/; - -SLOT=0 -IUSE="test update-check" - -LICENSE="LGPL-3 BSD-2 MIT" -# cryfs - LGPL-3 -# scrypt - BSD-2 -# spdlog - MIT - -if [[ "${PV}" == ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cryfs/cryfs; - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; - KEYWORDS="~amd64" - S="${WORKDIR}" -fi - -RDEPEND=">=dev-libs/boost-1.56:= - >=dev-libs/crypto++-5.6.3:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:= - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -src_prepare() { - # remove tests that require internet access to comply with Gentoo policy - sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" -
[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
commit: 8918831f63e23745eb9bdabef36efad07af4c313 Author: automorphism88 gmail com> AuthorDate: Sun May 14 04:49:18 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 17:04:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8918831f sys-fs/cryfs: New package, #612688 Closes: https://github.com/gentoo/gentoo/pull/4624 sys-fs/cryfs/Manifest | 1 + sys-fs/cryfs/cryfs-0.9.7.ebuild | 78 + sys-fs/cryfs/cryfs-.ebuild | 78 + sys-fs/cryfs/metadata.xml | 14 4 files changed, 171 insertions(+) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest new file mode 100644 index 000..476a301fd0c --- /dev/null +++ b/sys-fs/cryfs/Manifest @@ -0,0 +1 @@ +DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19 diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild new file mode 100644 index 000..7d375df40b9 --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit cmake-utils python-any-r1 + +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/; + +SLOT=0 +IUSE="test update-check" + +LICENSE="LGPL-3 BSD-2 MIT" +# cryfs - LGPL-3 +# scrypt - BSD-2 +# spdlog - MIT + +if [[ "${PV}" == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cryfs/cryfs; + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; + KEYWORDS="~amd64" + S="${WORKDIR}" +fi + +RDEPEND=">=dev-libs/boost-1.56:= + >=dev-libs/crypto++-5.6.3:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +src_prepare() { + # remove tests that require internet access to comply with Gentoo policy + sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DBoost_USE_STATIC_LIBS=off" + "-DCRYFS_UPDATE_CHECKS=$(usex update-check)" + "-DBUILD_TESTING=$(usex test)" + ) + + 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() { + dobin "${BUILD_DIR}"/src/cryfs-cli/cryfs + cmake-utils_src_install +} diff --git a/sys-fs/cryfs/cryfs-.ebuild b/sys-fs/cryfs/cryfs-.ebuild new file mode 100644 index 000..7d375df40b9 --- /dev/null +++ b/sys-fs/cryfs/cryfs-.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit cmake-utils python-any-r1 + +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/; + +SLOT=0 +IUSE="test update-check" + +LICENSE="LGPL-3 BSD-2 MIT" +# cryfs - LGPL-3 +# scrypt - BSD-2 +# spdlog - MIT + +if [[ "${PV}" == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cryfs/cryfs; + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz; + KEYWORDS="~amd64" + S="${WORKDIR}" +fi + +RDEPEND=">=dev-libs/boost-1.56:= + >=dev-libs/crypto++-5.6.3:= + net-misc/curl:= + >=sys-fs/fuse-2.8.6:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +src_prepare() { + # remove tests that require internet access to comply with Gentoo policy + sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DBoost_USE_STATIC_LIBS=off" + "-DCRYFS_UPDATE_CHECKS=$(usex