b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

dhcpcd: 6.6.1 -> 6.8.0

Browse source
This commit is contained in:
William A. Kennington III 2015-03-26 11:36:47 -07:00
parent 8ca8b0868c
commit 9ce3b3b746
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/networking/dhcpcd/default.nix
View file

@ -1,18 +1,19 @@
{ stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec {
name = "dhcpcd-6.6.7";
name = "dhcpcd-6.8.0";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.bz2";
sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3";
sha256 = "0h52rkzw87fyq5vj8zscbgf0ig9c881xz7i0rn3hvk28li7la0cb";
};
patches = [ /* ./lxc_ro_promote_secondaries.patch */ ];
buildInputs = [ pkgconfig udev ];
configureFlags = "--sysconfdir=/etc";
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
];
makeFlags = "PREFIX=\${out}";

12
pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch
View file

@ -1,12 +0,0 @@
diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c
--- dhcpcd-6.1.0-old/if-linux.c 2013-09-20 12:27:24.000000000 +0200
+++ dhcpcd-6.1.0/if-linux.c 2013-12-13 09:50:24.183694744 +0100
@@ -86,7 +86,7 @@ if_init(struct interface *iface)
fp = fopen(path, "w");
if (fp == NULL)
- return errno == ENOENT ? 0 : -1;
+ return (errno == ENOENT || errno == EROFS) ? 0 : -1;
n = fprintf(fp, "1");
fclose(fp);
return n == -1 ? -1 : 0;