rpms/bind/devel bind-9.5-libidn3.patch, NONE, 1.1 bind.spec, 1.239, 1.240

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22515

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-libidn3.patch 
Log Message:
- fixed regression caused by libidn2 patch (#426348)


bind-9.5-libidn3.patch:

--- NEW FILE bind-9.5-libidn3.patch ---
diff -up bind-9.5.0b1/bin/dig/dighost.c.libidn3 bind-9.5.0b1/bin/dig/dighost.c
--- bind-9.5.0b1/bin/dig/dighost.c.libidn3	2007-12-20 13:24:27.000000000 +0100
+++ bind-9.5.0b1/bin/dig/dighost.c	2007-12-20 13:27:10.000000000 +0100
@@ -1859,10 +1859,13 @@ setup_lookup(dig_lookup_t *lookup) {
 	if (lookup->origin != NULL) {
 		result = libidn_locale_to_utf8 (lookup->origin->origin, utf8_str);
 		check_result (result, "convert origin to UTF-8");
-		if (len + strlen (utf8_str) < MXNAME)
-			(void) strcpy (utf8_name + len, utf8_str);
-		else
-			fatal ("Too long name + origin");
+		if (len > 0 && utf8_name[len - 1] != '.') {
+			utf8_name[len++] = '.';
+			if (len + strlen (utf8_str) < MXNAME)
+				(void) strcpy (utf8_name + len, utf8_str);
+			else
+				fatal ("Too long name + origin");
+		}
 	}
 
 	result = libidn_utf8_to_ascii (utf8_name, ascii_name);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- bind.spec	19 Dec 2007 16:26:13 -0000	1.239
+++ bind.spec	20 Dec 2007 13:46:29 -0000	1.240
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	21.%{RELEASEVER}%{?dist}
+Release: 	22.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,7 @@
 # IDN paches
 Patch73:	bind-9.5-libidn.patch
 Patch83:	bind-9.5-libidn2.patch
+Patch85:	bind-9.5-libidn3.patch
 
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
@@ -258,6 +259,7 @@
 %patch73 -p1 -b .libidn
 %patch83 -p1 -b .libidn2
 %patch84 -p1 -b .gssapi-header
+%patch85 -p1 -b .libidn3
 :;
 
 
@@ -658,6 +660,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Dec 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-22.b1
+- fixed regression caused by libidn2 patch (#426348)
+
 * Wed Dec 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-21.b1
 - fixed typo in post section (CVE-2007-6283)