A major version bump gives a long changelog...

1.7.4:
- Fix a stupid bug from the previous version. T=1 cards were not
  working.

1.7.3:
- COPYING: Add my name as copyright holder
- hotplug libudev: support libudev >= 171
- hotplug libusb: Fix a memory leak
- pcscd: exit immediately in case of SIGTERM
  Closes Debian bug #620305 "pcscd slows down shutdown/restart"
- Send logs to stdout instead of stderr
  It is now possible to use tee(1) to redirect logs in a file without
  first redirecting stderr to stdout
- Add command line option -T, --color: force use of colored logs
  The idea is to have colored logs even if they are redirected to a file
  or a pipe.
- Define g_rgSCardT?Pci as const structures to be more Windows like
  I do not expect a regression or compilation problem in WinSCard API
  users but how knows...
- log at level PCSC_LOG_DEBUG instead of PCSC_LOG_ERROR to avoid filling
  the system log file
- Remove the deprecated define FEATURE_MCT_READERDIRECT (replaced by
  FEATURE_MCT_READER_DIRECT)
- better Hurd support
- some other minor improvements and bug corrections

1.7.2:
- fix a crash if a specific driver fails to work and no class driver is
  available

1.7.1
- use libudev only on Linux and libusb elsewhere. The configuration now
  works by default on GNU/kFreeBSD systems
- Try to use a (CCID) class driver if a specific driver fails to use the
  reader.
- fix a potential crash

1.7.0:
- use libudev instead of (the deprecated) libhal

