about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-05-03 11:27:10 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-05-03 11:31:28 +0200
commit8c918bdc2c3235058f317b65ab79f7c9414747f8 (patch)
tree871559a3efa678dc78701b880ff55df14dcbbdba /pkgs/applications/networking
parent3bb121e50eda9b80e3132c53251b93f3b4166b30 (diff)
downloadnixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar.gz
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar.bz2
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar.lz
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar.xz
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.tar.zst
nixlib-8c918bdc2c3235058f317b65ab79f7c9414747f8.zip
rsync: fix CVE-2014-2855 by upstream patch
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/sync/rsync/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 5265faf87b6f..0b3343b67314 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -20,7 +20,12 @@ stdenv.mkDerivation rec {
   };
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
-  patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+  patches = [(fetchurl {
+      url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
+      sha256 = "1jpwwdf07naqxc8fv1lspc95jgk50j5j3wvf037bjay2qzpwjmvf";
+      name = "CVE-2014-2855.patch";
+    })]
+    ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
 
   buildInputs = stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];