Test out proposed fix to #473046

4 files changed, 57 insertions, 13 deletions

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 2f0273a..faf4b0b 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,7 +1,9 @@
 AUX 0001_add_pthread_to_fix_as-needed.patch 744 SHA256 3d9f822d93555393c19fc9bdbface08092e78e640dd939424700f6403f11ac1f SHA512 fee020fa5f1ef22065c91e93178d99e3a451769cc5fb1ebdceef446a9bea5547727189c65310de2fe68a12f975eb1980af7a5b737882c0c6cdd5129b76659f82 WHIRLPOOL dac4c364fe617d23f0f66675bf98e8dd33c378709c997783df52007e33a89ba871e9f455a705da09e4d213c34707fed864fa5c46c8260c81e83db809a0c7f895
 AUX 0002_allow_xdm_openrc.patch 472 SHA256 9d0462096d7eb03489dbb4f5920c767828068cc87d2e41c75c37631f95850368 SHA512 c728b3619746902584d2f75ef57829a249c964139a24bd012530399ce3fb478fd2236efaa6c5313dd8132ea46ecb9a8c899f7a10c5b063da2a03ba9f9ba2650f WHIRLPOOL 93d4fdd206602833104f43eae576fc22bee4975e3ba116dd4caff1067a0394c230726d70d8e74d90288c984b46c3f9d26856bb2ee663dd63ace425ce6acc4d71
 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.conf 124 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43821a5fb94 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a WHIRLPOOL 37151473420598bd24d90ef1975ba83c5e9f5301a459b8d73d5df540d5b67686494b9f826b8e985b42765c65861d5f82b6ef705ebe577e68bbf57a893a24f32b
-DIST sssd-1.9.4.tar.gz 3050325 SHA256 20e39d7c5d89e217b5301f7e75360eb869ac1889701755a598fb3fbed923f4b4 SHA512 2e0297c4a748a5b265956034727a97c3addfa135216133cb76dcf7e905a3a0d87ea02331f98d06dd7a90c5185ba3e89496ff386e3cc675ae90c51a1c49ac0984 WHIRLPOOL 984395610ccc47b6d5b77c73f2ce4fb6f9dea2bfdd4a128d19599dabd6530286513b11c16707641c1610b1d80afdb8996b57f2dcadb9dc9a858053628fac65cf
-EBUILD sssd-1.9.4-r2.ebuild 3427 SHA256 2dbbe179de0a2b8f9612f2249595334fa5604cef8475cf86f0dceb8e6a2d04d8 SHA512 3f4f00f378f3aa7c0dc3b5332b8225cafa12eb8ba0b47ac801700641c59323b851c1aba0318d0eb1362d5b527c61352f8e6b194dbe463d9df38532e12bd1c134 WHIRLPOOL 1d280715d64a4aa0266e7e2e6917dcd3116f70eeeaf90fd86c5feb7ef760c67fe8b06f636b9948dd827cad50c4b68e0208ce7fc4a483a951dd6f9565dc845b22
+DIST sssd-1.9.5.tar.gz 3106988 SHA256 a377c436901e92d689de811d48e37d88764460e889e47bfddd90626f0a8a015c SHA512 308785c660b9df7884e4d089d5d6880ff512598ca7803c2320404898328741d4c8cd15103f3074f0fb11b63dacddec808328db3de7b3ec07b81768bac1554624 WHIRLPOOL 4bfb6b35bc867f49662b5a5e6e80330e927340796f930c717a750e15e0977766957cf873b43f8e3ad11a181c22997c6a59868f458d9fe6fe12ce6c078f82d3b5
+EBUILD sssd-1.9.5.ebuild 3402 SHA256 d370f5d509d8eb47699530dbce8f6fa0be48e115ed7606cd0db719ebe94e6966 SHA512 11b1876f732eb9664c7a3fec9b2267105aee34eafb8dd9242eba2dd906bc7ce2998a5531b5e2bce90b8f66e2b0f4c34a3f2df5f682ae202fb4ea7a6ec407a2a7 WHIRLPOOL b35fc248dfa16bf930f301fb0e624e76f2f3d8c38e2cc946978d2e2ea990a91b1c8303cefb59b4d91f7c333ba2e36fb5637e6968a8eb03430d7c30a2af8b56fa
 MISC metadata.xml 921 SHA256 4b2d79c80f3d9fa0d70be4a31083bc39edca07215611184bc1c1f1597260f8f3 SHA512 034310ea409bdfd6a4008c726b16a51659d625f8bc705eecc39643cecd4ed69689068e49311029f95d896347084c642d4e3283c913381770d3072a363c12f922 WHIRLPOOL 67a8da5b5e0d745443757ded349dae3ae3bdde8a9f679290226c6c0af27df890b83b0c18b7610f45b34a416301b7ee8bd45ff33c74fde2550cce7f66d9194fce
diff --git a/sys-auth/sssd/files/allow_xdm.patch b/sys-auth/sssd/files/allow_xdm.patch
new file mode 100644
index 0000000..40d64cb
--- /dev/null
+++ b/sys-auth/sssd/files/allow_xdm.patch
@@ -0,0 +1,19 @@
+--- src/sysv/gentoo/sssd.old	2011-08-02 23:14:48.000000000 +0300
++++ src/sysv/gentoo/sssd	2011-08-24 12:15:18.413929409 +0300
+@@ -1,13 +1,13 @@
+ #!/sbin/runscript
+ 
+ depend(){
+-    need localmount netmount clock
+-    use syslog
++    need localmount netmount clock nscd
++    use syslog xdm
+ }
+ 
+ start(){
+     ebegin "Starting sssd"
+-    start-stop-daemon --start --exec /usr/sbin/sssd -- -D
++    start-stop-daemon --start --exec /usr/sbin/sssd -- -Df 
+     eend ${?}
+ }
+ 
diff --git a/sys-auth/sssd/files/sssd b/sys-auth/sssd/files/sssd
new file mode 100644
index 0000000..dbf7850
--- /dev/null
+++ b/sys-auth/sssd/files/sssd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+command="/usr/sbin/sssd"
+command_args="${SSSD_OPTIONS} -D"
+start_stop_daemon_args="--quiet"
+description="System Security Services Daemon"
+
+depend(){
+    need localmount clock
+    use syslog xdm
+}
+
+if [ "${RC_VERSION:-0}" = "0" ]; then
+        start() {
+                eerror "This script cannot be used for baselayout-1."
+                return 1
+        }
+fi
diff --git a/sys-auth/sssd/sssd-1.9.4-r2.ebuild b/sys-auth/sssd/sssd-1.9.5.ebuild
index 011a37f..26b86b5 100644
--- a/sys-auth/sssd/sssd-1.9.4-r2.ebuild
+++ b/sys-auth/sssd/sssd-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r2.ebuild,v 1.1 2013/04/05 07:16:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.5.ebuild,v 1.1 2013/05/21 20:04:05 hwoarang Exp $
 
 EAPI=4
 
@@ -8,7 +8,6 @@ PYTHON_DEPEND="python? 2:2.6"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE="1.12"
 
 inherit python multilib pam linux-info autotools-utils
 
@@ -29,7 +28,7 @@ COMMON_DEP="
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
 	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.13
+	>=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
@@ -62,7 +61,10 @@ DEPEND="${COMMON_DEP}
 
 CONFIG_CHECK="~KEYS"
 
-PATCHES=( "${FILESDIR}"/0*.patch )
+PATCHES=(
+		"${FILESDIR}"/0001*.patch
+		"${FILESDIR}"/0002*.patch
+)
 
 pkg_setup(){
 	if use python; then
@@ -83,7 +85,7 @@ src_configure(){
 		--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-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
@@ -117,10 +119,8 @@ src_install(){
 	insopts -m644
 	newins "${S}"/src/examples/logrotate sssd
 
-	if use python; then
-		python_clean_installation_image
-		python_convert_shebangs -r 2 "${ED}$(python_get_sitedir)"/*.py
-	fi
+	use python && python_clean_installation_image
+
 	newconfd "${FILESDIR}"/sssd.conf sssd
 }
 
@@ -133,9 +133,11 @@ pkg_postinst(){
 	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.py ipachangeconf.py
+	use python && \
+		python_mod_optimize SSSDConfig/{ipachangeconf,sssd_upgrade_config}.py
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup SSSDConfig.py ipachangeconf.py
+	use python && \
+		python_mod_cleanup SSSDConfig/{ipachangeconf,sssd_upgrade_config}.py
 }