summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-07-15 20:15:36 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2018-07-15 20:15:36 +0200
commitd856ad7fc4006299d19e137af66ab93d14e4c7b7 (patch)
tree01cdcc7c47798ec4a57a812a63265ea8f2da63e0 /pkgs/tools/networking
parent6c33223f5f681aba159070a749139c88aecdb0ef (diff)
downloadnixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar.gz
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar.bz2
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar.lz
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar.xz
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.tar.zst
nixlib-d856ad7fc4006299d19e137af66ab93d14e4c7b7.zip
dnsmasq: 2.78 -> 2.79
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/dnsmasq/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 6205934084e8..ebbe5a11b523 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -11,23 +11,13 @@ let
   ]);
 in
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.78";
+  name = "dnsmasq-2.79";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549";
+    sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-15107.patch";
-      url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6";
-      sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk";
-      # changelog does not apply cleanly but its safe to skip
-      excludes = [ "CHANGELOG" ];
-    })
-  ];
-
   preBuild = ''
     makeFlagsArray=("COPTS=${copts}")
   '';