Any reason this version has not been used earlier?
18 December 2017
- use libsystemd instead sd-daemon.{c,h}
- install_spy.sh: add support of Ubuntu
- spy: add support SCardStatus() with NULL pcbAtrLen
- Some other minor improvements
It also includes our cherry-picked upstream commit.
I came here to switch from Python 2 to 3; tests pass and pcscd(8) keeps
working with by YubiKey.
Python is only used for pcsc-py which we ship, but the tool is of
questionable quality anyway, so I doubt people actually use it:
$ pcsc-spy
^CCtrl-C, exiting.
Quit (core dumped)
This happens with both 1.8.22p3 and 1.8.23; both Python 2 and 3 dump
core - I did not look into this.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/pcsc-lite/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 12 Jul 2019 20:49:09 -0000 1.45
+++ Makefile 22 Oct 2019 12:22:27 -0000
@@ -2,9 +2,8 @@
COMMENT= resource manager for PC/SC
-V= 1.8.22
+V= 1.8.23
DISTNAME= pcsc-lite-${V}
-REVISION= 3
CATEGORIES= security
SHARED_LIBS+= pcsclite 1.0 # 1.0.0
@@ -12,7 +11,7 @@ SHARED_LIBS+= pcscspy 0.0 # 0.0.0
HOMEPAGE= https://salsa.debian.org/debian/pcsc-lite
-MASTER_SITES=
https://alioth-archive.debian.org/releases/pcsclite/pcsclite/1.8.22/
+MASTER_SITES=
https://alioth-archive.debian.org/releases/pcsclite/pcsclite/${V}/
EXTRACT_SUFX= .tar.bz2
@@ -22,6 +21,10 @@ PERMIT_PACKAGE= Yes
WANTLIB= c pthread usb-1.0
MODULES+= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+MODPY_BUILDDEP= No
+
+MODPY_ADJ_LINES= src/spy/pcsc-spy
# thread-local storage
COMPILER= base-clang ports-gcc
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/pcsc-lite/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 30 Jun 2017 10:50:53 -0000 1.20
+++ distinfo 22 Oct 2019 12:09:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.22.tar.bz2) =
ajWPYe07Zqf24fTnlKlMe+TIG3pY7DYMM3kejX2b1AU=
-SIZE (pcsc-lite-1.8.22.tar.bz2) = 751724
+SHA256 (pcsc-lite-1.8.23.tar.bz2) =
WicmJYbv85z9XBmq3IiR3XHAgY09YpU5vWMblYvmick=
+SIZE (pcsc-lite-1.8.23.tar.bz2) = 749922
Index: patches/patch-src_simclist_c
===================================================================
RCS file: patches/patch-src_simclist_c
diff -N patches/patch-src_simclist_c
--- patches/patch-src_simclist_c 11 Aug 2017 10:06:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_simclist_c,v 1.1 2017/08/11 10:06:01 dcoppa Exp $
-
-commit 8946edadaca353d65112664a5fcd7bbe1be54ed5
-Author: Ludovic Rousseau <[email protected]>
-Date: Wed Jul 12 17:59:48 2017 +0200
-
-simclist: fix a potential memory leak
-
-Changes in a801c6e613fde89c09c755a20003ab82fd6a5c47 added tests and
-returns in case of errors.
-
-If something fails in list_insert_at() we must free the memory allocated
-for the new element (that was not inserted).
-
-Index: src/simclist.c
---- src/simclist.c.orig
-+++ src/simclist.c
-@@ -508,7 +508,10 @@ int list_insert_at(list_t *restrict l, const void *dat
- size_t datalen = l->attrs.meter(data);
- lent->data = (struct list_entry_s *)malloc(datalen);
- if (NULL == lent->data)
-+ {
-+ free(lent);
- return -1;
-+ }
- memcpy(lent->data, data, datalen);
- } else {
- lent->data = (void*)data;
-@@ -517,7 +520,11 @@ int list_insert_at(list_t *restrict l, const void *dat
- /* actually append element */
- prec = list_findpos(l, pos-1);
- if (NULL == prec)
-+ {
-+ free(lent->data);
-+ free(lent);
- return -1;
-+ }
- succ = prec->next;
-
- prec->next = lent;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/pcsc-lite/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 12 Mar 2014 08:37:49 -0000 1.6
+++ pkg/PLIST 22 Oct 2019 12:12:07 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2014/03/12 08:37:49 dcoppa Exp $
+@rcscript ${RCDIR}/pcscd
bin/pcsc-spy
include/PCSC/
include/PCSC/debuglog.h
@@ -21,4 +22,3 @@ lib/pkgconfig/libpcsclite.pc
@comment share/doc/pcsc-lite/
@comment share/doc/pcsc-lite/README.DAEMON
@comment share/doc/pcsc-lite/README.polkit
-@rcscript ${RCDIR}/pcscd
