Update openssl to version 1.0.2j

The windres patch was accepted upstream in a slightly different manner, so we drop our patch now. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Oct 4, 2016 · 0803400 · 0803400
1 parent 27b7b13
commit 0803400
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 81 deletions.
diff --git a/mingw-w64-openssl/PKGBUILD b/mingw-w64-openssl/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=openssl
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-_ver=1.0.2h
+_ver=1.0.2j
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -17,15 +17,13 @@ url="https://www.openssl.org"
 noextract=(${_realname}-${_ver}.tar.gz)
 source=(https://www.openssl.org/source/${_realname}-${_ver}.tar.gz{,.asc}
         'openssl-1.0.0a-ldflags.patch'
-        'openssl-1.0.0d-windres.patch'
         'openssl-1.0.2a-parallel-build.patch'
         'openssl-1.0.1-x32.patch'
         'openssl-0.9.6-x509.patch'
         'openssl-1.0.1i-relocation.patch')
-sha256sums=('1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919'
+sha256sums=('e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431'
             'SKIP'
             '164aa4928b022cc716fac545b4fd69899cb274682aa487100e595abb652adbae'
-            '906aad130d43e61d47d6843adc9f4a4f2ba027e698f9a840be77b53a36ca80b6'
             '609d7ca040f7ab26f5e9844e486b3bcc04f3da656ce2db7733fbd65c6d10457a'
             'f913185a36538315de3ff122ef96fc9a49e068078e65895cfc950bdb4ac4e4f0'
             'e8ed15b50f749064e89f26d49b7fd85b3f95e5dde22e430c0f6181e5b07146c7'
@@ -40,7 +38,6 @@ prepare() {
   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.1-x32.patch
   patch -p1 -i ${srcdir}/openssl-0.9.6-x509.patch

diff --git a/mingw-w64-openssl/openssl-1.0.0d-windres.patch b/mingw-w64-openssl/openssl-1.0.0d-windres.patch