From 985665c6306a5aadb69c51a8bb2c564b27ffb8789b8cbd2f355e60baf5b4e6e6 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 17 Jun 2024 06:45:33 +0000 Subject: [PATCH] Accepting request 1179192 from home:DocB:branches:security:chipcard - Version 1.6.0 - uses meson build system now - Add support of - Aladdin R.D. JCR SecurBio - AvidCard CAC Smart Card Reader - FujitsuTechnologySolutions GmbH Dual Smartcard Reader D321 - Ledger Stax - NXP Pegoda 3 - authenton #1- CTAP2.1 - provide files for meson build tool (replaces autoconf/automake) - Add possibility to set/get NAD on T=1 for MEP - multi-slots readers - Better handling of reader removal - Use CLOCK_MONOTONIC for timeouts - Some other minor improvements OBS-URL: https://build.opensuse.org/request/show/1179192 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-ccid?expand=0&rev=107 --- ccid-1.5.5.tar.bz2 | 3 --- ccid-1.5.5.tar.bz2.asc | 16 ---------------- ccid-1.6.0.tar.xz | 3 +++ ccid-1.6.0.tar.xz.asc | 16 ++++++++++++++++ pcsc-ccid.changes | 19 +++++++++++++++++++ pcsc-ccid.spec | 28 ++++++++++++++-------------- 6 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 ccid-1.5.5.tar.bz2 delete mode 100644 ccid-1.5.5.tar.bz2.asc create mode 100644 ccid-1.6.0.tar.xz create mode 100644 ccid-1.6.0.tar.xz.asc diff --git a/ccid-1.5.5.tar.bz2 b/ccid-1.5.5.tar.bz2 deleted file mode 100644 index f80aee7..0000000 --- a/ccid-1.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca -size 708374 diff --git a/ccid-1.5.5.tar.bz2.asc b/ccid-1.5.5.tar.bz2.asc deleted file mode 100644 index 0c8d723..0000000 --- a/ccid-1.5.5.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmWX0JUACgkQeKG03+j5 -xX6sVw//c8Ch1dJwXBWcaPLbyhLJYmoCs2OzMQnFYegh0+CWVgiEwkvZRPww3sCJ -tddyPrQBk1Zz97UCEKJxF7euPk9+9fS1JboQIMAwsktWeih9AZPZt1+MuX/uWoM1 -+10iw9QxKBqhMANUc26B3TQx0n+kYETYr1XTQnW0qBofgJYsm8RU3gA8Mmyhx/qI -tFENsvyhTqm6h3gv5bwZvv6MgKcuZVNybMFA+Lc1jDEASHXo+CPzcYaxHCPk2Wjt -ty9DCAifbyiublk81UNzrOjJQg+/93Jp+1+b+CgcHrSqfjvnTPewHTrQaUszE4WB -vZXAoGivGJSf21+FSwzxXKMgg+KKXvh5hYyl/NO6CdEfdO+oMJ3qI0XyvGqLhOi/ -o2k8Xuq94I1AljPeAz77eF/sE0JmnUeGXdNQaSLIPpWCFEEQf1aNWJnZC+fRTuPA -RvH7HeI/VmMpka2HofeG0l4J9xd3XlQDA4QaFzVolMfUViSyzpiCLA2w7NiJwwkZ -b0RmbMy8SLcM7ChVnTyN/J3PITNByDHGjKM7Kget/ppjwUYUwD6tP4KNW8eO63D6 -UiBRQ/avKUV+a1eRKCi5DyiDDcA/hp1fvv+b1bXGv0GprmYckh2snoaifvwGqY5S -WuYJj8gJrUNWMlQHp/KGj+V9Q4PB7Mo81l4FrWAe+ajs1VZBRiw= -=2b38 ------END PGP SIGNATURE----- diff --git a/ccid-1.6.0.tar.xz b/ccid-1.6.0.tar.xz new file mode 100644 index 0000000..ca24086 --- /dev/null +++ b/ccid-1.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdca7c22c45169cfc300d65d5362b7644ee195289f4fb8bf475a6cd321752c2c +size 195708 diff --git a/ccid-1.6.0.tar.xz.asc b/ccid-1.6.0.tar.xz.asc new file mode 100644 index 0000000..2bb9719 --- /dev/null +++ b/ccid-1.6.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmZbHPkACgkQeKG03+j5 +xX6T0Q//a7PvBi5EYrt0TnjG3h1nf+mlaJnJEr1lQ5wWunt316v7U/PlpPC3xm4t +es7cDOB1G5Q5eTNHhjPakGmtlFOVMvDmjs5nuQCA++JdYVICs/NGtBBzCEj7tKlb +xCtgInsw3PcMJHHIOPVCN4h5v78Bt7XZJPQqOMS6NdtcLmDxOxYKfKecVUaZLxh3 +dypkxzbKdKK0uVP7v6pqpnej3lcEYuIew7jwQpn1+NAqUrbALhKiVToDcgHQT//C +d/X+fZGqxzmuEYPd5OgEDQSMw/iCJZb5HDkwcfWsVg7tbIq9hj5K0wlq9hLcKSO4 +pRVz9baXtzBhbDuBhiD3Zl0bPkg45C5UnO1CGesvnb2Lv6rI+Nz8WmQIPbsfIx8C +WyhB8Mla3zn17i8+tyQtZQKyynMqQgcZ8ITekQ4mYcWutG5G5JxYXueCwRfuIMia +MCIExd7Gkvt22yBsGmaY1ucyRo8KM1AX0Taik4u8+SeGmBo2K3wNp8xpN/0PiGnQ +rqt2IpyjnjcE/w2k++sy8vPvhQg3MEVFhz2b4H2PY7qUTaUrffhkXZ5zsOiD23qD +IAGB2/8KDCTmWG7DYirBbCU4nc4HdXPg2VUb5t4rBxR8GbdsqwqKSM5u6z1yLMKT +aTxhjwvq4xNfacgX/tsVEZPlJqPy0rXs7VyFnTFAGWsa2EN/X+0= +=icou +-----END PGP SIGNATURE----- diff --git a/pcsc-ccid.changes b/pcsc-ccid.changes index 791772c..4d62582 100644 --- a/pcsc-ccid.changes +++ b/pcsc-ccid.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Jun 5 10:25:22 UTC 2024 - Axel Braun + +- Version 1.6.0 + - uses meson build system now + - Add support of + - Aladdin R.D. JCR SecurBio + - AvidCard CAC Smart Card Reader + - FujitsuTechnologySolutions GmbH Dual Smartcard Reader D321 + - Ledger Stax + - NXP Pegoda 3 + - authenton #1- CTAP2.1 + - provide files for meson build tool (replaces autoconf/automake) + - Add possibility to set/get NAD on T=1 for MEP + - multi-slots readers + - Better handling of reader removal + - Use CLOCK_MONOTONIC for timeouts + - Some other minor improvements + ------------------------------------------------------------------- Thu Feb 29 09:30:20 UTC 2024 - jun wang diff --git a/pcsc-ccid.spec b/pcsc-ccid.spec index 33d8822..1c587c9 100644 --- a/pcsc-ccid.spec +++ b/pcsc-ccid.spec @@ -18,21 +18,23 @@ Name: pcsc-ccid %define _name ccid -Version: 1.5.5 +Version: 1.6.0 Release: 0 Summary: PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader License: LGPL-2.1-or-later Group: Productivity/Security URL: https://ccid.apdu.fr/ -Source: https://ccid.apdu.fr/files/%{_name}-%{version}.tar.bz2 +Source: https://ccid.apdu.fr/files/%{_name}-%{version}.tar.xz Source1: %{name}-rpmlintrc -Source2: https://ccid.apdu.fr/files/%{_name}-%{version}.tar.bz2.asc +Source2: https://ccid.apdu.fr/files/%{_name}-%{version}.tar.xz.asc Source3: %{name}.keyring BuildRequires: automake BuildRequires: flex BuildRequires: libusb-1_0-devel +BuildRequires: meson BuildRequires: pcsc-lite-devel BuildRequires: pkg-config +BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(udev) # openSUSE package pcsc-lite 1.6.6 is the first one which creates the scard UID and GID: @@ -42,7 +44,7 @@ Requires: pcsc-lite >= 1.6.6 %define RBRACE ) %define QUOTE " %define BACKSLASH \\ -%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^ATTRS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTRS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*$/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') +%define USBDRIVERS %(set -x ; xz -d <%{S:0} | tr a-z A-Z | sed -n 's/^ATTRS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTRS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*$/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') # We are not using Supplements here. User may want to choose between pcsc-lite and openct: # Generic CCID devices: Enhances: modalias(usb:*ic0Bisc00d*dc*dsc*dp*ic*isc*ip*) @@ -60,21 +62,19 @@ This driver is meant to be used with the PCSC-Lite daemon from the pcsc-lite package. %prep -%setup -q -n %{_name}-%{version} +%autosetup -n %{_name}-%{version} cp -a src/openct/LICENSE LICENSE.openct cp -a src/towitoko/README README.towitoko %build -# not needed ATM -#./bootstrap -%configure\ - --enable-twinserial \ - --enable-zlp \ - --enable-serialconfdir=%{_sysconfdir}/reader.conf.d/ -make %{?_smp_mflags} +%meson -Dserial=true \ + -Dzlp=true + +%meson_build %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%meson_install +## make DESTDIR=%{buildroot} install %{?_smp_mflags} # Copied elsewhere: mkdir -p %{buildroot}/%{_udevrulesdir} sed 's:GROUP="pcscd":GROUP="scard":' %{buildroot}/%{_udevrulesdir}/92_pcscd_ccid.rules @@ -82,7 +82,7 @@ sed 's:GROUP="pcscd":GROUP="scard":' %{buildroot}/%{_u %files %defattr(-,root,root) # NEWS is empty -%doc AUTHORS ChangeLog README.md README.towitoko contrib/Kobil_mIDentity_switch/README_Kobil_mIDentity_switch.txt SCARDGETATTRIB.md +%doc AUTHORS README.md contrib/Kobil_mIDentity_switch/README_Kobil_mIDentity_switch.txt SCARDGETATTRIB.md %license COPYING LICENSE.openct %config (noreplace) %{_sysconfdir}/reader.conf.d/* %{ifddir}/*