about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-11 09:04:15 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-11 09:04:15 +0000
commit9274b390f475ca47339a28f26fd2486d0096e374 (patch)
tree36904419eb85ec4d19ca7ad870a91e2304299c75
parentf6f85016ec6508413147664ce43b10e9ab6d8336 (diff)
downloadnixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar.gz
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar.bz2
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar.lz
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar.xz
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.tar.zst
nixlib-9274b390f475ca47339a28f26fd2486d0096e374.zip
* Linux 2.6.23.16, 2.6.22.18 - fix for the vmsplice root exploit.
svn path=/nixpkgs/trunk/; revision=10622
-rw-r--r--pkgs/os-specific/linux/kernel/linux-2.6.22.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-2.6.23.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.22.nix b/pkgs/os-specific/linux/kernel/linux-2.6.22.nix
index 004de5ae189b..1abc1470616e 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.22.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.22.nix
@@ -28,7 +28,7 @@ let
 
   lib = import ../../../lib;
 
-  version = "2.6.22.16";
+  version = "2.6.22.18";
 
 in
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "0q8z8gbwshx2mz3h6lrqx5sz37q8sffnv2js3ln2difh3k6bw6j4";
+    sha256 = "09acj1xr16j9y91gzwzcjhanhcpyac1ah2lc42mfi7d8c0plagry";
   };
   
   patches = map (p: p.patch) kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.23.nix b/pkgs/os-specific/linux/kernel/linux-2.6.23.nix
index 78aaa2cc6cb6..d4c4b688ab48 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.23.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.23.nix
@@ -28,7 +28,7 @@ let
 
   lib = import ../../../lib;
 
-  version = "2.6.23.14";
+  version = "2.6.23.16";
 
 in
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1jnywr17gwizhy37a00i4f94xxpm65hf53mwjpd3vw7hpdz150k8";
+    sha256 = "0drk3981rl5j16s6amb63lai9kpi0vf0kr6avhpd9nikj27bsa83";
   };
   
   patches = map (p: p.patch) kernelPatches;