diff --git a/.cvsignore b/.cvsignore index 4ba448b..a1b5b4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sssd-0.5.0.tar.gz +sssd-0.7.0.tar.gz diff --git a/sources b/sources index 76326f4..c51859b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7566dcac75e7248ca99b4dd0bb49c1ee sssd-0.5.0.tar.gz +403945c70c902302e5d8babecb24b096 sssd-0.7.0.tar.gz diff --git a/sssd.spec b/sssd.spec index 7b7de4e..8501d9f 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,9 +1,11 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1))")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")} + Name: sssd -Version: 0.5.0 -Release: 0%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Group: Applications/System Summary: System Security Services Daemon - # The entire source code is GPLv3+ except replace/ which is LGPLv3+ License: GPLv3+ and LGPLv3+ URL: http://fedorahosted.org/sssd @@ -17,7 +19,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: libldb >= 0.9.3 Requires: libtdb >= 1.1.3 - +Requires: sssd-client = 0.7.0 +Requires(post): python Requires(preun): initscripts chkconfig Requires(postun): /sbin/service @@ -32,7 +35,8 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: m4 -BuildRequires: popt-devel +%{?fedora:BuildRequires: popt-devel} +%{?rhel:BuildRequires: popt} BuildRequires: libtalloc-devel BuildRequires: libtevent-devel BuildRequires: libtdb-devel @@ -49,6 +53,7 @@ BuildRequires: libxml2 BuildRequires: docbook-style-xsl BuildRequires: krb5-devel BuildRequires: c-ares-devel +BuildRequires: python-devel %description Provides a set of daemons to manage access to remote directories and @@ -57,6 +62,14 @@ the system and a pluggable backend system to connect to multiple different account sources. It is also the basis to provide client auditing and policy services for projects like FreeIPA. +%package client +Summary: SSSD Client libraries for NSS and PAM +Group: Applications/System + +%description client +Provides the libraries needed by the PAM and NSS stacks to connect to the SSSD +service. + %prep %setup -q @@ -75,6 +88,16 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# Prepare language files +/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon +/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client + +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd +install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf + +install -m400 server/config/etc/sssd.api.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf +install -m400 server/config/etc/sssd.api.d/* $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/ + # Remove .la files created by libtool rm -f \ $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \ @@ -83,15 +106,20 @@ rm -f \ $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \ $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \ $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_krb5.la \ - $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la - -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd -install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf + $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \ + $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la + +if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so +then + # Apppend this file to the sss_daemon.lang + # Older versions of rpmbuild can only handle one -f option + echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang +fi %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f sss_daemon.lang %defattr(-,root,root,-) %doc COPYING %attr(755,root,root) %{_initrddir}/%{name} @@ -105,23 +133,45 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/%{servicename}/ %{_libdir}/%{name}/ %{_libdir}/ldb/memberof.so -%{_libdir}/krb5/plugins/libkrb5/* %dir %{sssdstatedir} %attr(700,root,root) %dir %{dbpath} %attr(755,root,root) %dir %{pipepath} %attr(700,root,root) %dir %{pipepath}/private -%dir %{_sysconfdir}/sssd +%attr(750,root,root) %dir %{_var}/log/%{name} +%attr(700,root,root) %dir %{_sysconfdir}/sssd %config(noreplace) %{_sysconfdir}/sssd/sssd.conf +%config %{_sysconfdir}/sssd/sssd.api.conf +%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d +%config %{_sysconfdir}/sssd/sssd.api.d/ +%{_mandir}/man5/sssd.conf.5* +%{_mandir}/man5/sssd-ipa.5* +%{_mandir}/man5/sssd-krb5.5* +%{_mandir}/man5/sssd-ldap.5* +%{_mandir}/man8/sssd.8* +%{_mandir}/man8/sss_groupadd.8* +%{_mandir}/man8/sss_groupdel.8* +%{_mandir}/man8/sss_groupmod.8* +%{_mandir}/man8/sss_useradd.8* +%{_mandir}/man8/sss_userdel.8* +%{_mandir}/man8/sss_usermod.8* +%{_mandir}/man8/sssd_krb5_locator_plugin.8* +%{python_sitearch}/pysss.so +%{python_sitelib}/*.py* +%{?fedora:%{python_sitelib}/*.egg-info} + +%files client -f sss_client.lang +%defattr(-,root,root,-) /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so -%{_mandir}/man5/* -%{_mandir}/man8/* -%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo -%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo +%{_mandir}/man8/pam_sss.8* %post /sbin/ldconfig /sbin/chkconfig --add %{servicename} +if [ $1 -ge 2 ] ; then +# a one-time upgrade from confdb v1 to v2, only if upgrading + python %{_libexecdir}/%{servicename}/upgrade_config.py +fi %preun if [ $1 = 0 ]; then @@ -135,14 +185,41 @@ if [ $1 -ge 1 ] ; then /sbin/service %{servicename} condrestart 2>&1 > /dev/null fi +%post client -p /sbin/ldconfig + +%postun client -p /sbin/ldconfig + %changelog +* Fri Oct 23 2009 Stephen Gallagher - 0.7.0-1 +- New upstream release 0.7.0 + +* Thu Oct 15 2009 Stephen Gallagher - 0.6.1-2 +- Fix missing file permissions for sssd-clients + +* Tue Oct 13 2009 Stephen Gallagher - 0.6.1-1 +- Add SSSDConfig API +- Update polish translation for 0.6.0 +- Fix long timeout on ldap operation +- Make dp requests more robust + +* Tue Sep 29 2009 Stephen Gallagher - 0.6.0-1 +- Ensure that the configuration upgrade script always writes the config + file with 0600 permissions +- Eliminate an infinite loop in group enumerations + +* Mon Sep 28 2009 Sumit Bose - 0.6.0-0 +- New upstream release 0.6.0 + * Mon Aug 24 2009 Simo Sorce - 0.5.0-0 - New upstream release 0.5.0 -* Wed Jul 29 2009 Jakub Hrozek - 0.4.1-3 +* Wed Jul 29 2009 Jakub Hrozek - 0.4.1-4 - Fix for CVE-2009-2410 - Native SSSD users with no password set could log in without a password. (Patch by Stephen Gallagher) +* Sun Jul 26 2009 Fedora Release Engineering - 0.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jun 22 2009 Simo Sorce - 0.4.1-2 - Fix a couple of segfaults that may happen on reload @@ -154,15 +231,6 @@ fi - latest upstream release. - also add a patch that fixes debugging output (potential segfault) -* Tue Apr 29 2009 Simo Sorce - 0.3.3-3 -- Add use_first_pass option to fix pam stack problems - -* Tue Apr 28 2009 Simo Sorce - 0.3.3-1 -- Add patches to fix password caches when offline - -* Mon Apr 27 2009 Simo Sorce - 0.3.3-0 -- Version 0.3.3 - * Mon Apr 20 2009 Simo Sorce - 0.3.2-2 - release out of the official 0.3.2 tarball