Attachment #207268 for bug #240399





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

		libboost_system.so:devel/boost-libs

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

CPE_VENDOR=	isc
CPE_VERSION=	${ISCVERSION:C/-.*//}

TEST_TARGET=	check

PORTDOCS=	AUTHORS COPYING ChangeLog README \
		CONTRIBUTING.md examples
		kea-messages.html kea-logo-100x70.png \
		examples

OPTIONS_DEFINE=	DOCS MYSQL PGSQL
OPTIONS_SUB=	yes

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1544845580	1	TIMESTAMP = 1567876702
2	SHA256 (kea-1.5.0.tar.gz) = edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec	2	SHA256 (kea-1.6.0.tar.gz) = 44ed48c729e4618fffcf0086529b469f7232990983187b2f71fce89f1ac6e270
3	SIZE (kea-1.5.0.tar.gz) = 7395257	3	SIZE (kea-1.6.0.tar.gz) = 7154301

Lines 1-11 Link Here

(-)files/patch-Makefile.am (-6 / +5 lines)
1	--- Makefile.am.orig 2018-02-28 03:44:09 UTC	1	--- Makefile.am.orig 2019-09-07 13:19:16.709194000 -0500
2	+++ Makefile.am	2	+++ Makefile.am 2019-09-07 13:20:04.760926000 -0500
3	@@ -115,7 +115,7 @@ cppcheck:	3	@@ -154,7 +154,6 @@
4	# These steps are necessary during installation	4	# These steps are necessary during installation
5	install-exec-hook:	5	install-exec-hook:
6	mkdir -p $(DESTDIR)${localstatedir}/log/	6	mkdir -p $(DESTDIR)${localstatedir}/log/
7	- mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}	7	- mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
8	+ mkdir -p $(DESTDIR)${localstatedir}/run/	8	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
9		9
10	EXTRA_DIST = tools/path_replacer.sh	10	EXTRA_DIST = tools/path_replacer.sh
11	EXTRA_DIST += tools/mk_cfgrpt.sh

Lines 1-6 Link Here

(-)files/patch-src-bin-keactrl-Makefile.am (-3 / +3 lines)
1	--- src/bin/keactrl/Makefile.am.orig 2018-02-28 03:44:09 UTC	1	--- src/bin/keactrl/Makefile.am.orig 2019-09-07 12:46:25.279164000 -0500
2	+++ src/bin/keactrl/Makefile.am	2	+++ src/bin/keactrl/Makefile.am 2019-09-07 12:46:32.455324000 -0500
3	@@ -68,7 +68,7 @@ install-data-local:	3	@@ -62,7 +62,7 @@
4	$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \	4	$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \
5	fi; \	5	fi; \
6	if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \	6	if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \




