3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #166456 from mweinelt/isc-dhcp

dhcp: 4.4.2-P1 -> 4.4.3 and make client & relay support optional
This commit is contained in:
Lassulus 2022-04-10 11:05:29 +01:00 committed by GitHub
commit df7337ebb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 24 deletions

View file

@ -250,7 +250,7 @@ in {
};
dhcp = mkOption {
type = types.enum [ "dhclient" "dhcpcd" "internal" ];
type = types.enum [ "dhcpcd" "internal" ];
default = "internal";
description = ''
Which program (or internal library) should be used for DHCP.
@ -489,7 +489,6 @@ in {
"d /etc/ipsec.d 0700 root root -"
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
"d /var/lib/dhclient 0755 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd
}:
stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = ''
install -D pipework $out/bin/pipework
wrapProgram $out/bin/pipework --prefix PATH : \
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd ]};
'';
meta = with lib; {
description = "Software-Defined Networking tools for LXC";

View file

@ -1,15 +1,19 @@
{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper
, coreutils, gnused, openldap ? null
, buildPackages, lib
# client and relay are end of life, remove after 4.4.3
, withClient ? false
, withRelay ? false
}:
stdenv.mkDerivation rec {
pname = "dhcp";
version = "4.4.2-P1";
version = "4.4.3";
src = fetchurl {
url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh";
sha256 = "sha256-Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg=";
};
patches =
@ -18,20 +22,6 @@ stdenv.mkDerivation rec {
# patch, the hostname doesn't get set properly if the old
# hostname (i.e. before reboot) is equal to the new hostname.
./set-hostname.patch
(fetchpatch {
# upstream build fix against -fno-common compilers like >=gcc-10
url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch";
sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b";
})
# Fix parallel build failure, the patch is pending upstream inclusion:
# https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76
(fetchpatch {
name = "parallel-make.patch";
url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch";
sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp";
})
];
nativeBuildInputs = [ perl makeWrapper ];
@ -77,6 +67,10 @@ stdenv.mkDerivation rec {
--replace /sbin/ip ${iproute2}/sbin/ip
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
'' + lib.optionalString (!withClient) ''
rm $out/sbin/{dhclient,dhclient-script,.dhclient-script-wrapped}
'' + lib.optionalString (!withRelay) ''
rm $out/sbin/dhcrelay
'';
preConfigure =
@ -103,5 +97,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.isc.org/dhcp/";
license = licenses.mpl20;
platforms = platforms.unix;
knownVulnerabilities = lib.optional (withClient || withRelay) "The client and relay component of the dhcp package have reached their end of life";
};
}

View file

@ -12,7 +12,7 @@
, polkit
, gnutls
, ppp
, dhcp
, dhcpcd
, iptables
, nftables
, python3
@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
"-Dresolvconf=${openresolv}/bin/resolvconf"
# DHCP clients
"-Ddhclient=${dhcp}/bin/dhclient"
# Upstream prefers dhclient, so don't add dhcpcd to the closure
"-Ddhcpcd=no"
# ISC DHCP client has reached it's end of life, so stop using it
"-Ddhclient=no"
"-Ddhcpcd=${dhcpcd}/bin/dhcpcd"
"-Ddhcpcanon=no"
# Miscellaneous