A major version bump gives a long changelog...

1.4.5:
    - Add support of Alcor Micro AU9540, Ubisys 13.56MHz RFID (CCID),
      BIFIT USB-Token iBank2key, BIFIT iBank2Key, Gemalto Ezio Shield
      PinPad reader, Gemalto SA .NET Dual, Precise Sense MC reader (with
      fingerprint), SDS DOMINO-Key TWIN Pro
    - Add support of bPPDUSupport and FEATURE_CCID_ESC_COMMAND
    - SCARD_ATTR_VENDOR_NAME and SCARD_ATTR_VENDOR_IFD_VERSION are not
      the vendor name and version of the driver but of the IFD:
      InterFace Device i.e. the smart card reader.  We then return the
      USB iManufacturer string as SCARD_ATTR_VENDOR_NAME and USB
      bcdDevice as SCARD_ATTR_VENDOR_IFD_VERSION
    - reduce binary size bu removing unused features from simclist
    - Fix some warnings reported bu Coverity

1.4.4:
    - Add support of Gemalto Ezio Shield, Gemalto Ezio CB+, Gemalto Ezio
      Shield Secure Channel, Gemalto Ezio Shield PinPad and Gemalto Ezio
      Generic
    - Activate USB automatic power suspend. The Linux kernel should
      power off the reader automatically if it is not used (pcscd is not
      running).
    - Add support of TLV Properties wLcdMaxCharacters and wLcdMaxLines.
      They just duplicate wLcdLayout
    - some minor bugs removed

1.4.3:
    - Add support of Neowave Weneo, Vasco DIGIPASS 920, SCM SCL011,
      Feitian ePass2003 readers
    - use :libudev: instead of :libhal: naming scheme.
    - Do not install RSA_SecurID_getpasswd and Kobil_mIDentity_switch
      and the associated documentation.
    - the Secure Pin Entry of the HP USB Smart Card Keyboard is bogus so
      disable it
    - some minor bugs removed

1.4.2:
    - Add support of Feitian SCR310 reader (also known as 301v2), ACS
      APG8201 PINhandy 1, Oberthur ID-ONE TOKEN SLIM v2, new Neowave
      Weneo token, Vasco DIGIPASS KEY 860, Vasco DIGIPASS KEY 200,
      Xiring Leo v2, Xiring MyLeo, Aktiv Rutoken lite readers
    - Add back support of "bogus" Oz776, REINER SCT and BLUDRIVE II
    - Ease detection of OpenCT by pcsc-lite
    - disable use of interrupt card events for multi slots readers (the
      algorithm is bogus and can't be used)
    - fix minor problems detected by the clang tool
    - some minor bugs removed

1.4.1:
    - Add support of Gemalto Smart Guardian (SG CCID), ReinerSCT
      cyberJack RFID basis, Akasa AK-CR-03, BZH uKeyCI800-K18, Free
      Software Initiative of Japan Gnuk token readers
    - Remove O2 Micro Oz776 and Blutronics Bludrive II CCID since they
      are no more supported since version 1.4.0
    - SecurePINVerify() & SecurePINModify(): Accept big and little
      endian byte orders for multibytes fields. The application
      should not use HOST_TO_CCID_16() and HOST_TO_CCID_32() any more
      and just use the normal byte order of the architecture.
    - Need pcsc-lite 1.6.5 for TAG_IFD_POLLING_THREAD_WITH_TIMEOUT
    - Add --enable-embedded (default is no) to build libccid for an
      embedded system.  This will activate the NO_LOG option to disable
      logging and limit RAM and disk consumption.
    - Remove --enable-udev option since it is not used anymore with
      libhal. The udev rules file is now used to change the access
      rights of the device and not send a hotplug signal to pcscd.
      See http://ludovicrousseau.blogspot.com/2010/09/pcscd-auto-start.html
    - some minor bugs removed

1.4.0:
    - add support of Kingtrust Multi-Reader, Dectel CI692, Todos CX00,
      C3PO LTC36, ACS AET65, Broadcom 5880, Tianyu Smart Card Reader,
      Gemalto Hybrid Smartcard Reader
    - Add support of the SCM SDI 010 again. At least the contact
      interface can be used.
    - Use libusb-1.0 instead of libusb-0.1
    - add support of TAG_IFD_STOP_POLLING_THREAD and use of the
      asynchronous libusb API to be able to stop a transfer.
    - Request pcsc-lite 1.6.2 minimum (instead of 1.6.0) to have
      TAG_IFD_STOP_POLLING_THREAD defined
    - The O2MICRO OZ776 patch (for OZ776, OZ776_7772, REINER_SCT and
      BLUDRIVEII_CCID) is no more supported with libusb-1.0
    - correctly get the IFSC from the ATR (ATR parsing was not always
      correct)
    - some minor bugs removed

7 files changed, 56 insertions, 79 deletions

diff --git a/security/ccid/Makefile b/security/ccid/Makefile
index 2c905eb63c2..6304ec399bf 100644
--- a/security/ccid/Makefile
+++ b/security/ccid/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2012/10/23 18:16:22 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/12/15 00:29:31 pettai Exp $
 #
 
-DISTNAME=	ccid-1.3.11
-PKGREVISION=	1
+DISTNAME=	ccid-1.4.5
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3080/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3672/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@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
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS=	VARBASE
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
@@ -23,18 +25,28 @@ USE_LANGUAGES=	c c++
 CONFIGURE_ARGS+=        --sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
-SUBST_FILES.perl=	src/convert_version.pl src/create_Info_plist.pl
-SUBST_SED.perl=		-e 's,/usr/bin/perl,${PERL5},'
+REPLACE_PERL=		src/convert_version.pl src/create_Info_plist.pl
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	sbin share/doc/ccid
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} bootstrap
 
 post-install:
