[gentoo-commits] dev/flameeyes:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/

["Diego Elio Pettenò" <flameeyes@gentoo.org>]

commit:     0c09136cb54b75e82b37ca81a1ae1a20d444eed4
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Fri Feb 18 00:59:30 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 00:59:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/flameeyes.git;a=commit;h=0c09136c

Try 3 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      |    4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 3458301..4bd8dee 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -4,6 +4,10 @@
 
   18 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   files/pcsc-lite-1.6.6-libusb-libhal.patch:
+  Try 3 for the patch.
+
+  18 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/pcsc-lite-1.6.6-libusb-libhal.patch:
   Try two for the patch.
 
   18 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>

diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 9813e71..0cac897 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA1
 
 AUX 99-pcscd-hotplug.rules 483 RMD160 6a747495f425ae83a55b6be632818e00f82a47b3 SHA1 07c8112839b66b1e856c052ebddb9f867f5b55f7 SHA256 9c33ca952c9bf119329ac5d7083176540803901200032a6d2f5231196ee2314a
-AUX pcsc-lite-1.6.6-libusb-libhal.patch 3323 RMD160 a8b6254bddc576403f1dc5d97e9a7da5739dd44c SHA1 52ddbcfae08448e090671c31bb8e26a2dccdf686 SHA256 55959c6cc2e651aefdf1a32e32752cf23dbc035e9767116fdb738109b8ca7ac1
+AUX pcsc-lite-1.6.6-libusb-libhal.patch 3323 RMD160 c575bd1970c68694afe7542010577b0fd50815bd SHA1 50dc73e737faa095127c667e306cf57c5f7f7b95 SHA256 71cc71392fed868dec18326d3866213ab19c57bc89d6665fcee8d9b23af9acd4
 AUX pcscd-init.3 740 RMD160 38da0cecdc5a99d0af17a66a840e045b4bc0ebec SHA1 39f478f4e3e0c4f4f1a4624136872c97bcf65510 SHA256 98e6573b2917d442220a2afd3429ad70684eed0369204e84dabea150478356e9
 DIST pcsc-lite-1.6.6.tar.bz2 480232 RMD160 e4041b846d34cf94069b6ed71e1892af34d92acd SHA1 bdd4b2f87955e2719be9b4f5da253904c721fdec SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8
 EBUILD pcsc-lite-1.6.6.ebuild 2264 RMD160 32f24e2aafae00788c11926b9deb551c5965d8bf SHA1 2ef0b8bda1971b004bfab70b643177e49718eff4 SHA256 5433a4dd18114c096e52584596702573b66001e86983d6c968ed3cd479d1eb00
-MISC ChangeLog 14630 RMD160 b9ca25823812d9032d821f6849610fc35c55220c SHA1 ca03b136e23cffab5fa55c8a27c316071ce462cf SHA256 1db4da50887c350cb7f91418ca0c5d5b2ba5894018b3f5fba85a93ea7e76c905
+MISC ChangeLog 14755 RMD160 ca7c111936d6d1287e47ab1011bc367ee4ebfce5 SHA1 839c350a2c098ab8671ae916360d003eb13f6638 SHA256 844e0edcd9baeed09581dd54fe7e2f7ace70a95af278b02f1677c4dc9a028e9b
 MISC metadata.xml 244 RMD160 9a9367ba3a24404b82d10ffe6493dbe43dfcb718 SHA1 b609f191e50f68af8331dfd824a8d72d48fd3ac0 SHA256 b93928eec206138ccf14d2c0dd1ebd2bbbf1cda0b8b69f540eb7f17e729cb5bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1dw98ACgkQAiZjviIA2XgE8gCfX8PknjKQ5LkPbFK2V66eUC5x
-z/oAoIVLE4KcpQ0+cB2GzOJvPDMmbirk
-=a+xl
+iEYEARECAAYFAk1dxHIACgkQAiZjviIA2XiJeQCfSYrv/1JWXzbDoS18LAUhjwjd
+W5YAn1VdhqENOf7OTPnEpG8tyFkocYJs
+=0wV7
 -----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 c4b39e3..111630d 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:55:05.193193002 +0100
++++ src/hotplug_libusb.c	2011-02-18 01:59:09.171193002 +0100
 @@ -47,8 +47,8 @@
  #undef DEBUG_HOTPLUG
  #define ADD_SERIAL_NUMBER
@@ -99,7 +99,7 @@
 -	snprintf(deviceName, sizeof(deviceName), "usb:%04x/%04x:libusb-1.0:%s",
 -		desc.idVendor, desc.idProduct, bus_device);
 +	snprintf(deviceName, sizeof(deviceName), "usb:%04x/%04x:libhal:/org/freedesktop/Hal/devices/usb_device_%04x_%04x_serialnotneeded_if%d",
-+		 desc.idVendor, desc.idProduct, desc.idvendor, desc.idProduct, interface);
++		 desc.idVendor, desc.idProduct, desc.idVendor, desc.idProduct, interface);
  	deviceName[sizeof(deviceName) -1] = '\0';
  
  	pthread_mutex_lock(&usbNotifierMutex);