diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-12-20 13:46:29 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-12-20 13:46:29 +0000 |
| commit | d6f4ab3259d2817072ef82cb8c01a1f41f4af927 (patch) | |
| tree | d0a1c6b47c3bb63fc4dde6f3d6f32650dc154aa7 | |
| parent | 03105e66d007e66ba94c8f628873ae7a74f121a5 (diff) | |
- fixed regression caused by libidn2 patch (#426348)
| -rw-r--r-- | bind-9.5-libidn3.patch | 21 | ||||
| -rw-r--r-- | bind.spec | 9 |
2 files changed, 28 insertions, 2 deletions
diff --git a/bind-9.5-libidn3.patch b/bind-9.5-libidn3.patch new file mode 100644 index 0000000..3fd5573 --- /dev/null +++ b/bind-9.5-libidn3.patch @@ -0,0 +1,21 @@ +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); @@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv 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 @@ Patch82: bind-9.5-dbus-va_end.patch # 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 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %patch73 -p1 -b .libidn %patch83 -p1 -b .libidn2 %patch84 -p1 -b .gssapi-header +%patch85 -p1 -b .libidn3 :; @@ -414,7 +416,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.239 2007/12/19 16:26:13 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.240 2007/12/20 13:46:29 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -658,6 +660,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_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) |