summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2018-03-06 16:01:42 +0000
committerGitHub <noreply@github.com>2018-03-06 16:01:42 +0000
commit346e68d4f0016c3e543a3c742e16ae3a7337905c (patch)
tree97c70e271a851d5ec375b2270a600f101be6f6ab
parent4bd69fd24959d33b3f22f54d5447e509447aa9c9 (diff)
parent73dbc7319660668ed13531ce98924c8deec95465 (diff)
downloadnixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar.gz
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar.bz2
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar.lz
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar.xz
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.tar.zst
nixlib-346e68d4f0016c3e543a3c742e16ae3a7337905c.zip
Merge pull request #36380 from xeji/xen-4-8-xsa
xen 4.8: add xsa security patches 252-256
-rw-r--r--pkgs/applications/virtualization/xen/4.8.nix6
-rw-r--r--pkgs/applications/virtualization/xen/xsa-patches.nix29
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 558510b30f50..8dedb6a4d051 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -170,6 +170,12 @@ callPackage (import ./generic.nix (rec {
     XSA_249
     XSA_250
     XSA_251_48
+    XSA_252_49
+    # 253: 4.8 not affected
+    # 254: no patch supplied by xen project (Meltdown/Spectre)
+    XSA_255_49_1
+    XSA_255_49_2
+    XSA_256_48
     xenlockprofpatch
     xenpmdpatch
   ];
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 8f8cc459a243..668ba70343fe 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -863,5 +863,34 @@ in rec {
       sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq";
     })
   ];
+  # 4.8
+  XSA_252_49 = [
+   (xsaPatch {
+      name = "252-4.9";
+      sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n";
+    })
+  ];
+  # 4.8
+  XSA_255_49_1= [
+   (xsaPatch {
+      name = "255-4.9-1";
+      sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc";
+    })
+  ];
+  # 4.8
+  XSA_255_49_2= [
+   (xsaPatch {
+      name = "255-4.9-2";
+      sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12";
+    })
+  ];
+  # 4.8
+  XSA_256_48= [
+   (xsaPatch {
+      name = "256-4.8";
+      sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4";
+    })
+  ];
+
 
 }