From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- sys-fs/Manifest.gz | Bin 21393 -> 21232 bytes sys-fs/bcache-tools/Manifest | 4 +- sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild | 6 +- sys-fs/bcache-tools/bcache-tools-9999.ebuild | 6 +- sys-fs/dfc/Manifest | 2 +- sys-fs/dfc/dfc-3.1.1.ebuild | 4 +- sys-fs/encfs/Manifest | 2 +- sys-fs/encfs/encfs-1.9.5-r2.ebuild | 43 ++ sys-fs/encfs/encfs-1.9.5.ebuild | 39 -- sys-fs/eudev/Manifest | 16 +- sys-fs/eudev/eudev-3.2.10.ebuild | 237 -------- sys-fs/eudev/eudev-3.2.11.ebuild | 235 ++++++++ sys-fs/eudev/eudev-3.2.5.ebuild | 234 -------- sys-fs/eudev/eudev-3.2.7-r2.ebuild | 237 -------- sys-fs/eudev/eudev-3.2.8.ebuild | 237 -------- sys-fs/eudev/eudev-3.2.9.ebuild | 237 -------- sys-fs/eudev/eudev-4.9999.ebuild | 218 -------- sys-fs/eudev/eudev-9999.ebuild | 91 ++-- sys-fs/eudev/metadata.xml | 7 +- sys-fs/fuse/Manifest | 2 +- sys-fs/fuse/fuse-3.10.5.ebuild | 2 +- sys-fs/genext2fs/Manifest | 2 +- sys-fs/genext2fs/genext2fs-1.5.0.ebuild | 2 +- sys-fs/lxcfs/Manifest | 2 +- sys-fs/lxcfs/lxcfs-4.0.11.ebuild | 2 +- sys-fs/mergerfs/Manifest | 2 + sys-fs/mergerfs/mergerfs-2.33.1.ebuild | 52 ++ sys-fs/multipath-tools/Manifest | 2 +- .../multipath-tools/multipath-tools-0.8.7.ebuild | 2 +- sys-fs/tmsu/Manifest | 6 - sys-fs/tmsu/metadata.xml | 21 - sys-fs/tmsu/tmsu-0.7.4.ebuild | 44 -- sys-fs/tmsu/tmsu-0.7.5.ebuild | 54 -- sys-fs/udev/Manifest | 4 +- sys-fs/udev/udev-249.6-r1.ebuild | 310 ----------- sys-fs/udev/udev-249.6-r2.ebuild | 311 +++++++++++ sys-fs/udev/udev-9999.ebuild | 1 + sys-fs/udisks/Manifest | 2 +- sys-fs/udisks/udisks-2.9.4.ebuild | 2 +- sys-fs/vhba/Manifest | 8 +- sys-fs/vhba/vhba-20200106-r1.ebuild | 50 -- sys-fs/vhba/vhba-20210418.ebuild | 50 -- sys-fs/vhba/vhba-20211023.ebuild | 2 +- sys-fs/vhba/vhba-20211218.ebuild | 50 ++ sys-fs/xfsprogs/Manifest | 4 +- sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild | 96 ---- sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild | 96 ++++ sys-fs/zfs-kmod/Manifest | 12 +- .../zfs-kmod/files/2.1.1-SEEK_DATA-SEEK_HOLE.patch | 594 --------------------- .../files/2.1.1-restore-dirty-dnode-logic.patch | 31 -- sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild | 2 +- sys-fs/zfs-kmod/zfs-kmod-2.1.1-r4.ebuild | 216 -------- sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild | 205 +++++++ sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 4 +- sys-fs/zfs/Manifest | 15 +- sys-fs/zfs/files/2.1.2-musl-tests.patch | 58 ++ sys-fs/zfs/files/2.1.2-openrc-vendor.patch | 42 ++ sys-fs/zfs/files/2.1.2-scrub-timers.patch | 147 +++++ sys-fs/zfs/zfs-0.8.6-r1.ebuild | 246 --------- sys-fs/zfs/zfs-0.8.6-r2.ebuild | 246 +++++++++ sys-fs/zfs/zfs-2.0.6-r1.ebuild | 8 +- sys-fs/zfs/zfs-2.1.1-r5.ebuild | 303 ----------- sys-fs/zfs/zfs-2.1.2-r1.ebuild | 304 +++++++++++ sys-fs/zfs/zfs-9999.ebuild | 11 +- 64 files changed, 1901 insertions(+), 3579 deletions(-) create mode 100644 sys-fs/encfs/encfs-1.9.5-r2.ebuild delete mode 100644 sys-fs/encfs/encfs-1.9.5.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.10.ebuild create mode 100644 sys-fs/eudev/eudev-3.2.11.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.5.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.7-r2.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.8.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.9.ebuild delete mode 100644 sys-fs/eudev/eudev-4.9999.ebuild create mode 100644 sys-fs/mergerfs/mergerfs-2.33.1.ebuild delete mode 100644 sys-fs/tmsu/Manifest delete mode 100644 sys-fs/tmsu/metadata.xml delete mode 100644 sys-fs/tmsu/tmsu-0.7.4.ebuild delete mode 100644 sys-fs/tmsu/tmsu-0.7.5.ebuild delete mode 100644 sys-fs/udev/udev-249.6-r1.ebuild create mode 100644 sys-fs/udev/udev-249.6-r2.ebuild delete mode 100644 sys-fs/vhba/vhba-20200106-r1.ebuild delete mode 100644 sys-fs/vhba/vhba-20210418.ebuild create mode 100644 sys-fs/vhba/vhba-20211218.ebuild delete mode 100644 sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild create mode 100644 sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild delete mode 100644 sys-fs/zfs-kmod/files/2.1.1-SEEK_DATA-SEEK_HOLE.patch delete mode 100644 sys-fs/zfs-kmod/files/2.1.1-restore-dirty-dnode-logic.patch delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-2.1.1-r4.ebuild create mode 100644 sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild create mode 100644 sys-fs/zfs/files/2.1.2-musl-tests.patch create mode 100644 sys-fs/zfs/files/2.1.2-openrc-vendor.patch create mode 100644 sys-fs/zfs/files/2.1.2-scrub-timers.patch delete mode 100644 sys-fs/zfs/zfs-0.8.6-r1.ebuild create mode 100644 sys-fs/zfs/zfs-0.8.6-r2.ebuild delete mode 100644 sys-fs/zfs/zfs-2.1.1-r5.ebuild create mode 100644 sys-fs/zfs/zfs-2.1.2-r1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 4bff2440e987..b3a4cd51f3f4 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest index e969329a5553..0691478fcecc 100644 --- a/sys-fs/bcache-tools/Manifest +++ b/sys-fs/bcache-tools/Manifest @@ -2,6 +2,6 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca -EBUILD bcache-tools-1.1-r1.ebuild 1365 BLAKE2B f6bd8859b0ccdbeb5eb60f83b63cdc6c5d6a2659203d86f8b8e183a05e2b7a84e971a6035136a241747d83ae88fd8ccc8fd0a10d2be7fbebd98c615f7221a717 SHA512 a24acb5a0c798878abbc9bb5ff4c4d6905898ce9f817a822cd531362feedcc51580df055ac76a3cc5de136b2d81b3bc898ef583efba9927dc633ae1a2fd212c5 -EBUILD bcache-tools-9999.ebuild 1376 BLAKE2B f7030fe6ab27cc5e44fff92b81981ee071b34ce3b34edc8e64764274482a77c61b5a1bfc171575aa55ae5d5d30072f872807250b4e11d6226802eb847c0938b0 SHA512 1dd36af77299cfa5d5e07cfdb88aee661be02a4a9eac49f85277e3e6f95438d8545ba62884ed5172b9d51cbf04ca644992b271d1da2caf1c30a03ace59e3e7f8 +EBUILD bcache-tools-1.1-r1.ebuild 1438 BLAKE2B 1b5e0112d2c167e1627f7aee1f25e6306ffa906f975422171bca068c5c85f98e72ff54285a7ca14b92157304f81585db84bf5c75a80fbb52228ce0d424223952 SHA512 1c2519db9d466a3deb90563025d9b499ea63635e1b61c5acf66a4ae97a92017f98368c82d5cadfde24d1753b0796e892524c4bc6ae8114be49c9158142780cf4 +EBUILD bcache-tools-9999.ebuild 1431 BLAKE2B ed6ab5aa846a1b8d819b99bb4e0d70b97bb66282dcb525f0813f5366876fa628fd080677171e4fb69704954adc12b61794e183696941b2c4b1dd30622e3c8c57 SHA512 7f4f3ba740f5ffe4211adf15cbf1abcdd28b51adcb6fd45f13ceb1fc865339b31f548fd32fa2ced1cc06c72d16251be1a9ecee7f27cfbbe93b60883919b2dd77 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild index d1da43785931..e5cb403dba17 100644 --- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit flag-o-matic python-r1 toolchain-funcs udev DESCRIPTION="Tools for bcache" -HOMEPAGE="https://bcache.evilpiepirate.org/" +HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/" SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz" SLOT="0" diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild index 5cb77851e552..31a8bc178342 100644 --- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{7..10} ) @@ -15,7 +15,7 @@ else fi DESCRIPTION="Tools for bcache" -HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/" +HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/" SLOT="0" LICENSE="GPL-2" @@ -46,7 +46,7 @@ src_install() { dosbin bcache make-bcache bcache-super-show exeinto $(get_udevdir) - doexe bcache-register probe-bcache + doexe bcache-register probe-bcache bcache-export-cached python_foreach_impl python_doscript bcache-status diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest index 56cf5950e373..d94e0279ddaa 100644 --- a/sys-fs/dfc/Manifest +++ b/sys-fs/dfc/Manifest @@ -1,3 +1,3 @@ DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701 -EBUILD dfc-3.1.1.ebuild 822 BLAKE2B 0583da13a2fc63d937612c7eea628db8cbd9590bcf1d06291dd4821e9fdb0e715cda12bb2fe3c33fd52fa3ce19f8737ca52f1c585a16b49772095375c367c8a4 SHA512 64bf87044f5098b2f4c59d4e1e3f1411d926e4c5b60adf93124a9e2bb881987278970ae7fc214f09dde00c54f430811dfb0b50f5a2c5d792f9f908f47739be87 +EBUILD dfc-3.1.1.ebuild 829 BLAKE2B 554e0e83ec8822be0754e0d7a77d135901fe5919ed5905b43d82784a89199ff29f7141ee9bff0da738f90ef1eb3e2b852b24d5c14620f03810488e84d690f4a8 SHA512 25db024d38a522934f04cab5641b3202dd1c5a682b062e95d1b3561461d421f83529b3733026fc4b0704d4050d3072fe8cb5d8bfe6dbc59f5fc2891b572f3650 MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild index ff80ffbf9eb5..ec6877dbb2b0 100644 --- a/sys-fs/dfc/dfc-3.1.1.ebuild +++ b/sys-fs/dfc/dfc-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://projects.gw-computing.net/attachments/download/615/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" IUSE="nls" DEPEND="nls? ( diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 6f908ebc13f6..b5a0d0c5d602 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -1,4 +1,4 @@ DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 EBUILD encfs-1.9.5-r1.ebuild 906 BLAKE2B 96405f4508df41529a65d6dee3108312b48adce88e146655e72cd9c0bc947beb337e1a8d967517f87cb245e9d1a41b0eb10907145b24c6fdab59f93826332096 SHA512 cab74b159a9a06ec35d7227798e274e131cb3fdf6a7503117f994df7755881f32c7dcc5f5f697d4fb6b1f8235721cb063c754a63ff12b5eafab75bc92514e1ac -EBUILD encfs-1.9.5.ebuild 893 BLAKE2B c2d19cc038feb0cca4fa19c8f1bb1aeddd2ca6b1ba14c244e23ebbc07a94d42305418d410a6de2587cf908c385ab9fa8b3d32f931204a5f6e92f12d75067befe SHA512 83726bbfa10744b0260f4a9375ef2fa491c8a4743bc928a2d928ab7686e6e431d9db9c37d5a639c7b70c7583e70d11df05385378f20b9eafdfd06afb32ef73ba +EBUILD encfs-1.9.5-r2.ebuild 1010 BLAKE2B 3bb2706a1b91551975df08e9cd67e77399be8c17cc089446b2649b506bd7146d2cfe05d44c5bfb32eee2d06d20a7c0efce0dbc0380a04f771a6e94e384beb3e1 SHA512 4f4cba74dc38bdd0d480e67214a1075f8ba1aa0ce16c3666c0811209661b56416a359b47525f708d704408c8fabb727db1493939b8e10712bb86585435653cb0 MISC metadata.xml 380 BLAKE2B c65338452c25318cbb3f5d2036753661d3c2ac246269f49e5cc51781d5ce0ed2edfb37b74dc53cebddc249b8e0ebf0fc01d5767b70bcc628c8b3254083f36071 SHA512 104847da4091bb323a2ea7f1129cf18d6893ecb000b0ce2d11c09bc8ce7da623dc24312b30bae75b03c7908613f83ecf1ecf88ff5c285ea34a170238e5f6c700 diff --git a/sys-fs/encfs/encfs-1.9.5-r2.ebuild b/sys-fs/encfs/encfs-1.9.5-r2.ebuild new file mode 100644 index 000000000000..c26268474a9d --- /dev/null +++ b/sys-fs/encfs/encfs-1.9.5-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE" +HOMEPAGE="https://vgough.github.io/encfs/" +SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86" +IUSE="nls" + +RDEPEND="dev-libs/openssl:= + dev-libs/tinyxml2:= + sys-fs/fuse:0= + sys-libs/zlib" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + sys-devel/gettext + virtual/pkgconfig" + +# Build dir is hardcoded in test suite, but we restrict them +# because they can lead to false negatives, bug #630486 +RESTRICT="test" + +BUILD_DIR="${S}/build" + +src_configure() { + local mycmakeargs=( + -DENABLE_NLS="$(usex nls)" + -DUSE_INTERNAL_TINYXML=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_SHARED_LIBS=ON + # Needed with BUILD_SHARED_LIBS=ON + -DINSTALL_LIBENCFS=ON + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + cmake_src_configure +} diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5.ebuild deleted file mode 100644 index 70d05c10d13e..000000000000 --- a/sys-fs/encfs/encfs-1.9.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit cmake-utils - -DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE" -HOMEPAGE="https://vgough.github.io/encfs/" -SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~ppc64 ~sparc x86" -IUSE="nls" - -RDEPEND=" - dev-libs/openssl:0= - dev-libs/tinyxml2:0= - sys-fs/fuse:= - sys-libs/zlib" -DEPEND=" - ${RDEPEND} - dev-lang/perl - sys-devel/gettext - virtual/pkgconfig" - -# Build dir is hardcoded in test suite, but we restrict them -# because they can lead to false negatives, bug #630486 -RESTRICT="test" -BUILD_DIR="${S}/build" - -src_configure() { - local mycmakeargs=( - -DENABLE_NLS="$(usex nls)" - -DUSE_INTERNAL_TINYXML=OFF - -DBUILD_UNIT_TESTS=OFF - ) - cmake-utils_src_configure -} diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index 96b1ff1f625f..1152cdddd1c7 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -1,16 +1,8 @@ AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d -DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c -DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40 -DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 -DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f +DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33 EBUILD eudev-3.2.10-r1.ebuild 6973 BLAKE2B 4951dcd4fc1e1c8cba9aabb97f2d09d3447ddb7ab89adef7b049d638d6c82bf934d085f8df4f659c7e80bcf3e803b513c4b3a161ed364cfff2766cd43659bef4 SHA512 fbe1a5e1da7a836c41026ef6a4a73d4f56c20793e45faec6e114d8dd16d239d1b101efa6e80ad8447f077c6ed87824c4744e8506349eff0f02dcff03c2e3c937 -EBUILD eudev-3.2.10.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585 -EBUILD eudev-3.2.5.ebuild 6833 BLAKE2B e1a9f2ce47f6df7ed61f0544d7c134898a25d84b73842a66b94c95135bcf6ba95483999025a763264c2a44b6d5fbac0f34bc4e7051b420e90aaf50fa1cbda75f SHA512 ebadb7eb40160b3b85432cbf6b59285b47f4cbeaea7de47a3ce72fc6558edcfdcbb3956980ca3a3933c3f6887330fe0d7bcebafc1d579a42283d20b124c7d4e3 -EBUILD eudev-3.2.7-r2.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba -EBUILD eudev-3.2.8.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba -EBUILD eudev-3.2.9.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585 -EBUILD eudev-4.9999.ebuild 6105 BLAKE2B edad7d04272f0430ad3e8a347ad3f043a295298d04156ada8576757db2a4d0bfc8732f295ca6db69cb14ee2a47ef376160e06358aa25c17a2f21e2346394149e SHA512 e265895d5feeab3053595e9b84db879a4b87829b0aa28383ec16ad213cea56e6231d8742ace9c303397d261e4fad3e11dab3b2a10025e29cb65504d69e4e7426 -EBUILD eudev-9999.ebuild 6968 BLAKE2B 31272c7f13a0c06fddc6c2ffbe7bbcce75e1a9e1deb79960c2d27c509802acc85694de3d048b628b4b575c1cfc6bdf6e8b8ae8c1576201b35fff7cca9d03dc81 SHA512 8577f6c5dcccc932835efc88106feb9f1a04fffa51cb1770f9f3add1670283718ee8038f8771577d2d3033fbc58011c3c011e9a57fecad5ca2623391f5ff2862 -MISC metadata.xml 859 BLAKE2B 8a049b78d4c9a284315378d574a9774b1b90cb001102da02c9b4a2e01c603e7272ee4c5945cc8ea0531d99b006db21271b506207935143a64f83363e2785b5a3 SHA512 6aad92b8a8eeb4530c68323e87ac3550f750aec5c59b77c9a7c1d99cd2ec9a94070dbc999ace295cd1bf8a973b1092b25fd71568b15698f9e916ba9d763c95e1 +EBUILD eudev-3.2.11.ebuild 6856 BLAKE2B 88bf5e0f826ccddf58593fc9bc5e362808e69fa1ceb2600572425f00f02c0af21de0cf98717bfe9e923bdcec81b2997c6fcef02428a8beca3f46cc4c92334b48 SHA512 dc5e36e2073fd363a9582a52dab0f9c84fd16458622020a08a64e73ec81df241f73789d9fe51d35a0bf05992d15c5bbb5183afdc26a5f57b67e25fea24054324 +EBUILD eudev-9999.ebuild 6863 BLAKE2B 8cc05463b8c914bf3b460cc929df84961d8c27f63a18aef95bb6680de247a947e7dd6f01e047fa3052f4fc75be693ee14b0a8692052c284fe4bf709c80abca29 SHA512 380bfb084e4836a71a138225a77b33ab5da6b78db96dad14a78a3eedbdea585fca7fd7f9ac2a0513d55d3bfa5c29ed6b8672635e2c743cc04630b45bd8115971 +MISC metadata.xml 721 BLAKE2B 632d4454c02f58d293a7c8c8fd889085e5942a946d1238c0b8e38e4ff6a9aa7d6a7ec8c3980a36669fe05a32273ba828c4d89980d4cec8866379fc0a77d743ef SHA512 6f65edb2f3edad63fea660718bf770bac44cf4ed6bb5cc4ef8e48fcaab566378f24af8610ce7e9493e1541bcb3249d9c74324e2d0cb970e4bbfa194b8a157921 diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild deleted file mode 100644 index c2910b122451..000000000000 --- a/sys-fs/eudev/eudev-3.2.10.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-3.2.11.ebuild b/sys-fs/eudev/eudev-3.2.11.ebuild new file mode 100644 index 000000000000..0ad41a30ab58 --- /dev/null +++ b/sys-fs/eudev/eudev-3.2.11.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KV_MIN=2.6.39 + +inherit autotools linux-info multilib-minimal toolchain-funcs + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/eudev-project/eudev.git" + inherit git-r3 +else + SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://github.com/gentoo/eudev" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="+kmod introspection rule-generator selinux static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=">=sys-apps/util-linux-2.20 + >=sys-kernel/linux-headers-${KV_MIN} + virtual/libcrypt:= + introspection? ( >=dev-libs/gobject-introspection-1.38 ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd" +RDEPEND="${DEPEND} + acct-group/input + acct-group/kvm + acct-group/render + !sys-fs/udev + !sys-apps/systemd + !sys-apps/hwids[udev]" +BDEPEND="dev-util/gperf + virtual/os-headers + virtual/pkgconfig + >=sys-devel/make-3.82-r4 + test? ( app-text/tree dev-lang/perl )" +PDEPEND=">=sys-fs/udev-init-scripts-26" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/udev.h +) + +pkg_pretend() { + ewarn + ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality," + ewarn "as described in the URL below:" + ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing" + ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable" + ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules" + ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules" + ewarn +} + +pkg_setup() { + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" + linux-info_pkg_setup + get_running_version + + # These are required kernel options, but we don't error out on them + # because you can build under one kernel and run under another. + if kernel_is lt ${KV_MIN//./ }; then + ewarn + ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}." + ewarn "Make sure to run udev under kernel version ${KV_MIN} or above." + ewarn + fi +} + +src_prepare() { + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + default + eautoreconf +} + +multilib_src_configure() { + # bug #463846 + tc-export CC + # bug #502950 + export cc_cv_CFLAGS__flto=no + + # Keep sorted by ./configure --help and only pass --disable flags + # when *required* to avoid external deps or unnecessary compile + local econf_args + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --with-rootprefix= + --with-rootrundir=/run + --exec-prefix="${EPREFIX}" + --bindir="${EPREFIX}"/bin + --includedir="${EPREFIX}"/usr/include + --libdir="${EPREFIX}"/usr/$(get_libdir) + --with-rootlibexecdir="${EPREFIX}"/lib/udev + --enable-split-usr + --enable-manpages + ) + + # Only build libudev for non-native_abi, and only install it to libdir, + # that means all options only apply to native_abi + if multilib_is_native_abi; then + econf_args+=( + --with-rootlibdir="${EPREFIX}"/$(get_libdir) + $(use_enable introspection) + $(use_enable kmod) + $(use_enable static-libs static) + $(use_enable selinux) + $(use_enable rule-generator) + ) + else + econf_args+=( + --disable-static + --disable-introspection + --disable-kmod + --disable-selinux + --disable-rule-generator + --disable-hwdb + ) + fi + + ECONF_SOURCE="${S}" econf "${econf_args[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + emake -C src/shared + emake -C src/libudev + fi +} + +multilib_src_test() { + # make sandbox get out of the way + # these are safe because there is a fake root filesystem put in place, + # but sandbox seems to evaluate the paths of the test i/o instead of the + # paths of the actual i/o that results. + # also only test for native abi + if multilib_is_native_abi; then + addread /sys + addwrite /dev + addwrite /run + + default_src_test + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" install + else + emake -C src/libudev DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + + insinto /lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules + + use rule-generator && doinitd "${FILESDIR}"/udev-postmount +} + +pkg_postinst() { + mkdir -p "${EROOT}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${EROOT}"/dev/loop 2>/dev/null + if [[ -d ${EROOT}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, + # process it as a list. We only care about the zero case (new install) or the case where + # the same version is being re-emerged. If there is a second version, allow it to abort. + local rv rvres=doitnew + for rv in ${REPLACING_VERSIONS} ; do + if [[ ${rvres} == doit* ]]; then + if [[ ${rv%-r*} == ${PV} ]]; then + rvres=doit + else + rvres=${rv} + fi + fi + done + + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT}" + + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + # reload database after it has be rebuilt, but only if we are not upgrading + # also pass if we are -9999 since who knows what hwdb related changes there might be + if [[ ${rvres} == doit* ]] && [[ -z ${ROOT} ]] && [[ ${PV} != "9999" ]]; then + udevadm control --reload + fi + fi + + if [[ ${rvres} != doitnew ]]; then + ewarn + ewarn "You need to restart eudev as soon as possible to make the" + ewarn "upgrade go into effect:" + ewarn "\t/etc/init.d/udev --nodeps restart" + fi + + if use rule-generator && \ + [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then + ewarn + ewarn "Please add the udev-postmount init script to your default runlevel" + ewarn "to ensure the legacy rule-generator functionality works as reliably" + ewarn "as possible." + ewarn "\trc-update add udev-postmount default" + fi + + elog + elog "For more information on eudev on Gentoo, writing udev rules, and" + elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" +} diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild deleted file mode 100644 index 8dad253df479..000000000000 --- a/sys-fs/eudev/eudev-3.2.5.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-3.2.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild deleted file mode 100644 index 1038cbac1eec..000000000000 --- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-3.2.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild deleted file mode 100644 index 1038cbac1eec..000000000000 --- a/sys-fs/eudev/eudev-3.2.8.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild deleted file mode 100644 index c2910b122451..000000000000 --- a/sys-fs/eudev/eudev-3.2.9.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild deleted file mode 100644 index 3299349b6218..000000000000 --- a/sys-fs/eudev/eudev-4.9999.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 4.9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - EGIT_BRANCH="eudev-4" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - KEYWORDS="" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0" -IUSE="+blkid efi +hwdb +kmod selinux smack test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index 1ed46df87518..b830fc310bc6 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-9999.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -KV_min=2.6.39 +KV_MIN=2.6.39 -inherit autotools linux-info multilib multilib-minimal toolchain-funcs +inherit autotools linux-info multilib-minimal toolchain-funcs if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" + EGIT_REPO_URI="https://github.com/eudev-project/eudev.git" inherit git-r3 else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -20,36 +20,30 @@ HOMEPAGE="https://github.com/gentoo/eudev" LICENSE="LGPL-2.1 MIT GPL-2" SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" +IUSE="+kmod introspection rule-generator selinux static-libs test" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=sys-apps/util-linux-2.20 +DEPEND=">=sys-apps/util-linux-2.20 + >=sys-kernel/linux-headers-${KV_MIN} virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then + rmdir "${EROOT}"/dev/loop 2>/dev/null + if [[ -d ${EROOT}/dev/loop ]]; then ewarn "Please make sure your remove /dev/loop," ewarn "else losetup may be confused when looking for unused devices." fi @@ -204,16 +202,17 @@ pkg_postinst() { fi done - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT}" # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda # reload database after it has be rebuilt, but only if we are not upgrading # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then + if [[ ${rvres} == doit* ]] && [[ -z ${ROOT} ]] && [[ ${PV} != "9999" ]]; then udevadm control --reload fi fi + if [[ ${rvres} != doitnew ]]; then ewarn ewarn "You need to restart eudev as soon as possible to make the" diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml index 1a5c17dcddae..4ea35bd6e025 100644 --- a/sys-fs/eudev/metadata.xml +++ b/sys-fs/eudev/metadata.xml @@ -5,16 +5,13 @@ eudev@gentoo.org - enable blkid support - enable EFI support read vendor/device string database and add it to udev database enable module loading through libkmod - enable SMACK security model install legacy rule generator rules and support scripts - note - that the functionality within was dropped from sys-fs/udev as it is not stable in + that the functionality within was dropped from sys-fs/udev as it is not stable in all cases; use at your own risk - gentoo/eudev + eudev-project/eudev diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index 78d82e87c15e..9ccf5916d435 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -7,5 +7,5 @@ DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f6546 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55 EBUILD fuse-2.9.9-r1.ebuild 2258 BLAKE2B 3cc0484ba608c9943ce71df48b7a706753534f4b99fba9f60721ab4d125206767f44f368ca7791d47fd514605b4f4161178b6564974322b791baf1858e126133 SHA512 99d990bcd998613caee1964116656eb72657b4d8939f342d3a9a6b5ee56795b08d41f7ef4f3b7fa8c17cb4b32cd15b47f8aa254c546c41149bc3e7bfefa31660 EBUILD fuse-3.10.4.ebuild 1779 BLAKE2B c6b51c0cb628354f575d7428a6fd1db86a9a8db3c400f425170334c74409599f079bb5195338b9f1b8325cf7eaeb4a6e52672eec253e7ddf018c84c5687c0930 SHA512 3f52e1f3b2fee5b8704c01d7309c4f0864a48c688731bc54662c7eb96107ea0468f3402df22ff71409311311736f114c6f6c76e43b5ca6f06687cbaf6e7f38cb -EBUILD fuse-3.10.5.ebuild 1814 BLAKE2B 41614637e5ebd7aa7e6f11794249d57e13d302ef11fb198f628c4ddabe1b77ba78db60196f2a5a417ebc7f48ae21f7a41cb98817643c6092f11c6823fcd25d32 SHA512 fa180dc00609a5879e4aac6294b67410c428060dea0480f19b6f36e86fb196c8fc8329c1ee9508cb22b08e008f9deb868b12a5416e7c6c8f322a42f2f3811d82 +EBUILD fuse-3.10.5.ebuild 1806 BLAKE2B fc21f9e50c0f3c9de23ff2157c3c12d48e64a1e49ed955f1b28e30a14d855eb12fb16ada86f04f8256bbdbd34b8c7ea3c7ab511720d369cc48e86607b0115748 SHA512 54eec78493c8b365c9b7576cc7bf5f8947e52e359a24e8f044fd7785bf548b648d34437d4e6020509f05b529ba6cdb846576ec0e77f78294ccbbe4cd6588c6dc MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e diff --git a/sys-fs/fuse/fuse-3.10.5.ebuild b/sys-fs/fuse/fuse-3.10.5.ebuild index 8eafe06d9b57..cafbd51d479b 100644 --- a/sys-fs/fuse/fuse-3.10.5.ebuild +++ b/sys-fs/fuse/fuse-3.10.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+suid test" RESTRICT="!test? ( test )" diff --git a/sys-fs/genext2fs/Manifest b/sys-fs/genext2fs/Manifest index 3444faa85a5a..d88f5e618d95 100644 --- a/sys-fs/genext2fs/Manifest +++ b/sys-fs/genext2fs/Manifest @@ -1,5 +1,5 @@ DIST genext2fs-1.4.1.tar.gz 103283 BLAKE2B cacb6e5e5e69f9fbb8550e2b9d79e41d4dd58e2bcc5516a79476918203e5b8ebee0d12a6a6463ff4ec659249a6647881b2728a8d6936fadc298a1e0e68833bdc SHA512 1b9ec7044014423345ae6b09862ba6903f5b3e0f68fb8bbcf97daf2705471cc1633a9fdbc5e00afe1b191e1af7bed87bde2e538bc7365469218f2a00b062845c DIST genext2fs-1.5.0.tar.gz 47848 BLAKE2B 63d65033166356e561bb2ba1a2ff2d10feaab8397bff8d081271b0cdd4c1955949e84c856ff92e7cc3c09f8c913ed6d3672c08a2e07dfa1b71b359ae41abf6a6 SHA512 628994f4f5f6d534a42e16db5322e36addb227d0e0ee589ebebbbb6beda9c53774186a932d04fcb978fde1cbe534b8335fdbfea256aecd2d873c03bc5892a8ce EBUILD genext2fs-1.4.1.ebuild 337 BLAKE2B 96ca8d9974d5a81f2b960db36fce577d14f1c425e0841ea12b797628cfb1f34572361d4716e718f1cc9dc99bd79ced370212872fa0eecd7322833eb1bf59cb22 SHA512 1aea73e08ac5550e1ccd80a8b271e3bfc05878f70ae0f6091623a89892f71c1e68feda6843dfb8cf8a219322a7f3453894571434540d361a597b94ecbbfe1b55 -EBUILD genext2fs-1.5.0.ebuild 443 BLAKE2B 906f213dba5be161e59192dc3ff17e8a7d6a83f7ea9f7b61e540a7b831040d12d657acae131a25d69af4a1dc2085442423bfed0093b3e801e67e00b890734945 SHA512 e1f722ac20bfd1885ee12dccb22a64b2d3f435ff7756da22d6a3e57b1be9110c2714c69b04577081fb7ed38c609564cbfdc81a8962a46a690c5f5f230ce11f54 +EBUILD genext2fs-1.5.0.ebuild 439 BLAKE2B 1d49a92e9a1fbe0d38cf93a8092d0b674727d701e14b45668df8690893db39e7fa5721da73d8800848ddecd5923a2a950cc487011288ac31b6aac05beac1dfbf SHA512 a48bcaf5d2b68772921b6ab048b69511aa1864595bfb65b190b48761c017dd9bf91ac4f58e546c933d1768365545e4670f369ada9eb241cccd0757b2c8282baf MISC metadata.xml 331 BLAKE2B 2b5ea4a09d867d0d1244932233f1b5060fe617e47957ac4a70558e79369637ef1446665ca7125989dd7c77dea3f9ef891b6ca41f0459aae5bc85f72f6ac8e7bf SHA512 b68c435320cf57d257d654fd9fb31a32ead79a2f235269e2279764fde9866a901f2f6f53029bef5e429b23fe06111e3612d73bd9176d67bf4fa791e9ae7f0887 diff --git a/sys-fs/genext2fs/genext2fs-1.5.0.ebuild b/sys-fs/genext2fs/genext2fs-1.5.0.ebuild index bf1148c1fae0..7ad79b971bc6 100644 --- a/sys-fs/genext2fs/genext2fs-1.5.0.ebuild +++ b/sys-fs/genext2fs/genext2fs-1.5.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/bestouff/genext2fs/archive/refs/tags/v${PV}.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~sparc x86" src_prepare() { default diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 1d0ab8d0d47c..2f1dfb70896e 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -3,5 +3,5 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf DIST lxcfs-4.0.11.tar.gz 451424 BLAKE2B 8cb1f16ec8f2f5dbcaea9897553c21f2894ce75713c4de7fd9412254ef4e74cef93fbd9c79e259e0caf2426520d9454858bc0f09b652b00305699d52b4240cbf SHA512 60a76b8d3ab8a164ead8424cf2a20cdb616919318881348016299d2b5bff9d221c12b9208b46e6f72a84695632a762292313e0b51579d590ce505cf5b6fec6de DIST lxcfs-4.0.11.tar.gz.asc 833 BLAKE2B f70bcf119588c1e667111fe0e820c1bbd53c912027a94b600ce69713eb824f0b495cee4ab0107cf92bd5f10c0a17e9e5e85833f15f7ff570931c9df454f16bf9 SHA512 a9190c5913d0879c0034b1ff1f06b7755f8b78094270d64c89a371b56737e32c2a14681a58643e8ebde9d654ff2c66959ee9a4f6d5f6a6002f52da1362017d9f -EBUILD lxcfs-4.0.11.ebuild 1625 BLAKE2B 70641a3208f28d4f1ffaecc8b3d7aa952c614c30915d0ea1bb63aa13dbfe1aebb74801aec94e316edff25104c5194315748d1f2acffa6246f98288140ea1b3cc SHA512 4c192acb436fc49a7810278ea0fd44c827c473bad5137500cc88c3ef985a672ca0ceb4e0fd7c4d58a8dc8cc7348f313bce0bef0f5f2b873cea3f07757fa4f71c +EBUILD lxcfs-4.0.11.ebuild 1624 BLAKE2B 4d3f5164a82359a7020632496e8989ab37b0cde46d00fab02789c20b8b41cb0f708f3284c0964e6698afbd97f8afebd2cf6f6a9ce3929b8b5ac9f97191f431f3 SHA512 4771c6fcc86e9b685743e5cb90d09d2d91abfe961082a6582941f6ece1a37c092fb81b6cf36cba2f60051118853e092f8d9345ee521ad3e5003d0a7c171e0a47 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab diff --git a/sys-fs/lxcfs/lxcfs-4.0.11.ebuild b/sys-fs/lxcfs/lxcfs-4.0.11.ebuild index b811e340ec91..816a845e2788 100644 --- a/sys-fs/lxcfs/lxcfs-4.0.11.ebuild +++ b/sys-fs/lxcfs/lxcfs-4.0.11.ebuild @@ -17,7 +17,7 @@ KEYWORDS="amd64 ~riscv ~x86" RDEPEND="sys-fs/fuse:3" DEPEND="${RDEPEND}" BDEPEND="sys-apps/help2man - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" # Looks like these won't ever work in a container/chroot environment. #764620 RESTRICT="test" diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index 357d84b51535..6ba37b62d528 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -3,9 +3,11 @@ DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 768241671202019262e16ff9e2247014904fd DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd SHA512 f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d DIST mergerfs-2.32.4.tar.gz 314302 BLAKE2B 9435e1e9a7539c5fd732313e269551b12d5e23303e4ac77d783817f42c8004f2873f9e82bd69586c69ebce1e628da707534b04094ea0d7a1f626af6f3b8a444a SHA512 248b5e16c49f0775a5173b10940e45fa401ff81a44e2f081135f118a4deb9f79104d77e1c7424926da703123753a75e8f0590396e44c9ecd3bfdd1f27d7ced17 DIST mergerfs-2.32.6.tar.gz 314321 BLAKE2B 98d5aba7464a82ca21fd2e5d99bbda9b420462afb0743c132199a5e964143dd2b810fdd556a59b949dcdb8542b83654092e354c3c458bca07e40967c1c484386 SHA512 036c597b33d5ebd5a85444c24ad903f210ee62474ddf226e389bc7366b95972b0f75269540907dc9986c4fa449d0bfc67e6bf225ea1a8023d48872bbd4f5a325 +DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300 EBUILD mergerfs-2.32.1.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd EBUILD mergerfs-2.32.2.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd EBUILD mergerfs-2.32.4.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f EBUILD mergerfs-2.32.6.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f +EBUILD mergerfs-2.33.1.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild new file mode 100644 index 000000000000..2600359a9c80 --- /dev/null +++ b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A featureful union filesystem" +HOMEPAGE="https://github.com/trapexit/mergerfs" + +SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +# Vendorized libfuse that's bundled is under LGPL-2.1. +LICENSE="ISC LGPL-2.1" +SLOT="0" +IUSE="+xattr" + +DEPEND=" + xattr? ( sys-apps/attr ) +" + +RDEPEND="${DEPEND}" + +BDEPEND="sys-devel/gettext" + +src_prepare() { + default + + # Hand made build system at it's finest. + echo -e "#!/bin/sh\ntrue" >tools/update-version || die + echo "#pragma once" >src/version.hpp || die + echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die + + if ! use xattr; then + sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die + fi +} + +src_compile() { + # https://bugs.gentoo.org/725978 + tc-export AR CC CXX + + default +} + +src_install() { + dobin build/mergerfs + dosym mergerfs /usr/bin/mount.mergerfs + dodoc README.md + doman man/mergerfs.1 +} diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index d2265be7698f..0f330da4ed86 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -6,5 +6,5 @@ AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f 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 +EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild index b078cc97d9d7..35caf3b69f5b 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86" IUSE="systemd rbd test" RESTRICT="!test? ( test )" diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest deleted file mode 100644 index a8c236025a4a..000000000000 --- a/sys-fs/tmsu/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST github.com-mattn-go-sqlite3-v1.12.0.tar.gz 2282527 BLAKE2B 34ba9482085c3ab6b9612b01258f6c55cee897c6f60cfefcd51d3e0e5af804fd2951d849f2f89e0907b1493adac69516c543ad721706317881a027f5a577dea3 SHA512 7e8656ecf70b2ffc40f6351b661f5eb75caa63c3e9784a805821bf0ca1f087203f1afe80f58af0e5520ff04baff728c93d670fd7ecb6662bb0fed1dd798ada96 -DIST tmsu-0.7.4.tar.gz 98631 BLAKE2B 4af013de08f43b6ee337259b394aafce0862d3f0811174b196785d6e05d520a188ef6a1ce6f320dddcff6b2ab47cae8c248201a27d79bdd09d80b91e12161abd SHA512 28af79a03c774d8c08651cfac794d14a3363d3b5f6b037de1a74968b22053da45e6290ec9c5159950539e1e6577d01c06c62a05eb2b4f01ad5635d98e52b4e20 -DIST tmsu-0.7.5.tar.gz 98766 BLAKE2B 45208c070a92ad2f5791e27437f86702b7ab95bd0d9a0e77a0daad0f3c416bf881e989fc73d064ef3d302d640d7c6f43b7afae475f31f45bcc7f051aa5805429 SHA512 6f89eb156d2be86650ab84847ca0ddea985cdddf35db5f5843632b6a54f88681584b6864e4a14bc36cf1949713e098067e6f8dda0242f27b6061720165f71be1 -EBUILD tmsu-0.7.4.ebuild 848 BLAKE2B 73ea7a0136d29c6c0e24cd576b96888b02ab8af284c7b2fb928d7af5188ed164211fd78236b5e21d223c19a0ccf65797d74c407f1d8c46b6c6fcd3a1181221ea SHA512 d70901fe4999ef13483af4ea2996c463c0a96acb522079748d13b04d613c1d902da271159d565b0971d1a649fc5e115070b81f0a57987ee3e0a1de846b37ad01 -EBUILD tmsu-0.7.5.ebuild 1311 BLAKE2B 7f194e69d004dfadb3e8f03adcf271fa70bfe6f6dccf4998273d4bdc0f336ef425251c5a454c5a914389b30d956299f87b31acd65d83a1fa4efd8c4f3cf7ce6a SHA512 d5c25be8c76acdbbe86be7570efda4cc439581f39009f7d8ec532f9e79fc2070262497416a256a6cc73f25d2c63e07b159fd6b9df2918020600e0d2648b97695 -MISC metadata.xml 720 BLAKE2B bf4e5e28b569ffb24881b67bfcd31ea4382ea9eb7f5fd5c23e7a584cc8b84711f8ae1c8a7ae84f9ae07a0f4d9a9b3b6ff2d7c3d45e73b4b17233bcc09461d46c SHA512 caee223b04b8f6d49faf45fdd27f1dec362421ad0fd41eb52a2e52012d68e9acc9c99a822657cfd011cb816456554dc900c0c80d0363caf316f1bac17e6ed649 diff --git a/sys-fs/tmsu/metadata.xml b/sys-fs/tmsu/metadata.xml deleted file mode 100644 index 9cf6e3d9e4ec..000000000000 --- a/sys-fs/tmsu/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - gentoo@chymera.eu - Horea Christian - - - proxy-maint@gentoo.org - Proxy Maintainers - - - TMSU is a tool for tagging your files. It provides a simple - command-line utility for applying tags and a virtual - filesystem to give you a tag-based view of your files from - any other program. - - - oniony/TMSU - - diff --git a/sys-fs/tmsu/tmsu-0.7.4.ebuild b/sys-fs/tmsu/tmsu-0.7.4.ebuild deleted file mode 100644 index 7483ecb0b7d6..000000000000 --- a/sys-fs/tmsu/tmsu-0.7.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit golang-build - -EGO_PN="github.com/oniony/TMSU/" -DESCRIPTION="Files tagger and virtual tag-based filesystem" -HOMEPAGE="https://github.com/oniony/TMSU/wiki" -SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 AGPL-3+ BSD-4 GPL-3+ MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-fs/fuse:0" -DEPEND=" - dev-go/go-sqlite3 - dev-lang/go - dev-libs/go-fuse - test? ( ${RDEPEND} ) -" - -src_unpack() { - default - mv TMSU-${PV} ${P} || die "Failed to move sorce directory." -} - -src_install() { - dobin misc/bin/* - doman misc/man/tmsu.* - newbin TMSU tmsu - - insinto /usr/share/zsh/site-functions - doins misc/zsh/_tmsu -} - -src_test() { - cd tests || die - ./runall || die -} diff --git a/sys-fs/tmsu/tmsu-0.7.5.ebuild b/sys-fs/tmsu/tmsu-0.7.5.ebuild deleted file mode 100644 index 4659a209a474..000000000000 --- a/sys-fs/tmsu/tmsu-0.7.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/oniony/TMSU/" -EGO_VENDOR=( "github.com/mattn/go-sqlite3 v1.12.0" ) - -inherit golang-build golang-vcs-snapshot - -DESCRIPTION="Files tagger and virtual tag-based filesystem" -HOMEPAGE="https://github.com/oniony/TMSU/wiki" -SRC_URI=" - https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI} -" - -LICENSE="AGPL-3 AGPL-3+ BSD-4 GPL-3+ MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-fs/fuse:0" -DEPEND=" - dev-lang/go - dev-libs/go-fuse - test? ( ${RDEPEND} ) -" - -src_prepare() { - default - mkdir "${WORKDIR}/${P}/src/${EGO_PN}vendor/src" || die - mv "${WORKDIR}/${P}/src/${EGO_PN}vendor/github.com" "${WORKDIR}/${P}/src/${EGO_PN}vendor/src/" || die -} - -src_compile() { - pushd "${WORKDIR}/${P}/src/${EGO_PN}" || die - GOPATH="${WORKDIR}/${P}/src/${EGO_PN}vendor/" emake - popd || die -} - -src_test() { - cd "${WORKDIR}/${P}/src/github.com/oniony/TMSU/tests" || die - ./runall || die -} - -src_install() { - dobin "${WORKDIR}/${P}/src/${EGO_PN}bin/tmsu" - dobin "${WORKDIR}/${P}/src/${EGO_PN}misc/bin/"* - doman "${WORKDIR}/${P}/src/${EGO_PN}misc/man/tmsu."* - insinto /usr/share/zsh/site-functions - doins "${WORKDIR}/${P}/src/${EGO_PN}misc/zsh/_tmsu" -} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 34586f302ef5..0efdabceaa04 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -7,7 +7,7 @@ DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046ad DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f EBUILD udev-249-r3.ebuild 7609 BLAKE2B bdae4a297aa37813ff99a4821822719d51458d12cb8ab246ff89149dd358d36c9df30edafe6dfe51779cc3c4ed21f9e32230677ecad49d3e2917e837c1b523da SHA512 aa1d2a58c28a30ee488a3f9424946240dc08d2e47524250b023326e4bb7ec73630ddcd8ebd01c53280c5bee78ae4e1cb67868b339483625647a0a19aa8413d14 -EBUILD udev-249.6-r1.ebuild 7909 BLAKE2B cf5816429105c796deb6cfb8554dbc198163cee2df6df4b68b4302e07066b9c45501d3bf8050ec7e9a6bbb8d2fe96db700b106667def63568b3f821896225083 SHA512 c33cc650e8b8726caca8f65161d947c68b6ec37d11ec0dfe12576355f0e37b0499aeb9b6d074dfae1e0e82737aa62aa48bb7fe29fb877ef79a0ea0089512be0b +EBUILD udev-249.6-r2.ebuild 7917 BLAKE2B 8b48f9aa00ca2eddd0aa921d4adda3e8e506d0a895753ca9e6c64037f3cefb7b0a65c62e370a9064e3f2668524e21ac89bec18907b7e575cdab16791ca997726 SHA512 238b0daa2283b89b0b6c970e53c677073b851c1672fea1734393cd00e7a30af6ac0084583f41af733cf848101a3c091b1d0cfaff375d9a4910896177100fab0f EBUILD udev-249.6.ebuild 7771 BLAKE2B 0f5657c096483c9ddab5f749c2b250c64c4a7e7cb5df7e5dd8f45dbf76ccf181871a2ccff06ed807d5cd56fa581233ae7486ae78b095b6fb17dbc8051e1e7450 SHA512 c0ae5006e6bef8a035884e067f9d277761dac0883fe93842ddd999ccd24c0c90f4984ab99e5120e06e1121a75b1346b218e13318992db3fab73106dac044e616 -EBUILD udev-9999.ebuild 7905 BLAKE2B 2763c80b9a7d744744be9c626184693dada5ee2313265e099f22e94d523c532bd06940cbf06c3c76d36ae0692ba62f58249d702d90ea02d69b224fa84fe62b0c SHA512 442bc35901b2df59e68fae8fff3fb2a04c3e241c516ca3fe62cbe4a6a070cc7d95a15024285ab2cb480301853848ab9a0b2c4d489d7284d72d225088ee8f9299 +EBUILD udev-9999.ebuild 7921 BLAKE2B 6005fae7b9012a23f0a6c398d0381f725bf9afdb7469397ba887b37b290f3686c0f6dd5f9925b221d3d3fc333efd37fe5fa7d069c0635c1eb630ce78903b9ccc SHA512 8d55530628495ff6566575d0942380db6512cf307d74141c3af8a1738b30d8f34a20fc1d56161779a5654045929984d76b233aa499ac5e583ef93bc5c69ccdfc MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e diff --git a/sys-fs/udev/udev-249.6-r1.ebuild b/sys-fs/udev/udev-249.6-r1.ebuild deleted file mode 100644 index 7d3033099db3..000000000000 --- a/sys-fs/udev/udev-249.6-r1.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 2003-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript - -if [[ ${PV} = 9999* ]] ; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]] ; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - - MY_PV="${PV/_/-}" - MY_P="${MY_PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - - # musl patches taken from: - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd - MUSL_PATCHSET="249.5-r1" - SRC_URI+=" - elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - )" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-util/gperf - sys-devel/gettext - >=sys-apps/coreutils-8.16 - virtual/pkgconfig - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - test? ( - app-text/tree - dev-lang/perl - ) -" -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-15 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.9 -" -RDEPEND="${COMMON_DEPEND} - acct-group/kmem - acct-group/tty - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/input - acct-group/kvm - acct-group/lp - acct-group/render - acct-group/tape - acct-group/video - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd - !sys-apps/hwids[udev] -" -PDEPEND=" - >=sys-fs/udev-init-scripts-34 -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]] ; then - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" - linux-info_pkg_setup - - # CONFIG_FHANDLE was introduced by 2.6.39 - local MINKV=2.6.39 - - if kernel_is -lt ${MINKV//./ } ; then - eerror "Your running kernel is too old to run this version of ${P}" - eerror "You need to upgrade kernel at least to ${MINKV}" - fi - - if kernel_is -lt 3 7 ; then - ewarn "Your running kernel is too old to have firmware loader and" - ewarn "this version of ${P} doesn't have userspace firmware loader" - ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" - fi - fi -} - -src_prepare() { - local PATCHES=( - ) - use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) - - default -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool acl) - -Defi=false - $(meson_native_use_bool kmod) - $(meson_native_use_bool selinux) - -Dlink-udev-shared=false - -Dsplit-usr=true - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - - # Prevent automagic deps - -Dgcrypt=false - -Dlibcryptsetup=false - -Didn=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dp11kit=false - -Dseccomp=false - -Dlz4=false - -Dxz=false - ) - use elibc_musl && emesonargs+=( - -Dgshadow=false - -Dsmack=false - -Dutmp=false - ) - - meson_src_configure -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - python_setup - - use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 - - multilib-minimal_src_configure -} - -multilib_src_compile() { - # meson creates this link - local libudev=$(readlink libudev.so.1) - - local targets=( - ${libudev} - src/libudev/libudev.pc - ) - if multilib_is_native_abi; then - targets+=( - udevadm - src/udev/ata_id - src/udev/cdrom_id - src/udev/fido_id - src/udev/mtd_probe - src/udev/scsi_id - src/udev/udev.pc - src/udev/v4l_id - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - hwdb.d/60-autosuspend-chromiumos.hwdb - rules.d/50-udev-default.rules - rules.d/64-btrfs.rules - ) - fi - eninja "${targets[@]}" -} - -src_test() { - # The testsuite is *very* finicky. Don't try running it in - # containers or anything but a full VM or on bare metal. - # udev calls 'mknod' a number of times, and this interacts - # badly with kernel namespaces. - - if [[ ! -w /dev ]]; then - ewarn "udev tests needs full access to /dev" - ewarn "Skipping tests" - else - meson-multilib_src_test - fi -} - -multilib_src_test() { - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" - - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die - - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die -} - -multilib_src_install() { - local libudev=$(readlink libudev.so.1) - - dolib.so {${libudev},libudev.so.1,libudev.so} - gen_usr_ldscript -a udev - - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - - if multilib_is_native_abi ; then - into / - dobin udevadm - - dosym ../../bin/udevadm /lib/systemd/systemd-udevd - - exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} - - # Install generated rules (${BUILD_DIR}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - insinto /lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die - rm man/systemd-udevd-{control,kernel}.socket.8 || die - doman man/*.[0-9] - fi -} - -multilib_src_install_all() { - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /lib/systemd/network - doins network/99-default.link - - # Install static rules (${S}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - doins "${FILESDIR}"/40-gentoo.rules - insinto /lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - - einstalldocs -} - -pkg_preinst() { - has_version 'sys-fs/eudev' && HAD_EUDEV=1 -} - -pkg_postinst() { - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]' ; then - udevadm hwdb --update --root="${ROOT}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi - - if [[ ${HAD_EUDEV} -eq 1 ]] ; then - ewarn - ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" - ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - ewarn - ewarn "If you wish to disable this, please see the above documentation, or set" - ewarn "net.ifnames=0 on the kernel command line." - ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" - if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then - ewarn - ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" - ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" - mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules - fi - fi -} diff --git a/sys-fs/udev/udev-249.6-r2.ebuild b/sys-fs/udev/udev-249.6-r2.ebuild new file mode 100644 index 000000000000..f6698bd8ca5f --- /dev/null +++ b/sys-fs/udev/udev-249.6-r2.ebuild @@ -0,0 +1,311 @@ +# Copyright 2003-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript + +if [[ ${PV} = 9999* ]] ; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]] ; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + + MY_PV="${PV/_/-}" + MY_P="${MY_PN}-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + + # musl patches taken from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + MUSL_PATCHSET="249.5-r1" + SRC_URI+=" + elibc_musl? ( + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/gperf + sys-devel/gettext + >=sys-apps/coreutils-8.16 + virtual/pkgconfig + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + test? ( + app-text/tree + dev-lang/perl + ) +" +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-15 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.9 +" +RDEPEND="${COMMON_DEPEND} + acct-group/kmem + acct-group/tty + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/sgx + acct-group/tape + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd + !sys-apps/hwids[udev] +" +PDEPEND=" + >=sys-fs/udev-init-scripts-34 +" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]] ; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ } ; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7 ; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + local PATCHES=( + ) + use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) + + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool acl) + -Defi=false + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Didn=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dp11kit=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + use elibc_musl && emesonargs+=( + -Dgshadow=false + -Dsmack=false + -Dutmp=false + ) + + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + python_setup + + use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 + + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink libudev.so.1) + + local targets=( + ${libudev} + src/libudev/libudev.pc + ) + if multilib_is_native_abi; then + targets+=( + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/udev.pc + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + hwdb.d/60-autosuspend-chromiumos.hwdb + rules.d/50-udev-default.rules + rules.d/64-btrfs.rules + ) + fi + eninja "${targets[@]}" +} + +src_test() { + # The testsuite is *very* finicky. Don't try running it in + # containers or anything but a full VM or on bare metal. + # udev calls 'mknod' a number of times, and this interacts + # badly with kernel namespaces. + + if [[ ! -w /dev ]]; then + ewarn "udev tests needs full access to /dev" + ewarn "Skipping tests" + else + meson-multilib_src_test + fi +} + +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" + + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die + + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die +} + +multilib_src_install() { + local libudev=$(readlink libudev.so.1) + + dolib.so {${libudev},libudev.so.1,libudev.so} + gen_usr_ldscript -a udev + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi ; then + into / + dobin udevadm + + dosym ../../bin/udevadm /lib/systemd/systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + # Install generated rules (${BUILD_DIR}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # Install static rules (${S}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + doins "${FILESDIR}"/40-gentoo.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_preinst() { + has_version 'sys-fs/eudev' && HAD_EUDEV=1 +} + +pkg_postinst() { + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]' ; then + udevadm hwdb --update --root="${ROOT}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi + + if [[ ${HAD_EUDEV} -eq 1 ]] ; then + ewarn + ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" + ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "If you wish to disable this, please see the above documentation, or set" + ewarn "net.ifnames=0 on the kernel command line." + ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 49ee2cd44c17..91f83fe7149d 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -79,6 +79,7 @@ RDEPEND="${COMMON_DEPEND} acct-group/kvm acct-group/lp acct-group/render + acct-group/sgx acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index cd0b8420bbcb..4a19d9486874 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,5 +1,5 @@ DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a -EBUILD udisks-2.9.4.ebuild 3652 BLAKE2B 255dff40822adf438c750c3b53da385d9adaa55e8cb2e75910b185ebe2f8471a33142f26697f5369dd8088910e0ec4d2b234016d7d04bd31b1e23183809f3831 SHA512 549a74771ddb6a89b3794ac3e51e6a0b6e5ef2635a9aa22759deb662f1e0e5865bda28813fd94600f0a7a37fb145d4b0a371054addd655361303e8cd57c75115 +EBUILD udisks-2.9.4.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671 diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild index b15fdab52bd3..3112d930e977 100644 --- a/sys-fs/udisks/udisks-2.9.4.ebuild +++ b/sys-fs/udisks/udisks-2.9.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" REQUIRED_USE=" diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index 174ac1c7cf15..dd684a2afc7e 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -1,7 +1,5 @@ -DIST vhba-module-20200106.tar.bz2 15632 BLAKE2B 9b2db6cab2388fb5b84f2735d41a093af212434de2784f112d212cfc6193b1267ccf0afb222765bc32b0fc455d16bd1f0e98ddf60212735473853ec29ab27b97 SHA512 fc320e1f8f05247b7c2feded1335dce0fcc9a1257127d8d4086db48bd1e082d81b8a88089c04d0b8624ae584f1c0d049544f6f0018ec7dcea20ccfb136cd1bf0 -DIST vhba-module-20210418.tar.xz 16112 BLAKE2B 89b81e747f10fea4294c79a19b33b7e11e2747b48180a98bebe3a4a46b15ebbd7b7307c37801d4fd56b0d1440c14bc4e7b800846b2788e1a433edd0aee680501 SHA512 f5841f56974faae8317d84100a9e3d3ec80f6b980e7452047852c79b17e963e75f85d6712c64588ce57abbdbb4a8a2b9b10cf752102b145e1667f26bf260b1f0 DIST vhba-module-20211023.tar.xz 16144 BLAKE2B 70f922c9cf4de5e495ccf812c2b4eecbf3ba4dc49bb59763b97754505198506de4fce7789a4ef6e93dce4cef5275f7aff6c5c45b856a40ad6f62a5fae58d7187 SHA512 e398f8bbdff8d57d001633d98d3720d7cd424d0279de96d9d3e30dcc9013eedc4afaef4e2ab9962306e2073b30ed9d36ccff328253e1d6d36fde1944b2b78e5a -EBUILD vhba-20200106-r1.ebuild 1085 BLAKE2B 2ffe6e523bc4397b5cb1efc192075c3ee2ba01b5f099028bcc97e4ff6efbcc9761eed4eb37510e25e5192f5b53520c1fe88a4f8d6a7f7932e42b68f244764f02 SHA512 84929f69863c2cd8ab9ea689a1ebaeeff27fbb2269d2acc9fc1a858419262236bfa8e1697b34867f5f2681d74346d1de1c488ace525f4c8b581a8ae080267902 -EBUILD vhba-20210418.ebuild 1085 BLAKE2B d340728beb02725c1cc7c70c6abf61457cb63e53e07b1c0b7c6fea2d03dbb5467777e3dd0e0dcf73e8d4d90a00a86c1afd6efd0382e21ac9aa518885f46a76e6 SHA512 18d9b3e6bd8fb2e2869936e6cbecee30220af174258284db217899c31a090c559643d5751dba69941b1a570a7d6beb4dce90e32e1b0bd4e6fc5655d203d9fe7a -EBUILD vhba-20211023.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e +DIST vhba-module-20211218.tar.xz 16168 BLAKE2B 37fcc56cc34dfbc68c8a8212f30a54c6a04f3b9014a5964b995bfef59df1b8f5a005e6cbfff97f1233451d215b6c4fd3c09a0cd39ebf6cb86bd6b327e5d7d718 SHA512 02b554bb2d0c91c090edeeb7c692164f378273e475a64653df845cb30cdd15d689f7fbe5fa890f77f82bf778d4d228384f656d202b6b6baf02d08321d7c2598d +EBUILD vhba-20211023.ebuild 1085 BLAKE2B d340728beb02725c1cc7c70c6abf61457cb63e53e07b1c0b7c6fea2d03dbb5467777e3dd0e0dcf73e8d4d90a00a86c1afd6efd0382e21ac9aa518885f46a76e6 SHA512 18d9b3e6bd8fb2e2869936e6cbecee30220af174258284db217899c31a090c559643d5751dba69941b1a570a7d6beb4dce90e32e1b0bd4e6fc5655d203d9fe7a +EBUILD vhba-20211218.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129 diff --git a/sys-fs/vhba/vhba-20200106-r1.ebuild b/sys-fs/vhba/vhba-20200106-r1.ebuild deleted file mode 100644 index c8222ceac977..000000000000 --- a/sys-fs/vhba/vhba-20200106-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod udev - -MY_P=vhba-module-${PV} -DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" -HOMEPAGE="https://cdemu.sourceforge.io" -SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="virtual/udev" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} -MODULE_NAMES="vhba(block:${S})" -BUILD_TARGETS=modules - -pkg_setup() { - CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" - check_extra_config - BUILD_PARAMS="KDIR=${KV_OUT_DIR}" - linux-mod_pkg_setup -} - -src_prepare() { - # Avoid -Werror problems - sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed" - - eapply_user -} - -src_install() { - dodoc AUTHORS ChangeLog README - linux-mod_src_install - - einfo "Generating udev rules ..." - udev_newrules - 69-vhba.rules <<-EOF - # do not edit this file, it will be overwritten on update - # - KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" - EOF -} diff --git a/sys-fs/vhba/vhba-20210418.ebuild b/sys-fs/vhba/vhba-20210418.ebuild deleted file mode 100644 index d9e0c2610800..000000000000 --- a/sys-fs/vhba/vhba-20210418.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod udev - -MY_P=vhba-module-${PV} -DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" -HOMEPAGE="https://cdemu.sourceforge.io/" -SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="virtual/udev" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -MODULE_NAMES="vhba(block:${S})" -BUILD_TARGETS=modules - -pkg_setup() { - CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" - check_extra_config - BUILD_PARAMS="KDIR=${KV_OUT_DIR}" - linux-mod_pkg_setup -} - -src_prepare() { - # Avoid -Werror problems - sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed" - - eapply_user -} - -src_install() { - dodoc AUTHORS ChangeLog README - linux-mod_src_install - - einfo "Generating udev rules ..." - udev_newrules - 69-vhba.rules <<-EOF - # do not edit this file, it will be overwritten on update - # - KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" - EOF -} diff --git a/sys-fs/vhba/vhba-20211023.ebuild b/sys-fs/vhba/vhba-20211023.ebuild index 458a74bf9381..d9e0c2610800 100644 --- a/sys-fs/vhba/vhba-20211023.ebuild +++ b/sys-fs/vhba/vhba-20211023.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="virtual/udev" diff --git a/sys-fs/vhba/vhba-20211218.ebuild b/sys-fs/vhba/vhba-20211218.ebuild new file mode 100644 index 000000000000..458a74bf9381 --- /dev/null +++ b/sys-fs/vhba/vhba-20211218.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod udev + +MY_P=vhba-module-${PV} +DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" +HOMEPAGE="https://cdemu.sourceforge.io/" +SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +MODULE_NAMES="vhba(block:${S})" +BUILD_TARGETS=modules + +pkg_setup() { + CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" + check_extra_config + BUILD_PARAMS="KDIR=${KV_OUT_DIR}" + linux-mod_pkg_setup +} + +src_prepare() { + # Avoid -Werror problems + sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed" + + eapply_user +} + +src_install() { + dodoc AUTHORS ChangeLog README + linux-mod_src_install + + einfo "Generating udev rules ..." + udev_newrules - 69-vhba.rules <<-EOF + # do not edit this file, it will be overwritten on update + # + KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" + EOF +} diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index fc6c294a3c2f..908c41183b6f 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,9 +1,9 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd -DIST xfsprogs-5.14.0.tar.xz 1307332 BLAKE2B d2177f10d677e28439cef1db3ca6a2adb93f89f1f415b2b564ec694d80a0b981ebd283d33ea21573ce2e7405da8235bad48df3ca43d37a4294de60ca95380ed1 SHA512 dc87840c05bbd3f6ba64bb61f95499d58eff1d4bb2309ed223048ca0e475f5bb139f03c47f415a997576e5bf85cf06b1a040e022397d6f0bcd5ba60b36d8b0a2 DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f9eed13b54809e6b21275cf4f8673385e8bbb1c1c668ba2592ab43fb230c9d46edf4c0e5abe59a9572cc9a90ae5da SHA512 5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea +DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 -EBUILD xfsprogs-5.14.0.ebuild 2298 BLAKE2B f62894f6091ed43dda4817ff2259b02c544acbca123de22fbe89504f0e4805db0c4589369b24da35218b075f11d0b47313d9859df34ab45f6c187bbb178d299a SHA512 6612895c549b250197061517c54b69ad57a5c4fabce96b1d917e71804a5dfc3d0aab5431d1414dff6784a30c1eb936d387e39cfc80cad4e8e6b3e414ce78318b EBUILD xfsprogs-5.14.1.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb +EBUILD xfsprogs-5.14.2.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild deleted file mode 100644 index 069e9cb903a7..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs systemd usr-ldscript - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu libedit nls selinux" - -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih - dev-libs/userspace-rcu - icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.patch -) - -src_prepare() { - default - - # Fix doc dir - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - - # Don't install compressed docs - sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die -} - -src_configure() { - # include/builddefs.in will add FCFLAGS to CFLAGS which will - # unnecessarily clutter CFLAGS (and fortran isn't used) - unset FCFLAGS - - export DEBUG=-DNDEBUG - - # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. - # However, we have to provide an empty value to avoid default - # flags. - export OPTIMIZER=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #709694 - export ac_cv_search_dm_task_create=no - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - - # Upstream does NOT support --disable-static anymore, - # https://www.spinics.net/lists/linux-xfs/msg30185.html - # https://www.spinics.net/lists/linux-xfs/msg30272.html - local myconf=( - --enable-blkid - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable libedit editline) - ) - - if is-flagq -flto ; then - myconf+=( --enable-lto ) - else - myconf+=( --disable-lto ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev - - gen_usr_ldscript -a handle -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild new file mode 100644 index 000000000000..f1ec2e50d05c --- /dev/null +++ b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd usr-ldscript + +DESCRIPTION="xfs filesystem utilities" +HOMEPAGE="https://xfs.wiki.kernel.org/" +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux" + +RDEPEND=">=sys-apps/util-linux-2.17.2 + dev-libs/inih + dev-libs/userspace-rcu + icu? ( dev-libs/icu:= ) + libedit? ( dev-libs/libedit ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( sys-devel/gettext ) +" +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.15.0-docdir.patch + "${FILESDIR}"/${PN}-5.3.0-libdir.patch +) + +src_prepare() { + default + + # Fix doc dir + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in || die + + # Don't install compressed docs + sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die +} + +src_configure() { + # include/builddefs.in will add FCFLAGS to CFLAGS which will + # unnecessarily clutter CFLAGS (and fortran isn't used) + unset FCFLAGS + + export DEBUG=-DNDEBUG + + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + + unset PLATFORM # if set in user env, this breaks configure + + # Avoid automagic on libdevmapper, #709694 + export ac_cv_search_dm_task_create=no + + # Build fails with -O3 (bug #712698) + replace-flags -O3 -O2 + + # Upstream does NOT support --disable-static anymore, + # https://www.spinics.net/lists/linux-xfs/msg30185.html + # https://www.spinics.net/lists/linux-xfs/msg30272.html + local myconf=( + --enable-blkid + --with-crond-dir="${EPREFIX}/etc/cron.d" + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + $(use_enable icu libicu) + $(use_enable nls gettext) + $(use_enable libedit editline) + ) + + if is-flagq -flto ; then + myconf+=( --enable-lto ) + else + myconf+=( --disable-lto ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake V=1 +} + +src_install() { + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev + + gen_usr_ldscript -a handle +} diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index d2ced19c7f9a..2ca8c1bcf0b3 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,13 +1,11 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 -AUX 2.1.1-SEEK_DATA-SEEK_HOLE.patch 19794 BLAKE2B c3259c50e96e7c28a8d6a18693674c1a6b233fb8eb1cbdd4a4c87e085b0b787c8b512231f109c4600da1a7a571c6129a3acd904303967543c1a12bb1042ed2b5 SHA512 098d0b6cb25fb90ac987e7e0913b2681a297bf3138d6708d4f4bb9b6402f0ec71f4848c50bbec6ef006208f40fa709b1d58ca46c9cbf08a125a9165f83287c52 -AUX 2.1.1-restore-dirty-dnode-logic.patch 1075 BLAKE2B 04720dbfb3f4fc223c329dee330330a94224119dcdfb7240c8bb629fbc4f8206acf95c021219844ad289ddcd2cced7b686418d9f59c3c21d2b08d029100fa29d SHA512 5122de3b1fa9875d47afe52da624a25c1b24ad917ee195769828efdb3c510c709b1cee95914e0a0f2959b41324ac0b61fe77675901dfd95955994d52434b8c3a DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce 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.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c -DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94 +DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 +DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb EBUILD zfs-kmod-0.8.6.ebuild 5749 BLAKE2B 867ba8d060dc08eae4027d8c6e17f8ed31f429c87cc0ad9faa88aab0ee60d91e0a2a1d0b9dc59974d3c406a6266d4a4f752dab9e909a0df18ddf5c65152e6e13 SHA512 3f7303584c5324ed8715cd5a473344564ce2862b3e730722ac128a758f2750c1cb3ab2521185eae6e237ec1aa5dda82b8780009a51fc6798e27fc45b18c96f6a -EBUILD zfs-kmod-2.0.6.ebuild 6045 BLAKE2B 02a899203203caf05268bebd5e275aefdfb6ebdf71feecc9df9c3e5d861f635d8b0632afb51edf62450b2c82cf58396d3df812b721fd40906655c16aa7280b67 SHA512 d25e34726710e9b2bfda4467f03df4376cce9eb988c4449d54aeee47c7d7c717326e9e56d58fb69d8bfff47fb6a0a1f69d4cb8ca5cf28a7efa29f76f8caccf83 -EBUILD zfs-kmod-2.1.1-r4.ebuild 5584 BLAKE2B 5bf13cef8d82620b31498044dccbaee43dca00df521dc12a37d1d2f43262b6d0ce0be61b765c51a9423dee04697826b214c6e304ee84fa52767aafbb13fc6e32 SHA512 0ec9a83429c4833fbb569e251ba0ba940b9791360847618fceabf4f4597d815cb718e7368ca4db8d112186dbea4c095dfc289043cda5797995fdf403b558aec3 -EBUILD zfs-kmod-9999.ebuild 5243 BLAKE2B fb00deb56979862a3249a9be33dc438153945dc38384473c6d24534d9cbde56fc17b5dde81c110239dd8945079417a912f614f611be1b036106201fde4028125 SHA512 a3ade0ec20a34b0e28f8af9a674c3124c283097b405b222d4518122e81cf6a215aa1eacfed1d6beea04c782af3b8a2c9b8763188dfd94f9a94f10e6a6ebb0199 +EBUILD zfs-kmod-2.0.6.ebuild 6044 BLAKE2B bccfccf6b6a101e67448fa592cce63dee9b7eba6bdb2b925c6f0e7d6605137a87cf2d6ea2e231c20adb2cdf53a716ccccd22d2b3d8d2e555e71e8fb6f6313c81 SHA512 4834745ccdf0d77ff8aa9ec8a5796ef4ed2209e8735c86bb3762080ba95e6d34963ca9ee87320d216ccd68e1faef2d7f411a2dd4cbcab4df9c0e438fe85049ea +EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 57af8a2b3d4dfbe46828dc052b222f4f4cb7ace95a6e116ccd62616892a2fdc9b414f23ed6853e870f6623bf010e2b08048fce35ef1de04aebe136f65797fa25 SHA512 de5a2d68b49355302c1b534c0d416001bffd1f0e44d2f6e9eda4054c2a7dd090d57c5f692c76528552ca84f3481ee582e8816e698e12969ab8d927c86b33e8b2 +EBUILD zfs-kmod-9999.ebuild 5242 BLAKE2B 7ed1e8a1afc61c7df54cdfd2cef35490a6f0ccc69a2178292048b9ea22732fa9505d85fa8f09cd64a6e0cefb086f5c0e030527651e902c023571ea4f56a87f46 SHA512 ab608b6814a9178970124790eb6849a6bf62178fb0d091248a608b63d5a5152e53d4889a3bcd9c1f34505ab98c8adf1c6161706c2b52e19e33064fb364a08f2b MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650 diff --git a/sys-fs/zfs-kmod/files/2.1.1-SEEK_DATA-SEEK_HOLE.patch b/sys-fs/zfs-kmod/files/2.1.1-SEEK_DATA-SEEK_HOLE.patch deleted file mode 100644 index 458fe279ee23..000000000000 --- a/sys-fs/zfs-kmod/files/2.1.1-SEEK_DATA-SEEK_HOLE.patch +++ /dev/null @@ -1,594 +0,0 @@ -From 664d487a5dbd758216ac613934a4080fcc1de347 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf -Date: Sun, 7 Nov 2021 13:27:44 -0800 -Subject: [PATCH] Fix lseek(SEEK_DATA/SEEK_HOLE) mmap consistency - -When using lseek(2) to report data/holes memory mapped regions of -the file were ignored. This could result in incorrect results. -To handle this zfs_holey_common() was updated to asynchronously -writeback any dirty mmap(2) regions prior to reporting holes. - -Additionally, while not strictly required, the dn_struct_rwlock is -now held over the dirty check to prevent the dnode structure from -changing. This ensures that a clean dnode can't be dirtied before -the data/hole is located. The range lock is now also taken to -ensure the call cannot race with zfs_write(). - -Furthermore, the code was refactored to provide a dnode_is_dirty() -helper function which checks the dnode for any dirty records to -determine its dirtiness. - -Reviewed-by: Matthew Ahrens -Reviewed-by: Tony Hutter -Reviewed-by: Rich Ercolani -Signed-off-by: Brian Behlendorf -Issue #11900 -Closes #12724 ---- - configure.ac | 1 + - include/os/freebsd/spl/sys/vnode.h | 18 +++ - include/os/freebsd/zfs/sys/zfs_znode_impl.h | 3 +- - include/os/linux/zfs/sys/zfs_znode_impl.h | 1 + - include/sys/dnode.h | 1 + - man/man4/zfs.4 | 2 +- - module/zfs/dmu.c | 53 ++++--- - module/zfs/dnode.c | 20 +++ - module/zfs/zfs_vnops.c | 9 +- - tests/runfiles/common.run | 2 +- - tests/zfs-tests/cmd/Makefile.am | 1 + - tests/zfs-tests/cmd/mmap_seek/.gitignore | 1 + - tests/zfs-tests/cmd/mmap_seek/Makefile.am | 6 + - tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 147 ++++++++++++++++++ - tests/zfs-tests/include/commands.cfg | 1 + - tests/zfs-tests/include/tunables.cfg | 1 + - .../tests/functional/mmap/Makefile.am | 3 +- - .../functional/mmap/mmap_seek_001_pos.ksh | 67 ++++++++ - 18 files changed, 305 insertions(+), 32 deletions(-) - create mode 100644 tests/zfs-tests/cmd/mmap_seek/.gitignore - create mode 100644 tests/zfs-tests/cmd/mmap_seek/Makefile.am - create mode 100644 tests/zfs-tests/cmd/mmap_seek/mmap_seek.c - create mode 100755 tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh - -diff --git a/configure.ac b/configure.ac -index 6f34b210d2b..ebc7b276a64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -221,6 +221,7 @@ AC_CONFIG_FILES([ - tests/zfs-tests/cmd/mktree/Makefile - tests/zfs-tests/cmd/mmap_exec/Makefile - tests/zfs-tests/cmd/mmap_libaio/Makefile -+ tests/zfs-tests/cmd/mmap_seek/Makefile - tests/zfs-tests/cmd/mmapwrite/Makefile - tests/zfs-tests/cmd/nvlist_to_lua/Makefile - tests/zfs-tests/cmd/randfree_file/Makefile -diff --git a/include/os/freebsd/spl/sys/vnode.h b/include/os/freebsd/spl/sys/vnode.h -index 3670712a045..3bc8a18eeb7 100644 ---- a/include/os/freebsd/spl/sys/vnode.h -+++ b/include/os/freebsd/spl/sys/vnode.h -@@ -59,6 +59,8 @@ enum symfollow { NO_FOLLOW = NOFOLLOW }; - #include - #include - #include -+#include -+#include - - typedef struct vop_vector vnodeops_t; - #define VOP_FID VOP_VPTOFH -@@ -83,6 +85,22 @@ vn_is_readonly(vnode_t *vp) - #define vn_has_cached_data(vp) \ - ((vp)->v_object != NULL && \ - (vp)->v_object->resident_page_count > 0) -+ -+static __inline void -+vn_flush_cached_data(vnode_t *vp, boolean_t sync) -+{ -+#if __FreeBSD_version > 1300054 -+ if (vm_object_mightbedirty(vp->v_object)) { -+#else -+ if (vp->v_object->flags & OBJ_MIGHTBEDIRTY) { -+#endif -+ int flags = sync ? OBJPC_SYNC : 0; -+ zfs_vmobject_wlock(vp->v_object); -+ vm_object_page_clean(vp->v_object, 0, 0, flags); -+ zfs_vmobject_wunlock(vp->v_object); -+ } -+} -+ - #define vn_exists(vp) do { } while (0) - #define vn_invalid(vp) do { } while (0) - #define vn_renamepath(tdvp, svp, tnm, lentnm) do { } while (0) -diff --git a/include/os/freebsd/zfs/sys/zfs_znode_impl.h b/include/os/freebsd/zfs/sys/zfs_znode_impl.h -index e90008c70a8..edb28d041a0 100644 ---- a/include/os/freebsd/zfs/sys/zfs_znode_impl.h -+++ b/include/os/freebsd/zfs/sys/zfs_znode_impl.h -@@ -118,7 +118,8 @@ extern minor_t zfsdev_minor_alloc(void); - #define Z_ISLNK(type) ((type) == VLNK) - #define Z_ISDIR(type) ((type) == VDIR) - --#define zn_has_cached_data(zp) vn_has_cached_data(ZTOV(zp)) -+#define zn_has_cached_data(zp) vn_has_cached_data(ZTOV(zp)) -+#define zn_flush_cached_data(zp, sync) vn_flush_cached_data(ZTOV(zp), sync) - #define zn_rlimit_fsize(zp, uio) \ - vn_rlimit_fsize(ZTOV(zp), GET_UIO_STRUCT(uio), zfs_uio_td(uio)) - -diff --git a/include/os/linux/zfs/sys/zfs_znode_impl.h b/include/os/linux/zfs/sys/zfs_znode_impl.h -index 0a6273442b7..de46fc8f2bd 100644 ---- a/include/os/linux/zfs/sys/zfs_znode_impl.h -+++ b/include/os/linux/zfs/sys/zfs_znode_impl.h -@@ -71,6 +71,7 @@ extern "C" { - #define Z_ISDIR(type) S_ISDIR(type) - - #define zn_has_cached_data(zp) ((zp)->z_is_mapped) -+#define zn_flush_cached_data(zp, sync) write_inode_now(ZTOI(zp), sync) - #define zn_rlimit_fsize(zp, uio) (0) - - /* -diff --git a/include/sys/dnode.h b/include/sys/dnode.h -index 2cdc5b8798a..af8775b9ee0 100644 ---- a/include/sys/dnode.h -+++ b/include/sys/dnode.h -@@ -425,6 +425,7 @@ boolean_t dnode_add_ref(dnode_t *dn, void *ref); - void dnode_rele(dnode_t *dn, void *ref); - void dnode_rele_and_unlock(dnode_t *dn, void *tag, boolean_t evicting); - int dnode_try_claim(objset_t *os, uint64_t object, int slots); -+boolean_t dnode_is_dirty(dnode_t *dn); - void dnode_setdirty(dnode_t *dn, dmu_tx_t *tx); - void dnode_set_dirtyctx(dnode_t *dn, dmu_tx_t *tx, void *tag); - void dnode_sync(dnode_t *dn, dmu_tx_t *tx); -diff --git a/man/man4/zfs.4 b/man/man4/zfs.4 -index 2aed6895754..20b24d898d8 100644 ---- a/man/man4/zfs.4 -+++ b/man/man4/zfs.4 -@@ -1574,7 +1574,7 @@ Allow no-operation writes. - The occurrence of nopwrites will further depend on other pool properties - .Pq i.a. the checksumming and compression algorithms . - . --.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | ns 1 Pq int -+.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int - Enable forcing TXG sync to find holes. - When enabled forces ZFS to act like prior versions when - .Sy SEEK_HOLE No or Sy SEEK_DATA -diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c -index 1c47430953b..8302d506146 100644 ---- a/module/zfs/dmu.c -+++ b/module/zfs/dmu.c -@@ -2095,42 +2095,41 @@ int - dmu_offset_next(objset_t *os, uint64_t object, boolean_t hole, uint64_t *off) - { - dnode_t *dn; -- int i, err; -- boolean_t clean = B_TRUE; -+ int err; - -+restart: - err = dnode_hold(os, object, FTAG, &dn); - if (err) - return (err); - -- /* -- * Check if dnode is dirty -- */ -- for (i = 0; i < TXG_SIZE; i++) { -- if (multilist_link_active(&dn->dn_dirty_link[i])) { -- clean = B_FALSE; -- break; -- } -- } -+ rw_enter(&dn->dn_struct_rwlock, RW_READER); - -- /* -- * If compatibility option is on, sync any current changes before -- * we go trundling through the block pointers. -- */ -- if (!clean && zfs_dmu_offset_next_sync) { -- clean = B_TRUE; -- dnode_rele(dn, FTAG); -- txg_wait_synced(dmu_objset_pool(os), 0); -- err = dnode_hold(os, object, FTAG, &dn); -- if (err) -- return (err); -- } -+ if (dnode_is_dirty(dn)) { -+ /* -+ * If the zfs_dmu_offset_next_sync module option is enabled -+ * then strict hole reporting has been requested. Dirty -+ * dnodes must be synced to disk to accurately report all -+ * holes. When disabled (the default) dirty dnodes are -+ * reported to not have any holes which is always safe. -+ * -+ * When called by zfs_holey_common() the zp->z_rangelock -+ * is held to prevent zfs_write() and mmap writeback from -+ * re-dirtying the dnode after txg_wait_synced(). -+ */ -+ if (zfs_dmu_offset_next_sync) { -+ rw_exit(&dn->dn_struct_rwlock); -+ dnode_rele(dn, FTAG); -+ txg_wait_synced(dmu_objset_pool(os), 0); -+ goto restart; -+ } - -- if (clean) -- err = dnode_next_offset(dn, -- (hole ? DNODE_FIND_HOLE : 0), off, 1, 1, 0); -- else - err = SET_ERROR(EBUSY); -+ } else { -+ err = dnode_next_offset(dn, DNODE_FIND_HAVELOCK | -+ (hole ? DNODE_FIND_HOLE : 0), off, 1, 1, 0); -+ } - -+ rw_exit(&dn->dn_struct_rwlock); - dnode_rele(dn, FTAG); - - return (err); -diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c -index 7f741542ce0..572d88ec2bf 100644 ---- a/module/zfs/dnode.c -+++ b/module/zfs/dnode.c -@@ -1648,6 +1648,26 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) - slots, NULL, NULL)); - } - -+/* -+ * Checks if the dnode contains any uncommitted dirty records. -+ */ -+boolean_t -+dnode_is_dirty(dnode_t *dn) -+{ -+ mutex_enter(&dn->dn_mtx); -+ -+ for (int i = 0; i < TXG_SIZE; i++) { -+ if (list_head(&dn->dn_dirty_records[i]) != NULL) { -+ mutex_exit(&dn->dn_mtx); -+ return (B_TRUE); -+ } -+ } -+ -+ mutex_exit(&dn->dn_mtx); -+ -+ return (B_FALSE); -+} -+ - void - dnode_setdirty(dnode_t *dn, dmu_tx_t *tx) - { -diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c -index 8229bc9a93e..170e392abe9 100644 ---- a/module/zfs/zfs_vnops.c -+++ b/module/zfs/zfs_vnops.c -@@ -85,6 +85,7 @@ zfs_fsync(znode_t *zp, int syncflag, cred_t *cr) - static int - zfs_holey_common(znode_t *zp, ulong_t cmd, loff_t *off) - { -+ zfs_locked_range_t *lr; - uint64_t noff = (uint64_t)*off; /* new offset */ - uint64_t file_sz; - int error; -@@ -100,12 +101,18 @@ zfs_holey_common(znode_t *zp, ulong_t cmd, loff_t *off) - else - hole = B_FALSE; - -+ /* Flush any mmap()'d data to disk */ -+ if (zn_has_cached_data(zp)) -+ zn_flush_cached_data(zp, B_FALSE); -+ -+ lr = zfs_rangelock_enter(&zp->z_rangelock, 0, file_sz, RL_READER); - error = dmu_offset_next(ZTOZSB(zp)->z_os, zp->z_id, hole, &noff); -+ zfs_rangelock_exit(lr); - - if (error == ESRCH) - return (SET_ERROR(ENXIO)); - -- /* file was dirty, so fall back to using generic logic */ -+ /* File was dirty, so fall back to using generic logic */ - if (error == EBUSY) { - if (hole) - *off = file_sz; -diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run -index a62cd6ad39f..97ee7b8ae24 100644 ---- a/tests/runfiles/common.run -+++ b/tests/runfiles/common.run -@@ -669,7 +669,7 @@ tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos', - tags = ['functional', 'migration'] - - [tests/functional/mmap] --tests = ['mmap_write_001_pos', 'mmap_read_001_pos'] -+tests = ['mmap_write_001_pos', 'mmap_read_001_pos', 'mmap_seek_001_pos'] - tags = ['functional', 'mmap'] - - [tests/functional/mount] -diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am -index 2b965ca7000..d1c29fcd1c6 100644 ---- a/tests/zfs-tests/cmd/Makefile.am -+++ b/tests/zfs-tests/cmd/Makefile.am -@@ -19,6 +19,7 @@ SUBDIRS = \ - mktree \ - mmap_exec \ - mmap_libaio \ -+ mmap_seek \ - mmapwrite \ - nvlist_to_lua \ - randwritecomp \ -diff --git a/tests/zfs-tests/cmd/mmap_seek/.gitignore b/tests/zfs-tests/cmd/mmap_seek/.gitignore -new file mode 100644 -index 00000000000..6b05a791750 ---- /dev/null -+++ b/tests/zfs-tests/cmd/mmap_seek/.gitignore -@@ -0,0 +1 @@ -+/mmap_seek -diff --git a/tests/zfs-tests/cmd/mmap_seek/Makefile.am b/tests/zfs-tests/cmd/mmap_seek/Makefile.am -new file mode 100644 -index 00000000000..b938931125f ---- /dev/null -+++ b/tests/zfs-tests/cmd/mmap_seek/Makefile.am -@@ -0,0 +1,6 @@ -+include $(top_srcdir)/config/Rules.am -+ -+pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin -+ -+pkgexec_PROGRAMS = mmap_seek -+mmap_seek_SOURCES = mmap_seek.c -diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c -new file mode 100644 -index 00000000000..f476e1dba9a ---- /dev/null -+++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c -@@ -0,0 +1,147 @@ -+/* -+ * CDDL HEADER START -+ * -+ * The contents of this file are subject to the terms of the -+ * Common Development and Distribution License (the "License"). -+ * You may not use this file except in compliance with the License. -+ * -+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+ * or http://www.opensolaris.org/os/licensing. -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ * When distributing Covered Code, include this CDDL HEADER in each -+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+ * If applicable, add the following below this CDDL HEADER, with the -+ * fields enclosed by brackets "[]" replaced with your own identifying -+ * information: Portions Copyright [yyyy] [name of copyright owner] -+ * -+ * CDDL HEADER END -+ */ -+ -+/* -+ * Copyright (c) 2021 by Lawrence Livermore National Security, LLC. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static void -+seek_data(int fd, off_t offset, off_t expected) -+{ -+ off_t data_offset = lseek(fd, offset, SEEK_DATA); -+ if (data_offset != expected) { -+ fprintf(stderr, "lseek(fd, %d, SEEK_DATA) = %d (expected %d)\n", -+ (int)offset, (int)data_offset, (int)expected); -+ exit(2); -+ } -+} -+ -+static void -+seek_hole(int fd, off_t offset, off_t expected) -+{ -+ off_t hole_offset = lseek(fd, offset, SEEK_HOLE); -+ if (hole_offset != expected) { -+ fprintf(stderr, "lseek(fd, %d, SEEK_HOLE) = %d (expected %d)\n", -+ (int)offset, (int)hole_offset, (int)expected); -+ exit(2); -+ } -+} -+ -+int -+main(int argc, char **argv) -+{ -+ char *execname = argv[0]; -+ char *file_path = argv[1]; -+ char *buf = NULL; -+ int err; -+ -+ if (argc != 4) { -+ (void) printf("usage: %s " -+ "\n", argv[0]); -+ exit(1); -+ } -+ -+ int fd = open(file_path, O_RDWR | O_CREAT, 0666); -+ if (fd == -1) { -+ (void) fprintf(stderr, "%s: %s: ", execname, file_path); -+ perror("open"); -+ exit(2); -+ } -+ -+ off_t file_size = atoi(argv[2]); -+ off_t block_size = atoi(argv[3]); -+ -+ if (block_size * 2 > file_size) { -+ (void) fprintf(stderr, "file size must be at least " -+ "double the block size\n"); -+ exit(2); -+ } -+ -+ err = ftruncate(fd, file_size); -+ if (err == -1) { -+ perror("ftruncate"); -+ exit(2); -+ } -+ -+ if ((buf = mmap(NULL, file_size, PROT_READ | PROT_WRITE, -+ MAP_SHARED, fd, 0)) == MAP_FAILED) { -+ perror("mmap"); -+ exit(2); -+ } -+ -+ /* Verify the file is sparse and reports no data. */ -+ seek_data(fd, 0, -1); -+ -+ /* Verify the file is reported as a hole. */ -+ seek_hole(fd, 0, 0); -+ -+ /* Verify search beyond end of file is an error. */ -+ seek_data(fd, 2 * file_size, -1); -+ seek_hole(fd, 2 * file_size, -1); -+ -+ /* Dirty the first byte. */ -+ memset(buf, 'a', 1); -+ seek_data(fd, 0, 0); -+ seek_data(fd, block_size, -1); -+ seek_hole(fd, 0, block_size); -+ seek_hole(fd, block_size, block_size); -+ -+ /* Dirty the first half of the file. */ -+ memset(buf, 'b', file_size / 2); -+ seek_data(fd, 0, 0); -+ seek_data(fd, block_size, block_size); -+ seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size)); -+ seek_hole(fd, block_size, P2ROUNDUP(file_size / 2, block_size)); -+ -+ /* Dirty the whole file. */ -+ memset(buf, 'c', file_size); -+ seek_data(fd, 0, 0); -+ seek_data(fd, file_size * 3 / 4, -+ P2ROUNDUP(file_size * 3 / 4, block_size)); -+ seek_hole(fd, 0, file_size); -+ seek_hole(fd, file_size / 2, file_size); -+ -+ /* Punch a hole (required compression be enabled). */ -+ memset(buf + block_size, 0, block_size); -+ seek_data(fd, 0, 0); -+ seek_data(fd, block_size, 2 * block_size); -+ seek_hole(fd, 0, block_size); -+ seek_hole(fd, block_size, block_size); -+ seek_hole(fd, 2 * block_size, file_size); -+ -+ err = munmap(buf, file_size); -+ if (err == -1) { -+ perror("munmap"); -+ exit(2); -+ } -+ -+ close(fd); -+ -+ return (0); -+} -diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg -index 1ec73f25bae..4497a6248b4 100644 ---- a/tests/zfs-tests/include/commands.cfg -+++ b/tests/zfs-tests/include/commands.cfg -@@ -209,6 +209,7 @@ export ZFSTEST_FILES='badsend - mktree - mmap_exec - mmap_libaio -+ mmap_seek - mmapwrite - nvlist_to_lua - randfree_file -diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg -index 56d430a3987..fff43e46916 100644 ---- a/tests/zfs-tests/include/tunables.cfg -+++ b/tests/zfs-tests/include/tunables.cfg -@@ -33,6 +33,7 @@ DEADMAN_FAILMODE deadman.failmode zfs_deadman_failmode - DEADMAN_SYNCTIME_MS deadman.synctime_ms zfs_deadman_synctime_ms - DEADMAN_ZIOTIME_MS deadman.ziotime_ms zfs_deadman_ziotime_ms - DISABLE_IVSET_GUID_CHECK disable_ivset_guid_check zfs_disable_ivset_guid_check -+DMU_OFFSET_NEXT_SYNC dmu_offset_next_sync zfs_dmu_offset_next_sync - INITIALIZE_CHUNK_SIZE initialize_chunk_size zfs_initialize_chunk_size - INITIALIZE_VALUE initialize_value zfs_initialize_value - KEEP_LOG_SPACEMAPS_AT_EXPORT keep_log_spacemaps_at_export zfs_keep_log_spacemaps_at_export -diff --git a/tests/zfs-tests/tests/functional/mmap/Makefile.am b/tests/zfs-tests/tests/functional/mmap/Makefile.am -index 2adc398b8c0..b26791ee7ce 100644 ---- a/tests/zfs-tests/tests/functional/mmap/Makefile.am -+++ b/tests/zfs-tests/tests/functional/mmap/Makefile.am -@@ -4,7 +4,8 @@ dist_pkgdata_SCRIPTS = \ - cleanup.ksh \ - mmap_read_001_pos.ksh \ - mmap_write_001_pos.ksh \ -- mmap_libaio_001_pos.ksh -+ mmap_libaio_001_pos.ksh \ -+ mmap_seek_001_pos.ksh - - dist_pkgdata_DATA = \ - mmap.cfg -diff --git a/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh b/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh -new file mode 100755 -index 00000000000..6188549ad8d ---- /dev/null -+++ b/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh -@@ -0,0 +1,67 @@ -+#!/bin/ksh -p -+# -+# CDDL HEADER START -+# -+# The contents of this file are subject to the terms of the -+# Common Development and Distribution License (the "License"). -+# You may not use this file except in compliance with the License. -+# -+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+# or http://www.opensolaris.org/os/licensing. -+# See the License for the specific language governing permissions -+# and limitations under the License. -+# -+# When distributing Covered Code, include this CDDL HEADER in each -+# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+# If applicable, add the following below this CDDL HEADER, with the -+# fields enclosed by brackets "[]" replaced with your own identifying -+# information: Portions Copyright [yyyy] [name of copyright owner] -+# -+# CDDL HEADER END -+# -+ -+# -+# Copyright (c) 2021 by Lawrence Livermore National Security, LLC. -+# -+ -+. $STF_SUITE/include/libtest.shlib -+. $STF_SUITE/tests/functional/mmap/mmap.cfg -+ -+# -+# DESCRIPTION: -+# lseek() data/holes for an mmap()'d file. -+# -+# STRATEGY: -+# 1. Enable compression and hole reporting for dirty files. -+# 2. Call mmap_seek binary test case for various record sizes. -+# -+ -+verify_runnable "global" -+ -+function cleanup -+{ -+ log_must zfs set compression=off $TESTPOOL/$TESTFS -+ log_must zfs set recordsize=128k $TESTPOOL/$TESTFS -+ log_must rm -f $TESTDIR/test-mmap-file -+ log_must set_tunable64 DMU_OFFSET_NEXT_SYNC $dmu_offset_next_sync -+} -+ -+log_assert "lseek() data/holes for an mmap()'d file." -+ -+log_onexit cleanup -+ -+# Enable hole reporting for dirty files. -+typeset dmu_offset_next_sync=$(get_tunable DMU_OFFSET_NEXT_SYNC) -+log_must set_tunable64 DMU_OFFSET_NEXT_SYNC 1 -+ -+# Compression must be enabled to convert zero'd blocks to holes. -+# This behavior is checked by the mmap_seek test. -+log_must zfs set compression=on $TESTPOOL/$TESTFS -+ -+for bs in 4096 8192 16384 32768 65536 131072; do -+ log_must zfs set recordsize=$bs $TESTPOOL/$TESTFS -+ log_must mmap_seek $TESTDIR/test-mmap-file $((1024*1024)) $bs -+ log_must rm $TESTDIR/test-mmap-file -+done -+ -+log_pass "lseek() data/holes for an mmap()'d file succeeded." diff --git a/sys-fs/zfs-kmod/files/2.1.1-restore-dirty-dnode-logic.patch b/sys-fs/zfs-kmod/files/2.1.1-restore-dirty-dnode-logic.patch deleted file mode 100644 index d33735ff9ff6..000000000000 --- a/sys-fs/zfs-kmod/files/2.1.1-restore-dirty-dnode-logic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d7e640cf95f72deeca501d34afed59a0bc9d7940 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf -Date: Wed, 10 Nov 2021 16:14:32 -0800 -Subject: [PATCH] Restore dirty dnode detection logic - -In addition to flushing memory mapped regions when checking holes, -commit de198f2d95 modified the dirty dnode detection logic to check -the dn->dn_dirty_records instead of the dn->dn_dirty_link. Relying -on the dirty record has not be reliable, switch back to the previous -method. - -Signed-off-by: Brian Behlendorf -Issue #11900 -Closes #12745 ---- - module/zfs/dnode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c -index 572d88ec2bf..7044c1fc634 100644 ---- a/module/zfs/dnode.c -+++ b/module/zfs/dnode.c -@@ -1657,7 +1657,7 @@ dnode_is_dirty(dnode_t *dn) - mutex_enter(&dn->dn_mtx); - - for (int i = 0; i < TXG_SIZE; i++) { -- if (list_head(&dn->dn_dirty_records[i]) != NULL) { -+ if (multilist_link_active(&dn->dn_dirty_link[i])) { - mutex_exit(&dn->dn_mtx); - return (B_TRUE); - } diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild index d12b2a434901..69f6e20a0db0 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild @@ -49,7 +49,7 @@ BDEPEND=" # and we don't need in in git ebuild. if [[ ${PV} != "9999" ]] ; then BDEPEND+=" - verify-sig? ( app-crypt/openpgp-keys-openzfs ) + verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( 5.15, and still supports override. - ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" - - 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 -" - -# we want dist-kernel block in BDEPEND because of portage resolver. -# since linux-mod.eclass already sets version-unbounded dep, portage -# will pull new versions. So we set it in BDEPEND which takes priority. -# and we don't need in in git ebuild. -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" - verify-sig? ( app-crypt/openpgp-keys-openzfs ) - dist-kernel? ( 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 - - echo - ewarn "This versions of ${PN} includes a very important fix for upstream bug" - ewarn "https://github.com/openzfs/zfs/issues/11900" - ewarn "Please reboot into kernel with ${P} as soon as possible" - echo -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild new file mode 100644 index 000000000000..65b9253ee17a --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild @@ -0,0 +1,205 @@ +# 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.15" + + # increments minor eg 5.14 -> 5.15, and still supports override. + ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" + + 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 +" + +# we want dist-kernel block in BDEPEND because of portage resolver. +# since linux-mod.eclass already sets version-unbounded dep, portage +# will pull new versions. So we set it in BDEPEND which takes priority. +# and we don't need in in git ebuild. +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" + verify-sig? ( sec-keys/openpgp-keys-openzfs ) + dist-kernel? ( 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 5b11d92a6ea3..16b9466d2567 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -19,7 +19,7 @@ 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.14" + ZFS_KERNEL_COMPAT="5.15" # increments minor eg 5.14 -> 5.15, and still supports override. ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" @@ -49,7 +49,7 @@ BDEPEND=" # and we don't need in in git ebuild. if [[ ${PV} != "9999" ]] ; then BDEPEND+=" - verify-sig? ( app-crypt/openpgp-keys-openzfs ) + verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( +Date: Mon, 20 Dec 2021 12:25:11 -0800 +Subject: [PATCH] zfs-test/mmap_seek: fix build on musl + +it needs linux/fs.h for SEEK_DATA and friends + +without linux/fs.h: + +``` +mmap_seek.c +mmap_seek.c: In function 'seek_data': +mmap_seek.c:37:40: error: 'SEEK_DATA' undeclared (first use in this function); +did you mean 'SEEK_SET'? + 37 | off_t data_offset = lseek(fd, offset, SEEK_DATA); +``` + +also it needs sys/sysmacros.h for P2ROUNDUP +without it: + +``` +mmap_seek.c: In function 'main': +mmap_seek.c:122:19: warning: +implicit declaration of function 'P2ROUNDUP' [-Wimplicit-function-declaration] + 122 | seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size)); + | ^~~~~~~~~ +powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.o: in function `main': +mmap_seek.c:(.text.startup+0x1b8): undefined reference to `P2ROUNDUP' +powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x1d8): + undefined reference to `P2ROUNDUP' +powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x21c): + undefined reference to `P2ROUNDUP' +collect2: error: ld returned 1 exit status +make[5]: *** [Makefile:754: mmap_seek] Error 1 +``` + +Closes: https://github.com/openzfs/zfs/pull/12891 +Signed-off-by: Georgy Yakovlev +--- + tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c +index f476e1dba9a..bb36527aafe 100644 +--- a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c ++++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c +@@ -29,7 +29,11 @@ + #include + #include + #include ++#include + #include ++#ifdef __linux__ ++#include ++#endif + + static void + seek_data(int fd, off_t offset, off_t expected) diff --git a/sys-fs/zfs/files/2.1.2-openrc-vendor.patch b/sys-fs/zfs/files/2.1.2-openrc-vendor.patch new file mode 100644 index 000000000000..abe222aa5b84 --- /dev/null +++ b/sys-fs/zfs/files/2.1.2-openrc-vendor.patch @@ -0,0 +1,42 @@ +From 6ef28c526ba7199a3740407d764b6505618ca8ba Mon Sep 17 00:00:00 2001 +From: Peter Levine +Date: Fri, 29 Oct 2021 18:34:37 -0400 +Subject: [PATCH] Set DEFAULT_INIT_SHELL to /sbin/openrc-run for Gentoo and + Alpine + +Gentoo and Alpine always set the rc init scripts' shebang to +#!/sbin/openrc-run, whether or not openrc is installed. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Peter Levine +Closes #12683 +Closes #12692 +--- + config/zfs-build.m4 | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 +index 27041c054c2..ec4a2026bf5 100644 +--- a/config/zfs-build.m4 ++++ b/config/zfs-build.m4 +@@ -564,15 +564,11 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ + *) DEFAULT_INIT_SCRIPT=lsb ;; + esac + +- # On gentoo, it's possible that OpenRC isn't installed. Check if +- # /sbin/openrc-run exists, and if not, fall back to generic defaults. +- +- DEFAULT_INIT_SHELL="/bin/sh" +- AS_IF([test "$DEFAULT_INIT_SCRIPT" = "openrc"], [ +- AS_IF([test -x "/sbin/openrc-run"], +- [DEFAULT_INIT_SHELL="/sbin/openrc-run"], +- [DEFAULT_INIT_SCRIPT=lsb]) +- ]) ++ case "$VENDOR" in ++ gentoo) DEFAULT_INIT_SHELL="/sbin/openrc-run";; ++ alpine) DEFAULT_INIT_SHELL="/sbin/openrc-run";; ++ *) DEFAULT_INIT_SHELL="/bin/sh" ;; ++ esac + + AC_MSG_RESULT([$DEFAULT_INIT_SCRIPT:$DEFAULT_INIT_SHELL]) + AC_SUBST(DEFAULT_INIT_SCRIPT) diff --git a/sys-fs/zfs/files/2.1.2-scrub-timers.patch b/sys-fs/zfs/files/2.1.2-scrub-timers.patch new file mode 100644 index 000000000000..f1c5b5699f62 --- /dev/null +++ b/sys-fs/zfs/files/2.1.2-scrub-timers.patch @@ -0,0 +1,147 @@ +From 2c9844d159024d4c742d24639a218213fb53d537 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 22 May 2021 22:27:39 -0700 +Subject: [PATCH 1/2] systemd: add weekly and monthly scrub timers + +timers can be enabled as follows: + +systemctl enable zfs-scrub-weekly@rpool.timer --now +systemctl enable zfs-scrub-monthly@datapool.timer --now + +Each timer will pull in zfs-scrub@${poolname}.service, which is not +schedule-specific. + +Signed-off-by: Georgy Yakovlev +--- + etc/systemd/system/.gitignore | 1 + + etc/systemd/system/Makefile.am | 5 ++++- + etc/systemd/system/zfs-scrub-monthly@.timer.in | 12 ++++++++++++ + etc/systemd/system/zfs-scrub-weekly@.timer.in | 12 ++++++++++++ + etc/systemd/system/zfs-scrub@.service.in | 14 ++++++++++++++ + 5 files changed, 43 insertions(+), 1 deletion(-) + create mode 100644 etc/systemd/system/zfs-scrub-monthly@.timer.in + create mode 100644 etc/systemd/system/zfs-scrub-weekly@.timer.in + create mode 100644 etc/systemd/system/zfs-scrub@.service.in + +diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am +index c374a52ac..5e65e1db4 100644 +--- a/etc/systemd/system/Makefile.am ++++ b/etc/systemd/system/Makefile.am +@@ -12,7 +12,10 @@ systemdunit_DATA = \ + zfs-volume-wait.service \ + zfs-import.target \ + zfs-volumes.target \ +- zfs.target ++ zfs.target \ ++ zfs-scrub-monthly@.timer \ ++ zfs-scrub-weekly@.timer \ ++ zfs-scrub@.service + + SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA) + +diff --git a/etc/systemd/system/zfs-scrub-monthly@.timer.in b/etc/systemd/system/zfs-scrub-monthly@.timer.in +new file mode 100644 +index 000000000..903068468 +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub-monthly@.timer.in +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Monthly zpool scrub timer for %i ++Documentation=man:zpool-scrub(8) ++ ++[Timer] ++OnCalendar=monthly ++Persistent=true ++RandomizedDelaySec=1h ++Unit=zfs-scrub@%i.service ++ ++[Install] ++WantedBy=timers.target +diff --git a/etc/systemd/system/zfs-scrub-weekly@.timer.in b/etc/systemd/system/zfs-scrub-weekly@.timer.in +new file mode 100644 +index 000000000..ede699500 +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub-weekly@.timer.in +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Weekly zpool scrub timer for %i ++Documentation=man:zpool-scrub(8) ++ ++[Timer] ++OnCalendar=weekly ++Persistent=true ++RandomizedDelaySec=1h ++Unit=zfs-scrub@%i.service ++ ++[Install] ++WantedBy=timers.target +diff --git a/etc/systemd/system/zfs-scrub@.service.in b/etc/systemd/system/zfs-scrub@.service.in +new file mode 100644 +index 000000000..c04ac292a +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub@.service.in +@@ -0,0 +1,14 @@ ++[Unit] ++Description=zpool scrub on %i ++Documentation=man:zpool-scrub(8) ++Requires=zfs.target ++After=zfs.target ++ConditionACPower=true ++ConditionPathIsDirectory=/sys/module/zfs ++ ++[Service] ++ExecStart=/bin/sh -c '\ ++if @sbindir@/zpool status %i | grep "scrub in progress"; then\ ++exec @sbindir@/zpool wait -t scrub %i;\ ++else exec @sbindir@/zpool scrub -w %i; fi' ++ExecStop=-/bin/sh -c '@sbindir@/zpool scrub -p %i 2>/dev/null || true' +-- +2.34.1 + +From 4bac4eae0345fb322337b66a9b4923e9f3f52b0f Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 29 Oct 2021 21:40:50 -0700 +Subject: [PATCH 2/2] zpool-scrub.8: add PERIODIC SCRUB section + +Signed-off-by: Georgy Yakovlev +--- + man/man8/zpool-scrub.8 | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/man/man8/zpool-scrub.8 b/man/man8/zpool-scrub.8 +index 768f71539..69ae825b6 100644 +--- a/man/man8/zpool-scrub.8 ++++ b/man/man8/zpool-scrub.8 +@@ -116,8 +116,29 @@ scanned at 100M/s, and 68.4M of that file data has been + scrubbed sequentially at 10.0M/s. + .El + .El ++.Sh PERIODIC SCRUB ++On machines using systemd, scrub timers can be enabled on per-pool basis. ++.Nm weekly ++and ++.Nm monthly ++timer units are provided. ++.Bl -tag -width Ds ++.It Xo ++.Xc ++.Nm systemctl ++.Cm enable ++.Cm zfs-scrub-\fIweekly\fB@\fIrpool\fB.timer ++.Cm --now ++.It Xo ++.Xc ++.Nm systemctl ++.Cm enable ++.Cm zfs-scrub-\fImonthly\fB@\fIotherpool\fB.timer ++.Cm --now ++.El + . + .Sh SEE ALSO ++.Xr systemd.timer 5 , + .Xr zpool-iostat 8 , + .Xr zpool-resilver 8 , + .Xr zpool-status 8 +-- +2.34.1 + diff --git a/sys-fs/zfs/zfs-0.8.6-r1.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild deleted file mode 100644 index b21a59267cb9..000000000000 --- a/sys-fs/zfs/zfs-0.8.6-r1.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# 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 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 - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" -fi - -LICENSE="BSD-2 CDDL MIT" -SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -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/awk - virtual/libudev:= - dev-libs/openssl:0= - !minimal? ( ${PYTHON_DEPS} ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - virtual/awk - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # 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-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(use_enable debug) - $(use_enable nls) - $(use_enable python pyzfs) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - CONFIG_SHELL="${EPREFIX}/bin/bash" 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 uutil nvpair zpool zfs zfs_core - - use test-suite || rm -rf "${ED}/usr/share/zfs" - - 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 initramfs to boot" - elog "the following packages known to provide one and tested on 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-0.8.6-r2.ebuild b/sys-fs/zfs/zfs-0.8.6-r2.ebuild new file mode 100644 index 000000000000..df9295794bab --- /dev/null +++ b/sys-fs/zfs/zfs-0.8.6-r2.ebuild @@ -0,0 +1,246 @@ +# 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 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 + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" + KEYWORDS="amd64 arm64 ppc64" +fi + +LICENSE="BSD-2 CDDL MIT" +SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair +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/awk + virtual/libudev:= + dev-libs/openssl:0= + !minimal? ( ${PYTHON_DEPS} ) + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +BDEPEND="virtual/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +RDEPEND="${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +src_prepare() { + default + + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # 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-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" + $(use_enable debug) + $(use_enable nls) + $(use_enable python pyzfs) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + CONFIG_SHELL="${EPREFIX}/bin/bash" 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 uutil nvpair zpool zfs zfs_core + + use test-suite || rm -rf "${ED}/usr/share/zfs" + + 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 initramfs to boot" + elog "the following packages known to provide one and tested on 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}/$(systemd_get_systempresetdir)/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.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild index c955a9a96516..b90eb7e6aea6 100644 --- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild +++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild @@ -37,7 +37,7 @@ SLOT="0/4" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc + net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= @@ -58,7 +58,7 @@ BDEPEND="virtual/awk " if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" fi # awk is used for some scripts, completions, and the Dracut module @@ -206,7 +206,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo $(use_enable debug) $(use_enable nls) @@ -281,7 +281,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ diff --git a/sys-fs/zfs/zfs-2.1.1-r5.ebuild b/sys-fs/zfs/zfs-2.1.1-r5.ebuild deleted file mode 100644 index 2f2920a75e08..000000000000 --- a/sys-fs/zfs/zfs-2.1.1-r5.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# 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}:= ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - virtual/awk - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - 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-2.1.2-r1.ebuild b/sys-fs/zfs/zfs-2.1.2-r1.ebuild new file mode 100644 index 000000000000..a5b0419a7ed8 --- /dev/null +++ b/sys-fs/zfs/zfs-2.1.2-r1.ebuild @@ -0,0 +1,304 @@ +# 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}] + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${PYTHON_USEDEP}] + ) + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND="${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !" + 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="$(systemd_get_systempresetdir)" + --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}/$(systemd_get_systempresetdir)/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 2349a5a20d00..9a69934d3bb9 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -37,7 +37,7 @@ SLOT="0/5" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc + net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= @@ -62,7 +62,7 @@ BDEPEND="virtual/awk " if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" fi # awk is used for some scripts, completions, and the Dracut module @@ -78,6 +78,7 @@ RDEPEND="${DEPEND} !