1 files changed, 12 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index beafe784328c..b27f25658116 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=mingw-w64-openssl-1.0
-_ver=1.0.2p
+_ver=1.0.2u
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('any')
 depends=('mingw-w64-zlib')
-makedepends=('mingw-w64-gcc' 'perl')
+makedepends=('mingw-w64-gcc' 'mingw-w64-environment' 'perl')
 options=(!strip !buildflags staticlibs !emptydirs)
 license=('custom:BSD')
 url='https://www.openssl.org'
@@ -21,14 +21,15 @@ source=("http://www.openssl.org/source/openssl-$_ver.tar.gz"{,.asc}
         'openssl-1.0.1-x32.patch'
         'openssl-1.0.2a-parallel-build.patch'
         'openssl-1.0-versioned-symbols.patch')
-sha256sums=('50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00'
+sha256sums=('ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16'
             'SKIP'
             'd38dfc58fe2c3723f2dfa10408394a6e796bd1e7273804cb19c41baf3dcee534'
             '164aa4928b022cc716fac545b4fd69899cb274682aa487100e595abb652adbae'
             'f913185a36538315de3ff122ef96fc9a49e068078e65895cfc950bdb4ac4e4f0'
             '609d7ca040f7ab26f5e9844e486b3bcc04f3da656ce2db7733fbd65c6d10457a'
             '353a84e4c92e36c379ebd9216b8f8fb9c271396583561eb84ac8c825979acaa6')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
+              '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -38,8 +39,9 @@ prepare() {
   patch -p1 -i ${srcdir}/openssl-1.0.2a-parallel-build.patch
   patch -p1 -i ${srcdir}/openssl-1.0.1-x32.patch
   patch -p1 -i ${srcdir}/openssl-1.0.2a-x509.patch
-  sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4/' Configure
-  sed -i -e '/^"mingw64"/ s/-O3 -Wall/-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4/' Configure
+  #source mingw-env ${_arch}
+  #sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/'$CFLAGS'/' Configure
+  #sed -i -e '/^"mingw64"/ s/-O3 -Wall/'$CFLAGS'/' Configure
   # add symbol versioning to prevent conflicts with openssl 1.1 symbols (Debian)
   patch -p1 -i "$srcdir"/openssl-1.0-versioned-symbols.patch
 }
@@ -47,6 +49,7 @@ prepare() {
 build() {
   cd "${srcdir}/openssl-$_ver"
   for _arch in ${_architectures}; do
+    source mingw-env ${_arch}
     mkdir -p "${srcdir}/build-${_arch}" && cp -a "${srcdir}/openssl-$_ver/"* "${srcdir}/build-${_arch}" && cd "${srcdir}/build-${_arch}"
     _mingw=mingw
     [ "${_arch}" = 'x86_64-w64-mingw32' ] && _mingw=mingw64
@@ -59,7 +62,9 @@ build() {
       threads \
       shared \
       no-ssl3-method \
-      zlib-dynamic
+      zlib-dynamic \
+      "$LDFLAGS" \
+      "$CFLAGS"
     make
   done
 }