[freeipa/f16] Add patch to work with dogtag 9.0.18, fix replication agreements

[rcritten]

commit 07272a9797d647de80b7e804c9919a6f322f4be8
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Mon Mar 19 17:11:46 2012 -0400

    Add patch to work with dogtag 9.0.18, fix replication agreements
    
    - Add patch to drop shell escaping before calling pkisilent
    - Patch which adds tool to fix replication agreements missing memberof in
      EXCLUDE list
    - Set minimum n-v-r on pki-* to 9.0.18

 freeipa.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/freeipa.spec b/freeipa.spec
index 7f4c417..73b7809 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           freeipa
 Version:        2.1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -31,6 +31,8 @@ Patch6:         freeipa-2.1.4-replica-install-services.patch
 Patch7:         freeipa-2.1.4-inifiles-support.patch
 Patch8:         freeipa-2.1.4-python-ldap-2.4.6-support.patch
 Patch9:         freeipa-2.1.4-upgrade-systemd.patch
+Patch10:        freeipa-2.1.4-shellescape.patch
+Patch11:        freeipa-2.1.4-fixreplica.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
@@ -234,6 +236,8 @@ package.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -342,6 +346,8 @@ if [ $1 -gt 1 ] ; then
     /usr/libexec/freeipa-systemd-upgrade || :
     /usr/sbin/ipa-upgradeconfig || :
     /usr/sbin/ipa-ldap-updater --upgrade >/dev/null 2>&1 || :
+    # Make sure replication agreements are correct
+    /usr/sbin/ipa-fixreplica >/dev/null 2>&1 || :
 fi
 
 %preun server
@@ -413,6 +419,7 @@ fi
 %{_sbindir}/ipa-replica-install
 %{_sbindir}/ipa-replica-prepare
 %{_sbindir}/ipa-replica-manage
+%{_sbindir}/ipa-fixreplica
 %{_sbindir}/ipa-csreplica-manage
 %{_sbindir}/ipa-server-certinstall
 %{_sbindir}/ipa-ldap-updater
@@ -488,6 +495,7 @@ fi
 %{_mandir}/man1/ipa-replica-conncheck.1.gz
 %{_mandir}/man1/ipa-replica-install.1.gz
 %{_mandir}/man1/ipa-replica-manage.1.gz
+%{_mandir}/man1/ipa-fixreplica.1.gz
 %{_mandir}/man1/ipa-csreplica-manage.1.gz
 %{_mandir}/man1/ipa-replica-prepare.1.gz
 %{_mandir}/man1/ipa-server-certinstall.1.gz
@@ -556,6 +564,12 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Mon Mar 19 2012 Rob Crittenden <rcritten at redhat.com> - 2.1.4-6
+- Add patch to drop shell escaping before calling pkisilent
+- Patch which adds tool to fix replication agreements missing memberof in
+  EXCLUDE list
+- Set minimum n-v-r on pki-* to 9.0.18
+
 * Wed Feb 01 2012 Alexander Bokovoy <abokovoy at redhat.com> - 2.1.4-5
 - Force to use 389-ds 1.2.10-0.8.a7 or above
 - Improve upgrade script to handle systemd 389-ds change