rpms/bind/F-9 bind-9.5-edns.patch, 1.3, 1.4 bind.spec, 1.259, 1.260 named.init, 1.67, 1.68 bind-9.5-any.patch, 1.1, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Tue May 13 07:10:04 UTC 2008
- Previous message (by thread): rpms/bind/devel bind-9.5-edns.patch, 1.3, 1.4 bind.spec, 1.260, 1.261 named.init, 1.67, 1.68 bind-9.5-any.patch, 1.1, NONE
- Next message (by thread): rpms/qt/devel qt.spec,1.178,1.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589
Modified Files:
bind.spec named.init
Added Files:
bind-9.5-edns.patch
Removed Files:
bind-9.5-any.patch
Log Message:
- reverted "any" patch, upstream says not needed
- log EDNS failure only when we really switch to plain EDNS (#275091)
- detect configuration file better
bind-9.5-edns.patch:
Index: bind-9.5-edns.patch
===================================================================
RCS file: bind-9.5-edns.patch
diff -N bind-9.5-edns.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ bind-9.5-edns.patch 13 May 2008 07:09:20 -0000 1.4
@@ -0,0 +1,21 @@
+diff -up bind-9.5.0b3/lib/dns/resolver.c.edns bind-9.5.0b3/lib/dns/resolver.c
+--- bind-9.5.0b3/lib/dns/resolver.c.edns 2008-05-13 08:55:43.000000000 +0200
++++ bind-9.5.0b3/lib/dns/resolver.c 2008-05-13 08:58:12.000000000 +0200
+@@ -1552,13 +1552,16 @@ resquery_send(resquery_t *query) {
+ dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
+ !useedns)
+ {
+- query->options |= DNS_FETCHOPT_NOEDNS0;
+ dns_adb_changeflags(fctx->adb,
+ query->addrinfo,
+ DNS_FETCHOPT_NOEDNS0,
+ DNS_FETCHOPT_NOEDNS0);
+ }
+
++ /* Sync query->options and query->addrinfo->flags now */
++ if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) != 0)
++ query->options |= DNS_FETCHOPT_NOEDNS0;
++
+ /*
+ * Use EDNS0, unless the caller doesn't want it, or we know that
+ * the remote server doesn't like it.
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- bind.spec 6 May 2008 09:44:46 -0000 1.259
+++ bind.spec 13 May 2008 07:09:20 -0000 1.260
@@ -18,7 +18,7 @@
Name: bind
License: ISC
Version: 9.5.0
-Release: 30.1.%{RELEASEVER}%{?dist}
+Release: 31.%{RELEASEVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
Patch87: bind-9.5-parallel-build.patch
Patch90: bind-9.5-libcap.patch
Patch91: bind-9.5-recv-race.patch
-Patch92: bind-9.5-any.patch
+Patch92: bind-9.5-edns.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -239,7 +239,7 @@
%patch85 -p1 -b .libidn3
%patch87 -p1 -b .parallel
%patch91 -p1 -b .recv-race
-%patch92 -p1 -b .any
+%patch92 -p1 -b .edns
:;
@@ -645,6 +645,11 @@
%{_sbindir}/bind-chroot-admin
%changelog
+* Tue May 13 2008 Adam Tkac <atkac redhat com> 32:9.5.0-31.b3
+- reverted "any" patch, upstream says not needed
+- log EDNS failure only when we really switch to plain EDNS (#275091)
+- detect configuration file better
+
* Tue May 06 2008 Adam Tkac <atkac redhat com> 32:9.5.0-30.1.b3
- addresses 0.0.0.0 and ::0 really match any (#275091, comment #28)
Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/named.init,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- named.init 11 Feb 2008 15:47:01 -0000 1.67
+++ named.init 13 May 2008 07:09:20 -0000 1.68
@@ -65,7 +65,7 @@
named_conf=${named_conf:-/etc/named.conf};
- if [ ! -r $named_conf ]; then
+ if [ ! -r $ROOTDIR$named_conf ]; then
echo 'Cannot find configuration file. You could create it by system-config-bind'
exit 6;
fi;
--- bind-9.5-any.patch DELETED ---
- Previous message (by thread): rpms/bind/devel bind-9.5-edns.patch, 1.3, 1.4 bind.spec, 1.260, 1.261 named.init, 1.67, 1.68 bind-9.5-any.patch, 1.1, NONE
- Next message (by thread): rpms/qt/devel qt.spec,1.178,1.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list