Update kea to version 1.8.0
update kea to version 1.8.0 changes are to many to mention
This commit is contained in:
Niclas Rosenvik
parent
83776c82e9
commit
6c1095d06b
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD$
|
||||
|
||||
DISTNAME= kea-1.6.1
|
||||
DISTNAME= kea-1.8.0
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= https://downloads.isc.org/isc/kea/${PKGVERSION_NOREV}/
|
||||
MASTER_SITES+= ftp://ftp.isc.org/isc/kea/${PKGVERSION_NOREV}/
|
||||
|
|
|
|||
46
kea/PLIST
46
kea/PLIST
|
|
@ -138,6 +138,7 @@ include/kea/dhcpsrv/cfg_hosts.h
|
|||
include/kea/dhcpsrv/cfg_hosts_util.h
|
||||
include/kea/dhcpsrv/cfg_iface.h
|
||||
include/kea/dhcpsrv/cfg_mac_source.h
|
||||
include/kea/dhcpsrv/cfg_multi_threading.h
|
||||
include/kea/dhcpsrv/cfg_option.h
|
||||
include/kea/dhcpsrv/cfg_option_def.h
|
||||
include/kea/dhcpsrv/cfg_rsoo.h
|
||||
|
|
@ -189,6 +190,7 @@ include/kea/dhcpsrv/parsers/expiration_config_parser.h
|
|||
include/kea/dhcpsrv/parsers/host_reservation_parser.h
|
||||
include/kea/dhcpsrv/parsers/host_reservations_list_parser.h
|
||||
include/kea/dhcpsrv/parsers/ifaces_config_parser.h
|
||||
include/kea/dhcpsrv/parsers/multi_threading_config_parser.h
|
||||
include/kea/dhcpsrv/parsers/option_data_parser.h
|
||||
include/kea/dhcpsrv/parsers/sanity_checks_parser.h
|
||||
include/kea/dhcpsrv/parsers/shared_network_parser.h
|
||||
|
|
@ -198,6 +200,7 @@ include/kea/dhcpsrv/parsers/simple_parser6.h
|
|||
${PLIST.pgsql}include/kea/dhcpsrv/pgsql_host_data_source.h
|
||||
${PLIST.pgsql}include/kea/dhcpsrv/pgsql_lease_mgr.h
|
||||
include/kea/dhcpsrv/pool.h
|
||||
include/kea/dhcpsrv/resource_handler.h
|
||||
include/kea/dhcpsrv/sanity_checker.h
|
||||
include/kea/dhcpsrv/shared_network.h
|
||||
include/kea/dhcpsrv/srv_config.h
|
||||
|
|
@ -363,6 +366,7 @@ include/kea/util/io_utilities.h
|
|||
include/kea/util/labeled_value.h
|
||||
include/kea/util/memory_segment.h
|
||||
include/kea/util/memory_segment_local.h
|
||||
include/kea/util/multi_threading_mgr.h
|
||||
include/kea/util/optional.h
|
||||
include/kea/util/pid_file.h
|
||||
include/kea/util/pointer_util.h
|
||||
|
|
@ -370,18 +374,21 @@ include/kea/util/process_spawn.h
|
|||
include/kea/util/random/qid_gen.h
|
||||
include/kea/util/random/random_number_generator.h
|
||||
include/kea/util/range_utilities.h
|
||||
include/kea/util/readwrite_mutex.h
|
||||
include/kea/util/signal_set.h
|
||||
include/kea/util/staged_value.h
|
||||
include/kea/util/state_model.h
|
||||
include/kea/util/stopwatch.h
|
||||
include/kea/util/stopwatch_impl.h
|
||||
include/kea/util/strutil.h
|
||||
include/kea/util/threads/sync.h
|
||||
include/kea/util/threads/thread.h
|
||||
include/kea/util/threads/watched_thread.h
|
||||
include/kea/util/thread_pool.h
|
||||
include/kea/util/time_utilities.h
|
||||
include/kea/util/unlock_guard.h
|
||||
include/kea/util/versioned_csv_file.h
|
||||
include/kea/util/watch_socket.h
|
||||
include/kea/util/watched_thread.h
|
||||
lib/kea/hooks/libdhcp_bootp.la
|
||||
lib/kea/hooks/libdhcp_flex_option.la
|
||||
lib/kea/hooks/libdhcp_ha.la
|
||||
lib/kea/hooks/libdhcp_lease_cmds.la
|
||||
${PLIST.mysql}lib/kea/hooks/libdhcp_mysql_cb.la
|
||||
|
|
@ -405,18 +412,27 @@ ${PLIST.mysql}lib/libkea-mysql.la
|
|||
${PLIST.pgsql}lib/libkea-pgsql.la
|
||||
lib/libkea-process.la
|
||||
lib/libkea-stats.la
|
||||
lib/libkea-threads.la
|
||||
lib/libkea-util-io.la
|
||||
lib/libkea-util.la
|
||||
${PYSITELIB}/kea/kea_conn.pyo
|
||||
${PYSITELIB}/kea/kea_conn.pyc
|
||||
${PYSITELIB}/kea/kea_connector2.pyo
|
||||
${PYSITELIB}/kea/kea_connector2.pyc
|
||||
${PYSITELIB}/kea/kea_connector3.pyo
|
||||
${PYSITELIB}/kea/kea_connector3.pyc
|
||||
${PYSITELIB}/kea/kea_conn.py
|
||||
${PYSITELIB}/kea/kea_conn.pyc
|
||||
${PYSITELIB}/kea/kea_conn.pyo
|
||||
${PYSITELIB}/kea/kea_connector2.py
|
||||
${PYSITELIB}/kea/kea_connector2.pyc
|
||||
${PYSITELIB}/kea/kea_connector2.pyo
|
||||
${PYSITELIB}/kea/kea_connector3.py
|
||||
${PYSITELIB}/kea/kea_connector3.pyc
|
||||
${PYSITELIB}/kea/kea_connector3.pyo
|
||||
man/man8/kea-admin.8
|
||||
man/man8/kea-ctrl-agent.8
|
||||
man/man8/kea-dhcp-ddns.8
|
||||
man/man8/kea-dhcp4.8
|
||||
man/man8/kea-dhcp6.8
|
||||
man/man8/kea-lfc.8
|
||||
man/man8/kea-netconf.8
|
||||
man/man8/kea-shell.8
|
||||
man/man8/keactrl.8
|
||||
man/man8/perfdhcp.8
|
||||
sbin/kea-admin
|
||||
sbin/kea-ctrl-agent
|
||||
sbin/kea-dhcp-ddns
|
||||
|
|
@ -430,6 +446,7 @@ share/doc/kea/CONTRIBUTING.md
|
|||
share/doc/kea/COPYING
|
||||
share/doc/kea/ChangeLog
|
||||
share/doc/kea/README
|
||||
share/doc/kea/code_of_conduct.md
|
||||
share/doc/kea/examples/agent/comments.json
|
||||
share/doc/kea/examples/agent/simple.json
|
||||
share/doc/kea/examples/ddns/comments.json
|
||||
|
|
@ -497,18 +514,19 @@ share/doc/kea/examples/netconf/kea-dhcp6-operations/twopools.xml
|
|||
share/doc/kea/examples/netconf/kea-dhcp6-operations/twosubnets.xml
|
||||
share/doc/kea/examples/netconf/simple-dhcp4.json
|
||||
share/doc/kea/examples/netconf/simple-dhcp6.json
|
||||
share/doc/kea/platforms.rst
|
||||
share/examples/kea/kea-ctrl-agent.conf
|
||||
share/examples/kea/kea-dhcp-ddns.conf
|
||||
share/examples/kea/kea-dhcp4.conf
|
||||
share/examples/kea/kea-dhcp6.conf
|
||||
share/examples/kea/keactrl.conf
|
||||
share/examples/rc.d/kea
|
||||
share/kea/scripts/admin-utils.sh
|
||||
share/kea/scripts/cql/dhcpdb_create.cql
|
||||
share/kea/scripts/cql/dhcpdb_drop.cql
|
||||
share/kea/scripts/cql/upgrade_1.0_to_2.0.sh
|
||||
share/kea/scripts/cql/upgrade_2.0_to_3.0.sh
|
||||
share/kea/scripts/cql/upgrade_3.0_to_4.0.sh
|
||||
share/kea/scripts/cql/upgrade_4.0_to_5.0.sh
|
||||
share/kea/scripts/cql/wipe_data.sh
|
||||
share/kea/scripts/mysql/dhcpdb_create.mysql
|
||||
share/kea/scripts/mysql/dhcpdb_drop.mysql
|
||||
|
|
@ -524,6 +542,10 @@ share/kea/scripts/mysql/upgrade_6.0_to_7.0.sh
|
|||
share/kea/scripts/mysql/upgrade_7.0_to_8.0.sh
|
||||
share/kea/scripts/mysql/upgrade_8.0_to_8.1.sh
|
||||
share/kea/scripts/mysql/upgrade_8.1_to_8.2.sh
|
||||
share/kea/scripts/mysql/upgrade_8.2_to_9.0.sh
|
||||
share/kea/scripts/mysql/upgrade_9.0_to_9.1.sh
|
||||
share/kea/scripts/mysql/upgrade_9.1_to_9.2.sh
|
||||
share/kea/scripts/mysql/upgrade_9.2_to_9.3.sh
|
||||
share/kea/scripts/mysql/wipe_data.sh
|
||||
share/kea/scripts/pgsql/dhcpdb_create.pgsql
|
||||
share/kea/scripts/pgsql/dhcpdb_drop.pgsql
|
||||
|
|
@ -535,4 +557,6 @@ share/kea/scripts/pgsql/upgrade_3.2_to_3.3.sh
|
|||
share/kea/scripts/pgsql/upgrade_3.3_to_4.0.sh
|
||||
share/kea/scripts/pgsql/upgrade_4.0_to_5.0.sh
|
||||
share/kea/scripts/pgsql/upgrade_5.0_to_5.1.sh
|
||||
share/kea/scripts/pgsql/upgrade_5.1_to_6.0.sh
|
||||
share/kea/scripts/pgsql/upgrade_6.0_to_6.1.sh
|
||||
share/kea/scripts/pgsql/wipe_data.sh
|
||||
|
|
|
|||
19
kea/distinfo
19
kea/distinfo
|
|
@ -1,15 +1,16 @@
|
|||
$NetBSD$
|
||||
|
||||
SHA1 (kea-1.6.1.tar.gz) = 165ee499c40a1033d733e8a5197522562804a19b
|
||||
RMD160 (kea-1.6.1.tar.gz) = 261b0ea1bca0a70034532112011c64ad809c37ec
|
||||
SHA512 (kea-1.6.1.tar.gz) = 4220f46fc185f4434ad01886d2d43ba1f9dcca57f5afa33235c8593269220a79e2dcb4ad71298dec868444c29e7cb6febe66a1456fdc116a2d9fd3f019f740d8
|
||||
Size (kea-1.6.1.tar.gz) = 7155604 bytes
|
||||
SHA1 (kea-1.8.0.tar.gz) = ae9bc739bf58e876b61184e34fdbf6297d786e7a
|
||||
RMD160 (kea-1.8.0.tar.gz) = daff3aac1f3459a1d86007f3563e5aa39f896d61
|
||||
SHA512 (kea-1.8.0.tar.gz) = a8896ebdb6948851cddca015d696db4ec205af1472ccc25e7fd6d2f9070599cb7f80998f1dc94e763723723e8e0edd8a53274b96630d27db8c40995489d3a883
|
||||
Size (kea-1.8.0.tar.gz) = 8997516 bytes
|
||||
SHA1 (patch-Makefile.am) = 4e4896be44290114160be878666878bb44d71a8e
|
||||
SHA1 (patch-configure.ac) = e6ef32f92a70d248749e72e627d8fde11fb50805
|
||||
SHA1 (patch-src_bin_agent_agent__lexer.ll) = de64c9ad03b1c6812f95f52c8fcd5f6c1aa1ef27
|
||||
SHA1 (patch-configure.ac) = 5922054574a91b9164062a5cdd68b704e0f2d84c
|
||||
SHA1 (patch-m4macros_ax__gtest.m4) = 66d5c4c4a05e4691881b4938bcf67b99f7cf441b
|
||||
SHA1 (patch-src_bin_agent_agent__lexer.ll) = d5bc016c0939f5f4bbb391b2f588c9840f60cb96
|
||||
SHA1 (patch-src_bin_d2_d2__lexer.ll) = 400b9f54b5bb9c9eb9c52c1ef23c9a377f29960e
|
||||
SHA1 (patch-src_bin_dhcp4_dhcp4__lexer.ll) = dfcca8319ca3b6b8902676bb1662ceb9abca74bc
|
||||
SHA1 (patch-src_bin_dhcp4_tests_parser__unittest.cc) = 6f213d5abd286b57c41b6fad27ada49c9301857a
|
||||
SHA1 (patch-src_bin_dhcp4_tests_parser__unittest.cc) = bcc737988cd306f3acbd232e40874d7daa1a4c7b
|
||||
SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 6ebeb6b18dc8d86d0890ce3cfcaeea4c2658e958
|
||||
SHA1 (patch-src_bin_dhcp6_tests_parser__unittest.cc) = f671c6b5c26a6b6179971f2f10af8e2b1b8b7e6a
|
||||
SHA1 (patch-src_bin_keactrl_Makefile.am) = 5b6fd816da6011858d1167d297c83eda7947efd7
|
||||
|
|
@ -18,9 +19,9 @@ SHA1 (patch-src_lib_dhcp_Makefile.am) = 452036d0100a85f41c52562292931bea2501e396
|
|||
SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = ca4330b27adfa12b1ff6c6cc54c8c30f89f9851f
|
||||
SHA1 (patch-src_lib_dhcp_pkt__filter__inet.cc) = 32f70306483a719a8b400eff613cdbb935fe9cd0
|
||||
SHA1 (patch-src_lib_dhcp_tests_Makefile.am) = 9ee63ba82b05d02ea88e3a74183a7aa6da7b36c9
|
||||
SHA1 (patch-src_lib_dhcp_tests_iface__mgr__unittest.cc) = 8e274dbb5d9897ccd1708e4007cbe69ab2db0ef5
|
||||
SHA1 (patch-src_lib_dhcp_tests_iface__mgr__unittest.cc) = 833ce8dd4d06253a53a1ab9868fe92a5412b99ee
|
||||
SHA1 (patch-src_lib_dhcpsrv_Makefile.am) = bdd2be227d8c7f34b4329092e6de3bcaa7117284
|
||||
SHA1 (patch-src_lib_dhcpsrv_host__data__source__factory.cc) = a1bc71ec40b9eb5a6c9247360a84ce480521cad2
|
||||
SHA1 (patch-src_lib_util_encode_base__n.cc) = 61bf8402e4baf0578a7ec9444f396a9b6c69d87d
|
||||
SHA1 (patch-src_lib_dhcpsrv_timer__mgr.cc) = ccdde3264c6e80b3d971d3af96c48cffbcaee141
|
||||
SHA1 (patch-src_lib_util_signal__set.cc) = f060fcedecb8ccdda997fbef2040dab82c620cb0
|
||||
SHA1 (patch-src_lib_util_watch__socket.cc) = ab55b5e613bc431dcd92ef68bf3501a7e4aca7de
|
||||
|
|
|
|||
|
|
@ -1,20 +1,10 @@
|
|||
$NetBSD$
|
||||
|
||||
* fix typo to find googletest
|
||||
* fix compatability errors
|
||||
|
||||
--- configure.ac.orig 2019-11-19 14:50:46.000000000 +0000
|
||||
--- configure.ac.orig 2020-08-24 16:36:40.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -1148,7 +1148,7 @@ if test "x$enable_gtest" = "xyes" ; then
|
||||
GTEST_FOUND="false"
|
||||
for dir in $GTEST_PATHS; do
|
||||
if test -f "$dir/include/gtest/gtest.h"; then
|
||||
- if ! test -f "$dir/lib/libgtests.a"; then
|
||||
+ if ! test -f "$dir/lib/libgtest.a"; then
|
||||
AC_MSG_WARN([Found Google Test include but not the library in $dir.])
|
||||
continue
|
||||
fi
|
||||
@@ -1391,7 +1391,7 @@ if test "x$enable_generate_parser" != "x
|
||||
@@ -1298,7 +1298,7 @@ if test "x$enable_generate_parser" != "x
|
||||
AC_MSG_ERROR([Flex is required for enable-generate-parser, but was not found])
|
||||
fi
|
||||
|
||||
|
|
@ -23,7 +13,7 @@ $NetBSD$
|
|||
AC_MSG_ERROR([Bison is required for enable-generate-parser, but was not found])
|
||||
fi
|
||||
|
||||
@@ -1515,7 +1515,7 @@ if test "x$enable_generate_docs" != xno
|
||||
@@ -1422,7 +1422,7 @@ if test "x$enable_generate_docs" != xno
|
||||
|
||||
if test -z "$PDFLATEX"; then
|
||||
PDFLATEX=no
|
||||
|
|
@ -32,3 +22,12 @@ $NetBSD$
|
|||
AC_MSG_CHECKING([for pdflatex])
|
||||
AC_MSG_RESULT([no (disabled)])
|
||||
else
|
||||
@@ -1472,7 +1472,7 @@ else
|
||||
fi
|
||||
generate_docs_report="no"
|
||||
fi
|
||||
-AM_CONDITIONAL(INSTALL_MANS, test "x$install_mans" == "xyes")
|
||||
+AM_CONDITIONAL(INSTALL_MANS, test "x$install_mans" = "xyes")
|
||||
AM_CONDITIONAL(HAVE_PDFLATEX, test "x$PDFLATEX" != "xno")
|
||||
AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD$
|
||||
|
||||
* fix compatability errors
|
||||
|
||||
--- m4macros/ax_gtest.m4.orig 2020-08-24 16:36:38.000000000 +0000
|
||||
+++ m4macros/ax_gtest.m4
|
||||
@@ -100,7 +100,7 @@ if test "x$enable_gtest" = "xyes" ; then
|
||||
|
||||
# Versions starting from 1.8.0 are put in the googletest directory. If the basename
|
||||
# returns googletest string, we need to cut it off and try baseline again.
|
||||
- if test "$GTEST_VERSION" == "googletest"; then
|
||||
+ if test "$GTEST_VERSION" = "googletest"; then
|
||||
GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
|
||||
GTEST_VERSION=`basename $GTEST_VERSION`
|
||||
fi
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD$
|
||||
|
||||
* put io_adress.h first so that map from net/if.h on solaris won't confict
|
||||
with std::map
|
||||
with std::map on illumos
|
||||
|
||||
--- src/bin/agent/agent_lexer.ll.orig 2019-11-19 14:50:43.000000000 +0000
|
||||
+++ src/bin/agent/agent_lexer.ll
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD$
|
||||
|
||||
* put inclusion of asiolink on top so that std::map does not conlict with
|
||||
* put inclusion of asiolink on top so that std::map dos not conflict with
|
||||
map in net/if.h on illumos
|
||||
|
||||
--- src/bin/dhcp4/tests/parser_unittest.cc.orig 2020-01-02 23:01:48.000000000 +0000
|
||||
--- src/bin/dhcp4/tests/parser_unittest.cc.orig 2020-08-24 16:36:38.000000000 +0000
|
||||
+++ src/bin/dhcp4/tests/parser_unittest.cc
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
|
|
@ -13,6 +13,6 @@ $NetBSD$
|
|||
#include <gtest/gtest.h>
|
||||
#include <dhcp4/parser_context.h>
|
||||
-#include <dhcpsrv/parsers/simple_parser4.h>
|
||||
#include <testutils/gtest_utils.h>
|
||||
#include <testutils/io_utils.h>
|
||||
#include <testutils/user_context_utils.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
$NetBSD$
|
||||
|
||||
* enable test on illumos
|
||||
* use ifru_addr_sa that is available both on illumos and linux
|
||||
* use ifru_Addr_sa that is available on illumos and linux
|
||||
|
||||
--- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig 2020-01-02 23:01:48.000000000 +0000
|
||||
--- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig 2020-08-24 16:36:38.000000000 +0000
|
||||
+++ src/lib/dhcp/tests/iface_mgr_unittest.cc
|
||||
@@ -1569,7 +1569,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
|
||||
@@ -1636,7 +1636,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
|
||||
EXPECT_NO_THROW(iface_mgr->setPacketFilter(custom_packet_filter));
|
||||
}
|
||||
|
||||
|
||||
-#if defined OS_LINUX || OS_BSD
|
||||
+#if defined OS_LINUX || OS_BSD || OS_SOLARIS
|
||||
|
||||
// This test is only supported on Linux and BSD systems. It checks
|
||||
// if it is possible to use the IfaceMgr to select the packet filter
|
||||
@@ -2600,7 +2600,7 @@ checkIfFlags(const Iface & iface,
|
||||
@@ -2716,7 +2716,7 @@ checkIfFlags(const Iface & iface,
|
||||
bool
|
||||
checkIfAddrs(const Iface & iface, struct ifaddrs *& ifptr) {
|
||||
const unsigned char * p = 0;
|
||||
|
|
@ -23,7 +23,7 @@ $NetBSD$
|
|||
// Workaround for Linux ...
|
||||
if(ifptr->ifa_data != 0) {
|
||||
// We avoid localhost as it has no MAC Address
|
||||
@@ -2624,7 +2624,7 @@ checkIfAddrs(const Iface & iface, struct
|
||||
@@ -2740,7 +2740,7 @@ checkIfAddrs(const Iface & iface, struct
|
||||
}
|
||||
|
||||
const uint8_t * p =
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD$
|
||||
|
||||
* include map to not break build since std::map is used
|
||||
|
||||
--- src/lib/dhcpsrv/timer_mgr.cc.orig 2020-10-22 14:29:38.523508022 +0000
|
||||
+++ src/lib/dhcpsrv/timer_mgr.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <exceptions/exceptions.h>
|
||||
|
||||
#include <functional>
|
||||
+#include <map>
|
||||
#include <utility>
|
||||
|
||||
using namespace isc;
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
* remove use of deprecated header
|
||||
from upstream:
|
||||
|
||||
--- src/lib/util/encode/base_n.cc.orig 2019-12-20 19:19:59.959141555 +0000
|
||||
+++ src/lib/util/encode/base_n.cc
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <boost/archive/iterators/base64_from_binary.hpp>
|
||||
#include <boost/archive/iterators/binary_from_base64.hpp>
|
||||
#include <boost/archive/iterators/transform_width.hpp>
|
||||
-#include <boost/math/common_factor.hpp>
|
||||
+#include <boost/integer/common_factor.hpp>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdexcept>
|
||||
@@ -267,7 +267,7 @@ struct BaseNTransformer {
|
||||
// without padding. It's the least common multiple of 8 and BitsPerChunk,
|
||||
// e.g. 24 for base64.
|
||||
static const int BITS_PER_GROUP =
|
||||
- boost::math::static_lcm<BitsPerChunk, 8>::value;
|
||||
+ boost::integer::static_lcm<BitsPerChunk, 8>::value;
|
||||
|
||||
// MAX_PADDING_CHARS is the maximum number of padding characters
|
||||
// that can appear in a valid baseN encoded text.
|
||||
Loading…
Reference in New Issue