[arch-commits] Commit in kea/trunk (PKGBUILD cpp11.patch numeric_limits.patch)

[Konstantin Gizdov]

    Date: Monday, May 24, 2021 @ 21:19:20
  Author: kgizdov
Revision: 944930

upgpkg: kea 1.9.7-1

Added:
  kea/trunk/cpp11.patch
  kea/trunk/numeric_limits.patch
Modified:
  kea/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   20 +++++++++++++++-----
 cpp11.patch          |   26 ++++++++++++++++++++++++++
 numeric_limits.patch |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-24 21:04:00 UTC (rev 944929)
+++ PKGBUILD	2021-05-24 21:19:20 UTC (rev 944930)
@@ -2,9 +2,9 @@
 # Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
 # Contributor: nfnty
 pkgname='kea'
-pkgver=1.9.6
-_upstreamver=1.9.6
-pkgrel=2
+pkgver=1.9.7
+_upstreamver=1.9.7
+pkgrel=1
 pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6'
 arch=('x86_64')
 url='https://kea.isc.org'
@@ -41,8 +41,10 @@
   'kea-dhcp-ddns.service'
   'kea-ctrl-agent.service'
   'kea.install'
+  'cpp11.patch'
+  'numeric_limits.patch'
 )
-sha512sums=('958656e72b20e9c13ec1dff1a5303e7c01e957e66627da85f3ce8ed26756aadfa03fa9673964fb73f1305a82dfc7fcb259f3ab91910fc3081a6530e090f3700c'
+sha512sums=('ed23b112136ff3c29015a6c587892cc742d75e2c86bc14a500603f9226f74a7178260edc502d1ede7f53684a30dabc1990269e6e35161ac14799ee8d6464cfaf'
             'SKIP'
             'b83479f0b90caf4022b1c858f99d8310848a90b0cc45aaa222cb2bf08b2a97312816b8f64c8c0232b612795bc7a0bbe5b05dbc508b2f1214c1ea88dc84200a2d'
             '1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
@@ -49,10 +51,18 @@
             '8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
             '1da9f02d5f6b3e2f9f2f896b1085c141b8739bd6614706fe0544a31b278f4d3c6616cb1ab3915c650262ea3592df86e95b53ce944ade2c80bb72fcae796f8fd4'
             'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491'
-            '758371f20a977f8e42e9d43d2d065c6aa294866070e54868dc329c0875b2eeafa05dcdf93590d5b429e262e2350a42c7616a3bc2e6f3994f53886870f4910251')
+            '758371f20a977f8e42e9d43d2d065c6aa294866070e54868dc329c0875b2eeafa05dcdf93590d5b429e262e2350a42c7616a3bc2e6f3994f53886870f4910251'
+            'd3bfa20292e8f5de5f643e67d8de9c5b4ccd7068a7bcd5f9cbe6b42f050dbfb5bde252cd8a57a2b6da94915d45ba29c23331ea57ae78a72fed10946d9c34072f'
+            'eb5421797b35c9ee869fca9b7d549b1d60f0713f5598067253974bac826a32b8eaa99379f6aadfed3e5586417b3a4a9e0f52b37db2cbcc9ffdf5cb60b9ed8502')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57'  # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
               'AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38'  # Internet Systems Consortium, Inc. (Signing key, 2019-2020) <codesign at isc.org>
               '7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') # Internet Systems Consortium, Inc. (Signing key, 2021-2022) <codesign at isc.org>
+prepare() {
+  cd "${srcdir}/${pkgname}-${_upstreamver}"
+  patch -Np1 -i "${srcdir}/cpp11.patch"
+  patch -Np1 -i "${srcdir}/numeric_limits.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${_upstreamver}"
   autoreconf --install

Added: cpp11.patch
===================================================================
--- cpp11.patch	                        (rev 0)
+++ cpp11.patch	2021-05-24 21:19:20 UTC (rev 944930)
@@ -0,0 +1,26 @@
+From d505f7a7d6fac1c00a4467dfcf1e84f2db508bc6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Fri, 26 Feb 2021 23:14:20 -0800
+Subject: [PATCH] ax_cpp11.m4: Include <memory> header
+
+This is needed for std::shared_ptr
+GCC-11 throws errors if header is not included
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ m4macros/ax_cpp11.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/m4macros/ax_cpp11.m4 b/m4macros/ax_cpp11.m4
+index f9042fa6d5..99457f9491 100644
+--- a/m4macros/ax_cpp11.m4
++++ b/m4macros/ax_cpp11.m4
+@@ -182,6 +182,7 @@ for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do
+         AC_COMPILE_IFELSE(
+                 [AC_LANG_PROGRAM(
+                         [#include <thread>
++                         #include <memory>
+                          std::shared_ptr<std::thread> th;],
+                         [th.reset(new std::thread([[]]() { return; }));
+                          th->join();])],

Added: numeric_limits.patch
===================================================================
--- numeric_limits.patch	                        (rev 0)
+++ numeric_limits.patch	2021-05-24 21:19:20 UTC (rev 944930)
@@ -0,0 +1,39 @@
+From 38f6f6272f1060036a7bae5d85d1ff7f080628fd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Fri, 26 Feb 2021 23:31:15 -0800
+Subject: [PATCH] include limits.h
+
+Fixes build with gcc11
+backend_selector.cc:61:35: error: 'numeric_limits' is not a member of 'std'
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ src/lib/database/backend_selector.cc | 2 +-
+ src/lib/dhcpsrv/subnet_id.h          | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/database/backend_selector.cc b/src/lib/database/backend_selector.cc
+index 0f61fe8333..9073ad5899 100644
+--- a/src/lib/database/backend_selector.cc
++++ b/src/lib/database/backend_selector.cc
+@@ -8,7 +8,7 @@
+ 
+ #include <database/backend_selector.h>
+ #include <exceptions/exceptions.h>
+-#include <climits>
++#include <limits>
+ #include <sstream>
+ 
+ using namespace isc::data;
+diff --git a/src/lib/dhcpsrv/subnet_id.h b/src/lib/dhcpsrv/subnet_id.h
+index 77c2adf71d..b5b869dcb8 100644
+--- a/src/lib/dhcpsrv/subnet_id.h
++++ b/src/lib/dhcpsrv/subnet_id.h
+@@ -10,6 +10,7 @@
+ #include <exceptions/exceptions.h>
+ #include <stdint.h>
+ #include <typeinfo>
++#include <limits>
+ 
+ namespace isc {
+ namespace dhcp {