Fixups + try build Fedora package with meson

Author: Jakuje

.clang-tidy-include

@@ -4,5 +4,38 @@ src/common/*.c
 src/libopensc/*.h
 src/libopensc/*.c
 
+src/minidriver/*.h
+src/minidriver/*.c
+
 src/pkcs11/*.h
 src/pkcs11/*.c
+
+src/pkcs15init/*.h
+src/pkcs15init/*.c
+
+src/scconf/*.h
+src/scconf/*.c
+
+src/sm/*.h
+src/sm/*.c
+
+src/smm/*.h
+src/smm/*.c
+
+src/tests/*.h
+src/tests/*.c
+
+src/tests/unittests/*.h
+src/tests/unittests/*.c
+
+src/tests/p11test/*.h
+src/tests/p11test/*.c
+
+src/tests/fuzzing/*.h
+src/tests/fuzzing/*.c
+
+src/tools/*.h
+src/tools/*.c
+
+src/ui/*.h
+src/ui/*.c

.github/workflows/linux-meson.yml

@@ -2,7 +2,15 @@ name: Linux (meson)
 
 on:
   pull_request:
+    paths:
+      - '**.c'
+      - '**.h'
+      - '**.sh'
+      - .github/workflows/linux-meson.yml
+      - '**meson.build'
+      - doc/**
     branches: master
+  push:
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)

.github/workflows/rpmbuild.yaml

@@ -58,10 +58,9 @@ jobs:
 
       - name: RPM Build
         run: |
-          git config --global --add safe.directory /__w/opensc/opensc
-          ./bootstrap
-          ./configure
-          make dist
+          git config --global --add safe.directory $GITHUB_WORKSPACE
+          meson setup build/
+          meson dist -C build/ --formats xztar
           mkdir -p rpmbuild/SOURCES
-          cp opensc-*.tar.gz src/pkcs11/opensc.module rpmbuild/SOURCES/
+          cp build/meson-dist/opensc-*.tar.xz rpmbuild/SOURCES/
           rpmbuild --define "_topdir $PWD/rpmbuild" -ba packaging/opensc.spec

packaging/opensc.spec

@@ -5,22 +5,21 @@ Summary:        Smart card library and applications
 
 License:        LGPL-2.1-or-later AND BSD-3-Clause
 URL:            https://github.com/OpenSC/OpenSC/wiki
-Source0:        https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
-Source1:        opensc.module
+Source0:        https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires:  make
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  readline-devel
 BuildRequires:  openssl-devel
 BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  docbook-style-xsl
-BuildRequires:  autoconf automake libtool gcc
+BuildRequires:  meson gcc
 %if 0%{?fedora} || 0%{?rhel} > 10
 BuildRequires:  bash-completion-devel
 %else
 BuildRequires:  bash-completion
 %endif
-BuildRequires:  zlib-ng-devel
+BuildRequires:  zlib-ng-compat-devel
 BuildRequires:  p11-kit-devel
 # For tests
 BuildRequires:  libcmocka-devel
@@ -77,67 +76,45 @@ cp -p src/scconf/README.scconf .
 # No {_libdir} here to avoid multilib conflicts; it's just an example
 sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.example.in
 
-
-%build
-autoreconf -fvi
-%ifarch %{ix86}
-sed -i -e 's/opensc.conf/opensc-%{_arch}.conf/g' src/libopensc/Makefile.in
+%conf
+%meson -Dopenssl=enabled \
+%if ! 0%{?rhel}
+	-Dopenpace=enabled \
 %endif
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
-%set_build_flags
-CFLAGS="$CFLAGS -Wstrict-aliasing=2 -Wno-deprecated-declarations"
-%configure --disable-static \
-  --disable-autostart-items \
-  --disable-notify \
-  --disable-assert \
-  --enable-pcsc \
-  --enable-cmocka \
-  --enable-sm
-%make_build
+       -Dreadline=enabled \
+       -Dzlib=enabled \
+       -Dtests=true \
+       -Ddriver=pcsc \
+       -Ddoc=true \
+       -Dman=true
 
+%build
+%meson_build
 
 %check
-make check || (cat tests/*.log src/tests/unittests/*.log && exit 1)
-
+%meson_test
 
 %install
-%make_install
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/opensc.module
-
-%ifarch %{ix86}
-# To avoid multilib issues, move these files on 32b intel architectures
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
-install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/opensc.conf.5
-install -Dpm 644 doc/files/opensc.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/opensc-%{_arch}.conf.5
-# use NEWS file timestamp as reference for configuration file
-touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
-touch -r NEWS $RPM_BUILD_ROOT%{_mandir}/man5/opensc-%{_arch}.conf.5
-%else
-# For backward compatibility, symlink the old location to the new files
-ln -s %{_sysconfdir}/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
-%endif
-
-find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
+%meson_install
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/opensc
 
 # Upstream considers libopensc API internal and no longer ships
 # public headers and pkgconfig files.
 # Remove the symlink as nothing is supposed to link against libopensc.
-rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
+rm $RPM_BUILD_ROOT%{_libdir}/libopensc.so
 # remove the .pc file so we do not confuse users #1673139
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
-rm -f $RPM_BUILD_ROOT%{_libdir}/libsmm-local.so
+rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+rm $RPM_BUILD_ROOT%{_libdir}/libsmm-local.so
 
 %if 0%{?rhel}
-rm -rf %{buildroot}%{_bindir}/npa-tool
-rm -rf %{buildroot}%{_mandir}/man1/npa-tool.1*
+rm %{buildroot}%{_bindir}/npa-tool
+rm %{buildroot}%{_mandir}/man1/npa-tool.1*
 %endif
 
 # the pkcs11-register is not applicable to Fedora/RHEL where we use p11-kit
-rm -rf %{buildroot}%{_bindir}/pkcs11-register
-rm -rf %{buildroot}%{_mandir}/man1/pkcs11-register.1*
+rm %{buildroot}%{_bindir}/pkcs11-register
+rm %{buildroot}%{_mandir}/man1/pkcs11-register.1*
 
 # Remove the notification files
 rm %{buildroot}%{_datadir}/applications/org.opensc.notify.desktop

src/libopensc/meson.build

@@ -47,6 +47,7 @@ libopensc_sources = files(
     'card-setcos.c',
     'card-skeid.c',
     'card-starcos.c',
+    'card-srbeid.c',
     'card-tcos.c',
     'compression.c',
     'ctbcs.c',
@@ -104,6 +105,7 @@ libopensc_sources = files(
     'pkcs15-skey.c',
     'pkcs15-starcert.c',
     'pkcs15-starcos-esign.c',
+    'pkcs15-srbeid.c',
     'pkcs15-syn.c',
     'pkcs15-tccardos.c',
     'pkcs15-tcos.c',

src/pkcs11/meson.build

@@ -92,7 +92,7 @@ if depp11kit.found()
     if host_machine.system() != 'windows'
         install_symlink('onepin-opensc-pkcs11.' + extension_of_libraries,
             install_dir: p11kit_modules_path,
-            pointing_to: 'opensc-pkcs11.' + extension_of_libraries
+            pointing_to: prefix_of_libraries + 'opensc-pkcs11.' + extension_of_libraries
         )
     endif
 else

src/tools/pkcs11-tool.c

@@ -80,9 +80,9 @@
  * but does use some OpenSSL routines
  */
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	static OSSL_PROVIDER *legacy_provider = NULL;
-	static OSSL_PROVIDER *default_provider = NULL;
-	static OSSL_LIB_CTX *osslctx = NULL;
+static OSSL_PROVIDER *legacy_provider = NULL;
+static OSSL_PROVIDER *default_provider = NULL;
+static OSSL_LIB_CTX *osslctx = NULL;
 #endif
 
 #ifdef _WIN32
@@ -94,7 +94,7 @@
 #ifdef ENABLE_PKCS11
 #ifndef HAVE_P11KIT
 #ifndef ENABLE_SHARED
-	extern CK_FUNCTION_LIST_3_0 pkcs11_function_list_3_0;
+extern CK_FUNCTION_LIST_3_0 pkcs11_function_list_3_0;
 #endif
 #endif
 #endif