Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kea: bump to 2.0.2

Browse source 
Drop patches that no longer apply:
- net/kea/patches/001-fix-cross-compile.patch
- net/kea/patches/002-fix-host-compile.patch

Drop upstreamed patches:
- net/kea/patches/020-shared_ptr.patch
- net/kea/patches/030-gcc11.patch
- net/kea/patches/040-map.patch

Fixup patch net/kea/patches/003-no-test-compile.patch.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2022-03-31 02:52:33 +03:00 committed by Rosen Penev
parent 58866f3452
commit e58438abd6
8 changed files with 11 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/kea/Makefile
View file

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=kea
PKG_VERSION:=1.8.2
PKG_VERSION:=2.0.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)
PKG_HASH:=486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39
PKG_HASH:=8d28213bdc8e2bb870a383b30ac1e53d54e1eba43d2f86e5151b08b66aa6cf32
PKG_MAINTAINER:=BangLang Huang<banglang.huang@foxmail.com>, Rosy Song<rosysong@rosinson.com>
PKG_LICENSE:=MPL-2.0

16
net/kea/patches/001-fix-cross-compile.patch
View file

@ -1,16 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -580,10 +580,10 @@ AC_TRY_COMPILE([
usable_regex=
AC_MSG_CHECKING(for usuable C++11 regex)
-AC_TRY_RUN([
+AC_TRY_COMPILE([
#include <regex>
-#include <iostream>
-int main() {
+#include <iostream>],
+[int main() {
const std::regex regex(".*");
const std::string string = "This should match!";
const auto result = std::regex_search(string, regex);

11
net/kea/patches/002-fix-host-compile.patch
View file

@ -1,11 +0,0 @@
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -330,7 +330,7 @@ EOF
dnl Check availability of SHA-2
AC_MSG_CHECKING([support of SHA-2])
LIBS_SAVED=${LIBS}
- LIBS="$LIBS $CRYPTO_LIBS"
+ LIBS="$LIBS $CRYPTO_LIBS -lpthread"
CPPFLAGS_SAVED=${CPPFLAGS}
CPPFLAGS="$CRYPTO_INCLUDES $CPPFLAGS"
AC_LINK_IFELSE(

16
net/kea/patches/003-no-test-compile.patch
View file

@ -76,8 +76,8 @@
-SUBDIRS = . tests
+SUBDIRS = .
pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
PYTHON_PREFIX=@prefix@
PYTHON_EXEC_PREFIX=@prefix@
--- a/src/hooks/dhcp/high_availability/Makefile.am
+++ b/src/hooks/dhcp/high_availability/Makefile.am
@@ -1,4 +1,4 @@
@ -85,7 +85,7 @@
+SUBDIRS = . libloadtests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -1,4 +1,4 @@
@ -125,7 +125,7 @@
+SUBDIRS = .
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -1,4 +1,4 @@
@ -149,7 +149,7 @@
+SUBDIRS = .
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
--- a/src/lib/config_backend/Makefile.am
+++ b/src/lib/config_backend/Makefile.am
@@ -1,4 +1,4 @@
@ -249,7 +249,7 @@
+SUBDIRS = .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -1,4 +1,4 @@
@ -293,7 +293,7 @@
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . tests
-SUBDIRS = . tests testutils
+SUBDIRS = .
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
@ -315,4 +315,4 @@
+SUBDIRS = .
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_CPPFLAGS)
AM_CPPFLAGS += $(BOOST_INCLUDES)

2
net/kea/patches/004-replace-rev-with-awk.patch
View file

@ -1,6 +1,6 @@
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -98,7 +98,7 @@ get_pid_from_file() {
@@ -117,7 +117,7 @@ get_pid_from_file() {
# Extract the name portion (from last slash to last dot) of the config file name
# File name and extension are documented in src/lib/util/filename.h
local conf_name

24
net/kea/patches/020-shared_ptr.patch
View file

@ -1,24 +0,0 @@
From d505f7a7d6fac1c00a4467dfcf1e84f2db508bc6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@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@gmail.com>
---
m4macros/ax_cpp11.m4 | 1 +
1 file changed, 1 insertion(+)
--- a/m4macros/ax_cpp11.m4
+++ b/m4macros/ax_cpp11.m4
@@ -182,6 +182,7 @@ for retry in "none" "--std=c++11" "--std
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[#include <thread>
+ #include <memory>
std::shared_ptr<std::thread> th;],
[th.reset(new std::thread([[]]() { return; }));
th->join();])],

21
net/kea/patches/030-gcc11.patch
View file

@ -1,21 +0,0 @@
--- a/src/lib/database/backend_selector.cc
+++ b/src/lib/database/backend_selector.cc
@@ -6,7 +6,7 @@
#include <database/backend_selector.h>
#include <exceptions/exceptions.h>
-#include <climits>
+#include <limits>
#include <sstream>
using namespace isc::data;
--- 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 {

10
net/kea/patches/040-map.patch
View file

@ -1,10 +0,0 @@
--- a/src/lib/dhcpsrv/timer_mgr.cc
+++ b/src/lib/dhcpsrv/timer_mgr.cc
@@ -12,6 +12,7 @@
#include <exceptions/exceptions.h>
#include <functional>
+#include <map>
#include <utility>
using namespace isc;