kea:add patches to build on illumos.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kea:add patches to build on illumos.
From: Niclas Rosenvik <nros%netbsd.org@localhost>
Date: Mon, 30 Dec 2019 18:11:29 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%netbsd.org@localhost>
Pushed By:	nros
Date:		Mon Dec 30 18:11:29 2019 +0000
Changeset:	8855fc6161662afb9b054497c08f44c9b5a9638a

Modified Files:
	kea/Makefile
	kea/distinfo
Added Files:
	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
Removed Files:
	kea/patches/patch-Makefile.in
	kea/patches/patch-configure
	kea/patches/patch-src_bin_keactrl_Makefile.in
	kea/patches/patch-src_hooks_dhcp_high__availability_Makefile.in
	kea/patches/patch-src_hooks_dhcp_lease__cmds_Makefile.in
	kea/patches/patch-src_hooks_dhcp_mysql__cb_Makefile.in
	kea/patches/patch-src_hooks_dhcp_stat__cmds_Makefile.in
	kea/patches/patch-src_hooks_dhcp_user__chk_Makefile.in

Log Message:
kea:add patches to build on illumos.

Add patches to build illumos.
delete some of the old patches since they where only needed when c was
not in use_languages.
use autoreconf since it makes some patches easier.

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

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

diffstat:
 kea/Makefile                                       |  6 +++++
 kea/distinfo                                       | 21 ++++++++++-------
 kea/patches/patch-Makefile.am                      | 19 ++++++++++++++++
 kea/patches/patch-Makefile.in                      | 12 ----------
 kea/patches/patch-configure                        | 22 ------------------
 kea/patches/patch-configure.ac                     | 22 ++++++++++++++++++
 kea/patches/patch-src_bin_agent_agent__lexer.ll    | 19 ++++++++++++++++
 kea/patches/patch-src_bin_d2_d2__lexer.ll          | 18 +++++++++++++++
 kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll    | 18 +++++++++++++++
 kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll    | 18 +++++++++++++++
 kea/patches/patch-src_bin_keactrl_Makefile.am      | 23 +++++++++++++++++++
 kea/patches/patch-src_bin_keactrl_Makefile.in      | 23 -------------------
 .../patch-src_bin_netconf_netconf__lexer.ll        | 18 +++++++++++++++
 ...h-src_hooks_dhcp_high__availability_Makefile.in | 24 --------------------
 .../patch-src_hooks_dhcp_lease__cmds_Makefile.in   | 26 ----------------------
 .../patch-src_hooks_dhcp_mysql__cb_Makefile.in     | 26 ----------------------
 .../patch-src_hooks_dhcp_stat__cmds_Makefile.in    | 26 ----------------------
 .../patch-src_hooks_dhcp_user__chk_Makefile.in     | 26 ----------------------
 kea/patches/patch-src_lib_dhcp_Makefile.am         | 24 ++++++++++++++++++++
 kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc  | 13 +++++++++++
 kea/patches/patch-src_lib_dhcpsrv_Makefile.am      | 10 +++++++++
 ...-src_lib_dhcpsrv_host__data__source__factory.cc | 13 +++++++++++
 kea/patches/patch-src_lib_util_watch__socket.cc    | 15 +++++++++++++
 23 files changed, 249 insertions(+), 193 deletions(-)

diffs:
diff --git a/kea/Makefile b/kea/Makefile
index 7522a0bb4e..6fea5a7b02 100644
--- a/kea/Makefile
+++ b/kea/Makefile
@@ -15,10 +15,13 @@ LICENSE=	mpl-2.0
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
+USE_TOOLS=	autoconf automake bison flex
 
 CONFIGURE_ARGS+=--with-openssl --enable-shell
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=--enable-generate-parser
+
 PY_PATCHPLIST= 	yes
 
 RCD_SCRIPTS+=	kea
@@ -39,6 +42,9 @@ OWN_DIRS+=	${VARBASE}/run/kea
 OWN_DIRS+=	${VARBASE}/lib/kea
 OWN_DIRS+=	${VARBASE}/log
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf
+
 .include "options.mk"
 
 .include "../../devel/log4cplus/buildlink3.mk"
