From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96B10138359 for ; Sat, 4 Jul 2020 23:14:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA06CE0788; Sat, 4 Jul 2020 23:14:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BDB6E0788 for ; Sat, 4 Jul 2020 23:14:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4E4234F1EF for ; Sat, 4 Jul 2020 23:14:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95F882C8 for ; Sat, 4 Jul 2020 23:14:17 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1593904315.5b075422250d1ced0c6d4346ffe32412b5f4ed05.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/metadata.xml sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5b075422250d1ced0c6d4346ffe32412b5f4ed05 X-VCS-Branch: master Date: Sat, 4 Jul 2020 23:14:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b9faf0e-6dc9-4070-bc0e-8dc76d4b7c8d X-Archives-Hash: 40bfbabdef4d65c825f3b59c53291058 commit: 5b075422250d1ced0c6d4346ffe32412b5f4ed05 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jul 4 22:14:27 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jul 4 23:11:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b075422 sys-fs/zfs: update live ebuild, add pam useflag for controlling installation of pam_zfs_key module requires manual configuration, pam files are not provided this time Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/metadata.xml | 1 + sys-fs/zfs/zfs-9999.ebuild | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 0b1da3a015b..85d50d081af 100644 --- a/sys-fs/zfs/metadata.xml +++ b/sys-fs/zfs/metadata.xml @@ -11,6 +11,7 @@ Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree + Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets Enable dependencies required for booting off a pool containing a rootfs Install regression test suite diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index c7cc180b9ea..b388cd53e3a 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{6,7} ) -inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript +inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://github.com/openzfs/zfs" @@ -21,7 +21,7 @@ fi LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs" +IUSE="custom-cflags debug kernel-builtin libressl pam python +rootfs test-suite static-libs" DEPEND=" ${PYTHON_DEPS} @@ -32,6 +32,7 @@ DEPEND=" virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) + pam? ( sys-libs/pam[static-libs?] ) python? ( virtual/python-cffi[${PYTHON_USEDEP}] ) @@ -129,10 +130,13 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir=/dev/null # debian configs + --with-pammoduledir="$(getpam_mod_dir)" --with-python="${EPYTHON}" --with-systemdunitdir="$(systemd_get_systemunitdir)" --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) + $(use_enable pam) $(use_enable python pyzfs) $(use_enable static-libs static) )