Version bump

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

6 files changed, 141 insertions, 21 deletions

diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 1196e6a211ff..b085e0653fa8 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -11,16 +11,16 @@ DIST pam_mount-2.6.tar.xz 284984 RMD160 b3ffab9a05c8463d3ac694dbdfbe30380abfa5cc
 DIST pam_mount-2.8.tar.xz 283280 RMD160 258f96a0f1ac569777d921923d41cbf90cd93d5d SHA1 2b2c60553601c390abe98162213ed8a5bdbf5cce SHA256 720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b
 EBUILD pam_mount-2.1.ebuild 964 RMD160 103c403046d0a9d95c86bbf8f263305cbaf9dff5 SHA1 0636a48f120779f6ca4c1848d56764b821a9945e SHA256 e92b235a5cb6031e708a4ba47bf4cbf88392c50d93f186c53eac0f336008eb27
 EBUILD pam_mount-2.10.ebuild 992 RMD160 b6eabb73374c5f6cf39915c153f5eabfdc73bea6 SHA1 503ad08e55e85e271a5fe75ff46258f4e1c000b9 SHA256 1397983e01102bedef4b2f367871a67e5ce1c0d22dccc7b78dc96f2209b446e7
-EBUILD pam_mount-2.11.ebuild 1125 RMD160 1b88fbf4cfb3b57aac30a6c0718aac0de87dde81 SHA1 d10072c378dcfc67565bd3bf01edf3fb68f23cb4 SHA256 69664251f05b38d5546ba098928a61366578fd1ba1d4677c6fe8186a427be3ba
+EBUILD pam_mount-2.11.ebuild 1124 RMD160 b9f1f1793d199b4621851b48a63e00643b807d2e SHA1 c5b4bc18a081bed1be546102c6f04979a40de261 SHA256 b03381adedb6ab5801d55b62de2b800fb6dccc9acf65bf8fdf3a41ef056e423d
 EBUILD pam_mount-2.5.ebuild 966 RMD160 6f6b95f7b5e886ccc49d19f7e06503247093ea95 SHA1 4eed36ddfed4264332e9e90c3e7526a62187ff4e SHA256 db679341f91f0f2e71ea6efb06b3ac2c5a82474d991a65d15b7aa066569fa4d7
 EBUILD pam_mount-2.6.ebuild 1065 RMD160 19419327806e2b254211a892f22107c2c7859022 SHA1 c6b6058d622eaf7724898ddf5e6f21186465649b SHA256 22e2e93eb53ba79af43cd118c4dbbabc7c275ca84fe6ebb75131cc0bdf84dad0
 EBUILD pam_mount-2.8.ebuild 969 RMD160 9f6df469045df37f533fc38e98fe8be9e461bd2d SHA1 858d7a4ec2b23a005f3866fd7e5ed63e40e56c3c SHA256 014e04ba87bd9a1d6e835578443b233cef3489cb86caf0a9e6930efc33cabcc6
-MISC ChangeLog 7785 RMD160 380559a1907157f8065f3ce07f4c10a3036b7d35 SHA1 b302a76231c2bbedead34f9ddf7e45e46532e507 SHA256 655e1b1498e60824fac206d3600bca6e81037d4881d23e80f408ef3eb6954635
+MISC ChangeLog 8005 RMD160 d704fae6c6452eee6e4b7ce7f81d09a5eba33d24 SHA1 28d901532b77822aa8c35a600a877ef7527e8642 SHA256 a890ec597bca13253d752f65ed2f8c487c4f6ed9fba42cd6d538410405412837
 MISC metadata.xml 306 RMD160 e978846bab8b82090c98ed93f27dfb9292758796 SHA1 fea16e4b6ba9fa1db3c0202c0f2437014df28625 SHA256 4b4755f4eba84d790ef46a20909202805f891a00c2d0362b5a8bd172bbc5c82f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5dSe4ACgkQTVUdg23rv522GACePd3f+MkLsotZwATqKep47V7L