-	 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ccid/README
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ccid/README
+	${INSTALL_DATA} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \
+	${DESTDIR}${PREFIX}/bin/RSA_SecurID_getpasswd
+	${INSTALL_DATA} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \
+	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/RSA_SecurID_getpasswd.1
+	${INSTALL_DATA} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch \
+	${DESTDIR}${PREFIX}/sbin/Kobil_mIDentity_switch
+	${INSTALL_DATA} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8 \
+	${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/Kobil_mIDentity_switch.8
+	${INSTALL_DATA} ${WRKSRC}/contrib/Kobil_mIDentity_switch/README_Kobil_mIDentity_switch.txt \
+	${DESTDIR}${PREFIX}/share/doc/ccid/README_Kobil_mIDentity_switch.txt
 
 .include "../../security/pcsc-lite/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ccid/PLIST b/security/ccid/PLIST
index ed24b280161..afdd88d413c 100644
--- a/security/ccid/PLIST
+++ b/security/ccid/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:13:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/15 00:29:31 pettai Exp $
 bin/RSA_SecurID_getpasswd
 man/man1/RSA_SecurID_getpasswd.1
 man/man8/Kobil_mIDentity_switch.8
 lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/Info.plist
-lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so.${PKGVERSION}
 lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so
 sbin/Kobil_mIDentity_switch
 share/doc/ccid/README_Kobil_mIDentity_switch.txt
diff --git a/security/ccid/buildlink3.mk b/security/ccid/buildlink3.mk
index 3f4f7c76f99..0ace3605c34 100644
--- a/security/ccid/buildlink3.mk
+++ b/security/ccid/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/12/15 00:29:31 pettai Exp $
 
 BUILDLINK_TREE+=	ccid
 
 .if !defined(CCID_BUILDLINK3_MK)
 CCID_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ccid+=	ccid>=1.3.2
+BUILDLINK_API_DEPENDS.ccid+=	ccid>=1.4.0
 BUILDLINK_PKGSRCDIR.ccid?=	../../security/ccid
 
 .include "../../security/pcsc-lite/buildlink3.mk"
diff --git a/security/ccid/distinfo b/security/ccid/distinfo
index 38d8350c0ae..58ac0485b1e 100644
--- a/security/ccid/distinfo
+++ b/security/ccid/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/08/03 18:38:28 hasso Exp $
+$NetBSD: distinfo,v 1.6 2012/12/15 00:29:31 pettai Exp $
 
-SHA1 (ccid-1.3.11.tar.bz2) = 3b9b6cebe1fea7a6f73c5a44ae52c22dee1ee018
-RMD160 (ccid-1.3.11.tar.bz2) = 360101c3435f6aa1f715a5b1627ca21256cbae06
-Size (ccid-1.3.11.tar.bz2) = 418017 bytes
-SHA1 (patch-aa) = a9103835d13c8a860efb8a1b92aeacc8bd72fd23
-SHA1 (patch-ab) = 13db7c54d6c45aa1cb61489a7f2b38f4155793cd
-SHA1 (patch-ad) = 1eaae5649357cafbb7b612d45d4522bce7148f55
+SHA1 (ccid-1.4.5.tar.bz2) = af75baeec32c68144b902b3a7961bd52ee954b3e
+RMD160 (ccid-1.4.5.tar.bz2) = 12b38cf129623b3bbef0cd2683f4f0da536e55f0
+Size (ccid-1.4.5.tar.bz2) = 461820 bytes
+SHA1 (patch-ab) = 9f392ba99a9d3a9dfca01bf92abaff67b79c29da
+SHA1 (patch-ad) = 18d9d25c1e63bd1aeae885ac51116f7a81e58876
diff --git a/security/ccid/patches/patch-aa b/security/ccid/patches/patch-aa
deleted file mode 100644
index b7554831861..00000000000
--- a/security/ccid/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/03/16 14:10:47 hasso Exp $
-
---- configure.in.orig	2008-06-27 03:47:16.000000000 -0600
-+++ configure.in
-@@ -94,6 +94,10 @@ case "$host" in
- 	BUNDLE_HOST="FreeBSD"
- 	DYN_LIB_EXT="so"
- 	;;
-+*-*-netbsd*)
-+	BUNDLE_HOST="NetBSD"
-+	DYN_LIB_EXT="so"
-+	;;
- *-*-openbsd*)
- 	BUNDLE_HOST="OpenBSD"
- 	DYN_LIB_EXT="so.0.0"
diff --git a/security/ccid/patches/patch-ab b/security/ccid/patches/patch-ab
index 05ab2a12769..1a0928e2afb 100644
--- a/security/ccid/patches/patch-ab
+++ b/security/ccid/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
+$NetBSD: patch-ab,v 1.2 2012/12/15 00:29:31 pettai Exp $
 
