From: Mark Andrews Date: Fri, 14 Oct 2005 01:37:53 +0000 (+0000) Subject: 1930. [port] HPUX: ia64 support. [RT #15473] X-Git-Tag: v9.2.6b2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c728311186528b99673eb44316d135d1ddf3367b;p=thirdparty%2Fbind9.git 1930. [port] HPUX: ia64 support. [RT #15473] 1929. [port] FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM. --- diff --git a/CHANGES b/CHANGES index 6f7cb348096..ff78f7576eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ --- 9.2.6b2 released --- +1930. [port] HPUX: ia64 support. [RT #15473] + +1929. [port] FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM. + 1926. [bug] BINDinstall was being installed in the wrong place. [RT #15483] diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 35bc7467d8e..97c4fb3140b 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.221.2.28 2005/09/01 03:15:38 marka Exp $ */ +/* $Id: dighost.c,v 1.221.2.29 2005/10/14 01:37:48 marka Exp $ */ /* * Notice to programmers: Do not use this code as an example of how to @@ -1753,7 +1753,7 @@ send_udp(dig_query_t *query) { */ static void connect_timeout(isc_task_t *task, isc_event_t *event) { - dig_lookup_t *l=NULL, *n; + dig_lookup_t *l=NULL; dig_query_t *query=NULL, *cq; UNUSED(task); @@ -1789,7 +1789,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) { debug("making new TCP request, %d tries left", l->retries); l->retries--; - n = requeue_lookup(l, ISC_TRUE); + requeue_lookup(l, ISC_TRUE); cancel_lookup(l); check_next_lookup(l); } @@ -2587,8 +2587,8 @@ get_addresses(const char *hostname, in_port_t port, REQUIRE(addrcount != NULL); REQUIRE(addrsize > 0); - have_ipv4 = (isc_net_probeipv4() == ISC_R_SUCCESS); - have_ipv6 = (isc_net_probeipv6() == ISC_R_SUCCESS); + have_ipv4 = ISC_TF(isc_net_probeipv4() == ISC_R_SUCCESS); + have_ipv6 = ISC_TF(isc_net_probeipv6() == ISC_R_SUCCESS); /* * Try IPv4, then IPv6. In order to handle the extended format diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 2bf523812cc..c7b16834b7d 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signzone.c,v 1.139.2.8 2005/03/17 03:59:29 marka Exp $ */ +/* $Id: dnssec-signzone.c,v 1.139.2.9 2005/10/14 01:37:48 marka Exp $ */ #include @@ -1412,7 +1412,6 @@ loadzonepubkeys(dns_db_t *db) { result = dns_rdataset_first(&rdataset); check_result(result, "dns_rdataset_first"); while (result == ISC_R_SUCCESS) { - pubkey = NULL; dns_rdata_reset(&rdata); dns_rdataset_current(&rdataset, &rdata); result = dns_dnssec_keyfromrdata(gorigin, &rdata, mctx, diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c index 8823a7a01ef..477fa74e75d 100644 --- a/bin/named/xfrout.c +++ b/bin/named/xfrout.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrout.c,v 1.101.2.8 2004/04/15 01:38:05 marka Exp $ */ +/* $Id: xfrout.c,v 1.101.2.9 2005/10/14 01:37:49 marka Exp $ */ #include @@ -866,7 +866,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename, const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6); static void -xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...) +xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); /**************************************************************************/ @@ -1701,7 +1701,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename, * Logging function for use when there is a xfrout_ctx_t. */ static void -xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...) { +xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); xfrout_logv(xfr->client, xfr->qname, xfr->qclass, level, fmt, ap); diff --git a/configure.in b/configure.in index efea8c0fe46..e947467e5d0 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.294.2.51 $) +AC_REVISION($Revision: 1.294.2.52 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -573,7 +573,11 @@ then *-freebsd*) AC_CHECK_LIB(c_r, sigwait, AC_DEFINE(HAVE_SIGWAIT),) case $host in - *-freebsd5.3|*-freebsd5.3.*) + *-freebsd5.[[012]]|*-freebsd5.[[012]].*);; + *-freebsd5.[[3456789]]|*-freebsd5.[[3456789]].*) + AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM) + ;; + *-freebsd6.*) AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM) ;; esac @@ -726,7 +730,7 @@ else ;; *) # Turn off the pointlessly noisy warnings. - STD_CWARNINGS="+w1 +W 474,530" + STD_CWARNINGS="+w1 +W 474,530,2193,2236" ;; esac CCOPT="$CCOPT -Ae -z" diff --git a/lib/bind/configure b/lib/bind/configure index 882dab8fd89..e3002a386a4 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -6423,7 +6423,7 @@ else ;; *) # Turn off the pointlessly noisy warnings. - STD_CWARNINGS="+w1 +W 474,530,2193" + STD_CWARNINGS="+w1 +W 474,530,2193,2236" ;; esac CCOPT="$CCOPT -Ae -z" diff --git a/lib/bind/configure.in b/lib/bind/configure.in index 540558fa73b..520d320cbc8 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.83.2.26 $) +AC_REVISION($Revision: 1.83.2.27 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -533,7 +533,7 @@ else ;; *) # Turn off the pointlessly noisy warnings. - STD_CWARNINGS="+w1 +W 474,530,2193" + STD_CWARNINGS="+w1 +W 474,530,2193,2236" ;; esac CCOPT="$CCOPT -Ae -z"