[sssd] Update to SSSD 1.5.4

[Stephen Gallagher]

commit 3eed4c35576a51d22c302cc64d52bb9d09402a49
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Mar 24 15:17:41 2011 -0400

    Update to SSSD 1.5.4
    
    Improve the way we detect the LDB plugin location
    
    New upstream release 1.5.4
    https://fedorahosted.org/sssd/wiki/Releases/Notes-1.5.4
    Fixes for Active Directory when not all users and groups have POSIX attributes
    Fixes for handling users and groups that have name aliases (aliases are ignored)
    Fix group memberships after initgroups in the IPA provider

 .gitignore                                         |    1 +
 ...stence-of-GID-number-and-name-in-group-se.patch |  150 --------------------
 ...stence-of-username-uid-and-gid-for-user-e.patch |   55 -------
 sources                                            |    2 +-
 sssd.spec                                          |   31 +++--
 5 files changed, 19 insertions(+), 220 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63d7b92..b9a7e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ sssd-1.2.91.tar.gz
 /sssd-1.5.1.tar.gz
 /sssd-1.5.2.tar.gz
 /sssd-1.5.3.tar.gz
+/sssd-1.5.4.tar.gz
diff --git a/sources b/sources
index 275db16..28b177a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d1c73ef2cc60e44098410f20818dc1c  sssd-1.5.3.tar.gz
+d1459f6e0d0a5246374f08e6ab24c7de  sssd-1.5.4.tar.gz
diff --git a/sssd.spec b/sssd.spec
index 9d8c9dd..f3e2d7b 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -3,9 +3,13 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
+# Determine the location of the LDB modules directory
+%global ldb_modulesdir %(pkg-config --variable=modulesdir ldb)
+%global ldb_version 1.0.2
+
 Name: sssd
-Version: 1.5.3
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -14,12 +18,10 @@ Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch0001: 0001-Require-existence-of-GID-number-and-name-in-group-se.patch
-Patch0002: 0002-Require-existence-of-username-uid-and-gid-for-user-e.patch
 
 ### Dependencies ###
 
-Requires: libldb = 1.0.2
+Requires: libldb = %{ldb_version}
 Requires: libtdb >= 1.1.3
 Requires: sssd-client = %{version}-%{release}
 Requires: cyrus-sasl-gssapi
@@ -50,10 +52,7 @@ BuildRequires: popt-devel
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
-BuildRequires: libldb-devel
-%if 0%{?fedora} >= 15
-BuildRequires: libldb-devel = 1.0.2
-%endif
+BuildRequires: libldb-devel = %{ldb_version}
 BuildRequires: libdhash-devel >= 0.4.2
 BuildRequires: libcollection-devel
 BuildRequires: libini_config-devel
@@ -112,9 +111,6 @@ use with ldap_default_authtok_type = obfuscated_password.
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-
 %build
 autoreconf -ivf
 %configure \
@@ -161,7 +157,7 @@ install -m644 src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
     $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \
-    $RPM_BUILD_ROOT/%{_libdir}/ldb/modules/ldb/memberof.la \
+    $RPM_BUILD_ROOT/%{ldb_modulesdir}/memberof.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_krb5.la \
@@ -201,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/sssd
 %{_libexecdir}/%{servicename}/
 %{_libdir}/%{name}/
-%{_libdir}/ldb/modules/ldb/memberof.so
+%{ldb_modulesdir}/memberof.so
 %dir %{sssdstatedir}
 %attr(700,root,root) %dir %{dbpath}
 %attr(755,root,root) %dir %{pipepath}
@@ -274,6 +270,13 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 24 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.5.4-1
+- New upstream release 1.5.4
+- https://fedorahosted.org/sssd/wiki/Releases/Notes-1.5.4
+- Fixes for Active Directory when not all users and groups have POSIX attributes
+- Fixes for handling users and groups that have name aliases (aliases are ignored)
+- Fix group memberships after initgroups in the IPA provider
+
 * Thu Mar 17 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.5.3-2
 - Resolves: rhbz#683267 - sssd 1.5.1-9 breaks AD authentication