kea: update to 1.4.0.P1.

common/shlibs

@@ -2719,24 +2719,24 @@ libkj-async-0.6.1.so capnproto-0.6.1_2
 libkj-test-0.6.1.so capnproto-0.6.1_2
 libkj-0.6.1.so capnproto-0.6.1_2
 libkea-log.so.3 libkea-1.2.0_1
-libkea-util.so.2 libkea-1.1.0_1
+libkea-util.so.3 libkea-1.4.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-dhcpsrv.so.8 libkea-1.3.0_1
+libkea-dhcpsrv.so.11 libkea-1.4.0_1
-libkea-eval.so.6 libkea-1.3.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.4 libkea-1.3.0_1
+libkea-cfgclient.so.5 libkea-1.4.0_1
-libkea-dhcp++.so.6 libkea-1.3.0_1
+libkea-dhcp++.so.8 libkea-1.4.0_1
-libkea-asiolink.so.5 libkea-1.3.0_1
+libkea-asiolink.so.6 libkea-1.4.0_1
-libkea-cc.so.3 libkea-1.3.0_1
+libkea-cc.so.5 libkea-1.4.0_1
-libkea-cryptolink.so.2 libkea-1.2.0_1
+libkea-cryptolink.so.3 libkea-1.4.0_1
-libkea-hooks.so.3 libkea-1.2.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-util-io.so.0 libkea-1.1.0_1
 libkea-threads.so.1 libkea-1.1.0_1
-libkea-process.so.1 libkea-1.3.0_1
+libkea-process.so.2 libkea-1.4.0_1
-libkea-http.so.0 libkea-1.2.0_1
+libkea-http.so.2 libkea-1.4.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

srcpkgs/kea/patches/4a88f764.patch

@@ -0,0 +1,66 @@
+From 4a88f764d0f1ef53f0ffe8c004f401f339939cd0 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+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

srcpkgs/kea/patches/fix-log4c-2_0.patch

@@ -1,65 +0,0 @@
-From d6c31960033ff0f4aa05b4c2698cf456145ce6ff Mon Sep 17 00:00:00 2001
-From: Francis Dupont <fdupont@isc.org>
-Date: Sun, 8 Oct 2017 01:09:11 +0200
-Subject: [PATCH] [5380] Addressed another log4cplus 2.0.0 API change
-
----
- src/lib/log/logger_level_impl.cc | 10 ++++++++--
- src/lib/log/logger_level_impl.h  |  6 +++++-
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc
-index 79ca4856f2..fdcc5d367f 100644
---- src/lib/log/logger_level_impl.cc
-+++ src/lib/log/logger_level_impl.cc
-@@ -177,20 +177,26 @@ LoggerLevelImpl::logLevelFromString(const log4cplus::tstring& level) {
- 
- // Convert logging level to string.  If the level is a valid debug level,
- // return the string DEBUG, else return the empty string.
-+#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0)
- LoggerLevelImpl::LogLevelString
-+#else
-+const LoggerLevelImpl::LogLevelString&
-+#endif
- LoggerLevelImpl::logLevelToString(log4cplus::LogLevel level) {
-     Level bindlevel = convertToBindLevel(level);
-     Severity& severity = bindlevel.severity;
-     int& dbglevel = bindlevel.dbglevel;
-+    static LoggerLevelImpl::LogLevelString debug_ = tstring("DEBUG");
-+    static LoggerLevelImpl::LogLevelString empty_ = tstring();
- 
-     if ((severity == DEBUG) &&
-         ((dbglevel >= MIN_DEBUG_LEVEL) && (dbglevel <= MAX_DEBUG_LEVEL))) {
--        return (tstring("DEBUG"));
-+        return (debug_);
-     }
- 
-     // Unknown, so return empty string for log4cplus to try other conversion
-     // functions.
--    return (tstring());
-+    return (empty_);
- }
- 
- // Initialization.  Register the conversion functions with the LogLevelManager.
-diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h
-index 96696c2b1f..77da5f7408 100644
---- src/lib/log/logger_level_impl.h
-+++ src/lib/log/logger_level_impl.h
-@@ -1,4 +1,4 @@
--// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
-+// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
- //
- // This Source Code Form is subject to the terms of the Mozilla Public
- // License, v. 2.0. If a copy of the MPL was not distributed with this
-@@ -107,7 +107,11 @@ typedef log4cplus::tstring LogLevelString;
-     /// \param level Extended logging level
-     ///
-     /// \return Equivalent string.
-+#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0)
-     static LogLevelString logLevelToString(log4cplus::LogLevel level);
-+#else
-+    static const LogLevelString& logLevelToString(log4cplus::LogLevel level);
-+#endif
- 
-     /// \brief Initialize extended logging levels
-     ///

srcpkgs/kea/template

@@ -1,7 +1,8 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.3.0
+version=1.4.0.P1
-revision=6
+revision=1
+wrksrc="kea-${version/.P/-P}"
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-dhcp-mysql)
@@ -19,8 +20,8 @@ short_desc="Next generation DHCPv4/v6 server"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, Apache-2.0"
 homepage="http://kea.isc.org/wiki"
-distfiles="http://ftp.isc.org/isc/kea/${version}/kea-${version}.tar.gz"
+distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=6edfcdbf2526c218426a1d1a6a6694a4050c97bb8412953a230285d63415c391
+checksum=46356bd4594a73d269719a724042c43474e592e99476fb63dd8135e78c800411
 nocross="Tools required for messages are not built for the host arch"
 
 build_options="botan mysql pgsql"

srcpkgs/kea/update

@@ -0,0 +1,3 @@
+site="http://ftp.isc.org/isc/kea/"
+pattern='href="\K[\d\.]+(?=/")'
+ignore="20141219 20141223 20170131"