aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-04-04 08:39:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-04-06 05:19:23 +0000
commitc9a2fb3343f04540a15b428daee1e0cbff88096b (patch)
treead5d0d3a50eb7c692b5a193f76e7718f340305cf
parent020c3153595eccdebb1c51b56b27174b9dfa7a69 (diff)
downloadaports-c9a2fb3343f04540a15b428daee1e0cbff88096b.tar.gz
aports-c9a2fb3343f04540a15b428daee1e0cbff88096b.tar.bz2
aports-c9a2fb3343f04540a15b428daee1e0cbff88096b.tar.xz
main/cryptsetup1: rebuild against libressl-2.7
-rw-r--r--main/cryptsetup1/APKBUILD6
-rw-r--r--main/cryptsetup1/libressl-2.7.patch13
2 files changed, 17 insertions, 2 deletions
diff --git a/main/cryptsetup1/APKBUILD b/main/cryptsetup1/APKBUILD
index bf6553d941..f6813709ad 100644
--- a/main/cryptsetup1/APKBUILD
+++ b/main/cryptsetup1/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup1
pkgver=1.7.5
-pkgrel=2
+pkgrel=3
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -16,6 +16,7 @@ makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
flush-stdout.patch
+ libressl-2.7.patch
"
builddir="$srcdir"/cryptsetup-$pkgver
@@ -50,4 +51,5 @@ libs() {
}
sha512sums="be4cf2815390f415edc3e1013222c9fe735b83c37278484e680cf7e0f6bdb850242bf057020d4c0d9f0e66106dbbc5b57abe34b351c99951d4aebb809e3c0473 cryptsetup-1.7.5.tar.gz
-301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch"
+301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch
+04686ed9407c69a68f608a1d8fb1e49e99476eea9adab789a3d78578ec01d352337529165abd5615416b1173ef0357dd35f977f8335ecb2f5610b8be998b7314 libressl-2.7.patch"
diff --git a/main/cryptsetup1/libressl-2.7.patch b/main/cryptsetup1/libressl-2.7.patch
new file mode 100644
index 0000000000..1d88c51a12
--- /dev/null
+++ b/main/cryptsetup1/libressl-2.7.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/crypto_backend/crypto_openssl.c b/lib/crypto_backend/crypto_openssl.c
+index 21aee76..b0a6aeb 100644
+--- a/lib/crypto_backend/crypto_openssl.c
++++ b/lib/crypto_backend/crypto_openssl.c
+@@ -52,7 +52,7 @@ struct crypt_hmac {
+ /*
+ * Compatible wrappers for OpenSSL < 1.1.0
+ */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ static void openssl_backend_init(void)
+ {
+ OpenSSL_add_all_algorithms();