Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,13 +1,16 @@
|
||||
# $NetBSD: Makefile,v 1.12 2013/05/31 12:41:50 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2014/02/26 01:16:56 gdt Exp $
|
||||
#
|
||||
|
||||
DISTNAME= ccid-1.4.8
|
||||
DISTNAME= ccid-1.4.15
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://alioth.debian.org/frs/download.php/3768/
|
||||
# Note that the MASTER_SITES URL is not stable with version changes,
|
||||
# and one can end up with an old version if DISTNAME is changed but
|
||||
# not the magic number in MASTER_SITES.
|
||||
MASTER_SITES= https://alioth.debian.org/frs/download.php/file/3989/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
MAINTAINER= gdt@NetBSD.org
|
||||
HOMEPAGE= http://pcsclite.alioth.debian.org/ccid.html
|
||||
COMMENT= Middleware to access a smart card using SCard API (PC/SC)
|
||||
LICENSE= gnu-lgpl-v2.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
$NetBSD: distinfo,v 1.7 2013/01/06 16:10:39 pettai Exp $
|
||||
$NetBSD: distinfo,v 1.9 2014/02/25 17:16:35 gdt Exp $
|
||||
|
||||
SHA1 (ccid-1.4.8.tar.bz2) = 5506e3471e4893fe9b3fbb83d4d42fb77a641a7a
|
||||
RMD160 (ccid-1.4.8.tar.bz2) = be7a797a4c9a766841716b81b6b7859d096bea00
|
||||
Size (ccid-1.4.8.tar.bz2) = 470158 bytes
|
||||
SHA1 (ccid-1.4.15.tar.bz2) = cd73b99ef2a81822180b8c9bf0486e79e98a90a2
|
||||
RMD160 (ccid-1.4.15.tar.bz2) = 11403d8293d3baee2b8be52a1ab4029f3d0650a5
|
||||
Size (ccid-1.4.15.tar.bz2) = 487625 bytes
|
||||
SHA1 (patch-ab) = 9f392ba99a9d3a9dfca01bf92abaff67b79c29da
|
||||
SHA1 (patch-ad) = 18d9d25c1e63bd1aeae885ac51116f7a81e58876
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
$NetBSD: patch-ab,v 1.2 2012/12/15 00:29:31 pettai Exp $
|
||||
|
||||
--- src/commands.c.orig 2012-12-11 19:36:05.000000000 +0000
|
||||
+++ src/commands.c
|
||||
@@ -161,7 +161,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea
|
||||
|
||||
/* Status Information? */
|
||||
if (0x40 == tmp[0])
|
||||
- ccid_error(tmp[2], __FILE__, __LINE__, __FUNCTION__);
|
||||
+ ccid_error(tmp[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
|
||||
return IFD_COMMUNICATION_ERROR;
|
||||
}
|
||||
|
||||
@@ -230,7 +230,7 @@ again:
|
||||
|
||||
if (buffer[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
||||
{
|
||||
- ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
|
||||
if (0xBB == buffer[ERROR_OFFSET] && /* Protocol error in EMV mode */
|
||||
((GEMPC433 == ccid_descriptor->readerID)
|
||||
@@ -823,7 +823,7 @@ again:
|
||||
|
||||
if (cmd_out[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
||||
{
|
||||
- ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
return_value = IFD_COMMUNICATION_ERROR;
|
||||
}
|
||||
|
||||
@@ -925,7 +925,7 @@ RESPONSECODE CmdPowerOff(unsigned int re
|
||||
|
||||
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
||||
{
|
||||
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
return_value = IFD_COMMUNICATION_ERROR;
|
||||
}
|
||||
|
||||
@@ -1052,7 +1052,7 @@ again_status:
|
||||
&& (buffer[ERROR_OFFSET] != 0xFE))
|
||||
{
|
||||
return_value = IFD_COMMUNICATION_ERROR;
|
||||
- ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
}
|
||||
|
||||
return return_value;
|
||||
@@ -1278,7 +1278,7 @@ time_request_ICCD_B:
|
||||
|
||||
case 0x40:
|
||||
/* Status Information */
|
||||
- ccid_error(rx_buffer[2], __FILE__, __LINE__, __FUNCTION__);
|
||||
+ ccid_error(rx_buffer[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
|
||||
return IFD_COMMUNICATION_ERROR;
|
||||
|
||||
case 0x80:
|
||||
@@ -1336,7 +1336,7 @@ time_request:
|
||||
|
||||
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
||||
{
|
||||
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
switch (cmd[ERROR_OFFSET])
|
||||
{
|
||||
case 0xEF: /* cancel */
|
||||
@@ -2083,7 +2083,7 @@ RESPONSECODE SetParameters(unsigned int
|
||||
|
||||
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
||||
{
|
||||
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
||||
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
||||
if (0x00 == cmd[ERROR_OFFSET]) /* command not supported */
|
||||
return IFD_NOT_SUPPORTED;
|
||||
else
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-ad,v 1.2 2012/12/15 00:29:31 pettai Exp $
|
||||
|
||||
--- src/ccid_usb.c.orig 2012-12-11 19:45:39.000000000 +0000
|
||||
+++ src/ccid_usb.c
|
||||
@@ -1106,7 +1106,7 @@ int InterruptRead(int reader_index, int
|
||||
switch (ret)
|
||||
{
|
||||
case LIBUSB_TRANSFER_COMPLETED:
|
||||
- DEBUG_XXD("NotifySlotChange: ", buffer, actual_length);
|
||||
+ DEBUG_XXD("NotifySlotChange: ", (const unsigned char *) buffer, actual_length);
|
||||
break;
|
||||
|
||||
case LIBUSB_TRANSFER_TIMED_OUT:
|
||||
Reference in New Issue
Block a user