cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ccid-1.4.22

Browse Source
This commit is contained in:
dcoppa 2016-01-11 14:24:03 +00:00
parent a3a0466ac2
commit 3010708f94
4 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/ccid/Makefile
View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2015/11/03 13:55:31 dcoppa Exp $
# $OpenBSD: Makefile,v 1.21 2016/01/11 14:24:03 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = USB Chip/Smart Card Interface Devices driver
DISTNAME = ccid-1.4.21
REVISION = 0
DISTNAME = ccid-1.4.22
CATEGORIES = security

4
security/ccid/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ccid-1.4.21.tar.bz2) = uzGuTGBU+mgMgfbRKltl5tPkNJTbz9t1k7uhotl/kZs=
SIZE (ccid-1.4.21.tar.bz2) = 568984
SHA256 (ccid-1.4.22.tar.bz2) = nFyL5GW20zMWvnp+pyDCSnduLXa+kHIRbSj8mt9YwQY=
SIZE (ccid-1.4.22.tar.bz2) = 578835

10
security/ccid/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2015/10/22 16:21:07 dcoppa Exp $
--- src/Makefile.in.orig Wed Oct 21 20:40:44 2015
+++ src/Makefile.in Thu Oct 22 18:17:22 2015
@@ -487,7 +487,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
$OpenBSD: patch-src_Makefile_in,v 1.7 2016/01/11 14:24:03 dcoppa Exp $
--- src/Makefile.in.orig Sun Jan 10 14:43:28 2016
+++ src/Makefile.in Mon Jan 11 14:41:24 2016
@@ -485,7 +485,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
towitoko/COPYING towitoko/README openct/LICENSE \
convert_version.pl 92_pcscd_ccid.rules
@ -9,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.6 2015/10/22 16:21:07 dcoppa Exp $
DISTCLEANFILES = tokenparser.c Info.plist
all: all-am
@@ -1194,13 +1193,12 @@ install_ccid: libccid.la Info.plist
@@ -1192,13 +1191,12 @@ install_ccid: libccid.la Info.plist
$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/
cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)

28
security/ccid/patches/patch-src_ifdhandler_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_ifdhandler_c,v 1.1 2015/11/03 13:55:31 dcoppa Exp $
commit 9a1932bed605fb3e38d9853449bb33b8791fa142
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
Date: Mon Oct 26 16:02:50 2015 +0100
CreateChannel(): cleanup in case of error
If the initialisation fails after the OpenPortByName() (during the check
and hack phases) then we need to correctly close the device.
The problem occured on OS X with a Gemalto Pinpad reader.
The ccid_open_hack_post() failed and the port was not closed.
usbDevice[reader_index].dev_handle was not set to NULL and the next
reader plug (any reader) failed because the index was already in use.
--- src/ifdhandler.c.orig Wed Oct 14 10:39:21 2015
+++ src/ifdhandler.c Tue Nov 3 14:50:46 2015
@@ -193,8 +193,7 @@ error:
if (return_value != IFD_SUCCESS)
{
/* release the allocated resources */
- free(CcidSlots[reader_index].readerName);
- ReleaseReaderIndex(reader_index);
+ IFDHCloseChannel(Lun);
}
return return_value;