From 69b545293ec39fd3a2f69117b955a00fcd4e2a2b Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Thu, 8 Mar 2007 18:04:48 +0000 Subject: [PATCH] Fixed pcsc-lite-1.4 support, bug#169579, thanks to Ashu Tiwary Package-Manager: portage-2.1.2.1-r1 --- dev-libs/opensc/ChangeLog | 6 +++- dev-libs/opensc/Manifest | 30 ++++++++----------- .../opensc/files/opensc-0.11.1-pcsc.patch | 21 +++++++++++++ dev-libs/opensc/opensc-0.11.1-r1.ebuild | 3 +- 4 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 dev-libs/opensc/files/opensc-0.11.1-pcsc.patch 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 + +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 opensc-0.10.1.ebuild, opensc-0.11.0-r1.ebuild: diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index ff64592368d3..1ae0549645f4 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.8.1-64bit.patch 577 RMD160 1f42835fc1118bbcb7382b19bbedd108cf3f7cd4 SHA1 674112903080fd1f7e0744994db88cc024aeb491 SHA256 4915dc600a0c932b3b50dfa7ae780448a5b57b6d96ffce3fb4b61de1aca685c4 MD5 074aae91efbecf981a1e8ed73d5d1681 files/0.8.1-64bit.patch 577 RMD160 1f42835fc1118bbcb7382b19bbedd108cf3f7cd4 files/0.8.1-64bit.patch 577 @@ -9,6 +6,10 @@ AUX opensc-0.11.1-dep.patch 5441 RMD160 2dd46dde4728fa0347bd142372d1e21feb8ff6d8 MD5 a6ec4cbb56dfa3162c7d168183ac9401 files/opensc-0.11.1-dep.patch 5441 RMD160 2dd46dde4728fa0347bd142372d1e21feb8ff6d8 files/opensc-0.11.1-dep.patch 5441 SHA256 3106e1b795cc65c581fc9663d12397971c8a0e73334752c15c6c4ed6a3be115b files/opensc-0.11.1-dep.patch 5441 +AUX opensc-0.11.1-pcsc.patch 730 RMD160 8c5ad8aa44fcea0ed70143e55a0eadc4a44e7635 SHA1 593c9fb275e74548b32332d59adb993f10281d78 SHA256 8ccd82616322fbea926a5a4ad68c235b31e190f2ff8fda061f98ccafb546b2a6 +MD5 f9eef377007ff9f68df0f65152f4e1ed files/opensc-0.11.1-pcsc.patch 730 +RMD160 8c5ad8aa44fcea0ed70143e55a0eadc4a44e7635 files/opensc-0.11.1-pcsc.patch 730 +SHA256 8ccd82616322fbea926a5a4ad68c235b31e190f2ff8fda061f98ccafb546b2a6 files/opensc-0.11.1-pcsc.patch 730 AUX opensc-0.9.4-gcc4.patch 446 RMD160 d9d896adc0d1362d74e3c31bac9194077ae446a8 SHA1 bae7cac27c74890cd7b99480d1eaf09a77a1ac7e SHA256 b22069f42a5d223e4de7a8bc2d5aa8e2110ce7e22b262a59332cd188a0b0a505 MD5 c16f3cf2a3cb31195b173e54f4d2212d files/opensc-0.9.4-gcc4.patch 446 RMD160 d9d896adc0d1362d74e3c31bac9194077ae446a8 files/opensc-0.9.4-gcc4.patch 446 @@ -29,10 +30,10 @@ EBUILD opensc-0.11.0-r2.ebuild 1568 RMD160 c5cfdb519a7f9bebfc095361d73342ecdda0c MD5 9479161ce8aa035ce93e3e0e1d86c4f7 opensc-0.11.0-r2.ebuild 1568 RMD160 c5cfdb519a7f9bebfc095361d73342ecdda0c5c0 opensc-0.11.0-r2.ebuild 1568 SHA256 d888963df9db8b4768b9bf760b5bad1c17014ef0175e4e75a7108d3d9bfe1c50 opensc-0.11.0-r2.ebuild 1568 -EBUILD opensc-0.11.1-r1.ebuild 1718 RMD160 afae18cad5b157820d5f3b9629806a9517c552ce SHA1 da0c1152bfa46a711f27bf0e389f00fd789f7762 SHA256 c04763caf5a035fb53a2ecf321a993ae6048c19f2323dee61172833874ad1c3d -MD5 ba80591a7b626910a0d9a15249ed8d02 opensc-0.11.1-r1.ebuild 1718 -RMD160 afae18cad5b157820d5f3b9629806a9517c552ce opensc-0.11.1-r1.ebuild 1718 -SHA256 c04763caf5a035fb53a2ecf321a993ae6048c19f2323dee61172833874ad1c3d opensc-0.11.1-r1.ebuild 1718 +EBUILD opensc-0.11.1-r1.ebuild 1756 RMD160 e910e93d9739bc13df449849d94f422e075a05e9 SHA1 c708542e5bc723adeb6fd453dc6fd08dc068e92d SHA256 8b0ef6d2f3978f737712f6a70b8f175f2aea67de15834b05c3d2e5ab5c0956f2 +MD5 4c2c2fe8a0240b3f2d200ff2c8ff28b0 opensc-0.11.1-r1.ebuild 1756 +RMD160 e910e93d9739bc13df449849d94f422e075a05e9 opensc-0.11.1-r1.ebuild 1756 +SHA256 8b0ef6d2f3978f737712f6a70b8f175f2aea67de15834b05c3d2e5ab5c0956f2 opensc-0.11.1-r1.ebuild 1756 EBUILD opensc-0.11.1.ebuild 1560 RMD160 6b3b5a2eae40353b0eaa44d665606adfb2d62b59 SHA1 60b6558ec2e13bc611746605d49a18d3f4dfe756 SHA256 1cfe23a10cb0989b2cc1360d9c5598e687e05217de1bae59aa24c15d4da9f3b5 MD5 7fab2ccb85c5d7c141c9c69fbc5791db opensc-0.11.1.ebuild 1560 RMD160 6b3b5a2eae40353b0eaa44d665606adfb2d62b59 opensc-0.11.1.ebuild 1560 @@ -41,10 +42,10 @@ EBUILD opensc-0.9.4.ebuild 1601 RMD160 b627a8e28d8d79aaedc28423c977a84b4986d548 MD5 ee098da16bebb2cdb28490b35e1fd288 opensc-0.9.4.ebuild 1601 RMD160 b627a8e28d8d79aaedc28423c977a84b4986d548 opensc-0.9.4.ebuild 1601 SHA256 68ebc5ae39f2975a2cb0999cb3993b0b279d8713fb41c69975e31b55ab3cdcdd opensc-0.9.4.ebuild 1601 -MISC ChangeLog 5623 RMD160 02f21bd75099210bb56811a4b10f9de635114f29 SHA1 a129f22a91f97cb94d962cba6adc5fa91da053a3 SHA256 6a0067b5a1431babf7a06941e15ca5ae0c8c6f91e570111c5250fae52a0b2829 -MD5 5edc38192a1da29c392095f8e6ee91b3 ChangeLog 5623 -RMD160 02f21bd75099210bb56811a4b10f9de635114f29 ChangeLog 5623 -SHA256 6a0067b5a1431babf7a06941e15ca5ae0c8c6f91e570111c5250fae52a0b2829 ChangeLog 5623 +MISC ChangeLog 5798 RMD160 49d11f1342ed0cebc2681f03dc3331f309bb6c5d SHA1 76547c3e346f5610d31c8a53d4c3ec851adf7d9f SHA256 f599a041e1ed254ab30382b0c4235766568772f6813c8b7f72c0285554ce488f +MD5 dada313c7156b95e1fb7a085b6ee0d76 ChangeLog 5798 +RMD160 49d11f1342ed0cebc2681f03dc3331f309bb6c5d ChangeLog 5798 +SHA256 f599a041e1ed254ab30382b0c4235766568772f6813c8b7f72c0285554ce488f ChangeLog 5798 MISC metadata.xml 663 RMD160 004493a490c8ef2ab6add0f20d1bca1257fbc9d5 SHA1 a81f8c6081816041b96a8dc97f8ef7933c8a5c1d SHA256 d1372ebc4a755688717f980bdc3bf23710bde20b7faf7a9e4a59c128569e41a9 MD5 286a92520aa59a11916aacd680088270 metadata.xml 663 RMD160 004493a490c8ef2ab6add0f20d1bca1257fbc9d5 metadata.xml 663 @@ -67,10 +68,3 @@ SHA256 02dd51642188023a7d6c887052b0cf7fcecc403f1da20bd7bfa55aa2a339341c files/di MD5 8e0199b4b4e82375b4b984dfa4a81268 files/digest-opensc-0.9.4 241 RMD160 1719b875cef69d9d4d235ed5584d7d0da7ddfe7f files/digest-opensc-0.9.4 241 SHA256 7c9bb81f6520dbb1496112be99287208a9ecf82b338fbfd0957d6680032551f6 files/digest-opensc-0.9.4 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF5MBhppoStNGKGywRAm6sAKCLrNZqrAR4ROqKGYdfj+FmDHe6awCgw2pI -Qv0Id/5eAC0VuskEiyuLAUU= -=03as ------END PGP SIGNATURE----- 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 } -- 2.26.2