From 2d8e221b4335ff9543fb093baf67fce737b557eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 22 Dec 2018 14:46:29 +0100 Subject: [PATCH] kea: update to 1.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- common/shlibs | 36 ++++++++-------- srcpkgs/kea/patches/4a88f764.patch | 66 ------------------------------ srcpkgs/kea/template | 7 ++-- 3 files changed, 22 insertions(+), 87 deletions(-) delete mode 100644 srcpkgs/kea/patches/4a88f764.patch diff --git a/common/shlibs b/common/shlibs index d942d25cc4d..8721a7b8d9c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2715,25 +2715,27 @@ libkj-http-0.7.0.so capnproto-0.7.0_1 libkj-async-0.7.0.so capnproto-0.7.0_1 libkj-test-0.7.0.so capnproto-0.7.0_1 libkj-0.7.0.so capnproto-0.7.0_1 -libkea-log.so.3 libkea-1.2.0_1 -libkea-util.so.3 libkea-1.4.0_1 -libkea-exceptions.so.0 libkea-1.1.0_1 -libkea-dhcpsrv.so.11 libkea-1.4.0_1 -libkea-eval.so.7 libkea-1.4.0_1 -libkea-dhcp_ddns.so.1 libkea-1.1.0_1 -libkea-stats.so.2 libkea-1.3.0_1 -libkea-cfgclient.so.5 libkea-1.4.0_1 -libkea-dhcp++.so.8 libkea-1.4.0_1 -libkea-asiolink.so.6 libkea-1.4.0_1 -libkea-cc.so.5 libkea-1.4.0_1 -libkea-cryptolink.so.3 libkea-1.4.0_1 -libkea-hooks.so.7 libkea-1.4.0_1 libkea-asiodns.so.0 libkea-1.1.0_1 -libkea-dns++.so.2 libkea-1.3.0_1 +libkea-asiolink.so.7 libkea-1.5.0_1 +libkea-cc.so.7 libkea-1.5.0_1 +libkea-cfgclient.so.6 libkea-1.5.0_1 +libkea-cryptolink.so.4 libkea-1.5.0_1 +libkea-database.so.1 libkea-1.5.0_1 +libkea-dhcp++.so.11 libkea-1.5.0_1 +libkea-dhcp_ddns.so.1 libkea-1.1.0_1 +libkea-dhcpsrv.so.14 libkea-1.5.0_1 +libkea-dns++.so.3 libkea-1.5.0_1 +libkea-eval.so.10 libkea-1.5.0_1 +libkea-exceptions.so.0 libkea-1.1.0_1 +libkea-hooks.so.7 libkea-1.4.0_1 +libkea-http.so.4 libkea-1.5.0_1 +libkea-log.so.3 libkea-1.2.0_1 +libkea-pgsql.so.0 libkea-1.5.0_1 +libkea-process.so.3 libkea-1.5.0_1 +libkea-stats.so.2 libkea-1.3.0_1 +libkea-threads.so.2 libkea-1.5.0_1 libkea-util-io.so.0 libkea-1.1.0_1 -libkea-threads.so.1 libkea-1.1.0_1 -libkea-process.so.2 libkea-1.4.0_1 -libkea-http.so.2 libkea-1.4.0_1 +libkea-util.so.5 libkea-1.5.0_1 libytnef.so.0 ytnef-1.8_1 libpisock.so.9 pilot-link-0.12.5_1 libpisync.so.1 pilot-link-0.12.5_1 diff --git a/srcpkgs/kea/patches/4a88f764.patch b/srcpkgs/kea/patches/4a88f764.patch deleted file mode 100644 index b8ea21b03a9..00000000000 --- a/srcpkgs/kea/patches/4a88f764.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4a88f764d0f1ef53f0ffe8c004f401f339939cd0 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Mon, 10 Sep 2018 06:53:47 -0400 -Subject: [PATCH] [#109,!21] Prefix calls to distance() with std:: in - libdhcp++.cc - ---- - src/lib/dhcp/libdhcp++.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git src/lib/dhcp/libdhcp++.cc src/lib/dhcp/libdhcp++.cc -index 330c02b140..ced705dd29 100644 ---- src/lib/dhcp/libdhcp++.cc -+++ src/lib/dhcp/libdhcp++.cc -@@ -419,14 +419,14 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf, - // 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 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf, - // 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 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t vendor_id, - 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 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffe - 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 diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 6e8ad8080a7..7869871d254 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,8 +1,7 @@ # Template file for 'kea' pkgname=kea -version=1.4.0.P1 -revision=3 -wrksrc="kea-${version/.P/-P}" +version=1.5.0 +revision=1 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-dhcp-mysql) @@ -21,7 +20,7 @@ maintainer="Jürgen Buchmüller " license="MPL-2.0, Apache-2.0" homepage="http://kea.isc.org/wiki" distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz" -checksum=46356bd4594a73d269719a724042c43474e592e99476fb63dd8135e78c800411 +checksum=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec nocross="Tools required for messages are not built for the host arch" build_options="botan mysql pgsql"