summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-01-15 14:16:37 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-23 08:13:32 +0000
commitc0f4f6408fdd2da03552e043aa8fc61b9c4de4a1 (patch)
tree61848003b3aecd6b7c863a853c4b5a0b71bb61cc
parentMerge pull request #211094 from NixOS/backport-210142-to-release-22.11 (diff)
downloadnixpkgs-origin/backport-210915-to-release-22.11.tar.gz
libtar: apply patches for CVE-2021-33640, CVE-2021-33643, CVE-2021-33644, CVE-2021-33645 and CVE-2021-33646origin/backport-210915-to-release-22.11
https://nvd.nist.gov/vuln/detail/CVE-2021-33640 https://nvd.nist.gov/vuln/detail/CVE-2021-33643 https://nvd.nist.gov/vuln/detail/CVE-2021-33644 https://nvd.nist.gov/vuln/detail/CVE-2021-33645 https://nvd.nist.gov/vuln/detail/CVE-2021-33646 One of the existing patch that was pulled from Debian has been replaced by the Fedora version to be able to apply the CVE-2021-33645/CVE-2021-33646/CVE-2021-33640 patch without changes. (cherry picked from commit ed8834484642abebfcbfdb5e28458644c206679a)
-rw-r--r--pkgs/development/libraries/libtar/default.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index 3e5b4cd23e9d..c6c89ecb4f08 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -18,10 +18,24 @@ stdenv.mkDerivation rec {
inherit sha256;
};
in [
- (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0")
+ (fetchpatch {
+ name = "no_static_buffers.patch";
+ url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-no-static-buffer.patch";
+ sha256 = "sha256-QcWOgdkNlALb+YDVneT1zCNAMf4d8IUm2kUUUy2VvJs=";
+ })
(fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7")
(fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq")
(fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41")
+ (fetchpatch {
+ name = "CVE-2021-33643_CVE-2021-33644.patch";
+ url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch";
+ sha256 = "sha256-HdjotTvKJNntkdcV+kR08Ht/MyNeB6qUT0qo67BBOVA=";
+ })
+ (fetchpatch {
+ name = "CVE-2021-33645_CVE-2021-33646_CVE-2021-33640.patch";
+ url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch";
+ sha256 = "sha256-p9DEFAL5Y+Ldy5c9Wj9h/BSg4TDxIxCjCQJD+wGQ7oI=";
+ })
];
nativeBuildInputs = [ autoreconfHook ];