---- src/commands.c.orig	2008-02-06 01:11:11.000000000 -0700
+--- src/commands.c.orig	2012-12-11 19:36:05.000000000 +0000
 +++ src/commands.c
-@@ -153,7 +153,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea
+@@ -161,7 +161,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea
  
  			/* Status Information? */
  			if (0x40 == tmp[0])
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  			return IFD_COMMUNICATION_ERROR;
  		}
  
-@@ -200,7 +200,7 @@ again:
+@@ -230,7 +230,7 @@ again:
  
  	if (buffer[STATUS_OFFSET] & CCID_COMMAND_FAILED)
  	{
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  
  		if (0xBB == buffer[ERROR_OFFSET] &&	/* Protocol error in EMV mode */
  			((GEMPC433 == ccid_descriptor->readerID)
-@@ -711,7 +711,7 @@ again:
+@@ -823,7 +823,7 @@ again:
  
  	if (cmd_out[STATUS_OFFSET] & CCID_COMMAND_FAILED)
  	{
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  		return_value = IFD_COMMUNICATION_ERROR;
  	}
  
-@@ -811,7 +811,7 @@ RESPONSECODE CmdPowerOff(unsigned int re
+@@ -925,7 +925,7 @@ RESPONSECODE CmdPowerOff(unsigned int re
  
  	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
  	{
@@ -38,34 +38,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  		return_value = IFD_COMMUNICATION_ERROR;
  	}
  
-@@ -942,7 +942,7 @@ again_status:
- 			|| (OZ776_7772 == ccid_descriptor->readerID))
- 			&& (buffer[ERROR_OFFSET] == 0xFE)))
- #endif
+@@ -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 */
+ 	}
  
- 		/* card absent or mute is not an communication error */
- 		if (buffer[ERROR_OFFSET] != 0xFE)
-@@ -1028,7 +1028,7 @@ RESPONSECODE CCID_Transmit(unsigned int 
- 		int r;
- 
- 		/* Xfr Block */
--		r = ControlUSB(reader_index, 0x21, 0x65, 0, tx_buffer, tx_length);
-+		r = ControlUSB(reader_index, 0x21, 0x65, 0, (unsigned char *) tx_buffer, tx_length);
- 
- 		/* we got an error? */
- 		if (r < 0)
-@@ -1050,7 +1050,7 @@ RESPONSECODE CCID_Transmit(unsigned int 
- 
- 		/* Xfr Block */
- 		DEBUG_COMM2("chain parameter: %d", rx_length);
--		r = ControlUSB(reader_index, 0x21, 0x65, rx_length << 8, tx_buffer,
-+		r = ControlUSB(reader_index, 0x21, 0x65, rx_length << 8, (unsigned char *) tx_buffer,
- 			tx_length);
- 
- 		/* we got an error? */
-@@ -1175,7 +1175,7 @@ time_request_ICCD_B:
+ 	return return_value;
+@@ -1278,7 +1278,7 @@ time_request_ICCD_B:
  
  			case 0x40:
  				/* Status Information */
@@ -74,7 +56,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  				return IFD_COMMUNICATION_ERROR;
  
  			case 0x80:
-@@ -1233,7 +1233,7 @@ time_request:
+@@ -1336,7 +1336,7 @@ time_request:
  
  	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
  	{
@@ -83,7 +65,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
  		switch (cmd[ERROR_OFFSET])
  		{
  			case 0xEF:	/* cancel */
-@@ -1966,7 +1966,7 @@ RESPONSECODE SetParameters(unsigned int 
+@@ -2083,7 +2083,7 @@ RESPONSECODE SetParameters(unsigned int 
  
  	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
  	{
diff --git a/security/ccid/patches/patch-ad b/security/ccid/patches/patch-ad
index 86ac119729f..0e967ede7d4 100644
--- a/security/ccid/patches/patch-ad
+++ b/security/ccid/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
+$NetBSD: patch-ad,v 1.2 2012/12/15 00:29:31 pettai Exp $
 
---- src/ccid_usb.c.orig	2008-02-08 02:16:38.000000000 -0700
+--- src/ccid_usb.c.orig	2012-12-11 19:45:39.000000000 +0000
 +++ src/ccid_usb.c
-@@ -880,7 +880,7 @@ int InterruptRead(int reader_index)
- 					usbDevice[reader_index].filename, strerror(errno));
- 	}
- 	else
--		DEBUG_XXD("NotifySlotChange: ", buffer, ret);
-+		DEBUG_XXD("NotifySlotChange: ", (const unsigned char *) buffer, ret);
+@@ -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;
  
- 	return ret;
- } /* InterruptRead */
+ 		case LIBUSB_TRANSFER_TIMED_OUT: