chore: bump to 1.5.2

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
  - uses: actions/setup-java@v4
  with:
  distribution: temurin
- java-version: 11
+ java-version: 17
 
  - name: Setup Gradle
  uses: gradle/gradle-build-action@v3
@@ -36,7 +36,7 @@ jobs:
  sudo apt install -y g++ libcrypto++-dev
  libcrypto++8 libcurl4-openssl-dev libfontconfig1-dev
  libfreetype6-dev libpcsclite-dev libpcsclite1 libpng-dev
- libssl-dev libssl1.1 libxml2 libxml2-dev
+ libssl-dev libssl3 libxml2 libxml2-dev
  pcscd pkg-config python3-pip unzip;
  curl -sL "https://github.com/m0rf30/cie-middleware-linux/releases/download/podofo-1.4.2/libpodofo-1.4.2.tar.gz" -o libpodofo.tar.gz;
  tar xf libpodofo.tar.gz --directory=libs/lib

.github/workflows/release.yml

@@ -27,15 +27,14 @@ jobs:
 
  - name: Build
  run: |
- docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-ubuntu-focal:latest -c "cd /project; \
- yap prepare ubuntu-focal; \
- yap build ubuntu-focal /project/packages/deb; \
- yap build ubuntu-focal /project/packages"
- docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-rocky-8:latest -c "cd /project; \
- yap prepare rocky-8; \
+ docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-ubuntu-jammy:latest -c "cd /project; \
+ yap prepare ubuntu-jammy; \
+ yap build ubuntu-jammy /project/packages"
+ docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-rocky-9:latest -c "cd /project; \
+ yap prepare rocky-9; \
  dnf -y install dnf-plugins-core epel-release; \
  dnf config-manager --set-enabled powertools; \
- yap build rocky-8 /project/packages"
+ yap build rocky-9 /project/packages"
 
  for i in $(ls artifacts/*.deb); do sha256sum $i >> SHA256SUMS; done
  for i in $(ls artifacts/x86_64/*.rpm); do sha256sum $i >> SHA256SUMS; done

libs/meson.build

@@ -1,4 +1,4 @@
-project('libcie-pkcs11', 'cpp', 'c', version: '1.5.1', license: 'MIT')
+project('libcie-pkcs11', 'cpp', 'c', version: '1.5.2', license: 'MIT')
 
 add_project_arguments('-fPIC', language: 'cpp')
 

packages/cie-middleware/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname="cie-middleware"
-pkgver="1.5.1"
+pkgver="1.5.2"
 pkgrel="1"
 pkgdesc="A fork of Middleware della CIE (Carta di Identità Elettronica) per Linux"
 maintainer="M0Rf30"
@@ -11,7 +11,7 @@ priority="optional"
 source=(
  "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}.tar.gz"
  "https://github.com/M0Rf30/cie-middleware-linux/releases/download/podofo-1.4.2/libpodofo-1.4.2.tar.gz"
- "https://services.gradle.org/distributions/gradle-8.5-bin.zip"
+ "https://services.gradle.org/distributions/gradle-8.7-bin.zip"
 )
 source__pacman=(
  "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}.tar.gz"
@@ -28,27 +28,28 @@ sha256sums__pacman=(
  "ef81e439b12aa2ff309b353399c033bd62b027e7bd4cbf649c025226f1de5287"
 )
 depends__apt=(
- "cryptopp"
+ "libcrypto++8"
  "libcurl4"
  "libfreetype6"
  "libfontconfig1"
  "libpcsclite1"
  "libpng16-16"
- "libssl1.1"
+ "libssl3"
  "libxml2"
- "openjdk-11-jre-headless"
+ "openjdk-17-jre-headless"
  "pcscd"
 )
 makedepends__apt=(
  "g++"
+ "libcrypto++-dev"
  "libcurl4-openssl-dev"
  "libfontconfig1-dev"
  "libfreetype6-dev"
  "libpcsclite-dev"
  "libpng-dev"
  "libssl-dev"
  "libxml2-dev"
- "openjdk-11-jre-headless"
+ "openjdk-17-jre-headless"
  "pkg-config"
  "python3-pip"
  "unzip"
@@ -86,7 +87,7 @@ depends__yum=(
  "cryptopp"
  "fontconfig"
  "freetype"
- "java-11-openjdk-headless"
+ "java-17-openjdk-headless"
  "libcurl"
  "libpng"
  "libxml2"
@@ -98,7 +99,7 @@ makedepends__yum=(
  "fontconfig-devel"
  "freetype-devel"
  "gcc-c++"
- "java-11-openjdk-devel"
+ "java-17-openjdk-devel"
  "libcurl-devel"
  "libpng-devel"
  "libxml2-devel"
@@ -121,25 +122,25 @@ build__pacman() {
 }
 
 build__yum() {
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
+ export JAVA_HOME=/usr/lib/jvm/java-17-openjdk/
  cp "${srcdir}/libpodofo.a" \
  "${srcdir}/${pkgname}-linux-${pkgver}/libs/lib"
 
  cd "${srcdir}/${pkgname}-linux-${pkgver}"
- ../gradle-8.5/bin/gradle -b cie-java/build.gradle standalone
+ ../gradle-8.7/bin/gradle -b cie-java/build.gradle standalone
  meson setup builddir libs
  meson configure -Dprefix=/usr builddir
  meson compile -C builddir
 }
 
 build__apt() {
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
  pip3 install ninja==1.10.2.3 meson==0.61.1
  cp "${srcdir}/libpodofo.a" \
  "${srcdir}/${pkgname}-linux-${pkgver}/libs/lib"
 
  cd "${srcdir}/${pkgname}-linux-${pkgver}"
- ../gradle-8.5/bin/gradle -b cie-java/build.gradle standalone
+ ../gradle-8.7/bin/gradle -b cie-java/build.gradle standalone
 
  meson setup builddir libs
  meson configure -Dprefix=/usr builddir