diff options
author | Michael Swan <mswan@fastmail.com> | 2021-10-26 09:34:37 +0000 |
---|---|---|
committer | Michael Swan <mswan@fastmail.com> | 2021-10-26 09:34:37 +0000 |
commit | 0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f (patch) | |
tree | 37ce79e07c34207d7915bcf6929189a5b2e46405 | |
parent | 23f71e9427c7cd2a6f87a167b4f6dc170b4431df (diff) | |
download | nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar.gz nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar.bz2 nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar.lz nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar.xz nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.tar.zst nixpkgs-0ebf090e30ab71cc066c6a6ab1ba2e5dd866185f.zip |
checksec: 2.4.0 -> 2.5.0
-rw-r--r-- | pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch | 24 | ||||
-rw-r--r-- | pkgs/os-specific/linux/checksec/default.nix | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch index 9beeab0f954..2aabbc4d4c8 100644 --- a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch +++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch @@ -1,28 +1,24 @@ -From 6503848d9e0eb009e5f462116a963beacb208930 Mon Sep 17 00:00:00 2001 +From 5cfb08effd21d9278e3eb8901c85112a331c3181 Mon Sep 17 00:00:00 2001 From: Austin Seipp <aseipp@pobox.com> -Date: Thu, 20 Feb 2014 00:11:44 -0600 +Date: Tue, 26 Oct 2021 09:23:07 +0000 Subject: [PATCH] attempt to 'modprobe config' before checking kernel -Signed-off-by: Austin Seipp <aseipp@pobox.com> --- - checksec.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + checksec | 1 + + 1 file changed, 1 insertion(+) diff --git a/checksec b/checksec -index dd1f72e..63acc29 100644 +index 5536250..895073b 100755 --- a/checksec +++ b/checksec -@@ -676,7 +676,8 @@ kernelcheck() { - echo_message " userspace processes, this option lists the status of kernel configuration\n" '' '' '' +@@ -1059,6 +1059,7 @@ kernelcheck() { echo_message " options that harden the kernel itself against attack.\n\n" '' '' '' echo_message " Kernel config:\n" '' '' '{ "kernel": ' -- -+ + + modprobe configs 2> /dev/null - if [[ ! "${1}" == "" ]] ; then + if [[ ! "${1}" == "" ]]; then kconfig="cat ${1}" - echo_message " Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" "<kernel config=\"${1}\"" "{ \"KernelConfig\":\"${1}\"," - # update the architecture based on the config rather than the system + echo_message " Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" "<kernel config=\"${1}\"" "{ \"KernelConfig\":\"${1}\"" -- -1.8.3.2 +2.33.0 diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index e0a65589571..fada305c372 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "1gbbq85d3g3mnm3xvgvi2085aba7qc3cmsbwn76al50ax1518j2q"; + sha256 = "sha256-GxWXocz+GCEssRrIQP6E9hjVIhVh2EmZrefELxQlV1Q="; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; |