Commit fcaf8099 authored by Lamont Jones's avatar Lamont Jones

migrate quilt patches from 9.9.5 branch

parent eecd869b
*.vcxproj.in eol=crlf
debian/patches
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -152,8 +152,6 @@ options {\n\
lame-ttl 600;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-cache-ttl 604800; /* 1 week */\n\
min-ncache-ttl 0; /* 0 hours */\n\
min-cache-ttl 0; /* 0 seconds */\n\
transfer-format many-answers;\n\
max-cache-size 0;\n\
check-names master fail;\n\
......
......@@ -43,7 +43,6 @@
#include <isccc/result.h>
#include <dns/dispatch.h>
#include <dns/dynamic_db.h>
#include <dns/name.h>
#include <dns/result.h>
#include <dns/view.h>
......@@ -765,6 +764,14 @@ create_managers(void) {
ISC_LOG_INFO, "using up to %u sockets", socks);
}
result = isc_entropy_create(ns_g_mctx, &ns_g_entropy);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_entropy_create() failed: %s",
isc_result_totext(result));
return (ISC_R_UNEXPECTED);
}
result = isc_hash_create(ns_g_mctx, ns_g_entropy, DNS_NAME_MAXWIRE);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
......@@ -934,21 +941,6 @@ setup(void) {
}
#endif
result = isc_entropy_create(ns_g_mctx, &ns_g_entropy);
if (result != ISC_R_SUCCESS)
ns_main_earlyfatal("isc_entropy_create() failed: %s",
isc_result_totext(result));
/*
* DST may load additional libraries, which must be done before
* chroot
*/
result = dst_lib_init2(ns_g_mctx, ns_g_entropy,
ns_g_engine, ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS)
ns_main_earlyfatal("dst_lib_init2() failed: %s",
isc_result_totext(result));
#ifdef ISC_PLATFORM_USETHREADS
/*
* Check for the number of cpu's before ns_os_chroot().
......@@ -1125,12 +1117,6 @@ cleanup(void) {
ns_builtin_deinit();
dst_lib_destroy();
isc_entropy_detach(&ns_g_entropy);
if (ns_g_fallbackentropy != NULL)
isc_entropy_detach(&ns_g_fallbackentropy);
/*
* Add calls to unregister sdb drivers here.
*/
......
......@@ -68,7 +68,6 @@
#include <dns/db.h>
#include <dns/dispatch.h>
#include <dns/dlz.h>
#include <dns/dynamic_db.h>
#include <dns/dns64.h>
#include <dns/forward.h>
#include <dns/journal.h>
......@@ -1135,8 +1134,6 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) {
#endif /* DNS_RDATASET_FIXED */
else if (!strcasecmp(str, "random"))
mode = DNS_RDATASETATTR_RANDOMIZE;
else if (!strcasecmp(str, "random_1"))
mode = DNS_RDATASETATTR_RANDOMIZE|DNS_RDATASETATTR_SINGLE;
else if (!strcasecmp(str, "cyclic"))
mode = 0;
else
......@@ -1311,72 +1308,6 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
return (result);
}
static isc_result_t
configure_dynamic_db(const cfg_obj_t *dynamic_db, isc_mem_t *mctx,
const dns_dyndb_arguments_t *dyndb_args)
{
isc_result_t result;
const cfg_obj_t *obj;
const cfg_obj_t *options;
const cfg_listelt_t *element;
const char *name;
const char *libname;
const char **argv = NULL;
unsigned int i;
unsigned int len;
/* Get the name of the database. */
obj = cfg_tuple_get(dynamic_db, "name");
name = cfg_obj_asstring(obj);
/* Get options. */
options = cfg_tuple_get(dynamic_db, "options");
/* Get library name. */
obj = NULL;
CHECK(cfg_map_get(options, "library", &obj));
libname = cfg_obj_asstring(obj);
/* Create a list of arguments. */
obj = NULL;
result = cfg_map_get(options, "arg", &obj);
if (result == ISC_R_NOTFOUND)
len = 0;
else if (result == ISC_R_SUCCESS)
len = cfg_list_length(obj, isc_boolean_false);
else
goto cleanup;
/* Account for the last terminating NULL. */
len++;
argv = isc_mem_allocate(mctx, len * sizeof(const char *));
if (argv == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup;
}
for (element = cfg_list_first(obj), i = 0;
element != NULL;
element = cfg_list_next(element), i++)
{
REQUIRE(i < len);
obj = cfg_listelt_value(element);
argv[i] = cfg_obj_asstring(obj);
}
REQUIRE(i < len);
argv[i] = NULL;
CHECK(dns_dynamic_db_load(libname, name, mctx, argv, dyndb_args));
cleanup:
if (argv != NULL)
isc_mem_free(mctx, argv);
return result;
}
static isc_result_t
disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
isc_result_t result;
......@@ -2413,7 +2344,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
const cfg_obj_t *dlz;
unsigned int dlzargc;
char **dlzargv;
const cfg_obj_t *dynamic_db_list;
const cfg_obj_t *disabled;
const cfg_obj_t *obj;
#ifdef ENABLE_FETCHLIMIT
......@@ -2878,18 +2808,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
if (view->maxncachettl > 7 * 24 * 3600)
view->maxncachettl = 7 * 24 * 3600;
obj = NULL;
result = ns_config_get(maps, "min-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->mincachettl = cfg_obj_asuint32(obj);
obj = NULL;
result = ns_config_get(maps, "min-ncache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->minncachettl = cfg_obj_asuint32(obj);
if (view->minncachettl > 7 * 24 * 3600)
view->minncachettl = 7 * 24 * 3600;
/*
* Configure the view's cache.
*
......@@ -3779,37 +3697,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
} else
dns_view_setrootdelonly(view, ISC_FALSE);
/*
* Configure dynamic databases.
*/
dynamic_db_list = NULL;
if (voptions != NULL)
(void)cfg_map_get(voptions, "dynamic-db", &dynamic_db_list);
else
(void)cfg_map_get(config, "dynamic-db", &dynamic_db_list);
element = cfg_list_first(dynamic_db_list);
if (element != NULL) {
dns_dyndb_arguments_t *args;
args = dns_dyndb_arguments_create(mctx);
if (args == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup;
}
dns_dyndb_set_view(args, view);
dns_dyndb_set_zonemgr(args, ns_g_server->zonemgr);
dns_dyndb_set_task(args, ns_g_server->task);
dns_dyndb_set_timermgr(args, ns_g_timermgr);
while (element != NULL) {
obj = cfg_listelt_value(element);
CHECK(configure_dynamic_db(obj, mctx, args));
element = cfg_list_next(element);
}
dns_dyndb_arguments_destroy(mctx, args);
}
/*
* Setup automatic empty zones. If recursion is off then
* they are disabled by default.
......@@ -5556,7 +5443,6 @@ load_configuration(const char *filename, ns_server_t *server,
cfg_aclconfctx_detach(&ns_g_aclconfctx);
CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
dns_dynamic_db_cleanup(ISC_FALSE);
/*
* Parse the global default pseudo-config file.
*/
......@@ -6785,8 +6671,6 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
dns_view_detach(&view);
}
dns_dynamic_db_cleanup(ISC_TRUE);
while ((nsc = ISC_LIST_HEAD(server->cachelist)) != NULL) {
ISC_LIST_UNLINK(server->cachelist, nsc, link);
dns_cache_detach(&nsc->cache);
......@@ -7027,6 +6911,8 @@ ns_server_destroy(ns_server_t **serverp) {
if (server->tkeyctx != NULL)
dns_tkeyctx_destroy(&server->tkeyctx);
dst_lib_destroy();
isc_event_free(&server->reload_event);
INSIST(ISC_LIST_EMPTY(server->viewlist));
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -54,7 +54,6 @@ options {
memstatistics-file "named.memstats"; // _PATH_MEMSTATS
max-cache-ttl 999;
min-cache-ttl 666;
auth-nxdomain yes; // always set AA on NXDOMAIN.
// don't set this to 'no' unless
// you know what you're doing -- older
......@@ -156,7 +155,6 @@ options {
min-refresh-time 777;
max-ncache-ttl 333;
min-ncache-ttl 222;
min-roots 15;
serial-queries 34;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
[Unit]
Description=local BIND via resolvconf
Documentation=man:named(8) man:resolvconf(8)
Requires=bind9.service
After=bind9.service
ConditionFileIsExecutable=/sbin/resolvconf
[Service]
ExecStart=/bin/sh -c 'echo nameserver 127.0.0.1 | /sbin/resolvconf -a lo.named'
ExecStop=/sbin/resolvconf -d lo.named
[Install]
WantedBy=bind9.service
[Unit]
Description=BIND Domain Name Server
Documentation=man:named(8)
After=network.target
[Service]
ExecStart=/usr/sbin/named -f -u bind
ExecReload=/usr/sbin/rndc reload
ExecStop=/usr/sbin/rndc stop
[Install]
WantedBy=multi-user.target
d /run/named 0775 root bind - -
......@@ -192,9 +192,6 @@ int sigwait(const unsigned int *set, int *sig);
MSVC and with C++ compilers. */
#undef FLEXIBLE_ARRAY_MEMBER
/* Defined if GeoIP supports IPv6 lookups */
#undef GEOIP_V6
/* Define to 1 if you have the `chroot' function. */
#undef HAVE_CHROOT
......@@ -528,9 +525,6 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if you want GeoIP support. */
#undef SUPPORT_GEOIP
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
......
This diff is collapsed.
......@@ -441,7 +441,7 @@ case "$host" in
# as it breaks how the two halves (Basic and Advanced) of the IPv6
# Socket API were designed to be used but we have to live with it.
# Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
*-linux* | *-gnu*)
*-linux* | *-kfreebsd*-gnu*)
STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;;
......@@ -1202,7 +1202,7 @@ then
# LinuxThreads requires some changes to the way we
# deal with signals.
#
*-linux*|*-kfreebsd*-gnu)
*-linux*)
AC_DEFINE(HAVE_LINUXTHREADS)
;;
#
......
This diff is collapsed.
This diff is collapsed.
Author: LaMont Jones <lamont@debian.org>
# Add extensions to version
--- a/version
+++ b/version
@@ -8,4 +8,4 @@
PATCHVER=3
RELEASETYPE=-P
RELEASEVER=2
-EXTENSIONS=
+EXTENSIONS="$(dpkg-parsechangelog | sed -n '/^Version/s/[^-]*//p')-$(dpkg-vendor --query Vendor)"
Author: Julien Cristau <jcristau@falla.debian.org>, others
Date: Thu Apr 24 10:45:02 2014 -0600
FTBFS on kfreebsd.
Addresses-Debian-Bug: 741285
Signed-off-by: LaMont Jones <lamont@debian.org>
--- a/configure.in
+++ b/configure.in
@@ -1202,7 +1202,7 @@
# LinuxThreads requires some changes to the way we
# deal with signals.
#
- *-linux*)
+ *-linux*|*-kfreebsd*-gnu)
AC_DEFINE(HAVE_LINUXTHREADS)
;;
#
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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