summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-auth/sssd/ChangeLog8
-rw-r--r--sys-auth/sssd/sssd-1.6.2.ebuild116
-rw-r--r--sys-auth/sssd/sssd-1.7.0.ebuild (renamed from sys-auth/sssd/sssd-1.6.1-r2.ebuild)47
3 files changed, 38 insertions, 133 deletions
diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index 780cae4ba681..d656c9dfdec7 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-auth/sssd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.12 2012/02/04 15:38:23 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.13 2012/02/24 20:16:32 maksbotan Exp $
+
+*sssd-1.7.0 (24 Feb 2012)
+
+ 24 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> +sssd-1.7.0.ebuild,
+ -sssd-1.6.1-r2.ebuild, -sssd-1.6.2.ebuild:
+ Bump to 1.7.0, remove old versions. Thanks to slepnoga
04 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
Fix maintainer's email in metadata
diff --git a/sys-auth/sssd/sssd-1.6.2.ebuild b/sys-auth/sssd/sssd-1.6.2.ebuild
deleted file mode 100644
index e2792355d276..000000000000
--- a/sys-auth/sssd/sssd-1.6.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.2.ebuild,v 1.1 2011/10/28 17:13:52 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
-}
diff --git a/sys-auth/sssd/sssd-1.6.1-r2.ebuild b/sys-auth/sssd/sssd-1.7.0.ebuild
index f6fa555850b7..6ea3817af5d4 100644
--- a/sys-auth/sssd/sssd-1.6.1-r2.ebuild
+++ b/sys-auth/sssd/sssd-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.7.0.ebuild,v 1.1 2012/02/24 20:16:32 maksbotan Exp $
-EAPI=3
+EAPI=4
PYTHON_DEPEND="python? 2:2.6"
@@ -15,11 +15,15 @@ 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"
+IUSE="glib doc +locator logrotate netlink nls python +libunistring selinux test"
-COMMON_DEP="virtual/pam
+REQUIRED_USE="^^ ( glib libunistring )"
+
+COMMON_DEP="
+ virtual/pam
dev-libs/popt
- >=dev-libs/libunistring-0.9.3
+ !glib? ( >=dev-libs/libunistring-0.9.3 )
+ glib? ( dev-libs/glib:2 )
>=dev-libs/ding-libs-0.1.2
>=sys-libs/talloc-2.0
sys-libs/tdb
@@ -28,15 +32,17 @@ COMMON_DEP="virtual/pam
>=net-nds/openldap-2.4.19
dev-libs/libpcre
>=app-crypt/mit-krb5-1.9.1
+ sys-apps/keyutils
>=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
+ nls? ( >=sys-devel/gettext-0.17 )
virtual/libintl
- dev-libs/libnl"
+ netlink? ( dev-libs/libnl )
+ "
RDEPEND="${COMMON_DEP}"
DEPEND="${COMMON_DEP}
@@ -46,12 +52,14 @@ DEPEND="${COMMON_DEP}
doc? ( app-doc/doxygen )"
CONFIG_CHECK="~KEYS"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-#PATCHES=("${FILESDIR}"/new_openrc.patch)
+#AUTOTOOLS_IN_SOURCE_BUILD=1
pkg_setup(){
- python_set_active_version 2
- python_need_rebuild
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ python_need_rebuild
+ fi
linux-info_pkg_setup
}
@@ -60,19 +68,27 @@ src_prepare() {
}
src_configure(){
+ myconf=""
+ if use glib; then
+ myconf="glib2"
+ else
+ myconf="libunistring"
+ fi
+
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
+ --with-unicode-lib=${myconf}
$(use_with selinux)
$(use_with selinux semanage)
$(use_with python python-bindings)
$(use_enable locator krb5-locator-plugin)
- $(use_enable nls ) )
+ $(use_enable nls )
+ $(use_with netlink libnl) )
autotools-utils_src_configure
}
@@ -83,7 +99,7 @@ src_install(){
insinto /etc/sssd
insopts -m600
- doins "${S}"/src/examples/sssd.conf
+ doins "${S}"/src/examples/sssd-example.conf
if use logrotate; then
insinto /etc/logrotate.d
@@ -107,7 +123,6 @@ 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_need_rebuild
use python && python_mod_optimize SSSDConfig.py ipachangeconf.py
}