MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch

48 lines
1.6 KiB
Diff
Raw Normal View History

pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
index 51bd95f..84f959b 100644
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
--- a/src/hotplug_libudev.c
+++ b/src/hotplug_libudev.c
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
@@ -120,7 +120,8 @@ static LONG HPReadBundleValues(void)
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
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;
}
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
@@ -741,7 +742,7 @@ ULONG HPRegisterForHotplugEvents(void)
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
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
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
index 0ada9f5..d49a407 100644
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
--- a/src/hotplug_libusb.c
+++ b/src/hotplug_libusb.c
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
@@ -142,7 +142,8 @@ static LONG HPReadBundleValues(void)
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
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;
}
pcsclite: 1.9.4 -> 1.9.5 Also updated our patch: * Refreshed offsets. * hotplug_linux.c was removed upstream.
2021-12-04 16:07:58 +01:00
@@ -282,7 +283,8 @@ static LONG HPReadBundleValues(void)
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var 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
2016-06-04 12:42:16 +02:00
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
Reference in a new issue Copy permalink