rpms/ipa/F-13 ipa-replica.patch,NONE,1.1 ipa.spec,1.27,1.28

[rcritten]

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16412

Modified Files:
	ipa.spec 
Added Files:
	ipa-replica.patch 
Log Message:
gpg2 requires the --batch argument to not prompt for passphrases (#596446)


ipa-replica.patch:
 ipautil.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ipa-replica.patch ---
diff -u --recursive freeipa-1.2.2.orig/ipa-python/ipautil.py freeipa-1.2.2/ipa-python/ipautil.py
--- freeipa-1.2.2.orig/ipa-python/ipautil.py	2009-09-09 15:41:27.000000000 -0400
+++ freeipa-1.2.2/ipa-python/ipautil.py	2010-05-26 14:55:59.000000000 -0400
@@ -149,7 +149,7 @@
             #give gpg a fake dir so that we can leater remove all
             #the cruft when we clean up the tempdir
             os.mkdir(gpgdir)
-            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
+            args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
             run(args, password)
         except:
             raise
@@ -179,7 +179,7 @@
             #give gpg a fake dir so that we can leater remove all
             #the cruft when we clean up the tempdir
             os.mkdir(gpgdir)
-            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
+            args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
             run(args, password)
         except:
             raise


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-13/ipa.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ipa.spec	4 May 2010 21:37:37 -0000	1.27
+++ ipa.spec	26 May 2010 19:25:46 -0000	1.28
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Patch01:        Fix-install-with-krb-1.7.patch
 Patch02:        ipa-schema.patch
+Patch03:        ipa-replica.patch
 
 BuildRequires:  fedora-ds-base-devel >= 1.1.3
 BuildRequires:  mozldap-devel
@@ -197,6 +198,7 @@ administering radius authentication sett
 %setup -n freeipa-%{version} -q
 %patch01 -p1 -b .stash-as-keytab
 %patch02 -p1 -b .schema
+%patch03 -p1 -b .replica
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -477,6 +479,9 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed May 26 2010 Rob Crittenden <rcritten at redhat.com> - 1.2.2-4
+- gpg2 requires the --batch argument to not prompt for passphrases (#596446)
+
 * Tue May  4 2010 Rob Crittenden <rcritten at redhat.com> - 1.2.2-3
 - Add patch to fix installation with krb5 1.7