commit f0e77cd07da7aba1392d1f681648734c07588311 · pyrox.dev/nixpkgs

+2 -2

pkgs/os-specific/linux/kernel/linux-grsecurity.nix

···

       1
       1
        
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "4.8.14";

     

       4
       4
       +
         version = "4.8.15";

     

       5
       5
        
         extraMeta.branch = "4.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1";

     

       9
       9
       +
           sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         kernelPatches = args.kernelPatches;

+3 -3

pkgs/os-specific/linux/kernel/patches.nix

···

       95
       95
        
         };

     

       96
       96
        
       

     

       97
       97
        
         grsecurity_testing = grsecPatch

     

       98
       98
       -
           { kver   = "4.8.14";

     

       99
       99
       -
             grrev  = "201612110933";

     

       100
       100
       -
             sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym";

     

       98
       98
       +
           { kver   = "4.8.15";

     

       99
       99
       +
             grrev  = "201612151923";

     

       100
       100
       +
             sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89";

     

       101
       101
        
           };

     

       102
       102
        
       

     

       103
       103
        
         # This patch relaxes grsec constraints on the location of usermode helpers,

-1

pkgs/top-level/all-packages.nix

···

       11252
       11252
        
           inherit (lib) overrideDerivation;

     

       11253
       11253
        
           kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {

     

       11254
       11254
        
             kernelPatches = with self.kernelPatches; [

     

       11255
       11255
       -
               kernelPatches.multithreaded_rsapubkey

     

       11256
       11255
        
               bridge_stp_helper

     

       11257
       11256
        
               modinst_arg_list_too_long

     

       11258
       11257
        
             ] ++ lib.optionals ((platform.kernelArch or null) == "mips")