Update to OpenSSL 1.1.0e

2 files changed, 11 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5aef0b2e51ff..4c1a9a116983 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar  3 19:11:35 UTC 2017
+# Wed Apr 12 06:23:10 UTC 2017
 pkgbase = ovmf-git
 	pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version
-	pkgver = 21242.f1bbd4e3cc
+	pkgver = 21562.d3e0c996d5
 	pkgrel = 1
 	url = https://tianocore.github.io/ovmf/
 	install = ovmf.install
@@ -19,14 +19,14 @@ pkgbase = ovmf-git
 	conflicts = ovmf
 	conflicts = ovmf-bin
 	conflicts = ovmf-svn
-	noextract = openssl-1.0.2k.tar.gz
+	noextract = openssl-1.1.0e.tar.gz
 	options = !strip
 	options = docs
 	options = !makeflags
 	source = edk2::git+https://github.com/tianocore/edk2.git#branch=master
-	source = https://www.openssl.org/source/openssl-1.0.2k.tar.gz
+	source = https://www.openssl.org/source/openssl-1.1.0e.tar.gz
 	sha1sums = SKIP
-	sha1sums = 5f26a624479c51847ebd2f22bb9f84b3b44dcb44
+	sha1sums = 8bbbaf36feffadd3cb9110912a8192e665ebca4b
 
 pkgname = ovmf-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cc8f1e4b4891..64c766678ddd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,13 +20,13 @@ _COMPILER="GCC49"
 ################
 
 ################
-_OPENSSL_VERSION="1.0.2k"
+_OPENSSL_VERSION="1.1.0e"
 ################
 
 _pkgname="ovmf"
 pkgname="${_pkgname}-git"
 
-pkgver=21242.f1bbd4e3cc
+pkgver=21562.d3e0c996d5
 pkgrel=1
 pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version"
 url="https://tianocore.github.io/ovmf/"
@@ -43,10 +43,11 @@ provides=('ovmf' 'ovmf-bin' 'ovmf-svn')
 install="${_pkgname}.install"
 
 source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master"
-        "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
+        "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz"
+)
 
 sha1sums=('SKIP'
-          '5f26a624479c51847ebd2f22bb9f84b3b44dcb44')
+          '8bbbaf36feffadd3cb9110912a8192e665ebca4b')
 
 noextract=("openssl-${_OPENSSL_VERSION}.tar.gz")
 
@@ -112,18 +113,8 @@ _prepare_openssl_udk_dir() {
 	
 	msg "Download OpenSSL ${_OPENSSL_VERSION} Sources"
 	bsdtar -C "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/" -xf "${srcdir}/openssl-${_OPENSSL_VERSION}.tar.gz"
+	mv "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/openssl-${_OPENSSL_VERSION}" "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/openssl"
 	echo
-	
-	msg "Apply EDK2 Patch for OpenSSL ${_OPENSSL_VERSION}"
-	cd "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/openssl-${_OPENSSL_VERSION}/"
-	patch -p1 -i "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/EDKII_openssl-${_OPENSSL_VERSION}.patch"
-	echo
-	
-	msg "Setup OpenSSL ${_OPENSSL_VERSION} headers in EDK2 dir"
-	cd "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/"
-	chmod 0755 "${_UDK_DIR}/CryptoPkg/Library/OpensslLib/Install.sh"
-	"${_UDK_DIR}/CryptoPkg/Library/OpensslLib/Install.sh"
-	
 }
 
 prepare() {