update to 9.10.2rc1
- fix nsupdate server auto-detection (#1184151) - drop merged patch bind99-rh985918.patch Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza
parent
407c2d38c0
commit
4e2098e221
|
|
@ -49,3 +49,4 @@ bind-9.7.2b1.tar.gz
|
|||
/bind-9.10.1b2.tar.gz
|
||||
/bind-9.10.1.tar.gz
|
||||
/bind-9.10.1-P1.tar.gz
|
||||
/bind-9.10.2rc1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in
|
||||
--- bind-9.10.1b1/config.h.in.multlib-conflict 2014-08-04 12:42:19.750274089 +0200
|
||||
+++ bind-9.10.1b1/config.h.in 2014-08-04 12:43:19.334332434 +0200
|
||||
@@ -495,7 +495,7 @@ int sigwait(const unsigned int *set, int
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index ff72235..bce1a24 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -513,7 +513,7 @@ int sigwait(const unsigned int *set, int *sig);
|
||||
#undef PREFER_GOSTASN1
|
||||
|
||||
/* The size of `void *', as computed by sizeof. */
|
||||
|
|
@ -10,23 +11,28 @@ diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in
|
|||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
diff -up bind-9.10.1b1/configure.in.multlib-conflict bind-9.10.1b1/configure.in
|
||||
--- bind-9.10.1b1/configure.in.multlib-conflict 2014-08-04 12:42:19.751274090 +0200
|
||||
+++ bind-9.10.1b1/configure.in 2014-08-04 12:47:50.157648387 +0200
|
||||
@@ -2952,7 +2952,9 @@ int getnameinfo(const struct sockaddr *,
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 10c98c3..d54b036 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3048,8 +3048,11 @@ int getnameinfo(const struct sockaddr *, size_t, char *,
|
||||
size_t, char *, size_t, int);],
|
||||
[ return (0);],
|
||||
[AC_MSG_RESULT(size_t for buflen; int for flags)
|
||||
- AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
|
||||
- AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
||||
+ # Changed to solve multilib conflict on Fedora
|
||||
+ # AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
|
||||
+ # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
||||
+ AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
|
||||
+ AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
|
||||
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
|
||||
[AC_MSG_RESULT(not match any subspecies; assume standard definition)
|
||||
AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
|
||||
diff -up bind-9.10.1b1/isc-config.sh.in.multlib-conflict bind-9.10.1b1/isc-config.sh.in
|
||||
--- bind-9.10.1b1/isc-config.sh.in.multlib-conflict 2014-06-23 06:47:35.000000000 +0200
|
||||
+++ bind-9.10.1b1/isc-config.sh.in 2014-08-04 12:42:19.752274091 +0200
|
||||
AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
|
||||
diff --git a/isc-config.sh.in b/isc-config.sh.in
|
||||
index 10df275..5215eb0 100644
|
||||
--- a/isc-config.sh.in
|
||||
+++ b/isc-config.sh.in
|
||||
@@ -21,7 +21,18 @@ prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
exec_prefix_set=
|
||||
|
|
|
|||
23
bind.spec
23
bind.spec
|
|
@ -2,8 +2,8 @@
|
|||
# Red Hat BIND package .spec file
|
||||
#
|
||||
|
||||
%global PATCHVER P1
|
||||
#%%global PREVER b2
|
||||
#%%global PATCHVER P1
|
||||
%global PREVER rc1
|
||||
%global VERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
|
||||
|
||||
%{?!SDB: %global SDB 1}
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
|
||||
Name: bind
|
||||
License: ISC
|
||||
Version: 9.10.1
|
||||
Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
|
||||
Version: 9.10.2
|
||||
Release: 0.1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
|
||||
Epoch: 32
|
||||
Url: http://www.isc.org/products/BIND/
|
||||
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -76,7 +76,6 @@ Patch130:bind-9.9.1-P2-dlz-libdb.patch
|
|||
Patch131:bind-9.9.1-P2-multlib-conflict.patch
|
||||
Patch133:bind99-rh640538.patch
|
||||
Patch134:bind97-rh669163.patch
|
||||
Patch135:bind99-rh985918.patch
|
||||
# distribute native-pkcs#11 functionality
|
||||
Patch136:bind-9.10-dist-native-pkcs11.patch
|
||||
|
||||
|
|
@ -347,7 +346,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
|
|||
|
||||
%patch133 -p1 -b .rh640538
|
||||
%patch134 -p1 -b .rh669163
|
||||
%patch135 -p1 -b .rh985918
|
||||
|
||||
# Sparc and s390 arches need to use -fPIE
|
||||
%ifarch sparcv9 sparc64 s390 s390x
|
||||
|
|
@ -836,9 +834,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
|
||||
%files libs-lite
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libdns.so.146*
|
||||
%{_libdir}/libdns.so.149*
|
||||
%{_libdir}/libirs.so.141*
|
||||
%{_libdir}/libisc.so.142*
|
||||
%{_libdir}/libisc.so.148*
|
||||
%{_libdir}/libisccfg.so.140*
|
||||
|
||||
%files license
|
||||
|
|
@ -986,8 +984,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
|
||||
%files pkcs11-libs
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libdns-pkcs11.so.146*
|
||||
%{_libdir}/libisc-pkcs11.so.142*
|
||||
%{_libdir}/libdns-pkcs11.so.149*
|
||||
%{_libdir}/libisc-pkcs11.so.148*
|
||||
|
||||
%files pkcs11-devel
|
||||
%defattr(-,root,root,-)
|
||||
|
|
@ -999,6 +997,11 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 02 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.2-0.1.rc1
|
||||
- update to 9.10.2rc1
|
||||
- fix nsupdate server auto-detection (#1184151)
|
||||
- drop merged patch bind99-rh985918.patch
|
||||
|
||||
* Fri Jan 16 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.1-2.P1
|
||||
- Install config for tmpfiles under %%{_tmpfilesdir} (#1181020)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
From 7d891eaf911e5cab1f704615f8f1ef87c8716f46 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Andrews <marka@isc.org>
|
||||
Date: Wed, 1 Oct 2014 10:01:54 +1000
|
||||
Subject: [PATCH] 3962. [bug] 'dig +topdown +trace +sigchase'
|
||||
address unhandled error conditions. [RT #34663]
|
||||
|
||||
---
|
||||
bin/dig/dighost.c | 31 ++++++++++++++++++++++++++-----
|
||||
1 file changed, 26 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
|
||||
index c99dcfc..aeded9e 100644
|
||||
--- a/bin/dig/dighost.c
|
||||
+++ b/bin/dig/dighost.c
|
||||
@@ -56,6 +56,7 @@
|
||||
#include <dns/log.h>
|
||||
#include <dns/message.h>
|
||||
#include <dns/name.h>
|
||||
+#include <dns/rcode.h>
|
||||
#include <dns/rdata.h>
|
||||
#include <dns/rdataclass.h>
|
||||
#include <dns/rdatalist.h>
|
||||
@@ -4489,6 +4490,9 @@ chase_scanname_section(dns_message_t *msg, dns_name_t *name,
|
||||
dns_rdataset_t *rdataset;
|
||||
dns_name_t *msg_name = NULL;
|
||||
|
||||
+ if (msg->counts[section] == 0)
|
||||
+ return (NULL);
|
||||
+
|
||||
do {
|
||||
dns_message_currentname(msg, section, &msg_name);
|
||||
if (dns_name_compare(msg_name, name) == 0) {
|
||||
@@ -5297,6 +5301,20 @@ sigchase_td(dns_message_t *msg)
|
||||
isc_boolean_t have_answer = ISC_FALSE;
|
||||
isc_boolean_t true = ISC_TRUE;
|
||||
|
||||
+ if (msg->rcode != dns_rcode_noerror &&
|
||||
+ msg->rcode != dns_rcode_nxdomain) {
|
||||
+ char buf[20];
|
||||
+ isc_buffer_t b;
|
||||
+
|
||||
+ isc_buffer_init(&b, buf, sizeof(buf));
|
||||
+ result = dns_rcode_totext(msg->rcode, &b);
|
||||
+ check_result(result, "dns_rcode_totext failed");
|
||||
+ printf("error response code %.*s\n",
|
||||
+ (int)isc_buffer_usedlength(&b), buf);
|
||||
+ error_message = msg;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
|
||||
== ISC_R_SUCCESS) {
|
||||
dns_message_currentname(msg, DNS_SECTION_ANSWER, &name);
|
||||
@@ -5309,10 +5327,13 @@ sigchase_td(dns_message_t *msg)
|
||||
if (!current_lookup->trace_root_sigchase) {
|
||||
result = dns_message_firstname(msg,
|
||||
DNS_SECTION_AUTHORITY);
|
||||
- if (result == ISC_R_SUCCESS)
|
||||
- dns_message_currentname(msg,
|
||||
- DNS_SECTION_AUTHORITY,
|
||||
- &name);
|
||||
+ if (result != ISC_R_SUCCESS) {
|
||||
+ printf("no answer or authority section\n");
|
||||
+ error_message = msg;
|
||||
+ return;
|
||||
+ }
|
||||
+ dns_message_currentname(msg, DNS_SECTION_AUTHORITY,
|
||||
+ &name);
|
||||
chase_nsrdataset
|
||||
= chase_scanname_section(msg, name,
|
||||
dns_rdatatype_ns,
|
||||
@@ -5322,7 +5343,7 @@ sigchase_td(dns_message_t *msg)
|
||||
if (chase_nsrdataset != NULL) {
|
||||
have_delegation_ns = ISC_TRUE;
|
||||
printf("no response but there is a delegation"
|
||||
- " in authority section:");
|
||||
+ " in authority section: ");
|
||||
dns_name_print(name, stdout);
|
||||
printf("\n");
|
||||
} else {
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
Loading…
Reference in New Issue