[master] Added includes of new BIND9 compatibility headers, updated util/bind.sh

    Merges in rt48072.

diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
index 75a87ff6ebb886fcd9b419ec9cd1ab73f3ce30c9..538b927f33372fd0124b048fa9d11f8c80bdadd6 100644 (file)
--- a/includes/omapip/isclib.h
+++ b/includes/omapip/isclib.h
@@ -48,6 +48,9 @@
 #include <string.h>
 #include <netdb.h>
 
+#include <isc/boolean.h>
+#include <isc/int.h>
+
 #include <isc/buffer.h>
 #include <isc/lex.h>
 #include <isc/lib.h>

diff --git a/includes/omapip/result.h b/includes/omapip/result.h
index 91243e1bceab58b45e291f7649ff53d8f9d5482b..860298f64941fbbb8420896498bb5c928e50a2fe 100644 (file)
--- a/includes/omapip/result.h
+++ b/includes/omapip/result.h
@@ -26,6 +26,7 @@
 #ifndef DHCP_RESULT_H
 #define DHCP_RESULT_H 1
 
+#include <isc/boolean.h>
 #include <isc/lang.h>
 #include <isc/resultclass.h>
 #include <isc/types.h>

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index a7110f982f878fbf357ddfe5afd11a2a5a388b60..cde4f61789b89bed18164061f0c67f674d8bce11 100644 (file)
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
                                  shared_name,
                                  inet_ntop(AF_INET6, &lease->addr,
                                            tmp_addr, sizeof(tmp_addr)),
-                                 used, count);
+                                 (long long unsigned)(used),
+                                 (long long unsigned)(count));
                }
                return;
        }
@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
                  "address: %s; high threshold %d%% %llu/%llu.",
                  shared_name,
                  inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
-                 poolhigh, used, count);
+                 poolhigh, (long long unsigned)(used),
+                 (long long unsigned)(count));
 
        /* handle the low threshold now, if we don't
         * have one we default to 0. */
@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
                log_debug("Unable to pick client address: "
                          "no addresses available  - shared network %s: "
                          " 2^64-1 < total, %llu active,  %llu abandoned",
-                         shared_name, active - abandoned, abandoned);
+                         shared_name, (long long unsigned)(active - abandoned),
+                         (long long unsigned)(abandoned));
        } else {
                log_debug("Unable to pick client address: "
                          "no addresses available  - shared network %s: "
                          "%llu total, %llu active,  %llu abandoned",
-                         shared_name, total, active - abandoned, abandoned);
+                         shared_name, (long long unsigned)(total),
+                         (long long unsigned)(active - abandoned),
+                         (long long unsigned)(abandoned));
        }
 
        return ISC_R_NORESOURCES;

diff --git a/util/bind.sh b/util/bind.sh
index 4e986ea0a68daf23e64ad07e0d0535232ddd6dc6..b813044afd59325aedb4687af55bc01127d125bd 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -27,11 +27,20 @@
 
 topdir=`pwd`
 binddir=$topdir/bind
-remote=--remote=repo.isc.org:/proj/git/prod/bind9.git
+
+# repo_host and repo_path are used together to from urls for wget calls
+# to fetch the version and kit.sh files, and then also as the --remote
+# argument passed into kit.sh
+repo_host="gitlab.isc.org"
+repo_path="isc-projects/bind9"
 
 case "${1:-}" in
---remote=*)
-        remote="${1}";
+--repo_host=*)
+        repo_host="${1}";
+        shift
+        ;;
+--repo_path=*)
+        repo_path="${1}";
         shift
         ;;
 esac
@@ -95,7 +104,7 @@ case $# in
           ;;
        esac
        ;;
-    *) echo "usage: sh bind.sh [--remote=<path>] [<branch>|<version>]" >&2
+    *) echo "usage: sh bind.sh [--repo_host=<host>] [--repo_path=<project path>] [<branch>|<version>]" >&2
        exit 1
        ;;
 esac
@@ -119,18 +128,27 @@ else
        cd $binddir
 
        # Get the bind version file and move it to version.tmp
-       git archive --format tar $remote $BINDTAG version | tar xf -
+    wget https://$repo_host/$repo_path/raw/$BINDTAG/version
        mv version version.tmp
+    if [ $? -ne 0 ]
+    then
+        echo "Fetch of version file failed"
+        exit -1
+    fi
 
        # Get the bind release kit shell script
-       git archive --format tar $remote master:util/ | tar xf - kit.sh
+    wget https://$repo_host/$repo_path/raw/master/util/kit.sh
+    if [ $? -ne 0 ]
+    then
+        echo "Fetch of kit.sh failed"
+        exit -1
+    fi
 
        # Create the bind tarball, which has the side effect of
        # setting up the bind directory we will use for building
        # the libraries
        echo Creating tarball for $BINDTAG
-       sh kit.sh $remote $SNAP $BINDTAG $binddir
-
+       sh kit.sh --remote="git@$repo_host:$repo_path.git" $SNAP $BINDTAG $binddir
        . ./version.tmp
 
        version=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}