Fix python support. Bug #554776. Respect SSSD_OPTIONS in init script. Bug #553678

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

4 files changed, 68 insertions, 23 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index b3af91ba9837..c00fdebbafe8 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.72 2015/07/11 21:11:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.73 2015/07/22 20:00:57 hwoarang Exp $
+
+  22 Jul 2015; Markos Chandras <hwoarang@gentoo.org>
+  +files/sssd-1.13.0-fix-init.patch, sssd-1.13.0.ebuild:
+  Fix python support. Bug #554776. Respect SSSD_OPTIONS in init script. Bug
+  #553678
 
 *sssd-1.13.0 (11 Jul 2015)
 
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 99b7f452c6e8..46a7bb71b099 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -6,6 +6,7 @@ AUX 0002_allow_xdm_openrc.patch 472 SHA256 9d0462096d7eb03489dbb4f5920c767828068
 AUX 0003_new_krb5.patch 1702 SHA256 5ad16a7c733824dea87dc0df4ac8b1e9ec3edbd94093856bf379875dbbef4602 SHA512 a55285885d076250890765f25b3c2af5e28649de7efcc275d12ba751784182dccdab76b0f72f5e68863581b588cd4ddd615a218ebdd47be4317983f4c919fc9a WHIRLPOOL 55590c98ef738179e4ec0b4f3791d3fe38c7074173569408f32e102df38e1b86f29b729b85b791fd5661fff69f81c72d86402474eee5669fa079a090311fe47b
 AUX allow_xdm.patch 472 SHA256 9d0462096d7eb03489dbb4f5920c767828068cc87d2e41c75c37631f95850368 SHA512 c728b3619746902584d2f75ef57829a249c964139a24bd012530399ce3fb478fd2236efaa6c5313dd8132ea46ecb9a8c899f7a10c5b063da2a03ba9f9ba2650f WHIRLPOOL 93d4fdd206602833104f43eae576fc22bee4975e3ba116dd4caff1067a0394c230726d70d8e74d90288c984b46c3f9d26856bb2ee663dd63ace425ce6acc4d71
 AUX sssd 488 SHA256 464f6ecb559cbe14dcd1974837aeab338f4ce38686cc464bcddf1db28839caa5 SHA512 274473cf69e62f405c2af2ea94e9964f579140c47623f4d7712f33c9e34525fda6b77c8fe8d180e8b45905ad6c4d581f9ae4f173aafa0660e48f61da0069e65d WHIRLPOOL ceb70b5c0bf11f6620f0c31fab6c7f4fe5c7ff84fc07aa4f63a6a73be05f0bca62d1f9ab0d422ec0c97939569ec3a6ca7ed63b13ede84f6e39c4ac3c12cc0ba4
+AUX sssd-1.13.0-fix-init.patch 814 SHA256 edb1d019c8642794700f25a7f6b4adf06748d00a5def81c535415828498c9024 SHA512 6e25c091789fe31ca515de85510a473189b4007c9ad180f20e6c372ea4a78a64f1c881fbf36ac4c648897dcef3d61586bb4d66b7256c7bba3bca83d11f83ecc8 WHIRLPOOL 07cdc90f2c66b22856fee3f46969bc65a4fe2e7e55fe0a617c5d094c1745122bea1692dda5c67d7e74aad66890181653186dbc08e068330aed66f911745f726e
 AUX sssd-1.9.6-fix-init.patch 1020 SHA256 d9c1044ed9fca08cc4c104622aea56faa182465f5ce82796963636915de41ab9 SHA512 7718f990265fb1d4a717b3ca3863279b3351625438acea4bb3325ee3db7cdfef332290042856019badf22c1de604095686521c733fb0c725f2eaef0df61e5100 WHIRLPOOL 602bf7f3a4747b28d6af97284edaeadee82b9c1b28239a388b17166c5a0ea8b6b99842b4f3921ea94c40889987dcb3fee782435ce82eef3a0070a6655789f9d3
 AUX sssd.conf 124 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43821a5fb94 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a WHIRLPOOL 37151473420598bd24d90ef1975ba83c5e9f5301a459b8d73d5df540d5b67686494b9f826b8e985b42765c65861d5f82b6ef705ebe577e68bbf57a893a24f32b
 AUX sssd.service 341 SHA256 633a4824ba95524a0d9cf8b42cd1a5dc3f9b40f6aeda9ffc60d56edf72b2015e SHA512 99510d11f390722f56bc164059033fc40299dd4ea29f98cd5f08b2648f31b2e70afeb6b2d90f919bde595546c80b4e6941cf6f48130661ead09c0576043e4cf5 WHIRLPOOL 57963f1251e8f24d2ca67b1c71108171c468077e8ace27347d22e21ce854ab339a4131741397fa39607d8b10621c8fc33420a14bef1fdbd236442ad733299182
