about summary refs log tree commit diff
path: root/pkgs/servers/samba
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2019-03-20 14:04:31 +0100
committerAndreas Rammhold <andreas@rammhold.de>2019-03-20 14:18:58 +0100
commit5acc543233d990abeff543b8c99d97068ef7a37b (patch)
treea0410dc4b19ec435c257408ef54388e23bc6f8d1 /pkgs/servers/samba
parent84c1b2fbd82e478f79dbc31c2eee6c57cedea0da (diff)
downloadnixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar.gz
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar.bz2
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar.lz
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar.xz
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.tar.zst
nixlib-5acc543233d990abeff543b8c99d97068ef7a37b.zip
samba4: apply patch for CVE-2019-3824
Diffstat (limited to 'pkgs/servers/samba')
-rw-r--r--pkgs/servers/samba/4.x.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 4da3ae362c4d..53bfa6df8dc3 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -33,10 +33,18 @@ stdenv.mkDerivation rec {
     [ ./4.x-no-persistent-install.patch
       ./patch-source3__libads__kerberos_keytab.c.patch
       ./4.x-no-persistent-install-dynconfig.patch
+
+      # conditionall disable MacOS incompatible tests
       (fetchpatch {
         url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch";
         sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6";
       })
+
+      (fetchpatch {
+        name = "CVE-2019-3824.patch";
+        url = "https://attachments.samba.org/attachment.cgi?id=14859";
+        sha256 = "02qf3zr55mzbimqdv01k3b22jjb084vfr5zabapyr5h1f588mw0q";
+      })
     ];
 
   buildInputs =