diff options
| author | Justin Humm <justin.humm@posteo.de> | 2020-11-24 23:32:03 +0100 |
|---|---|---|
| committer | Justin Humm <justin.humm@posteo.de> | 2020-11-24 23:32:03 +0100 |
| commit | 19036e0ca0605d855066a10b650815b45cd76155 (patch) | |
| tree | ebe75e1519d33767147ea543824613341a0c8a6e /pkgs/tools/security | |
| parent | 3d3bcc5cc92541e3a63441a3d39f1176ef92c03b (diff) | |
opensc: 0.20.0 -> 0.21.0
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/opensc/default.nix | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index a9eea81c4e83..735f7558e7a8 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl -, libiconv, pcsclite, libassuan, libXt, fetchpatch +, libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin @@ -7,30 +7,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv"; + sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; }; - patches = [ - (fetchpatch { - # https://nvd.nist.gov/vuln/detail/CVE-2020-26570 - name = "CVE-2020-26570.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/6903aebfddc466d966c7b865fae34572bf3ed23e.patch"; - sha256 = "sha256-aB9iCVcdp9zFhZiSv5A399Ttj7NUHRVgXr0EfmMwKN4="; - }) - (fetchpatch { - # https://nvd.nist.gov/vuln/detail/CVE-2020-26572 - name = "CVE-2020-26572.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/9d294de90d1cc66956389856e60b6944b27b4817.patch"; - sha256 = "sha256-gKJaR5K+NaXh4NeTkGpzHzHCdpt6n54Hnt1GAq0tA9o="; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan |