Fix depends in init script, bug 385157

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

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index 6507b45f4c021031bda05f2c6df7971118c0b558..c8b580e740679d3080e614bb5c95457d07d2e6bc 100644 (file)
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2011/09/17 09:35:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.9 2011/10/23 18:06:10 maksbotan Exp $
+
+*sssd-1.6.1-r2 (23 Oct 2011)
+
+  23 Oct 2011; Maxim Koltsov <maksbotan@gentoo.org> +sssd-1.6.1-r2.ebuild,
+  +files/sssd, +files/sssd.conf:
+  Fix depends in init script, bug 385157
 
   17 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> -sssd-1.6.1.ebuild,
   sssd-1.6.1-r1.ebuild:

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 6b8393e5e8068304037e3f1068409457694c4703..1c2bfc7b210d6d9a506670487f2e3226bb4572c7 100644 (file)
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX allow_xdm.patch 472 RMD160 c17767239e43b5f4544b3434e8d2704eef4eac1a SHA1 50e0d62e03f571872eabae32a91a9014b0f7c16e SHA256 9d0462096d7eb03489dbb4f5920c767828068cc87d2e41c75c37631f95850368
+AUX sssd 488 RMD160 ee4d135acf2f94fb0a9ef662fdb9e6ecf7497760 SHA1 e63ce14b6d4a64da5ccfeec27457034eba7ac89f SHA256 464f6ecb559cbe14dcd1974837aeab338f4ce38686cc464bcddf1db28839caa5
+AUX sssd.conf 124 RMD160 5e3d03ec9f865c2668a2d675955d00698538fce0 SHA1 a5eef5829ff47a9dc116c69e90c93dab349384e4 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43821a5fb94
 DIST sssd-1.6.1.tar.gz 1406047 RMD160 7ff170c6914840dfd33abcea41f5164a9023c288 SHA1 86924e20d6e8c6c9070258469afe1acf81ab13ae SHA256 ba30d8cf7eae1fd66053b4f11e8e5b98bc6db113cf6d2f33e429f2e21d90ade9
 EBUILD sssd-1.6.1-r1.ebuild 2812 RMD160 616386570dcaa993d8b0f7b1f43f2bb9bd4f6431 SHA1 5bdab259963916f206cf777b57607c3cd4e822db SHA256 74d635dca16d8610bfcc5e4ef41dc39b7124a1af5c693aaa60679498420b95c6
-MISC ChangeLog 1624 RMD160 8079d6aa897c7effef612cd36f77d6a17adfba4e SHA1 583bb750f79728a7556ae2f06f9a58a0e8df172f SHA256 cdc9fd4b03935ede8193dba1c347d0b2ab129abd3d1c114c5b3faefa823fad1b
+EBUILD sssd-1.6.1-r2.ebuild 2927 RMD160 c1d98583a4da2d0550f8cb23745adc2fece21085 SHA1 d901f40ac94ac397de6e390423538b72e4cc871f SHA256 685749c12ad5e569455664339e376ff7f4c672f960ec817dfe0700b1b6ef0afe
+MISC ChangeLog 1804 RMD160 ecd5a1a11f120807ca3f1e49023a2fe7af55bc98 SHA1 6715893e5efd0b2f41fff3ce8d44459ddc463c47 SHA256 90c272975af4561cb7dd620d5c6a2ee9b4d7341fdc754d4c5e45f1b0d12ef20c
 MISC metadata.xml 397 RMD160 d8dc7a66776a2089520d45cc7d168cb26f9086a9 SHA1 9bb360b2eadb2d2ac8c7ae9653b63e13bcb0f116 SHA256 9f0e2f6ad562f85051ff4b13406d82bc1bb4b234efa3d1540ead8005958febb5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59skIACgkQfXuS5UK5QB3wIAP+JAB8t9+GhJ2m2+yqsYDCQBMe
-IlNC6SF4EW0/vNudn0I1i5wagnRx7iO9GS0q4sn39XDbPJktHHCTkzXOEtHgysmn
-+JVnQtasC8jLnPh9HrGfoNsAI0sUGuAhI0bXa1C7dpEWOm5vRBEmqSMft1NQlsYB
-Dvysztu7+i+uvrBQFbk=
-=7XjM
------END PGP SIGNATURE-----

diff --git a/sys-auth/sssd/files/sssd b/sys-auth/sssd/files/sssd
new file mode 100644 (file)
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/files/sssd.conf b/sys-auth/sssd/files/sssd.conf
new file mode 100644 (file)
index 0000000..33dab3d
--- /dev/null
+++ b/sys-auth/sssd/files/sssd.conf
@@ -0,0 +1,4 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SSSD_OPTIONS=""

diff --git a/sys-auth/sssd/sssd-1.6.1-r2.ebuild b/sys-auth/sssd/sssd-1.6.1-r2.ebuild
new file mode 100644 (file)
index 0000000..f6fa555
--- /dev/null
+++ b/sys-auth/sssd/sssd-1.6.1-r2.ebuild
@@ -0,0 +1,116 @@
+# 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-r2.ebuild,v 1.1 2011/10/23 18:06:10 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 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}"/new_openrc.patch)
+
+pkg_setup(){
+       python_set_active_version 2
+       python_need_rebuild
+       linux-info_pkg_setup
+}
+
+src_prepare() {
+       cp -f  "${FILESDIR}"/sssd "${S}/"src/sysv/gentoo/sssd
+}
+
+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
+       remove_libtool_files all
+
+       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
+       newconfd "${FILESDIR}"/sssd.conf sssd
+}
+
+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
+}