@@ -18,27 +19,27 @@ DIST sssd-1.9.7.tar.gz 3485351 SHA256 ed2b7e9835143404cbc0e3e105607b7c554f568e4a
 EBUILD sssd-1.12.1.ebuild 3517 SHA256 805e028fff71740743ad096907566b5abf554d97699b8880559beb535ce1ae62 SHA512 c3e1786b429ec230fb7221d4453ebd1ec1ac83e80eccf24709788da6217c8ac9e6a25d0804352530c9c9cbb74731d21b06f1a037c4d212e5492772fae5412422 WHIRLPOOL dc267384f92a37eb3ae5a836af4811c81ae7da4c787a971b94b9e4f1437f57d947890c48127ff2273d75534dd3857079766f64203ed41a7ce49e3fbe10eb61eb
 EBUILD sssd-1.12.4.ebuild 5366 SHA256 bb2b6b12ec3f164e9edf85e6821d3edd384d63413358bed601b8a6737be6a55f SHA512 666681c95f58a4d2dde85b5eace2e307a9577f2e7556d3406ae1874289e334b96bd1f7c4bf9e92c44612a252e2a18b842d78d73c6996e85335460dbd7342cf41 WHIRLPOOL 2af7db1bd461bb5d5bf4813bfdb6ded4b21109d7b00dbb4253407aed49c51d8556b724abd65d06d4e2929b15cccac537dd80785601516f6b0c31233bfab7a8f8
 EBUILD sssd-1.12.5.ebuild 5366 SHA256 75aeb517e7203eb5ca938f081a3f6619f00779b1d9ec6558cfb00654a1a9b134 SHA512 ba7647f09402bfeda9a8e2e9cc9ee5704653e7afe5b814f4005f2639d3ed1ceeb09a87a314c2bd3996241bb18f50abea39ef052bfba019f8f601220eea1ba5b8 WHIRLPOOL e3ee37d8d37037f1ece97d63ce17e7d7b50b1d082f3d34f23d07f2a39c45521cc0bc587295558a1b680d6b91e6e11bf2d0e64b625485604fa6ca6e8eeccb455a
-EBUILD sssd-1.13.0.ebuild 5366 SHA256 f9e33a6225efe91560c20ed151eb0c107f2a0bfe9d041e9f56f9e532f180f6dc SHA512 e9a93774ba54ecf88f22a7c158003e7a8779d6b27101f48eb22710bf1a45af734fdc002276060720263e28ba240d5845fe444edc0145dc465940de3f12d76125 WHIRLPOOL e7e1346cce415d049f212a705e2cb83f95ec100c6229eb23d657ca05172aa0698f67e16241f326e06e7e6ace53a2ee2a0fa9fb625356946511eb3ce695d95d80
+EBUILD sssd-1.13.0.ebuild 5585 SHA256 f31969b94aa297e9e39e06acf2e7c61a856eb454f9a8680e6dc35d52f2269b7a SHA512 aeb48345ab425cec99daa14d4b58a7a198ab450b9b5709bfea04288016d1efc674b4b3dc86ab9d4e10d8991f3432a89baa7a76367aa934a3657cbf4c2b13a868 WHIRLPOOL d17ae42a068ceda5a5c990cb5d48a13aab99997fa3e30d5d4ced396a189cbba602521bfbca9f21aaa1778931f520c92097711f8284b2d48f47641aa799ff0a6b
 EBUILD sssd-1.9.6-r3.ebuild 3221 SHA256 d694b694c51c4eaa3c772f0bba0381cab51223ce1af556fc48f39d85e61d413a SHA512 69241bfe5793c8fa674d3ed35f9deb1f7c2365b4f25f920d8834a05b061d1efed875fa4be02436abb5723487e0454687c4920b7b21f5af79c153160d4c49285c WHIRLPOOL 6652d3c24ab3783e282463b5653286d18f651ba3a2ddf03feebdb6b1c122c9a2e41b1f05a5cd0a342a5e4b60ad7e143f5f36b03547d1ecec69cd59abcc35eb91
 EBUILD sssd-1.9.7.ebuild 3233 SHA256 04637dec37ffaff36ebbb73684a8875bfb757420562d93a9b53fcb33396ffc11 SHA512 b65ba70a3cd9fe64ebcee77e1616dabfe7781415703e201d2eb1c5aaab8f47aefd19d97d859746136e74057ac2673ecd16098bc33291c71c74a0ae1569d7b0f5 WHIRLPOOL 674ba708e698bdd8e1a906605ef6d768b21c4e908015c2f0c3a2db4c452ab796c3b3d255776abb42d5054e09e64ed521cded9169a53b2db355ffedc090d8ead1
