contrib: update argon2

Change-Id: I7394d8bbbd58f040aa243a6d413de18c4504bf0e

contrib/src/argon2/0001-build-don-t-force-AR-path.patch

@@ -0,0 +1,25 @@
+From 82cf8da4126e9e2d99c0495c5baa4071f25811c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
+Date: Mon, 3 May 2021 16:16:55 -0400
+Subject: [PATCH] build: don't force AR path
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 44c076a..8823030 100644
+--- a/Makefile
++++ b/Makefile
+@@ -124,7 +124,7 @@ LINKED_LIB_SH := lib$(LIB_NAME).$(LINKED_LIB_EXT)
+ endif
+ 
+ # Some systems don't provide an unprefixed ar when cross-compiling.
+-AR=ar
++AR ?= ar
+ 
+ LIBRARIES = $(LIB_SH) $(LIB_ST)
+ HEADERS = include/argon2.h
+-- 
+2.27.0
+

contrib/src/argon2/SHA512SUMS

@@ -1 +1 @@
-5a88ce7e796594f3f5008001de315469f96b3761c01b6db139416dcf6b784f462884d026fb6a557bcb2a14ebe1eb55b84e57b7df12240ee70f8d8fb0f2c294d2  argon2-1eea0104e7cb2a38c617cf90ffa46ce5db6aceda.tar.gz
+73757e0b9a5b80bdda66348d8fc9aafa5332a902f044033663ab44a801734d6112b26726eafad247a69315ca5991b661f5370aad560e6611278a720828bacec3  argon2-16d3df698db2486dde480b09a732bf9bf48599f9.tar.gz

contrib/src/argon2/pkgconfig.patch

@@ -1,13 +0,0 @@
---- argon2/libargon2.pc.orig
-+++ argon2/libargon2.pc
-@@ -1,6 +1,1 @@
--# libargon2 info for pkg-config
--## Template for downstream installers:
--## - replace @HOST_MULTIARCH@ with target arch, eg 'x86_64-linux-gnu'
--## - replace @UPSTREAM_VER@ with current version, eg '20160406'
--
--prefix=/usr
-+prefix=@PREFIX@
-@@ -14,1 +9,1 @@
--Libs: -L${libdir} -largon2 -lrt -ldl
-+Libs: -L${libdir} -largon2

contrib/src/argon2/rules.mak

@@ -1,5 +1,5 @@
 # ARGON2
-ARGON2_VERSION := 1eea0104e7cb2a38c617cf90ffa46ce5db6aceda
+ARGON2_VERSION := 16d3df698db2486dde480b09a732bf9bf48599f9
 ARGON2_URL := https://github.com/P-H-C/phc-winner-argon2/archive/$(ARGON2_VERSION).tar.gz
 
 ifeq ($(call need_pkg,'libargon2 > 20161029'),)
@@ -14,14 +14,22 @@ $(TARBALLS)/argon2-$(ARGON2_VERSION).tar.gz:
 argon2: argon2-$(ARGON2_VERSION).tar.gz
 	$(UNPACK)
 	mv phc-winner-argon2-$(ARGON2_VERSION) argon2-$(ARGON2_VERSION)
-	$(APPLY) $(SRC)/argon2/pkgconfig.patch
+	$(APPLY) $(SRC)/argon2/0001-build-don-t-force-AR-path.patch
 	$(MOVE)
 
+ARGON2_CONF = \
+	PREFIX="$(PREFIX)" \
+	OPTTARGET="no-opt" \
+	LIB_SH="" \
+	ARGON2_VERSION="20190702"
+
+ifdef HAVE_ANDROID
+	ARGON2_CONF += LIBRARY_REL="lib"
+endif
+
 .argon2: argon2 .sum-argon2
-	cd $< && sed -i'.orig' -e 's|@PREFIX@|$(PREFIX)|' -e "s|@HOST_MULTIARCH@||" -e "s|@UPSTREAM_VER@|$(ARGON2_VERSION)|" libargon2.pc
-	cd $< && mkdir -p $(PREFIX)/lib/pkgconfig/ && cp libargon2.pc $(PREFIX)/lib/pkgconfig/
-	cd $< && $(HOSTVARS) $(MAKE) libs PREFIX="$(PREFIX)" OPTTARGET="no-opt" LIB_SH=""
+	cd $< && $(HOSTVARS) $(MAKE) libs $(ARGON2_CONF)
 	cd $< && $(RANLIB) libargon2.a
-	cd $< && $(HOSTVARS) $(MAKE) install PREFIX="$(PREFIX)" OPTTARGET="no-opt" LIB_SH=""
+	cd $< && $(HOSTVARS) $(MAKE) install $(ARGON2_CONF)
 	rm -f $(PREFIX)/lib/libargon2.so* $(PREFIX)/lib/libargon2*.dylib
 	touch $@