summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2008-09-17 08:03:03 +0000
committerAdam Tkac <atkac@fedoraproject.org>2008-09-17 08:03:03 +0000
commit77020b9c5b57e0eb8089509e44e189e25e1192f0 (patch)
tree75067b63106c1ec3c8826466aa2299ce5404a182
parent6eed956cdfb52c947fda6405f10be1621e63d29e (diff)
downloadbind-77020b9c5b57e0eb8089509e44e189e25e1192f0.tar.gz
bind-77020b9c5b57e0eb8089509e44e189e25e1192f0.tar.xz
bind-77020b9c5b57e0eb8089509e44e189e25e1192f0.zip
- IDN output strings didn't honour locale settings (#461409)bind-9_5_1-0_6_b1_fc10
-rw-r--r--bind.spec7
-rw-r--r--bind95-rh461409.patch19
2 files changed, 25 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index 81e50c9..0675a04 100644
--- a/bind.spec
+++ b/bind.spec
@@ -19,7 +19,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.5.1
-Release: 0.5.%{PREVER}%{?dist}
+Release: 0.6.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +81,7 @@ Patch82: bind-9.5-dbus-va_end.patch
Patch73: bind-9.5-libidn.patch
Patch83: bind-9.5-libidn2.patch
Patch85: bind-9.5-libidn3.patch
+Patch94: bind95-rh461409.patch
#
Requires: mktemp
@@ -245,6 +246,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
%patch90 -p1 -b .edns
%patch91 -p1 -b .rh450995
%patch92 -p1 -b .rh457175
+%patch94 -p1 -b .rh461409
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -642,6 +644,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin
%changelog
+* Wed Sep 17 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.6.b1
+- IDN output strings didn't honour locale settings (#461409)
+
* Tue Aug 05 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.5.b1
- disable transfer stats on DLZ zones (#454783)
diff --git a/bind95-rh461409.patch b/bind95-rh461409.patch
new file mode 100644
index 0000000..8c0c772
--- /dev/null
+++ b/bind95-rh461409.patch
@@ -0,0 +1,19 @@
+diff -up bind-9.5.1b1/bin/dig/dighost.c.rh461409 bind-9.5.1b1/bin/dig/dighost.c
+--- bind-9.5.1b1/bin/dig/dighost.c.rh461409 2008-09-16 14:04:03.000000000 +0200
++++ bind-9.5.1b1/bin/dig/dighost.c 2008-09-16 14:06:06.000000000 +0200
+@@ -3665,6 +3665,15 @@ output_filter (isc_buffer_t *buffer, uns
+ (void) strcpy (tmp1, tmp2);
+ free (tmp2);
+
++ tmp2 = stringprep_utf8_to_locale (tmp1);
++ if (tmp2 == NULL) {
++ debug ("output_filter: stringprep_utf8_to_locale failed");
++ return ISC_R_SUCCESS;
++ }
++
++ (void) strcpy (tmp1, tmp2);
++ free (tmp2);
++
+ tolen = strlen (tmp1);
+ if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
+ tolen--;