From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PqEeE-0002TU-7q for garchives@archives.gentoo.org; Fri, 18 Feb 2011 00:56:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15AF5E0462; Fri, 18 Feb 2011 00:56:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4D39E0462 for ; Fri, 18 Feb 2011 00:56:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A30C1B406B for ; Fri, 18 Feb 2011 00:56:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A94748006A for ; Fri, 18 Feb 2011 00:56:29 +0000 (UTC) From: "Diego Elio Pettenò" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Diego Elio Pettenò" Message-ID: Subject: [gentoo-commits] dev/flameeyes:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/ X-VCS-Repository: dev/flameeyes X-VCS-Files: sys-apps/pcsc-lite/ChangeLog sys-apps/pcsc-lite/Manifest sys-apps/pcsc-lite/files/pcsc-lite-1.6.6-libusb-libhal.patch X-VCS-Directories: sys-apps/pcsc-lite/ sys-apps/pcsc-lite/files/ X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Elio Pettenò X-VCS-Revision: ec8a6c92cfa2eefaa644d10797909ef8fc51a731 Date: Fri, 18 Feb 2011 00:56:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 25467271cb2d0b1608dd9b5a0f9d4a90 commit: ec8a6c92cfa2eefaa644d10797909ef8fc51a731 Author: Diego Elio Petten=C3=B2 gmail com> AuthorDate: Fri Feb 18 00:57:03 2011 +0000 Commit: Diego Elio Petten=C3=B2 gentoo org> CommitDate: Fri Feb 18 00:57:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/flameeyes.git;= a=3Dcommit;h=3Dec8a6c92 Try two for the patch. (Portage version: 2.2.0_alpha24/git/Linux x86_64, signed Manifest commit = with key 2200D978) --- sys-apps/pcsc-lite/ChangeLog | 4 + sys-apps/pcsc-lite/Manifest | 10 ++-- .../files/pcsc-lite-1.6.6-libusb-libhal.patch | 72 +++++++++++---= ------ 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog index 85f89bd..3458301 100644 --- a/sys-apps/pcsc-lite/ChangeLog +++ b/sys-apps/pcsc-lite/ChangeLog @@ -3,6 +3,10 @@ # $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.103 = 2011/01/10 18:51:08 flameeyes Exp $ =20 18 Feb 2011; Diego E. Petten=C3=B2 + files/pcsc-lite-1.6.6-libusb-libhal.patch: + Try two for the patch. + + 18 Feb 2011; Diego E. Petten=C3=B2 +files/99-pcscd-hotplug.rules, +pcsc-lite-1.6.6.ebuild, +files/pcsc-lite-1.6.6-libusb-libhal.patch, +files/pcscd-init.3, +metadata.xml: diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index 86f1f65..9813e71 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -2,16 +2,16 @@ Hash: SHA1 =20 AUX 99-pcscd-hotplug.rules 483 RMD160 6a747495f425ae83a55b6be632818e00f8= 2a47b3 SHA1 07c8112839b66b1e856c052ebddb9f867f5b55f7 SHA256 9c33ca952c9bf= 119329ac5d7083176540803901200032a6d2f5231196ee2314a -AUX pcsc-lite-1.6.6-libusb-libhal.patch 3130 RMD160 ed42fa2559dacb79a1d5= 6fed6b784e301a3e9bcf SHA1 9c4ed77a0eab98fb6883da311a7ba220ee2ea5b2 SHA256= 409b577de823ba4b776b0e4942afbfa30f96818c68ddd54ecd7d09402d51536f +AUX pcsc-lite-1.6.6-libusb-libhal.patch 3323 RMD160 a8b6254bddc576403f1d= c5d97e9a7da5739dd44c SHA1 52ddbcfae08448e090671c31bb8e26a2dccdf686 SHA256= 55959c6cc2e651aefdf1a32e32752cf23dbc035e9767116fdb738109b8ca7ac1 AUX pcscd-init.3 740 RMD160 38da0cecdc5a99d0af17a66a840e045b4bc0ebec SHA= 1 39f478f4e3e0c4f4f1a4624136872c97bcf65510 SHA256 98e6573b2917d442220a2af= d3429ad70684eed0369204e84dabea150478356e9 DIST pcsc-lite-1.6.6.tar.bz2 480232 RMD160 e4041b846d34cf94069b6ed71e189= 2af34d92acd SHA1 bdd4b2f87955e2719be9b4f5da253904c721fdec SHA256 7a94c27a= e687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8 EBUILD pcsc-lite-1.6.6.ebuild 2264 RMD160 32f24e2aafae00788c11926b9deb55= 1c5965d8bf SHA1 2ef0b8bda1971b004bfab70b643177e49718eff4 SHA256 5433a4dd1= 8114c096e52584596702573b66001e86983d6c968ed3cd479d1eb00 -MISC ChangeLog 14503 RMD160 1715cae07a0669a0f3dda56bf0693a6273a221f3 SHA= 1 a12d60ac04a6a97fe802eb7b2b81ccbb135c6fb3 SHA256 2779cf10d592232c46bb56b= 1fd8e919b8c27ead9c69e27d3a756395a3a45538b +MISC ChangeLog 14630 RMD160 b9ca25823812d9032d821f6849610fc35c55220c SHA= 1 ca03b136e23cffab5fa55c8a27c316071ce462cf SHA256 1db4da50887c350cb7f9141= 8ca0c5d5b2ba5894018b3f5fba85a93ea7e76c905 MISC metadata.xml 244 RMD160 9a9367ba3a24404b82d10ffe6493dbe43dfcb718 SH= A1 b609f191e50f68af8331dfd824a8d72d48fd3ac0 SHA256 b93928eec206138ccf14d2= c0dd1ebd2bbbf1cda0b8b69f540eb7f17e729cb5bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEARECAAYFAk1dwkcACgkQAiZjviIA2XhlBACgh31AgiP2C1MxNNeodkJL29AP -mK4AnjEEjMPi0xUDH5S0UTuWLnxuowWy -=3D6R7f +iEYEARECAAYFAk1dw98ACgkQAiZjviIA2XgE8gCfX8PknjKQ5LkPbFK2V66eUC5x +z/oAoIVLE4KcpQ0+cB2GzOJvPDMmbirk +=3Da+xl -----END PGP SIGNATURE----- diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.6.6-libusb-libhal.patch= b/sys-apps/pcsc-lite/files/pcsc-lite-1.6.6-libusb-libhal.patch index 2ae854f..c4b39e3 100644 --- a/sys-apps/pcsc-lite/files/pcsc-lite-1.6.6-libusb-libhal.patch +++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.6.6-libusb-libhal.patch @@ -1,5 +1,5 @@ --- .pc/pcsc-lite-1.6.6-libusb-libhal.patch/src/hotplug_libusb.c 2010-09= -03 13:55:29.000000000 +0200 -+++ src/hotplug_libusb.c 2011-02-18 01:41:25.957193002 +0100 ++++ src/hotplug_libusb.c 2011-02-18 01:55:05.193193002 +0100 @@ -47,8 +47,8 @@ #undef DEBUG_HOTPLUG #define ADD_SERIAL_NUMBER @@ -21,59 +21,69 @@ static LONG HPRemoveHotPluggable(int reader_index); =20 static LONG HPReadBundleValues(void) -@@ -294,16 +295,31 @@ +@@ -276,6 +277,7 @@ + while ((dev =3D devs[cnt++]) !=3D NULL) + { + struct libusb_device_descriptor desc; ++ struct libusb_config_descriptor *config_desc; + uint8_t bus_number =3D libusb_get_bus_number(dev); + uint8_t device_address =3D libusb_get_device_address(dev); +=20 +@@ -287,6 +289,14 @@ + continue; + } +=20 ++ r =3D libusb_get_active_config_descriptor(dev, &config_desc); ++ if (r < 0) ++ { ++ Log3(PCSC_LOG_ERROR, "failed to get device config for %d/%d", ++ bus_number, device_address); ++ continue; ++ } ++ + /* check if the device is supported by one driver */ + for (i=3D0; ibNumInterfaces; inte= rface++) + { -+ int newreader; -+ -+ /* A known device has been found */ + int newreader; +=20 + /* A known device has been found */ +- snprintf(bus_device, BUS_DEVICE_STRSIZE, "%d:%d", +- bus_number, device_address); + snprintf(bus_device, BUS_DEVICE_STRSIZE, "%d:%d:%d", + bus_number, device_address, interface); -+ bus_device[BUS_DEVICE_STRSIZE - 1] =3D '\0'; + bus_device[BUS_DEVICE_STRSIZE - 1] =3D '\0'; +-#ifdef DEBUG_HOTPLUG +- Log2(PCSC_LOG_DEBUG, "Found matching USB device: %s", +- bus_device); +-#endif newreader =3D TRUE; =20 /* Check if the reader is a new one */ -@@ -325,9 +341,12 @@ +@@ -325,7 +340,9 @@ =20 /* New reader found */ if (newreader) - HPAddHotPluggable(dev, desc, bus_device, &driverTracker[i]); + HPAddHotPluggable(dev, desc, bus_device, -+ interface, &driverTracker[i]); ++ interface, &driverTracker[i]); + } } } -+ next_device: } -=20 - /* -@@ -470,15 +489,16 @@ +@@ -470,15 +487,16 @@ =20 static LONG HPAddHotPluggable(struct libusb_device *dev, struct libusb_device_descriptor desc,