diff options
Diffstat (limited to 'sys-fs')
24 files changed, 95 insertions, 1110 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 2671e2fb39de..3e52edec394b 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest index 629c997ebfc0..fad034f0bead 100644 --- a/sys-fs/bashmount/Manifest +++ b/sys-fs/bashmount/Manifest @@ -1,3 +1,4 @@ DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062 EBUILD bashmount-4.3.2-r1.ebuild 617 BLAKE2B c03165b40a492feb0ab5fb0600fb58594a361dc452d966ed0f23823cc38a9166be509e83399161700a1536f6190e40b12b5ad5929d81e46332f598bf44f7923b SHA512 f044eed2a7762dbfa649859301ccfeef0e65784d3b5082bf970402d782c11b3f799a1d7373b9661b7461c3b50c0f577b3b8dfe5bd58ed2dcc6f391212ac8e966 +EBUILD bashmount-4.3.2-r2.ebuild 620 BLAKE2B 768d905023dfc299b984305983ece75656ad1a77c64d054c68c9fb8de9fc64e91b15bb7159ae31494496d21d9b939b2dcdceeb8dad14638a9205da3826a86c33 SHA512 69fd195314574b3ab12ebf996bb8c611cc9c2f7ca00c3c7aa586db81628d927be574a2bb437b35bcbb0d38c66b677b94aafc5bf98915aa5b06f48205f5659ef1 MISC metadata.xml 327 BLAKE2B 8cac6be6f6e1547ec7db00b20b3c5b050c14983f0f1c6cdc2589584db58dceef0801563e32ea07b9486557666c9d5cd8e9f0fe1640e585612830f728eb9ab77b SHA512 6f2d50b1abe2e4997f65d7e1616bc3e4e6bd76aea7a5e0d9a52cfd59500b3d4b8e8ef67dcfc14436b9cc00abbffcddadc5f57f1afce774f654d873a5c3c88466 diff --git a/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild new file mode 100644 index 000000000000..834ce078e693 --- /dev/null +++ b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI" +HOMEPAGE="https://github.com/jamielinux/bashmount" +SRC_URI="https://github.com/jamielinux/bashmount/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +# sys-apps/util-linux -> lsblk +RDEPEND=" + app-shells/bash:* + sys-apps/dbus + sys-apps/util-linux + sys-fs/udisks:2 +" +DEPEND="${RDEPEND}" + +src_install() { + dobin ${PN} + insinto /etc + doins ${PN}.conf + doman ${PN}.1 + dodoc NEWS +} diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest index 786d12f829f3..1666cb25b197 100644 --- a/sys-fs/clamfs/Manifest +++ b/sys-fs/clamfs/Manifest @@ -1,7 +1,5 @@ AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6 -DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626 DIST clamfs-1.3.0.tar.gz 229989 BLAKE2B 05327d8b6fbe7073c5bd70104282a32009f06556fd61267931f4d841378318e29bb1fc7157da6b5ebce80dda35484f5bc2af71fcecdb3739a4dd28507c767054 SHA512 81c234ec631abd49d9a6b940ef727a1eae048b7be12be6082ec176ed4045fcd92d35d1264e7fd48906786af7c07696139fd5bfa0a302fba7ebb2c528315857a1 -EBUILD clamfs-1.2.0.ebuild 877 BLAKE2B d1c3ccb6e696591fe76dd8385d5f78cc426bf22ee28aa05530664c2d08e37f57421ef672cb126e52a6344d54c3ba5e7f4797c90367de36f7892ca6456740fbc8 SHA512 95a76dc81a18faff1f614c264f2933c48a7e2b1bfd8eb702ef4927936372128f0de2a9ca92517d7918573bb4949fa03b491468c81a611575032fa6cf5852a6d2 EBUILD clamfs-1.3.0.ebuild 878 BLAKE2B 87b1c2acda4e6cce8e0b46001ca8b5c585d7e0a066a3d71daf7edb48544d14b65d3ee8cbb60a8ab693d2426f13006139b6e526365765a9838d9908c778fa0e9d SHA512 06e02c1a0394a82404778ccb79ade7c62f9af40da4013057e2ad0a342254e5cb09be2f9ace69757bb4f68730b387f72088bfb66eabf7322eb039cc8515857b85 MISC metadata.xml 563 BLAKE2B 37867dfdb271dde04f1d5b29a78696d792ca429ba7bf3daecb9822eea39c5ab80c3fb47deb35064b3b838ad1ee7d60997168e0feb771dc539980fbf412758858 SHA512 c9c582d533d6e9be80d74943649ee8b025517c13d329ff0e977978c89563134466498e30583affb3414e9c40a0f0e9d124d97c171ce9a9795f8ee0adf70dea22 diff --git a/sys-fs/clamfs/clamfs-1.2.0.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild deleted file mode 100644 index 6b8945a4342a..000000000000 --- a/sys-fs/clamfs/clamfs-1.2.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools linux-info - -DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning" -HOMEPAGE="https://github.com/burghardt/clamfs" -SRC_URI="https://github.com/burghardt/clamfs/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-libs/boost - dev-libs/poco - dev-libs/rlog - sys-fs/fuse:3" -RDEPEND="${DEPEND} - app-antivirus/clamav" - -CONFIG_CHECK="~FUSE_FS" - -src_prepare() { - # Do not use Werror ( #754180 ) - sed -i 's/\-Werror//g' configure.ac || die "Sed failed" - default - eautoreconf -} - -src_install() { - default - - insinto /etc/clamfs - doins doc/clamfs.xml - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 2d23feb0764c..d7532e0f9350 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,11 +1,4 @@ -AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680db38359f3e004ca0b08d8caf9ce6febde0cb816000d284696c76df84510f4ab64ee53821cd960311f8b66463ecf36ffdaec0 SHA512 cadf30d9d4228db4da6e5122bf1bb4daefce3ddfb2bc2c2d830d9d10c3d6b368c9dced69fe8675f5d9fda186725e489f819e934310f2a6040911b87b8e1f789d -AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c -AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2 -AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085 -AUX cryfs-0.10.3-gcc13.patch 258 BLAKE2B ca97032f8545c83ba717efc12a3563a8efa8353c478fe600cb94480fc0d358bad0482432283f9192824ba3c444bafba7f9b94109ec20007a687c6fb52303ecf2 SHA512 aaf0dd6698c833598b212c07e6c954d245f20da23a3edc967b0615504d83ea18994e446cf29cd3b5c08590f25bf8c9d4115e164f8ea0472a17ab897793fa2dc1 AUX cryfs-0.11.4-unbundle-vendored-libs.patch 9924 BLAKE2B b4503d9a9f64fc2b0b0cd2dddc22df0227b882e7b1e09447fb3f0c8ef42f137f616121c004f08d512b4d1b28d951bc51379b8abdf8cad57b268831a5f7adb844 SHA512 dc7db5ace13837f2254377b97418b3fe77577fc6dcb6121e3f3b276a10e3644f5315047853f2b3f35f6b3c99b5d726abe22e5c62b4dc470865b24bf587fa79a5 -DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B 3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391 SHA512 a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea -EBUILD cryfs-0.10.3-r1.ebuild 2764 BLAKE2B 926491581856295cc3577ee2e02ae24e7c55fdd4e38ec6c1bd87abab1da07a48a83f9d89a3d97fafbc9c21afccc5160d87fa4bb213bec73ad92c7df773b3dd66 SHA512 b40529a01188897d9b5d977cd3ae8f6dd4db1d9de5aab2c8387169c4af1b31e669e4a1a64eb7e14cd352329f9d4fadae0e00bc4f9d6b7219496e1e4bb343f46e -EBUILD cryfs-0.11.4.ebuild 5741 BLAKE2B 4857f9f79b5a8db3730795fca80732d9b1ceca7fca3ca05882e4860502c44d306af8792c696aff3ebf265db9c5e8b291a00e800cb770ab30f531bee91f1ebcbb SHA512 defe7cc27181ea030c2b62ef14dce7c3861971bc7e2f4a1e9647fff5de64bbd0ea01816347ab93da81eba4b565d67f5a2d3cceb883ed128b1edeb62ea4d1942e +EBUILD cryfs-0.11.4.ebuild 5740 BLAKE2B 8c714b948468892749e70e062cf5480ce0303d34af40143a6df29e84ad2a93190f617e86eb280f4fc3b0627fe760b904cea351305f1add427485f03d261114ab SHA512 513b1720afa151ece26c9d62571d0184b1adcaa42c367714111d70a4580e3c24a89000ce9fa1b13d1569f5c771c4852b54b3e1f786c992566b82b32d5a68409d MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild deleted file mode 100644 index 80309d474e3f..000000000000 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic linux-info python-any-r1 - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cryfs/cryfs" -else - SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - S="${WORKDIR}" -fi - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/" - -LICENSE="LGPL-3 MIT" -SLOT="0" -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:= - >=dev-libs/crypto++-8.2.0:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - dev-libs/openssl:= -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/versioneer[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - # TODO upstream: - "${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch" - "${FILESDIR}/${PN}-0.10.2-install-targets.patch" - "${FILESDIR}/${PN}-0.10.3-gcc13.patch" - # From upstream - "${FILESDIR}/${PN}-0.10.3-gcc11.patch" - "${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch" -) - -python_check_deps() { - python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]" -} - -pkg_setup() { - local CONFIG_CHECK="~FUSE_FS" - local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support." - - check_extra_config - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # don't install compressed manpage - cmake_comment_add_subdirectory doc - - # We use the package instead for >=py3.12 compat, bug #908997 - rm src/gitversion/versioneer.py || die - - # remove tests that require internet access to comply with Gentoo policy - sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \ - -i test/cpp-utils/CMakeLists.txt || die - - # /dev/fuse access denied - sed -e "/CliTest_IntegrityCheck/d" \ - -i test/cryfs-cli/CMakeLists.txt || die -} - -src_configure() { - # ODR violations (bug #880563) - filter-lto - - local mycmakeargs=( - -DBoost_USE_STATIC_LIBS=OFF - -DCRYFS_UPDATE_CHECKS=OFF - -DBUILD_SHARED_LIBS=OFF - -DUSE_SYSTEM_LIBS=ON - -DBUILD_TESTING=$(usex test) - ) - - use debug || append-flags -DNDEBUG - - # bug 907096 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - cmake_src_configure -} - -src_test() { - local TMPDIR="${T}" - local tests_failed=() - - # fspp fuse tests hang, bug # 699044 - for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do - "${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" ) - done - - if [[ -n ${tests_failed[@]} ]] ; then - eerror "The following tests failed:" - eerror "${tests_failed[@]}" - die "At least one test failed" - fi -} - -src_install() { - cmake_src_install - doman doc/man/cryfs.1 -} diff --git a/sys-fs/cryfs/cryfs-0.11.4.ebuild b/sys-fs/cryfs/cryfs-0.11.4.ebuild index 061236e9d5d0..367de758b356 100644 --- a/sys-fs/cryfs/cryfs-0.11.4.ebuild +++ b/sys-fs/cryfs/cryfs-0.11.4.ebuild @@ -14,7 +14,7 @@ else https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz " - KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" fi DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" 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 deleted file mode 100644 index 0c666448cc01..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/cryfs/cryfs/pull/396 - -From 18503b00bd16d95dd2cf8a9047446f8be7289082 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 19:35:49 +0200 -Subject: [PATCH 3/3] Don't limit install on Release/Debug/RelWithDebInfo - CONFIGURATIONS - ---- - src/cryfs-cli/CMakeLists.txt | 1 - - src/cryfs-unmount/CMakeLists.txt | 3 +-- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt -index 90edb227..e8c03916 100644 ---- a/src/cryfs-cli/CMakeLists.txt -+++ b/src/cryfs-cli/CMakeLists.txt -@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin) - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) -diff --git a/src/cryfs-unmount/CMakeLists.txt b/src/cryfs-unmount/CMakeLists.txt -index 0a246a7f..c5f096ab 100644 ---- a/src/cryfs-unmount/CMakeLists.txt -+++ b/src/cryfs-unmount/CMakeLists.txt -@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin) - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo -- DESTINATION ${CMAKE_INSTALL_BINDIR} -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.22.0 diff --git a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch b/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch deleted file mode 100644 index 65d72a99ac89..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch +++ /dev/null @@ -1,409 +0,0 @@ -From b78c249ce3e048d481d11347c98a86e6669ff5bb Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 10:59:46 +0200 -Subject: [PATCH 1/3] Add USE_SYSTEM_LIBS option to build without bundled libs - -headers: s/vendor_cryptopp/cryptopp/ - -Only gtest and crypto++ are being unbundled. In release/0.10 branch, -bundled spdlog version is too old for Gentoo to satisfy with system-lib. ---- - CMakeLists.txt | 15 ++++++++++++++- - .../compressing/compressors/Gzip.cpp | 2 +- - src/cpp-utils/CMakeLists.txt | 6 +++++- - src/cpp-utils/crypto/cryptopp_byte.h | 2 +- - src/cpp-utils/crypto/hash/Hash.cpp | 2 +- - src/cpp-utils/crypto/kdf/Scrypt.cpp | 2 +- - src/cpp-utils/crypto/symmetric/CFB_Cipher.h | 2 +- - src/cpp-utils/crypto/symmetric/GCM_Cipher.h | 2 +- - src/cpp-utils/crypto/symmetric/ciphers.h | 10 +++++----- - src/cpp-utils/data/Data.cpp | 2 +- - src/cpp-utils/data/FixedSizeData.h | 2 +- - src/cpp-utils/random/OSRandomGenerator.h | 2 +- - src/cpp-utils/random/RandomGeneratorThread.h | 2 +- - src/cryfs/localstate/BasedirMetadata.cpp | 2 +- - test/blobstore/CMakeLists.txt | 2 +- - test/blockstore/CMakeLists.txt | 2 +- - test/cpp-utils/CMakeLists.txt | 2 +- - test/cryfs-cli/CMakeLists.txt | 2 +- - test/cryfs/CMakeLists.txt | 2 +- - test/cryfs/config/CompatibilityTest.cpp | 2 +- - test/fspp/CMakeLists.txt | 2 +- - test/gitversion/CMakeLists.txt | 2 +- - test/my-gtest-main/CMakeLists.txt | 2 +- - test/parallelaccessstore/CMakeLists.txt | 2 +- - 24 files changed, 45 insertions(+), 28 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdbff715..9797d1ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ require_clang_version(4.0) - option(BUILD_TESTING "build test cases" OFF) - option(CRYFS_UPDATE_CHECKS "let cryfs check for updates and security vulnerabilities" ON) - option(DISABLE_OPENMP "allow building without OpenMP libraries. This will cause performance degradations." OFF) -+option(USE_SYSTEM_LIBS "build with system libs instead of bundled libs" OFF) - - # The following options are helpful for development and/or CI - option(USE_WERROR "build with -Werror flag") -@@ -48,7 +49,19 @@ if(MSVC) - add_definitions(/bigobj) - endif() - --add_subdirectory(vendor EXCLUDE_FROM_ALL) -+if(USE_SYSTEM_LIBS) -+ include(FindPkgConfig) -+ pkg_check_modules(CRYPTOPP REQUIRED libcryptopp>=8.2) -+ add_subdirectory(vendor/spdlog EXCLUDE_FROM_ALL) -+ if(BUILD_TESTING) -+ find_package(GTest CONFIG REQUIRED) -+ set(GOOGLETEST_LIBS GTest::gtest GTest::gmock) -+ endif() -+else() -+ add_subdirectory(vendor EXCLUDE_FROM_ALL) -+ set(GOOGLETEST_LIBS googletest) -+endif() -+ - add_subdirectory(src) - add_subdirectory(doc) - add_subdirectory(test) -diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp b/src/blockstore/implementations/compressing/compressors/Gzip.cpp -index 67b7f49a..64f13e97 100644 ---- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp -+++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp -@@ -1,6 +1,6 @@ - #include "cpp-utils/crypto/cryptopp_byte.h" - #include "Gzip.h" --#include <vendor_cryptopp/gzip.h> -+#include <cryptopp/gzip.h> - - using cpputils::Data; - -diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt -index f66f99f8..b57e02ba 100644 ---- a/src/cpp-utils/CMakeLists.txt -+++ b/src/cpp-utils/CMakeLists.txt -@@ -89,7 +89,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT}) - - target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) - --target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp) -+if(USE_SYSTEM_LIBS) -+ target_link_libraries(${PROJECT_NAME} PUBLIC spdlog ${CRYPTOPP_LIBRARIES}) -+else() -+ target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp) -+endif() - - target_add_boost(${PROJECT_NAME} filesystem system thread chrono) - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/src/cpp-utils/crypto/cryptopp_byte.h b/src/cpp-utils/crypto/cryptopp_byte.h -index e00cf7cf..363990e9 100644 ---- a/src/cpp-utils/crypto/cryptopp_byte.h -+++ b/src/cpp-utils/crypto/cryptopp_byte.h -@@ -2,7 +2,7 @@ - #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - --#include <vendor_cryptopp/cryptlib.h> -+#include <cryptopp/cryptlib.h> - - // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet. - // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP). -diff --git a/src/cpp-utils/crypto/hash/Hash.cpp b/src/cpp-utils/crypto/hash/Hash.cpp -index 696cdeaf..e07d28da 100644 ---- a/src/cpp-utils/crypto/hash/Hash.cpp -+++ b/src/cpp-utils/crypto/hash/Hash.cpp -@@ -1,6 +1,6 @@ - #include "Hash.h" - #include <cpp-utils/random/Random.h> --#include <vendor_cryptopp/sha.h> -+#include <cryptopp/sha.h> - - using cpputils::Random; - using CryptoPP::SHA512; -diff --git a/src/cpp-utils/crypto/kdf/Scrypt.cpp b/src/cpp-utils/crypto/kdf/Scrypt.cpp -index f97d6940..e26db8db 100644 ---- a/src/cpp-utils/crypto/kdf/Scrypt.cpp -+++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp -@@ -1,5 +1,5 @@ - #include "Scrypt.h" --#include <vendor_cryptopp/scrypt.h> -+#include <cryptopp/scrypt.h> - - using std::string; - -diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -index 217111d9..0ea6355c 100644 ---- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -+++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -@@ -7,7 +7,7 @@ - #include "../../data/Data.h" - #include "../../random/Random.h" - #include <boost/optional.hpp> --#include <vendor_cryptopp/modes.h> -+#include <cryptopp/modes.h> - #include "Cipher.h" - #include "EncryptionKey.h" - -diff --git a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -index 87404c8f..385f399f 100644 ---- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -+++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -@@ -6,7 +6,7 @@ - #include "../../data/FixedSizeData.h" - #include "../../data/Data.h" - #include "../../random/Random.h" --#include <vendor_cryptopp/gcm.h> -+#include <cryptopp/gcm.h> - #include "Cipher.h" - #include "EncryptionKey.h" - -diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h b/src/cpp-utils/crypto/symmetric/ciphers.h -index 7a8f8d45..61a6a25a 100644 ---- a/src/cpp-utils/crypto/symmetric/ciphers.h -+++ b/src/cpp-utils/crypto/symmetric/ciphers.h -@@ -2,11 +2,11 @@ - #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - --#include <vendor_cryptopp/aes.h> --#include <vendor_cryptopp/twofish.h> --#include <vendor_cryptopp/serpent.h> --#include <vendor_cryptopp/cast.h> --#include <vendor_cryptopp/mars.h> -+#include <cryptopp/aes.h> -+#include <cryptopp/twofish.h> -+#include <cryptopp/serpent.h> -+#include <cryptopp/cast.h> -+#include <cryptopp/mars.h> - #include "GCM_Cipher.h" - #include "CFB_Cipher.h" - -diff --git a/src/cpp-utils/data/Data.cpp b/src/cpp-utils/data/Data.cpp -index c8a3a25b..3a6d41eb 100644 ---- a/src/cpp-utils/data/Data.cpp -+++ b/src/cpp-utils/data/Data.cpp -@@ -1,6 +1,6 @@ - #include "Data.h" - #include <stdexcept> --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <cpp-utils/crypto/cryptopp_byte.h> - - using std::istream; -diff --git a/src/cpp-utils/data/FixedSizeData.h b/src/cpp-utils/data/FixedSizeData.h -index 832a96ee..e45127a4 100644 ---- a/src/cpp-utils/data/FixedSizeData.h -+++ b/src/cpp-utils/data/FixedSizeData.h -@@ -2,7 +2,7 @@ - #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <string> - #include <cstring> - #include "../assert/assert.h" -diff --git a/src/cpp-utils/random/OSRandomGenerator.h b/src/cpp-utils/random/OSRandomGenerator.h -index 18a8002d..8c8dc6f5 100644 ---- a/src/cpp-utils/random/OSRandomGenerator.h -+++ b/src/cpp-utils/random/OSRandomGenerator.h -@@ -4,7 +4,7 @@ - - #include "cpp-utils/crypto/cryptopp_byte.h" - #include "RandomGenerator.h" --#include <vendor_cryptopp/osrng.h> -+#include <cryptopp/osrng.h> - - namespace cpputils { - class OSRandomGenerator final : public RandomGenerator { -diff --git a/src/cpp-utils/random/RandomGeneratorThread.h b/src/cpp-utils/random/RandomGeneratorThread.h -index 593750ed..103c00d7 100644 ---- a/src/cpp-utils/random/RandomGeneratorThread.h -+++ b/src/cpp-utils/random/RandomGeneratorThread.h -@@ -4,7 +4,7 @@ - - #include "../thread/LoopThread.h" - #include "ThreadsafeRandomDataBuffer.h" --#include <vendor_cryptopp/osrng.h> -+#include <cryptopp/osrng.h> - - namespace cpputils { - //TODO Test -diff --git a/src/cryfs/localstate/BasedirMetadata.cpp b/src/cryfs/localstate/BasedirMetadata.cpp -index d32ced93..3de2d3ad 100644 ---- a/src/cryfs/localstate/BasedirMetadata.cpp -+++ b/src/cryfs/localstate/BasedirMetadata.cpp -@@ -1,7 +1,7 @@ - #include "BasedirMetadata.h" - #include <boost/property_tree/ptree.hpp> - #include <boost/property_tree/json_parser.hpp> --#include <vendor_cryptopp/sha.h> -+#include <cryptopp/sha.h> - #include <boost/filesystem/operations.hpp> - #include "LocalStateDir.h" - #include <cpp-utils/logging/logging.h> -diff --git a/test/blobstore/CMakeLists.txt b/test/blobstore/CMakeLists.txt -index 05e98b8d..342d5626 100644 ---- a/test/blobstore/CMakeLists.txt -+++ b/test/blobstore/CMakeLists.txt -@@ -27,7 +27,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blobstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/blockstore/CMakeLists.txt b/test/blockstore/CMakeLists.txt -index ca63acce..6dc5f505 100644 ---- a/test/blockstore/CMakeLists.txt -+++ b/test/blockstore/CMakeLists.txt -@@ -42,7 +42,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blockstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt -index 02cc9d5d..55f367eb 100644 ---- a/test/cpp-utils/CMakeLists.txt -+++ b/test/cpp-utils/CMakeLists.txt -@@ -70,7 +70,7 @@ target_activate_cpp14(${PROJECT_NAME}_exit_signal) - target_link_libraries(${PROJECT_NAME}_exit_signal cpp-utils) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cpp-utils) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cpp-utils) - add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_exit_status ${PROJECT_NAME}_exit_signal) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - -diff --git a/test/cryfs-cli/CMakeLists.txt b/test/cryfs-cli/CMakeLists.txt -index 2d0b38c5..76fd75bc 100644 ---- a/test/cryfs-cli/CMakeLists.txt -+++ b/test/cryfs-cli/CMakeLists.txt -@@ -16,7 +16,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs-cli cryfs-unmount fspp-fuse) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt -index 77a025f4..71c74310 100644 ---- a/test/cryfs/CMakeLists.txt -+++ b/test/cryfs/CMakeLists.txt -@@ -24,7 +24,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cryfs/config/CompatibilityTest.cpp b/test/cryfs/config/CompatibilityTest.cpp -index 36c1871c..a1d5f22b 100644 ---- a/test/cryfs/config/CompatibilityTest.cpp -+++ b/test/cryfs/config/CompatibilityTest.cpp -@@ -3,7 +3,7 @@ - #include <vector> - #include <boost/filesystem.hpp> - #include <cpp-utils/data/Data.h> --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <cpp-utils/crypto/symmetric/ciphers.h> - #include <cpp-utils/tempfile/TempFile.h> - #include <cryfs/config/CryConfigFile.h> -diff --git a/test/fspp/CMakeLists.txt b/test/fspp/CMakeLists.txt -index dabff1f1..c3949206 100644 ---- a/test/fspp/CMakeLists.txt -+++ b/test/fspp/CMakeLists.txt -@@ -102,7 +102,7 @@ set(SOURCES - testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest fspp-interface fspp-fuse) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} fspp-interface fspp-fuse) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/gitversion/CMakeLists.txt b/test/gitversion/CMakeLists.txt -index 51a5ccc1..396289fa 100644 ---- a/test/gitversion/CMakeLists.txt -+++ b/test/gitversion/CMakeLists.txt -@@ -6,7 +6,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest gitversion) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} gitversion) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/my-gtest-main/CMakeLists.txt b/test/my-gtest-main/CMakeLists.txt -index 1d1e7e08..de4fd107 100644 ---- a/test/my-gtest-main/CMakeLists.txt -+++ b/test/my-gtest-main/CMakeLists.txt -@@ -5,7 +5,7 @@ set(SOURCES - ) - - add_library(${PROJECT_NAME} STATIC ${SOURCES}) --target_link_libraries(${PROJECT_NAME} PUBLIC googletest cpp-utils) -+target_link_libraries(${PROJECT_NAME} PUBLIC ${GOOGLETEST_LIBS} cpp-utils) - target_add_boost(${PROJECT_NAME} filesystem system) - target_include_directories(${PROJECT_NAME} PUBLIC .) - -diff --git a/test/parallelaccessstore/CMakeLists.txt b/test/parallelaccessstore/CMakeLists.txt -index 16170d17..97379304 100644 ---- a/test/parallelaccessstore/CMakeLists.txt -+++ b/test/parallelaccessstore/CMakeLists.txt -@@ -6,7 +6,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest parallelaccessstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} parallelaccessstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) --- -2.22.0 - - -From 6d5b1dd6f040dbdf3e330962a174c91281b19472 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 15:17:16 +0200 -Subject: [PATCH 2/3] Use FeatureSummary - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9797d1ee..9e37b2e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,7 @@ project(cryfs) - - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake-utils) - include(utils) -+include(FeatureSummary) - - require_gcc_version(5.0) - require_clang_version(4.0) -@@ -66,3 +67,5 @@ add_subdirectory(src) - add_subdirectory(doc) - add_subdirectory(test) - add_subdirectory(cpack) -+ -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.22.0 - 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 deleted file mode 100644 index a9252e729fb6..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/cryfs/cryfs/pull/395 - -From dcc072d51d0bbb56c9d8709214ce49f8bd6de73c Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -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 <boost/optional.hpp> - #include <cpp-utils/macros.h> - #include <atomic> -+#include <memory> - #include "stat_compatibility.h" - - namespace fspp { --- -2.32.0 - diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch deleted file mode 100644 index 9a7252ba506b..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch +++ /dev/null @@ -1,271 +0,0 @@ -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 <messmer@cryfs.org> -Date: Sat, 8 May 2021 14:44:27 -0700 -Subject: [PATCH] Fixed an issue when compiling with GCC 11, see - https://github.com/cryfs/cryfs/issues/389 - ---- ---- a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h -+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h -@@ -67,7 +67,7 @@ class DataNodeView final { - - static DataNodeView create(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - ASSERT(serialized.size() == layout.blocksizeBytes(), "Wrong block size"); - auto block = blockStore->create(serialized); - return DataNodeView(std::move(block)); -@@ -75,7 +75,7 @@ class DataNodeView final { - - static DataNodeView initialize(cpputils::unique_ref<blockstore::Block> block, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - ASSERT(data.size() <= DataNodeLayout(block->size()).datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - ASSERT(serialized.size() == block->size(), "Block has wrong size"); - block->write(serialized.data(), 0, serialized.size()); - return DataNodeView(std::move(block)); -@@ -83,7 +83,7 @@ class DataNodeView final { - - static DataNodeView overwrite(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, const blockstore::BlockId &blockId, cpputils::Data data) { - ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - auto block = blockStore->overwrite(blockId, std::move(serialized)); - return DataNodeView(std::move(block)); - } -@@ -143,7 +143,7 @@ class DataNodeView final { - } - - private: -- static cpputils::Data _serialize(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { -+ static cpputils::Data serialize_(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - cpputils::Data result(layout.blocksizeBytes()); - cpputils::serialize<uint16_t>(result.dataOffset(layout.FORMAT_VERSION_OFFSET_BYTES), formatVersion); - cpputils::serialize<uint8_t>(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 { - template<typename DataType> -- size_t _serialize(void* dst, const DataType& obj) { -+ size_t serialize_(void* dst, const DataType& obj) { - cpputils::serialize<DataType>(dst, obj); - return sizeof(DataType); - } - - template<typename DataType> -- DataType _deserialize(const char** src) { -+ DataType deserialize_(const char** src) { - DataType result = cpputils::deserialize<DataType>(*src); - *src += sizeof(DataType); - return result; - } - -- constexpr size_t _serializedTimeValueSize() { -+ constexpr size_t serializedTimeValueSize_() { - return sizeof(uint64_t) + sizeof(uint32_t); - } - -- unsigned int _serializeTimeValue(uint8_t *dest, timespec value) { -+ unsigned int serializeTimeValue_(uint8_t *dest, timespec value) { - unsigned int offset = 0; -- offset += _serialize<uint64_t>(dest + offset, value.tv_sec); -- offset += _serialize<uint32_t>(dest + offset, value.tv_nsec); -- ASSERT(offset == _serializedTimeValueSize(), "serialized to wrong size"); -+ offset += serialize_<uint64_t>(dest + offset, value.tv_sec); -+ offset += serialize_<uint32_t>(dest + offset, value.tv_nsec); -+ ASSERT(offset == serializedTimeValueSize_(), "serialized to wrong size"); - return offset; - } - -- timespec _deserializeTimeValue(const char **pos) { -+ timespec deserializeTimeValue_(const char **pos) { - timespec value{}; -- value.tv_sec = _deserialize<uint64_t>(pos); -- value.tv_nsec = _deserialize<uint32_t>(pos); -+ value.tv_sec = deserialize_<uint64_t>(pos); -+ value.tv_nsec = deserialize_<uint32_t>(pos); - return value; - } - -- unsigned int _serializeString(uint8_t *dest, const string &value) { -+ unsigned int serializeString_(uint8_t *dest, const string &value) { - std::memcpy(dest, value.c_str(), value.size()+1); - return value.size() + 1; - } - -- string _deserializeString(const char **pos) { -+ string deserializeString_(const char **pos) { - size_t length = strlen(*pos); - string value(*pos, length); - *pos += length + 1; - return value; - } - -- unsigned int _serializeBlockId(uint8_t *dest, const BlockId &blockId) { -+ unsigned int serializeBlockId_(uint8_t *dest, const BlockId &blockId) { - blockId.ToBinary(dest); - return blockId.BINARY_LENGTH; - } - -- BlockId _deserializeBlockId(const char **pos) { -+ BlockId deserializeBlockId_(const char **pos) { - BlockId blockId = BlockId::FromBinary(*pos); - *pos += BlockId::BINARY_LENGTH; - return blockId; -@@ -75,35 +75,35 @@ namespace cryfs { - _mode.hasDirFlag()) + ", " + std::to_string(_mode.hasSymlinkFlag()) + ", " + std::to_string(static_cast<uint8_t>(_type)) - ); - unsigned int offset = 0; -- offset += _serialize<uint8_t>(dest + offset, static_cast<uint8_t>(_type)); -- offset += _serialize<uint32_t>(dest + offset, _mode.value()); -- offset += _serialize<uint32_t>(dest + offset, _uid.value()); -- offset += _serialize<uint32_t>(dest + offset, _gid.value()); -- offset += _serializeTimeValue(dest + offset, _lastAccessTime); -- offset += _serializeTimeValue(dest + offset, _lastModificationTime); -- offset += _serializeTimeValue(dest + offset, _lastMetadataChangeTime); -- offset += _serializeString(dest + offset, _name); -- offset += _serializeBlockId(dest + offset, _blockId); -+ offset += serialize_<uint8_t>(dest + offset, static_cast<uint8_t>(_type)); -+ offset += serialize_<uint32_t>(dest + offset, _mode.value()); -+ offset += serialize_<uint32_t>(dest + offset, _uid.value()); -+ offset += serialize_<uint32_t>(dest + offset, _gid.value()); -+ offset += serializeTimeValue_(dest + offset, _lastAccessTime); -+ offset += serializeTimeValue_(dest + offset, _lastModificationTime); -+ offset += serializeTimeValue_(dest + offset, _lastMetadataChangeTime); -+ offset += serializeString_(dest + offset, _name); -+ offset += serializeBlockId_(dest + offset, _blockId); - ASSERT(offset == serializedSize(), "Didn't write correct number of elements"); - } - - const char *DirEntry::deserializeAndAddToVector(const char *pos, vector<DirEntry> *result) { -- fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(_deserialize<uint8_t>(&pos)); -- fspp::mode_t mode = fspp::mode_t(_deserialize<uint32_t>(&pos)); -- fspp::uid_t uid = fspp::uid_t(_deserialize<uint32_t>(&pos)); -- fspp::gid_t gid = fspp::gid_t(_deserialize<uint32_t>(&pos)); -- timespec lastAccessTime = _deserializeTimeValue(&pos); -- timespec lastModificationTime = _deserializeTimeValue(&pos); -- timespec lastMetadataChangeTime = _deserializeTimeValue(&pos); -- string name = _deserializeString(&pos); -- BlockId blockId = _deserializeBlockId(&pos); -+ fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(deserialize_<uint8_t>(&pos)); -+ fspp::mode_t mode = fspp::mode_t(deserialize_<uint32_t>(&pos)); -+ fspp::uid_t uid = fspp::uid_t(deserialize_<uint32_t>(&pos)); -+ fspp::gid_t gid = fspp::gid_t(deserialize_<uint32_t>(&pos)); -+ timespec lastAccessTime = deserializeTimeValue_(&pos); -+ timespec lastModificationTime = deserializeTimeValue_(&pos); -+ timespec lastMetadataChangeTime = deserializeTimeValue_(&pos); -+ string name = deserializeString_(&pos); -+ BlockId blockId = deserializeBlockId_(&pos); - - result->emplace_back(type, name, blockId, mode, uid, gid, lastAccessTime, lastModificationTime, lastMetadataChangeTime); - return pos; - } - - size_t DirEntry::serializedSize() const { -- return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*_serializedTimeValueSize() + ( -+ return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*serializedTimeValueSize_() + ( - _name.size() + 1) + _blockId.BINARY_LENGTH; - } - } ---- a/src/cryfs/localstate/LocalStateMetadata.cpp -+++ b/src/cryfs/localstate/LocalStateMetadata.cpp -@@ -30,10 +30,10 @@ LocalStateMetadata::LocalStateMetadata(uint32_t myClientId, Hash encryptionKeyHa - - LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, const Data& encryptionKey, bool allowReplacedFilesystem) { - auto metadataFile = statePath / "metadata"; -- auto loaded = _load(metadataFile); -+ auto loaded = load_(metadataFile); - if (loaded == none) { - // If it couldn't be loaded, generate a new client id. -- return _generate(metadataFile, encryptionKey); -+ return generate_(metadataFile, encryptionKey); - } - - if (!allowReplacedFilesystem && loaded->_encryptionKeyHash.digest != cpputils::hash::hash(encryptionKey, loaded->_encryptionKeyHash.salt).digest) { -@@ -42,22 +42,22 @@ LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, - return *loaded; - } - --optional<LocalStateMetadata> LocalStateMetadata::_load(const bf::path &metadataFilePath) { -+optional<LocalStateMetadata> LocalStateMetadata::load_(const bf::path &metadataFilePath) { - ifstream file(metadataFilePath.string()); - if (!file.good()) { - // State file doesn't exist - return none; - } -- return _deserialize(file); -+ return deserialize_(file); - } - --void LocalStateMetadata::_save(const bf::path &metadataFilePath) const { -+void LocalStateMetadata::save_(const bf::path &metadataFilePath) const { - ofstream file(metadataFilePath.string(), std::ios::trunc); -- _serialize(file); -+ serialize_(file); - } - - namespace { --uint32_t _generateClientId() { -+uint32_t generateClientId_() { - uint32_t result; - do { - result = cpputils::deserialize<uint32_t>(Random::PseudoRandom().getFixedSize<sizeof(uint32_t)>().data()); -@@ -82,8 +82,8 @@ optional<uint32_t> _tryLoadClientIdFromLegacyFile(const bf::path &metadataFilePa - #endif - } - --LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePath, const Data& encryptionKey) { -- uint32_t myClientId = _generateClientId(); -+LocalStateMetadata LocalStateMetadata::generate_(const bf::path &metadataFilePath, const Data& encryptionKey) { -+ uint32_t myClientId = generateClientId_(); - #ifndef CRYFS_NO_COMPATIBILITY - // In the old format, this was stored in a "myClientId" file. If that file exists, load it from there. - optional<uint32_t> legacy = _tryLoadClientIdFromLegacyFile(metadataFilePath); -@@ -93,11 +93,11 @@ LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePat - #endif - - LocalStateMetadata result(myClientId, cpputils::hash::hash(encryptionKey, cpputils::hash::generateSalt())); -- result._save(metadataFilePath); -+ result.save_(metadataFilePath); - return result; - } - --void LocalStateMetadata::_serialize(ostream& stream) const { -+void LocalStateMetadata::serialize_(ostream& stream) const { - ptree pt; - pt.put<uint32_t>("myClientId", myClientId()); - pt.put<string>("encryptionKey.salt", _encryptionKeyHash.salt.ToString()); -@@ -106,7 +106,7 @@ void LocalStateMetadata::_serialize(ostream& stream) const { - write_json(stream, pt); - } - --LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) { -+LocalStateMetadata LocalStateMetadata::deserialize_(istream& stream) { - try { - ptree pt; - read_json(stream, pt); ---- a/src/cryfs/localstate/LocalStateMetadata.h -+++ b/src/cryfs/localstate/LocalStateMetadata.h -@@ -20,11 +20,11 @@ class LocalStateMetadata final { - const uint32_t _myClientId; - const cpputils::hash::Hash _encryptionKeyHash; - -- static boost::optional<LocalStateMetadata> _load(const boost::filesystem::path &metadataFilePath); -- static LocalStateMetadata _deserialize(std::istream& stream); -- static LocalStateMetadata _generate(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey); -- void _save(const boost::filesystem::path &metadataFilePath) const; -- void _serialize(std::ostream& stream) const; -+ static boost::optional<LocalStateMetadata> load_(const boost::filesystem::path &metadataFilePath); -+ static LocalStateMetadata deserialize_(std::istream& stream); -+ static LocalStateMetadata generate_(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey); -+ void save_(const boost::filesystem::path &metadataFilePath) const; -+ void serialize_(std::ostream& stream) const; - - LocalStateMetadata(uint32_t myClientId, cpputils::hash::Hash encryptionKey); - }; diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch deleted file mode 100644 index 33b6e95d1cea..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/890847 ---- a/src/cpp-utils/thread/LeftRight.h -+++ b/src/cpp-utils/thread/LeftRight.h -@@ -2,6 +2,7 @@ - #include <functional> - #include <mutex> - #include <thread> -+#include <stdexcept> - #include <cpp-utils/macros.h> - #include <array> - diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 0fbdc3812c9b..4b1f0a261e41 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,5 +1,7 @@ DIST fuse-overlayfs-1.12.tar.gz 99684 BLAKE2B e7ef075c043738d506efcf973ecef7eb321e9f2b2812b318a4087d2a913f022240ed4b0d46e47463daff6976dd99fb587a5819a22c7e58dd52029930e92abffc SHA512 f113ac20b389d2f1c5e5ff160a60c308017e74c9c85d74a7200bab81a4cfa30335a64740c173f17c91ab4feddffb138ca4378e92894645a67eea5ac73d42890f DIST fuse-overlayfs-1.13.tar.gz 99775 BLAKE2B 7a0643a5ef029db7f3d1009e9dd4e7a647bf936205723fc3656dfd6d14d622e98f9df15590783492f056ab3f151fd658b6fe65f7177f9499532d02411138ac7c SHA512 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b +DIST fuse-overlayfs-1.14.tar.gz 102564 BLAKE2B 9c4960bb82be68d545989adffda3c95d06a809692827ad2cf6e0eaa646860bb49ba2e91af88f634740714acb75f2f154b3781cfdd154003d4976e8cc123ed797 SHA512 e0c50abffb7b71248ed4d7b8663f21bab4bf358682dece3a0c9f1480f142532471e139f041759dd8bd24807c7369537a5d86efc01617a17172463bd1c3870623 EBUILD fuse-overlayfs-1.12.ebuild 504 BLAKE2B 584f9cdd21a7f956f6e34c2afc935feeae031dff27b816fef1c79bbd6a229bd22cfe72b305f564bfa79d2a182278140e3da6afd9ea45db38aeada2b065ab64ad SHA512 6e64dc415bfa62b85e763fbaf6c5d8eb216e9fefc167a687c34f9723540125b99a19d60c5c24250d0d99213c9fdf3abc341d457c58bccc8b738c8ac0926609b6 EBUILD fuse-overlayfs-1.13.ebuild 615 BLAKE2B d85046330296a86c1c2a64f6e70e266dcb3a6e3ce366f6b6853b172db0f1b716071e7da70d4c68b8c1676833e138602576f6de58b4dc407479cd735dd3e51b11 SHA512 50ea9e80a2a9464cd9fc73fc1c8b0942b6ea8c9626aad6df3e2058a53e5413f1a43290e579e984aec6afcb90a2ba0b98e05e440c5a489a4cf5c27c30e2cfa795 +EBUILD fuse-overlayfs-1.14.ebuild 617 BLAKE2B 85f109f3e2157571f8f0856e95666dcc2047510e7a2b9c8ab06c6e3785b69f909f4513f5697c044cc305482bf5e641e09d3f0845190fda2aa67305eec0abbd82 SHA512 92c6db4297cf40f5f4b0c13004cfefe70eadd68a2ac8dbca47e6941358ccfd0888f33bca695ba8d86609ca9b5ce57edf4e0263a8fadce6f504971de52adcdbb9 MISC metadata.xml 588 BLAKE2B 5871bf7c5b838fc87673fbe00610b2aee63be3140af6cc46050f98dc299e922096bdc9928d6700d9779f4ff3bb9212258e7a86d27d764a623b9b53047078b2dc SHA512 aea63b5ea32b83fb24ee7422bd5df24e4f1250f8a33b7281d381531df3d230d2a9c257c3a5d0e379a252c82a82f490b448f6bd2f416d766cd6e000e354408438 diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild new file mode 100644 index 000000000000..c235a29f536f --- /dev/null +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild @@ -0,0 +1,27 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="FUSE implementation for overlayfs" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" + +DEPEND="sys-fs/fuse:3" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + kernel_is -lt 4 18 && eerror "Linux Kernel > v4.18.0 is required" && die +} + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/genimage/Manifest b/sys-fs/genimage/Manifest index 727ad3f5fbf9..eeed702f2fd4 100644 --- a/sys-fs/genimage/Manifest +++ b/sys-fs/genimage/Manifest @@ -1,8 +1,4 @@ -DIST genimage-16.tar.gz 87544 BLAKE2B 822c1b5901ed3fa19e33961e6e9e718f961d6c0a2315dcb4301aea3cccad6368a03d48ab5b5713592bdd096e78e7d24c03e8016a1470c7864ace71e3341b16a4 SHA512 7cb079d6ae889a744e2a3596b0eac737f7fdf1734c2024c71bb5ff85b93bff1d8ec26d61ee5b210aad4f0f9137968a6e256492c8c8376bafe2c5da2d12985a73 -DIST genimage-17.tar.gz 94853 BLAKE2B 371f35be1f47ecc012adcac5e6138f8bf32b097fd508b599d788d3a1af3fd0ccb9a213d0dc683ecc6e11f762e6376cf3a2683dec3fefd26e70ceebc48e7d2814 SHA512 b02415e030e2ef9ace40b965935e2634c208db4f4d401e1a824aa6dcf06c9656ba060d66e4a3a4306216ec74ce2ddcea4647bb68eb61a3bf4e9aadb1ff0d73ef DIST genimage-18.tar.gz 98409 BLAKE2B dc73d2cca8166939e803834490fd55de66d235df0bb0dfef0c79810bfd619fc8683715241719b2fa94d19bf3870863c3aacbd6f2dd50cf41200d5990104ffd3d SHA512 70cacbb0ce081bd6e941f79e00e2c92839909e254d2f74b1eddd4e5d5d6d5177f80745df9bc132fa9b0c901e184d37c1c89113238a0b357412704dba0c367211 -EBUILD genimage-16.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 -EBUILD genimage-17.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 EBUILD genimage-18.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 -EBUILD genimage-9999.ebuild 1113 BLAKE2B 2b9328f8a7d59ab5548b7efea01623d160e8ea354cc062872942e81544e9bcdeff9ae994f8503ac2e5a9ff1c9a935a2b20696b51f4a7d779365fad82e75f5aff SHA512 5d6f06b891ac91a6776f9581f2ec075c3da73dc37e3bdb4a010ad2bb3c50d36d5f73f22ef0f22616390fa22cd6e2f72aa1200f354950221e13189fc7409799ec +EBUILD genimage-9999.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 MISC metadata.xml 333 BLAKE2B 802ffd79e7a01b6caadbbc9e8176b1dfc6657f09ef2ff7e6eaed979b5df4522fb481625bebd3ed1c4ce40017820a62624cb73c4e096144e2778d94b325c6c520 SHA512 402a05c00a4a776f023d46f415df5f4d012e9ee5bedb108e60da6e1b3a1281b7357904611c70da9b75ae598fe7bfef71c658b220efabed5a7b5f8ccc497ec7ef diff --git a/sys-fs/genimage/genimage-16.ebuild b/sys-fs/genimage/genimage-16.ebuild deleted file mode 100644 index 4becc18f6212..000000000000 --- a/sys-fs/genimage/genimage-16.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools optfeature - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/pengutronix/genimage.git" -else - SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree" -HOMEPAGE="https://github.com/pengutronix/genimage" - -LICENSE="GPL-2" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/confuse:=" -RDEPEND="${DEPEND}" -BDEPEND="test? ( sys-apps/fakeroot )" - -src_prepare() { - default - eautoreconf -} - -pkg_postinst() { - optfeature "cpio support" app-alternatives/cpio - optfeature "tar support" app-arch/tar - optfeature "qemu support" app-emulation/qemu - optfeature "dosfstools support" sys-fs/dosfstools - optfeature "cramfs support" sys-fs/cramfs - optfeature "genext2fs support" sys-fs/genext2fs - optfeature "jffs, ubifs and ubinize support" sys-fs/mtd-utils - optfeature "squashfs support" sys-fs/squashfs-tools -} diff --git a/sys-fs/genimage/genimage-17.ebuild b/sys-fs/genimage/genimage-17.ebuild deleted file mode 100644 index 4becc18f6212..000000000000 --- a/sys-fs/genimage/genimage-17.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools optfeature - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/pengutronix/genimage.git" -else - SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree" -HOMEPAGE="https://github.com/pengutronix/genimage" - -LICENSE="GPL-2" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/confuse:=" -RDEPEND="${DEPEND}" -BDEPEND="test? ( sys-apps/fakeroot )" - -src_prepare() { - default - eautoreconf -} - -pkg_postinst() { - optfeature "cpio support" app-alternatives/cpio - optfeature "tar support" app-arch/tar - optfeature "qemu support" app-emulation/qemu - optfeature "dosfstools support" sys-fs/dosfstools - optfeature "cramfs support" sys-fs/cramfs - optfeature "genext2fs support" sys-fs/genext2fs - optfeature "jffs, ubifs and ubinize support" sys-fs/mtd-utils - optfeature "squashfs support" sys-fs/squashfs-tools -} diff --git a/sys-fs/genimage/genimage-9999.ebuild b/sys-fs/genimage/genimage-9999.ebuild index 498034c2ce2a..4becc18f6212 100644 --- a/sys-fs/genimage/genimage-9999.ebuild +++ b/sys-fs/genimage/genimage-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/pengutronix/genimage.git" else SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64" fi DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree" diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest index 43c47d97f0b1..5b39e81535aa 100644 --- a/sys-fs/ncdu-bin/Manifest +++ b/sys-fs/ncdu-bin/Manifest @@ -1,19 +1,3 @@ -DIST ncdu-2.3-linux-aarch64.tar.gz 286044 BLAKE2B 12961a4ddfef4b240d0a379b8efa733e104d5179645f57512a68ff4e523c002085cdcff3b8533c7575c9201c0f9aa4063227b3953f7a9826f2cdcd6604e9f36f SHA512 6b37d1b9f9ccc18eac118cd94faf808a7173111157f0e06c97de73c349ee4a853bc832b7f8b3e5d116862f93987278504781c36431106a9bb870cf64f428c8f0 -DIST ncdu-2.3-linux-aarch64.tar.gz.asc 833 BLAKE2B cee39dbf98a17f678a6335a86e310291a957de5083818bc266e1e4ba3a562e3f3a0afb666b15b0c10348dab3214d8c02bc55f7d0d134d67673d7d781df51d389 SHA512 1b98c7d673e0a1b1467aba4699ad217388e95e1bb89200ccf59a567cf0512d3d46a067798a8ece55ca76e66c1712748843540d0c1441331e07117dfec533edbc -DIST ncdu-2.3-linux-arm.tar.gz 281221 BLAKE2B aa381e1d227689430168cc0eb7c762556da733b246fedb26b5adaee94f5c141a1dfdafa11518babfdad3c5c8a8040a6f6e398d78357935ed36df4dc027c8a492 SHA512 336e898ec393ae3d2d962b60083d1214fff32da0204d9aed52894488681ff11b223afdfb089d528d679da73e8580da25b3a857dcce9a2c6799ce9a4e6c4643d5 -DIST ncdu-2.3-linux-arm.tar.gz.asc 833 BLAKE2B ea3b427a516a0edf06dd29ec93df04daaa2e3a0659ad357370b58e95977d6ac881ea8104646f9a82b9905af12d18c3f51bba17f2a9d3b6db5b208050581d0ea8 SHA512 d5f484da3d45a52d97f65e25f4bbcfac3500b8871eceb4b5f5d2a8eda7e3f4b175cea544ba56ff4a7e86de7dfe4ccc054979f3755c1ca87b72b12e851cb12a1a -DIST ncdu-2.3-linux-x86.tar.gz 315771 BLAKE2B 10319febbb8cd9c88e0c0677eb53be9a9340106c542b9b7e888944ada52ccb9371b38aacac4d8374bd1c150cfa9939fcda20c5513885015569328fdfd5e69f78 SHA512 c77dd79d13b428d2c85f5a73b3638b6e71229fe924e6d4a3beb9b4765febbcb1d0c29e816fa3354b0e2c0b88c599b2f1fd03eeb87a73cccd296a2fb0225e0d98 -DIST ncdu-2.3-linux-x86.tar.gz.asc 833 BLAKE2B b4dcb755252287556019f15677b02922a0597baa20c176c105a4a47831b82365ee88d82f2f807dda43ce3c25e07e6510b96867e4b2fc2db4eab7b91af9ddc703 SHA512 e618db337ab4afa9dcd0cc743430af3ff17393d9cde9d1623667767e15b32d97310664507dbcc783008d5bb9842c6a6474c21bfce08a19241e5992da863840ea -DIST ncdu-2.3-linux-x86_64.tar.gz 293280 BLAKE2B 871f9c1f6860d83fe3c8ad8e7ffd2157389427b98d3232aaffc9ce983c4b98b9d562d39e94adb667ffaa4745aa4fb1caedd1f9f9b3ca5a756db922a8229f22b7 SHA512 9a1c17a971dc422342e5f42d4f6be4195239411bd529f81d0b0225bdef27e3112561cb1b8c699fb805bd766fb074fc0d93331d83af79d95235533899ac90de5a -DIST ncdu-2.3-linux-x86_64.tar.gz.asc 833 BLAKE2B 85d09c438c3a51fceb0e81252ccd184e3b7b7a1770c423b61efceb3728b1bfa68c26ef852084231a6fbd88d147ccaad655135007cdd8d850bb34aede465c3ab8 SHA512 a130f2f4d623cff7f0256437443fcdf8c0fc073f6c7bd27cc924e3a464dea5ea17f717cc2c700bc67356578d4e7eab342c444926cb14a6610f6e9be329d781f7 -DIST ncdu-2.4-linux-aarch64.tar.gz 278214 BLAKE2B 77429a554b05b1873012817c917b282f78fb3946d1521aa3a1c90362db1c4bfc9f8355e87b46dc795effb46312fa81297ec0b4777bcfb8f54a40df556c884b8f SHA512 3caaae21f4de4185da01ab55d466a2fb4321608ffed044688240a590a53753473719050777d48015703914769b7c60b59d2b218e96fd3f7c7655f5315b8daf96 -DIST ncdu-2.4-linux-aarch64.tar.gz.asc 833 BLAKE2B e00328f455a31fc4b5915afca6a98e3817ae94f92e7e4eca0655dc4db6dda3fdeb9d7aa6a5b6e20c9f39cba12cb9666ae3462e4f0caaef5415112afa80e6a602 SHA512 9b5a4b55afaf541763e9992a6f15de18cc7cb52b8004e3833b5e75ec0e79787c3693e924b326451caa6c9014d7c3b49eeed36eb9c120ca4aec96f5af9a8d94d6 -DIST ncdu-2.4-linux-arm.tar.gz 273717 BLAKE2B 599fdd716d72009d01e2b9f3022440760772471ebcd75e15c43eff382fa178065154e5d58710f6d16cff02a75f18f7d82239cd43da9d448f14a3fcb43c9353f1 SHA512 70a48564480d861ff3ea4be5bed650163444d34b1e7ed834f0d769e90fea3b69df8c3348273efe34f3fc052384288effad1ed69ff6b995afa92fc930a9f39f0a -DIST ncdu-2.4-linux-arm.tar.gz.asc 833 BLAKE2B 1af1cd305e86bce890e527dd50673e6d4572cf7983be249ed6d9ded97927b14045a46f20dfee54029a821e9a4754190074dcef6ec1ba523ab68a804b744551eb SHA512 b2bb42714cb1c07916581702b83cc64db663b0bc6342549d5350213beab608307ab34ace0cc8fab9bb9a0949a044cf3d9a46e39813046ff7f50735dc785d8ea1 -DIST ncdu-2.4-linux-x86.tar.gz 297477 BLAKE2B 2d1b7d4b775bfdfc7c0563d40ecbbd0a6d91ef40a49093c6c732d5cc07d5046cb295271d4552cb9ed629646f6dccd4a41c1ce3077b82f8e143e40027c42c51cf SHA512 f52878e302448a10e5720bc572dcb981a8be63b7b4e81c1e03371d89e0fb4075e2c9e2eacd3d6d2a173ed07ec2dd0d4a3d27660bd0f3038884262e2797e602f8 -DIST ncdu-2.4-linux-x86.tar.gz.asc 833 BLAKE2B f13a87ab6ccf98167adfbf98a43e1baad06f6344161ac45911e81ce2bf0637a8b381f22f1bd5ef1ec8aec44e56a4c13a0fceccec613359b44f01044ca39309de SHA512 da3e3b534656fb4d8589937322e2c6cf49227f0ec0ef5d3d00149f60b8c17122b7b026bfcb2a0e0de3893c71cc3adf2f301327782ff28ee94024f584f116c7b2 -DIST ncdu-2.4-linux-x86_64.tar.gz 286824 BLAKE2B 0a0c8ffed0b0bda6b77013ca348d43e508aaace419476fd9eaeaddaaa0656e803684bb493552f09ff94e6097e2d4ac8a261d7d64d13022976e1041d49e256338 SHA512 a7e026adf351a23457377f9f6524af709022ef4f3a0646cb875a98abf5dd7487222fd79b538debff66a851eb71135743987ffc8729189698e26e1f1c728136ed -DIST ncdu-2.4-linux-x86_64.tar.gz.asc 833 BLAKE2B 5501bbeda29ee15df09a50d64720b72c681f5aec89b05a9362b327d0b28cccb2537d5d9382e188e07a0c19e727fdcad5ddc6ce28937468e98125a18c318f6ac2 SHA512 8a70c1a76a3137c3b91b522cb6a703b566b426338cc794c6389693351cb61bb103af8ce49b5eda2f5732df490ed844fe3898499fc11a63478ee18c5e5c26533d DIST ncdu-2.5-linux-aarch64.tar.gz 283085 BLAKE2B 28518e20460db8abbdfdfa6b61b61024b9550f5bf34fcea9682f5598d05cd417ad4b8b78b662e6cc6ad35b45f514cdfa2d35ef7677c50338a40345daf0ce4b57 SHA512 973139d158ad71ee80939aabb1a419668c95dd25f7e5d78ede78afa66bf1fe835e7c736ae1ba5b56fe6e0bde6125b46d6102629492582910947778821912d199 DIST ncdu-2.5-linux-aarch64.tar.gz.asc 833 BLAKE2B ef4e246218a81c10aed27829f68a78fc96f9feb7a84dab6f32631ca400b480dc5ef36c185d6afc830537c15297da02ab7b58720576476509ebd554d0a1a338ae SHA512 d9ff6aee538cfbabfddcd59108baaa949e96df722c9e7f8fe81499640041d361b2a7473982cbd7e9a44ea2c5a1394cefd6a0a9bb05733775c0a354459d870ab1 DIST ncdu-2.5-linux-arm.tar.gz 278582 BLAKE2B 07ff2c8463ff407c5fcafe65db7d3911215b3dd78ae3e65ee6aef43c57d8eea782eae741cebe83488f9b5b504bc9b8830d6cc586866e3a6fdb10b79c6fcff43b SHA512 7fb2ed31eda1e6e4a7f1749ed341d062aa6f6e4502ccd3e50fcfd5fb2e3f892f201d17d6eca605e281a3f2a6f95938fe0af62750b79bde051917cf40747fc374 @@ -22,7 +6,5 @@ DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad1 DIST ncdu-2.5-linux-x86.tar.gz.asc 833 BLAKE2B 907beb66a768d9639445539f98069b172fdd0c462b2eeb8872bd8c33bc9607a1cae9ccbb542d33717649e73d413f12a8792835cb89f3e7fdf534a2f69d75cbc8 SHA512 508cc5893cb8b1bd7138dbffe91933f007ecb5ac601c5a08806f5c55f541d0bc89111fd7091d1b9b1ebbc7978ff9d7f896d80e2c19e8e28d8973db3bd3b6ad40 DIST ncdu-2.5-linux-x86_64.tar.gz 286301 BLAKE2B 92f7f6bdfa3838d657f53e14bb58be92e7b7aa2147f2bdd38fc9ac417bd0ffa14021eae587f0ba22c7277315b4251ce53fb78f8f7dbd1dad42d1805d0babe60e SHA512 2c48dd1ceb34de54cf64fcdabd81fea86a113c7914be2d2a17c9242ddbeffab69bf6ae9a51e1dd82f87c408f1cd61f4b1b32c960f4ab274db6c7fafaaa262e86 DIST ncdu-2.5-linux-x86_64.tar.gz.asc 833 BLAKE2B 44becd2cef14a4b5e0359810c2d9f867afe282431e203db2f88aa3b21cc703174651cfe23e1f6077de779edb980cc7356a099ce926a4f029049d165dc9311640 SHA512 14636902d8475772d6ed3e3d194ef23a5613fe0bcb43a39a10e5598d392251fcf69b6711904f36fbc5a9c13a6953d7c4bcc02e0fdee2c93b2ef7e6c1597fab60 -EBUILD ncdu-bin-2.3.ebuild 1103 BLAKE2B 075ef4fbd0dbc80495cee7ae5143d1d6a158f4e15222cb2ff0534cfb3d35361efab6221d1ec5a2f697f75f86b90bd07a63ed7092e948283ebb3a22923b4af79e SHA512 de6e73136559525dd63fb91c43f9af213eb4f78e5cda79f14174ef89710f137e9ed7b154748cdbc379880f99884ce9d4f438584df3d6adb01a77815c22acaed2 -EBUILD ncdu-bin-2.4.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9 EBUILD ncdu-bin-2.5.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild deleted file mode 100644 index 557f5c9250f3..000000000000 --- a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit verify-sig - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu" -SRC_URI=" - amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz ) - arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz ) - arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz ) - x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz ) - verify-sig? ( - amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc ) - arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc ) - arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc ) - x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc ) - ) -" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc - -QA_PREBUILT="usr/bin/ncdu-bin" - -src_install() { - newbin ncdu ncdu-bin -} diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.4.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.4.ebuild deleted file mode 100644 index 76fc2f6bba95..000000000000 --- a/sys-fs/ncdu-bin/ncdu-bin-2.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit verify-sig - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu" -SRC_URI=" - amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz ) - arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz ) - arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz ) - x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz ) - verify-sig? ( - amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc ) - arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc ) - arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc ) - x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc ) - ) -" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc - -QA_PREBUILT="usr/bin/ncdu-bin" - -src_install() { - newbin ncdu ncdu-bin -} diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest index f2015e130840..b86149ba5ec3 100644 --- a/sys-fs/simple-mtpfs/Manifest +++ b/sys-fs/simple-mtpfs/Manifest @@ -1,3 +1,4 @@ DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7 +EBUILD simple-mtpfs-0.4.0-r1.ebuild 616 BLAKE2B a6aa11f22724e0e97c38c990f54aef2426dd8b00662c6dbd2c73f5e61a8a4e8fa220cb321c58f35118a5c30cd18ad52f96e7033d0871d29388ea2800e0e80f93 SHA512 4da9cebe68f168573f6babaf2fde6d18cd1e09f90bdb3051251586ec0c41d5350d533dc6d2de31450778bed001d7613ce943fac332ef1e2abf379576ba13663e EBUILD simple-mtpfs-0.4.0.ebuild 613 BLAKE2B af4bbc6c6a3297bab7a5885bbb6a58f1de6e84afff9110d27d7c419140ae71e6e984fa314d4f6971a0fcab98fd5bc4f75980a67a81831a9f8efe2036d2cdfe65 SHA512 750ec138321bb2de7400e710334c63d074e596ee86365dd71c2590941766ef013c0e0dab0f27afd9905bff189eeddf0ba0347ea363ceeb42db169eecf1288fbe MISC metadata.xml 882 BLAKE2B 0e3e9fe17ed59c0aa1158e3cead024273d280a56a05b00268f2f981bc9cf96181b3296fe8b4ba85cf7f022c3d20773bc2f7d05695b06e1708eeba153da65c672 SHA512 9460fef344fdae709e10fb2d2164656d4ab9244d5881c75e23ff05f00cfc662c096679ddda841e2a0cf800fb6c36eb6eabe0c168a72a5db3e3f9e1166893b750 diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild new file mode 100644 index 000000000000..d915d61c898d --- /dev/null +++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Simple MTP fuse filesystem driver" +HOMEPAGE="https://github.com/phatina/simple-mtpfs" +SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libmtp + sys-fs/fuse:0" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +src_prepare() { + default + + # The tarball doesn't contain ./configure, only configure.ac and + # autogen.sh. + eautoreconf +} |