commit: abbe427ac62df0fa9ae86d86aa859c50152f72c8 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Feb 23 17:25:20 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Feb 23 17:25:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbe427a
sys-apps/systemd: add pkcs11 and pwquality USE flags Closes: https://bugs.gentoo.org/709378 Package-Manager: Portage-2.3.89_p9, Repoman-2.3.20_p79 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/metadata.xml | 2 ++ ...ystemd-245_rc1-r1.ebuild => systemd-245_rc1-r2.ebuild} | 15 ++++++++++++--- sys-apps/systemd/systemd-9999.ebuild | 6 +++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index d62c5159c4b..fdbbc809fd1 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -23,6 +23,8 @@ <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> <flag name="lz4">Enable lz4 compression for the journal</flag> <flag name="nat">Enable support for network address translation in networkd</flag> + <flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag> + <flag name="pwquality">Enable password quality checking in homed</flag> <flag name="qrcode">Enable qrcode output support in journal</flag> <flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag> <flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag> diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r2.ebuild similarity index 96% rename from sys-apps/systemd/systemd-245_rc1-r1.ebuild rename to sys-apps/systemd/systemd-245_rc1-r2.ebuild index a49e87494d0..4d06a4bcf3d 100644 --- a/sys-apps/systemd/systemd-245_rc1-r1.ebuild +++ b/sys-apps/systemd/systemd-245_rc1-r2.ebuild @@ -7,10 +7,15 @@ 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=${PN}-${MY_PV} + MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"; + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi @@ -23,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"; LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -54,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) @@ -271,8 +278,10 @@ multilib_src_configure() { -Dxz=$(meson_use lzma) -Dlibiptc=$(meson_multilib_native_use nat) -Dpam=$(meson_use pam) + -Dp11kit=$(meson_multilib_native_use pkcs11) -Dpcre2=$(meson_multilib_native_use pcre) -Dpolkit=$(meson_multilib_native_use policykit) + -Dpwquality=$(meson_multilib_native_use pwquality) -Dqrencode=$(meson_multilib_native_use qrcode) -Dseccomp=$(meson_multilib_native_use seccomp) -Dselinux=$(meson_multilib_native_use selinux) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 37223a9ddbb..586a16d1212 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"; LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -59,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) @@ -274,8 +276,10 @@ multilib_src_configure() { -Dxz=$(meson_use lzma) -Dlibiptc=$(meson_multilib_native_use nat) -Dpam=$(meson_use pam) + -Dp11kit=$(meson_multilib_native_use pkcs11) -Dpcre2=$(meson_multilib_native_use pcre) -Dpolkit=$(meson_multilib_native_use policykit) + -Dpwquality=$(meson_multilib_native_use pwquality) -Dqrencode=$(meson_multilib_native_use qrcode) -Dseccomp=$(meson_multilib_native_use seccomp) -Dselinux=$(meson_multilib_native_use selinux)
