1930. [port] HPUX: ia64 support. [RT #15473]

1929.   [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.

diff --git a/CHANGES b/CHANGES
index 6f7cb3480961a1033e44be5fcf77d76cff27a415..ff78f7576eb7b690f0d8f5d61ed7f154c4604bee 100644 (file)
--- 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 35bc7467d8e863e2ec348ea97873d6b1113541f0..97c4fb3140bc05103a3ad098cb646d41a86e69aa 100644 (file)
--- 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 2bf523812cce2d0923b3516a868a0c183b5d2382..c7b16834b7d1e4c3491b2c2b57c70d3f27faa398 100644 (file)
--- 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 <config.h>
 
@@ -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 8823a7a01ef08a980d41a204eb3b5b1b1a8db329..477fa74e75d313cbb2eb3a381305b8d2ae18fbec 100644 (file)
--- 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 <config.h>
 
@@ -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 efea8c0fe46bb58641021e7e3b9f99e518cbee08..e947467e5d0040c4d6f2ce9fdd48f3be74c81409 100644 (file)
--- 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 882dab8fd89d1ab8931d866c836e95b35820f48d..e3002a386a47ff0d0c84a551db954178a44d4017 100644 (file)
--- 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 540558fa73b783afdd9950def8c795ac5275eebc..520d320cbc8c2ec4e393bdd680c186ad8516142c 100644 (file)
--- 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"