gentoo auto-resync : 19:10:2022 - 07:57:56

4 files changed, 73 insertions, 199 deletions

diff --git a/net-misc/kea/files/ax_gtest.m4 b/net-misc/kea/files/ax_gtest.m4
new file mode 100644
index 000000000000..acd887c2d3ab
--- /dev/null
+++ b/net-misc/kea/files/ax_gtest.m4
@@ -0,0 +1,62 @@
+AC_DEFUN([AX_ISC_GTEST], [
+
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov[[=PROGRAM]]],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
+
+USE_LCOV="no"
+if test "$lcov" != "no"; then
+        # force gtest if not set
+        if test "$enable_gtest" = "no"; then
+#               AC_MSG_ERROR("lcov needs gtest for test coverage report")
+                AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests])
+                enable_gtest="yes"
+        fi
+        if test "$lcov" != "yes"; then
+                LCOV=$lcov
+        else
+                AC_PATH_PROG([LCOV], [lcov])
+        fi
+        if test -x "${LCOV}"; then
+                USE_LCOV="yes"
+        else
+                AC_MSG_ERROR([Cannot find lcov.])
+        fi
+        # is genhtml always in the same directory?
+        GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/`
+        if test ! -x $GENHTML; then
+                AC_MSG_ERROR([genhtml not found, needed for lcov])
+        fi
+        # GCC specific?
+        CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+        LIBS=" $LIBS -lgcov"
+        AC_SUBST(CPPFLAGS)
+        AC_SUBST(LIBS)
+        AC_SUBST(LCOV)
+        AC_SUBST(GENHTML)
+fi
+AC_SUBST(USE_LCOV)
+
+#
+# Check availability of gtest, which will be used for unit tests.
+#
+DISTCHECK_GTEST_CONFIGURE_FLAG=
+
+AS_IF([test "x$enable_gtest" = "xyes"], [
+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
+    GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
+    GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
+    GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
+])
+
+AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
+AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
+AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
+AC_SUBST(GTEST_INCLUDES)
+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS])
+AC_SUBST(GTEST_SOURCE)
+
+])dnl AX_ISC_GTEST
diff --git a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
deleted file mode 100644
index 867561f2e7e5..000000000000
--- a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/m4macros/ax_cpp11.m4
-+++ b/m4macros/ax_cpp11.m4
-@@ -182,6 +182,7 @@
- 	AC_COMPILE_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[#include <thread>
-+			 #include <memory>
- 			 std::shared_ptr<std::thread> th;],
- 			[th.reset(new std::thread([[]]() { return; }));
- 			 th->join();])],
---- a/src/bin/perfdhcp/Makefile.am
-+++ b/src/bin/perfdhcp/Makefile.am
-@@ -3,7 +3,6 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
- AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
- AM_CPPFLAGS += $(BOOST_INCLUDES)
--AM_CPPFLAGS += -Werror
- 
- AM_CXXFLAGS = $(KEA_CXXFLAGS)
- 
---- a/src/bin/perfdhcp/tests/Makefile.am
-+++ b/src/bin/perfdhcp/tests/Makefile.am
-@@ -4,7 +4,6 @@
- AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
- AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
- AM_CPPFLAGS += $(BOOST_INCLUDES)
--AM_CPPFLAGS += -Werror
- AM_CXXFLAGS = $(KEA_CXXFLAGS)
- 
- if USE_STATIC_LINK
---- a/src/lib/database/backend_selector.cc
-+++ b/src/lib/database/backend_selector.cc
-@@ -7,6 +7,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 {
diff --git a/net-misc/kea/files/kea-1.8.2-gtest.patch b/net-misc/kea/files/kea-1.8.2-gtest.patch
deleted file mode 100644
index 5fa4488b926c..000000000000
--- a/net-misc/kea/files/kea-1.8.2-gtest.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- a/m4macros/ax_gtest.m4
-+++ b/m4macros/ax_gtest.m4
-@@ -1,24 +1,14 @@
- AC_DEFUN([AX_ISC_GTEST], [
-
--enable_gtest="no"
--GTEST_INCLUDES=
--
--AC_ARG_WITH([gtest-source],
--            [AS_HELP_STRING([--with-gtest-source=PATH],
--                            [location of the Googletest source])],
--            [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
--
--AC_ARG_WITH([gtest],
--            [AS_HELP_STRING([--with-gtest=PATH],
--                            [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
--        [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
-+AC_ARG_ENABLE([gtest],
-+              [AS_HELP_STRING([--enable-gtest],
-+                              [Enable testing via Googletest [default=no]])])
-
- AC_ARG_WITH([lcov],
-             [AS_HELP_STRING([--with-lcov=PROGRAM],
-                             [enable gtest and coverage target using the specified lcov])],
-                             [lcov="$withval"],
-                             [lcov="no"])
--
- USE_LCOV="no"
- if test "$lcov" != "no"; then
-         # force gtest if not set
-@@ -55,110 +45,22 @@
- #
- # Check availability of gtest, which will be used for unit tests.
- #
--GTEST_LDFLAGS=
--GTEST_LDADD=
- DISTCHECK_GTEST_CONFIGURE_FLAG=
--GTEST_VERSION="unknown"
--
--if test "x$enable_gtest" = "xyes" ; then
--
--    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
--
--    if test -n "$with_gtest_source" ; then
-
--        if test "x$GTEST_SOURCE" = "xyes" ; then
-+AS_IF([test "x$enable_gtest" = "xyes"], [
-+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
-+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
-+    GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
-+    GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
-+    GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
-+])
-
--            AC_MSG_CHECKING([for gtest source])
--            # If not specified, try some common paths.
--            GTEST_SOURCE=
--            for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
--                if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
--                    GTEST_SOURCE=$d
--                    AC_MSG_RESULT([$GTEST_SOURCE])
--                    break
--                fi
--            done
--            if test -z $GTEST_SOURCE ; then
--                AC_MSG_ERROR([no gtest source but it was selected])
--            fi
--        else
--            if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
--                GTEST_SOURCE=$GTEST_SOURCE/googletest
--            fi
--            if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then
--                have_gtest_source=yes
--            else
--                AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
--            fi
--        fi
--        have_gtest_source=yes
--
--        GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
--        DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
--        GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
--        GTEST_VERSION="`basename $GTEST_SOURCE`"
--
--# Versions starting from 1.8.0 are put in the googletest directory. If the basename
--# returns googletest string, we need to cut it off and try baseline again.
--        if test "$GTEST_VERSION" == "googletest"; then
--            GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
--            GTEST_VERSION=`basename $GTEST_VERSION`
--        fi
--        GTEST_VERSION="${GTEST_VERSION#googletest-release-}"
--        GTEST_VERSION="${GTEST_VERSION#gtest-}"
--    fi
--
--    if test "$gtest_path" != "no" ; then
--        if test "$gtest_path" != "yes"; then
--            GTEST_PATHS=$gtest_path
--            if test -x "${gtest_path}/bin/gtest-config" ; then
--                GTEST_CONFIG="${gtest_path}/bin/gtest-config"
--            fi
--        else
--            AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
--        fi
--        if test -x "${GTEST_CONFIG}" ; then :
--            # using cppflags instead of cxxflags
--            GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
--            GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
--            GTEST_LDADD=`${GTEST_CONFIG} --libs`
--            GTEST_VERSION=`${GTEST_CONFIG} --version`
--            GTEST_FOUND="true"
--        else
--            AC_MSG_WARN([Unable to locate Google Test gtest-config.])
--            if test -z "${GTEST_PATHS}" ; then
--                GTEST_PATHS="/usr /usr/local"
--            fi
--            GTEST_FOUND="false"
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            GTEST_FOUND="false"
--            for dir in $GTEST_PATHS; do
--                if test -f "$dir/include/gtest/gtest.h"; then
--                    if ! test -f "$dir/lib/libgtest.a"; then
--                        AC_MSG_WARN([Found Google Test include but not the library in $dir.])
--                        continue
--                    fi
--                    GTEST_INCLUDES="-I$dir/include"
--                    GTEST_LDFLAGS="-L$dir/lib"
--                    GTEST_LDADD="-lgtest"
--                    GTEST_FOUND="true"
--                    break
--                fi
--            done
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
--        fi
--
--    fi
--fi
- AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
- AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
- AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
- AC_SUBST(GTEST_INCLUDES)
- AC_SUBST(GTEST_LDFLAGS)
--AC_SUBST(GTEST_LDADD)
-+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS])
- AC_SUBST(GTEST_SOURCE)
-
- ])dnl AX_ISC_GTEST
diff --git a/net-misc/kea/files/kea-2.2.0-openssl-version.patch b/net-misc/kea/files/kea-2.2.0-openssl-version.patch
new file mode 100644
index 000000000000..5e323357d7c5
--- /dev/null
+++ b/net-misc/kea/files/kea-2.2.0-openssl-version.patch
@@ -0,0 +1,11 @@
+--- a/m4macros/ax_crypto.m4
++++ b/m4macros/ax_crypto.m4
+@@ -258,7 +258,7 @@ then
+ else
+    CRYPTO_NAME="OpenSSL"
+    DISABLED_CRYPTO="Botan"
+-   CRYPTO_PACKAGE="openssl-1.1.0"
++   CRYPTO_PACKAGE="openssl"
+    DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}"
+    AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto])
+    AC_MSG_CHECKING(for OpenSSL library)