diff --git a/sys-fs/stratis-cli/Manifest b/sys-fs/stratis-cli/Manifest index cf609a3..cf77fbd 100644 --- a/sys-fs/stratis-cli/Manifest +++ b/sys-fs/stratis-cli/Manifest @@ -1,3 +1,3 @@ -DIST v2.4.1.tar.gz 60296 BLAKE2B 64c47449ebb126039c628b4657c2bc65c343cad1801c74d3683512765eb8ed649a1c2a3fa03b56c115c29135cddbe9c298712901b47305ed5b6da7cef96ac132 SHA512 1d318fb244ad1ef48882e686cace0166237ead7261e26c9197e3b98517128013c1c9b9978ad894e9f0e7d90bd312d98246b39a80f90e3d0fd7a88618110137e7 -EBUILD stratis-cli-2.4.1.ebuild 771 BLAKE2B f25ba31011e7a845d5242d3f3e08e02cbf7f0fb9aeeb611367b263d5e7a680364d1a00a1f22e2ffcafae4bc64dcf05415a7447046cf4c48865534870159579e8 SHA512 f3ca2691c92f2fe37ee5b87d3ea8f2e05371751b5e4625f3f620d60d8455c765801fbe9e011fe0af768e0f3540338f8276e1ebe60d0bdcbd1e82925f6693756a +DIST v3.0.1.tar.gz 63347 BLAKE2B d1cfc878c3e6d94f17ee0af62f0b85183ffd47c020eed762e47ddc22a43fed6b0c227970a0e4428c69d2cdf95259bee45eee0848c4efe18877444d3e52e1054b SHA512 70508456141f05bae4868676e6f35e33c1c564e9da565b2880ab0efb3232dc8b743e793d6d2262ec579dca99a6d9e9d8297d323f543b034b061b9bc28460cc88 +EBUILD stratis-cli-3.0.1.ebuild 774 BLAKE2B 294939b373f4d391872ddbe02fbdc76602685f30ce024baf8604e8fec621cc62de105b24d8647ecdca1309ece2d6debe0781d5a6c3c6deec9fa0418163781b84 SHA512 38ad710a1fa932f2024c8ea45645f66d2aa4eeedb4aef59a3d384d383b983881cf6ab81df90dbe3139c116f4bd8445eb1eb8495d95b0906ed7226aa05dde879f MISC metadata.xml 345 BLAKE2B 950376b3f4d4a3d88b1c0611ef26c82991b4762bf8934ad936cb77a16120c9eae7b4e81fa6e65e277c2fc393ba53c65cf8636e8a505985f9471163f238ef0b01 SHA512 27b47e4850eac374c82ff68d9fcfba7942d7f632a7b3c44174468b9c65586f02523594cb8271fdbfe87c960b142b1fc24304737b5f9d649ef0238aea8b2a9675 diff --git a/sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild b/sys-fs/stratis-cli/stratis-cli-3.0.1.ebuild similarity index 89% rename from sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild rename to sys-fs/stratis-cli/stratis-cli-3.0.1.ebuild index 271814e..5903646 100644 --- a/sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild +++ b/sys-fs/stratis-cli/stratis-cli-3.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit distutils-r1 @@ -25,7 +25,7 @@ DEPEND=" dev-python/dbus-python-client-gen dev-python/semantic_version" RDEPEND="${DEPEND} - >=sys-fs/stratisd-2.4.0 - =sys-fs/stratisd-3.0.0 + = filesystem_metadatas.iter().map(|x| x.thin_id).collect(); diff --git a/sys-fs/stratisd/stratisd-2.4.2.ebuild b/sys-fs/stratisd/stratisd-3.0.4.ebuild similarity index 74% rename from sys-fs/stratisd/stratisd-2.4.2.ebuild rename to sys-fs/stratisd/stratisd-3.0.4.ebuild index c555121..7abda12 100644 --- a/sys-fs/stratisd/stratisd-2.4.2.ebuild +++ b/sys-fs/stratisd/stratisd-3.0.4.ebuild @@ -1,144 +1,142 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CRATES=" -addr2line-0.15.1 -adler-1.0.2 aho-corasick-0.7.18 -ansi_term-0.11.0 +ansi_term-0.12.1 +async-trait-0.1.52 atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.59 -bindgen-0.57.0 +autocfg-1.1.0 +bindgen-0.58.1 +bindgen-0.59.2 bit-set-0.5.2 bit-vec-0.6.3 -bitflags-1.2.1 +bitflags-1.3.2 block-buffer-0.9.0 -build_const-0.2.2 byteorder-1.4.3 -cc-1.0.68 +cc-1.0.72 cexpr-0.4.0 +cexpr-0.6.0 cfg-if-0.1.10 cfg-if-1.0.0 chrono-0.4.19 -clang-sys-1.2.0 -clap-2.33.3 -cpufeatures-0.1.4 -crc-1.8.1 +clang-sys-1.3.1 +clap-2.34.0 +cpufeatures-0.2.1 +crc-2.1.0 +crc-catalog-1.1.1 data-encoding-2.3.2 -dbus-0.9.2 -dbus-tree-0.9.1 -devicemapper-0.29.1 +dbus-0.9.5 +dbus-tree-0.9.2 +devicemapper-sys-0.1.2 digest-0.9.0 either-1.6.1 -env_logger-0.8.3 -errno-0.2.7 -errno-dragonfly-0.1.1 -error-chain-0.12.4 +env_logger-0.8.4 +env_logger-0.9.0 +errno-0.2.8 +errno-dragonfly-0.1.2 +fastrand-1.7.0 fnv-1.0.7 -futures-0.3.15 -futures-channel-0.3.15 -futures-core-0.3.15 -futures-executor-0.3.15 -futures-io-0.3.15 -futures-macro-0.3.15 -futures-sink-0.3.15 -futures-task-0.3.15 -futures-util-0.3.15 -gcc-0.3.55 -generic-array-0.14.4 -getrandom-0.2.3 -gimli-0.24.0 +futures-0.3.21 +futures-channel-0.3.21 +futures-core-0.3.21 +futures-executor-0.3.21 +futures-io-0.3.21 +futures-macro-0.3.21 +futures-sink-0.3.21 +futures-task-0.3.21 +futures-util-0.3.21 +generic-array-0.14.5 +getrandom-0.2.4 glob-0.3.0 -hermit-abi-0.1.18 +hermit-abi-0.1.19 humantime-2.1.0 -itertools-0.10.0 -itoa-0.4.7 +instant-0.1.12 +itertools-0.10.3 +itoa-1.0.1 lazy_static-1.4.0 lazycell-1.3.0 -libc-0.2.95 -libcryptsetup-rs-0.4.4 -libcryptsetup-rs-sys-0.1.5 -libdbus-sys-0.2.1 -libloading-0.7.0 +libblkid-rs-0.1.1 +libblkid-rs-sys-0.1.3 +libc-0.2.117 +libcryptsetup-rs-0.5.0 +libcryptsetup-rs-sys-0.1.6 +libdbus-sys-0.2.2 +libloading-0.7.3 libmount-0.1.15 libudev-0.2.0 libudev-sys-0.1.4 log-0.4.14 -loopdev-0.2.1 -matches-0.1.8 -memchr-2.4.0 -miniz_oxide-0.4.4 -mio-0.7.11 +loopdev-0.2.2 +matches-0.1.9 +memchr-2.4.1 +memoffset-0.6.5 +minimal-lexical-0.2.1 +mio-0.7.14 miow-0.3.7 nix-0.14.1 -nix-0.20.0 +nix-0.22.3 +nix-0.23.1 nom-5.1.2 -ntapi-0.3.6 +nom-7.1.0 +ntapi-0.3.7 num-integer-0.1.44 num-traits-0.2.14 -num_cpus-1.13.0 -object-0.24.0 -once_cell-1.7.2 +num_cpus-1.13.1 +once_cell-1.9.0 opaque-debug-0.3.0 peeking_take_while-0.1.2 -pest-2.1.3 -pin-project-lite-0.2.6 +pin-project-lite-0.2.8 pin-utils-0.1.0 -pkg-config-0.3.19 -ppv-lite86-0.2.10 +pkg-config-0.3.24 +ppv-lite86-0.2.16 pretty-hex-0.2.1 -proc-macro-hack-0.5.19 -proc-macro-nested-0.1.7 -proc-macro2-1.0.27 +proc-macro2-1.0.36 proptest-1.0.0 quick-error-1.2.3 quick-error-2.0.1 -quote-1.0.9 -rand-0.8.3 -rand_chacha-0.3.0 -rand_core-0.6.2 -rand_hc-0.3.0 +quote-1.0.15 +rand-0.8.4 +rand_chacha-0.3.1 +rand_core-0.6.3 +rand_hc-0.3.1 rand_xorshift-0.3.0 -redox_syscall-0.2.8 +redox_syscall-0.2.10 regex-1.5.4 regex-syntax-0.6.25 remove_dir_all-0.5.3 rpassword-5.0.1 -rustc-demangle-0.1.19 rustc-hash-1.1.0 rusty-fork-0.3.0 -ryu-1.0.5 -semver-0.11.0 -semver-parser-0.10.2 -serde-1.0.126 -serde_derive-1.0.126 -serde_json-1.0.64 -sha-1-0.9.6 -shlex-0.1.1 +ryu-1.0.9 +semver-1.0.5 +serde-1.0.136 +serde_derive-1.0.136 +serde_json-1.0.78 +sha2-0.9.9 +shlex-1.1.0 signal-hook-registry-1.4.0 -slab-0.4.3 +slab-0.4.5 strsim-0.8.0 -syn-1.0.72 -tempfile-3.2.0 +syn-1.0.86 +tempfile-3.3.0 termcolor-1.1.2 textwrap-0.11.0 -time-0.1.43 -tokio-1.6.1 -tokio-macros-1.2.0 -typenum-1.13.0 -ucd-trie-0.1.3 -unicode-width-0.1.8 +tokio-1.16.1 +tokio-macros-1.7.0 +typenum-1.15.0 +unicode-width-0.1.9 unicode-xid-0.2.2 uuid-0.8.2 vec_map-0.8.2 -version_check-0.9.3 +version_check-0.9.4 void-1.0.2 wait-timeout-0.2.0 wasi-0.10.2+wasi-snapshot-preview1 which-3.1.1 +which-4.2.4 winapi-0.3.9 winapi-i686-pc-windows-gnu-0.4.0 winapi-util-0.1.5 @@ -182,13 +180,13 @@ RDEPEND=" #QA_FLAGS_IGNORED="/usr/libexec/stratisd " +RESTRICT="network-sandbox" + REQUIRED_USE="dracut? ( systemd )" PATCHES=( # Until feature will be released. https://github.com/stratis-storage/project/issues/161 ${FILESDIR}/0001-disable-xfs-uuid-change-after-snapshot-create.patch - # Until issue will be fixed. https://github.com/stratis-storage/stratisd/issues/1470 https://github.com/stratis-storage/stratisd/issues/1780 - ${FILESDIR}/0002-duplicate_check-disable.patch ) src_prepare() { @@ -201,6 +199,9 @@ src_prepare() { } src_compile() { + # Disable offline mode for device-mapper library + sed -i 's/^offline.*/offline = false/g' ${WORKDIR}/cargo_home/config + # allow building on musl with dynamic linking support # https://github.com/BurntSushi/rust-pcre2/issues/7 use elibc_musl && export PCRE2_SYS_STATIC=0