diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-12-16 12:40:41 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-12-16 12:46:44 +0100 |
| commit | f0e77cd07da7aba1392d1f681648734c07588311 (patch) | |
| tree | 1d41881bfee63889e2110a624d4e47d0041a1437 | |
| parent | 7aa8fa28ae6e07a7f27906ac7e8f6783d1ebde33 (diff) | |
| download | nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar.gz nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar.bz2 nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar.lz nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar.xz nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.tar.zst nixpkgs-f0e77cd07da7aba1392d1f681648734c07588311.zip | |
grsecurity: 4.8.14-201612110933 -> 4.8.15-201612151923
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index b6121fbd1b4..7a6ce4533e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.14"; + version = "4.8.15"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1"; + sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5562608effa..74cf8d156af 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -95,9 +95,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.14"; - grrev = "201612110933"; - sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym"; + { kver = "4.8.15"; + grrev = "201612151923"; + sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33d9b74424..af9dfa610f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11252,7 +11252,6 @@ in inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { kernelPatches = with self.kernelPatches; [ - kernelPatches.multithreaded_rsapubkey bridge_stp_helper modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") |