kea: cleanup and add upstream patch for depracated boost header

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kea: cleanup and add upstream patch for depracated boost header
From: Niclas Rosenvik <nros%NetBSD.org@localhost>
Date: Mon, 30 Dec 2019 19:53:37 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Mon Dec 30 19:53:37 2019 +0000
Changeset:	79120b7f7eab322b33c63d81e4f896603efb5ca0

Modified Files:
	kea/Makefile
	kea/TODO
	kea/distinfo
	kea/patches/patch-Makefile.am
	kea/patches/patch-configure.ac
	kea/patches/patch-src_bin_agent_agent__lexer.ll
	kea/patches/patch-src_bin_d2_d2__lexer.ll
	kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
	kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
	kea/patches/patch-src_bin_keactrl_Makefile.am
	kea/patches/patch-src_bin_netconf_netconf__lexer.ll
	kea/patches/patch-src_lib_dhcp_Makefile.am
	kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
	kea/patches/patch-src_lib_dhcpsrv_Makefile.am
	kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
	kea/patches/patch-src_lib_util_watch__socket.cc
Added Files:
	kea/patches/patch-src_lib_util_encode_base__n.cc
Removed Files:
	kea/patches/patch-src_lib_dhcpsrv_Makefile.in

Log Message:
kea: cleanup and add upstream patch for depracated boost header

Add patch for deprecated boost header, from upstream.
Comment all the patches and fix a comment that was in the wrong patch.
Fix notes mentioned by pkglint.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=79120b7f7eab322b33c63d81e4f896603efb5ca0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kea/Makefile                                       |  4 ++--
 kea/TODO                                           |  3 +++
 kea/distinfo                                       | 28 +++++++++++-----------
 kea/patches/patch-Makefile.am                      |  2 ++
 kea/patches/patch-configure.ac                     |  4 +++-
 kea/patches/patch-src_bin_agent_agent__lexer.ll    |  2 ++
 kea/patches/patch-src_bin_d2_d2__lexer.ll          |  3 +++
 kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll    |  3 +++
 kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll    |  3 +++
 kea/patches/patch-src_bin_keactrl_Makefile.am      |  2 ++
 .../patch-src_bin_netconf_netconf__lexer.ll        |  3 +++
 kea/patches/patch-src_lib_dhcp_Makefile.am         |  2 ++
 kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc  |  2 ++
 kea/patches/patch-src_lib_dhcpsrv_Makefile.am      |  2 ++
 kea/patches/patch-src_lib_dhcpsrv_Makefile.in      | 13 ----------
 ...-src_lib_dhcpsrv_host__data__source__factory.cc |  2 ++
 kea/patches/patch-src_lib_util_encode_base__n.cc   | 25 +++++++++++++++++++
 kea/patches/patch-src_lib_util_watch__socket.cc    |  4 +++-
 18 files changed, 76 insertions(+), 31 deletions(-)

diffs:
diff --git a/kea/Makefile b/kea/Makefile
index 6fea5a7b02..6fa4cd016e 100644
--- a/kea/Makefile
+++ b/kea/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	kea-1.6.1
 CATEGORIES=	net
-MASTER_SITES=   https://downloads.isc.org/isc/kea/${PKGVERSION_NOREV}/
+MASTER_SITES=	https://downloads.isc.org/isc/kea/${PKGVERSION_NOREV}/
 MASTER_SITES+=	ftp://ftp.isc.org/isc/kea/${PKGVERSION_NOREV}/
 MASTER_SITES+=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/kea/${PKGVERSION_NOREV}
 MASTER_SITES+=	ftp://ftp.iij.ad.jp/pub/network/isc/kea/${PKGVERSION_NOREV}/
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=--enable-generate-parser
 
-PY_PATCHPLIST= 	yes
+PY_PATCHPLIST=	yes
 
 RCD_SCRIPTS+=	kea
 
diff --git a/kea/TODO b/kea/TODO
index e8ee250022..7a834cf9f7 100644
--- a/kea/TODO
+++ b/kea/TODO
@@ -1 +1,4 @@
 install users to run kea with ??
+
+test build on GNU/linux.
+fix missing peices in code for illumos.
diff --git a/kea/distinfo b/kea/distinfo
index 361a7326d0..41f4490626 100644
--- a/kea/distinfo
+++ b/kea/distinfo
@@ -4,17 +4,17 @@ SHA1 (kea-1.6.1.tar.gz) = 165ee499c40a1033d733e8a5197522562804a19b
 RMD160 (kea-1.6.1.tar.gz) = 261b0ea1bca0a70034532112011c64ad809c37ec
 SHA512 (kea-1.6.1.tar.gz) = 4220f46fc185f4434ad01886d2d43ba1f9dcca57f5afa33235c8593269220a79e2dcb4ad71298dec868444c29e7cb6febe66a1456fdc116a2d9fd3f019f740d8
 Size (kea-1.6.1.tar.gz) = 7155604 bytes
-SHA1 (patch-Makefile.am) = cd0a319bd1174142f3cce8a183cddb00c7c9f763
-SHA1 (patch-configure.ac) = 2a81a5a9f1f5daa844027d8349f7506c75fa57e5
-SHA1 (patch-src_bin_agent_agent__lexer.ll) = a62876b37a6c44942aad6ff88b238e6e9e0152f5
-SHA1 (patch-src_bin_d2_d2__lexer.ll) = 06306fd1e86004aaca020166f02d4e599b8704a5
-SHA1 (patch-src_bin_dhcp4_dhcp4__lexer.ll) = d78cdfad319bb97019765115f899b997df4932ea
-SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 1d4afe0b44c694e6b86684998595efad653f74c6
-SHA1 (patch-src_bin_keactrl_Makefile.am) = 75bc30ef0b60e4d6a6388887df16f8f38d4c0687
-SHA1 (patch-src_bin_netconf_netconf__lexer.ll) = 4787c6e92e4793a972797d04ed18004824f1179d
-SHA1 (patch-src_lib_dhcp_Makefile.am) = 386decf008dc941772a18a711653c840ae893dd6
-SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = 1cbb81475cc519b6f5ffeb6be97b3d025bbeecca
-SHA1 (patch-src_lib_dhcpsrv_Makefile.am) = ee62c8927b745c090557290567d37879063d42df
-SHA1 (patch-src_lib_dhcpsrv_Makefile.in) = 6129811a105adc7702fa7ef9a78991ffed0ffe57
-SHA1 (patch-src_lib_dhcpsrv_host__data__source__factory.cc) = ba4ad5ba4bf09d112e146fb473dd392eaaa9de63
-SHA1 (patch-src_lib_util_watch__socket.cc) = ca4826b53fd8160216d879c1aa0796d2b2d08fa5
+SHA1 (patch-Makefile.am) = 4e4896be44290114160be878666878bb44d71a8e
+SHA1 (patch-configure.ac) = 70d7a8235ed6459a23f5404303d5babfdfec14db
+SHA1 (patch-src_bin_agent_agent__lexer.ll) = de64c9ad03b1c6812f95f52c8fcd5f6c1aa1ef27
+SHA1 (patch-src_bin_d2_d2__lexer.ll) = 400b9f54b5bb9c9eb9c52c1ef23c9a377f29960e
+SHA1 (patch-src_bin_dhcp4_dhcp4__lexer.ll) = dfcca8319ca3b6b8902676bb1662ceb9abca74bc
+SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 6ebeb6b18dc8d86d0890ce3cfcaeea4c2658e958
+SHA1 (patch-src_bin_keactrl_Makefile.am) = 5b6fd816da6011858d1167d297c83eda7947efd7
+SHA1 (patch-src_bin_netconf_netconf__lexer.ll) = ec316d436f791470df9dd5c106c76f3026a19b0e
+SHA1 (patch-src_lib_dhcp_Makefile.am) = 452036d0100a85f41c52562292931bea2501e396
+SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = 7bf79c4a24b3c074f8cf53b79fc83ae8255f63d7
+SHA1 (patch-src_lib_dhcpsrv_Makefile.am) = bdd2be227d8c7f34b4329092e6de3bcaa7117284
+SHA1 (patch-src_lib_dhcpsrv_host__data__source__factory.cc) = a1bc71ec40b9eb5a6c9247360a84ce480521cad2
+SHA1 (patch-src_lib_util_encode_base__n.cc) = 61bf8402e4baf0578a7ec9444f396a9b6c69d87d
+SHA1 (patch-src_lib_util_watch__socket.cc) = ab55b5e613bc431dcd92ef68bf3501a7e4aca7de
diff --git a/kea/patches/patch-Makefile.am b/kea/patches/patch-Makefile.am
index 22240c414d..38a48cb9c6 100644
--- a/kea/patches/patch-Makefile.am
+++ b/kea/patches/patch-Makefile.am
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * don't install dirs in varbase
+
 --- Makefile.am.orig	2019-12-30 16:02:34.138915584 +0000
 +++ Makefile.am
 @@ -152,10 +152,10 @@ docs:
