diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /pkgs/tools/security | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixlib-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/pcsc-scm-scl011/default.nix | 49 | ||||
| -rw-r--r-- | pkgs/tools/security/pcsc-scm-scl011/eid.patch | 28 | ||||
| -rw-r--r-- | pkgs/tools/security/radamsa/default.nix | 6 |
3 files changed, 80 insertions, 3 deletions
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix new file mode 100644 index 000000000000..88b5c147f303 --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, unzip, libusb }: + +let + arch = if stdenv.system == "i686-linux" then "32" + else if stdenv.system == "x86_64-linux" then "64" + else throw "Unsupported system: ${stdenv.system}"; +in +stdenv.mkDerivation rec { + name = "pcsc-scm-scl-${version}"; + version = "2.09"; + + src = fetchurl { + url = "http://files.identiv.com/products/smart-card-readers/contactless/scl010-011/Linux_Driver_Ver${version}.zip"; + sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + echo ${stdenv.system} + unzip $src + tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" + cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + ''; + + # Add support for SCL011 nPA (subsidized model for German eID) + patches = [ ./eid.patch ]; + + installPhase = '' + mkdir -p $out/pcsc/drivers + cp -r proprietary/*.bundle $out/pcsc/drivers + ''; + + libPath = stdenv.lib.makeLibraryPath [ libusb ]; + + fixupPhase = '' + patchelf --set-rpath $libPath \ + $out/pcsc/drivers/SCLGENERIC.bundle/Contents/Linux/libSCLGENERIC.so.${version}; + ''; + + meta = with stdenv.lib; { + description = "SCM Microsystems SCL011 chipcard reader user space driver"; + homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; + downloadPage = https://support.identiv.com/scl010-scl011/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/tools/security/pcsc-scm-scl011/eid.patch new file mode 100644 index 000000000000..6e7ffd60f72f --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/eid.patch @@ -0,0 +1,28 @@ +diff --git a/proprietary/SCLGENERIC.bundle/Contents/Info.plist b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +index 412d6b9..5d1c6cc 100755 +--- a/proprietary/SCLGENERIC.bundle/Contents/Info.plist ++++ b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +@@ -34,6 +34,7 @@ + <string>0x04E6</string> + <string>0x04E6</string> + <string>0x04E6</string> ++ <string>0x04E6</string> + </array> + + <key>ifdProductID</key> +@@ -42,6 +43,7 @@ + <string>0x5291</string> + <string>0x5290</string> + <string>0x5293</string> ++ <string>0x5292</string> + </array> + + <key>ifdFriendlyName</key> +@@ -50,6 +52,7 @@ + <string>SCL010 Contactless Reader</string> + <string>SCR331CL-NTTCom</string> + <string>SCL011G Contactless Reader</string> ++ <string>SCM Microsystems, Inc. SCL011 RFID reader</string> + </array> + + </dict> diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 3a6c09b9291d..3126dd2b4faf 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radamsa-${version}"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "http://haltp.org/download/${name}.tar.gz"; - sha256 = "1xs9dsrq6qrf104yi9x21scpr73crfikbi8q9njimiw5c1y6alrv"; + url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz"; + sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2"; }; patchPhase = '' |