Subject: [PATCH] testing/veracrypt: upgrade to 1.24-Update6

From: Sascha Paunovic <[email-masked]>
Date: Sun, 3 May 2020 09:33:41 +0000

suggestion: bump pkgrel when Update7 gets released, since
"1.24-Update6" is not a valid version string for APKBUILD.
---
 testing/veracrypt/10-systypes1.patch | 12 ++++++++++++
 testing/veracrypt/APKBUILD           | 14 ++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 testing/veracrypt/10-systypes1.patch

diff --git a/testing/veracrypt/10-systypes1.patch b/testing/veracrypt/10-systypes1.patch
new file mode 100644
index 0000000000..f28f41f208
--- /dev/null
+++ b/testing/veracrypt/10-systypes1.patch
@@ -0,0 +1,12 @@
+Author: Sascha Paunovic <[email-masked]>
+Summary: Fixes "ssize_t" not defined issue.
+--- src/src/Crypto/jitterentropy.h.orig
++++ src/src/Crypto/jitterentropy.h
+@@ -45,6 +45,7 @@
+ #define _JITTERENTROPY_H
+ 
+ #include "jitterentropy-base-user.h"
++#include <sys/types.h>
+ 
+ /* The entropy pool */
+ struct rand_data
diff --git a/testing/veracrypt/APKBUILD b/testing/veracrypt/APKBUILD
index 95c10a722e..81372d5d04 100644
--- a/testing/veracrypt/APKBUILD
+++ b/testing/veracrypt/APKBUILD
@@ -2,8 +2,10 @@
 # Maintainer: Sascha Paunovic <[email-masked]>
 pkgname=veracrypt
 _pkgname=VeraCrypt
-pkgver=1.22
-pkgrel=6
+pkgver=1.24
+_pkgver=1.24-Update6
+__pkgver=$(echo $_pkgver | tr '[:upper:]' '[:lower:]')
+pkgrel=0
 pkgdesc="disk encryption with strong security based on TrueCrypt"
 url="https://www.veracrypt.fr/"
 arch="all !x86 !armhf !armv7 !s390x !mips !mips64" # issues on linking
@@ -12,8 +14,8 @@ depends="device-mapper"
 makedepends="fuse-dev wxgtk-dev libsm-dev yasm"
 options="!check" # no test suite provided
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.bz2::https://launchpad.net/veracrypt/trunk/$pkgver/+download/${_pkgname}_${pkgver}_Source.tar.bz2
-	sysmacros.patch
+source="$pkgname-$pkgver.zip::https://launchpad.net/veracrypt/trunk/${__pkgver}/+download/${_pkgname}_${_pkgver}_Source.zip
+	10-systypes1.patch
 	"
 builddir="$srcdir/"
 
@@ -44,5 +46,5 @@ package() {
 	EOF
 }
 
-sha512sums="08795a42ab4eddb4792538d0207e6a45efad967abe257ba0a722b15f5bd43736f5e7cdce80b6c641dc1587c75f8f2b9b314f67e787a5a99031b5b47eea159b3d  veracrypt-1.22.tar.bz2
-34cbd10e3de5c0248a4d634e42a592b71c7c83e3edd4dd2ae05cc29bc7f9b3f71f85d32bbc5dcd68df9478a3fa2a0357ffbc9262baf76bf767c83b517ae29a09  sysmacros.patch"
+sha512sums="36e40074272dae272585a5aaca9e373a55360d5b50a718848c6ffe93860856740835c79ec79e58733c2199d2fb32a1c2a601d8e1e088d3f93c09f046051055eb  veracrypt-1.24.zip
+677349e25708d23fc7dd89cbcfbb72b658e1b6b0d64c403355984a745191d12fc373f90f4fcb170691fae771b39fcaffa0520f9db1a16f5248b817eefc973d37  10-systypes1.patch"
-- 
2.26.2