1.6.7:
- better Mac OS X support
- Fix Alioth bug [#312960] SCardDisconnect when other context has transaction
- add support of multi-interfaces readers with libusb and not just libhal
- add a API tracing feature in the client side (#define DO_TRACE)
- allow the use of tracing and profiling features from different
  application threads
- fix a problem with a multi-slots reader
- fix minor problems detected by the clang tool
- some other minor improvements and bug corrections

1.6.6:
- SCardGetStatusChange(): fix a bug on 64-bits systems
- Fix another bug because of a regression in internal list manager

1.6.5:
- Power on the card _only_ if an application requests a connection.
  You can disable the feature using DISABLE_ON_DEMAND_POWER_ON in
  src/pcscd.h.in
  If DISABLE_AUTO_POWER_ON is defined then do not automatically power on
  the card. The card will be powered on on the first SCardConnect()
  See http://ludovicrousseau.blogspot.com/2010/10/card-auto-power-on-and-off.html
- SCardReconnect(): return SCARD_E_NO_SMARTCARD when card is removed and
  SCARD_W_UNRESPONSIVE_CARD when card is unresponsive instead of
  SCARD_E_PROTO_MISMATCH
- Install pcscd as sgid pcscd instead of suid root
  See http://ludovicrousseau.blogspot.com/2010/09/pcscd-auto-start.html
- SCardSetTimeout() is no more provided. This function is not provided
  by Microsoft and is deprecated since 2004 in pcsc-lite.
- SCardCancelTransaction() is no more provided. This function is not
  provided by Microsoft and is deprecated since 2005 in pcsc-lite.
- Parsing the CCID Info.plist (159 readers supported) was, on a i386
  machine, done in 264306 #s and is now done 5547 #s => gain x47 or 4600%
  See http://ludovicrousseau.blogspot.com/2010/08/ram-and-cpu-improvements-in-pcsc-lite.html
- It is now possible to configure the local socket name to use using the
  environment variable PCSCLITE_CSOCK_NAME
  See http://ludovicrousseau.blogspot.com/2010/11/pcsc-client-and-server-on-two-different.html
- Wait until all connected readers have a chance to power up a possibly
  inserted card before accepting clients.
- restrict pcscd features when not run by root (so using suid): APDU
  logging or setting parameters are disabled for example
- fix compilation problem on kfreebsd-* systems
- PCSC/reader.h: HOST_TO_CCID_16() and HOST_TO_CCID_32() are now
  identity functions
  Since libccid 1.4.1 (revision 5252) the byte order is no more important
- If you want to use IFDHCreateChannel() instead of
  IFDHCreateChannelByName() then do not use any DEVICENAME line in the
  configuration file. IFDHCreateChannel() will then be called with the
  CHANNELID parameter.
- the CHANNELID parameter can also be a decimal number.
- Remove the support of IFDHandler v1 API. I don't know any driver using
  this API.
  See http://ludovicrousseau.blogspot.com/2010/10/ifdhandler-version-1-support-removed.html
- avoids a buffer overflow with badly formed ATR
- some other minor improvements and bug corrections

1.6.4:
- Do not use sysconfdir as configuration directory but
  "${sysconfdir}/reader.conf.d" instead.
  Use --enable-confdir=DIR if you want to set a specific value without
  the "reader.conf.d" appended.

1.6.3:
- "/reader.conf.d" is only appended to sysconfdir if no value of
  sysconfdir is provided
- Define LPSCARD_READERSTATE since this is used in the MSDN prototype.
  Use LPSCARD_READERSTATE in winscard.h instead of (SCARD_READERSTATE *)
  to mimic the MSDN API.
- fix a pcscd crash when the application uses a PCSC handle after a
  fork. The crash was with openvpn.
- some other minor improvements and bug corrections

1.6.2:
- implement a "Forced suicide" mechanism.
  After 3 Ctrl-C without much reaction from pcscd (in fact the drivers)
  we force the suicide. Sometimes libusb is blocked in a kind of
  dead-lock and kill -9 was the only option.
- Add support of TAG_IFD_STOP_POLLING_THREAD to request the stop of the
  driver polling function.
- Avoid a division by 0. Closes [#312555] "simclist bug in pcsc-lite"
- if pcscd is stared by libpcsclite then close all file handles except
  stdin, stdout and stderr so that pcscd does not confiscate ressources
  allocated by the application
- in case of auto exit create a new session so that Ctrl-C on the
  application will not also quit pcscd
- src/hotplug_libusb.c: port from libusb-0.1 to libusb-1.0
- default configuration is now $sysconfdir/reader.conf.d
- fix crash with empty config dir
- src/PCSC/winscard.h: Remove definitions of SCARD_READERSTATE_A
  PSCARD_READERSTATE_A and LPSCARD_READERSTATE_A types
- some other minor improvements and bug corrections

1.6.1:
- SCardControl(): do not check for card events since we are talking to
  the reader not the card. A smart card removal should not make
  SCardControl() fail with SCARD_W_REMOVED_CARD
- pcscd do not timeout any more after 2 minutes of inactivity. If the
  other side of the socket dies we will get an error from the kernel.
  The problem was that if a client does nothing during
  PCSCLITE_READ_TIMEOUT (120 seconds by default) then pcscd considers it
  as a dead client and closes the connection. I guess this problem was
  present since the first version of pcsc-lite but nobody complained
  before.
- pcscd: do not return before most of the initialisation are done
  correctly. The idea is that pcscd can return an error code if the
  daemon fails to start correctly (hald not started for example).
  Before the patch pcscd became a daemon, then returned 0 (success) and
  then continued with the initialisation. If the initialisation failed
  it was too late to return an error code. The /etc/init.d/pcscd script
  was not aware of the failure.
  Closes https://bugzilla.redhat.com/show_bug.cgi?id=580321
  "/usr/sbin/pcscd exit codes broken"
- src/hotplug_libusb.c: Add a synchronisation so that if pcscd is auto
  started the initial reader list is available before the server takes
  commands from clients.
  Before the change early calls of SCardListReaders() returned an empty
  list of readers even if a reader was connected.
- SCardConnect() & SCardReconnect(): do not reset the cardProtocol in
  SCARD_SHARE_DIRECT case since the card have _not_ been reseted. A new
  PPS negociation would fail.
- Do not install files in /etc any more. Serial drivers are rare now.
- Avoids a crash if a client sends a unknown command.
- some other minor improvements and bug corrections

1.6.0:
- redesign the client/server communication:
  * no more shared memory used (allow pcscd and libpcsclite1.so to be on
  different computer and talk over a network)
  * no more difference between short and extended APDU
  * no more use of a /var/run/pcscd/pcscd.events/ directory. events are
  sent through the socket
  * simpler command format between client and server
  The side effect is that you are not able to mix an old pcscd with a
  new libpcsclite1.so or the reverse. SCardEstablishContext() will fail
  unless you update both sides of the communication.
- Use lists instead of fixed size arrays to store handles.
  It is now possible to have:
  - 200 simultaneous PC/SC clients instead of 16
  - 200 SCardConnect per client instead of 16
  - 200 clients per reader instead of 16
  The default value of 200 can be changed by giving an argument to pcscd
  --max-thread --max-card-handle-per-thread --max-card-handle-per-reader
- Make SCardReconnect(), SCardStatus() and SCardTransmit() block instead
  of returning SCARD_E_SHARING_VIOLATION immediately. These functions
  will then behave like on Windows.
  This can happen if these functions are called when the reader is
  locked by a PCSC transaction
  (SCardBeginTransaction/SCardEndTransaction).
  You can define the environment variable PCSCLITE_NO_BLOCKING to use
  the old behavior.
  http://archives.neohapsis.com/archives/dev/muscle/2010-q1/0041.html
- SCardEstablishContext(): try to start the pcscd daemon if not already
  running.
  . pcscd will suicide itself after 60 seconds of inactivity if it is
  started using --auto-exit. This is the default behavior when pcscd is
  started by libpcsclite
  . Set PCSCLITE_PCSCD_ARGS with the argument you want to pass to pcscd in
  autostart Only one argument is passed. The space character is not a
  separator. example: export PCSCLITE_PCSCD_ARGS=-dfa
- SCardListReaders(): can use SCARD_AUTOALLOCATE
- SCardGetAttrib(): return SCARD_E_INSUFFICIENT_BUFFER if the driver
  returns IFD_ERROR_INSUFFICIENT_BUFFER
  . add support of SCARD_ATTR_DEVICE_FRIENDLY_NAME as it is better
  implemented in pcscd (it knows the friendly name)
- SCardGetStatusChange(): Calling with cReaders == 0 will now just
  return SCARD_S_SUCCESS
  . Use the special reader name "\\?PnP?\Notification" to wait for a
  reader event notification
- SCardTransmit(): do not limit the minimum size of an APDU to 4 bytes.
  non ISO 7816-4 compliant cards (like Mifare DESFIRE) may use shorter
  commands
- SCardStatus(): returns SCARD_E_SHARING_VIOLATION if the reader is
  already used More conform to Windows
- PCSC/reader.h: update sruct PIN_PROPERTIES_STRUCTURE to be conform
  with Revision 2.02.06, April 2009 of PCSCv2 part 10 Fields
  wLcdMaxCharacters and wLcdMaxLines have been removed
  . rename FEATURE_MCT_READERDIRECT in FEATURE_MCT_READER_DIRECT to be
  conform with ch. 2.3 of PCSC v2 part 10
  . add FEATURE_GET_TLV_PROPERTIES and FEATURE_CCID_ESC_COMMAND from
  PC/SC part 10 v2.02.07 March 2010
  . Add PCSCv2_PART10_PROPERTY_* defines
- SCardControl() return SCARD_E_UNSUPPORTED_FEATURE if the driver
  returned IFD_ERROR_NOT_SUPPORTED or IFD_NOT_SUPPORTED This is used to
  separate an unsupported value of ControlCode from a general error
- Use the standard --sysconfdir=DIR ($prefix/etc by default) instead of
  --enable-confdir=DIR for defining the directory containing reader.conf
- remove SCF support (PC/SC over Smart Card Framework). I never used
  this feature and SCF is now dead and replaced by JSR 268
  (javax.smartcardio)
- Better handling of PCSCLITE_STATIC_DRIVER as can be used on platforms
  using #Clinux (without dynamic loader).  This is used to statically
  link the reader driver to pcscd. Since the link is static you must
  define the IFDHandler API version at compilation time. Either define
  IFDHANDLERv1, IFDHANDLERv2 or IFDHANDLERv3
- Use dynamic instead of static allocation for the driver library
  filename. The filename is no more limited to 100 characters.
  Closes: [#312332] MAX_LIBNAME too short?
- force the return codes SCARD_* to be long since the SCard* functions
  return a LONG type
- Add the ability to parse all the configuration files of a directory
  instead of just one configuration file. update-reader.conf is then now
  obsolete.
- Add --enable-embedded (default is no) to build pcsc-lite for an
  embedded system. This will activate the NO_LOG option to disable
  logging and limit RAM and disk consumption.
- If NO_LOG is defined then no log are displayed. The idea is to limit
  the binaries size on disk and RAM consumption at execution time.
  With NO_LOG defined we gain 26% (17 kB) for the .text segment of pcscd
  and 15% (4 kB) for the .text segment of libpcsclite.so (for i386)
- Define a minimal pcsc_stringify_error() if NO_LOG is defined. Only the
  error code in hex is displayed in this case.
  Gain: 2kB of .text (10%) for libpcsclite
- Add --disable-serial and --disable-usb options
  --disable-serial removes support of /etc/reader.conf gain: 8.0kB of
  .text (12%) and 160 bytes of .bss (4%) for pcscd
  --disable-usb removes support of USB hotplug gain: 9.7kB of .text
  (14%) and 960 bytes of .bss (23%) for pcscd
  If you use both options (and use a static driver configuration) gain:
  17.7kB of .text (26%) and 1152 bytes of .bss (28%) for pcscd
- Better support of Android
- some other minor improvements and bug corrections

16 files changed, 68 insertions, 212 deletions

diff --git a/security/pcsc-lite/DEINSTALL b/security/pcsc-lite/DEINSTALL
deleted file mode 100644
index acd68703fbb..00000000000
--- a/security/pcsc-lite/DEINSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $NetBSD: DEINSTALL,v 1.1 2009/10/02 12:36:13 hasso Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	${RM} -f @PKG_SYSCONFDIR@/reader.conf
-	;;
-esac
diff --git a/security/pcsc-lite/INSTALL b/security/pcsc-lite/INSTALL
deleted file mode 100644
index 8105728af7f..00000000000
--- a/security/pcsc-lite/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $NetBSD: INSTALL,v 1.1 2009/10/02 12:36:13 hasso Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${PREFIX}/sbin/update-reader.conf
-	;;
-esac
diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index 07327cdb498..00132e697a3 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/11/30 14:28:55 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2012/12/14 23:50:33 pettai Exp $
 #
 
-DISTNAME=	pcsc-lite-1.5.5
-PKGREVISION=	4
+DISTNAME=	pcsc-lite-1.7.4
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3082/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3598/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
@@ -17,29 +16,23 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
-.include "options.mk"
-
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--enable-confdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--enable-confdir=${PKG_SYSCONFDIR:Q}/reader.conf.d
 CONFIGURE_ARGS+=	--enable-ipcdir=${VARBASE}/pcsc-lite
 CONFIGURE_ARGS+=	--enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
-CONFIGURE_ARGS+=	--disable-libhal
 MAKE_DIRS+=		${VARBASE}/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite/drivers
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/reader.conf.d
 
 EGDIR=			${PREFIX}/share/examples/pcsc-lite
-CONF_FILES+=		${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf.d/reader.conf
 
 PKGCONFIG_OVERRIDE+=	src/libpcsclite.pc.in
 
 BUILD_DEFS+=		VARBASE
 INSTALLATION_DIRS=	${EGDIR}
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf ${DESTDIR}${EGDIR}
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pcsc-lite/PLIST b/security/pcsc-lite/PLIST
index bd4b884b63a..8a6deac65ad 100644
--- a/security/pcsc-lite/PLIST
+++ b/security/pcsc-lite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/02 12:36:13 hasso Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/12/14 23:50:33 pettai Exp $
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
 include/PCSC/pcsclite.h
@@ -9,11 +9,5 @@ lib/libpcsclite.la
 lib/pkgconfig/libpcsclite.pc
 man/man5/reader.conf.5
 man/man8/pcscd.8
-man/man8/update-reader.conf.8
 sbin/pcscd
-sbin/update-reader.conf
 share/doc/pcsc-lite/README.DAEMON
-share/doc/pcsc-lite/ifdhandler-3.tex
-share/doc/pcsc-lite/pcsc-lite.bib
-share/doc/pcsc-lite/pcsc-lite.tex
-share/examples/pcsc-lite/reader.conf
diff --git a/security/pcsc-lite/buildlink3.mk b/security/pcsc-lite/buildlink3.mk
index 34033eec5c1..d5b720fd891 100644
--- a/security/pcsc-lite/buildlink3.mk
+++ b/security/pcsc-lite/buildlink3.mk
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/12/14 23:50:33 pettai Exp $
 
 BUILDLINK_TREE+=	pcsc-lite
 
 .if !defined(PCSC_LITE_BUILDLINK3_MK)
 PCSC_LITE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pcsc-lite+=	pcsc-lite>=1.4.99
+BUILDLINK_API_DEPENDS.pcsc-lite+=	pcsc-lite>=1.6.5
 BUILDLINK_PKGSRCDIR.pcsc-lite?=	../../security/pcsc-lite
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .endif # PCSC_LITE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-pcsc-lite
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index 2fb0a8188f5..a921b67f3e0 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.11 2012/11/30 14:28:55 gdt Exp $
+$NetBSD: distinfo,v 1.12 2012/12/14 23:50:33 pettai Exp $
 
-SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e
-RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e
-Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes
-SHA1 (patch-aa) = 71f39c897a104a87e5d3cbc031e1fdb4af7de272
-SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e
-SHA1 (patch-ac) = 1abf0c4bb7199998fb8d81ef8514f8f80f460ccc
-SHA1 (patch-configure) = 6b7f6b9333a93b731822456cec980c11bba27ba6
-SHA1 (patch-configure.in) = 35622b5461da2f31f1da0b151241a664848b15cd
-SHA1 (patch-src_Makefile.am) = 1bc3f82848accf2fe372a18a82ff915b0f8daac2
-SHA1 (patch-src_Makefile.in) = 885dec5cbc389b237e32b5cc72332a6ae001398e
+SHA1 (pcsc-lite-1.7.4.tar.bz2) = 6b815a1367390921ce4935f97de5cacb6965c9a7
+RMD160 (pcsc-lite-1.7.4.tar.bz2) = 0bec1904894e7b04cbeca8f60da35b64ac950279
+Size (pcsc-lite-1.7.4.tar.bz2) = 503848 bytes
+SHA1 (patch-configure) = af17586545a8c12a0d5ce649e28d525d56779a60
+SHA1 (patch-src_Makefile.in) = 213d54a70dff6aec55ccd74aeb721600aff6978b
+SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717
 SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67
-SHA1 (patch-src_thread_unix.c) = f12b233d3604e11694a38826b987470f6fb407e4
+SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a
diff --git a/security/pcsc-lite/options.mk b/security/pcsc-lite/options.mk
deleted file mode 100644
index c2d37cd1105..00000000000
--- a/security/pcsc-lite/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.pcsc-lite
-PKG_SUPPORTED_OPTIONS=	extendedapdu
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mextendedapdu)
-CONFIGURE_ARGS+=	--enable-extendedapdu
-.else
-CONFIGURE_ARGS+=       --enable-extendedapdu=no
-.endif
diff --git a/security/pcsc-lite/patches/patch-ab b/security/pcsc-lite/patches/patch-ab
deleted file mode 100644
index cac9d77cc7f..00000000000
--- a/security/pcsc-lite/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/10/02 12:36:13 hasso Exp $
-
---- etc/Makefile.in.orig	2009-10-02 14:30:34 +0300
-+++ etc/Makefile.in	2009-10-02 14:31:11 +0300
-@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- usbdropdir = @usbdropdir@
--conf_DATA = reader.conf
-+conf_DATA =
- sbin_SCRIPTS = update-reader.conf
- EXTRA_DIST = StartupParameters.plist SmartcardServices
- all: all-am
diff --git a/security/pcsc-lite/patches/patch-ac b/security/pcsc-lite/patches/patch-ac
deleted file mode 100644
index 94de59ca4f0..00000000000
--- a/security/pcsc-lite/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/12/17 17:00:35 shannonjr Exp $
-
---- src/atrhandler.c.orig	2009-07-28 20:57:07.000000000 +0000
-+++ src/atrhandler.c
-@@ -239,6 +239,13 @@ short ATRDecodeAtr(PSMARTCARD_EXTENSION 
- 	if (psExtension->CardCapabilities.AvailableProtocols & SCARD_PROTOCOL_T1)
- 		TCK = pucAtr[p++];
- 
-+        /*
-+	 * The following 2 lines were backported from PCSC-lite version 1.6.6
-+         * to correct buffer overflow vulnerability.
-+         */
-+	if (p > MAX_ATR_SIZE)
-+                return 0;       /** @retval 0 Maximum attribute size */
-+
- 	memcpy(psExtension->ATR.Value, pucAtr, p);
- 	psExtension->ATR.Length = p;	/* modified from p-1 */
- 
diff --git a/security/pcsc-lite/patches/patch-configure b/security/pcsc-lite/patches/patch-configure
index 66bd108178c..1789c2ae7f8 100644
--- a/security/pcsc-lite/patches/patch-configure
+++ b/security/pcsc-lite/patches/patch-configure
@@ -1,38 +1,34 @@
-$NetBSD: patch-configure,v 1.1 2012/10/24 09:01:40 manu Exp $
+$NetBSD: patch-configure,v 1.2 2012/12/14 23:50:36 pettai Exp $
 
 Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden
 
-
---- ./configure.orig	2012-10-24 06:24:27.000000000 +0200
-+++ ./configure	2012-10-24 06:39:49.000000000 +0200
-@@ -823,8 +823,10 @@
- LIBTOOL
+--- configure.orig	2012-12-11 21:43:14.000000000 +0000
++++ configure
+@@ -654,6 +654,8 @@ LIBTOOL
  PTHREAD_CFLAGS
  PTHREAD_LIBS
  PTHREAD_CC
 +LIBPCSC_PTHREAD_CFLAGS
 +LIBPCSC_PTHREAD_LIBS
  acx_pthread_config
- PKG_CONFIG
- LEXLIB
- LEX_OUTPUT_ROOT
-@@ -6135,8 +6137,18 @@
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
+@@ -13327,7 +13329,7 @@ fi
  
  
- CC="$PTHREAD_CC"
+ # disable libudev check is USB is not used
+-if test "$use_usb" == "no"; then
++if test "$use_usb" = "no"; then
+ 	use_libudev="no"
+ fi
  
-+case `uname` in
-+NetBSD)
-+	LIBPCSC_PTHREAD_LIBS=''
-+	LIBPCSC_PTHREAD_CFLAGS=''
-+	;;
-+*)
-+	LIBPCSC_PTHREAD_LIBS=$PTHREAD_LIBS
-+	LIBPCSC_PTHREAD_CFLAGS=$PTHREAD_CFLAGS
-+	;;
-+esac
+@@ -13484,7 +13486,7 @@ fi
  
  
+ # disable libusb check is USB is not used
+-if test "$use_usb" == "no"; then
++if test "$use_usb" = "no"; then
+ 	use_libusb="no"
+ fi
  
- # Add libtool support
diff --git a/security/pcsc-lite/patches/patch-configure.in b/security/pcsc-lite/patches/patch-configure.in
deleted file mode 100644
index 8c47ae49565..00000000000
--- a/security/pcsc-lite/patches/patch-configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2012/11/30 14:28:55 gdt Exp $
-
-Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
-loading libpthread.so through dlopen() is now forbidden.
-
-This should be addressed upstream, but may be controversial.
-
---- ./configure.in.orig	2012-10-24 06:33:56.000000000 +0200
-+++ ./configure.in	2012-10-24 06:36:19.000000000 +0200
-@@ -75,8 +75,22 @@
- 
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(PTHREAD_CFLAGS)
- 
-+case `uname` in
-+NetBSD)
-+	LIBPCSC_PTHREAD_LIBS=''
-+	LIBPCSC_PTHREAD_CFLAGS=''
-+	;;
-+*)
-+	LIBPCSC_PTHREAD_LIBS=$PTHREAD_LIBS
-+	LIBPCSC_PTHREAD_CFLAGS=$PTHREAD_CFLAGS
-+	;;
-+esac
-+
-+AC_SUBST(LIBPCSC_PTHREAD_LIBS)
-+AC_SUBST(LIBPCSC_PTHREAD_CFLAGS)
-+
- # Add libtool support
- AM_PROG_LIBTOOL
- # Automatically update the libtool script if it becomes out-of-date
- #AC_SUBST(LIBTOOL_DEPS)
diff --git a/security/pcsc-lite/patches/patch-src_Makefile.am b/security/pcsc-lite/patches/patch-src_Makefile.am
deleted file mode 100644
index 32a8989e82d..00000000000
--- a/security/pcsc-lite/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2012/11/30 14:28:55 gdt Exp $
-
-Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
-loading libpthread.so through dlopen() is now forbidden.
-
---- ./src/Makefile.am.orig	2012-10-24 06:33:12.000000000 +0200
-+++ ./src/Makefile.am	2012-10-24 06:33:37.000000000 +0200
-@@ -30,11 +30,11 @@
- 	thread_unix.c \
- 	utils.c \
- 	winscard_msg.c
- libpcsclite_la_LDFLAGS = -version-info 1:0:0
--libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE
-+libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE
- libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \
--	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-+	$(LIBPCSC_PTHREAD_CFLAGS) $(LIBPCSC_PTHREAD_LIBS)
- 
- pcscd_SOURCES = \
- 	atrhandler.c \
- 	atrhandler.h \
diff --git a/security/pcsc-lite/patches/patch-src_Makefile.in b/security/pcsc-lite/patches/patch-src_Makefile.in
index 3a6c9ca62fe..bb874b57878 100644
--- a/security/pcsc-lite/patches/patch-src_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_Makefile.in
@@ -1,12 +1,11 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2012/11/30 14:28:55 gdt Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2012/12/14 23:50:36 pettai Exp $
 
 Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden.
 
---- ./src/Makefile.in.orig	2012-10-24 06:31:51.000000000 +0200
-+++ ./src/Makefile.in	2012-10-24 06:33:06.000000000 +0200
-@@ -220,8 +220,10 @@
- PKG_CONFIG = @PKG_CONFIG@
+--- src/Makefile.in.orig	2012-12-12 09:03:13.000000000 +0000
++++ src/Makefile.in
+@@ -249,6 +249,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
  PTHREAD_CC = @PTHREAD_CC@
  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
  PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -15,18 +14,14 @@ loading libpthread.so through dlopen() is now forbidden.
  RANLIB = @RANLIB@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-@@ -311,11 +313,11 @@
- 	utils.c \
+@@ -340,8 +342,8 @@ libpcsclite_la_SOURCES = \
  	winscard_msg.c
  
  libpcsclite_la_LDFLAGS = -version-info 1:0:0
--libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE
-+libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE
- libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \
--	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-+	$(LIBPCSC_PTHREAD_CFLAGS) $(LIBPCSC_PTHREAD_LIBS)
- 
+-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE
+-libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
++libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE
++libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS)
  pcscd_SOURCES = \
  	atrhandler.c \
  	atrhandler.h \
