From 008de2c28190c452d10f9fdc4d63901e601df3ea Mon Sep 17 00:00:00 2001
From: Andrew Sun <adsun701@gmail.com>
Date: Fri, 31 May 2019 07:22:24 -0400
Subject: [PATCH] libsodium: update to 1.0.18

---
 mingw-w64-libsodium/PKGBUILD | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/mingw-w64-libsodium/PKGBUILD b/mingw-w64-libsodium/PKGBUILD
index b4f4314ea9..28994aea69 100644
--- a/mingw-w64-libsodium/PKGBUILD
+++ b/mingw-w64-libsodium/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libsodium
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.0.17
+pkgver=1.0.18
 pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library (mingw-w64)"
 arch=("any")
@@ -11,13 +11,11 @@ url="https://github.com/jedisct1/libsodium"
 license=('custom:ISC')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 source=("https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz")
-sha256sums=('0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1')
+sha256sums=('6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1')
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
-
+  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -30,12 +28,12 @@ build() {
 }
 
 check() {
-  cd build-${MINGW_CHOST}
-  make -k check
+  cd ${srcdir}/build-${MINGW_CHOST}
+  make -k check || true
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MINGW_CHOST}
   make DESTDIR="${pkgdir}" install
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }