From 54e77851aee72a9ed4ac6c4d2e863eb03102ccd2 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Tue, 16 Jun 2015 15:37:08 +0300
Subject: [PATCH] openssl: Update to 1.0.2c

---
 mingw-w64-openssl/PKGBUILD                    | 20 ++++++++-----------
 .../openssl-1.0.2-s_client-verify.patch       | 17 ----------------
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 mingw-w64-openssl/openssl-1.0.2-s_client-verify.patch

diff --git a/mingw-w64-openssl/PKGBUILD b/mingw-w64-openssl/PKGBUILD
index d844e9dabc..9f4893e5ee 100644
--- a/mingw-w64-openssl/PKGBUILD
+++ b/mingw-w64-openssl/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=openssl
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-_ver=1.0.2a
+_ver=1.0.2c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -20,36 +20,32 @@ source=(http://www.openssl.org/source/${_realname}-${_ver}.tar.gz{,.asc}
         'openssl-1.0.2a-parallel-build.patch'
         'openssl-1.0.1-x32.patch'
         'openssl-0.9.6-x509.patch'
-        'openssl-1.0.2-s_client-verify.patch'
         'openssl-1.0.1i-relocation.patch')
-md5sums=('a06c547dac9044161a477211049f60ef'
+md5sums=('8c8d81a9ae7005276e486702edbcd4b6'
          'SKIP'
          '9e0abad8dd17079815d9e92345c5adcb'
          '835a78dbe9c8690dbdd9190aaf5432e7'
          '1d363d5e19c6eb4144b49f9daadefd5f'
          '87610b76871d53d4b6f07374000dae87'
          'cae4eea6db48a254653fd1903cfabd15'
-         'c7856c88da72348a76a666d42cba0f46'
          'd8ed0865f35216a5e420e37d7a4e2515')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
-  cd $startdir/
   # Clean up old sources so re-patching doesn't fail.
-  [[ -d $srcdir/${_realname}-${_ver} ]] && rm -rf $srcdir/${_realname}-${_ver}
-  tar -xzvf ${_realname}-${_ver}.tar.gz -C $srcdir
-  cd $srcdir/${_realname}-${_ver}
+  [[ -d $srcdir/${_realname}-${_ver} ]] && rm -rf ${srcdir}/${_realname}-${_ver}
+  tar -xzvf ${_realname}-${_ver}.tar.gz -C ${srcdir}
+  cd ${srcdir}/${_realname}-${_ver}
 
   patch -p1 -i ${srcdir}/openssl-1.0.0a-ldflags.patch
   patch -p1 -i ${srcdir}/openssl-1.0.0d-windres.patch
   patch -p1 -i ${srcdir}/openssl-1.0.2a-parallel-build.patch
-  patch -p1 -i ${srcdir}/openssl-1.0.2-s_client-verify.patch
   patch -p1 -i ${srcdir}/openssl-1.0.1-x32.patch
   patch -p1 -i ${srcdir}/openssl-0.9.6-x509.patch
   patch -p1 -i ${srcdir}/openssl-1.0.1i-relocation.patch
 
   # No support for out-of-source builds
-  mkdir -p $srcdir/build-${CARCH}
+  mkdir -p ${srcdir}/build-${CARCH}
   cp -a ${srcdir}/${_realname}-${_ver}/* ${srcdir}/build-${CARCH}
 
   # Use mingw cflags instead of hardcoded ones
@@ -65,7 +61,7 @@ build()
   if $(echo ${CARCH} | grep -q x86_64); then
     _mingw=mingw64
   fi
-  cd "$srcdir/build-${CARCH}"
+  cd "${srcdir}/build-${CARCH}"
   export MSYS2_ARG_CONV_EXCL="--prefix="
   ./Configure \
     --prefix=${MINGW_PREFIX} \
@@ -82,7 +78,7 @@ build()
 }
 
 package() {
-  cd "$srcdir/build-${CARCH}"
+  cd "${srcdir}/build-${CARCH}"
   make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=${MINGW_PREFIX}/share/man MANSUFFIX=ssl install
 
   install -D -m644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
diff --git a/mingw-w64-openssl/openssl-1.0.2-s_client-verify.patch b/mingw-w64-openssl/openssl-1.0.2-s_client-verify.patch
deleted file mode 100644
index 803a91dde9..0000000000
--- a/mingw-w64-openssl/openssl-1.0.2-s_client-verify.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/472584
-http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest
-
-fix verification handling in s_client.  when loading paths, make sure
-we properly fallback to setting the default paths.
-
---- openssl-1.0.2/apps/s_client.c
-+++ openssl-1.0.2/apps/s_client.c
-@@ -1337,7 +1337,7 @@
- 
-     SSL_CTX_set_verify(ctx, verify, verify_callback);
- 
--    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-+    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) &&
-         (!SSL_CTX_set_default_verify_paths(ctx))) {
-         /*
-          * BIO_printf(bio_err,"error setting default verify locations\n");