From a7c0697bd5a87811bdf4b3581ad81898adaf1dee Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Sat, 30 Mar 2024 21:50:58 +0100 Subject: [PATCH] chore: bump to 1.5.2 --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 7 +++---- libs/meson.build | 2 +- packages/cie-middleware/PKGBUILD | 25 +++++++++++++------------ packages/deb/cryptopp/PKGBUILD | 31 ------------------------------- packages/deb/yap.json | 12 ------------ 6 files changed, 19 insertions(+), 62 deletions(-) delete mode 100644 packages/deb/cryptopp/PKGBUILD delete mode 100644 packages/deb/yap.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58d9e704..c37219c2 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ae5e0ed..f56e3572 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,10 +27,9 @@ 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-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-8:latest -c "cd /project; \ yap prepare rocky-8; \ dnf -y install dnf-plugins-core epel-release; \ diff --git a/libs/meson.build b/libs/meson.build index 2da7f45b..3ee31c13 100644 --- a/libs/meson.build +++ b/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') diff --git a/packages/cie-middleware/PKGBUILD b/packages/cie-middleware/PKGBUILD index b2953144..9083e955 100644 --- a/packages/cie-middleware/PKGBUILD +++ b/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,19 +28,20 @@ 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" @@ -48,7 +49,7 @@ makedepends__apt=( "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 diff --git a/packages/deb/cryptopp/PKGBUILD b/packages/deb/cryptopp/PKGBUILD deleted file mode 100644 index 11fc57cc..00000000 --- a/packages/deb/cryptopp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -pkgname="cryptopp" -pkgver="8.6.0" -pkgrel="1" -pkgdesc="A free C++ class library of cryptographic schemes" -arch=("x86_64") -maintainer="M0Rf30" -url="https://www.cryptopp.com/" -section="libs" -priority="important" -source=( - "https://github.com/weidai11/cryptopp/archive/69bf6b53052b59ccb57ce068ce741988ae087317.tar.gz" -) -sha256sums=( - "SKIP" -) - -build__apt() { - cd "${srcdir}" - export CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC" - make PREFIX=/usr -C cryptopp-69bf6b53052b59ccb57ce068ce741988ae087317 dynamic cryptest.exe libcryptopp.pc -} - -package() { - cd "${srcdir}" - make DESTDIR="${pkgdir}" PREFIX=/usr -C cryptopp-69bf6b53052b59ccb57ce068ce741988ae087317 install - install -Dm 644 cryptopp-69bf6b53052b59ccb57ce068ce741988ae087317/License.txt -t \ - "${pkgdir}"/usr/share/licenses/crypto++/ - # Remove cryptest.exe and test files, only needed for check() and bloats the package - # because cryptest.exe is linked statically. - rm -rf "${pkgdir}"/usr/{bin,share/cryptopp} -} diff --git a/packages/deb/yap.json b/packages/deb/yap.json deleted file mode 100644 index 21c20321..00000000 --- a/packages/deb/yap.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "cie-middleware", - "Description": "CIE middleware", - "buildDir": "/tmp/", - "output": "artifacts", - "Projects": [ - { - "name": "cryptopp", - "install": true - } - ] -} \ No newline at end of file