pyrox.dev
Merge pull request #148601 from kirelagin/pcsclite-1.9.5
+2
-2
pkgs/tools/security/pcsclite/default.nix
+2
-2
pkgs/tools/security/pcsclite/default.nix
···
14
14
15
15
stdenv.mkDerivation rec {
16
16
pname = "pcsclite";
17
-
version = "1.9.4";
17
+
version = "1.9.5";
18
18
19
19
outputs = [ "bin" "out" "dev" "doc" "man" ];
20
20
21
21
src = fetchurl {
22
22
url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2";
23
-
sha256 = "sha256:0jqwnpywk9ka3q88b1k93p8s0xhmx1isdpcqa80nd8p04z1am34a";
23
+
sha256 = "sha256:024x0hadn0kc0m9yz3l2pqzc5mdqyza9lmckg0bn4xak6frzkqwy";
24
24
};
25
25
26
26
patches = [ ./no-dropdir-literals.patch ];
+6
-32
pkgs/tools/security/pcsclite/no-dropdir-literals.patch
+6
-32
pkgs/tools/security/pcsclite/no-dropdir-literals.patch
···
1
1
diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
2
-
index a8ba1b8..a53700b 100644
2
+
index 51bd95f..84f959b 100644
3
3
--- a/src/hotplug_libudev.c
4
4
+++ b/src/hotplug_libudev.c
5
-
@@ -119,7 +119,8 @@ static LONG HPReadBundleValues(void)
5
+
@@ -120,7 +120,8 @@ static LONG HPReadBundleValues(void)
6
6
7
7
if (NULL == hpDir)
8
8
{
···
12
12
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
13
13
return -1;
14
14
}
15
-
@@ -722,7 +723,7 @@ ULONG HPRegisterForHotplugEvents(void)
15
+
@@ -741,7 +742,7 @@ ULONG HPRegisterForHotplugEvents(void)
16
16
17
17
if (driverSize <= 0)
18
18
{
···
22
22
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
23
23
return 0;
24
24
diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c
25
-
index eff8519..8dd496d 100644
25
+
index 0ada9f5..d49a407 100644
26
26
--- a/src/hotplug_libusb.c
27
27
+++ b/src/hotplug_libusb.c
28
-
@@ -138,7 +138,8 @@ static LONG HPReadBundleValues(void)
28
+
@@ -142,7 +142,8 @@ static LONG HPReadBundleValues(void)
29
29
30
30
if (hpDir == NULL)
31
31
{
···
35
35
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
36
36
return -1;
37
37
}
38
-
@@ -265,7 +266,8 @@ static LONG HPReadBundleValues(void)
38
+
@@ -282,7 +283,8 @@ static LONG HPReadBundleValues(void)
39
39
40
40
if (driverSize == 0)
41
41
{
···
45
45
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
46
46
}
47
47
#ifdef DEBUG_HOTPLUG
48
-
diff --git a/src/hotplug_linux.c b/src/hotplug_linux.c
49
-
index bf69af8..64b0ed7 100644
50
-
--- a/src/hotplug_linux.c
51
-
+++ b/src/hotplug_linux.c
52
-
@@ -130,8 +130,8 @@ static LONG HPReadBundleValues(void)
53
-
54
-
if (hpDir == NULL)
55
-
{
56
-
- Log1(PCSC_LOG_INFO,
57
-
- "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
58
-
+ Log2(PCSC_LOG_INFO, "Cannot open PC/SC drivers directory: %s",
59
-
+ PCSCLITE_HP_DROPDIR);
60
-
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd.");
61
-
return -1;
62
-
}
63
-
@@ -219,8 +219,8 @@ end:
64
-
65
-
if (bundleSize == 0)
66
-
{
67
-
- Log1(PCSC_LOG_INFO,
68
-
- "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
69
-
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
70
-
+ PCSCLITE_HP_DROPDIR);
71
-
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
72
-
}
73
-