From e19ad6c8a1b9a0aae1b217609d83dbdbe1d54890 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 11 Jul 2019 23:40:45 +0000
Subject: system/argon2: sec bump to 20190702

---
 system/argon2/APKBUILD | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'system/argon2')

diff --git a/system/argon2/APKBUILD b/system/argon2/APKBUILD
index c91fbfd10..7a7331221 100644
--- a/system/argon2/APKBUILD
+++ b/system/argon2/APKBUILD
@@ -3,30 +3,34 @@
 # Maintainer: 
 pkgname=argon2
 _pkgname=phc-winner-argon2
-pkgver=20171227
-pkgrel=1
+pkgver=20190702
+pkgrel=0
 pkgdesc="Password hashing function Argon2"
 url="https://github.com/P-H-C/phc-winner-argon2"
 arch="all"
 license="Apache-2.0 AND CC0-1.0"
+depends=""
+makedepends=""
 subpackages="$pkgname-dev $pkgname-dev $pkgname-libs"
 source="$pkgname-$pkgver.tar.gz::https://github.com/P-H-C/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
+	# musl >= 1.1.20 has explicit_bzero for better security
+	export CFLAGS="$CFLAGS -DHAVE_EXPLICIT_BZERO=1"
 	make OPTTARGET=none
 }
 
 check() {
-	cd "$builddir"
 	make OPTTARGET=none test
 }
 
 package() {
-	cd "$builddir"
-	make OPTTARGET=none DESTDIR="$pkgdir" install
+	# pkgconfig file has it in /usr/lib...
+	sed -i 's#libdir=${prefix}/lib#libdir=/lib#' "$builddir"/libargon2.pc
+	make OPTTARGET=none DESTDIR="$pkgdir" LIBRARY_REL=lib install
+	# ...but cryptsetup needs this in /lib for early-boot
 	mv "$pkgdir"/usr/lib "$pkgdir"/
 }
 
-sha512sums="9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d  argon2-20171227.tar.gz"
+sha512sums="0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f  argon2-20190702.tar.gz"
-- 
cgit v1.2.3-70-g09d2