From: Francis Dupont Date: Thu, 8 Feb 2018 15:02:48 +0000 (+0100) Subject: [master] Finishing merge of trac5494 (Cassandra vs macOS) X-Git-Tag: trac5524_base X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51fd66d364fab2da37fc12557b78bf9863df78d3;p=thirdparty%2Fkea.git [master] Finishing merge of trac5494 (Cassandra vs macOS) --- 51fd66d364fab2da37fc12557b78bf9863df78d3 diff --cc ChangeLog index e4460f7036,08d36b4849..20a56252e3 --- a/ChangeLog +++ b/ChangeLog @@@ -1,83 -1,3 +1,91 @@@ ++1358. [build,bug] fdupont ++ Cassandra build fixes for macOS. ++ (Trac #5494, git xxx) ++ ++1357. [bug] rcgoodfellow ++ Fixed bug in kea-admon causing error on lease-dump. ++ (github #61, git xxx) ++ +1356. [func] andreipavelQ,tomek + The logging configuration is now applied early, which helps + seeing errors in case the new configuration is faulty. + (github #41, git d77fbec5a003a69cab207aa741133015f2657878) + +1355. [build] andreipavelQ + --with-dhcp-mysql renamed to --with-mysql and + --with-dhcp-pgsql renamed to --with-pgsql. These names were + leftovers from old BIND10 times when Kea was part of bigger + solution that also provided DNS services. Kea is now a stand-alone + software, thus the -dhcp- doesn't make sense in those options any + more. + (github #40, git 318c9e3d3db9bb938ced27932d8401172529a2ff) + +1354. [doc] andreipavelQ + Documentation has been upgraded to DocBook 5.0. + (github #39, git 9b6705bd6c534128ec18820ff0cbdd72b7fce9e9) + +1353. [func] tomek + Lightweight 4over6 options reinstantiated. Definitions for DHCPv6 + options 89 through 96 were added back. DHCPv4 v4 Parameters Option + 159 has its definition tweaked slightly. + (Trac #5514, git 6a4aac2b3bfffe41460db6d1cd3c55b1430aa50c) + +1352. [build] andrei + Support for coverage tests has been improved. + (Github #43, git 1949bb3abf71fb3997044d239eb683095166c39f) + +1351. [build,bug] andrei, razvan + Various small changes and bugfixes. Thank you to Andrei Pavel + and Razvan Becheriu for submitting their patch. + (Github #54, git 2efa7494228a1797dff8d9d74107a452c61e2386) + +1350. [func] fdupont + It is now possible to specify client classification restrictions + on per pool basis. This capability will be useful for grouping + certain types of devices into specific address and/or prefix + pools. + (Trac #5425, git 5f3a89d6e32e90cd9cbb2347c7b2208c3e1561e0) + +1349. [build] andreipavelQ + Compilation parameters unified (every file now includes config.h, + several makefile tweaks). + (Github #38, git 7206aa79c57be7466c4ab3dd558663c6c4f858b7) + +1348. [func] fdupont + Several hook points now support next step status DROP. This allows + more flexibility with dropping packets from within hooks. + (Trac #5443, git ff22a906915a34df327174f550f69a396a05bb2c) + +1347. [func] marcin + Implemented HTTP client classes in libkea-http. + (Trac #5451, git 94267e252b372650e4235389251b49d6f5501322) + +1346. [build] fdupont + Modified configure.ac to include premium module m4 macros, if the + module is present. Prior to this it relied on premium having it's + own configure.ac script. + (Trac #5400, git 38c4f2fb8fc8c8874a0e4671cc295a049acf675f) + +1345. [build] fdupont + Added support of boost 1.66.0 ASIO. + (Github #60/Trac #5496, git bc2947de4296bd99b74e50e65f272c7ad5312429) + +1344. [func] marcin + Implemented lease4-get-all command in lease_cmds hooks library. + (Trac #5468, git a378ec28489e98df64830d1f26c3bebd20e256b2) + +1343. [func] marcin + Implemented "force-create" parameter for lease4-update and + lease6-update commands. + (Trac #5472, git 369245e4c5308a701fd483123f2cb2fd7d3d0966) + +1342. [func] andrei, razvan + Support for host reservations stored in Cassandra added. The core + functionality was added. There are some limitations (delete, + client classes, fixed DHCPv4 fields, statistics recount, etc.) + These will be addressed in upcoming tickets. + (github #37, git e37606fd2d0c02234a55f7445c52a12b2e7a82ec) + 1343. [func] fdupont User-context and comments are now supported in many new scopes: global, shared-network, subnet, pool, host reservation, option, diff --cc doc/guide/install.xml index c858cb7f76,a520486a4e..5cf88fb8f4 --- a/doc/guide/install.xml +++ b/doc/guide/install.xml @@@ -524,12 -518,12 +524,12 @@@ Debian and Ubuntu Build and install Kea as described in , with the following modification. To enable the MySQL database code, at the - "configure" step (see ), the --with-dhcp-mysql switch + "configure" step (see ), the --with-mysql switch should be specified: - ./configure [other-options] --with-dhcp-mysql + ./configure [other-options] --with-mysql - If MySQL was not installed in the default location, the location of the MySQL + If MySQL was not installed in the default location, the location of the MySQL configuration program "mysql_config" should be included with the switch, i.e. - ./configure [other-options] --with-dhcp-mysql=path-to-mysql_config + ./configure [other-options] --with-mysql=path-to-mysql_config See for details regarding @@@ -546,12 -540,12 +546,12 @@@ Build and install Kea as described in , with the following modification. To enable the PostgreSQL database code, at the - "configure" step (see ), the --with-dhcp-pgsql switch + "configure" step (see ), the --with-pgsql switch should be specified: - ./configure [other-options] --with-dhcp-pgsql + ./configure [other-options] --with-pgsql - If PostgreSQL was not installed in the default location, the location of the PostgreSQL + If PostgreSQL was not installed in the default location, the location of the PostgreSQL configuration program "pg_config" should be included with the switch, i.e. - ./configure [other-options] --with-dhcp-pgsql=path-to-pg_config + ./configure [other-options] --with-pgsql=path-to-pg_config See for details regarding diff --cc src/bin/admin/admin-utils.sh index 33616d9a90,464cc22ab7..2a9d4dccf8 --- a/src/bin/admin/admin-utils.sh +++ b/src/bin/admin/admin-utils.sh @@@ -1,4 -1,4 +1,4 @@@ --# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") ++# Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@@ -140,8 -126,9 +140,9 @@@ cql_execute_script() } cql_version() { - version=$(cql_execute "SELECT version, minor FROM schema_version" "$@") - error=$? - version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 | tr "|" ".") - echo "$version" - return $error + version=$(cql_execute "SELECT version, minor FROM schema_version" "$@") - version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 --output-delimiter=".") - echo "${version}" - return $? ++ error=$? ++ version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 | tr "|" ".") ++ echo "$version" ++ return $error }