diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index c055f1d..ea76057 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1 +1 @@
-DIST sssd-2.3.0.tar.gz 6797766 BLAKE2B 0d741709ddf31961d7b962ca2630893509a882e718f3b8d2d6c9b075e351d9f1bfa959fd5668e4af5d455a60c18d3b790f8d81d2e2b81a38389038a660df06d1 SHA512 72fc69018c4b8a71198f4a82e89d49d7a5c513e9291deff2f8e0e132cbd67341a8fa89598d28fcc1d785497526c9eeffe9b261c751524ee0e553badf0f748d59
+DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index 5b5f4a6..1a968a0 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -16,6 +16,6 @@
Build helper to let app-admin/sudo use sssd provided information
- cpe:/a:fedorahosted:sssd
+ cpe:/a:fedoraproject:sssd
diff --git a/sys-auth/sssd/sssd-2.3.0.ebuild b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
similarity index 78%
rename from sys-auth/sssd/sssd-2.3.0.ebuild
rename to sys-auth/sssd/sssd-2.3.1-r1.ebuild
index 67c1e9b..de580f5 100644
--- a/sys-auth/sssd/sssd-2.3.0.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
@@ -3,35 +3,37 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
inherit autotools flag-o-matic linux-info multilib-minimal python-r1 pam systemd toolchain-funcs
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/SSSD/sssd"
-SRC_URI="https://github.com/SSSD/sssd/releases/download/${PN}-$(ver_rs 1-2 _)/${P}.tar.gz"
+HOMEPAGE="https://github.com/SSSD/sssd"
+SRC_URI="https://github.com/SSSD/sssd/releases/download/${PN}-${PV//./_}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="GPL-3"
SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs kcm +locator +netlink nfsv4 nls +manpages pac python samba secrets selinux sudo ssh systemd test"
RESTRICT="!test? ( test )"
-COMMON_DEP="
+REQUIRED_USE="pac? ( samba )
+ kcm? ( systemd )
+ secrets? ( systemd )"
+
+DEPEND="
>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
>=dev-libs/popt-1.16
dev-libs/glib:2
>=dev-libs/ding-libs-0.2
+ >=dev-libs/openssl-1.0.2:0=
>=sys-libs/talloc-2.0.7
>=sys-libs/tdb-1.2.9
>=sys-libs/tevent-0.9.16
>=sys-libs/ldb-1.1.17-r1:=
>=net-nds/openldap-2.4.30[sasl]
- net-libs/http-parser
- >=dev-libs/libpcre-8.30
+ >=dev-libs/libpcre-8.30:=
>=app-crypt/mit-krb5-1.10.3
- dev-libs/jansson
- net-misc/curl
locator? (
>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
@@ -48,19 +50,32 @@ COMMON_DEP="
>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
>=sys-apps/dbus-1.6
acl? ( net-fs/cifs-utils[acl] )
+ kcm? (
+ dev-libs/jansson
+ net-misc/curl
+ )
nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
nls? ( >=sys-devel/gettext-0.18 )
virtual/libintl
netlink? ( dev-libs/libnl:3 )
samba? ( >=net-fs/samba-4.10.2[winbind] )
+ secrets? (
+ dev-libs/jansson
+ net-libs/http-parser
+ net-misc/curl
+ )
+ pac? (
+ app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+ net-fs/samba[${MULTILIB_USEDEP}]
+ )
( ${PYTHON_DEPS} )
"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${DEPEND}
>=sys-libs/glibc-2.17[nscd]
selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
"
-DEPEND="${COMMON_DEP}
+BDEPEND="${DEPEND}
test? ( dev-libs/check )
manpages? (
>=dev-libs/libxslt-1.1.26
@@ -73,7 +88,6 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/ipa_hbac.h
/usr/include/sss_idmap.h
/usr/include/sss_nss_idmap.h
- /usr/include/wbclient_sssd.h
# --with-ifp
/usr/include/sss_sifp.h
/usr/include/sss_sifp_dbus.h
@@ -86,9 +100,6 @@ pkg_setup() {
}
src_prepare() {
- sed -i 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
- "${S}"/src/sysv/gentoo/sssd.in || die "sed sssd.in"
-
default
eautoreconf
multilib_copy_sources
@@ -101,11 +112,7 @@ src_configure() {
}
multilib_src_configure() {
- # set initscript to sysv because the systemd option needs systemd to
- # be installed. We provide our own systemd file anyway.
local myconf=()
- #Work around linker dependency problem.
- append-ldflags "-Wl,--allow-shlib-undefined"
local python3_configure=--without-python3-bindings
if use python; then
@@ -117,45 +124,53 @@ multilib_src_configure() {
myconf+=(
--localstatedir="${EPREFIX}"/var
+ --with-pid-path="${EPREFIX}"/run
--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
--with-os=gentoo
- --with-nscd
+ --with-nscd="${EPREFIX}"/usr/sbin/nscd
--with-unicode-lib="glib2"
--disable-rpath
--sbindir=/usr/sbin
- --without-kcm
- $(use_with samba libwbclient)
- --with-secrets
+ $(multilib_native_use_with kcm)
+ $(multilib_native_use_with secrets)
$(multilib_native_use_with samba)
$(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 pac pac-responder)
$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
- $(use_enable nls )
+ $(use_enable nls)
$(multilib_native_use_with netlink libnl)
$(multilib_native_use_with manpages)
$(multilib_native_use_with sudo)
$(multilib_native_use_with autofs)
$(multilib_native_use_with ssh)
--with-crypto="libcrypto"
- --with-initscript="sysv"
--without-python2-bindings
${python3_configure}
-
- KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
)
+ # Annoyingly configure requires that you pick systemd XOR sysv
+ if use systemd; then
+ myconf+=(
+ --with-initscript="systemd"
+ --with-systemdunitdir=$(systemd_get_systemunitdir)
+ )
+ else
+ myconf+=(--with-initscript="sysv")
+ fi
+
if ! multilib_is_native_abi; then
# work-around all the libraries that are used for CLI and server
myconf+=(
{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
# ldb headers are fine since native needs it
# ldb lib fails... but it does not seem to bother
- {DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
- {PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
+ {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}=' '
# use native include path for dbus (needed for build)
DBUS_CFLAGS="${native_dbus_cflags}"
@@ -163,13 +178,7 @@ multilib_src_configure() {
# non-pkgconfig checks
ac_cv_lib_ldap_ldap_search=yes
--without-secrets
- --without-libwbclient
--without-kcm
- --with-crypto=""
- )
-
- use locator || myconf+=(
- KRB5_CONFIG=/bin/true
)
fi
@@ -215,7 +224,6 @@ multilib_src_install_all() {
newins "${S}"/src/examples/logrotate sssd
newconfd "${FILESDIR}"/sssd.conf sssd
- newinitd "${FILESDIR}"/sssd sssd
keepdir /var/lib/sss/db
keepdir /var/lib/sss/deskprofile
@@ -227,8 +235,6 @@ multilib_src_install_all() {
keepdir /var/lib/sss/secrets
keepdir /var/log/sssd
- systemd_dounit "${FILESDIR}/${PN}.service"
-
if use python; then
python_foreach_impl python_optimize
fi
@@ -241,5 +247,5 @@ multilib_src_test() {
pkg_postinst() {
elog "You must set up sssd.conf (default installed into /etc/sssd)"
elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
- elog "features. Please see howto in https://docs.pagure.org/SSSD.sssd/design_pages/smartcard_authentication_require.html"
+ elog "features. Please see howto in https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
}