Version bump. Remove nscd dependency from the init script. Bug #491608

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 177 insertions, 1 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index ec2e33515b4d..aca9b7c2aed6 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.45 2013/10/27 11:58:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.46 2013/12/01 17:10:54 hwoarang Exp $
+
+*sssd-1.9.6 (01 Dec 2013)
+
+  01 Dec 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/sssd-1.9.6-fix-init.patch, +sssd-1.9.6.ebuild:
+  Version bump. Remove nscd dependency from the init script. Bug #491608
 
   27 Oct 2013; Michał Górny <mgorny@gentoo.org> sssd-1.8.6-r1.ebuild,
   sssd-1.8.6.ebuild, sssd-1.9.4-r3.ebuild, sssd-1.9.5-r1.ebuild:
diff --git a/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch b/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
new file mode 100644
index 000000000000..252473bcede2
--- /dev/null
+++ b/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
@@ -0,0 +1,28 @@
+A couple of changes are necessary to make sssd work better on Gentoo Linux
+systems.
+
+- login manager can use sssd for login. Therefore it's necessary to adjust
+the dependencies of the script to use 'xdm' if it is available.
+- We need to send the debug output to files instead of stderr.
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+Index: sssd-1.9.6/src/sysv/gentoo/sssd
+===================================================================
+--- sssd-1.9.6.orig/src/sysv/gentoo/sssd
++++ sssd-1.9.6/src/sysv/gentoo/sssd
+@@ -2,12 +2,12 @@
+ 
+ depend(){
+     need localmount netmount clock
+-    use syslog
++    use syslog xdm
+ }
+ 
+ start(){
+     ebegin "Starting sssd"
+-    start-stop-daemon --start --exec ${exec_prefix}/sbin/sssd -- -D
++    start-stop-daemon --start --exec ${exec_prefix}/sbin/sssd -- -Df
+     eend ${?}
+ }
+ 
diff --git a/sys-auth/sssd/sssd-1.9.6.ebuild b/sys-auth/sssd/sssd-1.9.6.ebuild
new file mode 100644
index 000000000000..d42a7814803e
--- /dev/null
+++ b/sys-auth/sssd/sssd-1.9.6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.6.ebuild,v 1.1 2013/12/01 17:10:54 hwoarang Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+inherit python multilib pam linux-info autotools-utils
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="http://fedorahosted.org/sssd/"
+SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autofs doc +locator netlink nls +manpages python selinux sudo ssh test"
+
+COMMON_DEP="
+	virtual/pam
+	>=dev-libs/popt-1.16
+	dev-libs/glib:2
+	>=dev-libs/ding-libs-0.2
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.15-r1
+	>=net-nds/openldap-2.4.30
+	>=dev-libs/libpcre-8.30
+	>=app-crypt/mit-krb5-1.10.3
+	>=sys-apps/keyutils-1.5
+	>=net-dns/c-ares-1.7.4
+	>=dev-libs/nss-3.12.9
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+		>=sec-policy/selinux-sssd-2.20120725-r9
+	)
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=sys-apps/dbus-1.6
+	nls? ( >=sys-devel/gettext-0.18 )
+	virtual/libintl
+	netlink? ( dev-libs/libnl:3 )
+	"
+
+RDEPEND="${COMMON_DEP}
+	|| ( <=sys-libs/glibc-2.16.9999 >=sys-libs/glibc-2.17[nscd] )
+	"
+DEPEND="${COMMON_DEP}
+	test? ( dev-libs/check )
+	manpages? (
+		>=dev-libs/libxslt-1.1.26
+		app-text/docbook-xml-dtd:4.4
+		)
+	doc? ( app-doc/doxygen )"
+
+CONFIG_CHECK="~KEYS"
+
+PATCHES=(
+		"${FILESDIR}"/${P}*.patch
+)
+
+pkg_setup(){
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+		python_need_rebuild
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	autotools-utils_src_prepare
+}
+
+src_configure(){
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--without-nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--enable-silent-rules
+		$(use_with selinux)
+		$(use_with selinux semanage)
+		$(use_with python python-bindings)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable nls )
+		$(use_with netlink libnl)
+		$(use_with manpages)
+		$(use_with sudo)
+		$(use_with autofs)
+		$(use_with ssh)
+		--with-crypto="libcrypto"
+		--with-initscript="sysv"
+		)
+
+	autotools-utils_src_configure
+}
+
+src_install(){
+	autotools-utils_src_install
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	use python && python_clean_installation_image
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+}
+
+src_test() {
+	autotools-utils_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	http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2"
+
+	use python && \
+		python_mod_optimize SSSDConfig/{ipachangeconf,sssd_upgrade_config}.py
+}
+
+pkg_postrm() {
+	use python && \
+		python_mod_cleanup SSSDConfig/{ipachangeconf,sssd_upgrade_config}.py
+}