[freeipa/f19] Update to upstream 3.3.5

[Martin Kosek]

commit 8d122629b0ebdef091e9b6b432975e1ef98c89ac
Author: Martin Kosek <mkosek at redhat.com>
Date:   Fri Mar 28 10:36:06 2014 +0100

    Update to upstream 3.3.5

 .gitignore                                         |    1 +
 ...ck-to-global-policy-in-ipa-lockout-plugin.patch |  108 --------------------
 ...t-of-adtrustinstance-for-case-without-tru.patch |   41 --------
 ...-do-not-fail-when-default-realm-cannot-be.patch |   66 ------------
 freeipa.spec                                       |   23 ++--
 sources                                            |    2 +-
 6 files changed, 14 insertions(+), 227 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76e7be2..728af3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /freeipa-3.3.2.tar.gz
 /freeipa-3.3.3.tar.gz
 /freeipa-3.3.4.tar.gz
+/freeipa-3.3.5.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index c77c072..ef9d42e 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -4,15 +4,15 @@
 %global plugin_dir %{_libdir}/dirsrv/plugins
 %global POLICYCOREUTILSVER 2.1.14-37
 %global gettext_domain ipa
-%global VERSION 3.3.4
+%global VERSION 3.3.5
 
 %if (0%{?fedora} > 15 || 0%{?rhel} >= 7)
 %define _hardened_build 1
 %endif
 
 Name:           freeipa
-Version:        3.3.4
-Release:        3%{?dist}
+Version:        3.3.5
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -21,9 +21,6 @@ URL:            http://www.freeipa.org/
 Source0:        http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0001:      0001-Fallback-to-global-policy-in-ipa-lockout-plugin.patch
-Patch0002:      0002-ipa-lockout-do-not-fail-when-default-realm-cannot-be.patch
-
 %if ! %{ONLY_CLIENT}
 BuildRequires:  389-ds-base-devel >= 1.3.1.3
 BuildRequires:  svrcore-devel
@@ -99,7 +96,7 @@ Group: System Environment/Base
 Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
-Requires: 389-ds-base >= 1.3.1.3
+Requires: 389-ds-base >= 1.3.1.22
 Requires: openldap-clients > 2.4.35-4
 %if 0%{?fedora} == 18
 Requires: nss >= 3.14.3-2
@@ -142,7 +139,7 @@ Requires(post): systemd-units
 Requires: selinux-policy >= 3.12.1-65
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.47.7
-Requires: pki-ca >= 10.0.4
+Requires: pki-ca >= 10.0.7
 Requires: dogtag-pki-server-theme
 %if 0%{?rhel}
 Requires: subscription-manager
@@ -154,7 +151,7 @@ Requires: zip
 Requires: policycoreutils >= %{POLICYCOREUTILSVER}
 Requires: tar
 Requires(pre): certmonger >= 0.65
-Requires(pre): 389-ds-base >= 1.3.1.3
+Requires(pre): 389-ds-base >= 1.3.1.22
 
 # With FreeIPA 3.3, package freeipa-server-selinux was obsoleted as the
 # entire SELinux policy is stored in the system policy
@@ -226,9 +223,9 @@ Requires(post): %{name}-server = %{version}-%{release}
 Requires(postun): %{name}-server = %{version}-%{release}
 
 # Specific requires
-Requires(pre): 389-ds-base = 1.3.1.17
+Requires(pre): 389-ds-base = 1.3.1.22
 Requires: krb5-server = 1.11.3
-Requires: pki-ca = 10.0.6
+Requires: pki-ca = 10.0.7
 
 %description server-strict
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -375,6 +372,7 @@ export JAVA_STACK_SIZE="8m"
 %endif
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
+export LDFLAGS="%{__global_ldflags} $LDFLAGS"
 %if 0%{?fedora} >= 18
 # use fedora18 platform which is based on fedora16 platform with systemd
 # support + fedora18 changes
@@ -908,6 +906,9 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
+* Fri Mar 28 2014 Martin Kosek <mkosek at redhat.com> - 3.3.5-1
+- Update to upstream 3.3.5
+
 * Wed Feb  5 2014 Martin Kosek <mkosek at redhat.com> - 3.3.4-3
 - ipa_lockout plugin did not work with users's without krbPwdPolicyReference
 
diff --git a/sources b/sources
index b6a1d95..80deded 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ad49c60abada8a328ddd825481d9e9c  freeipa-3.3.4.tar.gz
+d255c8177714735bc3963c619a0737ba  freeipa-3.3.5.tar.gz