From 2b71536ad9b38eb96162bd7e27f15d62b95756a7 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: May 30 2012 19:27:09 +0000
Subject: Merge branch 'f17' into f16


Conflicts:
	.gitignore
	sources
	sssd.spec

---

diff --git a/.gitignore b/.gitignore
index 5558a2b..987a25d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ sssd-1.2.91.tar.gz
 /sssd-1.8.1.tar.gz
 /sssd-1.8.2.tar.gz
 /sssd-1.8.3.tar.gz
+/sssd-1.8.4.tar.gz
diff --git a/sources b/sources
index 0388784..5450c98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e09410d6bfe0a2bf8a4ce7ab95c005db  sssd-1.8.3.tar.gz
+196cc355f74a1a431f9bd5dcd2c6cc41  sssd-1.8.4.tar.gz
diff --git a/sssd.spec b/sssd.spec
index b80798a..a555fcb 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -15,8 +15,8 @@
 %global ldb_version 1.1.0
 
 Name: sssd
-Version: 1.8.3
-Release: 11%{?dist}
+Version: 1.8.4
+Release: 12%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -29,13 +29,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ### Dependencies ###
 
 Conflicts: selinux-policy < 3.10.0-46
-Requires: libldb = %{ldb_version}
-Requires: libtdb >= 1.1.3
+Requires: libldb%{?_isa} = %{ldb_version}
+Requires: libtdb%{?_isa} >= 1.1.3
 Requires: sssd-client%{?_isa} = %{version}-%{release}
 Requires: cyrus-sasl-gssapi%{?_isa}
 Requires: libipa_hbac%{?_isa} = %{version}-%{release}
-Requires: krb5-libs >= 1.9
-Requires: keyutils-libs
+Requires: krb5-libs%{?_isa} >= 1.9
+Requires: keyutils-libs%{?_isa}
 Requires(post): systemd-units initscripts chkconfig /sbin/ldconfig
 Requires(preun): systemd-units initscripts chkconfig
 Requires(postun): systemd-units initscripts chkconfig /sbin/ldconfig
@@ -111,7 +111,7 @@ service.
 Summary: Userspace tools for use with the SSSD
 Group: Applications/System
 License: GPLv3+
-Requires: sssd = %{version}-%{release}
+Requires: sssd%{?_isa} = %{version}-%{release}
 
 %description tools
 Provides userspace tools for manipulating users, groups, and nested groups in
@@ -132,7 +132,7 @@ Utility library to validate FreeIPA HBAC rules for authorization requests
 Summary: FreeIPA HBAC Evaluator library
 Group: Development/Libraries
 License: LGPLv3+
-Requires: libipa_hbac = %{version}-%{release}
+Requires: libipa_hbac%{?_isa} = %{version}-%{release}
 
 %description -n libipa_hbac-devel
 Utility library to validate FreeIPA HBAC rules for authorization requests
@@ -141,7 +141,7 @@ Utility library to validate FreeIPA HBAC rules for authorization requests
 Summary: Python bindings for the FreeIPA HBAC Evaluator library
 Group: Development/Libraries
 License: LGPLv3+
-Requires: libipa_hbac = %{version}-%{release}
+Requires: libipa_hbac%{?_isa} = %{version}-%{release}
 
 %description -n libipa_hbac-python
 The libipa_hbac-python contains the bindings so that libipa_hbac can be
@@ -159,7 +159,7 @@ A utility library to allow communication between SUDO and SSSD
 Summary: A library to allow communication between SUDO and SSSD
 Group: Development/Libraries
 License: LGPLv3+
-Requires: libsss_sudo = %{version}-%{release}
+Requires: libsss_sudo%{?_isa} = %{version}-%{release}
 
 %description -n libsss_sudo-devel
 A utility library to allow communication between SUDO and SSSD
@@ -454,6 +454,17 @@ fi
 %postun -n libipa_hbac -p /sbin/ldconfig
 
 %changelog
+* Wed May 30 2012 Stephen Gallagher <sgallagh@redhat.com> - 1.8.4-12
+- New upstream release 1.8.4
+- https://fedorahosted.org/sssd/wiki/Releases/Notes-1.8.4
+- Fix a bug causing AD servers not to fail over properly when the KDC on the
+  primary server is down
+- Fix an endianness bug on big-endian systems when looking up services
+- Fix a segfault dealing with nested groups
+- Make the nowait cache updates work for netgroups
+- Fix a regression that broke domains with use_fully_qualified_names = True
+- Correct package dependency versions to match installed arch
+
 * Thu May 03 2012 Stephen Gallagher <sgallagh@redhat.com> - 1.8.3-11
 - New upstream release 1.8.3
 - https://fedorahosted.org/sssd/wiki/Releases/Notes-1.8.3