From 49ffb8ba99257a96941e17f517d5955eaaad62b7 Mon Sep 17 00:00:00 2001 From: Laurent Bercot <ska-adelie@skarnet.org> Date: Sat, 18 Aug 2018 12:51:04 +0000 Subject: [PATCH] user/bearssl: move brssl to /usr/bin, make it dynamic --- user/bearssl/APKBUILD | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/user/bearssl/APKBUILD b/user/bearssl/APKBUILD index 1f40633b76..ad6e8b20af 100644 --- a/user/bearssl/APKBUILD +++ b/user/bearssl/APKBUILD @@ -2,17 +2,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bearssl pkgver=0.6 -pkgrel=0 +pkgrel=1 pkgdesc="The BearSSL implementation of the SSL/TLS protocol" url="https://bearssl.org/" arch="all" license="MIT" builddir="$srcdir/$pkgname-$pkgver" subpackages="$pkgname-dev" -source="https://bearssl.org/$pkgname-$pkgver.tar.gz" - -# not using the brssl dynamic patch atm, because the ABI can change, -# and bearssl's author recommends against using the .so atm. +source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch" build() { cd "$builddir" @@ -25,8 +22,8 @@ build() { } package() { - mkdir -p -m 0755 -- "$pkgdir"/bin "$pkgdir"/lib "$pkgdir"/usr/include "$pkgdir"/usr/lib - cp -f "$builddir/build/brssl" "$pkgdir/bin/" + mkdir -p -m 0755 -- "$pkgdir"/usr/bin "$pkgdir"/lib "$pkgdir"/usr/include "$pkgdir"/usr/lib + cp -f "$builddir/build/brssl" "$pkgdir/usr/bin/" cp -f "$builddir"/inc/* "$pkgdir/usr/include/" cp -f "$builddir/build/libbearssl.a" "$pkgdir/usr/lib/" cp -f "$builddir/build/libbearssl.so.$pkgver" "$pkgdir/lib/" @@ -39,4 +36,5 @@ check() { ./testx509 && ./testcrypto all } -sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz" +sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz +f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch" -- GitLab