From 5e85657ba5763b496388b9820519ec99a238f613 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 6 Jan 2018 16:52:58 +0800
Subject: rsync: Fix CVE-2017-17433 and CVE-2017-17434

---
 pkgs/applications/networking/sync/rsync/base.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index f6224b0f48f1..69613c489e1e 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -18,6 +18,21 @@ rec {
       url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce";
       sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1";
     })
+    (fetchpatch {
+      name = "CVE-2017-17433.patch";
+      url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51";
+      sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52";
+    })
+    (fetchpatch {
+      name = "CVE-2017-17434-patch1.patch";
+      url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1";
+      sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx";
+    })
+    (fetchpatch {
+      name = "CVE-2017-17434-patch2.patch";
+      url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9";
+      sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6";
+    })
   ];
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1