From df6e83f7493b52ddfad1ce034dcbd38b89b4faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Thu, 3 Sep 2020 17:14:43 +0200 Subject: [PATCH] [sys-auth/sssd] last changes for tree - dep on newest stable autoconf for runstatedir support; fixes systemd units - change manpages use to man; more common - pac is back, multilib dep on samba is gone see below - pass with-sam-idmap-interface-version=6 to configure to work around broken check, has been that since samba 4.7 --- sys-auth/sssd/metadata.xml | 6 ++++-- sys-auth/sssd/sssd-2.3.1.ebuild | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml index 4c905c1..5b808c1 100644 --- a/sys-auth/sssd/metadata.xml +++ b/sys-auth/sssd/metadata.xml @@ -11,11 +11,13 @@ Build and use the cifsidmap plugin + Build helper to let net-fs/autofs use sssd provided information Install sssd's Kerberos plugin + Build man pages with dev-libs/libxslt + Build man pages with dev-libs/libxslt Add support for netlink protocol via dev-libs/libnl Add support for the nfsv4 idmapd plugin provided by net-libs/libnfsidmap - Build man pages with dev-libs/libxslt - Build helper to let net-fs/autofs use sssd provided information + Add Privileged Attribute Certificate Support for Kerberos Build helper to let net-misc/openssh use sssd provided information Build helper to let app-admin/sudo use sssd provided information Depend on dev-util/valgrind for test suite diff --git a/sys-auth/sssd/sssd-2.3.1.ebuild b/sys-auth/sssd/sssd-2.3.1.ebuild index b4b65b2..72dab04 100644 --- a/sys-auth/sssd/sssd-2.3.1.ebuild +++ b/sys-auth/sssd/sssd-2.3.1.ebuild @@ -14,10 +14,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x LICENSE="GPL-3" SLOT="0" -IUSE="acl doc +locator +netlink nfsv4 nls +manpages python samba selinux sudo systemd test valgrind" +IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind" RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="pac? ( samba ) + python? ( ${PYTHON_REQUIRED_USE} )" DEPEND=" >=app-crypt/mit-krb5-1.10.3 @@ -47,11 +48,12 @@ DEPEND=" netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) - python? ( ${PYTHON_DEPS} ) - samba? ( + pac? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] - >=net-fs/samba-4.10.2[winbind,${MULTILIB_USEDEP}] + net-fs/samba ) + python? ( ${PYTHON_DEPS} ) + samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 @@ -68,6 +70,7 @@ RDEPEND="${DEPEND} selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 ) " BDEPEND="${DEPEND} + >=sys-devel/autoconf-2.69-r5 doc? ( app-doc/doxygen ) test? ( dev-libs/check @@ -80,7 +83,7 @@ BDEPEND="${DEPEND} sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) - manpages? ( + man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) @@ -130,6 +133,7 @@ multilib_src_configure() { myconf+=( --localstatedir="${EPREFIX}"/var + --runstatedir="${EPREFIX}"/run --with-pid-path="${EPREFIX}"/run --with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd --enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir) @@ -150,15 +154,16 @@ multilib_src_configure() { $(multilib_native_use_with systemd kcm) $(multilib_native_use_with systemd secrets) $(use_with samba) + --with-smb-idmap-interface-version=6 $(multilib_native_use_enable acl cifs-idmap-plugin) $(multilib_native_use_with selinux) $(multilib_native_use_with selinux semanage) $(use_enable locator krb5-locator-plugin) - $(use_enable samba pac-responder) + $(use_enable pac pac-responder) $(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin) $(use_enable nls) $(multilib_native_use_with netlink libnl) - $(multilib_native_use_with manpages) + $(multilib_native_use_with man manpages) $(multilib_native_use_with sudo) $(multilib_native_with autofs) $(multilib_native_with ssh) @@ -186,6 +191,7 @@ multilib_src_configure() { # ldb lib fails... but it does not seem to bother {DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' ' {PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' ' + {NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' ' # use native include path for dbus (needed for build) DBUS_CFLAGS="${native_dbus_cflags}" @@ -204,13 +210,13 @@ multilib_src_compile() { if multilib_is_native_abi; then default use doc && emake docs - if use manpages || use nls; then + if use man || use nls; then emake update-po fi else emake libnss_sss.la pam_sss.la use locator && emake sssd_krb5_locator_plugin.la - use samba && emake sssd_pac_plugin.la + use pac && emake sssd_pac_plugin.la fi } @@ -234,7 +240,7 @@ multilib_src_install() { doexe .libs/sssd_krb5_locator_plugin.so fi - if use samba; then + if use pac; then exeinto /usr/$(get_libdir)/krb5/plugins/authdata doexe .libs/sssd_pac_plugin.so fi