-MISC ChangeLog 11648 SHA256 1bb30d73d8dd4da2733417cd9f0e5c316f7ae502019077e43c486817ee7250d5 SHA512 3b00e2b7f2f3b8456d0fffa19c3a5476ce1c09592bcebc0be8ceedfc4e961c0aa812b7c09f4e66c212f1b6edd8d3d7b9f7d1dd07581205bd247476fc732d4cd5 WHIRLPOOL 77c19ec1f286b64639be0f037353c5eacca6432759f94d01f77eb022b0b551caec9b9dcee64350af91e95b8a7830855ba195ea8434cca453e48a374f39939b2d
+MISC ChangeLog 11845 SHA256 6a629fe4e219222897929c7aae935150ae0b8490d1f4abd9fa53cb79d9ed0de8 SHA512 28e88be0402d327231e61a04d5a03398c1c79cc6e636f9c8b43370f81520e72a3ed63b64e597001d914c39e909a9095cfc27506d4e5c26ecb9e7f23812e8aa74 WHIRLPOOL baf2471df5a8c5a5ea0566bbf9d70e81ed4020f09f6ad6f5e37a32708ac0347e22fa6122b459683cd3b386924efdf7bf1228adbb57e84ac5c0be3a4d68420718
 MISC metadata.xml 1023 SHA256 d056fd8216ec84da30390ed4f3961cb97969d2159cca695dd3fd2f939e808b4c SHA512 9296ab06d55fe4e81fd2dd81ca79220268496bdb686d7e49e3fe2eae0e253d91964c6101f09653de688b1fb1074a0dde78e999b5774a9d27e02fdb1cf9cd9f4c WHIRLPOOL df942efd13b9e8002fdf9be5b6d981832b014ea48814ed663725dc790f8e0f7b3a60c329d8f720b569eef563d5b219331f35dba3c18ec992676ed5ee2d1537b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVoYafXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVr/Z6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88r9wP/2F0HFLq9/MiHmrPXnYqtwL9
