summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2007-03-08 18:04:48 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2007-03-08 18:04:48 +0000
commit8b8ad4c5585efbc343d0a119acd90e5d029e18ce (patch)
treebf408e85d385b5d6bb4e483896b0f5d9e0d5e340 /dev-libs/opensc
parentStable on ppc wrt bug #169640. (diff)
downloadgentoo-2-8b8ad4c5585efbc343d0a119acd90e5d029e18ce.tar.gz
gentoo-2-8b8ad4c5585efbc343d0a119acd90e5d029e18ce.tar.bz2
gentoo-2-8b8ad4c5585efbc343d0a119acd90e5d029e18ce.zip
Fixed pcsc-lite-1.4 support, bug#169579, thanks to Ashu Tiwary
(Portage version: 2.1.2.1-r1)
Diffstat (limited to 'dev-libs/opensc')
-rw-r--r--dev-libs/opensc/ChangeLog6
-rw-r--r--dev-libs/opensc/files/opensc-0.11.1-pcsc.patch21
-rw-r--r--dev-libs/opensc/opensc-0.11.1-r1.ebuild3
3 files changed, 28 insertions, 2 deletions
diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 9137f3bf9e5a..c7e54a2a20f3 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/opensc
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.36 2007/02/27 23:35:54 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.37 2007/03/08 18:04:48 alonbl Exp $
+
+ 08 Mar 2007; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/opensc-0.11.1-pcsc.patch, opensc-0.11.1-r1.ebuild:
+ Fixed pcsc-lite-1.4 support, bug#169579, thanks to Ashu Tiwary
27 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> opensc-0.10.1.ebuild,
opensc-0.11.0-r1.ebuild:
diff --git a/dev-libs/opensc/files/opensc-0.11.1-pcsc.patch b/dev-libs/opensc/files/opensc-0.11.1-pcsc.patch
new file mode 100644
index 000000000000..5de457ae3542
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.11.1-pcsc.patch
@@ -0,0 +1,21 @@
+--- src/libopensc/reader-pcsc.c 2006-05-10 01:15:17.000000000 -0500
++++ reader-pcsc-2.c 2007-03-06 00:13:22.731527485 -0600
+@@ -53,7 +53,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);
+@@ -63,6 +62,10 @@
+ #define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %s\n", pcsc_stringify_error(rv));
+ #endif
+
++#ifndef SCARD_SCOPE_GLOBAL
++#define SCARD_SCOPE_GLOBAL SCARD_SCOPE_USER
++#endif
++
+ /* Utility for handling big endian IOCTL codes. */
+ #define dw2i_be(a, x) ((((((a[x] << 8) + a[x+1]) << 8) + a[x+2]) << 8) + a[x+3])
+
diff --git a/dev-libs/opensc/opensc-0.11.1-r1.ebuild b/dev-libs/opensc/opensc-0.11.1-r1.ebuild
index b0fb9f79c4b5..d504caa1b724 100644
--- a/dev-libs/opensc/opensc-0.11.1-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.1-r1.ebuild,v 1.2 2007/01/29 22:11:35 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.1-r1.ebuild,v 1.3 2007/03/08 18:04:48 alonbl Exp $
WANT_AUTOMAKE="1.9"
@@ -30,6 +30,7 @@ src_unpack() {
epatch ${ELT_PATCH_DIR}/fix-relink/1.5.0
epatch "${FILESDIR}/${P}-dep.patch"
+ epatch "${FILESDIR}/${P}-pcsc.patch"
AT_M4DIR="aclocal" eautoreconf
}