[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

["Sam James" <sam@gentoo.org>]

commit:     27deb10d15cda7124f51e257352774d0f1e3ab84
Author:     Luke Schwager <luke <AT> blucobalt <DOT> dev>
AuthorDate: Wed Sep  4 22:56:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 13:00:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27deb10d

sys-fs/zfs: add 2.2.6

Signed-off-by: Luke Schwager <luke <AT> blucobalt.dev>
Closes: https://github.com/gentoo/gentoo/pull/38442
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs/Manifest         |   2 +
 sys-fs/zfs/zfs-2.2.6.ebuild | 308 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 310 insertions(+)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 99794d263e7a..6a58959b8242 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e16575003470
 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
 DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
 DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4

diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
new file mode 100644
index 000000000000..87689751ff17
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+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
+        EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+        VERIFY_SIG_OPENPGP_KEY_PATH=/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}/${MY_P}"
+
+        if [[ ${PV} != *_rc* ]]; then
+                KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+        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 selinux test-suite"
+
+DEPEND="
+        dev-libs/openssl:=
+        net-libs/libtirpc:=
+        sys-apps/util-linux
+        sys-libs/zlib
+        virtual/libudev:=
+        !minimal? ( ${PYTHON_DEPS} )
+        pam? ( sys-libs/pam )
+        python? (
+                $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+        )
+"
+
+BDEPEND="
+        app-alternatives/awk
+        virtual/pkgconfig
+        nls? ( sys-devel/gettext )
+        python? (
+                ${DISTUTILS_DEPS}
+                || (
+                        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 )
+        app-alternatives/awk
+        sys-fs/udev-init-scripts
+        dist-kernel? ( virtual/dist-kernel:= )
+        rootfs? (
+                app-alternatives/cpio
+                app-misc/pax-utils
+        )
+        selinux? ( sec-policy/selinux-zfs )
+        test-suite? (
+                app-shells/ksh
+                sys-apps/kmod[tools]
+                sys-apps/util-linux
+                app-alternatives/bc
+                sys-block/parted
+                sys-fs/lsscsi
+                sys-fs/mdadm
+                sys-process/procps
+        )
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+        !minimal? ( ${PYTHON_REQUIRED_USE} )
+        python? ( !minimal )
+        test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+        "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+        "${FILESDIR}"/2.2.2-no-USER_NS.patch
+        "${FILESDIR}"/2.2.3-musl.patch
+)
+
+pkg_pretend() {
+        use rootfs || return 0
+
+        if has_version virtual/dist-kernel && ! use dist-kernel; then
+                ewarn "You have virtual/dist-kernel installed, but"
+                ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+                ewarn "It's recommended to globally enable dist-kernel USE flag"
+                ewarn "to auto-trigger initrd rebuilds with kernel updates"
+        fi
+}
+
+pkg_setup() {
+        if use kernel_linux; then
+                linux-info_pkg_setup
+
+                if ! linux_config_exists; then
+                        ewarn "Cannot check the linux kernel configuration."
+                else
+                        if use test-suite; then
+                                if linux_chkconfig_present BLK_DEV_LOOP; then
+                                        eerror "The ZFS test suite requires loop device support enabled."
+                                        eerror "Please enable it:"
+                                        eerror "    CONFIG_BLK_DEV_LOOP=y"
+                                        eerror "in /usr/src/linux/.config or"
+                                        eerror "    Device Drivers --->"
+                                        eerror "        Block devices --->"
+                                        eerror "            [X] Loopback device support"
+                                fi
+                        fi
+                fi
+        fi
+}
+
+libsoversion_check() {
+        local bugurl libzfs_sover
+        bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+        libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+                | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+        libzfs_sover="${libzfs_sover%%:*}"
+
+        if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+                echo
+                eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+                eerror "ebuild subslot does not match libzfs soversion!"
+                eerror "libzfs soversion: ${libzfs_sover}"
+                eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+                eerror "This is a bug in the ebuild, please use the following URL to report it"
+                eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+                echo
+                # we want to abort for releases, but just print a warning for live ebuild
+                # to keep package installable
+                [[  ${PV} == "9999" ]] || die
+        fi
+}
+
+src_prepare() {
+        default
+        libsoversion_check
+
+        # Run unconditionally (bug #792627)
+        eautoreconf
+
+        if [[ ${PV} != "9999" ]]; then
+                # Set revision number
+                sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+        fi
+
+        if use python; then
+                pushd contrib/pyzfs >/dev/null || die
+                distutils-r1_src_prepare
+                popd >/dev/null || die
+        fi
+
+        # Tries to use /etc/conf.d which we reserve for OpenRC
+        sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
+
+        # 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.
+                # UPDATE: it has been fixed since,
+                # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
+                # but we still leave it as this for now.
+                $(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() {
+        udev_reload
+
+        # 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 ( preferred, module maintained by zfs developers )"
+                        elog "  sys-kernel/genkernel"
+                fi
+        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-load-key" ]] || \
+                        einfo "You should add zfs-load-key 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() {
+        udev_reload
+}