--- src/bin/keactrl/keactrl.in.orig	2017-10-24 21:57:38 UTC
+++ src/bin/keactrl/keactrl.in
@@ -85,7 +85,7 @@ get_pid_from_file() {
     local conf_name=$(basename ${kea_config_file} | cut -f1 -d'.')
 
     # Default the directory to --localstatedir
-    local pid_file_dir=@localstatedir@/@PACKAGE@
+    local pid_file_dir=@localstatedir@/run
 
     # Use directory override if set (primarily for testing only)
     if [ ! -z $KEA_PIDFILE_DIR ]; then
@@ -271,7 +271,7 @@ run_conditional() {
 # to the default file.
 if [ -z ${KEA_LOGGER_DESTINATION} ]; then
     prefix=@prefix@
-    export KEA_LOGGER_DESTINATION=@localstatedir@/@PACKAGE@/kea.log
+    export KEA_LOGGER_DESTINATION=@localstatedir@/log/kea.log
 fi
 
 command=${1}




--- src/lib/dhcpsrv/Makefile.am.orig	2019-09-07 13:00:43.923225000 -0500
+++ src/lib/dhcpsrv/Makefile.am	2019-09-07 13:02:13.215945000 -0500
@@ -4,7 +4,7 @@
 
 # DATA_DIR is the directory where to put default CSV files and the DHCPv6
 # server ID file (i.e. the file where the server finds its DUID at startup).
-dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
+dhcp_data_dir = @localstatedir@/db/@PACKAGE@
 kea_lfc_location = @prefix@/sbin/kea-lfc
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\"" -DKEA_PIDFILE_DIR="\"@localstatedir@/run\""
 AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
 # Set location of the kea-lfc binary.
 AM_CPPFLAGS += -DKEA_LFC_EXECUTABLE="\"$(kea_lfc_location)\""

Lines 1-11 Link Here

(-)files/patch-src-lib-log-interprocess-Makefile.am (-11 lines)
1	--- src/lib/log/interprocess/Makefile.am.orig 2015-12-28 12:18:05 UTC
2	+++ src/lib/log/interprocess/Makefile.am
3	@@ -1,7 +1,7 @@
4	SUBDIRS = . tests
5
6	AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
7	-AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\"
8	+AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run\"
9	AM_CPPFLAGS += $(BOOST_INCLUDES)
10
11	AM_CXXFLAGS = $(KEA_CXXFLAGS)

Lines 1-9 Link Here

(-)files/patch-src-lib-process-Makefile.am (-9 lines)
1	--- src/lib/process/Makefile.am.orig 2018-12-30 16:56:27 UTC
2	+++ src/lib/process/Makefile.am
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




include/kea/asiodns/asiodns_messages.h
include/kea/asiodns/io_fetch.h
include/kea/asiodns/logger.h
include/kea/asiolink/addr_utilities.h

include/kea/asiolink/unix_domain_socket.h
include/kea/asiolink/unix_domain_socket_acceptor.h
include/kea/asiolink/unix_domain_socket_endpoint.h
include/kea/cc/base_stamped_element.h
include/kea/cc/cfg_to_element.h
include/kea/cc/command_interpreter.h
include/kea/cc/data.h
include/kea/cc/dhcp_config_error.h
include/kea/cc/element_value.h
include/kea/cc/json_feed.h
include/kea/cc/server_tag.h
include/kea/cc/simple_parser.h
include/kea/cc/stamped_element.h
include/kea/cc/stamped_value.h

include/kea/config/cmds_impl.h
include/kea/config/command_mgr.h
include/kea/config/config_log.h
include/kea/config/config_messages.h
include/kea/config/hooked_command_mgr.h
include/kea/config/timeouts.h
include/kea/config_backend/base_config_backend.h

include/kea/cryptolink/cryptolink.h
include/kea/cryptolink/openssl_common.h
include/kea/cryptolink/openssl_compat.h
include/kea/database/audit_entry.h
include/kea/database/backend_selector.h
include/kea/database/database_connection.h
include/kea/database/db_exceptions.h
include/kea/database/db_log.h
include/kea/database/db_messages.h
include/kea/database/dbaccess_parser.h
include/kea/database/server.h
include/kea/database/server_collection.h
include/kea/database/server_selector.h
include/kea/dhcp/classify.h
include/kea/dhcp/dhcp4.h

include/kea/dhcp/socket_info.h
include/kea/dhcp/std_option_defs.h
include/kea/dhcp_ddns/dhcp_ddns_log.h
include/kea/dhcp_ddns/dhcp_ddns_messages.h
include/kea/dhcp_ddns/ncr_io.h
include/kea/dhcp_ddns/ncr_msg.h
include/kea/dhcp_ddns/ncr_udp.h
include/kea/dhcpsrv/alloc_engine.h
include/kea/dhcpsrv/alloc_engine_log.h
include/kea/dhcpsrv/alloc_engine_messages.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/cb_ctl_dhcp.h
include/kea/dhcpsrv/cb_ctl_dhcp4.h
include/kea/dhcpsrv/cb_ctl_dhcp6.h
include/kea/dhcpsrv/cfg_4o6.h
include/kea/dhcpsrv/cfg_consistency.h
include/kea/dhcpsrv/cfg_db_access.h

include/kea/dhcpsrv/client_class_def.h
include/kea/dhcpsrv/config_backend_dhcp4.h
include/kea/dhcpsrv/config_backend_dhcp4_mgr.h
include/kea/dhcpsrv/config_backend_dhcp6.h
include/kea/dhcpsrv/config_backend_dhcp6_mgr.h
include/kea/dhcpsrv/config_backend_pool_dhcp4.h
include/kea/dhcpsrv/config_backend_pool_dhcp6.h
include/kea/dhcpsrv/csv_lease_file4.h
include/kea/dhcpsrv/csv_lease_file6.h
include/kea/dhcpsrv/d2_client_cfg.h

include/kea/dhcpsrv/dhcp4o6_ipc.h
include/kea/dhcpsrv/dhcpsrv_exceptions.h
include/kea/dhcpsrv/dhcpsrv_log.h
include/kea/dhcpsrv/dhcpsrv_messages.h
include/kea/dhcpsrv/host.h
include/kea/dhcpsrv/host_container.h
include/kea/dhcpsrv/host_data_source_factory.h
include/kea/dhcpsrv/host_mgr.h
include/kea/dhcpsrv/hosts_log.h
include/kea/dhcpsrv/hosts_messages.h
include/kea/dhcpsrv/key_from_key.h
include/kea/dhcpsrv/lease.h
include/kea/dhcpsrv/lease_file_loader.h

include/kea/dhcpsrv/ncr_generator.h
include/kea/dhcpsrv/network.h
include/kea/dhcpsrv/network_state.h
include/kea/dhcpsrv/parsers/base_network_parser.h
include/kea/dhcpsrv/parsers/client_class_def_parser.h
include/kea/dhcpsrv/parsers/dhcp_parsers.h
include/kea/dhcpsrv/parsers/dhcp_queue_control_parser.h

include/kea/dhcpsrv/parsers/shared_networks_list_parser.h
include/kea/dhcpsrv/parsers/simple_parser4.h
include/kea/dhcpsrv/parsers/simple_parser6.h
include/kea/dhcpsrv/pool.h
%%PGSQL%%include/kea/dhcpsrv/pgsql_host_data_source.h
%%PGSQL%%include/kea/dhcpsrv/pgsql_lease_mgr.h
include/kea/dhcpsrv/pool.h
include/kea/dhcpsrv/sanity_checker.h
include/kea/dhcpsrv/shared_network.h
include/kea/dhcpsrv/srv_config.h

include/kea/eval/eval_context.h
include/kea/eval/eval_context_decl.h
include/kea/eval/eval_log.h
include/kea/eval/eval_messages.h
include/kea/eval/evaluate.h
include/kea/eval/parser.h
include/kea/eval/token.h
include/kea/exceptions/exceptions.h
include/kea/exceptions/isc_assert.h
include/kea/hooks/callout_handle.h
include/kea/hooks/callout_handle_associate.h
include/kea/hooks/callout_manager.h

include/kea/hooks/hooks_config.h
include/kea/hooks/hooks_log.h
include/kea/hooks/hooks_manager.h
include/kea/hooks/hooks_messages.h
include/kea/hooks/hooks_parser.h
include/kea/hooks/libinfo.h
include/kea/hooks/library_handle.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_messages.h
include/kea/http/http_types.h
include/kea/http/listener.h
include/kea/http/listener_impl.h
include/kea/http/post_request.h
include/kea/http/post_request_json.h
include/kea/http/request.h

%%MYSQL%%include/kea/mysql/mysql_constants.h
%%PGSQL%%include/kea/pgsql/pgsql_connection.h
%%PGSQL%%include/kea/pgsql/pgsql_exchange.h
include/kea/process/cb_ctl_base.h
include/kea/process/config_base.h
include/kea/process/config_ctl_info.h
include/kea/process/config_ctl_parser.h

include/kea/process/io_service_signal.h
include/kea/process/log_parser.h
include/kea/process/logging_info.h
include/kea/process/process_messages.h
include/kea/stats/context.h
include/kea/stats/observation.h
include/kea/stats/stats_mgr.h

include/kea/util/boost_time_utils.h
include/kea/util/buffer.h
include/kea/util/csv_file.h
include/kea/util/doubles.h
include/kea/util/encode/base16_from_binary.h
include/kea/util/encode/base32hex.h
include/kea/util/encode/base32hex_from_binary.h

include/kea/util/io/fd_share.h
include/kea/util/io/pktinfo_utilities.h
include/kea/util/io/sockaddr_util.h
include/kea/util/io/socketsession.h
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/optional.h
include/kea/util/pid_file.h
include/kea/util/pointer_util.h
include/kea/util/process_spawn.h

include/kea/util/time_utilities.h
include/kea/util/versioned_csv_file.h
include/kea/util/watch_socket.h
lib/kea/hooks/libdhcp_ha.a
lib/kea/hooks/libdhcp_ha.so
lib/kea/hooks/libdhcp_lease_cmds.a
lib/kea/hooks/libdhcp_lease_cmds.so
%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.a
%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.so
lib/kea/hooks/libdhcp_stat_cmds.a
lib/kea/hooks/libdhcp_stat_cmds.so
lib/libkea-asiodns.a
lib/libkea-asiodns.so
lib/libkea-asiodns.so.0

lib/libkea-asiolink.a
lib/libkea-asiolink.so
lib/libkea-asiolink.so.7
lib/libkea-asiolink.so.7.0.2
lib/libkea-cc.a
lib/libkea-cc.so
lib/libkea-cc.so.8
lib/libkea-cc.so.8.1.1
lib/libkea-cfgclient.a
lib/libkea-cfgclient.so
lib/libkea-cfgclient.so.7
lib/libkea-cfgclient.so.7.0.1
lib/libkea-cryptolink.a
lib/libkea-cryptolink.so
lib/libkea-cryptolink.so.4

lib/libkea-cryptolink.so.4.0.0
lib/libkea-database.a
lib/libkea-database.so
lib/libkea-database.so.3
lib/libkea-database.so.3.1.0
lib/libkea-dhcp++.a
lib/libkea-dhcp++.so
lib/libkea-dhcp++.so.13
lib/libkea-dhcp++.so.13.0.1
lib/libkea-dhcp_ddns.a
lib/libkea-dhcp_ddns.so
lib/libkea-dhcp_ddns.so.1
lib/libkea-dhcp_ddns.so.1.0.5
lib/libkea-dhcpsrv.a
lib/libkea-dhcpsrv.so
lib/libkea-dhcpsrv.so.16
lib/libkea-dhcpsrv.so.16.0.1
lib/libkea-dns++.a
lib/libkea-dns++.so
lib/libkea-dns++.so.3
lib/libkea-dns++.so.3.0.1
lib/libkea-eval.a
lib/libkea-eval.so
lib/libkea-eval.so.11
lib/libkea-eval.so.11.0.0
lib/libkea-exceptions.a
lib/libkea-exceptions.so
lib/libkea-exceptions.so.0
lib/libkea-exceptions.so.0.2.0
lib/libkea-hooks.a
lib/libkea-hooks.so
lib/libkea-hooks.so.7
lib/libkea-hooks.so.7.0.3
lib/libkea-http.a
lib/libkea-http.so
lib/libkea-http.so.6
lib/libkea-http.so.6.0.1
lib/libkea-log.a
lib/libkea-log.so
lib/libkea-log.so.4
lib/libkea-log.so.4.0.0
%%MYSQL%%lib/libkea-mysql.a
%%MYSQL%%lib/libkea-mysql.so
%%MYSQL%%lib/libkea-mysql.so.1
%%MYSQL%%lib/libkea-mysql.so.1.0.2
%%PGSQL%%lib/libkea-pgsql.a
%%PGSQL%%lib/libkea-pgsql.so
%%PGSQL%%lib/libkea-pgsql.so.0
%%PGSQL%%lib/libkea-pgsql.so.0.0.2
lib/libkea-process.a
lib/libkea-process.so
lib/libkea-process.so.4
lib/libkea-process.so.4.2.0
lib/libkea-stats.a
lib/libkea-stats.so
lib/libkea-stats.so.3
lib/libkea-stats.so.3.1.0
lib/libkea-threads.a
lib/libkea-threads.so
lib/libkea-threads.so.2

lib/libkea-util-io.so.0.0.1
lib/libkea-util.a
lib/libkea-util.so
lib/libkea-util.so.7
lib/libkea-util.so.7.0.0
libdata/pkgconfig/dns++.pc
man/man8/kea-admin.8.gz
man/man8/kea-ctrl-agent.8.gz
man/man8/kea-dhcp-ddns.8.gz
man/man8/kea-dhcp4.8.gz
man/man8/kea-dhcp6.8.gz
man/man8/kea-lfc.8.gz
man/man8/keactrl.8.gz
man/man8/perfdhcp.8.gz
sbin/kea-admin
sbin/kea-ctrl-agent
sbin/kea-dhcp-ddns

sbin/kea-dhcp6
sbin/kea-lfc
sbin/keactrl
sbin/perfdhcp
%%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/cql/upgrade_2.0_to_3.0.sh
%%DATADIR%%/scripts/cql/upgrade_3.0_to_4.0.sh
%%DATADIR%%/scripts/cql/wipe_data.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_5.1_to_5.2.sh
%%DATADIR%%/scripts/mysql/upgrade_5.2_to_6.0.sh
%%DATADIR%%/scripts/mysql/upgrade_6.0_to_7.0.sh
%%DATADIR%%/scripts/mysql/upgrade_7.0_to_8.0.sh
%%DATADIR%%/scripts/mysql/upgrade_8.0_to_8.1.sh
%%DATADIR%%/scripts/mysql/upgrade_8.1_to_8.2.sh
%%DATADIR%%/scripts/mysql/wipe_data.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_3.2_to_3.3.sh
%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh
%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
%%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh
%%DATADIR%%/scripts/pgsql/wipe_data.sh
%%DATADIR%%/yang/modules/ietf-dhcpv6-relay@2018-09-04.yang
%%DATADIR%%/yang/modules/ietf-dhcpv6-server@2018-09-04.yang
%%DATADIR%%/yang/modules/ietf-dhcpv6-types@2018-09-04.yang
%%DATADIR%%/yang/modules/ietf-inet-types@2013-07-15.yang
%%DATADIR%%/yang/modules/ietf-interfaces@2014-05-08.yang
%%DATADIR%%/yang/modules/ietf-yang-types@2013-07-15.yang
%%DATADIR%%/yang/modules/kea-ctrl-agent@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-dhcp-ddns@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-dhcp-types@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-dhcp4-server@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-dhcp6-server@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-logging@2018-11-20.yang
%%DATADIR%%/yang/modules/kea-types@2018-11-20.yang
@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
@sample %%ETCDIR%%/kea-dhcp4.conf.sample
@sample %%ETCDIR%%/kea-dhcp6.conf.sample
@sample %%ETCDIR%%/kea-netconf.conf.sample
@sample %%ETCDIR%%/keactrl.conf.sample
@dir /var/db/kea
@dir /var/run/kea

Return to bug 240399

Lines 2-8 Link Here

(-)Makefile (-5 / +3 lines)
2		2
3	PORTNAME= kea	3	PORTNAME= kea
4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}	4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}
5	PORTREVISION= 3	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	libboost_system.so:devel/boost-libs	19	libboost_system.so:devel/boost-libs
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.5.0	22	ISCVERSION= 1.6.0
23		23
24	CPE_VENDOR= isc	24	CPE_VENDOR= isc
25	CPE_VERSION= ${ISCVERSION:C/-.*//}	25	CPE_VERSION= ${ISCVERSION:C/-.*//}
Lines 40-48 Link Here
40	TEST_TARGET= check	40	TEST_TARGET= check
41		41
42	PORTDOCS= AUTHORS COPYING ChangeLog README \	42	PORTDOCS= AUTHORS COPYING ChangeLog README \
43	kea-guide.css kea-guide.html kea-guide.txt \	43	CONTRIBUTING.md examples
44	kea-messages.html kea-logo-100x70.png \
45	examples
46		44
47	OPTIONS_DEFINE= DOCS MYSQL PGSQL	45	OPTIONS_DEFINE= DOCS MYSQL PGSQL
48	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes

Lines 1-20 Link Here

(-)files/patch-src-bin-keactrl-keactrl.in (-20 lines)
1	--- src/bin/keactrl/keactrl.in.orig 2017-10-24 21:57:38 UTC
2	+++ src/bin/keactrl/keactrl.in
3	@@ -85,7 +85,7 @@ get_pid_from_file() {
4	local conf_name=$(basename ${kea_config_file} \| cut -f1 -d'.')
5
6	# Default the directory to --localstatedir
7	- local pid_file_dir=@localstatedir@/@PACKAGE@
8	+ local pid_file_dir=@localstatedir@/run
9
10	# Use directory override if set (primarily for testing only)
11	if [ ! -z $KEA_PIDFILE_DIR ]; then
12	@@ -271,7 +271,7 @@ run_conditional() {
13	# to the default file.
14	if [ -z ${KEA_LOGGER_DESTINATION} ]; then
15	prefix=@prefix@
16	- export KEA_LOGGER_DESTINATION=@localstatedir@/@PACKAGE@/kea.log
17	+ export KEA_LOGGER_DESTINATION=@localstatedir@/log/kea.log
18	fi
19
20	command=${1}

Lines 1-15 Link Here

(-)files/patch-src-lib-dhcpsrv-Makefile.am (-11 / +7 lines)
1	--- src/lib/dhcpsrv/Makefile.am.orig 2015-12-28 12:18:05 UTC	1	--- src/lib/dhcpsrv/Makefile.am.orig 2019-09-07 13:00:43.923225000 -0500
2	+++ src/lib/dhcpsrv/Makefile.am	2	+++ src/lib/dhcpsrv/Makefile.am 2019-09-07 13:02:13.215945000 -0500
3	@@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS = subdir-objects	3	@@ -4,7 +4,7 @@
4		4
5	SUBDIRS = . testutils tests	5	# DATA_DIR is the directory where to put default CSV files and the DHCPv6
6		6	# server ID file (i.e. the file where the server finds its DUID at startup).
7	-dhcp_data_dir = @localstatedir@/@PACKAGE@	7	-dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
8	+dhcp_data_dir = @localstatedir@/db/@PACKAGE@	8	+dhcp_data_dir = @localstatedir@/db/@PACKAGE@
9	kea_lfc_location = @prefix@/sbin/kea-lfc	9	kea_lfc_location = @prefix@/sbin/kea-lfc
10		10
11	-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""	11	AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
12	+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\"" -DKEA_PIDFILE_DIR="\"@localstatedir@/run\""
13	AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
14	# Set location of the kea-lfc binary.
15	AM_CPPFLAGS += -DKEA_LFC_EXECUTABLE="\"$(kea_lfc_location)\""