Unverified Commit b4d133b5 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #196094: Kernel updates for 2022-10-15 (security) 

Includes the mac80211 security fixes.
parents 143fda84 c9fa012f

pkgs/os-specific/linux/kernel/hardened/patches.json

+29 −29
Original line number Diff line number Diff line
@@ -12,51 +12,51 @@ 
    "4.19": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-4.19.260-hardened1.patch",

            "sha256": "08b3kk5m12yqq12ik1d9zxaga2pzw2znzcwh9ymk6i9b8y5f3bsm",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.260-hardened1/linux-hardened-4.19.260-hardened1.patch"

            "name": "linux-hardened-4.19.261-hardened1.patch",

            "sha256": "1hs9jg2n9i89li0p1mbkfhy8r5pv5wrl3gw3b3xvp0n8283cy631",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.261-hardened1/linux-hardened-4.19.261-hardened1.patch"

        },

        "sha256": "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24",

        "version": "4.19.260"

        "sha256": "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy",

        "version": "4.19.261"

    },

    "5.10": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-5.10.146-hardened1.patch",

            "sha256": "1ah8p0iy4cqjhmjd1zxqvspihx0wkj515ggca65rjrpmfr05f2ll",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.146-hardened1/linux-hardened-5.10.146-hardened1.patch"

            "extra": "-hardened2",

            "name": "linux-hardened-5.10.147-hardened2.patch",

            "sha256": "0j44mfyc66vq6hncc5w3mxxw8jcpa66w4w40d3wm7ka6yr6p34sh",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.147-hardened2/linux-hardened-5.10.147-hardened2.patch"

        },

        "sha256": "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv",

        "version": "5.10.146"

        "sha256": "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5",

        "version": "5.10.147"

    },

    "5.15": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-5.15.71-hardened1.patch",

            "sha256": "0yfvwivjj8swc4l0ngq4x1104jpfmzj9cb4pvxsagkkf8dwfvqc6",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.71-hardened1/linux-hardened-5.15.71-hardened1.patch"

            "extra": "-hardened3",

            "name": "linux-hardened-5.15.73-hardened3.patch",

            "sha256": "1p4cm1viyryf4npbfvg72a4kpqs22vqvfqj2hl6pq5wrpgg677g0",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.73-hardened3/linux-hardened-5.15.73-hardened3.patch"

        },

        "sha256": "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z",

        "version": "5.15.71"

        "sha256": "0pbi640llcdbx57vwwzc5axa75w0y5rixa9r752h725f4naz08m8",

        "version": "5.15.73"

    },

    "5.19": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-5.19.12-hardened1.patch",

            "sha256": "157m9mkdqpm01rzwsgdcv88z51642fp3v0h5q0mafg4ph4afd7pg",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.12-hardened1/linux-hardened-5.19.12-hardened1.patch"

            "extra": "-hardened2",

            "name": "linux-hardened-5.19.15-hardened2.patch",

            "sha256": "12si2gy6maxbvf252ircp94ci0ihqlxv3l9sf4xwxrs66gn3z2fa",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.15-hardened2/linux-hardened-5.19.15-hardened2.patch"

        },

        "sha256": "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4",

        "version": "5.19.12"

        "sha256": "06zband5q6m9imyvn4y4naafdakjcj00rg23227cagnv8wwf71j6",

        "version": "5.19.15"

    },

    "5.4": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-5.4.215-hardened1.patch",

            "sha256": "1xfyvppf16y7bjmjkhpps9vp4zw2dcrk18kajj1lkzhh441y1g94",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.215-hardened1/linux-hardened-5.4.215-hardened1.patch"

            "extra": "-hardened2",

            "name": "linux-hardened-5.4.217-hardened2.patch",

            "sha256": "16hcwjll5dkfc8sb81w3dipqx9j1np91f5gad45b0xfcnqcn70ab",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.217-hardened2/linux-hardened-5.4.217-hardened2.patch"

        },

        "sha256": "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard",

        "version": "5.4.215"

        "sha256": "0qrfrk0g1dky5apg8gdxczj2ir0g0z41zmdmbwwcxkxjz76jdf1b",

        "version": "5.4.217"

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.10.147";

  version = "5.10.148";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5";

    sha256 = "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj";

  };

} // (args.argsOverride or {}))

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.15.72";

  version = "5.15.74";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "1aq75z2spa1jvxv9m89gsaxza29n25k8j1f0pg9yj6j7bcxk5430";

    sha256 = "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c";

  };

} // (args.argsOverride or { }))

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.19.14";

  version = "5.19.16";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "1h8srn3fw4vw61qi0xxlk9fq0fqq4wl7fbrzz7sivdd8qkhjgv8x";

    sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1";

  };

} // (args.argsOverride or { }))

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.4.216";

  version = "5.4.218";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "19vyxa0yzdf4w48jamjfz6kpiaaa7mjjz5gs2awckzilfc0n4pyf";

    sha256 = "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x";

  };

} // (args.argsOverride or {}))