From 5171a327a08e782f2ff8cf9f81492c16b6706370 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 4 May 2024 19:08:55 +0200 Subject: [PATCH] pcsclite: 2.1.0 -> 2.2.0 --- pcsclite/.footprint | 20 +++------ pcsclite/.signature | 9 ++-- ...367edc01518b90684ffff99010ee07ae1bd4.patch | 45 +++++++++++++++++++ pcsclite/Pkgfile | 31 +++++++------ 4 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 pcsclite/960e367edc01518b90684ffff99010ee07ae1bd4.patch diff --git a/pcsclite/.footprint b/pcsclite/.footprint index d7357bdab..3d5c19314 100644 --- a/pcsclite/.footprint +++ b/pcsclite/.footprint @@ -10,18 +10,12 @@ drwxr-xr-x root/root usr/include/PCSC/ -rw-r--r-- root/root usr/include/PCSC/winscard.h -rw-r--r-- root/root usr/include/PCSC/wintypes.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libpcsclite.la -lrwxrwxrwx root/root usr/lib/libpcsclite.so -> libpcsclite.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libpcsclite.so.1 -> libpcsclite.so.1.0.0 --rwxr-xr-x root/root usr/lib/libpcsclite.so.1.0.0 --rwxr-xr-x root/root usr/lib/libpcsclite_real.la -lrwxrwxrwx root/root usr/lib/libpcsclite_real.so -> libpcsclite_real.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libpcsclite_real.so.1 -> libpcsclite_real.so.1.0.0 --rwxr-xr-x root/root usr/lib/libpcsclite_real.so.1.0.0 --rwxr-xr-x root/root usr/lib/libpcscspy.la -lrwxrwxrwx root/root usr/lib/libpcscspy.so -> libpcscspy.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libpcscspy.so.0 -> libpcscspy.so.0.0.0 --rwxr-xr-x root/root usr/lib/libpcscspy.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libpcsclite.so -> libpcsclite.so.1 +-rwxr-xr-x root/root usr/lib/libpcsclite.so.1 +lrwxrwxrwx root/root usr/lib/libpcsclite_real.so -> libpcsclite_real.so.1 +-rwxr-xr-x root/root usr/lib/libpcsclite_real.so.1 +lrwxrwxrwx root/root usr/lib/libpcscspy.so -> libpcscspy.so.0 +-rwxr-xr-x root/root usr/lib/libpcscspy.so.0 drwxr-xr-x root/root usr/lib/pcsc/ drwxr-xr-x root/root usr/lib/pcsc/drivers/ drwxr-xr-x root/root usr/lib/pkgconfig/ @@ -32,8 +26,6 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/pcsc-spy.1.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/reader.conf.5.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/pcscd.8.gz drwxr-xr-x root/root usr/share/polkit-1/ diff --git a/pcsclite/.signature b/pcsclite/.signature index aff908f1c..d91e00206 100644 --- a/pcsclite/.signature +++ b/pcsclite/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32SNlAeIkXrz3FZOujysz9Mn39tEtwYajDEMKf+UaJO6lXxZ5K4kMPoaKnKpq8Em2XsD7VrLPdMH40ZppwgMMgc= -SHA256 (Pkgfile) = 735a47330732c1677648776744741b3ff6fb82ba7773e26ef61d9e65d9c8e192 -SHA256 (.footprint) = fc2859d9b63c13b139687d5a58a14be07276b246ff6c07f0c7b9eae97c6683e0 -SHA256 (pcsc-lite-2.1.0.tar.bz2) = 85cab61cc744c81e2bc432656863293b8428d0136f079e3b12a84b335b5b35aa +RWSagIOpLGJF36vg+nDDyXtyR8E8uhCa/PXwMhvtQwEgE3c2ZZHjxxaRLxF3X7OgEteTeWWPR2VHU3kskzznW6NOtNOvaMDjBQE= +SHA256 (Pkgfile) = 2f424d7948d10d901d4cd03c85905fa1e7d4094952e1a52a3f73a2093d55add5 +SHA256 (.footprint) = d35e3baff1b54d963f02f771e44a72c85029d6eec1f853f7a032fb15fb409387 +SHA256 (pcsc-lite-2.2.0.tar.xz) = 76e06bb9f47f0c10c4eaec3ee9cea634bda28a1fc46f1286c097d220386c22d4 +SHA256 (960e367edc01518b90684ffff99010ee07ae1bd4.patch) = 30e5e3c5ca16d18243c6cf7db662f4cc504e05ccc0c70747f34832397ae1cdd5 diff --git a/pcsclite/960e367edc01518b90684ffff99010ee07ae1bd4.patch b/pcsclite/960e367edc01518b90684ffff99010ee07ae1bd4.patch new file mode 100644 index 000000000..218936ed4 --- /dev/null +++ b/pcsclite/960e367edc01518b90684ffff99010ee07ae1bd4.patch @@ -0,0 +1,45 @@ +From 960e367edc01518b90684ffff99010ee07ae1bd4 Mon Sep 17 00:00:00 2001 +From: Ludovic Rousseau +Date: Sat, 4 May 2024 15:39:39 +0200 +Subject: [PATCH] meson: include prefix in sbindir + +If sbindir is set to "bin" and prefix is set to "/usr" then sbindir is +"/usr/bin" instead of "/bin". + +Thanks to Frederik Schwan for the bug report +" [Build] Meson ignoring prefix for binary location #179 " +https://github.com/LudovicRousseau/PCSC/issues/179 +--- + meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 843d643e..0686a151 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,11 +20,12 @@ conf_data = configuration_data({ + 'NO_LOG' : get_option('embedded'), + }) + # for generated files from .in templates ++sbindir = join_paths(get_option('prefix') , get_option('sbindir')) + confgen_data = configuration_data({ + 'VERSION' : meson.project_version(), + 'ipcdir' : get_option('ipcdir'), + 'sysconfdir' : get_option('sysconfdir'), +- 'sbindir_exp' : '/' / get_option('sbindir'), ++ 'sbindir_exp' : sbindir, + 'PCSCLITE_CONFIG_DIR' : get_option('serialconfdir'), + 'usbdropdir' : get_option('usbdropdir'), + }) +@@ -143,7 +144,7 @@ executable('pcscd', + dependencies : pcscd_dep, + c_args: '-DPCSCD', + export_dynamic : true, +- install_dir : '/' / get_option('sbindir'), ++ install_dir : sbindir, + install : true) + + # libpcsclite_real library +-- +GitLab + diff --git a/pcsclite/Pkgfile b/pcsclite/Pkgfile index 41db0d100..2773fe22f 100644 --- a/pcsclite/Pkgfile +++ b/pcsclite/Pkgfile @@ -1,26 +1,31 @@ -# Description: Middleware to access a smart card using SCard API (PC/SC). -# URL: https://pcsclite.apdu.fr/ +# Description: Middleware to access a smart card using SCard API (PC/SC) +# URL: https://pcsclite.apdu.fr # Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: polkit name=pcsclite -version=2.1.0 +version=2.2.0 release=1 -source=(https://pcsclite.apdu.fr/files/pcsc-lite-$version.tar.bz2) +source=(https://pcsclite.apdu.fr/files/pcsc-lite-$version.tar.xz + 960e367edc01518b90684ffff99010ee07ae1bd4.patch) build() { - cd pcsc-lite-$version + patch -Np1 -d pcsc-lite-$version -i $SRC/960e367edc01518b90684ffff99010ee07ae1bd4.patch - ./configure \ + meson setup pcsc-lite-$version build \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-filter \ - --enable-ipcdir=/run/pcscd \ - --enable-libudev \ - --enable-usbdropdir=/usr/lib/pcsc/drivers \ - --disable-libsystemd - make - make DESTDIR=$PKG install + --sbindir=/usr/sbin/ \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D libudev=true \ + -D usb=true \ + -D usbdropdir=/usr/lib/pcsc/drivers \ + -D libsystemd=false + meson compile -C build + DESTDIR=$PKG meson install -C build rm -r $PKG/usr/share/doc install -d $PKG/usr/lib/pcsc/drivers