diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-12-29 00:39:04 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-12-29 03:00:47 +0100 |
| commit | 1d44322d53b9ea1937ec11ff41983a387947539e (patch) | |
| tree | 07a276d39480e53845017968e6e97bf8d09627b6 /pkgs | |
| parent | d477b4c51ca98ec171554f570781639314eabffa (diff) | |
| download | nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar.gz nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar.bz2 nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar.lz nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar.xz nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.tar.zst nixpkgs-1d44322d53b9ea1937ec11ff41983a387947539e.zip | |
grsecurity: Update stable and test patches
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859 test: 3.0-3.17.7-201412211910 -> 3.0-3.18.1-201412281149
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.17.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.18.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 10 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 19e8f14ebf1..91972838230 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -32,7 +32,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_17 test-patch; + else mkKernel pkgs.linux_3_18 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index fd21f3c285c..a459e33f4d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "3.17.7"; - # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 7e8fd723dd2..e12588e052b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -2,6 +2,7 @@ import ./generic.nix (args // rec { version = "3.18.1"; + # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 561eadf2f21..8c707c7e570 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -61,16 +61,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.27"; - revision = "201412211908"; + revision = "201412280859"; branch = "stable"; - sha256 = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a"; + sha256 = "185sq4bsgwmpq9g0g5fhm69ba875xhxha2rs0cn6n647v90rxrjk"; }; grsecurity_unstable = grsecPatch - { kversion = "3.17.7"; - revision = "201412211910"; + { kversion = "3.18.1"; + revision = "201412281149"; branch = "test"; - sha256 = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w"; + sha256 = "10pq6lslfn6ck7pm1651s6pd5mqmjxvqv3iv70qrpwwb2gdhpdin"; }; grsec_fix_path = |