Merge pull request #107759 from mweinelt/kea

kea: 1.5.0-P1 -> 1.8.2

pkgs/tools/networking/kea/default.nix

@@ -1,15 +1,22 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
+{ stdenv
-, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
+, lib
-
+, fetchurl
-let inherit (stdenv) lib; in
+, autoreconfHook
+, pkg-config
+, boost
+, botan2
+, libmysqlclient
+, log4cplus
+, postgresql
+, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "kea";
-  version = "1.5.0-P1";
+  version = "1.8.2";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
+    sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28";
   };
 
   patches = [ ./dont-create-var.patch ];
@@ -20,15 +27,24 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
+    "--enable-perfdhcp"
+    "--enable-shell"
     "--localstatedir=/var"
-    "--with-pgsql=${postgresql}/bin/pg_config"
     "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"
+    "--with-pgsql=${postgresql}/bin/pg_config"
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    openssl log4cplus boost python3 libmysqlclient
+    boost
-    botan2 gmp bzip2
+    botan2
+    libmysqlclient
+    log4cplus
+    python3
   ];
 
   enableParallelBuilding = true;

pkgs/tools/networking/kea/dont-create-var.patch

@@ -1,26 +1,28 @@
 diff --git a/Makefile.am b/Makefile.am
-index 2c0733c..974bb5e 100644
+index 10708e7..d4efd73 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -135,11 +135,6 @@ cppcheck:
+@@ -150,13 +150,6 @@ cppcheck:
- 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
+ docs:
- 		src
+ 	$(MAKE) -C doc/sphinx
  
+-
 -# These steps are necessary during installation
 -install-exec-hook:
 -	mkdir -p $(DESTDIR)${localstatedir}/log/
--	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+-	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/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
-index 564f623..7cea9f2 100644
+index a0a0289..ba42f8a 100644
 --- a/src/lib/dhcpsrv/Makefile.am
 +++ b/src/lib/dhcpsrv/Makefile.am
-@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+@@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+ 	parsers/simple_parser4.h \
  	parsers/simple_parser6.h
  
- 
 -install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)