From 08bc47716f6c2ce5c872aa5d9c0da814ea1a25bc10eb3f597a0da87f743a5a89 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 17 Jun 2024 06:45:10 +0000 Subject: [PATCH] Accepting request 1179191 from home:DocB:branches:security:chipcard please check as some compiler options are removed due to meson - version 2.2.3 * switch to meson build system . Fix build on Slackware 15 . fail if both libusb and libudev are used - Fix memory leak on exit - libpcscspy: dump an output buffer only if the call succeeded - Some code cleanup - Serial support is ENABLED by default - fix meson related issues - Some code cleanup - provide files for meson build tool (replaces autoconf/auoomake) - fix a missing symbol in libpcscspy (bug introduced by the previous version) - fix shutdown issues with hotplug_libusb - update pcsc-spy manpage - update copyright date - Some other minor improvements OBS-URL: https://build.opensuse.org/request/show/1179191 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=195 --- pcsc-lite-2.1.0.tar.bz2 | 3 --- pcsc-lite-2.1.0.tar.bz2.asc | 16 ---------------- pcsc-lite-2.2.3.tar.xz | 3 +++ pcsc-lite-2.2.3.tar.xz.asc | 16 ++++++++++++++++ pcsc-lite.changes | 20 +++++++++++++++++++ pcsc-lite.spec | 38 ++++++++++++++++++++----------------- 6 files changed, 60 insertions(+), 36 deletions(-) delete mode 100644 pcsc-lite-2.1.0.tar.bz2 delete mode 100644 pcsc-lite-2.1.0.tar.bz2.asc create mode 100644 pcsc-lite-2.2.3.tar.xz create mode 100644 pcsc-lite-2.2.3.tar.xz.asc diff --git a/pcsc-lite-2.1.0.tar.bz2 b/pcsc-lite-2.1.0.tar.bz2 deleted file mode 100644 index 39e2413..0000000 --- a/pcsc-lite-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85cab61cc744c81e2bc432656863293b8428d0136f079e3b12a84b335b5b35aa -size 825196 diff --git a/pcsc-lite-2.1.0.tar.bz2.asc b/pcsc-lite-2.1.0.tar.bz2.asc deleted file mode 100644 index 61185da..0000000 --- a/pcsc-lite-2.1.0.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmYZBEsACgkQeKG03+j5 -xX7aHw/8DN9kLR5NE6uI4OGSGN5N+VgTemDNs80UN33B03wqgS1ip1ZmsRvOlyzk -CECr+zQp+1NruMEw5YPajJ9jCIIo+PtZIVqidbDLl+66yQANYLyWm+0dcscQlfuq -XF+Dy7HXpGf8mxBWlkGcBJt4OMLyeUgaRHt4PktRT4gJHAfWRzT9vnlNphWmUPyZ -wUdgEDgSzzgV91MlN5Cauj+rrEPCl4vn9pgSFBWgXz6o7TSDKnB/mYB9f73MdoUU -hm2SPjNtRV53oPmxfgbqgZaD+OBNLwMdUQitODF/pjIPSN8RXkkEJalESG9BEEsE -wiS4iF7izRL1oaqqq2ytqsKOHz5PpMUfVD17ml38n1efQ8296HmkMsm8ncYTZNcG -jWpNKuCE3V1ED6iJofUM86yAcNOvxSpPG9lpvUN2fUqQXY+qkqvYt7d9VPf9QFjT -zsQxoXtftvAQ4c6sX+bu7RUZAp7RhfmPjOt3EU1Rgu9wwUmqQCB7is6WOAdJw3bU -XDcbMGMj/kZP/hFnt68DTXoM7Qc7oBNYfd8F0EYJbTIIfWotm5JWS+Lpuz3mbMjb -06gxRDRuyETEB57kacPvcHPMlXiYaVk7rFciD5T07Itd7mznjUWjitYPiGrG0cU1 -jd5H6th1NRbu0Lysj5pSDUP2K5Bdd3kSxVEHQkHOxKPIHUgdMl4= -=Ax16 ------END PGP SIGNATURE----- diff --git a/pcsc-lite-2.2.3.tar.xz b/pcsc-lite-2.2.3.tar.xz new file mode 100644 index 0000000..cdcc6a1 --- /dev/null +++ b/pcsc-lite-2.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cab1e62755713f62ce1b567954dbb0e9a7e668ffbc3bbad3ce85c53f8f4e00a4 +size 207892 diff --git a/pcsc-lite-2.2.3.tar.xz.asc b/pcsc-lite-2.2.3.tar.xz.asc new file mode 100644 index 0000000..f8eb5e9 --- /dev/null +++ b/pcsc-lite-2.2.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmZTUMcACgkQeKG03+j5 +xX5JXw/8CjH7jrxwZmCLWpvuGGJpDpqEritUqciW03YkjKtp/yC7h6S6KQKgD+RW +2ArShpaGsCZMDlI8gsW66pgWfjfCYrWEe8G+Tjdd/1t6L+XiO/Kmv/+WT0rRQUNN +V9kOJkl4Uqse8vupeiUfWto9Kw+2yXAaB3QO0VOLJ+ozsXR7EQ4W90azPchhEIa4 +Gj6qq9rRVWC16kuH80x1umbEFlQujBEXAy2YmscPT4rBSTYej1f2Wi6+RVtltTk9 +6uTnhWiGoy0KtM0Zr0EZLww/G4NpCSQ5vFzCHl883rdol8YRIgCibriTuzeMoAbm +Fd9IokWWbBvpNxrO5XMZagZwRJpxeyZV9IuDqj8QCEFJ8lghBHx4DvO5/H0Mg8EF +FMNhC1lMV1EmRnkvmDQZT8v3rjjtmlwycB5jE/txPL2LFwRR0cd7Yr+p7g3dwT+3 +6267mWe0Onq2q08SM/Ixr/fpY8sRvjYmGl6nlZShplTXgNBV80rpXh36NqIdDHkK +HUjuyo7lG4WMGlWGJh6IJCk3cyHBACb6k0AVBI9jDU6q2wAs9gkjDhV3R1GYIwim +qD4BjPgWOPKhVrNjXVuv1/csgLxeMT9HBa7Y7S0Dd8WzfdFhLmRD4uGys22m/wOI +/GwS3iiBgljLOnv7/HDxOWokx7a9UBugQHePxZ5vo8+w/Pfz2FM= +=UdJS +-----END PGP SIGNATURE----- diff --git a/pcsc-lite.changes b/pcsc-lite.changes index 3c7278e..a19bb83 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jun 7 10:15:11 UTC 2024 - Axel Braun + +- version 2.2.3 + * switch to meson build system + . Fix build on Slackware 15 + . fail if both libusb and libudev are used + - Fix memory leak on exit + - libpcscspy: dump an output buffer only if the call succeeded + - Some code cleanup + - Serial support is ENABLED by default + - fix meson related issues + - Some code cleanup + - provide files for meson build tool (replaces autoconf/auoomake) + - fix a missing symbol in libpcscspy (bug introduced by the previous version) + - fix shutdown issues with hotplug_libusb + - update pcsc-spy manpage + - update copyright date + - Some other minor improvements + ------------------------------------------------------------------- Tue Apr 23 08:15:56 UTC 2024 - Stephan Hemeier diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 9b53dd7..cf2e95b 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -26,29 +26,34 @@ %define PKG_USER scard %define PKG_GROUP scard Name: pcsc-lite -Version: 2.1.0 +Version: 2.2.3 Release: 0 Summary: PC/SC Smart Cards Library License: BSD-3-Clause AND GPL-3.0-or-later Group: Productivity/Security URL: https://pcsclite.apdu.fr/ -Source: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2 +Source: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz Source1: %{name}.sysconfig Source2: README.SUSE Source4: baselibs.conf Source6: pcsc-lite-reader-conf -Source7: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc +Source7: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz.asc Source8: %{name}.keyring Source9: %{name}.sysusers Patch0: systemd-service.patch Patch1: harden_pcscd.service.patch +BuildRequires: cmake BuildRequires: flex BuildRequires: gcc BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: sysuser-tools +## BuildRequires: systemd-devel +BuildRequires: xz BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) Requires: libpcsclite1 = %{version} Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -110,25 +115,23 @@ This package contains the development files for pcsc-lite. It allows to compile plugins for the pcsc-lite package. %prep -%setup -q +%setup %patch -P 0 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE6} . %patch -P 1 -p1 %build %sysusers_generate_pre %{SOURCE9} %{PKG_USER} %{PKG_USER}.conf -%configure \ - --disable-silent-rules \ - --docdir=%{_docdir}/%{name} \ - --enable-usbdropdir=%{ifddir} \ - --with-systemdsystemunitdir=%{_unitdir} \ - --enable-polkit \ - --enable-filter \ - --disable-static - make %{?_smp_mflags} +%meson \ + -D usbdropdir=%{ifddir} \ + -D polkit=TRUE \ + -D libsystemd=TRUE \ + -D systemdunit=system + +%meson_build %{?_smp_mflags} %install -%make_install +%meson_install mkdir -p %{buildroot}%{ifddir} mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: %{buildroot}%{_sysconfdir}/reader.conf.d/reader.conf @@ -137,6 +140,8 @@ mkdir -p %{buildroot}%{_fillupdir} cp %{name}.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pcscd mkdir -p %{buildroot}%{_docdir}/%{name} cp -a AUTHORS ChangeLog COPYING HELP NEWS README README.SUSE SECURITY %{buildroot}%{_docdir}/%{name} +mv %{buildroot}/usr/share/doc/%{name}/* %{buildroot}%{_docdir}/%{name} +rm -d %{buildroot}/usr/share/doc/%{name} # Remove useless la files find %{buildroot} -type f -name "*.la" -delete -print install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{PKG_USER}.conf @@ -167,21 +172,20 @@ install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{PKG_USER}.conf %defattr(-,root,root) %docdir %{_docdir}/%{name} %dir %{_docdir}/%{name} +%{_docdir}/%{name}/setup_spy.sh %{_docdir}/%{name}/AUTHORS %{_docdir}/%{name}/COPYING %{_docdir}/%{name}/HELP %{_docdir}/%{name}/NEWS %{_docdir}/%{name}/README %{_docdir}/%{name}/README.SUSE -%{_docdir}/%{name}/README.polkit %{_docdir}/%{name}/SECURITY -%{_docdir}/%{name}/setup_spy.sh %doc %{_mandir}/man?/*.* %{_sbindir}/* %dir %{_sysconfdir}/reader.conf.d %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf %{ifddir} -%{_unitdir}/* +%{_unitdir}/pcsc* %{_sysusersdir}/%{PKG_USER}.conf %{_fillupdir}/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen().