More fixes in the init script.

3 files changed, 9 insertions, 30 deletions

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index d784722c8925..7fc837ac3de6 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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-1.9.6-fix-init.patch 831 SHA256 3b6208ae2825861cd2eede4ad86b224fa64ba8a3fa38ea637b2af8c3e57dd6a3 SHA512 80daa2862f12468040ca3c686c9be8013cb08a05d915c3e01b57c54a2a43f8fd23e4bdb99e4a7742c48701b7dd3fc2f64c3668fea99a84b8d02d3323571e4998 WHIRLPOOL 585a3135d515300b896b2198da23b95de70d4c6fef67016468cf76ee3a741d42f89171a442056d517a931548f1b7948e38cff4071fb376625c137c1c06a04d43
+AUX sssd-1.9.6-fix-init.patch 820 SHA256 ccf6be452f0d1fceb236cef5e1d0d721660f7f6533b3336e86ac7ef8621d06ae SHA512 01dc4d820edaa10c3d730ee748b2b741372098d8041bbd9e51673ad758550e029d38667371f009dd044c709b991dabdf68173a01aa7d064ebed9dc9061c77b99 WHIRLPOOL 5ff2093ddb3592635fdb0d8392d6fe06bbe3b06cf447c2dcd7824abeabf35efce0ce34b16827d280519c1291e34f616fe139793fb032690d361f595101755549
 AUX sssd.conf 124 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43821a5fb94 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a WHIRLPOOL 37151473420598bd24d90ef1975ba83c5e9f5301a459b8d73d5df540d5b67686494b9f826b8e985b42765c65861d5f82b6ef705ebe577e68bbf57a893a24f32b
 DIST sssd-1.8.6.tar.gz 2175323 SHA256 df3417e7c95e49ee982b6919059a5f181d59fcfbffa1c75106025980fda4c023 SHA512 137b3f2977511ed88c013e3e07da73dff689f8064c7ecf4c6c555e2686d76dd9daf10a184396b9e4a663a5a4fc4942808f6eae2b72eef47a730e041916445a30 WHIRLPOOL 25c8baecc35e69028b92cf4be01a2d37412838b6ec624ca3928e3f013b0e81bb0f0f1a3d57b7145291da7bed52f84f6259366a78e9f562afd26b9af0eb12c31c
 DIST sssd-1.9.4.tar.gz 3050325 SHA256 20e39d7c5d89e217b5301f7e75360eb869ac1889701755a598fb3fbed923f4b4 SHA512 2e0297c4a748a5b265956034727a97c3addfa135216133cb76dcf7e905a3a0d87ea02331f98d06dd7a90c5185ba3e89496ff386e3cc675ae90c51a1c49ac0984 WHIRLPOOL 984395610ccc47b6d5b77c73f2ce4fb6f9dea2bfdd4a128d19599dabd6530286513b11c16707641c1610b1d80afdb8996b57f2dcadb9dc9a858053628fac65cf
@@ -16,25 +13,6 @@ EBUILD sssd-1.8.6-r1.ebuild 3059 SHA256 cd6f89011fe01485d7a18468069c113356bf624f
 EBUILD sssd-1.8.6.ebuild 2989 SHA256 8071e03b447460673246fc728c48a85f9d49db4ee30d506de4d2e2a39978a460 SHA512 104dcf2aece9389dfadd966ef8a9fffa160e4a94c0f6aa21386e249cc0e12b59aefceace6b6193a130d956ded515640835a14b5477f5f07b32e3b412f1a785fe WHIRLPOOL 28cccf05c8ab32f14f99e894d9ffaf109af4605bb494416b071159a9205433d1c7d9e3da58c27ade9d056dc1c7edf4089c7fbc490657ff370c298c469588f338
 EBUILD sssd-1.9.4-r3.ebuild 3410 SHA256 ada3bde5f3bf443aad4ee38d9d85dfed11e1853fb8a4b171ab3109fb010df842 SHA512 5ffff7fd6dfdec67d62994f723ea108ee83145a2c8ae735f4142d5338865cce2cc69861124243a5f0dab232d3afb5132355fb1a4bfea068e0ecf566b67055855 WHIRLPOOL 6cce356e7c7e438b489a0b33a8a621685f7cd01c0581144fd65df4ccda4138ad54a141581a937959dc1df535fc6afa66eaeb828270d2606e3ded75275d266359
 EBUILD sssd-1.9.5-r1.ebuild 3413 SHA256 c7640b82177b8cbce4fe1c5004090e4856d6bb48f5eec72bcd6202c094630d05 SHA512 c71ca9e6cc92b78f61be30b122b5bb131518a8aca567166cfdae26bff8698d2c279a16864be72cbaa16685ef28486904d3e113a2d2916425cb8fbb89b0dff5cc WHIRLPOOL c8b7bdf24454ff82f80978b8fa7c0b69f7dc31683ae97d1a698ffbc330a402e936d1b180b303cfa5d41952de1098a864fb096b6e97546f16ef15879234277b8d
-EBUILD sssd-1.9.6.ebuild 3381 SHA256 bcc6bf9d32d6c0651fecb934f6f7997b76abca8617a10ee288ddad3087db73ad SHA512 5813fe5c9650cfdcc9d3bf915ca1087f62a50fbf05f625ff8b32158979cd20779904458fbda4afc013784d6a4720ce73731ca6b910aedaef7a804fbe6803b2be WHIRLPOOL 429492a8991fd860fa822e4ed11d9c01ec8e3605ec009d89b574853ac687f5e00e0bd1356954941e02dd0fac52cbb3d22fff007c7e6972aba2862f11c2ffc22d
+EBUILD sssd-1.9.6-r1.ebuild 3402 SHA256 8d66666f676829c417a8679be3b23c1200b7b0517ff3266a0bf79fc54f5f96da SHA512 b9b264be06631f2cb499e891e32562816db89634dbd08a2fe20c4aa279795c4ef1a0c118d83cfaf482f27afa26067a4f5ec0a383f8498867221b62eeaa6276f6 WHIRLPOOL 9060cfd8874d22a66a5aad81133cb9638600a77a23efee1aff4be9a80673b3a98ff5ff7ce5e63719db208049b56f848a4842dd3b0dc47e8746c89533ae9a86af
 MISC ChangeLog 7890 SHA256 dc135e77ca536507f49bf9bda6fdc23a17c2de1ceff5d4739b657c2a29a9d564 SHA512 5371487f407ca245eff5351815a03153ac97d8f148e445bd5e896a2dcf23e4ab9432e4acc36a7c81701b0dd7f721b00bef08ffa4679494d6aef8093fe78dd575 WHIRLPOOL 4a5705fdfa596fd3160aa0de06ef1fb3b4d611f01a56a6bae6a8282cde9353eeff496fe5ce25658f76d26e638256f9872856edeb26f38680d96c9d92fabc0faf
 MISC metadata.xml 921 SHA256 4b2d79c80f3d9fa0d70be4a31083bc39edca07215611184bc1c1f1597260f8f3 SHA512 034310ea409bdfd6a4008c726b16a51659d625f8bc705eecc39643cecd4ed69689068e49311029f95d896347084c642d4e3283c913381770d3072a363c12f922 WHIRLPOOL 67a8da5b5e0d745443757ded349dae3ae3bdde8a9f679290226c6c0af27df890b83b0c18b7610f45b34a416301b7ee8bd45ff33c74fde2550cce7f66d9194fce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSm22YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88mhMP/RlCDHQyAafiq7b449KMmG8/
-cadgR8TmG63qY3JYbU60XsK2vTydfzaJmHIomLiHGbeqUh4oJ56X/X9MSWO9vJ9n
-9T2Dn/fkvtlkH+FZRqWd0pGRtY2m8XGs4WWVRTQu/Xyhr9ikFHrbOFNDPqtF7/Ib
-fgLs9ecjlZDRqfH2trzLP9gtFtsS43Wyh04VG3uJAou9uL2w1IOui6VMTwR6cAmJ
-Htdwa5fCtComQbYpBzqL2xwmYe7H2Pn+w2AyD9R/tsDKbCBT/AlnI+ptrMj4/zZR
-eyDOVJU2eVPv824FmPTNBQ20E0xwlJFATBhrQz30TCVS/pW2AQozuwnVaK9+e+4Q
-nHCXYkI6eQ5lDqy2WU3rOhUHey4ZIePuVkcqYu6C/5urgqSyMR3QPGzHxKiWJ9FX
-9UO+RRfMB3ioVISCmpGtmmuv7gVXAtvQe9L2w6eoOcssnw9m81cDFm4D1KDAX0Wb
-rq8xpBiR1A/MyF5rps9ZwoLfMsMhCM8k26cLIlfeYut4tX/RXpOLYIzPLzHLwNtD
-f0Kox2ilqwf276fn6tMJmZXPHA6nGWlFjfq4Acnp8Qy1whNI968YdTeX0woa7B/3
-6ERf6VbAWIKU7jUwQ2cN9QiO4+AuyTkmqYItVOsKVWGzMehn+wdjF5CzaCZlq61R
-f8tNlnyuRs6azr2/99lb
-=BI/3
------END PGP SIGNATURE-----
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
index 252473bcede2..1636c28a8e67 100644
--- a/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
+++ b/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
@@ -7,10 +7,10 @@ the dependencies of the script to use 'xdm' if it is available.
 
 Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
 
-Index: sssd-1.9.6/src/sysv/gentoo/sssd
+Index: sssd-1.9.6/src/sysv/gentoo/sssd.in
 ===================================================================
---- sssd-1.9.6.orig/src/sysv/gentoo/sssd
-+++ sssd-1.9.6/src/sysv/gentoo/sssd
+--- sssd-1.9.6.orig/src/sysv/gentoo/sssd.in
++++ sssd-1.9.6/src/sysv/gentoo/sssd.in
 @@ -2,12 +2,12 @@
  
  depend(){
@@ -21,8 +21,8 @@ Index: sssd-1.9.6/src/sysv/gentoo/sssd
  
  start(){
      ebegin "Starting sssd"
--    start-stop-daemon --start --exec ${exec_prefix}/sbin/sssd -- -D
-+    start-stop-daemon --start --exec ${exec_prefix}/sbin/sssd -- -Df
+-    start-stop-daemon --start --exec @sbindir@/sssd -- -D
++    start-stop-daemon --start --exec /usr/sbin/sssd -- -Df
      eend ${?}
  }
  
diff --git a/sys-auth/sssd/sssd-1.9.6.ebuild b/sys-auth/sssd/sssd-1.9.6-r1.ebuild
index d42a7814803e..e492dc0eb71a 100644
--- a/sys-auth/sssd/sssd-1.9.6.ebuild
+++ b/sys-auth/sssd/sssd-1.9.6-r1.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.6.ebuild,v 1.1 2013/12/01 17:10:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.6-r1.ebuild,v 1.1 2013/12/02 08:50:31 hwoarang Exp $
 
 EAPI=4
 
@@ -90,6 +90,7 @@ src_configure(){
 		--with-unicode-lib="glib2"
 		--disable-rpath
 		--enable-silent-rules
+		--exec-prefix=/usr
 		$(use_with selinux)
 		$(use_with selinux semanage)
 		$(use_with python python-bindings)