cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to kea-1.7.3

Browse Source
This commit is contained in:
sthen 2019-12-20 17:16:37 +00:00
parent 113114c55b
commit b12230effb
10 changed files with 119 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
net/kea/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.17 2019/09/26 13:23:37 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2019/12/20 17:16:37 sthen Exp $
COMMENT= high-performance and extensible DHCP server engine from ISC
VERSION= 1.6.0
VERSION= 1.7.3
DISTNAME= kea-${VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
PKGNAME-main= kea-${VERSION:S/-P/pl/}
.for i in kea-exceptions kea-util kea-util-io kea-threads kea-log \
kea-cryptolink kea-dns++ kea-asiolink kea-cc kea-database kea-hooks \
kea-dhcp++ kea-cfgclient kea-stats kea-asiodns kea-dhcp_ddns \
kea-eval kea-process kea-dhcpsrv kea-http
SHARED_LIBS += $i 3.0
kea-eval kea-process kea-dhcpsrv kea-http kea-mysql kea-pgsql
SHARED_LIBS += $i 4.0
.endfor
CATEGORIES= net
@ -28,34 +28,56 @@ MASTER_SITES= ${MASTER_SITE_ISC:=kea/${VERSION}/}
LIB_DEPENDS= devel/boost \
devel/log4cplus
FLAVOR?=
FLAVORS= mysql postgresql
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-openssl=/usr \
--with-boost-libs=-lboost_system \
--with-boost-lib-dir=${LOCALBASE}/lib
USE_GMAKE= Yes
LIBTOOL_FLAGS= --tag=disable-static
COMPILER= base-clang ports-gcc
FLAVORS= mysql postgresql
FLAVOR?=
.include <bsd.port.arch.mk>
# cassandra
RMFILES= share/kea/scripts/cql
.if ${FLAVOR:Mmysql}
WANTLIB += iconv mariadb ssl z
LIB_DEPENDS+= databases/mariadb
CONFIGURE_ARGS+= --with-dhcp-mysql=${LOCALBASE}/bin/mysql_config
WANTLIB+= iconv mariadb ssl z
LIB_DEPENDS+= databases/mariadb
.else
RMFILES+= share/doc/kea/examples/kea[46]/*mysql* \
share/kea/scripts/mysql
.endif
.if ${FLAVOR:Mpostgresql}
WANTLIB += pq ssl
BUILD_DEPENDS+= databases/postgresql,-server
LIB_DEPENDS+= databases/postgresql
# requires include/postgresql/server/utils/errcodes.h
BUILD_DEPENDS+= databases/postgresql,-server
CONFIGURE_ARGS+= --with-dhcp-pgsql=${LOCALBASE}/bin/pg_config
WANTLIB+= pq ssl
LIB_DEPENDS+= databases/postgresql
.else
RMFILES+= share/doc/kea/examples/kea[46]/*pgsql* \
share/kea/scripts/pgsql
.endif
pre-configure:
sed -i -e 's,"socket-name": "/tmp/,"socket-name": "@localstatedir@/run/kea/,' \
${WRKSRC}/src/bin/keactrl/*.conf.pre
pre-install:
mkdir -p ${PREFIX}/share/examples/kea
post-install:
.for i in ${RMFILES}
rm -r ${PREFIX}/$i
.endfor
.include <bsd.port.mk>

4
net/kea/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kea-1.6.0.tar.gz) = RO1IxynkYY//zwCGUptGn3IymQmDGHsvcfzonxrG4nA=
SIZE (kea-1.6.0.tar.gz) = 7154301
SHA256 (kea-1.7.3.tar.gz) = MPgsVIuETBLtRsTrOIDWO0XsBM7Pzy5Ksde62n//Tyo=
SIZE (kea-1.7.3.tar.gz) = 7284882

21
net/kea/patches/patch-src_bin_keactrl_kea-ctrl-agent_conf_pre
View File

@ -1,27 +1,8 @@
$OpenBSD: patch-src_bin_keactrl_kea-ctrl-agent_conf_pre,v 1.1 2019/09/26 13:23:37 sthen Exp $
$OpenBSD: patch-src_bin_keactrl_kea-ctrl-agent_conf_pre,v 1.2 2019/12/20 17:16:37 sthen Exp $
Index: src/bin/keactrl/kea-ctrl-agent.conf.pre
--- src/bin/keactrl/kea-ctrl-agent.conf.pre.orig
+++ src/bin/keactrl/kea-ctrl-agent.conf.pre
@@ -26,15 +26,15 @@
"control-sockets": {
"dhcp4": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp4-ctrl.sock"
},
"dhcp6": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp6-ctrl.sock"
},
"d2": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp-ddns-ctrl.sock"
}
},
@@ -67,7 +67,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)

11
net/kea/patches/patch-src_bin_keactrl_kea-dhcp-ddns_conf_pre
View File

@ -1,17 +1,8 @@
$OpenBSD: patch-src_bin_keactrl_kea-dhcp-ddns_conf_pre,v 1.1 2019/09/26 13:23:37 sthen Exp $
$OpenBSD: patch-src_bin_keactrl_kea-dhcp-ddns_conf_pre,v 1.2 2019/12/20 17:16:37 sthen Exp $
Index: src/bin/keactrl/kea-dhcp-ddns.conf.pre
--- src/bin/keactrl/kea-dhcp-ddns.conf.pre.orig
+++ src/bin/keactrl/kea-dhcp-ddns.conf.pre
@@ -23,7 +23,7 @@
"port": 53001,
"control-socket": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp-ddns-ctrl.sock"
},
"tsig-keys": [],
"forward-ddns" : {},
@@ -44,7 +44,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)

11
net/kea/patches/patch-src_bin_keactrl_kea-dhcp4_conf_pre
View File

@ -1,17 +1,8 @@
$OpenBSD: patch-src_bin_keactrl_kea-dhcp4_conf_pre,v 1.1 2019/09/26 13:23:37 sthen Exp $
$OpenBSD: patch-src_bin_keactrl_kea-dhcp4_conf_pre,v 1.2 2019/12/20 17:16:37 sthen Exp $
Index: src/bin/keactrl/kea-dhcp4.conf.pre
--- src/bin/keactrl/kea-dhcp4.conf.pre.orig
+++ src/bin/keactrl/kea-dhcp4.conf.pre
@@ -49,7 +49,7 @@
// more. For detailed description, see Sections 8.8, 16 and 15.
"control-socket": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp4-ctrl.sock"
},
// Use Memfile lease database backend to store leases in a CSV file.
@@ -428,7 +428,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)

11
net/kea/patches/patch-src_bin_keactrl_kea-dhcp6_conf_pre
View File

@ -1,17 +1,8 @@
$OpenBSD: patch-src_bin_keactrl_kea-dhcp6_conf_pre,v 1.1 2019/09/26 13:23:37 sthen Exp $
$OpenBSD: patch-src_bin_keactrl_kea-dhcp6_conf_pre,v 1.2 2019/12/20 17:16:37 sthen Exp $
Index: src/bin/keactrl/kea-dhcp6.conf.pre
--- src/bin/keactrl/kea-dhcp6.conf.pre.orig
+++ src/bin/keactrl/kea-dhcp6.conf.pre
@@ -43,7 +43,7 @@
// description, see Sections 9.12, 16 and 15.
"control-socket": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp6-ctrl.sock"
},
// Use Memfile lease database backend to store leases in a CSV file.
@@ -353,7 +353,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)

18
net/kea/patches/patch-src_bin_keactrl_kea-netconf_conf_pre
View File

@ -1,24 +1,8 @@
$OpenBSD: patch-src_bin_keactrl_kea-netconf_conf_pre,v 1.1 2019/09/26 13:23:37 sthen Exp $
$OpenBSD: patch-src_bin_keactrl_kea-netconf_conf_pre,v 1.2 2019/12/20 17:16:37 sthen Exp $
Index: src/bin/keactrl/kea-netconf.conf.pre
--- src/bin/keactrl/kea-netconf.conf.pre.orig
+++ src/bin/keactrl/kea-netconf.conf.pre
@@ -30,13 +30,13 @@
"dhcp4": {
"control-socket": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp4-ctrl.sock"
}
},
"dhcp6": {
"control-socket": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+ "socket-name": ""@localstatedir@/run/kea/kea-dhcp6-ctrl.sock"
}
}
},
@@ -69,7 +69,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)

30
net/kea/pkg/PFRAG.mysql Normal file
View File

@ -0,0 +1,30 @@
@comment $OpenBSD: PFRAG.mysql,v 1.1 2019/12/20 17:16:37 sthen Exp $
include/kea/dhcpsrv/mysql_host_data_source.h
include/kea/dhcpsrv/mysql_lease_mgr.h
include/kea/mysql/
include/kea/mysql/mysql_binding.h
include/kea/mysql/mysql_connection.h
include/kea/mysql/mysql_constants.h
lib/kea/hooks/libdhcp_mysql_cb.la
@so lib/kea/hooks/libdhcp_mysql_cb.so
lib/libkea-mysql.la
@lib lib/libkea-mysql.so.${LIBkea-mysql_VERSION}
share/doc/kea/examples/kea4/mysql-reservations.json
share/doc/kea/examples/kea6/mysql-reservations.json
share/kea/scripts/mysql/
share/kea/scripts/mysql/dhcpdb_create.mysql
share/kea/scripts/mysql/dhcpdb_drop.mysql
share/kea/scripts/mysql/upgrade_1.0_to_2.0.sh
share/kea/scripts/mysql/upgrade_2.0_to_3.0.sh
share/kea/scripts/mysql/upgrade_3.0_to_4.0.sh
share/kea/scripts/mysql/upgrade_4.0_to_4.1.sh
share/kea/scripts/mysql/upgrade_4.1_to_5.0.sh
share/kea/scripts/mysql/upgrade_5.0_to_5.1.sh
share/kea/scripts/mysql/upgrade_5.1_to_5.2.sh
share/kea/scripts/mysql/upgrade_5.2_to_6.0.sh
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/wipe_data.sh

23
net/kea/pkg/PFRAG.postgresql Normal file
View File

@ -0,0 +1,23 @@
@comment $OpenBSD: PFRAG.postgresql,v 1.1 2019/12/20 17:16:37 sthen Exp $
include/kea/dhcpsrv/pgsql_host_data_source.h
include/kea/dhcpsrv/pgsql_lease_mgr.h
include/kea/pgsql/
include/kea/pgsql/pgsql_connection.h
include/kea/pgsql/pgsql_exchange.h
lib/libkea-pgsql.la
@lib lib/libkea-pgsql.so.${LIBkea-pgsql_VERSION}
share/doc/kea/examples/kea4/pgsql-reservations.json
share/doc/kea/examples/kea6/pgsql-reservations.json
share/kea/scripts/pgsql/
share/kea/scripts/pgsql/dhcpdb_create.pgsql
share/kea/scripts/pgsql/dhcpdb_drop.pgsql
share/kea/scripts/pgsql/upgrade_1.0_to_2.0.sh
share/kea/scripts/pgsql/upgrade_2.0_to_3.0.sh
share/kea/scripts/pgsql/upgrade_3.0_to_3.1.sh
share/kea/scripts/pgsql/upgrade_3.1_to_3.2.sh
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/wipe_data.sh

75
net/kea/pkg/PLIST
View File

@ -1,11 +1,12 @@
@comment $OpenBSD: PLIST,v 1.5 2019/09/26 13:23:37 sthen Exp $
@extraunexec rm -Rf ${LOCALSTATEDIR}/kea/*
@comment $OpenBSD: PLIST,v 1.6 2019/12/20 17:16:37 sthen Exp $
@newgroup _kea:763
@newuser _kea:763:_kea:daemon:Kea user:/nonexistent:/sbin/nologin
@sample ${LOCALSTATEDIR}/lib/
@mode 0750
@group _kea
@sample ${SYSCONFDIR}/kea/
@sample ${LOCALSTATEDIR}/kea/
@mode 0770
@sample ${LOCALSTATEDIR}/lib/kea/
@mode
@group
@rcscript ${RCDIR}/kea
@ -403,21 +404,22 @@ 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/
include/kea/util/threads/sync.h
include/kea/util/threads/thread.h
include/kea/util/threads/watched_thread.h
include/kea/util/time_utilities.h
include/kea/util/versioned_csv_file.h
include/kea/util/watch_socket.h
include/kea/util/watched_thread.h
lib/kea/
lib/kea/hooks/
lib/kea/hooks/libdhcp_bootp.la
@so lib/kea/hooks/libdhcp_bootp.so
lib/kea/hooks/libdhcp_flex_option.la
@so lib/kea/hooks/libdhcp_flex_option.so
lib/kea/hooks/libdhcp_ha.la
lib/kea/hooks/libdhcp_ha.so
@so lib/kea/hooks/libdhcp_ha.so
lib/kea/hooks/libdhcp_lease_cmds.la
lib/kea/hooks/libdhcp_lease_cmds.so
@so lib/kea/hooks/libdhcp_lease_cmds.so
lib/kea/hooks/libdhcp_stat_cmds.la
lib/kea/hooks/libdhcp_stat_cmds.so
@so lib/kea/hooks/libdhcp_stat_cmds.so
lib/libkea-asiodns.la
@lib lib/libkea-asiodns.so.${LIBkea-asiodns_VERSION}
lib/libkea-asiolink.la
@ -452,12 +454,20 @@ lib/libkea-process.la
@lib lib/libkea-process.so.${LIBkea-process_VERSION}
lib/libkea-stats.la
@lib lib/libkea-stats.so.${LIBkea-stats_VERSION}
lib/libkea-threads.la
@lib lib/libkea-threads.so.${LIBkea-threads_VERSION}
lib/libkea-util-io.la
@lib lib/libkea-util-io.so.${LIBkea-util-io_VERSION}
lib/libkea-util.la
@lib lib/libkea-util.so.${LIBkea-util_VERSION}
@man man/man8/kea-admin.8
@man man/man8/kea-ctrl-agent.8
@man man/man8/kea-dhcp-ddns.8
@man man/man8/kea-dhcp4.8
@man man/man8/kea-dhcp6.8
@man man/man8/kea-lfc.8
@man man/man8/kea-netconf.8
@man man/man8/kea-shell.8
@man man/man8/keactrl.8
@man man/man8/perfdhcp.8
sbin/kea-admin
@bin sbin/kea-ctrl-agent
@bin sbin/kea-dhcp-ddns
@ -503,8 +513,6 @@ share/doc/kea/examples/kea4/hooks-radius.json
share/doc/kea/examples/kea4/hooks.json
share/doc/kea/examples/kea4/leases-expiration.json
share/doc/kea/examples/kea4/multiple-options.json
share/doc/kea/examples/kea4/mysql-reservations.json
share/doc/kea/examples/kea4/pgsql-reservations.json
share/doc/kea/examples/kea4/reservations.json
share/doc/kea/examples/kea4/several-subnets.json
share/doc/kea/examples/kea4/shared-network.json
@ -528,8 +536,6 @@ share/doc/kea/examples/kea6/hooks.json
share/doc/kea/examples/kea6/iPXE.json
share/doc/kea/examples/kea6/leases-expiration.json
share/doc/kea/examples/kea6/multiple-options.json
share/doc/kea/examples/kea6/mysql-reservations.json
share/doc/kea/examples/kea6/pgsql-reservations.json
share/doc/kea/examples/kea6/reservations.json
share/doc/kea/examples/kea6/several-subnets.json
share/doc/kea/examples/kea6/shared-network.json
@ -563,38 +569,5 @@ share/examples/kea/keactrl.conf
share/kea/
share/kea/scripts/
share/kea/scripts/admin-utils.sh
share/kea/scripts/cql/
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/wipe_data.sh
share/kea/scripts/mysql/
share/kea/scripts/mysql/dhcpdb_create.mysql
share/kea/scripts/mysql/dhcpdb_drop.mysql
share/kea/scripts/mysql/upgrade_1.0_to_2.0.sh
share/kea/scripts/mysql/upgrade_2.0_to_3.0.sh
share/kea/scripts/mysql/upgrade_3.0_to_4.0.sh
share/kea/scripts/mysql/upgrade_4.0_to_4.1.sh
share/kea/scripts/mysql/upgrade_4.1_to_5.0.sh
share/kea/scripts/mysql/upgrade_5.0_to_5.1.sh
share/kea/scripts/mysql/upgrade_5.1_to_5.2.sh
share/kea/scripts/mysql/upgrade_5.2_to_6.0.sh
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/wipe_data.sh
share/kea/scripts/pgsql/
share/kea/scripts/pgsql/dhcpdb_create.pgsql
share/kea/scripts/pgsql/dhcpdb_drop.pgsql
share/kea/scripts/pgsql/upgrade_1.0_to_2.0.sh
share/kea/scripts/pgsql/upgrade_2.0_to_3.0.sh
share/kea/scripts/pgsql/upgrade_3.0_to_3.1.sh
share/kea/scripts/pgsql/upgrade_3.1_to_3.2.sh
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/wipe_data.sh
%%mysql%%
%%postgresql%%