diff --git a/kea/patches/patch-configure.ac b/kea/patches/patch-configure.ac
index bf0766ae5b..f287b9208b 100644
--- a/kea/patches/patch-configure.ac
+++ b/kea/patches/patch-configure.ac
@@ -1,5 +1,7 @@
 $NetBSD$
-* don't create dir in varbase
+
+* fix compatability errors
+
 --- configure.ac.orig	2019-12-30 16:00:16.704565254 +0000
 +++ configure.ac
 @@ -1391,7 +1391,7 @@ if test "x$enable_generate_parser" != "x
diff --git a/kea/patches/patch-src_bin_agent_agent__lexer.ll b/kea/patches/patch-src_bin_agent_agent__lexer.ll
index 0a5ef04fec..ce28d5b406 100644
--- a/kea/patches/patch-src_bin_agent_agent__lexer.ll
+++ b/kea/patches/patch-src_bin_agent_agent__lexer.ll
@@ -1,6 +1,8 @@
 $NetBSD$
+
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map
+
 --- src/bin/agent/agent_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/bin/agent/agent_lexer.ll
 @@ -9,12 +9,12 @@
diff --git a/kea/patches/patch-src_bin_d2_d2__lexer.ll b/kea/patches/patch-src_bin_d2_d2__lexer.ll
index ddf877d880..0a3a3dbe82 100644
--- a/kea/patches/patch-src_bin_d2_d2__lexer.ll
+++ b/kea/patches/patch-src_bin_d2_d2__lexer.ll
@@ -1,5 +1,8 @@
 $NetBSD$
 
+* put io_adress.h first so that map from net/if.h on solaris won't confict
+  with std::map
+
 --- src/bin/d2/d2_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/bin/d2/d2_lexer.ll
 @@ -9,12 +9,12 @@
diff --git a/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
index 69a5afef8c..fd874e3203 100644
--- a/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
+++ b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
@@ -1,5 +1,8 @@
 $NetBSD$
 
+* put io_adress.h first so that map from net/if.h on solaris won't confict
+  with std::map
+
 --- src/bin/dhcp4/dhcp4_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/bin/dhcp4/dhcp4_lexer.ll
 @@ -9,12 +9,12 @@
diff --git a/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
index cfc6be26e4..c5186b5cc8 100644
--- a/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
+++ b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
@@ -1,5 +1,8 @@
 $NetBSD$
 
+* put io_adress.h first so that map from net/if.h on solaris won't confict
+  with std::map
+
 --- src/bin/dhcp6/dhcp6_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/bin/dhcp6/dhcp6_lexer.ll
 @@ -9,12 +9,12 @@
diff --git a/kea/patches/patch-src_bin_keactrl_Makefile.am b/kea/patches/patch-src_bin_keactrl_Makefile.am
index fe9234e7c1..a047e4abbd 100644
--- a/kea/patches/patch-src_bin_keactrl_Makefile.am
+++ b/kea/patches/patch-src_bin_keactrl_Makefile.am
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * install conf files in examples heirarchy
+
 --- src/bin/keactrl/Makefile.am.orig	2019-12-30 15:49:38.601325408 +0000
 +++ src/bin/keactrl/Makefile.am
 @@ -54,15 +54,15 @@ if INSTALL_CONFIGURATIONS
diff --git a/kea/patches/patch-src_bin_netconf_netconf__lexer.ll b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
index 06fd013e45..9aead52ed8 100644
--- a/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
+++ b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
@@ -1,5 +1,8 @@
 $NetBSD$
 
+* put io_adress.h first so that map from net/if.h on solaris won't confict
+  with std::map
+
 --- src/bin/netconf/netconf_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/bin/netconf/netconf_lexer.ll
 @@ -9,12 +9,12 @@
diff --git a/kea/patches/patch-src_lib_dhcp_Makefile.am b/kea/patches/patch-src_lib_dhcp_Makefile.am
index 96528ba5ac..5c84d75907 100644
--- a/kea/patches/patch-src_lib_dhcp_Makefile.am
+++ b/kea/patches/patch-src_lib_dhcp_Makefile.am
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * use bpf on illumos
+
 --- src/lib/dhcp/Makefile.am.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/lib/dhcp/Makefile.am
 @@ -68,6 +68,10 @@ if OS_BSD
