summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2007-12-20 13:48:07 +0000
committerAdam Tkac <atkac@fedoraproject.org>2007-12-20 13:48:07 +0000
commit2bf8601fe7f9eb92bfd7deb539c608a1b12e5806 (patch)
tree02f907836fbba74ba55029d0b7a79285cd0a0406
parentff04c46ad2e6af54d08d44beaa51fd518e04dbaa (diff)
- fixed regression caused by libidn2 patch (#426348)
-rw-r--r--bind.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/bind.spec b/bind.spec
index 992ce0e..e4d527b 100644
--- a/bind.spec
+++ b/bind.spec
@@ -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: 20.%{RELEASEVER}%{?dist}
+Release: 21.%{RELEASEVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,6 +83,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
@@ -260,6 +261,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
%patch80 -p1 -b .edns
%patch83 -p1 -b .libidn2
%patch84 -p1 -b .gssapi-header
+%patch85 -p1 -b .libidn3
:;
@@ -416,7 +418,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.235 2007/12/19 16:29:43 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.236 2007/12/20 13:48:07 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:
@@ -676,6 +678,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin
%changelog
+* Thu Dec 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-21.b1
+- fixed regression caused by libidn2 patch (#426348)
+
* Wed Dec 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-20.b1
- CVE-2007-6283