kea: 2.6.2 -> 2.6.3 (#411875)

authored by Martin Weinelt and committed by GitHub 62b08a9a 6586662e

+42 -30
+23 -17
nixos/modules/services/networking/kea.nix
··· 265 265 266 266 config = 267 267 let 268 + commonEnvironment = { 269 + KEA_CONTROL_SOCKET_DIR = "/run/kea"; 270 + KEA_LOCKFILE_DIR = "/run/kea"; 271 + KEA_PIDFILE_DIR = "/run/kea"; 272 + }; 273 + 268 274 commonServiceConfig = { 269 - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; 275 + ExecReload = toString [ 276 + (lib.getExe' pkgs.coreutils "kill") 277 + "-HUP" 278 + "$MAINPID" 279 + ]; 270 280 DynamicUser = true; 271 281 User = "kea"; 272 282 ConfigurationDirectory = "kea"; 283 + Restart = "on-failure"; 273 284 RuntimeDirectory = "kea"; 285 + RuntimeDirectoryMode = "0750"; 274 286 RuntimeDirectoryPreserve = true; 275 287 StateDirectory = "kea"; 276 288 UMask = "0077"; ··· 280 292 lib.mkMerge [ 281 293 { 282 294 environment.systemPackages = [ package ]; 295 + 296 + users.users.kea = { 297 + isSystemUser = true; 298 + group = "kea"; 299 + }; 300 + users.groups.kea = { }; 283 301 } 284 302 285 303 (lib.mkIf cfg.ctrl-agent.enable { ··· 312 330 "kea-dhcp-ddns-server.service" 313 331 ]; 314 332 315 - environment = { 316 - KEA_PIDFILE_DIR = "/run/kea"; 317 - KEA_LOCKFILE_DIR = "/run/kea"; 318 - }; 333 + environment = commonEnvironment; 319 334 320 335 restartTriggers = [ 321 336 ctrlAgentConfig ··· 358 373 "multi-user.target" 359 374 ]; 360 375 361 - environment = { 362 - KEA_PIDFILE_DIR = "/run/kea"; 363 - KEA_LOCKFILE_DIR = "/run/kea"; 364 - }; 376 + environment = commonEnvironment; 365 377 366 378 restartTriggers = [ 367 379 dhcp4Config ··· 411 423 "multi-user.target" 412 424 ]; 413 425 414 - environment = { 415 - KEA_PIDFILE_DIR = "/run/kea"; 416 - KEA_LOCKFILE_DIR = "/run/kea"; 417 - }; 426 + environment = commonEnvironment; 418 427 419 428 restartTriggers = [ 420 429 dhcp6Config ··· 460 469 "multi-user.target" 461 470 ]; 462 471 463 - environment = { 464 - KEA_PIDFILE_DIR = "/run/kea"; 465 - KEA_LOCKFILE_DIR = "/run/kea"; 466 - }; 472 + environment = commonEnvironment; 467 473 468 474 restartTriggers = [ 469 475 dhcpDdnsConfig
+15 -9
pkgs/by-name/ke/kea/dont-create-var.patch
··· 1 1 diff --git a/Makefile.am b/Makefile.am 2 - index 10708e7..d4efd73 100644 2 + index a81f4cc..5d61407 100644 3 3 --- a/Makefile.am 4 4 +++ b/Makefile.am 5 - @@ -150,13 +150,6 @@ cppcheck: 5 + @@ -173,18 +173,6 @@ cppcheck: 6 6 docs: 7 7 $(MAKE) -C doc/sphinx 8 8 9 9 - 10 - -# These steps are necessary during installation 10 + -# These steps are necessary during installation. chmod is for reinstallation/upgrade. 11 11 -install-exec-hook: 12 - - mkdir -p $(DESTDIR)${localstatedir}/log/ 13 - - mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME} 14 - - mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME} 12 + - mkdir -m 750 -p "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}" 13 + - chmod 750 "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}" 14 + - mkdir -m 750 -p "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}" 15 + - chmod 750 "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}" 16 + - mkdir -m 750 -p "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}" 17 + - chmod 750 "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}" 18 + - mkdir -m 750 -p "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}" 19 + - chmod 750 "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}" 15 20 - 16 21 EXTRA_DIST = tools/path_replacer.sh 17 22 EXTRA_DIST += tools/mk_cfgrpt.sh 18 23 19 24 diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am 20 - index a0a0289..ba42f8a 100644 25 + index 7e0f3c4..08c53d8 100644 21 26 --- a/src/lib/dhcpsrv/Makefile.am 22 27 +++ b/src/lib/dhcpsrv/Makefile.am 23 - @@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ 28 + @@ -420,6 +420,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ 29 + parsers/shared_networks_list_parser.h \ 24 30 parsers/simple_parser4.h \ 25 31 parsers/simple_parser6.h 26 - 32 + - 27 33 -install-data-local: 28 34 - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
+4 -4
pkgs/by-name/ke/kea/package.nix
··· 24 24 25 25 stdenv.mkDerivation rec { 26 26 pname = "kea"; 27 - version = "2.6.2"; # only even minor versions are stable 27 + version = "2.6.3"; # only even minor versions are stable 28 28 29 29 src = fetchurl { 30 30 url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; 31 - hash = "sha256-ilC2MQNzS1nDuGGczWdm0t/uPwLjpfnzq8HNVfcPpCQ="; 31 + hash = "sha256-ACQaWVX/09IVosCYxFJ/nX9LIDGIsnb5o2JQ3T2d1hI="; 32 32 }; 33 33 34 34 patches = [ ··· 36 36 ]; 37 37 38 38 postPatch = '' 39 - substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" 39 + substituteInPlace ./src/bin/keactrl/Makefile.am --replace-fail '@sysconfdir@' "$out/etc" 40 40 # darwin special-casing just causes trouble 41 - substituteInPlace ./m4macros/ax_crypto.m4 --replace 'apple-darwin' 'nope' 41 + substituteInPlace ./m4macros/ax_crypto.m4 --replace-fail 'apple-darwin' 'nope' 42 42 ''; 43 43 44 44 outputs = [