diff --git a/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
index 4e3e30017f..e29b6c9c0e 100644
--- a/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
+++ b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * map conflicts with map from net/if.h, use std::map explicitly
+
 --- src/lib/dhcp/iface_mgr_sun.cc.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/lib/dhcp/iface_mgr_sun.cc
 @@ -39,7 +39,7 @@ IfaceMgr::detectIfaces() {
diff --git a/kea/patches/patch-src_lib_dhcpsrv_Makefile.am b/kea/patches/patch-src_lib_dhcpsrv_Makefile.am
index 7cfa02c8df..61c069346b 100644
--- a/kea/patches/patch-src_lib_dhcpsrv_Makefile.am
+++ b/kea/patches/patch-src_lib_dhcpsrv_Makefile.am
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * don't create files in varbase
+
 --- src/lib/dhcpsrv/Makefile.am.orig	2019-12-30 15:56:06.783365379 +0000
 +++ src/lib/dhcpsrv/Makefile.am
 @@ -387,5 +387,3 @@ libkea_dhcpsrv_parsers_include_HEADERS =
diff --git a/kea/patches/patch-src_lib_dhcpsrv_Makefile.in b/kea/patches/patch-src_lib_dhcpsrv_Makefile.in
deleted file mode 100644
index a6aae20a64..0000000000
--- a/kea/patches/patch-src_lib_dhcpsrv_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* don't create directories in varbase
---- src/lib/dhcpsrv/Makefile.in.orig	2019-12-03 18:23:53.391046906 +0000
-+++ src/lib/dhcpsrv/Makefile.in
-@@ -1825,7 +1825,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-data-local \
-+install-data-am: \
- 	install-libkea_dhcpsrv_includeHEADERS \
- 	install-libkea_dhcpsrv_parsers_includeHEADERS
- 
diff --git a/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc b/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
index 923232fdb1..ddccd3d41c 100644
--- a/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
+++ b/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
@@ -1,5 +1,7 @@
 $NetBSD$
+
 * map conflicts with map from net/if.h, use std::map explicitly
+
 --- src/lib/dhcpsrv/host_data_source_factory.cc.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/lib/dhcpsrv/host_data_source_factory.cc
 @@ -40,7 +40,7 @@ using namespace std;
diff --git a/kea/patches/patch-src_lib_util_encode_base__n.cc b/kea/patches/patch-src_lib_util_encode_base__n.cc
new file mode 100644
index 0000000000..3207a1b017
--- /dev/null
+++ b/kea/patches/patch-src_lib_util_encode_base__n.cc
@@ -0,0 +1,25 @@
+$NetBSD$
+
+* remove use of deprecated header
+  from upstream:
+  
+--- src/lib/util/encode/base_n.cc.orig	2019-12-20 19:19:59.959141555 +0000
++++ src/lib/util/encode/base_n.cc
+@@ -18,7 +18,7 @@
+ #include <boost/archive/iterators/base64_from_binary.hpp>
+ #include <boost/archive/iterators/binary_from_base64.hpp>
+ #include <boost/archive/iterators/transform_width.hpp>
+-#include <boost/math/common_factor.hpp>
++#include <boost/integer/common_factor.hpp>
+ 
+ #include <stdint.h>
+ #include <stdexcept>
+@@ -267,7 +267,7 @@ struct BaseNTransformer {
+     // without padding.  It's the least common multiple of 8 and BitsPerChunk,
+     // e.g. 24 for base64.
+     static const int BITS_PER_GROUP =
+-        boost::math::static_lcm<BitsPerChunk, 8>::value;
++        boost::integer::static_lcm<BitsPerChunk, 8>::value;
+ 
+     // MAX_PADDING_CHARS is the maximum number of padding characters
+     // that can appear in a valid baseN encoded text.
diff --git a/kea/patches/patch-src_lib_util_watch__socket.cc b/kea/patches/patch-src_lib_util_watch__socket.cc
index 8885a901b0..2d5691fdc1 100644
--- a/kea/patches/patch-src_lib_util_watch__socket.cc
+++ b/kea/patches/patch-src_lib_util_watch__socket.cc
@@ -1,5 +1,7 @@
 $NetBSD$
-* Solaris has FIONREAD in sys/filoi.h
+
+* Solaris has FIONREAD in sys/filio.h
+
 --- src/lib/util/watch_socket.cc.orig	2019-11-19 14:50:43.000000000 +0000
 +++ src/lib/util/watch_socket.cc
 @@ -18,6 +18,10 @@
Prev by Date: kea:add patches to build on illumos.
Next by Date: Add py-diffoscope 134 for update.
Previous by Thread: kea:add patches to build on illumos.
Next by Thread: Add py-diffoscope 134 for update.
Indexes:
Home | Main Index | Thread Index | Old Index