tjh.dev
dhcp: 4.3.3 -> 4.3.4
Uses shipped version of libbind now.
Fix CVE-2016-2774 & CVE-2015-8605.
cc #18856
(cherry picked from commit d5adf2cc0bd4d1d436dd81f33a8503a6db8e1762)
+5
-17
pkgs/tools/networking/dhcp/default.nix
+5
-17
pkgs/tools/networking/dhcp/default.nix
···
1
1
{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper
2
-
, coreutils, gnused, bind, openldap ? null
2
+
, coreutils, gnused, openldap ? null
3
3
}:
4
4
5
5
stdenv.mkDerivation rec {
6
6
name = "dhcp-${version}";
7
-
version = "4.3.3";
8
-
7
+
version = "4.3.4";
8
+
9
9
src = fetchurl {
10
10
url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
11
-
sha256 = "1pjy4lylx7dww1fp2mk5ikya5vxaf97z70279j81n74vn12ljg2m";
11
+
sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm";
12
12
};
13
13
14
14
patches =
···
23
23
./set-hostname.patch
24
24
];
25
25
26
-
# Fixes "socket.c:591: error: invalid application of 'sizeof' to
27
-
# incomplete type 'struct in6_pktinfo'". See
28
-
# http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html
29
-
#
30
-
# Also adds the ability to run dhcpd as a non-root user / group
31
-
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -DPARANOIA";
32
-
33
-
# It would automatically add -Werror, which disables build in gcc 4.4
34
-
# due to an uninitialized variable.
35
-
CFLAGS = "-g -O2 -Wall";
36
-
37
-
buildInputs = [ perl makeWrapper openldap bind ];
26
+
buildInputs = [ perl makeWrapper openldap ];
38
27
39
28
configureFlags = [
40
-
"--with-libbind=${bind.dev}"
41
29
"--enable-failover"
42
30
"--enable-execute"
43
31
"--enable-tracing"