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

pcsclite: Introduce PCSCLITE_HP_DROPDIR env var

Browse Source 
This allows to override the directory where PCSC-Lite searches for USB
drivers at runtime and should make our NixOS module much more clean so
that we don't need to imperatively stitch together plugin directories
anymore.

I'm using a GNU extension for the ternary operator to avoid computing
getenv("PCSCLITE_HP_DROPDIR") twice:

https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric, @wkennington
This commit is contained in:
aszlig 2016-06-04 12:42:16 +02:00
parent 9a154e2838
commit 70246d7cfa
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/security/pcsclite/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "12k8q0ckyy1fqcfh7x0b7kfrlfiscrqaqmidcggnzs4pi2iqml77"; sha256 = "12k8q0ckyy1fqcfh7x0b7kfrlfiscrqaqmidcggnzs4pi2iqml77";
}; };
patches = [ ./no-dropdir-literals.patch ];
configureFlags = [ configureFlags = [
# The OS should care on preparing the drivers into this location # The OS should care on preparing the drivers into this location
"--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-usbdropdir=/var/lib/pcsc/drivers"
@ -15,6 +17,12 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional stdenv.isLinux ] ++ stdenv.lib.optional stdenv.isLinux
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"; "--with-systemdsystemunitdir=\${out}/etc/systemd/system";
postConfigure = ''
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
s/(DROPDIR *)(.*)/\1(getenv("PCSCLITE_HP_DROPDIR") ? : \2)/
}' config.h
'';
nativeBuildInputs = [ pkgconfig perl python2 ]; nativeBuildInputs = [ pkgconfig perl python2 ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ];

73
pkgs/tools/security/pcsclite/no-dropdir-literals.patch Normal file
View File

@ -0,0 +1,73 @@
diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
index a8ba1b8..a53700b 100644
--- a/src/hotplug_libudev.c
+++ b/src/hotplug_libudev.c
@@ -119,7 +119,8 @@ static LONG HPReadBundleValues(void)
if (NULL == hpDir)
{
- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
+ PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
return -1;
}
@@ -722,7 +723,7 @@ ULONG HPRegisterForHotplugEvents(void)
if (driverSize <= 0)
{
- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: "
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
return 0;
diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c
index eff8519..8dd496d 100644
--- a/src/hotplug_libusb.c
+++ b/src/hotplug_libusb.c
@@ -138,7 +138,8 @@ static LONG HPReadBundleValues(void)
if (hpDir == NULL)
{
- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
+ PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
return -1;
}
@@ -265,7 +266,8 @@ static LONG HPReadBundleValues(void)
if (driverSize == 0)
{
- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
+ PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
}
#ifdef DEBUG_HOTPLUG
diff --git a/src/hotplug_linux.c b/src/hotplug_linux.c
index bf69af8..64b0ed7 100644
--- a/src/hotplug_linux.c
+++ b/src/hotplug_linux.c
@@ -130,8 +130,8 @@ static LONG HPReadBundleValues(void)
if (hpDir == NULL)
{
- Log1(PCSC_LOG_INFO,
- "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+ Log2(PCSC_LOG_INFO, "Cannot open PC/SC drivers directory: %s",
+ PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd.");
return -1;
}
@@ -219,8 +219,8 @@ end:
if (bundleSize == 0)
{
- Log1(PCSC_LOG_INFO,
- "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
+ PCSCLITE_HP_DROPDIR);
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
}