Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/ccid-1.5.2.tar.bz2
SOURCES/ccid-1.6.0.tar.xz
SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg

@ -1,2 +1,2 @@
24d246722f8415dcd4ddb7fc1ccf9c795f265900 SOURCES/ccid-1.5.2.tar.bz2
3f1a3919c996e9d7434b03b3037a110e5e5af253 SOURCES/ccid-1.6.0.tar.xz
13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg

@ -1,12 +0,0 @@
diff -up ./src/ccid_ifdhandler.h.readers_32 ./src/ccid_ifdhandler.h
--- ./src/ccid_ifdhandler.h.readers_32 2018-08-20 16:06:34.080905748 -0700
+++ ./src/ccid_ifdhandler.h 2018-08-20 16:07:04.638097096 -0700
@@ -47,7 +47,7 @@ extern int DriverOptions;
* The maximum number of readers is also limited in pcsc-lite (16 by default)
* see the definition of PCSCLITE_MAX_READERS_CONTEXTS in src/PCSC/pcsclite.h
*/
-#define CCID_DRIVER_MAX_READERS 16
+#define CCID_DRIVER_MAX_READERS 48
/*
* CCID driver specific functions

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmPZM7IACgkQeKG03+j5
xX5FMRAAjorP1bWZonnty/8Ha1AmKQehV7MaCaI/Z55IpdUO2h/Efq+Kpx4efMin
6iXHnEObm83wAi7aCeFbYC3sSXpC+ukEKBt6cHllfwFO/WX2M/h37VLAeJC7kG30
cZUY5N8FnhZ+wrugBPWdaek0NElIEQw/JWi4fhB5YvrZyWBBSLwnPxRjYq/+QutU
gP9YD46JSxArNcYX0HhDkwo6QYVnMlkz1kQ5P1ovVr5cw1kp1XKzz7XuhpQ7E4xL
e+e7gf8O/G7zZDpQNPTtkMo7fGRMe+e7QpeXnWdnkZoddaDhzys4smMV0nDaWLb5
INoNO/JadTLnGsjw7o8p0SIZhLwofV/cBkIVlZzXNYlAR8iv2djXaj4B7hHIDo2t
YA5tySaHNTX//lQEH7YpzeKF+slBsFFGWHboe3AcbkHGh+Fg2nhCuChvbuYRXh73
UZIUSHgy5qPe0ypFoBFhTXEirb1AulsfCzaTNgqAdYouaGJmokQKJ0nbH7DbzyGi
WyTpZjLlX/XB4SQ+UYtpLLvHq/EC6vPkAiOSKc5g34uRhrzcJC+tCxNfGZpKJ5G1
rKRq3kyICY9aUYK/OQU0orLZjj+3MuDQk6DgIUUbEBngTo3U24s2NcAi3+gwca63
sgLOBsitziH4dOdqV214KLC5QYNIuGFeZbGWxkrweA3+ZORmT6U=
=Rky3
-----END PGP SIGNATURE-----

@ -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-----

@ -2,24 +2,26 @@
%global pcsc_lite_ver 1.8.9
Name: pcsc-lite-ccid
Version: 1.5.2
Release: 1%{?dist}
Version: 1.6.0
Release: 2%{?dist}
Summary: Generic USB CCID smart card reader driver
License: LGPLv2+
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://ccid.apdu.fr/files
Source0: https://ccid.apdu.fr/files/ccid-%{version}.tar.bz2
Source1: https://ccid.apdu.fr/files/ccid-%{version}.tar.bz2.asc
Source0: https://ccid.apdu.fr/files/ccid-%{version}.tar.xz
Source1: https://ccid.apdu.fr/files/ccid-%{version}.tar.xz.asc
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
Patch0: ccid-1.4.26-omnikey-3121.patch
Patch1: ccid-1.4.34-maxreaders.patch
BuildRequires: make
BuildRequires: meson
BuildRequires: gcc
BuildRequires: perl-interpreter
BuildRequires: perl-Getopt-Long
BuildRequires: libusb1-devel
BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver}
BuildRequires: gnupg2 gcc
BuildRequires: gnupg2
BuildRequires: flex
BuildRequires: zlib-devel
Requires(post): systemd
Requires(postun): systemd
Requires: pcsc-lite%{?_isa} >= %{pcsc_lite_ver}
@ -38,16 +40,15 @@ PC/SC Lite daemon.
%prep
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%setup -q -n ccid-%{version}
%patch0 -p1 -b .omnikey
%patch1 -p0 -b .maxreaders
%patch 0 -p1 -b .omnikey
%build
%configure --enable-twinserial
%make_build
%meson -Dserial=true
%meson_build
%install
%make_install
%meson_install
cp -p src/openct/LICENSE LICENSE.openct
@ -59,7 +60,7 @@ cp -p src/openct/LICENSE LICENSE.openct
%files
%doc AUTHORS ChangeLog README.md
%doc AUTHORS README.md
%license COPYING LICENSE.openct
%{dropdir}/ifd-ccid.bundle/
%{dropdir}/serial/
@ -67,24 +68,69 @@ cp -p src/openct/LICENSE LICENSE.openct
%changelog
* Thu Jun 8 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.2-1
- Rebase to current version from Fedora to fix support for Alcor Micro Corp. AU9540 (#2209457)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.0-2
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-1
- Rebase to current version from Fedora (#2017830)
* Tue Jul 02 2024 Jakub Jelen <jjelen@redhat.com> - 1.6.0-1
- New upstream release with meson build system (#2284336)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.34-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.5-4
- Bump release for June 2024 mass rebuild
* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-4
- Increase the maximum readers count (#1975424)
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Apr 21 2021 Bob Relyea <rrelyea@redhat.com> - 1.4.34-3
- fix %{?dist} tag in Release: line (was missing the ?)
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.34-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jan 08 2024 Jakub Jelen <jjelen@redhat.com> - 1.5.5-1
- New upstream release (#2257041)
* Mon Oct 30 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.4-1
- New upstream release fixing regression in previous (#2246459)
* Fri Oct 27 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.3-1
- New upstream release (#2246459)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Feb 01 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.2-1
- New upstream release (#2166005)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 16 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.1-1
- New upstream release (#2142976)
* Tue Nov 01 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.0-3
- Remove downstream patch breaking flatpak (#2054826)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 28 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.0-1
- New upstream release (#2047569)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Oct 15 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-2
- Fix eToken support (#2014312)
* Tue Aug 31 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-1
- New upstream release (#1999233)
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.35-1
- New upstream release (#1985861)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.34-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-2
- Add support for more readers
* Fri Feb 05 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-1
- New upstream release

Loading…
Cancel
Save