Version bump

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 129 insertions, 11 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index 7d3b885df9aa..1e30f9714370 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.4 2011/08/20 19:06:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.5 2011/08/31 08:22:25 maksbotan Exp $
+
+*sssd-1.6.1 (31 Aug 2011)
+*sssd-1.5.13 (31 Aug 2011)
+
+  31 Aug 2011; Maxim Koltsov <maksbotan@gentoo.org> -sssd-1.5.12-r1.ebuild,
+  +sssd-1.5.13.ebuild, +sssd-1.6.1.ebuild:
+  Bumped to 1.5.13 and 1.6.1, removed old 1.5.12-r1
 
   20 Aug 2011; Maxim Koltsov <maksbotan@gentoo.org> sssd-1.5.12-r1.ebuild:
   Fix LDB path again
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index 17e83ae6c0e9..71227d618822 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -11,6 +11,5 @@
 <use>
 	<flag name="locator">Install sssd's Kerberos plugin</flag>
 	<flag name="logrotate">Install logrotate.d file</flag>
-	<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support instead of <pkg>dev-libs/nss</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/sys-auth/sssd/sssd-1.5.12-r1.ebuild b/sys-auth/sssd/sssd-1.5.13.ebuild
index 51ba90dd5f38..413eb3e3e004 100644
--- a/sys-auth/sssd/sssd-1.5.12-r1.ebuild
+++ b/sys-auth/sssd/sssd-1.5.13.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.5.12-r1.ebuild,v 1.2 2011/08/20 19:06:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.5.13.ebuild,v 1.1 2011/08/31 08:22:24 maksbotan Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
-#RESTRICT="userpriv"
 
 inherit python multilib pam linux-info autotools-utils
 
@@ -16,7 +15,7 @@ SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +locator logrotate nls openssl python selinux static-libs test"
+IUSE="doc +locator logrotate nls python selinux static-libs test"
 
 COMMON_DEP="virtual/pam
 	dev-libs/popt
@@ -30,8 +29,7 @@ COMMON_DEP="virtual/pam
 	dev-libs/libpcre
 	>=app-crypt/mit-krb5-1.9.1
 	>=net-dns/c-ares-1.7.4
-	openssl? ( dev-libs/openssl )
-	!openssl? ( >=dev-libs/nss-3.12.9 )
+	>=dev-libs/nss-3.12.9
 	selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 )
 	net-dns/bind-tools
 	dev-libs/cyrus-sasl
@@ -49,6 +47,7 @@ DEPEND="${COMMON_DEP}
 
 CONFIG_CHECK="~KEYS"
 AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=("${FILESDIR}"/allow_xdm.patch)
 
 pkg_setup(){
 	python_set_active_version 2
@@ -60,15 +59,15 @@ 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)/ldb/modules/ldb
+		--with-libnl
+		--without-nscd
 		$(use_with selinux)
 		$(use_with selinux semanage)
-		--with-libnl
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules/ldb
 		$(use_with python python-bindings)
-		--without-nscd
 		$(use_enable locator krb5-locator-plugin)
-		$(use_enable openssl crypto)
 		$(use_enable nls ) )
 
 	autotools-utils_src_configure
diff --git a/sys-auth/sssd/sssd-1.6.1.ebuild b/sys-auth/sssd/sssd-1.6.1.ebuild
new file mode 100644
index 000000000000..76729f8a8987
--- /dev/null
+++ b/sys-auth/sssd/sssd-1.6.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.6.1.ebuild,v 1.1 2011/08/31 08:22:25 maksbotan Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+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="doc +locator logrotate nls python selinux static-libs test"
+
+COMMON_DEP="virtual/pam
+	dev-libs/popt
+	>=dev-libs/libunistring-0.9.3
+	>=dev-libs/ding-libs-0.1.2
+	>=sys-libs/talloc-2.0
+	sys-libs/tdb
+	sys-libs/tevent
+	sys-libs/ldb
+	>=net-nds/openldap-2.4.19
+	dev-libs/libpcre
+	>=app-crypt/mit-krb5-1.9.1
+	>=net-dns/c-ares-1.7.4
+	>=dev-libs/nss-3.12.9
+	selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 )
+	net-dns/bind-tools
+	dev-libs/cyrus-sasl
+	sys-apps/dbus
+	>=sys-devel/gettext-0.17
+	virtual/libintl
+	dev-libs/libnl"
+
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	test? ( dev-libs/check )
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.4
+	doc? ( app-doc/doxygen )"
+
+CONFIG_CHECK="~KEYS"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=("${FILESDIR}"/allow_xdm.patch)
+
+pkg_setup(){
+	python_set_active_version 2
+	python_need_rebuild
+	linux-info_pkg_setup
+}
+
+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)/ldb/modules/ldb
+		--with-libnl
+		--without-nscd
+		$(use_with selinux)
+		$(use_with selinux semanage)
+		$(use_with python python-bindings)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable nls ) )
+
+	autotools-utils_src_configure
+}
+
+src_install(){
+	autotools-utils_src_install
+
+	rm "${ED}/$(get_libdir)/"libnss_sss.la || die
+	rm "${ED}/usr/$(get_libdir)/"ldb/modules/ldb/*.la || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd.conf
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		insopts -m644
+		newins "${S}"/src/examples/logrotate sssd
+	fi
+
+	if use python; then
+		python_clean_installation_image
+		python_convert_shebangs 2 "${ED}$(python_get_sitedir)/"*.py
+	fi
+}
+
+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_need_rebuild
+	use python && python_mod_optimize SSSDConfig.py ipachangeconf.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup SSSDConfig.py ipachangeconf.py
+}