diff --git a/security/pcsc-lite/patches/patch-aa b/security/pcsc-lite/patches/patch-src_PCSC_reader.h
index d3d4b01372a..a4cef4e87ca 100644
--- a/security/pcsc-lite/patches/patch-aa
+++ b/security/pcsc-lite/patches/patch-src_PCSC_reader.h
@@ -1,12 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2012/11/30 14:28:55 gdt Exp $
+$NetBSD: patch-src_PCSC_reader.h,v 1.1 2012/12/14 23:50:36 pettai Exp $
 
 Add NetBSD to apple/sun conditional.
-
 This should be sent upstream.
 
---- src/PCSC/reader.h.in.orig	2009-03-24 21:41:03 +0200
-+++ src/PCSC/reader.h.in	2009-04-30 09:03:08 +0300
-@@ -126,7 +126,7 @@
+--- src/PCSC/reader.h.orig	2011-06-22 06:38:16.000000000 +0000
++++ src/PCSC/reader.h
+@@ -128,7 +128,7 @@
  
  /* Set structure elements aligment on bytes
   * http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */
diff --git a/security/pcsc-lite/patches/patch-src_thread_unix.c b/security/pcsc-lite/patches/patch-src_thread_unix.c
deleted file mode 100644
index fbab9987650..00000000000
--- a/security/pcsc-lite/patches/patch-src_thread_unix.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_thread_unix.c,v 1.2 2012/11/30 14:28:55 gdt Exp $
-
-Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
-loading libpthread.so through dlopen() is now forbidden.
-
---- ./src/thread_unix.c.orig	2012-10-24 06:22:45.000000000 +0200
-+++ ./src/thread_unix.c	2012-10-24 06:23:57.000000000 +0200
-@@ -58,9 +58,9 @@
- 		return pthread_mutex_unlock(mMutex);
- 	else
- 		return -1;
- }
--
-+#ifndef LIBPCSCLITE
- INTERNAL int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
- 	PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
- {
- 	pthread_attr_t attr;
-@@ -120,5 +120,5 @@
- INTERNAL int SYS_ThreadSetCancelType(int type, int *oldtype)
- {
- 	return pthread_setcanceltype(type, oldtype);
- }
--
-+#endif /* LIBPCSCLITE */ 
diff --git a/security/pcsc-lite/patches/patch-src_utils.c b/security/pcsc-lite/patches/patch-src_utils.c
new file mode 100644
index 00000000000..d788ff5d10b
--- /dev/null
+++ b/security/pcsc-lite/patches/patch-src_utils.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_utils.c,v 1.1 2012/12/14 23:50:36 pettai Exp $
+
+Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
+loading libpthread.so through dlopen() is now forbidden.
+
+--- src/utils.c.orig	2012-12-12 09:49:16.000000000 +0000
++++ src/utils.c
+@@ -117,6 +117,7 @@ long int time_sub(struct timeval *a, str
+ 	return r.tv_sec * 1000000 + r.tv_usec;
+ } /* time_sub */
+ 
++#ifndef LIBPCSCLITE
+ int ThreadCreate(pthread_t * pthThread, int attributes,
+ 	PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
+ {
+@@ -142,3 +143,4 @@ int ThreadCreate(pthread_t * pthThread, 
+ 	ret = pthread_attr_destroy(&attr);
+ 	return ret;
+ }
++#endif /* LIBPCSCLITE */