Updated to 1.1.0i

3 files changed, 39 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00d2f2d8d009..1051013a7476 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = mingw-w64-openssl
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)
-	pkgver = 1.1.0.h
+	pkgver = 1.1.0.i
 	pkgrel = 1
-	url = http://www.openssl.org
+	url = https://www.openssl.org
 	arch = any
-	license = custom:BSD
+	license = BSD
 	makedepends = mingw-w64-gcc
 	makedepends = perl
 	depends = mingw-w64-zlib
 	options = !strip
-	options = !buildflags
 	options = staticlibs
-	options = !emptydirs
-	source = http://www.openssl.org/source/openssl-1.1.0h.tar.gz
-	source = http://www.openssl.org/source/openssl-1.1.0h.tar.gz.asc
+	options = !buildflags
+	source = https://www.openssl.org/source/openssl-1.1.0i.tar.gz
+	source = https://www.openssl.org/source/openssl-1.1.0i.tar.gz.asc
 	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
-	sha256sums = 5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517
+	sha256sums = ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99
 	sha256sums = SKIP
 
 pkgname = mingw-w64-openssl
diff --git a/.gitignore b/.gitignore
index 3ffe417662d9..97589fb4de69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-pkg/
-src/
-*.asc
-*.gz
-*.log
-*.tar
-*.xz
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.diff
diff --git a/PKGBUILD b/PKGBUILD
index 2c5dbb1209f2..6c7aad818e6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,37 @@
+# Maintainer: pingplug <pingplug@foxmail.com>
+# Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
 # Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
+
+_pkgver=1.1.0i
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 pkgname=mingw-w64-openssl
-_ver=1.1.0h
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgver=${_pkgver/[a-z]/.${_pkgver//[0-9.]/}}
 pkgrel=1
 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)"
-arch=(any)
-depends=(mingw-w64-zlib)
-makedepends=(mingw-w64-gcc perl)
-options=(!strip !buildflags staticlibs !emptydirs)
-license=("custom:BSD")
-url="http://www.openssl.org"
-source=("http://www.openssl.org/source/openssl-$_ver.tar.gz"{,.asc})
-sha256sums=('5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517'
+arch=('any')
+url="https://www.openssl.org"
+license=('BSD')
+depends=('mingw-w64-zlib')
+makedepends=('mingw-w64-gcc'
+             'perl')
+options=('!strip' 'staticlibs' '!buildflags')
+source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
+sha256sums=('ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99'
             'SKIP')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
-
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt@openssl.org>
 
 prepare() {
-  cd openssl-$_ver
+  cd openssl-${_pkgver}
   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
 }
 
 build() {
-  cd "${srcdir}/openssl-$_ver"
+  cd "${srcdir}/openssl-${_pkgver}"
   for _arch in ${_architectures}; do
-    mkdir -p "${srcdir}/build-${_arch}" && cp -a "${srcdir}/openssl-$_ver/"* "${srcdir}/build-${_arch}" && cd "${srcdir}/build-${_arch}"
+    mkdir -p "${srcdir}/build-${_arch}" && cp -a "${srcdir}/openssl-${_pkgver}/"* "${srcdir}/build-${_arch}" && cd "${srcdir}/build-${_arch}"
     _mingw=mingw
     [ "${_arch}" = 'x86_64-w64-mingw32' ] && _mingw=mingw64
     ./Configure \
@@ -48,8 +52,10 @@ package() {
     cd "${srcdir}/build-${_arch}"
     make -j1 DESTDIR="${pkgdir}" install_sw
     install -m644 ms/applink.c "${pkgdir}/usr/${_arch}/include/openssl/"
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
+    find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
+    find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
   done
 }
+
+# vim:set ts=2 sw=2 et: