Commit 8194daab authored by Thomas Markwalder's avatar Thomas Markwalder

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

    Merges in rt48072.
parent b1ed27b9
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment