public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpd: Update 4.1-ESV-R6 -> 4.3.0

Browse Source 
Additionally add the ability to run as a non-root user / group by including
paranoia patches in the build.
This commit is contained in:
William A. Kennington III 2014-06-24 16:58:38 -05:00
parent 6c2763c3bf
commit 05976a2b5a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/networking/dhcp/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: { stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dhcp-4.1-ESV-R6"; name = "dhcp-${version}";
version = "4.3.0";
src = fetchurl { src = fetchurl {
url = http://ftp.isc.org/isc/dhcp/4.1-ESV-R6/dhcp-4.1-ESV-R6.tar.gz; url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
sha256 = "17md1vml07szl9dx4875gfg4sgnb3z73glpbq1si7p82mfhnddny"; sha256 = "12mydvj6x3zcl3gla06bywfkkrgg03g66fijs94mwb7kbiym3dm7";
}; };
patches = patches =
@ -23,13 +24,15 @@ stdenv.mkDerivation rec {
# Fixes "socket.c:591: error: invalid application of 'sizeof' to # Fixes "socket.c:591: error: invalid application of 'sizeof' to
# incomplete type 'struct in6_pktinfo'". See # incomplete type 'struct in6_pktinfo'". See
# http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html # http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; #
# Also adds the ability to run dhcpd as a non-root user / group
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -DPARANOIA";
# It would automatically add -Werror, which disables build in gcc 4.4 # It would automatically add -Werror, which disables build in gcc 4.4
# due to an uninitialized variable. # due to an uninitialized variable.
CFLAGS = "-g -O2 -Wall"; CFLAGS = "-g -O2 -Wall";
buildInputs = [ makeWrapper ]; buildInputs = [ perl makeWrapper ];
postInstall = postInstall =
'' ''
@ -42,6 +45,7 @@ stdenv.mkDerivation rec {
preConfigure = preConfigure =
'' ''
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
sed -i "includes/dhcpd.h" \ sed -i "includes/dhcpd.h" \
-"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" -"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g"
''; '';