summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-09-20 21:49:53 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-09-22 22:24:50 +0000
commitb11d6bafbe7142e318f01934578df9bede959a0d (patch)
tree2cec022bf975e9e173eeaeae06ee82b3e1da656f
parentMerge pull request #192448 from NixOS/backport-192304-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-192127-to-release-22.05.tar.gz
tinyproxy: add patch for CVE-2022-40468origin/backport-192127-to-release-22.05
(cherry picked from commit 32f4104b6610d31a17cc06f71a88bc27a677f538)
-rw-r--r--pkgs/tools/networking/tinyproxy/default.nix17
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index b382aeaf7428..ce0e1c6c10fa 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, withDebug ? false }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, perl
+, withDebug ? false
+}:
stdenv.mkDerivation rec {
pname = "tinyproxy";
@@ -11,6 +18,14 @@ stdenv.mkDerivation rec {
owner = "tinyproxy";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2022-40468.patch";
+ url = "https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7.patch";
+ sha256 = "sha256-P0c4mUK227ld3703ss5MQhi8Vo2QVTCVXhKmc9fcufk=";
+ })
+ ];
+
# perl is needed for man page generation.
nativeBuildInputs = [ autoreconfHook perl ];