-jQEAn1o28tFfX4MFpJwPnyC221n7pj0g
-=+XiF
+iEYEARECAAYFAk5d794ACgkQp5vW4rUFj5pf7ACeIhmxBpwhCl1vPlE97MgGYs8D
+4ncAnij2YjWA31uBeHXV65hgV4Bq6OIy
+=rPq3
 -----END PGP SIGNATURE-----
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/Manifest b/sys-auth/sssd/Manifest
index 9e388c65b809..1b6dfd57eeb5 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,4 +1,6 @@
-DIST sssd-1.5.12.tar.gz 2835872 RMD160 d675486ad6deab56d903b2ae809b057ba7fb9da8 SHA1 ddfe31e11dbce931e7b8e58c4119780ea227169b SHA256 703b59f1ec575c322457bcad6c1579f34aedc6ea2e29e508739405b26034d3ca
-EBUILD sssd-1.5.12-r1.ebuild 2913 RMD160 a3af951af94d9931b5c65f2d3f5dd3983caef43a SHA1 45d0932e14568b26d284746b342aefa593ca6718 SHA256 0670674ef7ba35450196772690ee02d3f0512936a64c4a5fade593de2524ba24
-MISC ChangeLog 783 RMD160 e94a32401e2d683bf9e252fc1039f9e535083201 SHA1 d0067bde52ed0ceeb4ae830321c12c941ce59377 SHA256 aa3cc438d2ef30dba70955abdd4f2c155f3124db577fa70e1d2d6965a24bf713
-MISC metadata.xml 525 RMD160 adfa1acd8ee0124b53554e5389fbf8f5d2c7fd82 SHA1 fefd5ef93f7712df22aa7ea218e11edf88482714 SHA256 998718cda36ef8f9df921ce8dae7c79275b86461968dccf666f715da1d34ce64
+DIST sssd-1.5.13.tar.gz 2843196 RMD160 ae34d5416a46958bf7b8e7f09678d2c9f152d8bd SHA1 ff9d1da5f475d2d8735241d8904318360258a10c SHA256 9a830eba8255634e20be248ac1826fc77b9c558b98854e60d7c7aee59f845dd6
+DIST sssd-1.6.1.tar.gz 1406047 RMD160 7ff170c6914840dfd33abcea41f5164a9023c288 SHA1 86924e20d6e8c6c9070258469afe1acf81ab13ae SHA256 ba30d8cf7eae1fd66053b4f11e8e5b98bc6db113cf6d2f33e429f2e21d90ade9
+EBUILD sssd-1.5.13.ebuild 2902 RMD160 3d27f65310cd6dba4caeb8c990bf67bbd3b5cd21 SHA1 d4b066b31be7ef077e38a8486d341bede25b7724 SHA256 2d525279f90b8f813785d8c656c11dc30bc7fad49408d9ce681e103e5c446dd5
+EBUILD sssd-1.6.1.ebuild 2901 RMD160 5b620f910ab12ed246da4d7589232c2a6c1f2ec2 SHA1 05e445a4c39dd02b4634a4b53b49178af27637a4 SHA256 13f5f656ec0545055707e325953fa42ffb155c01142c54454f0e581b4e835c9b
+MISC ChangeLog 1009 RMD160 44c76f2b1644ce91c11757bc079b6f2d73871c73 SHA1 c136b9a96fa3c5843630a91d7a90d0668c40dc52 SHA256 75e0aea6240957af37f2c60b7dfe4f255b0a1f705a8d85101ea6f8299da13a3a
+MISC metadata.xml 418 RMD160 78bbdd3af92cc2599dba5222edc1a1ced20771f6 SHA1 796ccd25dcd7555619097b89b4359147d52cc776 SHA256 f2f8d8ffb4b0f0da3c040d5d048d4c4e492d784b2e3dd0ac76442857e0f62667
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
+}