diff --git a/security/ccid/Makefile b/security/ccid/Makefile index 915c88ca92f..65da3d4164b 100644 --- a/security/ccid/Makefile +++ b/security/ccid/Makefile @@ -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 -DISTNAME = ccid-1.4.27 +V = 1.4.30 +DISTNAME = ccid-${V} CATEGORIES = security -REVISION = 1 +HOMEPAGE = https://ccid.apdu.fr/ -HOMEPAGE = https://pcsclite.apdu.fr/ - -MASTER_SITES = https://alioth-archive.debian.org/releases/pcsclite/ccid/ +MASTER_SITES = https://ccid.apdu.fr/files/ EXTRACT_SUFX = .tar.bz2 diff --git a/security/ccid/distinfo b/security/ccid/distinfo index 20b3c3b92a9..555d9c4222b 100644 --- a/security/ccid/distinfo +++ b/security/ccid/distinfo @@ -1,2 +1,2 @@ -SHA256 (ccid-1.4.27.tar.bz2) = pmDiaWBphsuUhArVuoAv+wzSPdErmPaaNQNeDeud0Tc= -SIZE (ccid-1.4.27.tar.bz2) = 632817 +SHA256 (ccid-1.4.30.tar.bz2) = rBcIe+CIgKDN+ZqKJ5mk7wBNxv+gi02bCtmV85pT/3w= +SIZE (ccid-1.4.30.tar.bz2) = 642342 diff --git a/security/ccid/patches/patch-src_Makefile_in b/security/ccid/patches/patch-src_Makefile_in index d41a41c5f25..127b3ab7bd4 100644 --- a/security/ccid/patches/patch-src_Makefile_in +++ b/security/ccid/patches/patch-src_Makefile_in @@ -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 --- src/Makefile.in.orig +++ 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 \ convert_version.pl 92_pcscd_ccid.rules @@ -10,19 +14,19 @@ Index: src/Makefile.in DISTCLEANFILES = tokenparser.c Info.plist all: all-am -@@ -1193,13 +1192,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) +@@ -1299,13 +1298,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)" - $(INSTALL_UDEV_RULE_FILE) install_ccidtwin: libccidtwin.la - $(mkinstalldirs) $(DESTDIR)$(ccidtwindir) - cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB) -- $(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \ -- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/ccid ; \ -+ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)$(datadir)/examples/ccid/libccidtwin + $(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)" + cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)" +- $(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \ +- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin" ++ $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/ccid" ; \ ++ 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 # use explicitely 'make uninstall_ccidtwin'