diff options
Diffstat (limited to 'sys-fs')
48 files changed, 1558 insertions, 289 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex c2113f7210b1..79d967a0a4d1 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 3738ae62c73a..83916a48fec4 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,8 +1,10 @@ DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823 +DIST btrfs-progs-v5.14.1.tar.xz 2247384 BLAKE2B 70eb5f1f3f4b7acc2d4f662c0484984903a09c03bd4d3bd6e15ac712318c3ee9a3621e682f1d33a8b2b25280a63801e1a71d574c55dbd28e205e7fb4b549af47 SHA512 d706322b3c82825ab0eedc952a5e68642483539af5f3bf84d751ffed09d5e997f188370734145c7eb8b109be5bf6d77a2e3731521b3e34d46e1a454eef6bfb56 DIST btrfs-progs-v5.14.tar.xz 2246876 BLAKE2B 0b0b9a8b131c7a80951695bd8e606e07f89834b60e5af1478b9a02474b9c4e77cd7d628e8cb1be32051d25bd8539e15c48f8b15b3500f6490daca87cd36555b6 SHA512 153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7 EBUILD btrfs-progs-5.13.1-r1.ebuild 3015 BLAKE2B 4d1c0c35fe2e0d159db0a286805258ec4db568b39ea0bab81b3459bd87538c0d9b2ce5b4966d7cb64548d25e86ab0a42d6a96818439ed26dfbd6a904fc52ea1d SHA512 8109626768b1622658657eeb054decb92e1f2474623c3b4eae249d94712f61831d7f4a8207f824eae08bd6a4ad776e411c39c9896a359467ec53d07c5b5df03b EBUILD btrfs-progs-5.14-r1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 +EBUILD btrfs-progs-5.14.1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.14.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.14.1.ebuild new file mode 100644 index 000000000000..36548f98db8a --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.14.1.ebuild @@ -0,0 +1,128 @@ +# Copyright 2008-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit bash-completion-r1 python-single-r1 + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + S="${WORKDIR}/${PN}-${MY_PV}" +else + WANT_LIBTOOL=none + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert doc python reiserfs static static-libs +zstd" + +RESTRICT=test # tries to mount repared filesystems + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:0=[static-libs(+)?] + sys-libs/zlib:0= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + zstd? ( app-arch/zstd:0= ) +" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd:0[static-libs(+)] ) + ) +" +BDEPEND=" + doc? ( + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + ) +" + +if [[ ${PV} == 9999 ]]; then + DEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + AT_M4DIR=m4 eautoreconf + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + $(use_enable convert) + $(use_enable doc documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable zstd) + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static install-static '') + ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize + + # install prebuilt subset of manuals + use doc || doman Documentation/*.[58] +} diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 62fb67be6f42..055afb88e642 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -3,8 +3,11 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2 AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f0b48fa74316d8ad98fb5400ed89f674b6a93e30d76fa1adc3391a209a95936156fcd472b779cf5dbdd8b4 SHA512 131cee054019eed3f1939615386ba849bad2b02e31042075d5839e9a5943c8716431aae01aece25b2193645bcd706e14e6c947ee59f1fab4c2d7e0afc80228be AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf +AUX cryptsetup-2.4.1-external-tokens.patch 1015 BLAKE2B ca7b5940caf000cc97742dfcbf8ee38e9fec049a4a3788737b283851dc3fd340664d332aff507f8d9d5962bca66b56a232419902114ac08ace5df76825cccd1a SHA512 23dff40a535ac1d4ccae41cc7a24e0ca53b412e0f6c0fc3e4a8ef7b7255ed28d8010a5684aa5029ec1d5d534196c4fbb83bc2a1ab5794cc6197b19f1a0696bab DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665 DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6 SHA512 9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186 +DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 EBUILD cryptsetup-2.3.6-r2.ebuild 3908 BLAKE2B f2b709398da106f2d2b89365d67eee7298703035b1c94960fc0819b00dc48231692a6df2bf13322778e3704003bc0637a14d8198343053010b74fd21b1f52050 SHA512 6a9ee5bdd788a51944af30311ec84698d0fcaf19fe5845be4e0758dc89367ba9786c47b861595dfa691e3b9a82e11a239e54b1166fddd4848ec3bf37d5ceb195 EBUILD cryptsetup-2.4.0-r1.ebuild 4118 BLAKE2B 87d307168f52ba2476fa3acfbe4a9203a6a720ea957bc5be45acec3264311e2648270878cfbf4ba82b8935cbd8fa49dc32843617bc5f70b54c0c222b6b693d83 SHA512 eb71c347d866fd91f9ed940ce32daa117204259f55eed0e65e99f12c2756e5dcd857ff954171c861aa8eacead09fb714e2133169544766300c22dcec68273920 +EBUILD cryptsetup-2.4.1-r1.ebuild 4134 BLAKE2B 057b3f0f264a35155971feb860c83ac7fba48f963973aa626543f7aa0172f2284f1f0d6ea4469e144a0f12dc202b5f0278d4221865fc5ed942ca822d2e221865 SHA512 512df86889fdbd000b2c17f36c1cee96976be1a92c1c3421ed4f320bf822ff2026159d708b0cdd50c69b72ab682312aad0bdbd569849a68a9f6f7930f4ab315d MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild new file mode 100644 index 000000000000..cd60372120e6 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info tmpfiles + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" +SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/12" # libcryptsetup.so version +[[ ${PV} != *_rc* ]] && \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" +# we don't support nss since it doesn't allow cryptsetup to be built statically +# and it's missing ripemd160 support so it can't provide full backward compatibility +IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom" +REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) + static? ( !gcrypt !udev )" #496612 + +LIB_DEPEND=" + dev-libs/json-c:=[static-libs(+)] + dev-libs/popt[static-libs(+)] + >=sys-apps/util-linux-2.31-r1[static-libs(+)] + argon2? ( app-crypt/argon2:=[static-libs(+)] ) + gcrypt? ( + dev-libs/libgcrypt:0=[static-libs(+)] + dev-libs/libgpg-error[static-libs(+)] + ) + nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) + openssl? ( dev-libs/openssl:0=[static-libs(+)] ) + pwquality? ( dev-libs/libpwquality[static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) + sys-fs/lvm2[static-libs(+)]" +# We have to always depend on ${LIB_DEPEND} rather than put behind +# !static? () because we provide a shared library which links against +# these other packages. #414665 +RDEPEND="static-libs? ( ${LIB_DEPEND} ) + ${LIB_DEPEND//\[static-libs\([+-]\)\]} + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + virtual/pkgconfig +" + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch +) + +pkg_setup() { + local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" + local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" + local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" + check_extra_config +} + +src_prepare() { + sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die + default +} + +src_configure() { + if use kernel ; then + ewarn "Note that kernel backend is very slow for this type of operation" + ewarn "and is provided mainly for embedded systems wanting to avoid" + ewarn "userspace crypto libraries." + fi + + local myeconfargs=( + --disable-internal-argon2 + --enable-shared + --sbindir=/sbin + # for later use + --with-default-luks-format=LUKS2 + --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" + --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) + $(use_enable argon2 libargon2) + $(use_enable nls) + $(use_enable pwquality) + $(use_enable reencrypt cryptsetup-reencrypt) + $(use_enable !static external-tokens) + $(use_enable static static-cryptsetup) + $(use_enable static-libs static) + $(use_enable udev) + $(use_enable !urandom dev-random) + $(use_enable ssh ssh-token) + $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') + ) + econf "${myeconfargs[@]}" +} + +src_test() { + if [[ ! -e /dev/mapper/control ]] ; then + ewarn "No /dev/mapper/control found -- skipping tests" + return 0 + fi + + local p + for p in /dev/mapper /dev/loop* ; do + addwrite ${p} + done + + default +} + +src_install() { + default + + if use static ; then + mv "${ED}"/sbin/cryptsetup{.static,} || die + mv "${ED}"/sbin/veritysetup{.static,} || die + mv "${ED}"/sbin/integritysetup{.static,} || die + if use ssh ; then + mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die + fi + if use reencrypt ; then + mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die + fi + fi + find "${ED}" -type f -name "*.la" -delete || die + + dodoc docs/v*ReleaseNotes + + newconfd "${FILESDIR}"/2.4.0-dmcrypt.confd dmcrypt + newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt +} + +pkg_postinst() { + tmpfiles_process cryptsetup.conf +} diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch new file mode 100644 index 000000000000..1777a02652ce --- /dev/null +++ b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch @@ -0,0 +1,34 @@ +From a1b577c085cc9ef6b95c4556ec8815070828ee6c Mon Sep 17 00:00:00 2001 +From: Hector Martin <marcan@marcan.st> +Date: Fri, 17 Sep 2021 05:44:18 +0000 +Subject: [PATCH] Do not attempt to unload external tokens if + USE_EXTERNAL_TOKENS is disabled. + +This allows building a static binary as long as --disable-external-tokens is used +--- + lib/luks2/luks2_token.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c +index d34cebf5..88d84418 100644 +--- a/lib/luks2/luks2_token.c ++++ b/lib/luks2/luks2_token.c +@@ -245,6 +245,7 @@ int crypt_token_register(const crypt_token_handler *handler) + + void crypt_token_unload_external_all(struct crypt_device *cd) + { ++#if USE_EXTERNAL_TOKENS + int i; + + for (i = LUKS2_TOKENS_MAX - 1; i >= 0; i--) { +@@ -258,6 +259,7 @@ void crypt_token_unload_external_all(struct crypt_device *cd) + if (dlclose(CONST_CAST(void *)token_handlers[i].u.v2.dlhandle)) + log_dbg(cd, "%s", dlerror()); + } ++#endif + } + + static const void +-- +GitLab + diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest index 2f892050a56f..282c40e029e3 100644 --- a/sys-fs/dosfstools/Manifest +++ b/sys-fs/dosfstools/Manifest @@ -1,3 +1,3 @@ DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 -EBUILD dosfstools-4.2.ebuild 924 BLAKE2B d075f85623853b3b862968fae53bfa6e1e09dbdd6607d86ce2b746e85eb38c2eea693253930e5179b73fd3cd19821b0cb6cc43ea380a4fba7ac8e71f1e80379b SHA512 22cfe56a3f267ec5770d2f5669382e09dc60f18b808b8927f25d16290efc9b2076f8bcd894062732bbe841682e313909e0d1139e1c764a96dd416159a229c10e +EBUILD dosfstools-4.2.ebuild 923 BLAKE2B ab06e47ad58b6fd88bd200c7a4ab408b1d15aea936ca6e2120f535ee8b2e50019ca5a0c2af6c0a81aa18865a7b439ed613eadae38cd1427ab6d44894057dcb6d SHA512 4830af78f5b1e7c017505b19d22115b0e31acec31ef1c8939fecba2f1399425657538b0079755e8418fe6cf28d34a3d9a40f6ecb89a1968a6bc8312e8c638457 MISC metadata.xml 497 BLAKE2B c2133e8e9cacc48ae4cad373a4414ab5b3884b640eac5ffd7bf88b08ee8c741c43dcfd9a8c339cbdeb37354e424580beb058b79c58440ce85d1b1ce53a94b57b SHA512 b8e2647a85edd7cffbe3fd91560ad8c0c6f4aaf66b67db9d41268ec17001ded8da4a9e7aefdcae00737e7ece5f7cd1e47f9101dc3323d4679d059043c1d686d4 diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild index bfc1083c8d38..b26ba281f342 100644 --- a/sys-fs/dosfstools/dosfstools-4.2.ebuild +++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="compat +iconv test" RESTRICT="!test? ( test )" diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 931cf6802f77..ed700e6e8e15 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04 EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5 EBUILD e2fsprogs-1.46.3.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136 -EBUILD e2fsprogs-1.46.4.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136 +EBUILD e2fsprogs-1.46.4.ebuild 4014 BLAKE2B ac2a45cb2877a952fbe58fbc0d15d3110ff250a65a103933a0d952d371ca0917bc9e481b141da0963522d312ab72fddc59200bf178c6f64627963d3be5b17bda SHA512 81971cf3e057093ca600fa5041b01449ee321bd8293f07d62283b62fb755bace5791b9eb173d080a668d39131cc64146092ff579ecdb7792e93e95f53f805b29 MISC metadata.xml 704 BLAKE2B a3986eb376f5e2416b1588bba5de134c62c45f0f0d952973f8a6adafbdfac19e81111f0b558592c914c71b072d1e51a6d98dd89f2488f9abbd5b81ebdf3906db SHA512 3059a0e8fd73db411e44749af435e061eda76fe908cbde14ce6e1ed3cc316f5f3e895632e92f789ced0b96766124eecf61885444755615ced25e137b32e9f7e7 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild index 963bf42ad0c5..2449fbcf989c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest deleted file mode 100644 index b92fd1519eb3..000000000000 --- a/sys-fs/e4rat/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX e4rat-0.2.2-libdir.patch 509 BLAKE2B dda800fb005994a737b7331bb07c69bdfa79ac5e0ad49a6a001319177963b671dfaa32dea28e155ecbf31d345a1b2e1b9cc30dfea4ad496d5107b2d2c8d74c7b SHA512 c942b1fe189500c666e0994c3b7563a96b05fe065f0b3c2ff5f99bb3a0b462cc13e5ac6ecc692e10d6eec43f2d83c1f80bed7c3f354cda3f3f0d85d358e85d0f -AUX e4rat-0.2.2-shared-build.patch 2560 BLAKE2B dfacdf9ff70d8d1335947eae3e61d1a152aa91459e090eb9212bcf113fc843c60af75c28aceae4f76939d8ba0ed2611a029fec5b3aab83b2638190ac9d04401a SHA512 0cb8acc4c2df6cc92574f46153516dbc0cb91240cccb46e2879d60a515af066688db3c79a5f66cf5da43b5a51a85c9cea22cef52178ebea5aec7c267f67562d0 -AUX e4rat-0.2.4-gcc6.patch 542 BLAKE2B 9548cb2f2fa7f7d43db35e0f97915fa2a81d63f934637b7190e66626322d41c444943867a78e121bd06ff09d27d3eb2606a535e008512fe917bf16422ec9a491 SHA512 9bb843a0359acb843a513f701b71a2b666c550d28708a14cdc6e77c4fc56362a10990cfe3fbed2ff9724dc71bc0be6ec72be4309b6e2383120ca75697f359512 -AUX e4rat-0.2.4-strdup.patch 1427 BLAKE2B 1ab2f089f346ac635a8417d9e608695e18f77d12c15cf0fa35b4c1dc1fdfca2761308e8d21b1fa2daeee83e82f9f893a9d4e014e77538c3d345b2cca4b85676a SHA512 62d2b4b2b5e8a9b309b920d20fee98057f7e7564cf86e01f8d4cbd3219b47caf7d78ddfe71b01fde46997bb8966e2ce76df4d32ec6ab9a6190a1351bc2faf6cc -AUX e4rat-0.2.4-sysmacros.patch 288 BLAKE2B de96b8e8dc03359e2eda1357dcd76233ac9a7a5e6a6c8f2c187372e5dcfeccc3eb89d8aa349a0a07e2fc7ab59320428b46c3dcd5c45c0eb2433bfdc63355806f SHA512 50883828bf95368c31c620fac46728c6bfaf768a794158b30614cb2c0b7a65ee82e8bcf12268a26de93e87fb6b0466bc93e29a7dd69895234693745e24a6da59 -DIST e4rat-0.2.4_pre20141201.tar.xz 60408 BLAKE2B 4ebedfcca7f21bb1f3be59dac64694e0f69ecb5ebdc1637210c68097178e2ae38959581a51fc55b8773d63ce629aaf69765bb755d45467bf5e4f4e741b715101 SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9 -EBUILD e4rat-0.2.4_pre20141201-r1.ebuild 1601 BLAKE2B bfa6e4fd6b0e10a1df31e389d3f2cf1e8932415ec2a33c02dd9d181ce9550ddf9043aa50cf9d0d5898cf2d3bf9b2c9d351bf4ad8e2c142f001317e14285b500d SHA512 2d0a19bb976f99ef8b39f170d5d4838e543641e9e1cc546a51222509d37a9def78cd01fed26095ce7060053d417fe985d58cfaf85e45630c35c6212c4319f0e7 -MISC metadata.xml 326 BLAKE2B abd41d1b0f40f0715448c83bd0a538e09eb17c52b1ec0b39439d86eb01a0b1c7ed9e2ab8e40ff78b3a2a5d0fcc5cd61539e5d80157fef09e1c4f99a5d3299ba0 SHA512 95ce588cf88254ccf5fa02e357e62c26f8a5996d2615bf4610f18db255d2eb7dc14b865863c6700be7ea7870aede748e82a570e85372b0e75e17c31701bdde23 diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild deleted file mode 100644 index 1894e09017df..000000000000 --- a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils linux-info readme.gentoo-r1 - -DESCRIPTION="Toolset to accelerate the boot process and application startup" -HOMEPAGE="http://e4rat.sourceforge.net/" -#SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz" -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-lang/perl:= - >=dev-libs/boost-1.42:= - sys-fs/e2fsprogs - sys-process/audit[static-libs(+)] - sys-process/lsof -" -DEPEND="${RDEPEND}" - -CONFIG_CHECK="~AUDITSYSCALL" - -PATCHES=( - "${FILESDIR}"/${PN}-0.2.2-shared-build.patch - "${FILESDIR}"/${PN}-0.2.2-libdir.patch - "${FILESDIR}"/${PN}-0.2.4-sysmacros.patch #580534 - "${FILESDIR}"/${PN}-0.2.4-gcc6.patch #594046 - "${FILESDIR}"/${PN}-0.2.4-strdup.patch -) - -pkg_setup() { - check_extra_config - DOC_CONTENTS=" - To launch systemd from e4rat you simply need to edit /etc/e4rat.conf - and set:\n - ; path to init process binary (DEFAULT: /sbin/init)\n - init /usr/lib/systemd/systemd" -} - -src_install() { - cmake-utils_src_install - # relocate binaries to /sbin. If someone knows of a better way to do it - # please do tell me - dodir sbin - find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \ - || die - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - if has_version sys-apps/preload; then - elog "It appears you have sys-apps/preload installed. This may" - elog "has negative effects on ${PN}. You may want to disable preload" - elog "when using ${PN}." - fi -} diff --git a/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch b/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch deleted file mode 100644 index eaa2695d7872..000000000000 --- a/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: e4rat-0.2.2/src/CMakeLists.txt -=================================================================== ---- e4rat-0.2.2.orig/src/CMakeLists.txt -+++ e4rat-0.2.2/src/CMakeLists.txt -@@ -170,8 +170,7 @@ endif(NOT BUILD_CORE_LIBRARY_STATIC) - - INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS} - RUNTIME DESTINATION "sbin" -- LIBRARY DESTINATION "lib" -- ARCHIVE DESTINATION "lib" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) - - INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}") diff --git a/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch b/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch deleted file mode 100644 index 636eb52fb612..000000000000 --- a/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: e4rat-0.2.2/CMakeLists.txt -=================================================================== ---- e4rat-0.2.2.orig/CMakeLists.txt -+++ e4rat-0.2.2/CMakeLists.txt -@@ -14,7 +14,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D - set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE) - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - --set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_MULTITHREADED OFF) - add_definitions(-DBOOST_FILESYSTEM_VERSION=2) - find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED) -Index: e4rat-0.2.2/src/CMakeLists.txt -=================================================================== ---- e4rat-0.2.2.orig/src/CMakeLists.txt -+++ e4rat-0.2.2/src/CMakeLists.txt -@@ -131,21 +131,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "debug") - ) - ENDIF(CMAKE_BUILD_TYPE STREQUAL "debug") - --# On 64 bit architecture you cannot link a static to a shared library --# Therefore -static-libstdc++ will fail. --if(BUILD_CORE_LIBRARY_STATIC) -- add_library(${PROJECT_NAME}-core STATIC -- ${${PROJECT_NAME}-core_SRC} -- ) --else(BUILD_CORE_LIBRARY_STATIC) -- add_library(${PROJECT_NAME}-core SHARED -- ${${PROJECT_NAME}-core_SRC} -- ) -- set_target_properties(${PROJECT_NAME}-core PROPERTIES -- SOVERSION 0 -- LINK_FLAGS "-static-libgcc -static-libstdc++" -- ) --endif(BUILD_CORE_LIBRARY_STATIC) -+add_library(${PROJECT_NAME}-core SHARED -+ ${${PROJECT_NAME}-core_SRC} -+) -+set_target_properties(${PROJECT_NAME}-core PROPERTIES -+ SOVERSION 0 -+) - - target_link_libraries(${PROJECT_NAME}-core - ${${PROJECT_NAME}_LIBRARIES} -@@ -158,15 +149,13 @@ foreach( EXE ${PROJECT_NAME}-collect - TARGET_LINK_LIBRARIES(${EXE} - ${PROJECT_NAME}-core - ) -- set_target_properties(${EXE} PROPERTIES -- LINK_FLAGS "-static-libgcc -static-libstdc++" -- ) - endforeach( EXE ) - - ### - # install project targets - ### - set(${PROJECT_NAME}_TARGETS -+ ${PROJECT_NAME}-core - ${PROJECT_NAME}-collect - ${PROJECT_NAME}-preload - ${PROJECT_NAME}-realloc -Index: e4rat-0.2.2/src/cmake/Findaudit.cmake -=================================================================== ---- e4rat-0.2.2.orig/src/cmake/Findaudit.cmake -+++ e4rat-0.2.2/src/cmake/Findaudit.cmake -@@ -1,7 +1,7 @@ - FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include - /usr/local/include) - --FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib) -+FIND_LIBRARY(AUDIT_LIBRARY NAMES audit PATH /usr/lib /usr/local/lib) - - IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY) - SET(AUDIT_FOUND TRUE) diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch b/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch deleted file mode 100644 index cdf14e5c92eb..000000000000 --- a/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- e4rat-0.2.4_pre20141201/src/logging.hh.old 2016-09-21 22:01:37.631925077 -0400 -+++ e4rat-0.2.4_pre20141201/src/logging.hh 2016-09-21 22:01:44.351086734 -0400 -@@ -93,7 +93,7 @@ - #define dump_log(...) logger.write(__VA_ARGS__) - - #ifdef DEBUG_ENABLED -- #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): "format, __FILE__, __LINE__, __FUNCTION__, ## args) -+ #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): " format, __FILE__, __LINE__, __FUNCTION__, ## args) - #else - #define debug(format,args...) - #endif diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch deleted file mode 100644 index c3a9cd0e8ca0..000000000000 --- a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- e4rat-0.2.4_pre20141201/src/e4rat-collect.cc.orig 2014-11-24 12:12:12.000000000 +0300 -+++ e4rat-0.2.4_pre20141201/src/e4rat-collect.cc 2017-02-12 02:16:25.151757182 +0300 -@@ -32,6 +32,7 @@ - #include <fcntl.h> - #include <fstream> - #include <signal.h> -+#include <cstring> - - /* EXT2_SUPER_MAGIC */ - #include <ext2fs/ext2_fs.h> -@@ -361,7 +362,9 @@ - { - create_pid_late = true; - -- outPath = Config::get<std::string>("startup_log_file").c_str(); -+ // It is unsafe to use Config::get<T>(arg)c_str() pointer -+ // directly, since it may be overwritten by later get calls. -+ outPath = strdup(Config::get<std::string>("startup_log_file").c_str()); - verbose = 0; - } - else ---- e4rat-0.2.4_pre20141201/src/e4rat-preload.cc.orig 2014-11-24 12:12:12.000000000 +0300 -+++ e4rat-0.2.4_pre20141201/src/e4rat-preload.cc 2017-02-12 02:16:38.425552630 +0300 -@@ -25,6 +25,7 @@ - - #include <iostream> - #include <fstream> -+#include <cstring> - - #include <sys/types.h> - #include <sys/stat.h> -@@ -227,7 +228,8 @@ - try { - if(getpid() == 1) - { -- const char* logfile = Config::get<std::string>("startup_log_file").c_str(); -+ // pointer may change, string must be copied -+ const char* logfile = strdup(Config::get<std::string>("startup_log_file").c_str()); - notice("Open %s ... ", logfile); - FILE* infile = fopen(logfile, "r"); - if(!infile) diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch b/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch deleted file mode 100644 index 5cdcf3f05ae5..000000000000 --- a/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://sourceforge.net/p/e4rat/tickets/5/ -https://bugs.gentoo.org/580534 - ---- a/src/common.hh -+++ b/src/common.hh -@@ -20,6 +20,7 @@ - #ifndef COMMON_HH - #define COMMON_HH - -+#include <sys/sysmacros.h> - #include <linux/types.h> - #include <boost/filesystem.hpp> - #include <boost/regex.hpp> diff --git a/sys-fs/e4rat/metadata.xml b/sys-fs/e4rat/metadata.xml deleted file mode 100644 index cb0a6ad46562..000000000000 --- a/sys-fs/e4rat/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">e4rat</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest index 2ec08847aaaa..0c1fcc61a68e 100644 --- a/sys-fs/inotify-tools/Manifest +++ b/sys-fs/inotify-tools/Manifest @@ -1,8 +1,9 @@ -AUX inotify-tools-3.20.1-rm-unused-cmd-arg.patch 495 BLAKE2B e838d5af6f64a1bc9b7693d61b822199de43afa79b071390df20fc301f5c1fd27c71d4470b0ad8844f2b3f9421382f3fba505336f5ba9433590b63017b62e896 SHA512 baf8805d3463f849dc6830177c2b72273dfde7baf025266d95b26662b69f003ca0fd9511561d523a59f37a2e9a2d23bf3e51d3687be000263ef60136af87b677 -DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2 DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881 -EBUILD inotify-tools-3.20.1.ebuild 878 BLAKE2B 9b6f38589aeefaeacb4d2591c4dfd01566b195a076a385f814db48e909ab0cc77b402164215f989a6645f2b390f312bbf372fcc180fb4ab38728e86b31b7f2de SHA512 17aa77439aaccb143eca5509373d3ff05499eec793bced223dc508291b7130c27ed9c64070118da6be24751bfba49bc695309894e4d2fecbe571e1adb2a21f93 +DIST inotify-tools-3.21.9.1.tar.gz 91378 BLAKE2B a7d5d7ed2f63e186ed68d42ec443c43ae75e575d553221a11cd6991421d5d5b8c5447144a2e5cbc7dbad1d603e3cc120429ef5c91ac67994a82ea530c54142c0 SHA512 2a4d9f2e98b1f0263745c533fc06cd9f23bf9c793e9a8a3a944c7312f8d2b8e223caafbdd17b81e6dc0e29d85dd1730aef9341ed282992b4333d6d79cbfb3f99 +DIST inotify-tools-3.21.9.5.tar.gz 91711 BLAKE2B cf6575cdd445a823c8272a9f8394ed241af1cc729784ec363c9dac6cd3c5cf37856076e88d389669d9da768b899e7ecb64c997e25b42cd5fccc2ebbbf145b273 SHA512 d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97 EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57 +EBUILD inotify-tools-3.21.9.1.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f +EBUILD inotify-tools-3.21.9.5.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833 diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch b/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch deleted file mode 100644 index 8c4f6f510e2f..000000000000 --- a/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inotify-tools-3.20.1/src/Makefile.am -+++ inotify-tools-3.20.1/src/Makefile.am -@@ -2,7 +2,7 @@ - inotifywait_SOURCES = inotifywait.c common.c common.h - inotifywatch_SOURCES = inotifywatch.c common.c common.h - --AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src -+AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src - AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src - LDADD = ../libinotifytools/src/libinotifytools.la - diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild index 8874ede472d9..1cc912c8d9cc 100644 --- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild +++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="a set of command-line programs providing a simple interface to inotify" -HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki" -SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/inotify-tools/inotify-tools" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86" IUSE="doc" -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -PATCHES=( "${FILESDIR}/${P}-rm-unused-cmd-arg.patch" ) +BDEPEND="doc? ( app-doc/doxygen )" src_prepare() { default + + # Remove -Werror from CFLAGS (#745069) + find -name "Makefile.am" -print0 \ + | xargs --null sed 's@ -Werror@@' -i || die + eautoreconf } src_configure() { # only docs installed are doxygen ones, so use /html local myeconfargs=( + --disable-static --docdir='$(datarootdir)'/doc/${PF}/html $(use_enable doc doxygen) ) @@ -35,5 +38,5 @@ src_configure() { src_install() { default - find "${ED%/}" \( -name '*.a*' -o -name '*.la' \) -delete || die + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild new file mode 100644 index 000000000000..1cc912c8d9cc --- /dev/null +++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="a set of command-line programs providing a simple interface to inotify" +HOMEPAGE="https://github.com/inotify-tools/inotify-tools" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86" +IUSE="doc" + +BDEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + default + + # Remove -Werror from CFLAGS (#745069) + find -name "Makefile.am" -print0 \ + | xargs --null sed 's@ -Werror@@' -i || die + + eautoreconf +} + +src_configure() { + # only docs installed are doxygen ones, so use /html + local myeconfargs=( + --disable-static + --docdir='$(datarootdir)'/doc/${PF}/html + $(use_enable doc doxygen) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest index feb6a98da97d..f54fa2ee166d 100644 --- a/sys-fs/lsscsi/Manifest +++ b/sys-fs/lsscsi/Manifest @@ -1,3 +1,3 @@ DIST lsscsi-0.32.tgz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145 -EBUILD lsscsi-0.32.ebuild 344 BLAKE2B 485bc831bab9fa314332d3c5eceb1a7eb4e9df294ea762997a69a371f5b83b550409c5378b112c0bf8e1365a249ad511d9ada1ad81661e30d027482574ee11c3 SHA512 ef6f1cad2f0df955fe8d9141ec4d543cb47d8569f3cda317e396c42303c0c7f0c3d2d2e97588060307d99bb2fa498eccff22f1e8d32842bed6fbd84fab3e7048 +EBUILD lsscsi-0.32.ebuild 343 BLAKE2B 529dc33ad3e3bc6a4b22262950fe910a9ad9231abba6720fad097c65edc57ca17435ef0b0e8fa546dc75bf685bd7c585dffff7fefce4f90e69f5c256520b1147 SHA512 ad3ff177385b3914a97e7b5078df6c7dc7e0194c7c42d056bc31dca76c177498b448e33ebc0be5d08a694deb68ce77cfa675fb0ef0abf2df8cc43d8904a53fca MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/lsscsi/lsscsi-0.32.ebuild b/sys-fs/lsscsi/lsscsi-0.32.ebuild index 1c2edaae5096..87dc5d893180 100644 --- a/sys-fs/lsscsi/lsscsi-0.32.ebuild +++ b/sys-fs/lsscsi/lsscsi-0.32.ebuild @@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index ced212f7c9d6..74d251118b9a 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -32,6 +32,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca DIST LVM2.2.03.13.tgz 2619537 BLAKE2B 8f93896105e4d392ab88f027bbc0ea874b179a73d10ff8d0850ead2625e86468fe69d55c6fb0108f57a1efc1d3e8cc94647f1bc06636e4a714d0817224bbbfd7 SHA512 8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a -EBUILD lvm2-2.02.188-r2.ebuild 10107 BLAKE2B 3082ec5a25f95e278dbac74804a57dd680e1977f6aba5258f3df4ff977d6d1593076986920c8001c47337c31298e39dd15ef575309a8fe4ac9fb1f47300f01c5 SHA512 8231a8d3d3863dce3d0808ddea31c89983b0a95a0ee864fe8609a5fe40fb923c236f53f841a402f738e74c3c4cd516ddf1ef099f7fd2a943934f9188721da455 -EBUILD lvm2-2.03.13-r2.ebuild 9617 BLAKE2B bca93a9e1e0dc6d332cdecb89b58498447e0acbec1af0575fffbd131d4f07a05c30e18b025b57754ec3854cab5648a9df7108e063db8ef4c0d89c4c86545b96a SHA512 0a8f7b1df17eff2211ca297e0640de04b1572fa2e35d84ca4761c033b0970247558cc0a9969f0ae61ba0791cc982ac29bee9f1857afea860b56689b464a5b6c7 +EBUILD lvm2-2.02.188-r2.ebuild 10201 BLAKE2B b5e314a58938aac469c41deacfccbae61764e6935cdde28aaae27c793ba0fed0ddbd3606ddce0a16187aaa6755f8a513e56a20066c9222a9f439980a7c602579 SHA512 d7d1f489eb84101a5c98b2d40dc73742329aec811c0feaeb9ac459a04d2f018fd9ecc13913b70a2a3524df97e2e461106631d425bee4515c021da3385b5322e5 +EBUILD lvm2-2.03.13-r2.ebuild 9711 BLAKE2B 06e679ec5390c0298f1716256002b1a7dec3e700b081b647de213218a8a300bafe69e608b9bbbf36f2f45333d64c423ef645af141cbaca37bb958d1f4f5c2356 SHA512 dcf402220a61614591559c4a274cafba896dcf3cd4318182e3c0ed8e62fa37f2a7d68be652b83daa28b189d5ef263e4f7471c01f4d1ca79024bf8802f187588c MISC metadata.xml 1035 BLAKE2B 363c4aefb6831140dbad128de1856a51025a267ec3f91c8e904623acd37f768241476e75c0445188a22892c1c7f63ad30302c7325f529c024d9cd0939dfba91d SHA512 6b4c9f27d96b1b90362db7d167d9f9b05f5f7f8d70394502d4cd581e8677c184ff05cf8474882902dce6c5ac746ec9c73d8a09ee8fb12ec48e006e13372c1f92 diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild index a6c786adcc2d..dcba617a6048 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic +TMPFILES_OPTIONAL=1 +inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" HOMEPAGE="https://sourceware.org/lvm2/" @@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON} !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) + !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} @@ -265,7 +267,9 @@ src_install() { } pkg_postinst() { - tmpfiles_process lvm2.conf + if ! use device-mapper-only; then + tmpfiles_process lvm2.conf + fi if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild index f6c64e6f5d1b..f23621e8619b 100644 --- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic +TMPFILES_OPTIONAL=1 +inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" HOMEPAGE="https://sourceware.org/lvm2/" @@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON} !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) + !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} @@ -253,7 +255,9 @@ src_install() { } pkg_postinst() { - tmpfiles_process lvm2.conf + if ! use device-mapper-only; then + tmpfiles_process lvm2.conf + fi if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 9cc25b95631f..8b50dce2d41e 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -9,6 +9,6 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859 DIST mdadm-4.2-rc2.tar.xz 452724 BLAKE2B c13c031450a93a3e74c286a84cca541a32041ad7611a2a427539f8583404a9c1b7dffb2565d7cf72fe4b43c79e4dd144ad3b76c65193cc05c9f0da0bf08a8ee5 SHA512 09a3657284c7f98892f5be663d5e034252ff319d8ff1d235597efc373c156188d450e12f64a9a0fb9266b00035c1602133e487ce1961db1a12db05f7f9829249 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63 DIST mdadm_4.2~rc2-1.debian.tar.xz 89160 BLAKE2B 055fb705fde6c47bf4187eb596e1bba3eb4b0e47f79e1b8d134f18dacb363dc3a434959a2d337a6e33b714d5b34b1359853fcfdc91d50b8f6ab14ad5015cdb51 SHA512 2900bae6b8133ddaaa29a83856b16ebe3ae5bb16aea4d252318392e6c789a11df16d874c101316e90df124b1dea0c939cd5b6fcb07f7c09abf5eabe1d2202113 -EBUILD mdadm-4.1.ebuild 2383 BLAKE2B a7a13ea02c86332e7c7ccec0f901cfc8e302a9d45f4c05c71edc0cc9cfff1185fd373cbfa458d2d3a7e16574c8f8999d6fda6a8b5f90588dc33552af729d0bdd SHA512 ea2f1236c2e0dd28ef139320e0e3bd2f8e432397081d2a3d6765f3f0300d6a362ec3fc6e756af064b0c5d35a0a49f89df7c18d9f3fc1d097a6895de2c867f5a0 -EBUILD mdadm-4.2_rc2.ebuild 2395 BLAKE2B b2dc049808b2bae2de7d02842986522196a496b9cd0ffd3859b9dc2152bb65834c21dfee03b5489795d10d55af5b9051c67f1dbb8e53f71c8fa82e01a105c9c9 SHA512 36b5f31a7f10ff937f81a91a9e99b60406611bd0b834e26e2712bd2877a69e08b4695749d92d7dafa8b7f2afa56b4965cf86b368b87a047aedb309e15220282f +EBUILD mdadm-4.1.ebuild 2390 BLAKE2B f087e92607145b9e9235a4da6571d2a691a5f69072cfd40b183422411f4b1c8a41049b8350ff0761c79527afef6ca759e7dcdde42cd7c7bb6620795aef69da7d SHA512 b80d6eec601955155730be28e81fe8b260eeedb3eedc20edd677d5c56fd416ac5b8fac93ecad7047e3e28441437bd3f3b0359de0735933dc9454c31e961d56ea +EBUILD mdadm-4.2_rc2.ebuild 2402 BLAKE2B 8c738fa38d12509b61c0248ce0eca4aea24c2d9faa3b4fdf878f83e0e18480861cb1ac81533b61d2d510a4a44a22f4d3a184b35572603381943fccf8ad833e79 SHA512 09d2e6c2f64e4d19f9c583d4de24e5219c30b41a3f7b584318975f5ef814930465bc52dd7af7557ead249849f2ed00fd38d8de27f0c9e8421dd4319b6085eaf7 MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild index cfac54750561..21649c23547f 100644 --- a/sys-fs/mdadm/mdadm-4.1.ebuild +++ b/sys-fs/mdadm/mdadm-4.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="static" BDEPEND="virtual/pkgconfig diff --git a/sys-fs/mdadm/mdadm-4.2_rc2.ebuild b/sys-fs/mdadm/mdadm-4.2_rc2.ebuild index ce30130e13d8..148a4e327326 100644 --- a/sys-fs/mdadm/mdadm-4.2_rc2.ebuild +++ b/sys-fs/mdadm/mdadm-4.2_rc2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="static" BDEPEND="virtual/pkgconfig diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 48c69521bfd8..722cca38ce16 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,5 +1,5 @@ DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5 DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10 EBUILD mtools-4.0.31.ebuild 1051 BLAKE2B bbfb5be0365c8e98d06fb0c0e96b775c38b346dacb93c9a7cd467930d6ae7a4212b20b92095629ddc3dd33c9acbd16bbd05bf9e259b3660ec63f67a24dfd6cb5 SHA512 f754225dfa3a840325d80127123b4095a8dd25f76db0c7fb067805ac06e11f25918f55549aae4fcf7ea26d29a66f01c3a5d2dfecc0bf8a9a14ad569f269324cc -EBUILD mtools-4.0.35.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931 +EBUILD mtools-4.0.35.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/mtools-4.0.35.ebuild b/sys-fs/mtools/mtools-4.0.35.ebuild index 3ebdd3b6df91..eba20aaf2121 100644 --- a/sys-fs/mtools/mtools-4.0.35.ebuild +++ b/sys-fs/mtools/mtools-4.0.35.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris" IUSE="X elibc_glibc" RDEPEND=" diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 3d1fbe36145c..d2265be7698f 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,7 +1,10 @@ AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47 AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538fc5c7babe920b47e94af8e8bca53f4c8e71f612517430a64d371d6fb2480c5d9b706198f32015ed323c45f9034d22c8bddaecc2bd11d0c671513 SHA512 446c756fd947daecae790733f9c15ca0e7bc902b9aa832a4f4f4625d3fc74f5f7772402f37fd48f0498ca281ae484690d3f1c913cc2dfea6cca9f7b5f8b43b4b +AUX multipath-tools-0.8.7-respect-flags.patch 693 BLAKE2B 298948ad60635be15ae8b83eb0e43e46a8055b22ac351b317c435ff20728e37dd6d371eb0898c5d764490affa7b8dc878faacb2d3084ff3aa49cc102341774d5 SHA512 03573d907ef34e610e9b4e993640ab2b44be52f0b335390435cdc3d33351c5e378c421eeae0706e62000e9f1d95b118afd5a17292e0a1051c680c717b1b9b0bd AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38 +DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805 +EBUILD multipath-tools-0.8.7.ebuild 2137 BLAKE2B 50a467391eaa17596cae6c6655e5435cf5c9abca4ae2b29440b7352a45977320cce318e720b83e967d01c522d75e562593742f4bc9dae180e8dd8c222e5cb374 SHA512 2597ca9d4e29d2bc2b4cb3bdbb46d7eab73ac9edd1dce8a3584d50d307aece436dbf26d23bb8ab03f4abe5ead4bd9058922368cfddc5019a29bba77daa37fa26 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch new file mode 100644 index 000000000000..43c03883ee07 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch @@ -0,0 +1,14 @@ +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -101,8 +101,9 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 + WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ + -Werror=implicit-function-declaration -Werror=format-security \ + $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) +-CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 +-CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ ++CPPFLAGS ?= -Wp,-D_FORTIFY_SOURCE=2 ++CFLAGS ?= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe ++CFLAGS += --std=gnu99 \ + -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ + -MMD -MP + BIN_CFLAGS = -fPIE -DPIE diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild new file mode 100644 index 000000000000..b078cc97d9d7 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit linux-info systemd toolchain-funcs udev + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/json-c:= + dev-libs/libaio + dev-libs/userspace-rcu:= + >=sys-fs/lvm2-2.02.45 + >=virtual/libudev-232-r3 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND} + test? ( dev-util/cmocka )" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch + "${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.patch +) + +src_prepare() { + default + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proper configure system + if ! use rbd ; then + sed \ + -e "s/libcheckrbd.so/# libcheckrbd.so/" \ + -e "s/-lrados//" \ + -i libmultipath/checkers/Makefile \ + || die + fi +} + +src_compile() { + tc-export CC + + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + LIB="${EPREFIX}/$(get_libdir)" \ + LIBDM_API_FLUSH=1 \ + PKGCONFIG="$(tc-getPKG_CONFIG)" +} + +src_install() { + dodir /sbin /usr/share/man/man{3,5,8} + emake \ + DESTDIR="${D}" \ + LIB="${EPREFIX}/$(get_libdir)" \ + RUN=run \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \ + install + + newinitd "${FILESDIR}"/multipathd-r1.rc multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest index e0ec07f040b5..364eb440a684 100644 --- a/sys-fs/ubi_reader/Manifest +++ b/sys-fs/ubi_reader/Manifest @@ -1,3 +1,3 @@ DIST ubi_reader-0.7.0.tar.gz 30298 BLAKE2B ea9ab8270ed24974a679452840cdb298535e342631fcf3979a0a52c0662bf710729ddc451780227c866bb2a2febffef071a9ddf13a311d2eb766ad0827f548da SHA512 4bf80ab9e0151f3c1ec20965513732846ab32c21d0813c75b4fae8ec2576e224c6406f1c5415fc90bcd4327c7a82bbcc9ab240c9b22b3d0441584208abc89b74 -EBUILD ubi_reader-0.7.0.ebuild 503 BLAKE2B 4bddcb8b299f58a311b18e9518b45758b5444be4c0a24597c9f8b1c1a1adc951c3919de64ba38929962199e9591a5df193d04830c735d052a0dc9f5dbf932717 SHA512 16bbdcf78550301aa32e41dc9635e8581ee82904a0aa5771f28d6ba517289a97e40f3276c2babe208067f8fd9f0e71444e643885ab6f885843d2baa79eee6363 +EBUILD ubi_reader-0.7.0.ebuild 481 BLAKE2B 6dd59b523d2a4e2899430297fffcae2ec55f27808c5a2b9408843fde37fb9309f3c34c127ed652a4abcce9d7a15656def2895111673c052f56970bfa3509ff5f SHA512 dca066f3d0ee0c4d1f067b8aed9bc9b5ed25804e0ced8a29febc164fd0814eaa3424dbc833dc25f87aeffa9aaa0bcd4784d37b890f7f99e66738fedf1598bcae MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03 diff --git a/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild b/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild index d9accb971c86..458bf4321eda 100644 --- a/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild +++ b/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild @@ -8,7 +8,6 @@ PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 MY_PN="${PN/_/-}" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Collection of Python scripts for extracting data from UBI and UBIFS images" HOMEPAGE="https://github.com/jrspruitt/ubi_reader" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz" diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest index 206d1dbce94a..04976f0be425 100644 --- a/sys-fs/unionfs-fuse/Manifest +++ b/sys-fs/unionfs-fuse/Manifest @@ -1,4 +1,6 @@ DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0 +DIST unionfs-fuse-2.2.tar.gz 47955 BLAKE2B 44ce19b5b857a571da4722af7d19f4c59a5ca222a9d5d544529ef6c4be5125518ffc62cbbd7b5ac7b88fadd22b8777daf18b23124602f35de1a8a041b27d3cbb SHA512 eaecc203f8fad094221cf16b962e7d32a3aa9b0c945a663ce027aba3b7c4152a4dba8d5e96cb63d147f5ecd216cae29b53de946d74a939cde486dcea95d947df EBUILD unionfs-fuse-2.1.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 +EBUILD unionfs-fuse-2.2.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 EBUILD unionfs-fuse-9999.ebuild 964 BLAKE2B 16297e64d3137ac4562c1ceece6c341ec31a4b53e6b63ea86b59b4ac4986565051b6b4cc858e309b7f035c0d606ddc0ef7001f89ac3408b1b0ad3dc962090919 SHA512 776252949ac73f675d1935f1c3ea24e5801b55c9a2e80b3084c4a05478ee9656d809f917fca7a80141d50cb8713b4aa0c63a9961c5cbeca6a99806974e3fa9aa MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7 diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.2.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.2.ebuild new file mode 100644 index 000000000000..329020ca1173 --- /dev/null +++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="Self-syncing tree-merging file system based on FUSE" +HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse" +SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-fs/fuse:0" +DEPEND="${RDEPEND} + test? ( + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +python_check_deps() { + use test || return 0 + has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} + +src_test() { + [[ -e /dev/fuse ]] || return 0 + addwrite /dev/fuse + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 8d63f2efac23..fa8802067160 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -2,10 +2,16 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa +DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8 +DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a +DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c +DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94 EBUILD zfs-kmod-0.8.6.ebuild 5481 BLAKE2B a367b1cec0374f6c9266bf599944ef5493eae21a91704572f806ec2486707a6d3cae876f52f97d527744c66596204b2dcdb435b2beb7cd182ca524cb991f8915 SHA512 014332fa562aae19d65c3f31ba1179e0c623dc3293e45e51323bb2b279641ee6926ac9d8cca3aba8407b44a2787be19abbaa3945f48e6e40f9aa27b1458e647a EBUILD zfs-kmod-2.0.5.ebuild 5524 BLAKE2B 09188fec56c553b2a5f1cf8f0047b155745ac023cf3656b9f2d6550cd3e208a08807f2eb31fad1c6412ea161a46d26fa82e981fdd29b843cc47ba647fc88952f SHA512 54ef09279cb6a1ae2610c3f78a3384da40af545a368e73701c1e3377972949000337bff9dc9daedc76734dcf2b641457a6a8ba4fae60ab8cec4626fcf64aa135 +EBUILD zfs-kmod-2.0.6.ebuild 5527 BLAKE2B 6f420e4b7ecfe938f73b14f4d735e91291d53608bbd784dcf60f74cc84454fc9a56a0e5f87397f1ce942888a1db46a62fe37aec60b03d915058c5539da69f22c SHA512 b3c13a5411ba13da36a729e5c258724ad3945a0b820953333d465b51fb601c640c4315977c3ae3abf28c5a39168c59c62b9b4e0eb0401fcff24761ebbf3ceec8 EBUILD zfs-kmod-2.1.0.ebuild 4733 BLAKE2B aaa6a4be69435f30069a329854e0f33e963401c70e5b95ff1c418562d0556180659cb52f867475112c889a9d0596f2919fa5e9519c9ec41247f8128da394e447 SHA512 1f2829c7c1c317198e83594066c3e2aaa5931639cfa87920b1a1e1aff827da12c18cbc0ef340d1bda388efae6d59f4135f0ab85fb9f3923e2d8e6e7328deff41 -EBUILD zfs-kmod-9999.ebuild 4733 BLAKE2B aaa6a4be69435f30069a329854e0f33e963401c70e5b95ff1c418562d0556180659cb52f867475112c889a9d0596f2919fa5e9519c9ec41247f8128da394e447 SHA512 1f2829c7c1c317198e83594066c3e2aaa5931639cfa87920b1a1e1aff827da12c18cbc0ef340d1bda388efae6d59f4135f0ab85fb9f3923e2d8e6e7328deff41 +EBUILD zfs-kmod-2.1.1.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04 +EBUILD zfs-kmod-9999.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04 MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild new file mode 100644 index 000000000000..e7c85c6b3e47 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${PV%_rc?}" + ZFS_KERNEL_COMPAT="5.14" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0/${PVR}" +IUSE="custom-cflags debug +rootfs" + +RDEPEND="${DEPEND} + !sys-kernel/spl +" + +BDEPEND=" + dev-lang/perl + virtual/awk +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + +RESTRICT="debug? ( strip ) test" + +DOCS=( AUTHORS COPYRIGHT META README.md ) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + EFI_PARTITION + MODULES + !PAX_KERNEXEC_PLUGIN_METHOD_OR + !TRIM_UNUSED_KSYMS + ZLIB_DEFLATE + ZLIB_INFLATE + " + + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + !DEBUG_INFO_REDUCED + " + + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" + + if [[ ${PV} != "9999" ]]; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + + fi + + kernel_is -ge 3 10 || die "Linux 3.10 or newer required" + + linux-mod_pkg_setup +} + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set module revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi +} + +src_configure() { + set_arch_to_kernel + + use custom-cflags || strip-flags + + filter-ldflags -Wl,* + + # Set CROSS_COMPILE in the environment. + # This allows the user to override it via make.conf or via a local Makefile. + # https://bugs.gentoo.org/811600 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-} + + local myconf=( + HOSTCC="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + ) + + econf "${myconf[@]}" +} + +src_compile() { + set_arch_to_kernel + + myemakeargs=( + HOSTCC="$(tc-getBUILD_CC)" + V=1 + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + set_arch_to_kernel + + myemakeargs+=( + DEPMOD=: + DESTDIR="${D}" + INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} + +pkg_postinst() { + linux-mod_pkg_postinst + + # Remove old modules + if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then + ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" + ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" + ewarn "Automatically removing old modules to avoid problems." + rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" + rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" + fi + + if [[ -z ${ROOT} ]] && use dist-kernel; then + set_arch_to_portage + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use x86 || use arm; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of ZFSOnLinux. To" + ewarn "create a newpool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -d -o feature@async_destroy=enabled " + ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" + ewarn " -o feature@spacemap_histogram=enabled" + ewarn " -o feature@enabled_txg=enabled " + ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" + ewarn " ..." + ewarn + ewarn "GRUB2 support will be updated as soon as either the GRUB2" + ewarn "developers do a tag or the Gentoo developers find time to backport" + ewarn "support from GRUB2 HEAD." +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.1.ebuild new file mode 100644 index 000000000000..996dd40ebdcb --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${PV%_rc?}" + ZFS_KERNEL_COMPAT="5.14" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0/${PVR}" +IUSE="custom-cflags debug +rootfs" + +RDEPEND="${DEPEND} + !sys-kernel/spl +" + +BDEPEND=" + dev-lang/perl + virtual/awk +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + +RESTRICT="debug? ( strip ) test" + +DOCS=( AUTHORS COPYRIGHT META README.md ) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + EFI_PARTITION + MODULES + !PAX_KERNEXEC_PLUGIN_METHOD_OR + !TRIM_UNUSED_KSYMS + ZLIB_DEFLATE + ZLIB_INFLATE + " + + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + !DEBUG_INFO_REDUCED + " + + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" + + if [[ ${PV} != "9999" ]]; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + + fi + + kernel_is -ge 3 10 || die "Linux 3.10 or newer required" + + linux-mod_pkg_setup +} + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set module revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi +} + +src_configure() { + set_arch_to_kernel + + use custom-cflags || strip-flags + + filter-ldflags -Wl,* + + # Set CROSS_COMPILE in the environment. + # This allows the user to override it via make.conf or via a local Makefile. + # https://bugs.gentoo.org/811600 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-} + + local myconf=( + HOSTCC="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + ) + + econf "${myconf[@]}" +} + +src_compile() { + set_arch_to_kernel + + myemakeargs=( + HOSTCC="$(tc-getBUILD_CC)" + V=1 + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + set_arch_to_kernel + + myemakeargs+=( + DEPMOD=: + DESTDIR="${D}" + INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} + +pkg_postinst() { + linux-mod_pkg_postinst + + if [[ -z ${ROOT} ]] && use dist-kernel; then + set_arch_to_portage + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use x86 || use arm; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + if has_version sys-boot/grub; then + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of ZFSOnLinux. To" + ewarn "create a newpool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -o compatibility=grub2 ..." + ewarn + ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features." + fi +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 3aa1db85dc33..996dd40ebdcb 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -19,10 +19,10 @@ else SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.13" + ZFS_KERNEL_COMPAT="5.14" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi fi diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 51620485411c..c2cc068a46f1 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -3,10 +3,16 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa +DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8 +DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a +DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c +DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94 EBUILD zfs-0.8.6-r1.ebuild 6315 BLAKE2B 063ec7b7374c26035f05614ce2cab7e9d73993571edd22fbaa6eeff51b26ebdeba98fe7fae398f4201a12774a672fe444c1f0f56cfae8da7acd1ec35d92cd5c4 SHA512 5ee8f85b288eca30d3540b1fa8de11616f9095385190139478aa59942e0df7e5f089522e145c35ce900c288b1a4f1d13dda66c569a206da73050630b2f3e787b EBUILD zfs-2.0.5-r1.ebuild 8035 BLAKE2B 757cfe559c0f3f97f8feb4dae98938cfef68336947057a4520857842e3ff037ef26a78a7cd191183a439b3aab123a4b4b98bb544c5ea31b144beba6241a820b5 SHA512 4a918715cff7d63c00a4d6bcd7b72ecc0f9f76a27180552a98bbec59161ca920b53b077127163f81944a0d3afda7000bcc2dc5aecb7cc3a0d1bf12c347ab0b2e -EBUILD zfs-2.1.0-r1.ebuild 7995 BLAKE2B 321bd30c228300f0fca5b02d7ea1f15dd2fbbec596039f5eb52ef9f2e8443e6c949799de613e07477a1be5bf74e8c54609dc1f65962f883d25e0ed7e826952b7 SHA512 f9c12203fe81b773e0c2925c88e64a441e0c54086b878b643ae5968063304e97f41308fe094c06c32c59e965c46244d6445585fd593dbac624905e9adc473aa8 -EBUILD zfs-9999.ebuild 8036 BLAKE2B dc4b1ab167033e5589130c917c3ca7f0649f1595a8ffecb914f263d6d601aef3d6e299c040ab333441c8bc9b1967deb646de91b10a7906a24aec4b5cfcd44ce3 SHA512 b46877f8f2de727f5f8704da02661cbf7d73f8c570b7a95aad9419636cf80af9ee634c606e987a91ff8578a1fb3a3270269beffd0cecf0d45bd42b91d0af5d87 +EBUILD zfs-2.0.6.ebuild 8038 BLAKE2B f7c2ee5b3a66001d1904aac338fa1c02252d283d7fbe85a39d1585eb2baf87f3bc40468f68051cb953129fe15090b5462999e1f13a52ba9a77c7a28a34518691 SHA512 00ace24909653a236cd742c688e1da57bad38cfa3d5c0261d0f2900326c85719dec9c4d6a554aa45ec170bdd9bc46002921b70830f18ea71505770143a5f0f0d +EBUILD zfs-2.1.0-r1.ebuild 8088 BLAKE2B 02df4f77ce32bad5454b3a772447da4f87faae5a0fd247113236bc3001f37fd6a667ff6ae64916d2c98e767e14b8fe5ac682dda928aab80e6b09398c48906e43 SHA512 982e62c15298bef0ce0cd4f35835ee415c5f32082bbfcea30919f120c2390e8707c68d9e01e1509b801549e5293a731d5a75da5a7a27a6681470f9d89dafb33a +EBUILD zfs-2.1.1-r1.ebuild 8213 BLAKE2B 599e9a41f8c47bf5d120bd0509f8bd1a5c0833ec1ab1981602148cf9f33012db3363d3e4b9f5fc1ce56b00d1732e56dc2e24561f3f2b0c6492290aa095f43c50 SHA512 3dc47e1c9ced2ac9c9c4f7f8532835da63f26d85e0b6713ec73b909ae3f4153c4bddf98224517da910441fad22b1b9a38d5c3f7ccb86a046d8b108ab663892d0 +EBUILD zfs-9999.ebuild 8254 BLAKE2B 85816fe265223812d55b688dfce5ca23de5be4f095cfa64aeed54a6cee481a22c749ca461e34fb774a02f96d91899bdaf103474a2f9a54c72dea01f61fafe66d SHA512 6677231a44923f7903f7da2d5631e1acb8915af272a0bb7c61afca1e3204dd26041be873cf79b99be404c2afc9afabe6dab06584318888833458d484b6bd37f8 MISC metadata.xml 1001 BLAKE2B 8e94a0d8e1afff064b3f8e4a7e3e6d34ad12d5fa550df2f3371b1593b0938b3ea0dbfdcd2e40023f4e91bbe12cf1f3633d92977e4f5b4ee10b56d5040f065f90 SHA512 fc7ba310676715f5daa59b30107560f9ba61cc7dc79eb74ff866e4c8f36bd6a414474a216f5c833dc46c6426e4c80a6672b488fab4178a0c00a47b0de1caf6eb diff --git a/sys-fs/zfs/zfs-2.0.6.ebuild b/sys-fs/zfs/zfs-2.0.6.ebuild new file mode 100644 index 000000000000..4b474020cd77 --- /dev/null +++ b/sys-fs/zfs/zfs-2.0.6.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 linux-mod + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" + S="${WORKDIR}/${P%_rc?}" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64" + fi +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +# see libsoversion_check() below as well +SLOT="0/4" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" + +DEPEND=" + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +BDEPEND="virtual/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND="${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !<sys-kernel/genkernel-3.5.1.1 + ) + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/bash-completion-sudo.patch" + "${FILESDIR}/2.0.4-scrub-timers.patch" +) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +libsoversion_check() { + + local bugurl libzfs_sover + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" + + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" + libzfs_sover="${libzfs_sover%%:*}" + + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then + echo + eerror "BUG BUG BUG BUG BUG BUG BUG BUG" + eerror "ebuild subslot does not match libzfs soversion!" + eerror "libzfs soversion: ${libzfs_sover}" + eerror "ebuild value: $(ver_cut 2 ${SLOT})" + eerror "This is a bug in the ebuild, please use the following URL to report it" + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" + echo + # we want to abort for releases, but just print a warning for live ebuild + # to keep package installable + [[ ${PV} == "9999" ]] || die + fi +} + +src_prepare() { + default + libsoversion_check + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-vendor=gentoo + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + + find "${ED}" -name '*.la' -delete || die + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" + elog " sys-kernel/dracut" + elog " sys-kernel/genkernel" + fi + fi + + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then + einfo "Adding ${P} to the module database to ensure that the" + einfo "kernel modules and userland utilities stay in sync." + update_moduledb + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then + remove_moduledb + fi +} diff --git a/sys-fs/zfs/zfs-2.1.0-r1.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild index 9f8ac5af2207..2ab356846cf3 100644 --- a/sys-fs/zfs/zfs-2.1.0-r1.ebuild +++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild @@ -54,6 +54,10 @@ BDEPEND="virtual/awk nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[${PYTHON_USEDEP}] + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${PYTHON_USEDEP}] + ) ) " diff --git a/sys-fs/zfs/zfs-2.1.1-r1.ebuild b/sys-fs/zfs/zfs-2.1.1-r1.ebuild new file mode 100644 index 000000000000..b18fbb260614 --- /dev/null +++ b/sys-fs/zfs/zfs-2.1.1-r1.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 linux-mod + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" + S="${WORKDIR}/${P%_rc?}" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + fi +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +# see libsoversion_check() below as well +SLOT="0/5" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" + +DEPEND=" + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +BDEPEND="virtual/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND="${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !<sys-kernel/genkernel-3.5.1.1 + ) + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" ) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +libsoversion_check() { + local bugurl libzfs_sover + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" + + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" + libzfs_sover="${libzfs_sover%%:*}" + + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then + echo + eerror "BUG BUG BUG BUG BUG BUG BUG BUG" + eerror "ebuild subslot does not match libzfs soversion!" + eerror "libzfs soversion: ${libzfs_sover}" + eerror "ebuild value: $(ver_cut 2 ${SLOT})" + eerror "This is a bug in the ebuild, please use the following URL to report it" + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" + echo + # we want to abort for releases, but just print a warning for live ebuild + # to keep package installable + [[ ${PV} == "9999" ]] || die + fi +} + +src_prepare() { + default + libsoversion_check + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-vendor=gentoo + # Building zfs-mount-generator.c on musl breaks as strndupa + # isn't available. But systemd doesn't support musl anyway, so + # just disable building it. + $(use_enable !elibc_musl systemd) + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } + + find "${ED}" -name '*.la' -delete || die + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" + elog " sys-kernel/dracut" + elog " sys-kernel/genkernel" + fi + fi + + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then + einfo "Adding ${P} to the module database to ensure that the" + einfo "kernel modules and userland utilities stay in sync." + update_moduledb + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then + remove_moduledb + fi +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index c089c475f30c..43755044ed6b 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript @@ -25,7 +25,7 @@ else S="${WORKDIR}/${P%_rc?}" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi fi @@ -130,7 +130,6 @@ pkg_setup() { } libsoversion_check() { - local bugurl libzfs_sover bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" @@ -183,7 +182,6 @@ src_configure() { local myconf=( --bindir="${EPREFIX}/bin" --enable-shared - --enable-systemd --enable-sysvinit --localstatedir="${EPREFIX}/var" --sbindir="${EPREFIX}/sbin" @@ -197,6 +195,10 @@ src_configure() { --with-systemdunitdir="$(systemd_get_systemunitdir)" --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" --with-vendor=gentoo + # Building zfs-mount-generator.c on musl breaks as strndupa + # isn't available. But systemd doesn't support musl anyway, so + # just disable building it. + $(use_enable !elibc_musl systemd) $(use_enable debug) $(use_enable nls) $(use_enable pam) @@ -224,7 +226,7 @@ src_install() { use pam && { rm -rv "${ED}/unwanted_files" || die ; } - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } find "${ED}" -name '*.la' -delete || die |