public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grsecurity: 4.6.4-201607242014 -> 4.6.5-201607272152

Browse Source
This commit is contained in:
Joachim Fasting 2016-07-29 00:22:56 +02:00
parent 2a4ba66d6c
commit 83f783c00f
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.6.4"; version = "4.6.5";
extraMeta.branch = "4.6"; extraMeta.branch = "4.6";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0zpz29hgwdwkil6rakn08bdq77qjcz8q18qlkfc43s84f4fd8s45"; sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -93,9 +93,9 @@ rec {
grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_4_4 = throw "grsecurity stable is no longer supported";
grsecurity_testing = grsecPatch grsecurity_testing = grsecPatch
{ kver = "4.6.4"; { kver = "4.6.5";
grrev = "201607242014"; grrev = "201607272152";
sha256 = "1imzz4m1a6i7199plwj264izj8xvvx7r09v3s50rrb17jcsrfiss"; sha256 = "120rj3cpvbchihj3w3i9j2fxvap3270kfxjfznw2ljglzf7pi8zc";
}; };
# This patch relaxes grsec constraints on the location of usermode helpers, # This patch relaxes grsec constraints on the location of usermode helpers,

2
pkgs/top-level/all-packages.nix
View File

@ -11313,7 +11313,7 @@ in
linux_grsec_nixos = callPackage ../build-support/grsecurity { linux_grsec_nixos = callPackage ../build-support/grsecurity {
inherit (lib) overrideDerivation; inherit (lib) overrideDerivation;
kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {
kernelPatches = with self.kernelPatches; [ bridge_stp_helper qat_common_Makefile ] kernelPatches = with self.kernelPatches; [ bridge_stp_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill