Attachment #76858 for bug #110736

View | Details | Raw Unified | Return to bug 110736
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= opensc	8	PORTNAME= opensc
9	DISTVERSION= 0.11.2-pre3	9	DISTVERSION= 0.11.2-rc1
10	CATEGORIES= security devel	10	CATEGORIES= security devel
11	MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \	11	MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \
12	http://www.opensc-project.org/files/${PORTNAME}/testing/	12	http://www.opensc-project.org/files/${PORTNAME}/testing/

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (opensc-0.11.2-pre3.tar.gz) = 46a5ea72b3cc447f970de0a103e479e4	1	MD5 (opensc-0.11.2-rc1.tar.gz) = 58e82ea52c71275e573b34a64f79827a
2	SHA256 (opensc-0.11.2-pre3.tar.gz) = e2f9c0427e60e5487cdcb4847d080fbee06dc9c2a67edc4b791c7bfd63b484fc	2	SHA256 (opensc-0.11.2-rc1.tar.gz) = a52bcfd19e5197538894c6c4a8199a68380f4899232f0ccf1559f23aaf3a7a1f
3	SIZE (opensc-0.11.2-pre3.tar.gz) = 1302861	3	SIZE (opensc-0.11.2-rc1.tar.gz) = 1309949




--- src/libopensc/reader-pcsc.c.orig	Fri Feb 23 22:13:56 2007
+++ src/libopensc/reader-pcsc.c	Fri Feb 23 22:14:40 2007
@@ -60,7 +60,6 @@
 #undef SCARD_PROTOCOL_ANY
 #define SCARD_PROTOCOL_ANY (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
 #ifdef _WIN32
-#define SCARD_SCOPE_GLOBAL SCARD_SCOPE_USER
 
 /* Error printing */
 #define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %lx\n", rv);
@@ -717,7 +716,7 @@
 	struct pcsc_global_private_data *gpriv;
 	scconf_block *conf_block;
 
-	rv = SCardEstablishContext(SCARD_SCOPE_GLOBAL,
+	rv = SCardEstablishContext(SCARD_SCOPE_USER,
                               NULL, NULL, &pcsc_ctx);
 	if (rv != SCARD_S_SUCCESS)
 		return pcsc_ret_to_error(rv);

Return to bug 110736

Removed Link Here

(-)files/patch-src_libopensc_reader-pcsc.c (-19 lines)
1	--- src/libopensc/reader-pcsc.c.orig Fri Feb 23 22:13:56 2007
2	+++ src/libopensc/reader-pcsc.c Fri Feb 23 22:14:40 2007
3	@@ -60,7 +60,6 @@
4	#undef SCARD_PROTOCOL_ANY
5	#define SCARD_PROTOCOL_ANY (SCARD_PROTOCOL_T0 \| SCARD_PROTOCOL_T1)
6	#ifdef _WIN32
7	-#define SCARD_SCOPE_GLOBAL SCARD_SCOPE_USER
8
9	/* Error printing */
10	#define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %lx\n", rv);
11	@@ -717,7 +716,7 @@
12	struct pcsc_global_private_data *gpriv;
13	scconf_block *conf_block;
14
15	- rv = SCardEstablishContext(SCARD_SCOPE_GLOBAL,
16	+ rv = SCardEstablishContext(SCARD_SCOPE_USER,
17	NULL, NULL, &pcsc_ctx);
18	if (rv != SCARD_S_SUCCESS)
19	return pcsc_ret_to_error(rv);