public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104814 from erictapen/opensc-0.21.0

Browse Source 
opensc: 0.20.0 -> 0.21.0
This commit is contained in:
Sandro 2020-11-25 01:42:57 +01:00 committed by GitHub
commit 047b7fe16b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/security/opensc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
, libiconv, pcsclite, libassuan, libXt, fetchpatch , libiconv, pcsclite, libassuan, libXt
, docbook_xsl, libxslt, docbook_xml_dtd_412 , docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC, buildPackages , Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin , withApplePCSC ? stdenv.isDarwin
@ -7,30 +7,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opensc"; pname = "opensc";
version = "0.20.0"; version = "0.21.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenSC"; owner = "OpenSC";
repo = "OpenSC"; repo = "OpenSC";
rev = version; 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 ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
zlib readline openssl libassuan zlib readline openssl libassuan