Update to ccid 1.4.30

Lots of changes incl. many firmware updates;  no issue with a
Yubikey NEO.
This commit is contained in:
kn 2019-11-17 13:11:58 +00:00
parent 211ea883bb
commit b60d5362d8
3 changed files with 23 additions and 20 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.30 2019/07/12 21:02:24 sthen Exp $ # $OpenBSD: Makefile,v 1.31 2019/11/17 13:11:58 kn Exp $
COMMENT = USB Chip/Smart Card Interface Devices driver COMMENT = USB Chip/Smart Card Interface Devices driver
DISTNAME = ccid-1.4.27 V = 1.4.30
DISTNAME = ccid-${V}
CATEGORIES = security CATEGORIES = security
REVISION = 1 HOMEPAGE = https://ccid.apdu.fr/
HOMEPAGE = https://pcsclite.apdu.fr/ MASTER_SITES = https://ccid.apdu.fr/files/
MASTER_SITES = https://alioth-archive.debian.org/releases/pcsclite/ccid/
EXTRACT_SUFX = .tar.bz2 EXTRACT_SUFX = .tar.bz2

View File

@ -1,2 +1,2 @@
SHA256 (ccid-1.4.27.tar.bz2) = pmDiaWBphsuUhArVuoAv+wzSPdErmPaaNQNeDeud0Tc= SHA256 (ccid-1.4.30.tar.bz2) = rBcIe+CIgKDN+ZqKJ5mk7wBNxv+gi02bCtmV85pT/3w=
SIZE (ccid-1.4.27.tar.bz2) = 632817 SIZE (ccid-1.4.30.tar.bz2) = 642342

View File

@ -1,8 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.10 2017/06/06 14:58:58 dcoppa Exp $ $OpenBSD: patch-src_Makefile_in,v 1.11 2019/11/17 13:11:58 kn Exp $
- avoid udev
- fix examples directory
Index: src/Makefile.in Index: src/Makefile.in
--- src/Makefile.in.orig --- src/Makefile.in.orig
+++ src/Makefile.in +++ src/Makefile.in
@@ -486,7 +486,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade @@ -517,7 +517,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
towitoko/COPYING towitoko/README openct/LICENSE openct/README \ towitoko/COPYING towitoko/README openct/LICENSE openct/README \
convert_version.pl 92_pcscd_ccid.rules convert_version.pl 92_pcscd_ccid.rules
@ -10,19 +14,19 @@ Index: src/Makefile.in
DISTCLEANFILES = tokenparser.c Info.plist DISTCLEANFILES = tokenparser.c Info.plist
all: all-am all: all-am
@@ -1193,13 +1192,12 @@ install_ccid: libccid.la Info.plist @@ -1299,13 +1298,12 @@ install_ccid: libccid.la Info.plist
$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/ $(mkinstalldirs) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/"
cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/ cp Info.plist "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/"
cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB) cp .libs/$(CCID_LIB) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)"
- $(INSTALL_UDEV_RULE_FILE) - $(INSTALL_UDEV_RULE_FILE)
install_ccidtwin: libccidtwin.la install_ccidtwin: libccidtwin.la
$(mkinstalldirs) $(DESTDIR)$(ccidtwindir) $(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)"
cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB) cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
- $(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \ - $(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \
- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin - perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin"
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/ccid ; \ + $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/ccid" ; \
+ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)$(datadir)/examples/ccid/libccidtwin + perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)$(datadir)/examples/ccid/libccidtwin"
# do not uninstall the serial driver by default # do not uninstall the serial driver by default
# use explicitely 'make uninstall_ccidtwin' # use explicitely 'make uninstall_ccidtwin'