summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-02-08 01:55:47 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-02-09 02:07:59 +0100
commitfe3ef43dab633337ebaf5b2c890cb63f57929e99 (patch)
treeb38dbfa61ec76aed0d766b3c91413ccfead89268
parentMerge pull request #214416 from NixOS/backport-214401-to-release-22.11 (diff)
downloadnixpkgs-fe3ef43dab633337ebaf5b2c890cb63f57929e99.tar.gz
less: Apply patch for CVE-2022-46663
https://www.openwall.com/lists/oss-security/2023/02/07/7 (cherry picked from commit 5277b187cc6bfa4c30ca4d7ea261002a88675ab9)
-rw-r--r--pkgs/tools/misc/less/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index a7212ccf7648..ebb15a3fd98b 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ncurses, lessSecure ? false }:
+{ lib, stdenv, fetchurl, fetchpatch, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
pname = "less";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6";
};
+ patches = [
+ (fetchpatch {
+ # https://github.com/advisories/GHSA-5xw7-xf7p-gm82
+ name = "CVE-2022-46663.patch";
+ url = "https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch";
+ hash = "sha256-gWgCzoMt1WyVJVKYzkMq8HfaTlU1XUtC8fvNFUQT0sI=";
+ })
+ ];
+
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
++ lib.optionals lessSecure [ "--with-secure" ];