From ab670a721610490693b6c7c8cd70c0d7d1ba7880 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Fri, 11 Jul 2014 16:49:56 +0000 Subject: [PATCH] Update to ccid-1.4.17 --- security/ccid/Makefile | 7 +++---- security/ccid/distinfo | 4 ++-- security/ccid/patches/patch-src_ccid_usb_c | 22 ---------------------- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 security/ccid/patches/patch-src_ccid_usb_c diff --git a/security/ccid/Makefile b/security/ccid/Makefile index 00e3a1a82da..452c8a2e0c1 100644 --- a/security/ccid/Makefile +++ b/security/ccid/Makefile @@ -1,17 +1,16 @@ -# $OpenBSD: Makefile,v 1.12 2014/03/27 13:55:43 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.13 2014/07/11 16:49:56 dcoppa Exp $ SHARED_ONLY = Yes COMMENT = USB Chip/Smart Card Interface Devices driver -DISTNAME = ccid-1.4.16 +DISTNAME = ccid-1.4.17 CATEGORIES = security HOMEPAGE = http://pcsclite.alioth.debian.org/ccid.html -# MASTER_SITES = https://alioth.debian.org/frs/download.php/latestfile/112/ -MASTER_SITES = http://spacehopper.org/mirrors/ +MASTER_SITES = https://alioth.debian.org/frs/download.php/latestfile/112/ EXTRACT_SUFX = .tar.bz2 diff --git a/security/ccid/distinfo b/security/ccid/distinfo index a874883752a..ec21d5f226a 100644 --- a/security/ccid/distinfo +++ b/security/ccid/distinfo @@ -1,2 +1,2 @@ -SHA256 (ccid-1.4.16.tar.bz2) = Cg5qo4hjx544ZzwIUlT6lP0KoEC5YiMEqNbUIit+fqA= -SIZE (ccid-1.4.16.tar.bz2) = 490965 +SHA256 (ccid-1.4.17.tar.bz2) = zNq4qbwa0ogkLV+e85lAXpy5b7CcqttD42ScurqExFE= +SIZE (ccid-1.4.17.tar.bz2) = 491972 diff --git a/security/ccid/patches/patch-src_ccid_usb_c b/security/ccid/patches/patch-src_ccid_usb_c deleted file mode 100644 index c0a9286ee90..00000000000 --- a/security/ccid/patches/patch-src_ccid_usb_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_ccid_usb_c,v 1.1 2014/03/27 13:55:43 dcoppa Exp $ - -Revert svn revision 6801, "Do not get the data rates if -bNumDataRatesSupported = 0", since it breaks (at least) my reader - ---- src/ccid_usb.c.orig Sun Mar 23 16:09:48 2014 -+++ src/ccid_usb.c Thu Mar 27 13:54:17 2014 -@@ -635,13 +635,7 @@ again: - usbDevice[reader_index].ccid.bMaxSlotIndex = device_descriptor[4]; - usbDevice[reader_index].ccid.bCurrentSlotIndex = 0; - usbDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT; -- if (device_descriptor[27]) -- usbDevice[reader_index].ccid.arrayOfSupportedDataRates = get_data_rates(reader_index, config_desc, num); -- else -- { -- usbDevice[reader_index].ccid.arrayOfSupportedDataRates = NULL; -- DEBUG_INFO("bNumDataRatesSupported is 0"); -- } -+ usbDevice[reader_index].ccid.arrayOfSupportedDataRates = get_data_rates(reader_index, config_desc, num); - usbDevice[reader_index].ccid.bInterfaceProtocol = usb_interface->altsetting->bInterfaceProtocol; - usbDevice[reader_index].ccid.bNumEndpoints = usb_interface->altsetting->bNumEndpoints; - usbDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;