diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-04 09:11:20 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-06 05:19:24 +0000 |
commit | 56d11e86868967ccdeea5aa1607efb178c842d86 (patch) | |
tree | b617ed1131dcfe30c9fa4d0d9e3cea8dc737df51 /main/cryptsetup | |
parent | 68b4b7d351f43e42b707ba015c24d50bb52037e9 (diff) | |
download | aports-56d11e86868967ccdeea5aa1607efb178c842d86.tar.bz2 aports-56d11e86868967ccdeea5aa1607efb178c842d86.tar.xz |
main/cryptsetup: rebuild against libressl-2.7
Diffstat (limited to 'main/cryptsetup')
-rw-r--r-- | main/cryptsetup/APKBUILD | 4 | ||||
-rw-r--r-- | main/cryptsetup/libressl-2.7.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD index bb60cde81d..3d7040df39 100644 --- a/main/cryptsetup/APKBUILD +++ b/main/cryptsetup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cryptsetup pkgver=2.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" url="https://gitlab.com/cryptsetup/cryptsetup" arch="all" @@ -17,6 +17,7 @@ checkdepends="device-mapper sharutils which bash" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz flush-stdout.patch + libressl-2.7.patch dmcrypt.confd dmcrypt.initd " @@ -64,5 +65,6 @@ libs() { sha512sums="a1a47320a608885acd43bd13f3c0160021c5f987e64de582f69d3bc35d444f5e65f8a4e2312118283ce8aa6c97322ec4ba279ae3aa7200e8046c4be70a492c2c cryptsetup-2.0.2.tar.gz 301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch +7224bb46f1b09cd5bbf2f8c194e8b618432f8273bdc65470fdbe929dde2efa168c4e00eb7728d03dd1658902ded6ebbf13d9bcc6932a2d10c642aef0d148d37a libressl-2.7.patch 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd 81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd" diff --git a/main/cryptsetup/libressl-2.7.patch b/main/cryptsetup/libressl-2.7.patch new file mode 100644 index 0000000000..dda8ec7dfd --- /dev/null +++ b/main/cryptsetup/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 4929f82..463c3dd 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(); |