Attachment #200126 for bug #234032

View | Details | Raw Unified | Return to bug 234032
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= kea	3	PORTNAME= kea
4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}	4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}
5	PORTREVISION= 2	5	PORTREVISION= 0
6	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
7	MASTER_SITES= ISC/kea/${ISCVERSION}	7	MASTER_SITES= ISC/kea/${ISCVERSION}
8	DISTNAME= ${PORTNAME}-${ISCVERSION}	8	DISTNAME= ${PORTNAME}-${ISCVERSION}
Lines 19-25 Link Here
19	BROKEN_powerpc64= fails to configure: checking for log4cplus library... no	19	BROKEN_powerpc64= fails to configure: checking for log4cplus library... no
20		20
21	# ISC releases things like 1.4.0-P1, which our versioning doesn't like	21	# ISC releases things like 1.4.0-P1, which our versioning doesn't like
22	ISCVERSION= 1.4.0-P1	22	ISCVERSION= 1.5.0
23		23
24	CPE_VENDOR= isc	24	CPE_VENDOR= isc
25	CPE_VERSION= ${ISCVERSION:C/-.*//}	25	CPE_VERSION= ${ISCVERSION:C/-.*//}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1531421892	1	TIMESTAMP = 1544845580
2	SHA256 (kea-1.4.0-P1.tar.gz) = 46356bd4594a73d269719a724042c43474e592e99476fb63dd8135e78c800411	2	SHA256 (kea-1.5.0.tar.gz) = edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec
3	SIZE (kea-1.4.0-P1.tar.gz) = 6645111	3	SIZE (kea-1.5.0.tar.gz) = 7395257

Lines 1-11 Link Here

(-)files/patch-src-lib-dhcpsrv-daemon.cc (-11 lines)
1	--- src/lib/dhcpsrv/daemon.cc.orig 2017-10-05 13:00:04 UTC
2	+++ src/lib/dhcpsrv/daemon.cc
3	@@ -29,7 +29,7 @@ namespace dhcp {
4
5	Daemon::Daemon()
6	: signal_set_(), signal_handler_(), config_file_(""), proc_name_(""),
7	- pid_file_dir_(DHCP_DATA_DIR), pid_file_(), am_file_author_(false) {
8	+ pid_file_dir_(KEA_PIDFILE_DIR), pid_file_(), am_file_author_(false) {
9
10	// The pid_file_dir can be overridden via environment variable
11	// This is primarily intended to simplify testing

Line 0 Link Here

(-)files/patch-src-lib-process-Makefile.am (+9 lines)
	1	--- src/lib/process/Makefile.am.orig 2018-12-13 08:31:11.575325000 -0600
	2	+++ src/lib/process/Makefile.am 2018-12-13 08:31:37.252907000 -0600
	3	@@ -1,5 +1,5 @@
	4	SUBDIRS = . testutils tests
	5	-dhcp_data_dir = @localstatedir@/@PACKAGE@
	6	+dhcp_data_dir = @localstatedir@/run
	7	AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
	8	AM_CPPFLAGS += -DDATA_DIR="\"$(dhcp_data_dir)\""
	9




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	2018-08-15 13:54:01.170731000 -0500
+++ src/lib/dhcp/libdhcp++.cc
@@ -419,14 +419,14 @@
         // We previously did the lookup only for dhcp6 option space, but with the
         // addition of S46 options, we now do it for every 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
         // our option or we're searching for non-standard option. Try to
         // 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;
@@ -538,14 +538,14 @@
         // may be standard options in other spaces (e.g. radius). So we now do
         // the lookup for every 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
         // our option or we're searching for non-standard option. Try to
         // 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
@@ -638,7 +638,7 @@
                 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
@@ -746,7 +746,7 @@
                     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

Lines 1-6 Link Here

(-)pkg-plist (-35 / +86 lines)
1	bin/kea-msg-compiler	1	bin/kea-msg-compiler
2	include/kea/asiodns/io_fetch.h	2	include/kea/asiodns/io_fetch.h
3	include/kea/asiodns/logger.h	3	include/kea/asiodns/logger.h
		4	include/kea/asiolink/addr_utilities.h
4	include/kea/asiolink/asio_wrapper.h	5	include/kea/asiolink/asio_wrapper.h
5	include/kea/asiolink/asiolink.h	6	include/kea/asiolink/asiolink.h
6	include/kea/asiolink/dummy_io_cb.h	7	include/kea/asiolink/dummy_io_cb.h
Lines 26-31 Link Here
26	include/kea/cc/dhcp_config_error.h	27	include/kea/cc/dhcp_config_error.h
27	include/kea/cc/json_feed.h	28	include/kea/cc/json_feed.h
28	include/kea/cc/simple_parser.h	29	include/kea/cc/simple_parser.h
		30	include/kea/cc/stamped_element.h
		31	include/kea/cc/stamped_value.h
29	include/kea/cc/user_context.h	32	include/kea/cc/user_context.h
30	include/kea/cfgrpt/config_report.h	33	include/kea/cfgrpt/config_report.h
31	include/kea/config.h	34	include/kea/config.h
Lines 36-46 Link Here
36	include/kea/config/config_log.h	39	include/kea/config/config_log.h
37	include/kea/config/hooked_command_mgr.h	40	include/kea/config/hooked_command_mgr.h
38	include/kea/config/timeouts.h	41	include/kea/config/timeouts.h
		42	include/kea/config_backend/base_config_backend.h
		43	include/kea/config_backend/base_config_backend_mgr.h
		44	include/kea/config_backend/base_config_backend_pool.h
		45	include/kea/config_backend/constants.h
39	include/kea/cryptolink/crypto_hash.h	46	include/kea/cryptolink/crypto_hash.h
40	include/kea/cryptolink/crypto_hmac.h	47	include/kea/cryptolink/crypto_hmac.h
		48	include/kea/cryptolink/crypto_rng.h
41	include/kea/cryptolink/cryptolink.h	49	include/kea/cryptolink/cryptolink.h
42	include/kea/cryptolink/openssl_common.h	50	include/kea/cryptolink/openssl_common.h
43	include/kea/cryptolink/openssl_compat.h	51	include/kea/cryptolink/openssl_compat.h
		52	include/kea/database/backend_selector.h
		53	include/kea/database/database_connection.h
		54	include/kea/database/db_exceptions.h
		55	include/kea/database/db_log.h
		56	include/kea/database/dbaccess_parser.h
		57	include/kea/database/server_selector.h
44	include/kea/dhcp/classify.h	58	include/kea/dhcp/classify.h
45	include/kea/dhcp/dhcp4.h	59	include/kea/dhcp/dhcp4.h
46	include/kea/dhcp/dhcp6.h	60	include/kea/dhcp/dhcp6.h
Lines 56-61 Link Here
56	include/kea/dhcp/option4_addrlst.h	70	include/kea/dhcp/option4_addrlst.h
57	include/kea/dhcp/option4_client_fqdn.h	71	include/kea/dhcp/option4_client_fqdn.h
58	include/kea/dhcp/option6_addrlst.h	72	include/kea/dhcp/option6_addrlst.h
		73	include/kea/dhcp/option6_auth.h
59	include/kea/dhcp/option6_client_fqdn.h	74	include/kea/dhcp/option6_client_fqdn.h
60	include/kea/dhcp/option6_ia.h	75	include/kea/dhcp/option6_ia.h
61	include/kea/dhcp/option6_iaaddr.h	76	include/kea/dhcp/option6_iaaddr.h
Lines 73-78 Link Here
73	include/kea/dhcp/option_string.h	88	include/kea/dhcp/option_string.h
74	include/kea/dhcp/option_vendor.h	89	include/kea/dhcp/option_vendor.h
75	include/kea/dhcp/option_vendor_class.h	90	include/kea/dhcp/option_vendor_class.h
		91	include/kea/dhcp/packet_queue.h
		92	include/kea/dhcp/packet_queue_mgr.h
		93	include/kea/dhcp/packet_queue_mgr4.h
		94	include/kea/dhcp/packet_queue_mgr6.h
		95	include/kea/dhcp/packet_queue_ring.h
76	include/kea/dhcp/pkt.h	96	include/kea/dhcp/pkt.h
77	include/kea/dhcp/pkt4.h	97	include/kea/dhcp/pkt4.h
78	include/kea/dhcp/pkt4o6.h	98	include/kea/dhcp/pkt4o6.h
Lines 83-94 Link Here
83	include/kea/dhcp/pkt_filter_inet.h	103	include/kea/dhcp/pkt_filter_inet.h
84	include/kea/dhcp/pkt_filter_inet6.h	104	include/kea/dhcp/pkt_filter_inet6.h
85	include/kea/dhcp/protocol_util.h	105	include/kea/dhcp/protocol_util.h
		106	include/kea/dhcp/socket_info.h
86	include/kea/dhcp/std_option_defs.h	107	include/kea/dhcp/std_option_defs.h
87	include/kea/dhcp_ddns/dhcp_ddns_log.h	108	include/kea/dhcp_ddns/dhcp_ddns_log.h
88	include/kea/dhcp_ddns/ncr_io.h	109	include/kea/dhcp_ddns/ncr_io.h
89	include/kea/dhcp_ddns/ncr_msg.h	110	include/kea/dhcp_ddns/ncr_msg.h
90	include/kea/dhcp_ddns/ncr_udp.h	111	include/kea/dhcp_ddns/ncr_udp.h
91	include/kea/dhcpsrv/addr_utilities.h
92	include/kea/dhcpsrv/alloc_engine.h	112	include/kea/dhcpsrv/alloc_engine.h
93	include/kea/dhcpsrv/alloc_engine_log.h	113	include/kea/dhcpsrv/alloc_engine_log.h
94	include/kea/dhcpsrv/assignable_network.h	114	include/kea/dhcpsrv/assignable_network.h
Lines 96-101 Link Here
96	include/kea/dhcpsrv/cache_host_data_source.h	116	include/kea/dhcpsrv/cache_host_data_source.h
97	include/kea/dhcpsrv/callout_handle_store.h	117	include/kea/dhcpsrv/callout_handle_store.h
98	include/kea/dhcpsrv/cfg_4o6.h	118	include/kea/dhcpsrv/cfg_4o6.h
		119	include/kea/dhcpsrv/cfg_consistency.h
99	include/kea/dhcpsrv/cfg_db_access.h	120	include/kea/dhcpsrv/cfg_db_access.h
100	include/kea/dhcpsrv/cfg_duid.h	121	include/kea/dhcpsrv/cfg_duid.h
101	include/kea/dhcpsrv/cfg_expiration.h	122	include/kea/dhcpsrv/cfg_expiration.h
Lines 112-128 Link Here
112	include/kea/dhcpsrv/cfg_subnets6.h	133	include/kea/dhcpsrv/cfg_subnets6.h
113	include/kea/dhcpsrv/cfgmgr.h	134	include/kea/dhcpsrv/cfgmgr.h
114	include/kea/dhcpsrv/client_class_def.h	135	include/kea/dhcpsrv/client_class_def.h
		136	include/kea/dhcpsrv/config_backend_dhcp4.h
		137	include/kea/dhcpsrv/config_backend_dhcp4_mgr.h
		138	include/kea/dhcpsrv/config_backend_pool_dhcp4.h
115	include/kea/dhcpsrv/csv_lease_file4.h	139	include/kea/dhcpsrv/csv_lease_file4.h
116	include/kea/dhcpsrv/csv_lease_file6.h	140	include/kea/dhcpsrv/csv_lease_file6.h
117	include/kea/dhcpsrv/d2_client_cfg.h	141	include/kea/dhcpsrv/d2_client_cfg.h
118	include/kea/dhcpsrv/d2_client_mgr.h	142	include/kea/dhcpsrv/d2_client_mgr.h
119	include/kea/dhcpsrv/daemon.h
120	include/kea/dhcpsrv/database_connection.h
121	include/kea/dhcpsrv/db_exceptions.h
122	include/kea/dhcpsrv/db_log.h
123	include/kea/dhcpsrv/db_type.h	143	include/kea/dhcpsrv/db_type.h
124	include/kea/dhcpsrv/dhcp4o6_ipc.h	144	include/kea/dhcpsrv/dhcp4o6_ipc.h
125	include/kea/dhcpsrv/dhcpsrv_db_log.h	145	include/kea/dhcpsrv/dhcpsrv_exceptions.h
126	include/kea/dhcpsrv/dhcpsrv_log.h	146	include/kea/dhcpsrv/dhcpsrv_log.h
127	include/kea/dhcpsrv/host.h	147	include/kea/dhcpsrv/host.h
128	include/kea/dhcpsrv/host_container.h	148	include/kea/dhcpsrv/host_container.h
Lines 135-142 Link Here
135	include/kea/dhcpsrv/lease_file_stats.h	155	include/kea/dhcpsrv/lease_file_stats.h
136	include/kea/dhcpsrv/lease_mgr.h	156	include/kea/dhcpsrv/lease_mgr.h
137	include/kea/dhcpsrv/lease_mgr_factory.h	157	include/kea/dhcpsrv/lease_mgr_factory.h
138	include/kea/dhcpsrv/logging.h
139	include/kea/dhcpsrv/logging_info.h
140	include/kea/dhcpsrv/memfile_lease_mgr.h	158	include/kea/dhcpsrv/memfile_lease_mgr.h
141	include/kea/dhcpsrv/memfile_lease_storage.h	159	include/kea/dhcpsrv/memfile_lease_storage.h
142	include/kea/dhcpsrv/ncr_generator.h	160	include/kea/dhcpsrv/ncr_generator.h
Lines 143-150 Link Here
143	include/kea/dhcpsrv/network.h	161	include/kea/dhcpsrv/network.h
144	include/kea/dhcpsrv/network_state.h	162	include/kea/dhcpsrv/network_state.h
145	include/kea/dhcpsrv/parsers/client_class_def_parser.h	163	include/kea/dhcpsrv/parsers/client_class_def_parser.h
146	include/kea/dhcpsrv/parsers/dbaccess_parser.h
147	include/kea/dhcpsrv/parsers/dhcp_parsers.h	164	include/kea/dhcpsrv/parsers/dhcp_parsers.h
		165	include/kea/dhcpsrv/parsers/dhcp_queue_control_parser.h
148	include/kea/dhcpsrv/parsers/duid_config_parser.h	166	include/kea/dhcpsrv/parsers/duid_config_parser.h
149	include/kea/dhcpsrv/parsers/expiration_config_parser.h	167	include/kea/dhcpsrv/parsers/expiration_config_parser.h
150	include/kea/dhcpsrv/parsers/host_reservation_parser.h	168	include/kea/dhcpsrv/parsers/host_reservation_parser.h
Lines 151-163 Link Here
151	include/kea/dhcpsrv/parsers/host_reservations_list_parser.h	169	include/kea/dhcpsrv/parsers/host_reservations_list_parser.h
152	include/kea/dhcpsrv/parsers/ifaces_config_parser.h	170	include/kea/dhcpsrv/parsers/ifaces_config_parser.h
153	include/kea/dhcpsrv/parsers/option_data_parser.h	171	include/kea/dhcpsrv/parsers/option_data_parser.h
		172	include/kea/dhcpsrv/parsers/sanity_checks_parser.h
154	include/kea/dhcpsrv/parsers/shared_network_parser.h	173	include/kea/dhcpsrv/parsers/shared_network_parser.h
155	include/kea/dhcpsrv/parsers/shared_networks_list_parser.h	174	include/kea/dhcpsrv/parsers/shared_networks_list_parser.h
156	include/kea/dhcpsrv/parsers/simple_parser4.h	175	include/kea/dhcpsrv/parsers/simple_parser4.h
157	include/kea/dhcpsrv/parsers/simple_parser6.h	176	include/kea/dhcpsrv/parsers/simple_parser6.h
158	include/kea/dhcpsrv/pool.h	177	include/kea/dhcpsrv/pool.h
		178	include/kea/dhcpsrv/sanity_checker.h
159	include/kea/dhcpsrv/shared_network.h	179	include/kea/dhcpsrv/shared_network.h
160	include/kea/dhcpsrv/sql_common.h
161	include/kea/dhcpsrv/srv_config.h	180	include/kea/dhcpsrv/srv_config.h
162	include/kea/dhcpsrv/subnet.h	181	include/kea/dhcpsrv/subnet.h
163	include/kea/dhcpsrv/subnet_id.h	182	include/kea/dhcpsrv/subnet_id.h
Lines 201-206 Link Here
201	include/kea/dns/tsigkey.h	220	include/kea/dns/tsigkey.h
202	include/kea/dns/tsigrecord.h	221	include/kea/dns/tsigrecord.h
203	include/kea/dns/zone_checker.h	222	include/kea/dns/zone_checker.h
		223	include/kea/eval/dependency.h
204	include/kea/eval/eval_context.h	224	include/kea/eval/eval_context.h
205	include/kea/eval/eval_context_decl.h	225	include/kea/eval/eval_context_decl.h
206	include/kea/eval/eval_log.h	226	include/kea/eval/eval_log.h
Lines 247-252 Link Here
247	include/kea/http/response_json.h	267	include/kea/http/response_json.h
248	include/kea/http/response_parser.h	268	include/kea/http/response_parser.h
249	include/kea/http/url.h	269	include/kea/http/url.h
		270	include/kea/kea_version.h
250	include/kea/log/buffer_appender_impl.h	271	include/kea/log/buffer_appender_impl.h
251	include/kea/log/interprocess/interprocess_sync.h	272	include/kea/log/interprocess/interprocess_sync.h
252	include/kea/log/interprocess/interprocess_sync_file.h	273	include/kea/log/interprocess/interprocess_sync_file.h
Lines 272-282 Link Here
272	include/kea/log/message_reader.h	293	include/kea/log/message_reader.h
273	include/kea/log/message_types.h	294	include/kea/log/message_types.h
274	include/kea/log/output_option.h	295	include/kea/log/output_option.h
		296	include/kea/process/config_base.h
		297	include/kea/process/config_ctl_info.h
		298	include/kea/process/config_ctl_parser.h
275	include/kea/process/d_cfg_mgr.h	299	include/kea/process/d_cfg_mgr.h
276	include/kea/process/d_controller.h	300	include/kea/process/d_controller.h
277	include/kea/process/d_log.h	301	include/kea/process/d_log.h
278	include/kea/process/d_process.h	302	include/kea/process/d_process.h
		303	include/kea/process/daemon.h
279	include/kea/process/io_service_signal.h	304	include/kea/process/io_service_signal.h
		305	include/kea/process/log_parser.h
		306	include/kea/process/logging_info.h
280	include/kea/stats/context.h	307	include/kea/stats/context.h
281	include/kea/stats/observation.h	308	include/kea/stats/observation.h
282	include/kea/stats/stats_mgr.h	309	include/kea/stats/stats_mgr.h
Lines 316-321 Link Here
316	include/kea/util/strutil.h	343	include/kea/util/strutil.h
317	include/kea/util/threads/sync.h	344	include/kea/util/threads/sync.h
318	include/kea/util/threads/thread.h	345	include/kea/util/threads/thread.h
		346	include/kea/util/threads/watched_thread.h
319	include/kea/util/time_utilities.h	347	include/kea/util/time_utilities.h
320	include/kea/util/versioned_csv_file.h	348	include/kea/util/versioned_csv_file.h
321	include/kea/util/watch_socket.h	349	include/kea/util/watch_socket.h
Lines 331-354 Link Here
331	lib/libkea-asiodns.so.0.0.2	359	lib/libkea-asiodns.so.0.0.2
332	lib/libkea-asiolink.a	360	lib/libkea-asiolink.a
333	lib/libkea-asiolink.so	361	lib/libkea-asiolink.so
334	lib/libkea-asiolink.so.6	362	lib/libkea-asiolink.so.7
335	lib/libkea-asiolink.so.6.0.1	363	lib/libkea-asiolink.so.7.0.0
336	lib/libkea-cc.a	364	lib/libkea-cc.a
337	lib/libkea-cc.so	365	lib/libkea-cc.so
338	lib/libkea-cc.so.5	366	lib/libkea-cc.so.7
339	lib/libkea-cc.so.5.0.0	367	lib/libkea-cc.so.7.0.0
340	lib/libkea-cfgclient.a	368	lib/libkea-cfgclient.a
341	lib/libkea-cfgclient.so	369	lib/libkea-cfgclient.so
342	lib/libkea-cfgclient.so.5	370	lib/libkea-cfgclient.so.6
343	lib/libkea-cfgclient.so.5.0.1	371	lib/libkea-cfgclient.so.6.0.0
344	lib/libkea-cryptolink.a	372	lib/libkea-cryptolink.a
345	lib/libkea-cryptolink.so	373	lib/libkea-cryptolink.so
346	lib/libkea-cryptolink.so.3	374	lib/libkea-cryptolink.so.4
347	lib/libkea-cryptolink.so.3.0.0	375	lib/libkea-cryptolink.so.4.0.0
		376	lib/libkea-database.a
		377	lib/libkea-database.so
		378	lib/libkea-database.so.1
		379	lib/libkea-database.so.1.0.0
348	lib/libkea-dhcp++.a	380	lib/libkea-dhcp++.a
349	lib/libkea-dhcp++.so	381	lib/libkea-dhcp++.so
350	lib/libkea-dhcp++.so.8	382	lib/libkea-dhcp++.so.11
351	lib/libkea-dhcp++.so.8.0.0	383	lib/libkea-dhcp++.so.11.0.0
352	lib/libkea-dhcp_ddns.a	384	lib/libkea-dhcp_ddns.a
353	lib/libkea-dhcp_ddns.so	385	lib/libkea-dhcp_ddns.so
354	lib/libkea-dhcp_ddns.so.1	386	lib/libkea-dhcp_ddns.so.1
Lines 355-370 Link Here
355	lib/libkea-dhcp_ddns.so.1.0.3	387	lib/libkea-dhcp_ddns.so.1.0.3
356	lib/libkea-dhcpsrv.a	388	lib/libkea-dhcpsrv.a
357	lib/libkea-dhcpsrv.so	389	lib/libkea-dhcpsrv.so
358	lib/libkea-dhcpsrv.so.11	390	lib/libkea-dhcpsrv.so.14
359	lib/libkea-dhcpsrv.so.11.0.0	391	lib/libkea-dhcpsrv.so.14.0.0
360	lib/libkea-dns++.a	392	lib/libkea-dns++.a
361	lib/libkea-dns++.so	393	lib/libkea-dns++.so
362	lib/libkea-dns++.so.2	394	lib/libkea-dns++.so.3
363	lib/libkea-dns++.so.2.0.1	395	lib/libkea-dns++.so.3.0.0
364	lib/libkea-eval.a	396	lib/libkea-eval.a
365	lib/libkea-eval.so	397	lib/libkea-eval.so
366	lib/libkea-eval.so.7	398	lib/libkea-eval.so.10
367	lib/libkea-eval.so.7.0.1	399	lib/libkea-eval.so.10.0.0
368	lib/libkea-exceptions.a	400	lib/libkea-exceptions.a
369	lib/libkea-exceptions.so	401	lib/libkea-exceptions.so
370	lib/libkea-exceptions.so.0	402	lib/libkea-exceptions.so.0
Lines 372-382 Link Here
372	lib/libkea-hooks.a	404	lib/libkea-hooks.a
373	lib/libkea-hooks.so	405	lib/libkea-hooks.so
374	lib/libkea-hooks.so.7	406	lib/libkea-hooks.so.7
375	lib/libkea-hooks.so.7.0.0	407	lib/libkea-hooks.so.7.0.2
376	lib/libkea-http.a	408	lib/libkea-http.a
377	lib/libkea-http.so	409	lib/libkea-http.so
378	lib/libkea-http.so.2	410	lib/libkea-http.so.4
379	lib/libkea-http.so.2.0.0	411	lib/libkea-http.so.4.0.0
380	lib/libkea-log.a	412	lib/libkea-log.a
381	lib/libkea-log.so	413	lib/libkea-log.so
382	lib/libkea-log.so.3	414	lib/libkea-log.so.3
Lines 383-390 Link Here
383	lib/libkea-log.so.3.0.1	415	lib/libkea-log.so.3.0.1
384	lib/libkea-process.a	416	lib/libkea-process.a
385	lib/libkea-process.so	417	lib/libkea-process.so
386	lib/libkea-process.so.2	418	lib/libkea-process.so.3
387	lib/libkea-process.so.2.0.1	419	lib/libkea-process.so.3.0.0
388	lib/libkea-stats.a	420	lib/libkea-stats.a
389	lib/libkea-stats.so	421	lib/libkea-stats.so
390	lib/libkea-stats.so.2	422	lib/libkea-stats.so.2
Lines 391-398 Link Here
391	lib/libkea-stats.so.2.0.2	423	lib/libkea-stats.so.2.0.2
392	lib/libkea-threads.a	424	lib/libkea-threads.a
393	lib/libkea-threads.so	425	lib/libkea-threads.so
394	lib/libkea-threads.so.1	426	lib/libkea-threads.so.2
395	lib/libkea-threads.so.1.0.0	427	lib/libkea-threads.so.2.0.0
396	lib/libkea-util-io.a	428	lib/libkea-util-io.a
397	lib/libkea-util-io.so	429	lib/libkea-util-io.so
398	lib/libkea-util-io.so.0	430	lib/libkea-util-io.so.0
Lines 399-406 Link Here
399	lib/libkea-util-io.so.0.0.1	431	lib/libkea-util-io.so.0.0.1
400	lib/libkea-util.a	432	lib/libkea-util.a
401	lib/libkea-util.so	433	lib/libkea-util.so
402	lib/libkea-util.so.3	434	lib/libkea-util.so.5
403	lib/libkea-util.so.3.0.1	435	lib/libkea-util.so.5.0.0
404	libdata/pkgconfig/dns++.pc	436	libdata/pkgconfig/dns++.pc
405	man/man8/kea-admin.8.gz	437	man/man8/kea-admin.8.gz
406	man/man8/kea-ctrl-agent.8.gz	438	man/man8/kea-ctrl-agent.8.gz
Lines 423-428 Link Here
423	%%DATADIR%%/scripts/cql/dhcpdb_drop.cql	455	%%DATADIR%%/scripts/cql/dhcpdb_drop.cql
424	%%DATADIR%%/scripts/cql/soft_wipe.cql	456	%%DATADIR%%/scripts/cql/soft_wipe.cql
425	%%DATADIR%%/scripts/cql/upgrade_1.0_to_2.0.sh	457	%%DATADIR%%/scripts/cql/upgrade_1.0_to_2.0.sh
		458	%%DATADIR%%/scripts/cql/upgrade_2.0_to_3.0.sh
426	%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql	459	%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql
427	%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql	460	%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql
428	%%DATADIR%%/scripts/mysql/upgrade_1.0_to_2.0.sh	461	%%DATADIR%%/scripts/mysql/upgrade_1.0_to_2.0.sh
Lines 433-438 Link Here
433	%%DATADIR%%/scripts/mysql/upgrade_5.0_to_5.1.sh	466	%%DATADIR%%/scripts/mysql/upgrade_5.0_to_5.1.sh
434	%%DATADIR%%/scripts/mysql/upgrade_5.1_to_5.2.sh	467	%%DATADIR%%/scripts/mysql/upgrade_5.1_to_5.2.sh
435	%%DATADIR%%/scripts/mysql/upgrade_5.2_to_6.0.sh	468	%%DATADIR%%/scripts/mysql/upgrade_5.2_to_6.0.sh
		469	%%DATADIR%%/scripts/mysql/upgrade_6.0_to_7.0.sh
436	%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql	470	%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql
437	%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql	471	%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql
438	%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh	472	%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh
Lines 441-449 Link Here
441	%%DATADIR%%/scripts/pgsql/upgrade_3.1_to_3.2.sh	475	%%DATADIR%%/scripts/pgsql/upgrade_3.1_to_3.2.sh
442	%%DATADIR%%/scripts/pgsql/upgrade_3.2_to_3.3.sh	476	%%DATADIR%%/scripts/pgsql/upgrade_3.2_to_3.3.sh
443	%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh	477	%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh
		478	%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
		479	%%DATADIR%%/yang/modules/ietf-dhcpv6-client@2018-09-04.yang
		480	%%DATADIR%%/yang/modules/ietf-dhcpv6-options@2018-09-04.yang
		481	%%DATADIR%%/yang/modules/ietf-dhcpv6-relay@2018-09-04.yang
		482	%%DATADIR%%/yang/modules/ietf-dhcpv6-server@2018-09-04.yang
		483	%%DATADIR%%/yang/modules/ietf-dhcpv6-types@2018-09-04.yang
		484	%%DATADIR%%/yang/modules/ietf-inet-types@2013-07-15.yang
		485	%%DATADIR%%/yang/modules/ietf-interfaces@2014-05-08.yang
		486	%%DATADIR%%/yang/modules/ietf-yang-types@2013-07-15.yang
		487	%%DATADIR%%/yang/modules/kea-ctrl-agent@2018-11-20.yang
		488	%%DATADIR%%/yang/modules/kea-dhcp-ddns@2018-11-20.yang
		489	%%DATADIR%%/yang/modules/kea-dhcp-types@2018-11-20.yang
		490	%%DATADIR%%/yang/modules/kea-dhcp4-server@2018-11-20.yang
		491	%%DATADIR%%/yang/modules/kea-dhcp6-server@2018-11-20.yang
		492	%%DATADIR%%/yang/modules/kea-logging@2018-11-20.yang
		493	%%DATADIR%%/yang/modules/kea-types@2018-11-20.yang
444	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample	494	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
445	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample	495	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
446	@sample %%ETCDIR%%/kea-dhcp4.conf.sample	496	@sample %%ETCDIR%%/kea-dhcp4.conf.sample
447	@sample %%ETCDIR%%/kea-dhcp6.conf.sample	497	@sample %%ETCDIR%%/kea-dhcp6.conf.sample
		498	@sample %%ETCDIR%%/kea-netconf.conf.sample
448	@sample %%ETCDIR%%/keactrl.conf.sample	499	@sample %%ETCDIR%%/keactrl.conf.sample
449	@dir /var/db/kea	500	@dir /var/db/kea

Return to bug 234032

Lines 1-81 Link Here

(-)files/patch-src_lib_dhcp_libdhcp++.cc (-81 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 2018-08-15 13:54:01.170731000 -0500
29	+++ src/lib/dhcp/libdhcp++.cc
30	@@ -419,14 +419,14 @@
31	// We previously did the lookup only for dhcp6 option space, but with the
32	// addition of S46 options, we now do it for every 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	// Standard option definitions do not include the definition for
38	// our option or we're searching for non-standard option. Try to
39	// find the definition among runtime option definitions.
40	if (num_defs == 0) {
41	range = runtime_idx.equal_range(opt_type);
42	- num_defs = distance(range.first, range.second);
43	+ num_defs = std::distance(range.first, range.second);
44	}
45
46	OptionPtr opt;
47	@@ -538,14 +538,14 @@
48	// may be standard options in other spaces (e.g. radius). So we now do
49	// the lookup for every space.
50	range = idx.equal_range(opt_type);
51	- num_defs = distance(range.first, range.second);
52	+ num_defs = std::distance(range.first, range.second);
53
54	// Standard option definitions do not include the definition for
55	// our option or we're searching for non-standard option. Try to
56	// find the definition among runtime option definitions.
57	if (num_defs == 0) {
58	range = runtime_idx.equal_range(opt_type);
59	- num_defs = distance(range.first, range.second);
60	+ num_defs = std::distance(range.first, range.second);
61	}
62
63	// Check if option unpacking must be deferred
64	@@ -638,7 +638,7 @@
65	idx->equal_range(opt_type);
66	// Get the number of returned option definitions for the
67	// option code.
68	- size_t num_defs = distance(range.first, range.second);
69	+ size_t num_defs = std::distance(range.first, range.second);
70
71	if (num_defs > 1) {
72	// Multiple options of the same code are not supported
73	@@ -746,7 +746,7 @@
74	idx->equal_range(opt_type);
75	// Get the number of returned option definitions for
76	// the option code.
77	- size_t num_defs = distance(range.first, range.second);
78	+ size_t num_defs = std::distance(range.first, range.second);
79
80	if (num_defs > 1) {
81	// Multiple options of the same code are not