diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-31 16:35:53 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-31 16:35:53 +0100 |
| commit | 555037a6670ba487ec23c3e819a6a2f24dc0a05f (patch) | |
| tree | 55a7fca979cb68a309aab68b202477bb4a783682 /pkgs/tools/security | |
| parent | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (diff) | |
| parent | e4d0e33f36491a0e08a3b1a15db13366d7d0785f (diff) | |
| download | nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.gz nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.bz2 nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.lz nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.xz nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.zst nixpkgs-555037a6670ba487ec23c3e819a6a2f24dc0a05f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/opensc/default.nix | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 4f220ee7717..315cd1c8c28 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -7,33 +7,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; + sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-6502.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; - sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; - }) - (fetchpatch { - name = "CVE-2019-15945.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; - sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; - }) - (fetchpatch { - name = "CVE-2019-15946.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/a3fc7693f3a035a8a7921cffb98432944bb42740.patch"; - sha256 = "1qr9n8cbarrdn4kr5z0ys7flq50hfmcbm8584mhw7r39p08qwmvq"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan |