[freeipa/f19] Update to upstream 3.3.3

[Martin Kosek]

commit 04fa14ccd273ce06ea19aa60dfca6031f9022c0a
Author: Martin Kosek <mkosek at redhat.com>
Date:   Fri Nov 1 19:43:38 2013 +0100

    Update to upstream 3.3.3

 .gitignore   |    1 +
 freeipa.spec |   13 ++++++-------
 sources      |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d4e505..4a6de80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /freeipa-3.3.0.tar.gz
 /freeipa-3.3.1.tar.gz
 /freeipa-3.3.2.tar.gz
+/freeipa-3.3.3.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 03d35c3..2a5e662 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -4,10 +4,10 @@
 %global plugin_dir %{_libdir}/dirsrv/plugins
 %global POLICYCOREUTILSVER 2.1.14-37
 %global gettext_domain ipa
-%global VERSION 3.3.2
+%global VERSION 3.3.3
 
 Name:           freeipa
-Version:        3.3.2
+Version:        3.3.3
 Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
@@ -122,7 +122,7 @@ Requires: mod_auth_kerb >= 5.4-16
 %else
 Requires: mod_auth_kerb >= 5.4-8
 %endif
-Requires: mod_nss
+Requires: mod_nss >= 1.0.8-24
 Requires: python-ldap
 Requires: python-krbV
 Requires: acl
@@ -167,10 +167,6 @@ Conflicts: bind < 9.8.2-0.4.rc2
 # member.
 Conflicts: nss-pam-ldapd < 0.8.4
 
-# mod_proxy provides a single API to communicate over SSL. If mod_ssl
-# is even loaded into Apache then it grabs this interface.
-Conflicts: mod_ssl
-
 Obsoletes: ipa-server >= 1.0
 
 %description server
@@ -890,6 +886,9 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
+* Fri Nov 1 2013 Martin Kosek <mkosek at redhat.com> - 3.3.3-1
+- Update to upstream 3.3.3
+
 * Fri Oct 4 2013 Martin Kosek <mkosek at redhat.com> - 3.3.2-1
 - Update to upstream 3.3.2
 
diff --git a/sources b/sources
index 33299e6..39e8e00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-476c35280c5bdc647d72c4923e0cd787  freeipa-3.3.2.tar.gz
+ba4546b837c5129524e2d1020986400f  freeipa-3.3.3.tar.gz