-0OMwhabBxehAwri/tz1mK6pWYGEVg6UhBs+k8Wv8+12HtSQxuVLLYkpmhjTwLfaW
-2twOftDOXWGc7pGkH6uWeATKDn70C7lGvCXl+oLMseqJub5Lpo1iJuESUTzV6I5f
-d9w2ZCoNMil4q9wu+r6ROdIs3WAgOTKr7qAqZMcHU93j7IxtHpcsAV/CGJrDzD6Y
-D7pArvkzmnA13w41fM+y02xz++FfMePCWSK3qh6a82XPqWhZRUGDRGNvU1JAMePC
-PRHbBjbt11elXGHFaA8meJeNL5rlNdjKO2BcPS5thJVB1eGo9/gKSUX5NQoTAIeQ
-IgBVQTahupQhyAcThFi0RXqE1xGqNTu0+gdfzP4WpA81KtNxx0XjCONMXSJ0vfbs
-gEKR8D2CJvjxMWOhgM8mSdW5s/fZY8D8vQgQhZU1a7kG20emYhum48W7Hxsz+Lf4
-8F+n8r9931PU2GdblFMe+Ej2ou10gtqoVdi1MUj+OqgThlAeBhGCDjalqUhSQhhd
-mmNZfhYNmAhR/iIWKrfoDf8rrrYbPGGpeITYOcthFwdxbWZxlPEvnYDdcZVgYrqM
-DeivS3+gV0DmXLBSxxZMNvGwfMtcyrIBBFCWzE25CqUAWbLc9BC1RyiJmv5u6Ylw
-2WxIv/yILwYqFJ9DxqRc
-=iknw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88KRYQAI1N88mH0zz9kDFNzI4MJg7b
+47IGh0Wn86wcJiQ9og+fBU1tzqYvVb9nzAXjLdHmO4gZVJsqR1rCudei04cFi01A
+TiQ4DNANLvDsuolSKoDU8Y5Zxf3taRhAy5aYR/OPQvqWfAuFL423T28cidPypbZv
+SbMpcJCOCkP3dZ30LaluhXeSkACgtzhQHaLzFXEyDxP1kf/qtBYB8p39nzD1EAvv
+Mg3pj0+rJ+AYt4VY00qpDTpHekmQEDZxp72bG5nPDj9x5C/pFj8ee/Pfrx4lc77a
+Jhy0ZXweCmpcY1ZbnLZbi5A7KqIGvKMMD7fM152MkmV6YvA2Oskrkzzh7myq782/
+RPd8C5gU/1qHgUNq1LfhmVfT+7wM22wnZNYoPXVxk0AXmKA3rPVFgbl3xMdKnzso
+Pk8aqjTtwOQd2bajQE+KjH2an768S68JjHDm1J7DgBZgRhyag9pImiQ9qhB6azN6
+BB7C/v9xvvqfPQDjlbqfIOoaMh6TWreiNuzHOuUfk66oZRKHyzT4Ijj2fhx2xi26
+PLf2QDUh/K8T5rUdMNNwn849dg6puygr+RX+v/kXjtmhLW6eyD+z5kV34YeP8hve
+MmpM2eHlVlk+MJYyPolw657gndtSt8gvLb4PCf74WEsZHwf/yir1O9uEEV4EtI99
+2vSsU8QY6l/KNn/Zlu6K
+=TUmz
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/sssd/files/sssd-1.13.0-fix-init.patch b/sys-auth/sssd/files/sssd-1.13.0-fix-init.patch
new file mode 100644
index 000000000000..d821a0740606
--- /dev/null
+++ b/sys-auth/sssd/files/sssd-1.13.0-fix-init.patch
@@ -0,0 +1,28 @@
+From 121061115d1902d8298fbe9ebc3f8d081a725934 Mon Sep 17 00:00:00 2001
+From: Tyler Gates <tgates81@gmail.com>
+Date: Mon, 20 Jul 2015 17:14:12 -0400
+Subject: [PATCH] daemon startup options as declared in conf.d/sssd
+
+---
+Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=553678
+Upstrem bugzilla: https://fedorahosted.org/sssd/ticket/2722
+---
+ src/sysv/gentoo/sssd.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysv/gentoo/sssd.in b/src/sysv/gentoo/sssd.in
+index 30d7559..7ced44f 100644
+--- a/src/sysv/gentoo/sssd.in
++++ b/src/sysv/gentoo/sssd.in
+@@ -7,7 +7,7 @@ depend(){
+ 
+ start(){
+     ebegin "Starting sssd"
+-    start-stop-daemon --start --exec @sbindir@/sssd -- -Df
++    start-stop-daemon --start --exec @sbindir@/sssd -- -Df ${SSSD_OPTIONS}
+     eend ${?}
+ }
+ 
+-- 
+2.0.5
+
diff --git a/sys-auth/sssd/sssd-1.13.0.ebuild b/sys-auth/sssd/sssd-1.13.0.ebuild
index 4ae8c23de23e..1a763fb38f69 100644
--- a/sys-auth/sssd/sssd-1.13.0.ebuild
+++ b/sys-auth/sssd/sssd-1.13.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.13.0.ebuild,v 1.1 2015/07/11 21:11:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.13.0.ebuild,v 1.2 2015/07/22 20:00:57 hwoarang Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit python-single-r1 multilib pam linux-info autotools multilib-minimal systemd toolchain-funcs
+inherit eutils multilib pam linux-info autotools multilib-minimal systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="http://fedorahosted.org/sssd/"
@@ -76,14 +76,19 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 pkg_setup(){
-	use python && python-single-r1_pkg_setup
 	linux-info_pkg_setup
 }
 
 src_prepare() {
+	# bug #553678
+	epatch "${FILESDIR}"/${P}-fix-init.patch
+
 	eautoreconf
 
 	multilib_copy_sources
+
+	# Maybe run it before eautoreconf?
+	epatch_user
 }
 
 src_configure() {
@@ -95,7 +100,15 @@ 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=(
+	local myconf=()
+	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
+		myconf+=($(multilib_native_use_with python python2-bindings))
+	fi
+	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
+		myconf+=($(multilib_native_use_with python python3-bindings))
+	fi
+
+	myconf+=(
 		--localstatedir="${EPREFIX}"/var
 		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
 		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
@@ -111,7 +124,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable augeas config-lib)
 		$(multilib_native_use_with selinux)
 		$(multilib_native_use_with selinux semanage)
-		$(multilib_native_use_with python python-bindings)
 		$(use_enable locator krb5-locator-plugin)
 		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
 		$(use_enable nls )
@@ -179,7 +191,6 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files --all
-	use python && python_optimize
 
 	insinto /etc/sssd
 	insopts -m600