kea: 2.6.2 -> 2.6.3 (#411875)

nixos/modules/services/networking/kea.nix

···
 
   config =
     let
+      commonEnvironment = {
+        KEA_CONTROL_SOCKET_DIR = "/run/kea";
+        KEA_LOCKFILE_DIR = "/run/kea";
+        KEA_PIDFILE_DIR = "/run/kea";
+      };
+
       commonServiceConfig = {
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecReload = toString [
+          (lib.getExe' pkgs.coreutils "kill")
+          "-HUP"
+          "$MAINPID"
+        ];
         DynamicUser = true;
         User = "kea";
         ConfigurationDirectory = "kea";
+        Restart = "on-failure";
         RuntimeDirectory = "kea";
+        RuntimeDirectoryMode = "0750";
         RuntimeDirectoryPreserve = true;
         StateDirectory = "kea";
         UMask = "0077";
···
       lib.mkMerge [
         {
           environment.systemPackages = [ package ];
+
+          users.users.kea = {
+            isSystemUser = true;
+            group = "kea";
+          };
+          users.groups.kea = { };
         }
 
         (lib.mkIf cfg.ctrl-agent.enable {
···
               "kea-dhcp-ddns-server.service"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               ctrlAgentConfig
···
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcp4Config
···
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcp6Config
···
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcpDdnsConfig

pkgs/by-name/ke/kea/dont-create-var.patch

···
 diff --git a/Makefile.am b/Makefile.am
-index 10708e7..d4efd73 100644
+index a81f4cc..5d61407 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -150,13 +150,6 @@ cppcheck:
+@@ -173,18 +173,6 @@ cppcheck:
  docs:
  	$(MAKE) -C doc/sphinx
  
 -
--# These steps are necessary during installation
+-# These steps are necessary during installation. chmod is for reinstallation/upgrade.
 -install-exec-hook:
--	mkdir -p $(DESTDIR)${localstatedir}/log/
--	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
--	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
+-	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${sysconfdir}/${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 a0a0289..ba42f8a 100644
+index 7e0f3c4..08c53d8 100644
 --- a/src/lib/dhcpsrv/Makefile.am
 +++ b/src/lib/dhcpsrv/Makefile.am
-@@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+@@ -420,6 +420,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+ 	parsers/shared_networks_list_parser.h \
  	parsers/simple_parser4.h \
  	parsers/simple_parser6.h
- 
+-
 -install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)

pkgs/by-name/ke/kea/package.nix

···
 
 stdenv.mkDerivation rec {
   pname = "kea";
-  version = "2.6.2"; # only even minor versions are stable
+  version = "2.6.3"; # only even minor versions are stable
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-ilC2MQNzS1nDuGGczWdm0t/uPwLjpfnzq8HNVfcPpCQ=";
+    hash = "sha256-ACQaWVX/09IVosCYxFJ/nX9LIDGIsnb5o2JQ3T2d1hI=";
   };
 
   patches = [
···
   ];
 
   postPatch = ''
-    substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am --replace-fail '@sysconfdir@' "$out/etc"
     # darwin special-casing just causes trouble
-    substituteInPlace ./m4macros/ax_crypto.m4 --replace 'apple-darwin' 'nope'
+    substituteInPlace ./m4macros/ax_crypto.m4 --replace-fail 'apple-darwin' 'nope'
   '';
 
   outputs = [