Attachment #195095 for bug #229088




# $FreeBSD$

PORTNAME=	kea
PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION=	0
CATEGORIES=	net ipv6
MASTER_SITES=	ISC/kea/${ISCVERSION}
DISTNAME=	${PORTNAME}-${ISCVERSION}

MAINTAINER=	hrs@FreeBSD.org
COMMENT=	Alternative DHCP implementation by ISC


BROKEN_powerpc64=	fails to configure: checking for log4cplus library... no

# ISC releases things like 1.4.0-P1, which our versioning doesn't like
ISCVERSION=	1.4.0-P1

CPE_VENDOR=	isc
CPE_VERSION=	${ISCVERSION:C/-.*//}
.if ${ISCVERSION:M*-*}
CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
.endif

USES=		autoreconf compiler:c++11-lang libtool pathfix ssl cpe
USE_LDCONFIG=	yes
USE_RC_SUBR=	${PORTNAME}
GNU_CONFIGURE=	yes

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519785969	1	TIMESTAMP = 1531421892
2	SHA256 (kea-1.3.0.tar.gz) = 6edfcdbf2526c218426a1d1a6a6694a4050c97bb8412953a230285d63415c391	2	SHA256 (kea-1.4.0-P1.tar.gz) = 46356bd4594a73d269719a724042c43474e592e99476fb63dd8135e78c800411
3	SIZE (kea-1.3.0.tar.gz) = 5996560	3	SIZE (kea-1.4.0-P1.tar.gz) = 6645111




--- src/lib/asiolink/io_acceptor.h.orig	2017-10-05 13:00:03 UTC
+++ src/lib/asiolink/io_acceptor.h
@@ -47,7 +47,11 @@ public:
 
     /// @brief Returns file descriptor of the underlying socket.
     virtual int getNative() const {
+#if BOOST_VERSION < 106600
         return (acceptor_->native());
+#else
+        return (acceptor_->native_handle());
+#endif
     }
 
     /// @brief Opens acceptor socket given the endpoint.




--- src/lib/asiolink/io_service.h.orig	2017-10-05 13:00:03 UTC
+++ src/lib/asiolink/io_service.h
@@ -11,7 +11,12 @@
 
 namespace boost {
 namespace asio {
+#if BOOST_VERSION < 106600
     class io_service;
+#else
+    class io_context;
+    typedef io_context io_service;
+#endif
 }
 }
 




--- src/lib/asiolink/tcp_socket.h.orig	2017-10-05 13:00:03 UTC
+++ src/lib/asiolink/tcp_socket.h
@@ -75,7 +75,11 @@ public:
 
     /// \brief Return file descriptor of underlying socket
     virtual int getNative() const {
+#if BOOST_VERSION < 106600
         return (socket_.native());
+#else
+        return (socket_.native_handle());
+#endif
     }
 
     /// \brief Return protocol of socket




--- src/lib/asiolink/udp_socket.h.orig	2017-10-05 13:00:03 UTC
+++ src/lib/asiolink/udp_socket.h
@@ -61,7 +61,11 @@ public:
 
     /// \brief Return file descriptor of underlying socket
     virtual int getNative() const {
+#if BOOST_VERSION < 106600
         return (socket_.native());
+#else
+        return (socket_.native_handle());
+#endif
     }
 
     /// \brief Return protocol of socket




--- src/lib/asiolink/unix_domain_socket.cc.orig	2017-10-05 13:00:03 UTC
+++ src/lib/asiolink/unix_domain_socket.cc
@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOSer
 
 int
 UnixDomainSocket::getNative() const {
+#if BOOST_VERSION < 106600
     return (impl_->socket_.native());
+#else
+    return (impl_->socket_.native_handle());
+#endif
 }
 
 int




After https://github.com/boostorg/range/commit/69409ed63a9e1 build fails:

libdhcp++.cc:420:24: error: call to 'distance' is ambiguous
            num_defs = distance(range.first, range.second);
                       ^~~~~~~~
libdhcp++.cc:428:24: error: call to 'distance' is ambiguous
            num_defs = distance(range.first, range.second);
                       ^~~~~~~~
libdhcp++.cc:537:24: error: call to 'distance' is ambiguous
            num_defs = distance(range.first, range.second);
                       ^~~~~~~~
libdhcp++.cc:545:24: error: call to 'distance' is ambiguous
            num_defs = distance(range.first, range.second);
                       ^~~~~~~~
libdhcp++.cc:637:31: error: call to 'distance' is ambiguous
            size_t num_defs = distance(range.first, range.second);
                              ^~~~~~~~
libdhcp++.cc:743:35: error: call to 'distance' is ambiguous
                size_t num_defs = distance(range.first, range.second);
                                  ^~~~~~~~
/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = boost::multi_index::detail::hashed_index_iterator<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::index_node_base<boost::shared_ptr<isc::dhcp::OptionDefinition>, std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array<std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_index_global_iterator_tag>]
distance(_InputIter __first, _InputIter __last)
^
/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = boost::multi_index::detail::hashed_index_iterator<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::index_node_base<boost::shared_ptr<isc::dhcp::OptionDefinition>, std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array<std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_index_global_iterator_tag>]
        distance(SinglePassIterator first, SinglePassIterator last)
        ^

--- src/lib/dhcp/libdhcp++.cc.orig	2017-10-05 13:00:05 UTC
+++ src/lib/dhcp/libdhcp++.cc
@@ -417,7 +417,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf
         size_t num_defs = 0;
         if (option_space == DHCP6_OPTION_SPACE) {
             range = idx.equal_range(opt_type);
-            num_defs = distance(range.first, range.second);
+            num_defs = std::distance(range.first, range.second);
         }
 
         // Standard option definitions do not include the definition for