diff --git a/kea/distinfo b/kea/distinfo
index 01bc760d2d..361a7326d0 100644
--- a/kea/distinfo
+++ b/kea/distinfo
@@ -4,12 +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.in) = 4fb86d228f7b481613a574cfa8f38ec8073b9a01
-SHA1 (patch-configure) = 53270e1f31426557781705b272dc8b9a3b7b3d62
-SHA1 (patch-src_bin_keactrl_Makefile.in) = 5dbf9e096f7da3edd497876c665c3d5b14399cf5
-SHA1 (patch-src_hooks_dhcp_high__availability_Makefile.in) = 1158d793f0511d2f5121bfc8396c54a842f63794
-SHA1 (patch-src_hooks_dhcp_lease__cmds_Makefile.in) = 7440ac8d8e657703c87b704b11451f2615b75883
-SHA1 (patch-src_hooks_dhcp_mysql__cb_Makefile.in) = 2bef7d52a8d7c8390400ae02c8ecc230aefa6e83
-SHA1 (patch-src_hooks_dhcp_stat__cmds_Makefile.in) = dc5dafedc2f743946806f9d4e62e510b804be6c9
-SHA1 (patch-src_hooks_dhcp_user__chk_Makefile.in) = 581c12c11c4dfc524d8b5ca1e0ab91a9ee799486
+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
diff --git a/kea/patches/patch-Makefile.am b/kea/patches/patch-Makefile.am
new file mode 100644
index 0000000000..22240c414d
--- /dev/null
+++ b/kea/patches/patch-Makefile.am
@@ -0,0 +1,19 @@
+$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:
+ 
+ 
+ # These steps are necessary during installation
+-install-exec-hook:
+-	mkdir -p $(DESTDIR)${localstatedir}/log/
+-	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
+-	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
++#install-exec-hook:
++#	mkdir -p $(DESTDIR)${localstatedir}/log/
++#	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
++#	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
+ 
+ EXTRA_DIST  = tools/path_replacer.sh
+ EXTRA_DIST += tools/mk_cfgrpt.sh
diff --git a/kea/patches/patch-Makefile.in b/kea/patches/patch-Makefile.in
deleted file mode 100644
index 3bebea325d..0000000000
--- a/kea/patches/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-* don't create directories in varbase
---- Makefile.in.orig	2019-11-19 14:50:56.000000000 +0000
-+++ Makefile.in
-@@ -961,7 +961,6 @@ install-dvi-am:
- 
- install-exec-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-html: install-html-recursive
- 
- install-html-am:
diff --git a/kea/patches/patch-configure b/kea/patches/patch-configure
deleted file mode 100644
index f59adf9ba1..0000000000
--- a/kea/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-* fix compatability errors
---- configure.orig	2019-11-19 14:50:55.000000000 +0000
-+++ configure
-@@ -20878,7 +20878,7 @@ if test "x$enable_generate_parser" != "x
-        as_fn_error $? "Flex is required for enable-generate-parser, but was not found" "$LINENO" 5
-     fi
- 
--    if test "x$YACC" == "x"; then
-+    if test "x$YACC" = "x"; then
-        as_fn_error $? "Bison is required for enable-generate-parser, but was not found" "$LINENO" 5
-     fi
- 
-@@ -21377,7 +21377,7 @@ fi
- 
-   if test -z "$PDFLATEX"; then
-     PDFLATEX=no
--  elif test "x$PDFLATEX" == "xno"; then
-+  elif test "x$PDFLATEX" = "xno"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pdflatex" >&5
- $as_echo_n "checking for pdflatex... " >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (disabled)" >&5
diff --git a/kea/patches/patch-configure.ac b/kea/patches/patch-configure.ac
new file mode 100644
index 0000000000..bf0766ae5b
--- /dev/null
+++ b/kea/patches/patch-configure.ac
@@ -0,0 +1,22 @@
+$NetBSD$
+* don't create dir in varbase
+--- configure.ac.orig	2019-12-30 16:00:16.704565254 +0000
++++ configure.ac
+@@ -1391,7 +1391,7 @@ if test "x$enable_generate_parser" != "x
+        AC_MSG_ERROR([Flex is required for enable-generate-parser, but was not found])
+     fi
+ 
+-    if test "x$YACC" == "x"; then
++    if test "x$YACC" = "x"; then
+        AC_MSG_ERROR([Bison is required for enable-generate-parser, but was not found])
+     fi
+ 
+@@ -1515,7 +1515,7 @@ if test "x$enable_generate_docs" != xno
+ 
+   if test -z "$PDFLATEX"; then
+     PDFLATEX=no
+-  elif test "x$PDFLATEX" == "xno"; then
++  elif test "x$PDFLATEX" = "xno"; then
+     AC_MSG_CHECKING([for pdflatex])
+     AC_MSG_RESULT([no (disabled)])
+   else
diff --git a/kea/patches/patch-src_bin_agent_agent__lexer.ll b/kea/patches/patch-src_bin_agent_agent__lexer.ll
new file mode 100644
index 0000000000..0a5ef04fec
--- /dev/null
+++ b/kea/patches/patch-src_bin_agent_agent__lexer.ll
@@ -0,0 +1,19 @@
+$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 @@
+ /* Generated files do not make clang static analyser so happy */
+ #ifndef __clang_analyzer__
+ 
++#include <asiolink/io_address.h>
+ #include <cerrno>
+ #include <climits>
+ #include <cstdlib>
+ #include <string>
+ #include <agent/parser_context.h>
+-#include <asiolink/io_address.h>
+ #include <boost/lexical_cast.hpp>
+ #include <exceptions/exceptions.h>
+ #include <cc/dhcp_config_error.h>
diff --git a/kea/patches/patch-src_bin_d2_d2__lexer.ll b/kea/patches/patch-src_bin_d2_d2__lexer.ll
new file mode 100644
index 0000000000..ddf877d880
--- /dev/null
+++ b/kea/patches/patch-src_bin_d2_d2__lexer.ll
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- 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 @@
+ /* Generated files do not make clang static analyser so happy */
+ #ifndef __clang_analyzer__
+ 
++#include <asiolink/io_address.h>
+ #include <cerrno>
+ #include <climits>
+ #include <cstdlib>
+ #include <string>
+ #include <d2/parser_context.h>
+-#include <asiolink/io_address.h>
+ #include <boost/lexical_cast.hpp>
+ #include <exceptions/exceptions.h>
+ 
diff --git a/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
new file mode 100644
index 0000000000..69a5afef8c
--- /dev/null
+++ b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- 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 @@
+ /* Generated files do not make clang static analyser so happy */
+ #ifndef __clang_analyzer__
+ 
++#include <asiolink/io_address.h>
+ #include <cerrno>
+ #include <climits>
+ #include <cstdlib>
+ #include <string>
+ #include <dhcp4/parser_context.h>
+-#include <asiolink/io_address.h>
+ #include <boost/lexical_cast.hpp>
+ #include <exceptions/exceptions.h>
+ 
diff --git a/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
new file mode 100644
index 0000000000..cfc6be26e4
--- /dev/null
+++ b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- 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 @@
+ /* Generated files do not make clang static analyser so happy */
+ #ifndef __clang_analyzer__
+ 
++#include <asiolink/io_address.h>
+ #include <cerrno>
+ #include <climits>
+ #include <cstdlib>
+ #include <string>
+ #include <dhcp6/parser_context.h>
+-#include <asiolink/io_address.h>
+ #include <boost/lexical_cast.hpp>
+ #include <exceptions/exceptions.h>
+ 
diff --git a/kea/patches/patch-src_bin_keactrl_Makefile.am b/kea/patches/patch-src_bin_keactrl_Makefile.am
new file mode 100644
index 0000000000..fe9234e7c1
--- /dev/null
+++ b/kea/patches/patch-src_bin_keactrl_Makefile.am
@@ -0,0 +1,23 @@
+$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
+ # To preserve any user modifications to the old version of the file,
+ # this old file is backed up as keactrl.conf.bak.
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
++	$(mkinstalldirs) $(DESTDIR)/@datarootdir@/examples/@PACKAGE@
+ 	for f in $(CONFIGFILES) ; do	\
+ 		if test -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f && \
+ 		   test $$f = "keactrl.conf"; then \
+ 			mv $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f \
+ 			   $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \
+ 		fi; \
+-		if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
+-			${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \
++		if test ! -f $(DESTDIR)$(datarootdir)/examples/@PACKAGE@/$$f; then \
++			${INSTALL_DATA} $$f $(DESTDIR)$(datarootdir)/examples/@PACKAGE@/; \
+ 		fi; \
+ 	done
+ 
diff --git a/kea/patches/patch-src_bin_keactrl_Makefile.in b/kea/patches/patch-src_bin_keactrl_Makefile.in
deleted file mode 100644
index dc3b0ed0eb..0000000000
--- a/kea/patches/patch-src_bin_keactrl_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-* install conf files in exemples heirarcy
---- src/bin/keactrl/Makefile.in.orig	2019-11-24 09:44:41.003245379 +0000
-+++ src/bin/keactrl/Makefile.in
-@@ -824,15 +824,15 @@ kea-netconf.conf: kea-netconf.conf.pre
- # To preserve any user modifications to the old version of the file,
- # this old file is backed up as keactrl.conf.bak.
- @INSTALL_CONFIGURATIONS_TRUE@install-data-local:
--@INSTALL_CONFIGURATIONS_TRUE@	$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
-+@INSTALL_CONFIGURATIONS_TRUE@	$(mkinstalldirs) $(DESTDIR)/@datarootdir@/examples/@PACKAGE@
- @INSTALL_CONFIGURATIONS_TRUE@	for f in $(CONFIGFILES) ; do	\
- @INSTALL_CONFIGURATIONS_TRUE@		if test -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f && \
- @INSTALL_CONFIGURATIONS_TRUE@		   test $$f = "keactrl.conf"; then \
- @INSTALL_CONFIGURATIONS_TRUE@			mv $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f \
- @INSTALL_CONFIGURATIONS_TRUE@			   $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \
- @INSTALL_CONFIGURATIONS_TRUE@		fi; \
--@INSTALL_CONFIGURATIONS_TRUE@		if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
--@INSTALL_CONFIGURATIONS_TRUE@			${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \
-+@INSTALL_CONFIGURATIONS_TRUE@		if test ! -f $(DESTDIR)$(datarootdir)/@PACKAGE@/$$f; then \
-+@INSTALL_CONFIGURATIONS_TRUE@			${INSTALL_DATA} $$f $(DESTDIR)$(datarootdir)/examples/@PACKAGE@/; \
- @INSTALL_CONFIGURATIONS_TRUE@		fi; \
- @INSTALL_CONFIGURATIONS_TRUE@	done
- 
diff --git a/kea/patches/patch-src_bin_netconf_netconf__lexer.ll b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
new file mode 100644
index 0000000000..06fd013e45
--- /dev/null
+++ b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- 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 @@
+ /* Generated files do not make clang static analyser so happy */
+ #ifndef __clang_analyzer__
+ 
++#include <asiolink/io_address.h>
+ #include <cerrno>
+ #include <climits>
+ #include <cstdlib>
+ #include <string>
+ #include <netconf/parser_context.h>
+-#include <asiolink/io_address.h>
+ #include <boost/lexical_cast.hpp>
+ #include <exceptions/exceptions.h>
+ #include <cc/dhcp_config_error.h>
diff --git a/kea/patches/patch-src_hooks_dhcp_high__availability_Makefile.in b/kea/patches/patch-src_hooks_dhcp_high__availability_Makefile.in
deleted file mode 100644
index 58930fed19..0000000000
--- a/kea/patches/patch-src_hooks_dhcp_high__availability_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-* use c++ for linking c++ code
---- src/hooks/dhcp/high_availability/Makefile.in.orig	2019-11-19 14:50:58.000000000 +0000
-+++ src/hooks/dhcp/high_availability/Makefile.in
-@@ -160,8 +160,8 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libdhcp_ha_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+libdhcp_ha_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(libdhcp_ha_la_LDFLAGS) $(LDFLAGS) -o $@
- libha_la_LIBADD =
- am_libha_la_OBJECTS = libha_la-command_creator.lo \
-@@ -615,7 +615,7 @@ clean-noinstLTLIBRARIES:
- 	}
- 
- libdhcp_ha.la: $(libdhcp_ha_la_OBJECTS) $(libdhcp_ha_la_DEPENDENCIES) $(EXTRA_libdhcp_ha_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libdhcp_ha_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_ha_la_OBJECTS) $(libdhcp_ha_la_LIBADD) $(LIBS)
-+	$(AM_V_CXXLD)$(libdhcp_ha_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_ha_la_OBJECTS) $(libdhcp_ha_la_LIBADD) $(LIBS)
- 
- libha.la: $(libha_la_OBJECTS) $(libha_la_DEPENDENCIES) $(EXTRA_libha_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(libha_la_LINK)  $(libha_la_OBJECTS) $(libha_la_LIBADD) $(LIBS)
diff --git a/kea/patches/patch-src_hooks_dhcp_lease__cmds_Makefile.in b/kea/patches/patch-src_hooks_dhcp_lease__cmds_Makefile.in
deleted file mode 100644
index f79ce2245b..0000000000
--- a/kea/patches/patch-src_hooks_dhcp_lease__cmds_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-* use c++ for linking c++ code
---- src/hooks/dhcp/lease_cmds/Makefile.in.orig	2019-11-19 14:50:58.000000000 +0000
-+++ src/hooks/dhcp/lease_cmds/Makefile.in
-@@ -162,9 +162,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libdhcp_lease_cmds_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(AM_CFLAGS) $(CFLAGS) $(libdhcp_lease_cmds_la_LDFLAGS) \
-+libdhcp_lease_cmds_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdhcp_lease_cmds_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- liblease_cmds_la_LIBADD =
- am_liblease_cmds_la_OBJECTS = liblease_cmds_la-lease_cmds.lo \
-@@ -617,7 +617,7 @@ clean-noinstLTLIBRARIES:
- 	}
- 
- libdhcp_lease_cmds.la: $(libdhcp_lease_cmds_la_OBJECTS) $(libdhcp_lease_cmds_la_DEPENDENCIES) $(EXTRA_libdhcp_lease_cmds_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libdhcp_lease_cmds_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_lease_cmds_la_OBJECTS) $(libdhcp_lease_cmds_la_LIBADD) $(LIBS)
-+	$(AM_V_CXXLD)$(libdhcp_lease_cmds_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_lease_cmds_la_OBJECTS) $(libdhcp_lease_cmds_la_LIBADD) $(LIBS)
- 
- liblease_cmds.la: $(liblease_cmds_la_OBJECTS) $(liblease_cmds_la_DEPENDENCIES) $(EXTRA_liblease_cmds_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(liblease_cmds_la_LINK)  $(liblease_cmds_la_OBJECTS) $(liblease_cmds_la_LIBADD) $(LIBS)
diff --git a/kea/patches/patch-src_hooks_dhcp_mysql__cb_Makefile.in b/kea/patches/patch-src_hooks_dhcp_mysql__cb_Makefile.in
deleted file mode 100644
index 34117aceac..0000000000
--- a/kea/patches/patch-src_hooks_dhcp_mysql__cb_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-* use c++ for linking c++ code
---- src/hooks/dhcp/mysql_cb/Makefile.in.orig	2019-11-19 14:50:58.000000000 +0000
-+++ src/hooks/dhcp/mysql_cb/Makefile.in
-@@ -161,9 +161,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libdhcp_mysql_cb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(AM_CFLAGS) $(CFLAGS) $(libdhcp_mysql_cb_la_LDFLAGS) \
-+libdhcp_mysql_cb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdhcp_mysql_cb_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- libmysqlcb_la_LIBADD =
- am_libmysqlcb_la_OBJECTS = libmysqlcb_la-mysql_cb_callouts.lo \
-@@ -616,7 +616,7 @@ clean-noinstLTLIBRARIES:
- 	}
- 
- libdhcp_mysql_cb.la: $(libdhcp_mysql_cb_la_OBJECTS) $(libdhcp_mysql_cb_la_DEPENDENCIES) $(EXTRA_libdhcp_mysql_cb_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libdhcp_mysql_cb_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_mysql_cb_la_OBJECTS) $(libdhcp_mysql_cb_la_LIBADD) $(LIBS)
-+	$(AM_V_CXXLD)$(libdhcp_mysql_cb_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_mysql_cb_la_OBJECTS) $(libdhcp_mysql_cb_la_LIBADD) $(LIBS)
- 
- libmysqlcb.la: $(libmysqlcb_la_OBJECTS) $(libmysqlcb_la_DEPENDENCIES) $(EXTRA_libmysqlcb_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(libmysqlcb_la_LINK)  $(libmysqlcb_la_OBJECTS) $(libmysqlcb_la_LIBADD) $(LIBS)
diff --git a/kea/patches/patch-src_hooks_dhcp_stat__cmds_Makefile.in b/kea/patches/patch-src_hooks_dhcp_stat__cmds_Makefile.in
deleted file mode 100644
index 9f3d812bce..0000000000
--- a/kea/patches/patch-src_hooks_dhcp_stat__cmds_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-* use c++ for linking c++ code
---- src/hooks/dhcp/stat_cmds/Makefile.in.orig	2019-11-19 14:50:58.000000000 +0000
-+++ src/hooks/dhcp/stat_cmds/Makefile.in
-@@ -161,9 +161,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libdhcp_stat_cmds_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(AM_CFLAGS) $(CFLAGS) $(libdhcp_stat_cmds_la_LDFLAGS) \
-+libdhcp_stat_cmds_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdhcp_stat_cmds_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- libstat_cmds_la_LIBADD =
- am_libstat_cmds_la_OBJECTS = libstat_cmds_la-stat_cmds.lo \
-@@ -613,7 +613,7 @@ clean-noinstLTLIBRARIES:
- 	}
- 
- libdhcp_stat_cmds.la: $(libdhcp_stat_cmds_la_OBJECTS) $(libdhcp_stat_cmds_la_DEPENDENCIES) $(EXTRA_libdhcp_stat_cmds_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libdhcp_stat_cmds_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_stat_cmds_la_OBJECTS) $(libdhcp_stat_cmds_la_LIBADD) $(LIBS)
-+	$(AM_V_CXXLD)$(libdhcp_stat_cmds_la_LINK) -rpath $(lib_hooksdir) $(libdhcp_stat_cmds_la_OBJECTS) $(libdhcp_stat_cmds_la_LIBADD) $(LIBS)
- 
- libstat_cmds.la: $(libstat_cmds_la_OBJECTS) $(libstat_cmds_la_DEPENDENCIES) $(EXTRA_libstat_cmds_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(libstat_cmds_la_LINK)  $(libstat_cmds_la_OBJECTS) $(libstat_cmds_la_LIBADD) $(LIBS)
diff --git a/kea/patches/patch-src_hooks_dhcp_user__chk_Makefile.in b/kea/patches/patch-src_hooks_dhcp_user__chk_Makefile.in
deleted file mode 100644
index 93698f6378..0000000000
--- a/kea/patches/patch-src_hooks_dhcp_user__chk_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-* use c++ for linking c++ code
---- src/hooks/dhcp/user_chk/Makefile.in.orig	2019-11-19 14:50:58.000000000 +0000
-+++ src/hooks/dhcp/user_chk/Makefile.in
-@@ -122,9 +122,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libdhcp_user_chk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(AM_CFLAGS) $(CFLAGS) $(libdhcp_user_chk_la_LDFLAGS) \
-+libdhcp_user_chk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdhcp_user_chk_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- libduc_la_LIBADD =
- am_libduc_la_OBJECTS = libduc_la-load_unload.lo \
-@@ -527,7 +527,7 @@ clean-noinstLTLIBRARIES:
- 	}
- 
- libdhcp_user_chk.la: $(libdhcp_user_chk_la_OBJECTS) $(libdhcp_user_chk_la_DEPENDENCIES) $(EXTRA_libdhcp_user_chk_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libdhcp_user_chk_la_LINK)  $(libdhcp_user_chk_la_OBJECTS) $(libdhcp_user_chk_la_LIBADD) $(LIBS)
-+	$(AM_V_CXXLD)$(libdhcp_user_chk_la_LINK)  $(libdhcp_user_chk_la_OBJECTS) $(libdhcp_user_chk_la_LIBADD) $(LIBS)
- 
- libduc.la: $(libduc_la_OBJECTS) $(libduc_la_DEPENDENCIES) $(EXTRA_libduc_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(libduc_la_LINK)  $(libduc_la_OBJECTS) $(libduc_la_LIBADD) $(LIBS)
diff --git a/kea/patches/patch-src_lib_dhcp_Makefile.am b/kea/patches/patch-src_lib_dhcp_Makefile.am
new file mode 100644
index 0000000000..96528ba5ac
--- /dev/null
+++ b/kea/patches/patch-src_lib_dhcp_Makefile.am
@@ -0,0 +1,24 @@
+$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
+ libkea_dhcp___la_SOURCES += pkt_filter_bpf.cc pkt_filter_bpf.h
+ endif
+ 
++if OS_SOLARIS
++libkea_dhcp___la_SOURCES += pkt_filter_bpf.cc pkt_filter_bpf.h
++endif
++
+ libkea_dhcp___la_SOURCES += protocol_util.cc protocol_util.h
+ libkea_dhcp___la_SOURCES += std_option_defs.h
+ 
+@@ -152,3 +156,8 @@ if OS_BSD
+ libkea_dhcp___include_HEADERS += \
+ 	pkt_filter_bpf.h
+ endif
++
++if OS_SOLARIS
++libkea_dhcp___include_HEADERS += \
++	pkt_filter_bpf.h
++endif
diff --git a/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
new file mode 100644
index 0000000000..4e3e30017f
--- /dev/null
+++ b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
@@ -0,0 +1,13 @@
+$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() {
+         isc_throw(Unexpected, "Network interfaces detection failed.");
+     }
+ 
+-    typedef map<string, IfacePtr> IfaceLst;
++    typedef std::map<string, IfacePtr> IfaceLst;
+     IfaceLst::iterator iface_iter;
+     IfaceLst ifaces;
+ 
diff --git a/kea/patches/patch-src_lib_dhcpsrv_Makefile.am b/kea/patches/patch-src_lib_dhcpsrv_Makefile.am
new file mode 100644
index 0000000000..7cfa02c8df
--- /dev/null
+++ b/kea/patches/patch-src_lib_dhcpsrv_Makefile.am
@@ -0,0 +1,10 @@
+$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 =
+ 	parsers/simple_parser4.h \
+ 	parsers/simple_parser6.h
+ 
+-install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
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
new file mode 100644
index 0000000000..923232fdb1
--- /dev/null
+++ b/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
@@ -0,0 +1,13 @@
+$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;
+ namespace isc {
+ namespace dhcp {
+ 
+-map<string, HostDataSourceFactory::Factory> HostDataSourceFactory::map_;
++std::map<string, HostDataSourceFactory::Factory> HostDataSourceFactory::map_;
+ 
+ void
+ HostDataSourceFactory::add(HostDataSourceList& sources,
diff --git a/kea/patches/patch-src_lib_util_watch__socket.cc b/kea/patches/patch-src_lib_util_watch__socket.cc
new file mode 100644
index 0000000000..8885a901b0
--- /dev/null
+++ b/kea/patches/patch-src_lib_util_watch__socket.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+* Solaris has FIONREAD in sys/filoi.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 @@
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ 
++#ifdef HAVE_SYS_FILIO_H
++#include <sys/filio.h>
++#endif
++
+ namespace isc {
+ namespace util {
+
Prev by Date: remove spectrwm, imported in pkgsrc.
Next by Date: kea: cleanup and add upstream patch for depracated boost header
Previous by Thread: remove spectrwm, imported in pkgsrc.
Next by Thread: kea: cleanup and add upstream patch for depracated boost header
Indexes:
Home | Main Index | Thread Index | Old Index