rpms/ipa/F-8 freeipa-dnsquery.patch,NONE,1.1 ipa.spec,1.8,1.9

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3155

Modified Files:
	ipa.spec 
Added Files:
	freeipa-dnsquery.patch 
Log Message:
- Added patch to fix problem with DNS querying where the query could be
  returned as the answer.
- Set fedora-ds-base minimum version to 1.1.0-3
- Add selinux-policy-base(post) to Requires (446496)


freeipa-dnsquery.patch:

--- NEW FILE freeipa-dnsquery.patch ---
--- a/ipa-python/dnsclient.py
+++ b/ipa-python/dnsclient.py
@@ -365,22 +365,22 @@ def dnsParseResults(results):
 		if not rest:
 			return []
 		
-		rr = DNSResult()
+		qq = DNSResult()
 
 		(rest, label) = dnsParseLabel(rest, results)
 		if label is None:
 			return []
 
-		if len(rest) < rr.qsize():
+		if len(rest) < qq.qsize():
 			return []
 		
-		rr.qunpack(rest)
+		qq.qunpack(rest)
 		
-		rest = rest[rr.qsize():]
+		rest = rest[qq.qsize():]
 
 		if DEBUG_DNSCLIENT:
 			print "Queried for '%s', class = %d, type = %d." % (label,
-				rr.dns_class, rr.dns_type)
+				qq.dns_class, qq.dns_type)
 
 	for i in xrange(header.dns_ancount + header.dns_nscount + header.dns_arcount):
 		(rest, label) = dnsParseLabel(rest, results)
@@ -424,8 +424,6 @@ def dnsParseResults(results):
 		rest = rest[rr.dns_rlength:]
 		rrlist += [rr]
 
-	if not rrlist:
-		rrlist = [rr]
 	return rrlist
 
 def query(query, qclass, qtype):


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-8/ipa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipa.spec	29 Apr 2008 16:57:25 -0000	1.8
+++ ipa.spec	16 May 2008 14:02:51 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -15,6 +15,8 @@
 Source0:        freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch3:         freeipa-dnsquery.patch
+
 BuildRequires:  fedora-ds-base-devel >= 1.1
 BuildRequires:  mozldap-devel
 BuildRequires:  openssl-devel
@@ -49,7 +51,7 @@
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires(post): %{name}-server-selinux = %{version}-%{release}
-Requires: fedora-ds-base >= 1.1
+Requires: fedora-ds-base >= 1.1.0-3
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -73,6 +75,7 @@
 Requires: python-pyasn1
 Requires: libcap
 Requires: selinux-policy
+Requires(post): selinux-policy-base
 Conflicts: mod_ssl
 
 %description server
@@ -176,6 +179,7 @@
 
 %prep
 %setup -n freeipa-%{version} -q
+%patch3 -p1 -b .dnsquery
 
 %build
 cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
@@ -422,6 +426,12 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Fri May 16 2008 Rob Crittenden <rcritten at redhat.com> - 1.0.0-3
+- Added patch to fix problem with DNS querying where the query could be
+  returned as the answer.
+- Set fedora-ds-base minimum version to 1.1.0-3
+- Add selinux-policy-base(post) to Requires (446496)
+
 * Tue Apr 29 2008 Rob Crittenden <rcritten at redhat.com> - 1.0.0-2
 - Add missing entry for /var/cache/ipa/kpasswd (444624)
 - Fix Requires for krb5-server that was missing for Fedora versions > 9