summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-08-19 11:28:39 +0200
committerGitHub <noreply@github.com>2023-08-19 11:28:39 +0200
commit90677a4464d3de3efdc6b6ec7c8ae4b830997293 (patch)
treea4a7a0e1da7509860046f24287da7d5360ca13b6
parentemacs: better glib-networking detection (diff)
parentopensc: add patch for CVE-2023-2977 (diff)
downloadnixpkgs-90677a4464d3de3efdc6b6ec7c8ae4b830997293.tar.gz
Merge pull request #249592 from NixOS/backport-249403-to-release-23.05
[Backport release-23.05] opensc: add patch for CVE-2023-2977
-rw-r--r--pkgs/tools/security/opensc/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 51e9434f82e8..9b5b6fba8b24 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl
, libiconv, pcsclite, libassuan, libXt
+, fetchpatch
, docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin
@@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k=";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2023-2977.patch";
+ url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch";
+ hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s=";
+ })
+ ];
+
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
zlib readline openssl libassuan