@@ -425,7 +425,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf
         // find the definition among runtime option definitions.
         if (num_defs == 0) {
             range = runtime_idx.equal_range(opt_type);
-            num_defs = distance(range.first, range.second);
+            num_defs = std::distance(range.first, range.second);
         }
 
         OptionPtr opt;
@@ -534,7 +534,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf
         size_t num_defs = 0;
         if (option_space == DHCP4_OPTION_SPACE) {
             range = idx.equal_range(opt_type);
-            num_defs = distance(range.first, range.second);
+            num_defs = std::distance(range.first, range.second);
         }
 
         // Standard option definitions do not include the definition for
@@ -542,7 +542,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf
         // find the definition among runtime option definitions.
         if (num_defs == 0) {
             range = runtime_idx.equal_range(opt_type);
-            num_defs = distance(range.first, range.second);
+            num_defs = std::distance(range.first, range.second);
         }
 
         // Check if option unpacking must be deferred
@@ -634,7 +634,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t ve
                 idx->equal_range(opt_type);
             // Get the number of returned option definitions for the
             // option code.
-            size_t num_defs = distance(range.first, range.second);
+            size_t num_defs = std::distance(range.first, range.second);
 
             if (num_defs > 1) {
                 // Multiple options of the same code are not supported
@@ -740,7 +740,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t ve
                     idx->equal_range(opt_type);
                 // Get the number of returned option definitions for
                 // the option code.
-                size_t num_defs = distance(range.first, range.second);
+                size_t num_defs = std::distance(range.first, range.second);
 
                 if (num_defs > 1) {
                     // Multiple options of the same code are not




include/kea/cc/dhcp_config_error.h
include/kea/cc/json_feed.h
include/kea/cc/simple_parser.h
include/kea/cc/user_context.h
include/kea/cfgrpt/config_report.h
include/kea/config.h
include/kea/config/base_command_mgr.h

include/kea/config/client_connection.h
include/kea/config/cmds_impl.h
include/kea/config/command_mgr.h
include/kea/config/config_data.h
include/kea/config/config_log.h
include/kea/config/hooked_command_mgr.h
include/kea/config/timeouts.h
include/kea/cryptolink/crypto_hash.h
include/kea/cryptolink/crypto_hmac.h
include/kea/cryptolink/cryptolink.h

include/kea/dhcpsrv/alloc_engine_log.h
include/kea/dhcpsrv/assignable_network.h
include/kea/dhcpsrv/base_host_data_source.h
include/kea/dhcpsrv/cache_host_data_source.h
include/kea/dhcpsrv/callout_handle_store.h
include/kea/dhcpsrv/cfg_4o6.h
include/kea/dhcpsrv/cfg_db_access.h

include/kea/dhcpsrv/daemon.h
include/kea/dhcpsrv/database_connection.h
include/kea/dhcpsrv/db_exceptions.h
include/kea/dhcpsrv/db_log.h
include/kea/dhcpsrv/db_type.h
include/kea/dhcpsrv/dhcp4o6_ipc.h
include/kea/dhcpsrv/dhcpsrv_db_log.h
include/kea/dhcpsrv/dhcpsrv_log.h
include/kea/dhcpsrv/host.h
include/kea/dhcpsrv/host_container.h

include/kea/dhcpsrv/memfile_lease_storage.h
include/kea/dhcpsrv/ncr_generator.h
include/kea/dhcpsrv/network.h
include/kea/dhcpsrv/network_state.h
include/kea/dhcpsrv/parsers/client_class_def_parser.h
include/kea/dhcpsrv/parsers/dbaccess_parser.h
include/kea/dhcpsrv/parsers/dhcp_parsers.h

include/kea/dhcpsrv/parsers/simple_parser6.h
include/kea/dhcpsrv/pool.h
include/kea/dhcpsrv/shared_network.h
include/kea/dhcpsrv/sql_common.h
include/kea/dhcpsrv/srv_config.h
include/kea/dhcpsrv/subnet.h
include/kea/dhcpsrv/subnet_id.h

include/kea/eval/token.h
include/kea/exceptions/exceptions.h
include/kea/hooks/callout_handle.h
include/kea/hooks/callout_handle_associate.h
include/kea/hooks/callout_manager.h
include/kea/hooks/hooks.h
include/kea/hooks/hooks_config.h

include/kea/hooks/library_handle.h
include/kea/hooks/library_manager.h
include/kea/hooks/library_manager_collection.h
include/kea/hooks/parking_lots.h
include/kea/hooks/pointer_converter.h
include/kea/hooks/server_hooks.h
include/kea/http/client.h
include/kea/http/connection.h
include/kea/http/connection_pool.h
include/kea/http/date_time.h
include/kea/http/header_context.h
include/kea/http/http_acceptor.h
include/kea/http/http_header.h
include/kea/http/http_log.h
include/kea/http/http_message.h
include/kea/http/http_message_parser_base.h
include/kea/http/http_types.h
include/kea/http/listener.h
include/kea/http/post_request.h

include/kea/http/request_context.h
include/kea/http/request_parser.h
include/kea/http/response.h
include/kea/http/response_context.h
include/kea/http/response_creator.h
include/kea/http/response_creator_factory.h
include/kea/http/response_json.h
include/kea/http/response_parser.h
include/kea/http/url.h
include/kea/log/buffer_appender_impl.h
include/kea/log/interprocess/interprocess_sync.h
include/kea/log/interprocess/interprocess_sync_file.h

include/kea/util/encode/binary_from_base32hex.h
include/kea/util/encode/hex.h
include/kea/util/filename.h
include/kea/util/hash.h
include/kea/util/io/fd.h
include/kea/util/io/fd_share.h
include/kea/util/io/pktinfo_utilities.h

include/kea/util/time_utilities.h
include/kea/util/versioned_csv_file.h
include/kea/util/watch_socket.h
lib/hooks/libdhcp_ha.a
lib/hooks/libdhcp_ha.so
lib/hooks/libdhcp_lease_cmds.a
lib/hooks/libdhcp_lease_cmds.so
lib/hooks/libdhcp_stat_cmds.a
lib/hooks/libdhcp_stat_cmds.so
lib/libkea-asiodns.a
lib/libkea-asiodns.so
lib/libkea-asiodns.so.0
lib/libkea-asiodns.so.0.0.2
lib/libkea-asiolink.a
lib/libkea-asiolink.so
lib/libkea-asiolink.so.6
lib/libkea-asiolink.so.6.0.1
lib/libkea-cc.a
lib/libkea-cc.so
lib/libkea-cc.so.5
lib/libkea-cc.so.5.0.0
lib/libkea-cfgclient.a
lib/libkea-cfgclient.so
lib/libkea-cfgclient.so.5
lib/libkea-cfgclient.so.5.0.1
lib/libkea-cryptolink.a
lib/libkea-cryptolink.so
lib/libkea-cryptolink.so.3
lib/libkea-cryptolink.so.3.0.0
lib/libkea-dhcp++.a
lib/libkea-dhcp++.so
lib/libkea-dhcp++.so.8
lib/libkea-dhcp++.so.8.0.0
lib/libkea-dhcp_ddns.a
lib/libkea-dhcp_ddns.so
lib/libkea-dhcp_ddns.so.1
lib/libkea-dhcp_ddns.so.1.0.3
lib/libkea-dhcpsrv.a
lib/libkea-dhcpsrv.so
lib/libkea-dhcpsrv.so.11
lib/libkea-dhcpsrv.so.11.0.0
lib/libkea-dns++.a
lib/libkea-dns++.so
lib/libkea-dns++.so.2
lib/libkea-dns++.so.2.0.1
lib/libkea-eval.a
lib/libkea-eval.so
lib/libkea-eval.so.7
lib/libkea-eval.so.7.0.1
lib/libkea-exceptions.a
lib/libkea-exceptions.so
lib/libkea-exceptions.so.0
lib/libkea-exceptions.so.0.0.1
lib/libkea-hooks.a
lib/libkea-hooks.so
lib/libkea-hooks.so.7
lib/libkea-hooks.so.7.0.0
lib/libkea-http.a
lib/libkea-http.so
lib/libkea-http.so.2
lib/libkea-http.so.2.0.0
lib/libkea-log.a
lib/libkea-log.so
lib/libkea-log.so.3
lib/libkea-log.so.3.0.1
lib/libkea-process.a
lib/libkea-process.so
lib/libkea-process.so.2
lib/libkea-process.so.2.0.1
lib/libkea-stats.a
lib/libkea-stats.so
lib/libkea-stats.so.2
lib/libkea-stats.so.2.0.2
lib/libkea-threads.a
lib/libkea-threads.so
lib/libkea-threads.so.1

lib/libkea-util-io.a
lib/libkea-util-io.so
lib/libkea-util-io.so.0
lib/libkea-util-io.so.0.0.1
lib/libkea-util.a
lib/libkea-util.so
lib/libkea-util.so.3
lib/libkea-util.so.3.0.1
libdata/pkgconfig/dns++.pc
man/man8/kea-admin.8.gz
man/man8/kea-ctrl-agent.8.gz

sbin/kea-lfc
sbin/keactrl
sbin/perfdhcp
%%DATADIR%%/dhcp-ddns.spec
%%DATADIR%%/dhcp4.spec
%%DATADIR%%/dhcp6.spec
%%DATADIR%%/scripts/admin-utils.sh
%%DATADIR%%/scripts/cql/dhcpdb_create.cql
%%DATADIR%%/scripts/cql/dhcpdb_drop.cql
%%DATADIR%%/scripts/cql/soft_wipe.cql
%%DATADIR%%/scripts/cql/upgrade_1.0_to_2.0.sh
%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql
%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql
%%DATADIR%%/scripts/mysql/upgrade_1.0_to_2.0.sh

%%DATADIR%%/scripts/mysql/upgrade_4.0_to_4.1.sh
%%DATADIR%%/scripts/mysql/upgrade_4.1_to_5.0.sh
%%DATADIR%%/scripts/mysql/upgrade_5.0_to_5.1.sh
%%DATADIR%%/scripts/mysql/upgrade_5.1_to_5.2.sh
%%DATADIR%%/scripts/mysql/upgrade_5.2_to_6.0.sh
%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql
%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql
%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh
%%DATADIR%%/scripts/pgsql/upgrade_2.0_to_3.0.sh
%%DATADIR%%/scripts/pgsql/upgrade_3.0_to_3.1.sh
%%DATADIR%%/scripts/pgsql/upgrade_3.1_to_3.2.sh
%%DATADIR%%/scripts/pgsql/upgrade_3.2_to_3.3.sh
%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh
@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
@sample %%ETCDIR%%/kea-dhcp4.conf.sample

Return to bug 229088

Lines 1-10 Link Here

(-)Makefile (-4 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= kea	3	PORTNAME= kea
4	PORTVERSION= 1.3.0	4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
5	PORTREVISION= 1	5	PORTREVISION= 0
6	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
7	MASTER_SITES= ISC/kea/${PORTVERSION}	7	MASTER_SITES= ISC/kea/${ISCVERSION}
		8	DISTNAME= ${PORTNAME}-${ISCVERSION}
8		9
9	MAINTAINER= hrs@FreeBSD.org	10	MAINTAINER= hrs@FreeBSD.org
10	COMMENT= Alternative DHCP implementation by ISC	11	COMMENT= Alternative DHCP implementation by ISC
Lines 17-23 Link Here
17		18
18	BROKEN_powerpc64= fails to configure: checking for log4cplus library... no	19	BROKEN_powerpc64= fails to configure: checking for log4cplus library... no
19		20
20	USES= autoreconf compiler:c++11-lang libtool pathfix python:3.3+ ssl	21	# ISC releases things like 1.4.0-P1, which our versioning doesn't like
		22	ISCVERSION= 1.4.0-P1
		23
		24	CPE_VENDOR= isc
		25	CPE_VERSION= ${ISCVERSION:C/-.*//}
		26	.if ${ISCVERSION:M-}
		27	CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
		28	.endif
		29
		30	USES= autoreconf compiler:c++11-lang libtool pathfix ssl cpe
21	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
22	USE_RC_SUBR= ${PORTNAME}	32	USE_RC_SUBR= ${PORTNAME}
23	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes

Lines 1-14 Link Here

(-)files/patch-src-lib-asiolink-io_acceptor.h (-14 lines)
1	--- src/lib/asiolink/io_acceptor.h.orig 2017-10-05 13:00:03 UTC
2	+++ src/lib/asiolink/io_acceptor.h
3	@@ -47,7 +47,11 @@ public:
4
5	/// @brief Returns file descriptor of the underlying socket.
6	virtual int getNative() const {
7	+#if BOOST_VERSION < 106600
8	return (acceptor_->native());
9	+#else
10	+ return (acceptor_->native_handle());
11	+#endif
12	}
13
14	/// @brief Opens acceptor socket given the endpoint.

Lines 1-15 Link Here

(-)files/patch-src-lib-asiolink-io_service.h (-15 lines)
1	--- src/lib/asiolink/io_service.h.orig 2017-10-05 13:00:03 UTC
2	+++ src/lib/asiolink/io_service.h
3	@@ -11,7 +11,12 @@
4
5	namespace boost {
6	namespace asio {
7	+#if BOOST_VERSION < 106600
8	class io_service;
9	+#else
10	+ class io_context;
11	+ typedef io_context io_service;
12	+#endif
13	}
14	}
15

Lines 1-14 Link Here

(-)files/patch-src-lib-asiolink-tcp_socket.h (-14 lines)
1	--- src/lib/asiolink/tcp_socket.h.orig 2017-10-05 13:00:03 UTC
2	+++ src/lib/asiolink/tcp_socket.h
3	@@ -75,7 +75,11 @@ public:
4
5	/// \brief Return file descriptor of underlying socket
6	virtual int getNative() const {
7	+#if BOOST_VERSION < 106600
8	return (socket_.native());
9	+#else
10	+ return (socket_.native_handle());
11	+#endif
12	}
13
14	/// \brief Return protocol of socket

Lines 1-14 Link Here

(-)files/patch-src-lib-asiolink-udp_socket.h (-14 lines)
1	--- src/lib/asiolink/udp_socket.h.orig 2017-10-05 13:00:03 UTC
2	+++ src/lib/asiolink/udp_socket.h
3	@@ -61,7 +61,11 @@ public:
4
5	/// \brief Return file descriptor of underlying socket
6	virtual int getNative() const {
7	+#if BOOST_VERSION < 106600
8	return (socket_.native());
9	+#else
10	+ return (socket_.native_handle());
11	+#endif
12	}
13
14	/// \brief Return protocol of socket

Lines 1-14 Link Here

(-)files/patch-src-lib-asiolink-unix_domain_socket.cc (-14 lines)
1	--- src/lib/asiolink/unix_domain_socket.cc.orig 2017-10-05 13:00:03 UTC
2	+++ src/lib/asiolink/unix_domain_socket.cc
3	@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOSer
4
5	int
6	UnixDomainSocket::getNative() const {
7	+#if BOOST_VERSION < 106600
8	return (impl_->socket_.native());
9	+#else
10	+ return (impl_->socket_.native_handle());
11	+#endif
12	}
13
14	int

Lines 1-83 Link Here

(-)files/patch-src_lib_dhcp_libdhcp++.cc (-83 lines)
1	After https://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
2
3	libdhcp++.cc:420:24: error: call to 'distance' is ambiguous
4	num_defs = distance(range.first, range.second);
5	^~~~~~~~
6	libdhcp++.cc:428:24: error: call to 'distance' is ambiguous
7	num_defs = distance(range.first, range.second);
8	^~~~~~~~
9	libdhcp++.cc:537:24: error: call to 'distance' is ambiguous
10	num_defs = distance(range.first, range.second);
11	^~~~~~~~
12	libdhcp++.cc:545:24: error: call to 'distance' is ambiguous
13	num_defs = distance(range.first, range.second);
14	^~~~~~~~
15	libdhcp++.cc:637:31: error: call to 'distance' is ambiguous
16	size_t num_defs = distance(range.first, range.second);
17	^~~~~~~~
18	libdhcp++.cc:743:35: error: call to 'distance' is ambiguous
19	size_t num_defs = distance(range.first, range.second);
20	^~~~~~~~
21	/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = boost::multi_index::detail::hashed_index_iterator<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::index_node_base<boost::shared_ptr<isc::dhcp::OptionDefinition>, std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array<std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_index_global_iterator_tag>]
22	distance(_InputIter __first, _InputIter __last)
23	^
24	/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = boost::multi_index::detail::hashed_index_iterator<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::index_node_base<boost::shared_ptr<isc::dhcp::OptionDefinition>, std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array<std::__1::allocator<boost::shared_ptr<isc::dhcp::OptionDefinition> > >, boost::multi_index::detail::hashed_index_global_iterator_tag>]
25	distance(SinglePassIterator first, SinglePassIterator last)
26	^
27
28	--- src/lib/dhcp/libdhcp++.cc.orig 2017-10-05 13:00:05 UTC
29	+++ src/lib/dhcp/libdhcp++.cc
30	@@ -417,7 +417,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf
31	size_t num_defs = 0;
32	if (option_space == DHCP6_OPTION_SPACE) {
33	range = idx.equal_range(opt_type);
34	- num_defs = distance(range.first, range.second);
35	+ num_defs = std::distance(range.first, range.second);
36	}
37
38	// Standard option definitions do not include the definition for
39	@@ -425,7 +425,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf
40	// find the definition among runtime option definitions.
41	if (num_defs == 0) {
42	range = runtime_idx.equal_range(opt_type);
43	- num_defs = distance(range.first, range.second);
44	+ num_defs = std::distance(range.first, range.second);
45	}
46
47	OptionPtr opt;
48	@@ -534,7 +534,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf
49	size_t num_defs = 0;
50	if (option_space == DHCP4_OPTION_SPACE) {
51	range = idx.equal_range(opt_type);
52	- num_defs = distance(range.first, range.second);
53	+ num_defs = std::distance(range.first, range.second);
54	}
55
56	// Standard option definitions do not include the definition for
57	@@ -542,7 +542,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf
58	// find the definition among runtime option definitions.
59	if (num_defs == 0) {
60	range = runtime_idx.equal_range(opt_type);
61	- num_defs = distance(range.first, range.second);
62	+ num_defs = std::distance(range.first, range.second);
63	}
64
65	// Check if option unpacking must be deferred
66	@@ -634,7 +634,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t ve
67	idx->equal_range(opt_type);
68	// Get the number of returned option definitions for the
69	// option code.
70	- size_t num_defs = distance(range.first, range.second);
71	+ size_t num_defs = std::distance(range.first, range.second);
72
73	if (num_defs > 1) {
74	// Multiple options of the same code are not supported
75	@@ -740,7 +740,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t ve
76	idx->equal_range(opt_type);
77	// Get the number of returned option definitions for
78	// the option code.
79	- size_t num_defs = distance(range.first, range.second);
80	+ size_t num_defs = std::distance(range.first, range.second);
81
82	if (num_defs > 1) {
83	// Multiple options of the same code are not

Lines 26-31 Link Here

(-)pkg-plist (-34 / +57 lines)
26	include/kea/cc/dhcp_config_error.h	26	include/kea/cc/dhcp_config_error.h
27	include/kea/cc/json_feed.h	27	include/kea/cc/json_feed.h
28	include/kea/cc/simple_parser.h	28	include/kea/cc/simple_parser.h
		29	include/kea/cc/user_context.h
29	include/kea/cfgrpt/config_report.h	30	include/kea/cfgrpt/config_report.h
30	include/kea/config.h	31	include/kea/config.h
31	include/kea/config/base_command_mgr.h	32	include/kea/config/base_command_mgr.h
Lines 32-41 Link Here
32	include/kea/config/client_connection.h	33	include/kea/config/client_connection.h
33	include/kea/config/cmds_impl.h	34	include/kea/config/cmds_impl.h
34	include/kea/config/command_mgr.h	35	include/kea/config/command_mgr.h
35	include/kea/config/config_data.h
36	include/kea/config/config_log.h	36	include/kea/config/config_log.h
37	include/kea/config/hooked_command_mgr.h	37	include/kea/config/hooked_command_mgr.h
38	include/kea/config/module_spec.h	38	include/kea/config/timeouts.h
39	include/kea/cryptolink/crypto_hash.h	39	include/kea/cryptolink/crypto_hash.h
40	include/kea/cryptolink/crypto_hmac.h	40	include/kea/cryptolink/crypto_hmac.h
41	include/kea/cryptolink/cryptolink.h	41	include/kea/cryptolink/cryptolink.h
Lines 93-98 Link Here
93	include/kea/dhcpsrv/alloc_engine_log.h	93	include/kea/dhcpsrv/alloc_engine_log.h
94	include/kea/dhcpsrv/assignable_network.h	94	include/kea/dhcpsrv/assignable_network.h
95	include/kea/dhcpsrv/base_host_data_source.h	95	include/kea/dhcpsrv/base_host_data_source.h
		96	include/kea/dhcpsrv/cache_host_data_source.h
96	include/kea/dhcpsrv/callout_handle_store.h	97	include/kea/dhcpsrv/callout_handle_store.h
97	include/kea/dhcpsrv/cfg_4o6.h	98	include/kea/dhcpsrv/cfg_4o6.h
98	include/kea/dhcpsrv/cfg_db_access.h	99	include/kea/dhcpsrv/cfg_db_access.h
Lines 118-124 Link Here
118	include/kea/dhcpsrv/daemon.h	119	include/kea/dhcpsrv/daemon.h
119	include/kea/dhcpsrv/database_connection.h	120	include/kea/dhcpsrv/database_connection.h
120	include/kea/dhcpsrv/db_exceptions.h	121	include/kea/dhcpsrv/db_exceptions.h
		122	include/kea/dhcpsrv/db_log.h
		123	include/kea/dhcpsrv/db_type.h
121	include/kea/dhcpsrv/dhcp4o6_ipc.h	124	include/kea/dhcpsrv/dhcp4o6_ipc.h
		125	include/kea/dhcpsrv/dhcpsrv_db_log.h
122	include/kea/dhcpsrv/dhcpsrv_log.h	126	include/kea/dhcpsrv/dhcpsrv_log.h
123	include/kea/dhcpsrv/host.h	127	include/kea/dhcpsrv/host.h
124	include/kea/dhcpsrv/host_container.h	128	include/kea/dhcpsrv/host_container.h
Lines 137-142 Link Here
137	include/kea/dhcpsrv/memfile_lease_storage.h	141	include/kea/dhcpsrv/memfile_lease_storage.h
138	include/kea/dhcpsrv/ncr_generator.h	142	include/kea/dhcpsrv/ncr_generator.h
139	include/kea/dhcpsrv/network.h	143	include/kea/dhcpsrv/network.h
		144	include/kea/dhcpsrv/network_state.h
140	include/kea/dhcpsrv/parsers/client_class_def_parser.h	145	include/kea/dhcpsrv/parsers/client_class_def_parser.h
141	include/kea/dhcpsrv/parsers/dbaccess_parser.h	146	include/kea/dhcpsrv/parsers/dbaccess_parser.h
142	include/kea/dhcpsrv/parsers/dhcp_parsers.h	147	include/kea/dhcpsrv/parsers/dhcp_parsers.h
Lines 152-157 Link Here
152	include/kea/dhcpsrv/parsers/simple_parser6.h	157	include/kea/dhcpsrv/parsers/simple_parser6.h
153	include/kea/dhcpsrv/pool.h	158	include/kea/dhcpsrv/pool.h
154	include/kea/dhcpsrv/shared_network.h	159	include/kea/dhcpsrv/shared_network.h
		160	include/kea/dhcpsrv/sql_common.h
155	include/kea/dhcpsrv/srv_config.h	161	include/kea/dhcpsrv/srv_config.h
156	include/kea/dhcpsrv/subnet.h	162	include/kea/dhcpsrv/subnet.h
157	include/kea/dhcpsrv/subnet_id.h	163	include/kea/dhcpsrv/subnet_id.h
Lines 203-208 Link Here
203	include/kea/eval/token.h	209	include/kea/eval/token.h
204	include/kea/exceptions/exceptions.h	210	include/kea/exceptions/exceptions.h
205	include/kea/hooks/callout_handle.h	211	include/kea/hooks/callout_handle.h
		212	include/kea/hooks/callout_handle_associate.h
206	include/kea/hooks/callout_manager.h	213	include/kea/hooks/callout_manager.h
207	include/kea/hooks/hooks.h	214	include/kea/hooks/hooks.h
208	include/kea/hooks/hooks_config.h	215	include/kea/hooks/hooks_config.h
Lines 213-226 Link Here
213	include/kea/hooks/library_handle.h	220	include/kea/hooks/library_handle.h
214	include/kea/hooks/library_manager.h	221	include/kea/hooks/library_manager.h
215	include/kea/hooks/library_manager_collection.h	222	include/kea/hooks/library_manager_collection.h
		223	include/kea/hooks/parking_lots.h
216	include/kea/hooks/pointer_converter.h	224	include/kea/hooks/pointer_converter.h
217	include/kea/hooks/server_hooks.h	225	include/kea/hooks/server_hooks.h
		226	include/kea/http/client.h
218	include/kea/http/connection.h	227	include/kea/http/connection.h
219	include/kea/http/connection_pool.h	228	include/kea/http/connection_pool.h
220	include/kea/http/date_time.h	229	include/kea/http/date_time.h
221	include/kea/http/header_context.h	230	include/kea/http/header_context.h
222	include/kea/http/http_acceptor.h	231	include/kea/http/http_acceptor.h
		232	include/kea/http/http_header.h
223	include/kea/http/http_log.h	233	include/kea/http/http_log.h
		234	include/kea/http/http_message.h
		235	include/kea/http/http_message_parser_base.h
224	include/kea/http/http_types.h	236	include/kea/http/http_types.h
225	include/kea/http/listener.h	237	include/kea/http/listener.h
226	include/kea/http/post_request.h	238	include/kea/http/post_request.h
Lines 229-237 Link Here
229	include/kea/http/request_context.h	241	include/kea/http/request_context.h
230	include/kea/http/request_parser.h	242	include/kea/http/request_parser.h
231	include/kea/http/response.h	243	include/kea/http/response.h
		244	include/kea/http/response_context.h
232	include/kea/http/response_creator.h	245	include/kea/http/response_creator.h
233	include/kea/http/response_creator_factory.h	246	include/kea/http/response_creator_factory.h
234	include/kea/http/response_json.h	247	include/kea/http/response_json.h
		248	include/kea/http/response_parser.h
		249	include/kea/http/url.h
235	include/kea/log/buffer_appender_impl.h	250	include/kea/log/buffer_appender_impl.h
236	include/kea/log/interprocess/interprocess_sync.h	251	include/kea/log/interprocess/interprocess_sync.h
237	include/kea/log/interprocess/interprocess_sync_file.h	252	include/kea/log/interprocess/interprocess_sync_file.h
Lines 276-281 Link Here
276	include/kea/util/encode/binary_from_base32hex.h	291	include/kea/util/encode/binary_from_base32hex.h
277	include/kea/util/encode/hex.h	292	include/kea/util/encode/hex.h
278	include/kea/util/filename.h	293	include/kea/util/filename.h
		294	include/kea/util/hash.h
279	include/kea/util/io/fd.h	295	include/kea/util/io/fd.h
280	include/kea/util/io/fd_share.h	296	include/kea/util/io/fd_share.h
281	include/kea/util/io/pktinfo_utilities.h	297	include/kea/util/io/pktinfo_utilities.h
Lines 303-374 Link Here
303	include/kea/util/time_utilities.h	319	include/kea/util/time_utilities.h
304	include/kea/util/versioned_csv_file.h	320	include/kea/util/versioned_csv_file.h
305	include/kea/util/watch_socket.h	321	include/kea/util/watch_socket.h
		322	lib/hooks/libdhcp_ha.a
		323	lib/hooks/libdhcp_ha.so
306	lib/hooks/libdhcp_lease_cmds.a	324	lib/hooks/libdhcp_lease_cmds.a
307	lib/hooks/libdhcp_lease_cmds.so	325	lib/hooks/libdhcp_lease_cmds.so
		326	lib/hooks/libdhcp_stat_cmds.a
		327	lib/hooks/libdhcp_stat_cmds.so
308	lib/libkea-asiodns.a	328	lib/libkea-asiodns.a
309	lib/libkea-asiodns.so	329	lib/libkea-asiodns.so
310	lib/libkea-asiodns.so.0	330	lib/libkea-asiodns.so.0
311	lib/libkea-asiodns.so.0.0.1	331	lib/libkea-asiodns.so.0.0.2
312	lib/libkea-asiolink.a	332	lib/libkea-asiolink.a
313	lib/libkea-asiolink.so	333	lib/libkea-asiolink.so
314	lib/libkea-asiolink.so.5	334	lib/libkea-asiolink.so.6
315	lib/libkea-asiolink.so.5.0.0	335	lib/libkea-asiolink.so.6.0.1
316	lib/libkea-cc.a	336	lib/libkea-cc.a
317	lib/libkea-cc.so	337	lib/libkea-cc.so
318	lib/libkea-cc.so.3	338	lib/libkea-cc.so.5
319	lib/libkea-cc.so.3.0.0	339	lib/libkea-cc.so.5.0.0
320	lib/libkea-cfgclient.a	340	lib/libkea-cfgclient.a
321	lib/libkea-cfgclient.so	341	lib/libkea-cfgclient.so
322	lib/libkea-cfgclient.so.4	342	lib/libkea-cfgclient.so.5
323	lib/libkea-cfgclient.so.4.0.0	343	lib/libkea-cfgclient.so.5.0.1
324	lib/libkea-cryptolink.a	344	lib/libkea-cryptolink.a
325	lib/libkea-cryptolink.so	345	lib/libkea-cryptolink.so
326	lib/libkea-cryptolink.so.2	346	lib/libkea-cryptolink.so.3
327	lib/libkea-cryptolink.so.2.0.0	347	lib/libkea-cryptolink.so.3.0.0
328	lib/libkea-dhcp++.a	348	lib/libkea-dhcp++.a
329	lib/libkea-dhcp++.so	349	lib/libkea-dhcp++.so
330	lib/libkea-dhcp++.so.6	350	lib/libkea-dhcp++.so.8
331	lib/libkea-dhcp++.so.6.0.0	351	lib/libkea-dhcp++.so.8.0.0
332	lib/libkea-dhcp_ddns.a	352	lib/libkea-dhcp_ddns.a
333	lib/libkea-dhcp_ddns.so	353	lib/libkea-dhcp_ddns.so
334	lib/libkea-dhcp_ddns.so.1	354	lib/libkea-dhcp_ddns.so.1
335	lib/libkea-dhcp_ddns.so.1.0.2	355	lib/libkea-dhcp_ddns.so.1.0.3
336	lib/libkea-dhcpsrv.a	356	lib/libkea-dhcpsrv.a
337	lib/libkea-dhcpsrv.so	357	lib/libkea-dhcpsrv.so
338	lib/libkea-dhcpsrv.so.8	358	lib/libkea-dhcpsrv.so.11
339	lib/libkea-dhcpsrv.so.8.0.0	359	lib/libkea-dhcpsrv.so.11.0.0
340	lib/libkea-dns++.a	360	lib/libkea-dns++.a
341	lib/libkea-dns++.so	361	lib/libkea-dns++.so
342	lib/libkea-dns++.so.2	362	lib/libkea-dns++.so.2
343	lib/libkea-dns++.so.2.0.0	363	lib/libkea-dns++.so.2.0.1
344	lib/libkea-eval.a	364	lib/libkea-eval.a
345	lib/libkea-eval.so	365	lib/libkea-eval.so
346	lib/libkea-eval.so.6	366	lib/libkea-eval.so.7
347	lib/libkea-eval.so.6.0.0	367	lib/libkea-eval.so.7.0.1
348	lib/libkea-exceptions.a	368	lib/libkea-exceptions.a
349	lib/libkea-exceptions.so	369	lib/libkea-exceptions.so
350	lib/libkea-exceptions.so.0	370	lib/libkea-exceptions.so.0
351	lib/libkea-exceptions.so.0.0.0	371	lib/libkea-exceptions.so.0.0.1
352	lib/libkea-hooks.a	372	lib/libkea-hooks.a
353	lib/libkea-hooks.so	373	lib/libkea-hooks.so
354	lib/libkea-hooks.so.3	374	lib/libkea-hooks.so.7
355	lib/libkea-hooks.so.3.1.0	375	lib/libkea-hooks.so.7.0.0
356	lib/libkea-http.a	376	lib/libkea-http.a
357	lib/libkea-http.so	377	lib/libkea-http.so
358	lib/libkea-http.so.0	378	lib/libkea-http.so.2
359	lib/libkea-http.so.0.0.1	379	lib/libkea-http.so.2.0.0
360	lib/libkea-log.a	380	lib/libkea-log.a
361	lib/libkea-log.so	381	lib/libkea-log.so
362	lib/libkea-log.so.3	382	lib/libkea-log.so.3
363	lib/libkea-log.so.3.0.0	383	lib/libkea-log.so.3.0.1
364	lib/libkea-process.a	384	lib/libkea-process.a
365	lib/libkea-process.so	385	lib/libkea-process.so
366	lib/libkea-process.so.1	386	lib/libkea-process.so.2
367	lib/libkea-process.so.1.0.0	387	lib/libkea-process.so.2.0.1
368	lib/libkea-stats.a	388	lib/libkea-stats.a
369	lib/libkea-stats.so	389	lib/libkea-stats.so
370	lib/libkea-stats.so.2	390	lib/libkea-stats.so.2
371	lib/libkea-stats.so.2.0.0	391	lib/libkea-stats.so.2.0.2
372	lib/libkea-threads.a	392	lib/libkea-threads.a
373	lib/libkea-threads.so	393	lib/libkea-threads.so
374	lib/libkea-threads.so.1	394	lib/libkea-threads.so.1
Lines 376-386 Link Here
376	lib/libkea-util-io.a	396	lib/libkea-util-io.a
377	lib/libkea-util-io.so	397	lib/libkea-util-io.so
378	lib/libkea-util-io.so.0	398	lib/libkea-util-io.so.0
379	lib/libkea-util-io.so.0.0.0	399	lib/libkea-util-io.so.0.0.1
380	lib/libkea-util.a	400	lib/libkea-util.a
381	lib/libkea-util.so	401	lib/libkea-util.so
382	lib/libkea-util.so.2	402	lib/libkea-util.so.3
383	lib/libkea-util.so.2.0.1	403	lib/libkea-util.so.3.0.1
384	libdata/pkgconfig/dns++.pc	404	libdata/pkgconfig/dns++.pc
385	man/man8/kea-admin.8.gz	405	man/man8/kea-admin.8.gz
386	man/man8/kea-ctrl-agent.8.gz	406	man/man8/kea-ctrl-agent.8.gz
Lines 398-410 Link Here
398	sbin/kea-lfc	418	sbin/kea-lfc
399	sbin/keactrl	419	sbin/keactrl
400	sbin/perfdhcp	420	sbin/perfdhcp
401	%%DATADIR%%/dhcp-ddns.spec
402	%%DATADIR%%/dhcp4.spec
403	%%DATADIR%%/dhcp6.spec
404	%%DATADIR%%/scripts/admin-utils.sh	421	%%DATADIR%%/scripts/admin-utils.sh
405	%%DATADIR%%/scripts/cql/dhcpdb_create.cql	422	%%DATADIR%%/scripts/cql/dhcpdb_create.cql
406	%%DATADIR%%/scripts/cql/dhcpdb_drop.cql	423	%%DATADIR%%/scripts/cql/dhcpdb_drop.cql
407	%%DATADIR%%/scripts/cql/soft_wipe.cql	424	%%DATADIR%%/scripts/cql/soft_wipe.cql
		425	%%DATADIR%%/scripts/cql/upgrade_1.0_to_2.0.sh
408	%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql	426	%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql
409	%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql	427	%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql
410	%%DATADIR%%/scripts/mysql/upgrade_1.0_to_2.0.sh	428	%%DATADIR%%/scripts/mysql/upgrade_1.0_to_2.0.sh
Lines 413-423 Link Here
413	%%DATADIR%%/scripts/mysql/upgrade_4.0_to_4.1.sh	431	%%DATADIR%%/scripts/mysql/upgrade_4.0_to_4.1.sh
414	%%DATADIR%%/scripts/mysql/upgrade_4.1_to_5.0.sh	432	%%DATADIR%%/scripts/mysql/upgrade_4.1_to_5.0.sh
415	%%DATADIR%%/scripts/mysql/upgrade_5.0_to_5.1.sh	433	%%DATADIR%%/scripts/mysql/upgrade_5.0_to_5.1.sh
		434	%%DATADIR%%/scripts/mysql/upgrade_5.1_to_5.2.sh
		435	%%DATADIR%%/scripts/mysql/upgrade_5.2_to_6.0.sh
416	%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql	436	%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql
417	%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql	437	%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql
418	%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh	438	%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh
419	%%DATADIR%%/scripts/pgsql/upgrade_2.0_to_3.0.sh	439	%%DATADIR%%/scripts/pgsql/upgrade_2.0_to_3.0.sh
420	%%DATADIR%%/scripts/pgsql/upgrade_3.0_to_3.1.sh	440	%%DATADIR%%/scripts/pgsql/upgrade_3.0_to_3.1.sh
		441	%%DATADIR%%/scripts/pgsql/upgrade_3.1_to_3.2.sh
		442	%%DATADIR%%/scripts/pgsql/upgrade_3.2_to_3.3.sh
		443	%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh
421	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample	444	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
422	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample	445	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
423	@sample %%ETCDIR%%/kea-dhcp4.conf.sample	446	@sample %%ETCDIR%%/kea-dhcp4.conf.sample