From 4b5793ca35b90c5127ce49b13eb81024058200fa Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:14 +0000 Subject: [PATCH 01/12] linux: 4.14.231 -> 4.14.232 (cherry picked from commit f1b9f8023d11155bf72f56aafaa6009f51284942) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7c51f01ac844..c5dbb25819fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.231"; + version = "4.14.232"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp"; + sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x"; }; } // (args.argsOverride or {})) From 79ab764de785352fc779aa7a33ac2943256904df Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:21 +0000 Subject: [PATCH 02/12] linux: 4.19.188 -> 4.19.190 (cherry picked from commit df61f804fb8670879ff0b51cb9f4fb900b5df52a) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 0d782bec07e3..0e5b5b62d553 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.188"; + version = "4.19.190"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h"; + sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g"; }; } // (args.argsOverride or {})) From 90b1cafbaf623531bdfadc222dda364ccc91bf79 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:27 +0000 Subject: [PATCH 03/12] linux: 4.4.267 -> 4.4.268 (cherry picked from commit 662c0201a531c1cb0637d164f16328976a087f17) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 73b043d70829..17f28bc4b0c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.267"; + version = "4.4.268"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4"; + sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8"; }; } // (args.argsOverride or {})) From 10ac4bd55180ec1aebe638961cdcb0adaf941893 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:32 +0000 Subject: [PATCH 04/12] linux: 4.9.267 -> 4.9.268 (cherry picked from commit 94ce86210197f75a8bcab9ff04f273f43ce1910f) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 001cb9f85aeb..450d3cdd08b8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.267"; + version = "4.9.268"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq"; + sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv"; }; } // (args.argsOverride or {})) From 2d0e447babea54c7b418117d240e050fd74a1ed6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:39 +0000 Subject: [PATCH 05/12] linux: 5.10.32 -> 5.10.35 (cherry picked from commit 2161af8d3c5f57279598395ace47bd8e3994f06b) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7cd0a3ebc242..5cd5582275c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10.32"; + version = "5.10.35"; # 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 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4"; + sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; }; } // (args.argsOverride or {})) From 654238cf6d64dd466cf7915295a4fc98d3c53d82 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:47 +0000 Subject: [PATCH 06/12] linux: 5.11.16 -> 5.11.19 (cherry picked from commit d96c775d1af7b397099e8469f138908370db7f89) --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 2c9b5d6039d2..77214378ce82 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.16"; + version = "5.11.19"; # 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 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1"; + sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs"; }; } // (args.argsOverride or {})) From 8abec3c9a0ac78a4ad7db254ba89cce8bc42a1be Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:51:53 +0000 Subject: [PATCH 07/12] linux: 5.4.114 -> 5.4.117 (cherry picked from commit 08bc09092cefd363fdeab147885a80a847d1c9bf) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8e445dbd50ce..cabbaea538ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.114"; + version = "5.4.117"; # 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 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y"; + sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f"; }; } // (args.argsOverride or {})) From 5d10f01179a49c7ebf8e02aa2502d2844c1fd406 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:53:28 +0000 Subject: [PATCH 08/12] linux/hardened/patches/4.14: 4.14.231-hardened1 -> 4.14.232-hardened1 (cherry picked from commit 98eb12bcae5ba91521ba28bfa67d096c25a4faf9) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0222fe5d5a7d..d279c67163cd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.231-hardened1.patch", - "sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch" + "name": "linux-hardened-4.14.232-hardened1.patch", + "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch" }, "4.19": { "extra": "-hardened1", From f8270df624531664cf2cea05994ea6a86ccfbd9d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:53:29 +0000 Subject: [PATCH 09/12] linux/hardened/patches/4.19: 4.19.188-hardened1 -> 4.19.190-hardened1 (cherry picked from commit a2a89d85d06be38bcbdc61e602fbe71585ca2729) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d279c67163cd..012c427dacf1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.188-hardened1.patch", - "sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch" + "name": "linux-hardened-4.19.190-hardened1.patch", + "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch" }, "5.10": { "extra": "-hardened1", From b6c51fa6102face4c8324855bc3dbb3b8be1b135 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:53:30 +0000 Subject: [PATCH 10/12] linux/hardened/patches/5.10: 5.10.32-hardened1 -> 5.10.35-hardened1 (cherry picked from commit 2e32ce5eddbfaec313d3edda8d1e987efd9287c1) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 012c427dacf1..a309db0af689 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.32-hardened1.patch", - "sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch" + "name": "linux-hardened-5.10.35-hardened1.patch", + "sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch" }, "5.11": { "extra": "-hardened1", From d2f82b35cc820952bf7ab66f2cb2274497a89294 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:53:31 +0000 Subject: [PATCH 11/12] linux/hardened/patches/5.11: 5.11.16-hardened1 -> 5.11.19-hardened1 (cherry picked from commit 5b5ecae63d28db71a69979bbe0e7f0dc31725116) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a309db0af689..83bff1b33fa4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.16-hardened1.patch", - "sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch" + "name": "linux-hardened-5.11.19-hardened1.patch", + "sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch" }, "5.4": { "extra": "-hardened1", From c845af6cb788ef8b78f4136617a37e9aa725801b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 9 May 2021 16:53:32 +0000 Subject: [PATCH 12/12] linux/hardened/patches/5.4: 5.4.114-hardened1 -> 5.4.117-hardened1 (cherry picked from commit c1569cc8ad30f6ff4c3635f13a25ebeb3fdda32a) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 83bff1b33fa4..d97341fccca1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.114-hardened1.patch", - "sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch" + "name": "linux-hardened-5.4.117-hardened1.patch", + "sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch" } }