From af48372e3740713595a07330316276259162edf6 Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Sun, 8 Oct 2023 01:47:09 +0300
Subject: [PATCH] kea: bump to 2.4.0

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 net/kea/Makefile                          |  4 +-
 net/kea/patches/003-no-test-compile.patch | 88 ++++++++++++++++++-----
 2 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/net/kea/Makefile b/net/kea/Makefile
index 2909346370..c44c088e80 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kea
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)
-PKG_HASH:=bd2555b48b4dcda08097b12695e53227c6a23c6901018fc31b79d409c998c181
+PKG_HASH:=3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7
 
 PKG_MAINTAINER:=BangLang Huang <banglang.huang@foxmail.com>, Rosy Song <rosysong@rosinson.com>
 PKG_LICENSE:=MPL-2.0
diff --git a/net/kea/patches/003-no-test-compile.patch b/net/kea/patches/003-no-test-compile.patch
index 709e534c65..d22badf04a 100644
--- a/net/kea/patches/003-no-test-compile.patch
+++ b/net/kea/patches/003-no-test-compile.patch
@@ -76,8 +76,8 @@
 -SUBDIRS = . tests
 +SUBDIRS = .
  
- PYTHON_PREFIX=@prefix@
- PYTHON_EXEC_PREFIX=@prefix@
+ pkgpython_PYTHON = kea_conn.py kea_connector3.py
+ 
 --- a/src/hooks/dhcp/high_availability/Makefile.am
 +++ b/src/hooks/dhcp/high_availability/Makefile.am
 @@ -1,4 +1,4 @@
@@ -89,16 +89,16 @@
 --- a/src/hooks/dhcp/lease_cmds/Makefile.am
 +++ b/src/hooks/dhcp/lease_cmds/Makefile.am
 @@ -1,4 +1,4 @@
--SUBDIRS = . tests
-+SUBDIRS = .
+-SUBDIRS = . tests libloadtests
++SUBDIRS = . libloadtests
  
  AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  AM_CPPFLAGS += $(BOOST_INCLUDES)
 --- a/src/hooks/dhcp/stat_cmds/Makefile.am
 +++ b/src/hooks/dhcp/stat_cmds/Makefile.am
 @@ -1,4 +1,4 @@
--SUBDIRS = . tests
-+SUBDIRS = .
+-SUBDIRS = . tests libloadtests
++SUBDIRS = . libloadtests
  
  AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  AM_CPPFLAGS += $(BOOST_INCLUDES)
@@ -134,14 +134,6 @@
  
  AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  AM_CPPFLAGS += $(BOOST_INCLUDES)
---- a/src/lib/cfgrpt/Makefile.am
-+++ b/src/lib/cfgrpt/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = . tests
-+SUBDIRS = .
- 
- AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
- AM_CXXFLAGS  = $(KEA_CXXFLAGS)
 --- a/src/lib/config/Makefile.am
 +++ b/src/lib/config/Makefile.am
 @@ -1,4 +1,4 @@
@@ -277,8 +269,8 @@
 --- a/src/lib/process/Makefile.am
 +++ b/src/lib/process/Makefile.am
 @@ -1,4 +1,4 @@
--SUBDIRS = . testutils tests
-+SUBDIRS = .
+-SUBDIRS = cfgrpt . testutils tests
++SUBDIRS = cfgrpt . testutils
  # DATA_DIR is the directory where to put PID files.
  dhcp_data_dir = @runstatedir@/@PACKAGE@
  AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
@@ -308,3 +300,67 @@
  
  AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  AM_CPPFLAGS += $(BOOST_INCLUDES)
+--- a/src/hooks/dhcp/bootp/Makefile.am
++++ b/src/hooks/dhcp/bootp/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests libloadtests
++SUBDIRS = . libloadtests
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+--- a/src/hooks/dhcp/flex_option/Makefile.am
++++ b/src/hooks/dhcp/flex_option/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . libloadtests tests
++SUBDIRS = . libloadtests
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+--- a/src/hooks/dhcp/mysql_cb/Makefile.am
++++ b/src/hooks/dhcp/mysql_cb/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests libloadtests
++SUBDIRS = . libloadtests
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS)
+--- a/src/hooks/dhcp/pgsql_cb/Makefile.am
++++ b/src/hooks/dhcp/pgsql_cb/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests libloadtests
++SUBDIRS = . libloadtests
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS)
+--- a/src/hooks/dhcp/run_script/Makefile.am
++++ b/src/hooks/dhcp/run_script/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . libloadtests tests
++SUBDIRS = . libloadtests
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+--- a/src/lib/d2srv/Makefile.am
++++ b/src/lib/d2srv/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . testutils tests
++SUBDIRS = . testutils
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+--- a/src/lib/process/cfgrpt/Makefile.am
++++ b/src/lib/process/cfgrpt/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests
++SUBDIRS = .
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+ AM_CXXFLAGS  = $(KEA_CXXFLAGS)
+--- a/src/lib/tcp/Makefile.am
++++ b/src/lib/tcp/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests
++SUBDIRS = .
+ 
+ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+ AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)