dev-libs/openssl: sync, bump winnt patches

Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3

6 files changed, 73 insertions, 8 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a075dde0e0..2862f957b7 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-1.0.2k.tar.gz 5309236 SHA256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 WHIRLPOOL ffa3d89a078db6829f1fff21779a19c87e059600162e6d7d3114b8440ba5fa7d1a08e04594b6ed8ab47e148782de299d7ec338f2ba2d466bf7737b0749f590cd
 DIST openssl-1.0.2l.tar.gz 5365054 SHA256 ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c SHA512 047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 WHIRLPOOL fa5b303fd7007eb2b7afe0b6a7d90a6676b738bf39addc1005f15a4664e61e72f9465d5020477abcf6b3e420d46a618e44751ad9e21671c70e5dbe8cdc768bfc
-DIST openssl-1.1.0c.tar.gz 5179668 SHA256 fc436441a2e05752d31b4e46115eb89709a28aef96d4fe786abe92409b2fd6f5 SHA512 e3cfba6c682e5edd6f678df7c1da9c9713880f7dca248e6d62f095185c22ce8fd7571d53a54a119fb5d4422578637746ad2809bb2ba324a5c54564f532307ad9 WHIRLPOOL d6ee4610a6ce5c8d2593bcd9f8a2fc55910006d3f466d0d27409f92b4f60880f96979ccbbdf9da5cf110c59a86e1a906bf20a8eb93338efa9e197bd4755ce4d8
+DIST openssl-1.1.0f.tar.gz 5278176 SHA256 12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765 SHA512 340ab3f38c90dea346e543b58bc0eff0adede15be212ad20b7cf38718a7f94fab51996da414855c180540f7488b8bd31d8b9a0d04bb19159f735c46d8f6df22c WHIRLPOOL bb4ce1d100c5eb567de0139e4a1c0a2bb1cd308bd014704d6bb796d3fcfc16b91fe69839068944831746e0b937a6ccb234b5cea3b4911fab4283500ed380f0b6
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2
index aea716dd63..a2d64d56c4 100755
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
@@ -33,7 +33,7 @@ if [[ $1 == "test" ]] ; then
 		"i686-apple-darwinX           |darwin-i386-cc" \
 		"i386-apple-darwinX           |darwin-i386-cc" \
 		"powerpc-apple-darwinX        |darwin-ppc-cc" \
-		"i586-pc-winnt                |winnt-parity" \
+		"i586-pc-winnt                |mingwvc-parity" \
 		"i586-pc-cygwin2.0            |Cygwin" \
 		"x86_64-pc-cygwin             |Cygwin-x86_64" \
 		"s390-ibm-linux-gnu           |linux-generic32 -DB_ENDIAN" \
@@ -65,7 +65,7 @@ case ${CHOST} in
 	*-hpux*)         system="hpux";;
 	*-linux*)        system="linux";;
 	*-solaris*)      system="solaris";;
-	*-winnt*)        system="winnt";;
+	*-winnt*)        system="mingwvc";;
 	x86_64-*-mingw*) system="mingw64";;
 	*mingw*)         system="mingw";;
 	*)               exit 0;;
@@ -160,7 +160,7 @@ solaris)
 		sparc*)       machine=sparcv8-${compiler};;
 	esac
 	;;
-winnt)
+mingwvc)
 	machine=parity
 	;;
 mingw*)
diff --git a/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch b/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch
new file mode 100644
index 0000000000..cbf1bad692
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch
@@ -0,0 +1,31 @@
+--- openssl-1.0.2l/Configure	2017-10-02 13:14:38.701296300 +0200
++++ openssl-1.0.2l-.default/Configure	2017-10-02 13:19:34.325506800 +0200
+@@ -602,6 +602,7 @@
+ 
+ # MinGW
+ "mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
++"mingwvc-parity","parity.gnu.gcc:-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE:::MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${no_asm}:win32:cygwin-shared:-D_WINDLL -fPIC -DPIC::.dll.a",
+ # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
+ # compiled with one compiler with application compiled with another
+ # compiler. It's possible to engage Applink support in mingw64 build,
+--- openssl-1.0.2l/e_os.h	2017-05-25 14:54:34.000000000 +0200
++++ openssl-1.0.2l-.default/e_os.h	2017-10-02 15:13:18.575589700 +0200
+@@ -652,7 +652,7 @@
+  * Some IPv6 implementations are broken, disable them in known bad versions.
+  */
+ #  if !defined(OPENSSL_USE_IPV6)
+-#   if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB)
++#   if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB) && !defined(_WIN32)
+ #    define OPENSSL_USE_IPV6 1
+ #   else
+ #    define OPENSSL_USE_IPV6 0
+--- openssl-1.0.2l/util/mklink.pl	2017-05-25 14:54:34.000000000 +0200
++++ openssl-1.0.2l-.default/util/mklink.pl	2017-09-27 17:22:29.528648000 +0200
+@@ -52,6 +52,7 @@
+ my $file;
+ $symlink_exists=eval {symlink("",""); 1};
+ if ($^O eq "msys") { $symlink_exists=0 };
++if ($^O eq "cygwin") { $symlink_exists=0 }; # may use cl.exe on cygwin
+ foreach $file (@files) {
+     my $err = "";
+     if ($symlink_exists) {
diff --git a/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch b/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch
new file mode 100644
index 0000000000..cb68eb9050
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch
@@ -0,0 +1,32 @@
+diff -ru openssl-1.1.0f/Configurations/10-main.conf openssl-1.1.0f-.default/Configurations/10-main.conf
+--- openssl-1.1.0f/Configurations/10-main.conf	2017-05-25 14:46:17.000000000 +0200
++++ openssl-1.1.0f-.default/Configurations/10-main.conf	2017-09-28 12:56:22.544307300 +0200
+@@ -1463,6 +1463,28 @@
+         multilib         => "",
+         apps_aux_src     => add("win32_init.c"),
+     },
++    "mingwvc-parity" => {
++        inherit_from     => [ "BASE_unix", asm("x86_asm"),
++                              sub { $disabled{shared} ? () : "uplink_common" } ],
++        cc               => "gcc",
++        cflags           => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",
++                                           debug   => "-g -O0",
++                                           release => "-O3 -fomit-frame-pointer"),
++                                    threads("-D_MT")),
++        sys_id           => "WIN32",
++        ex_libs          => add("-lws2_32 -lgdi32 -lcrypt32"),
++        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
++        thread_scheme    => "winthreads",
++        perlasm_scheme   => "win32",
++        dso_scheme       => "win32",
++        shared_target    => "mingw-shared",
++        shared_cflag     => add("-D_WINDLL"),
++        shared_ldflag    => "-static-libgcc",
++        shared_rcflag    => "--target=pe-i386",
++        shared_extension => ".dll",
++        multilib         => "",
++        apps_aux_src     => add("win32_init.c"),
++    },
+     "mingw64" => {
+         # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
+         # .dll compiled with one compiler with application compiled with
diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild
index d512d107f2..78e448cb50 100644
--- a/dev-libs/openssl/openssl-1.0.2l.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2l.ebuild
@@ -78,6 +78,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch
 	epatch "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch
 	epatch "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.0.2l-winnt.patch # parity
 
 	# remove -arch for Darwin
 	sed -i '/^"darwin/s,-arch [^ ]\+,,g' Configure || die
diff --git a/dev-libs/openssl/openssl-1.1.0c.ebuild b/dev-libs/openssl/openssl-1.1.0f.ebuild
index 33e4913d4d..38100de289 100644
--- a/dev-libs/openssl/openssl-1.1.0c.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0f.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -13,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
@@ -51,6 +50,8 @@ src_prepare() {
 		epatch_user #332661
 	fi
 
+	epatch "${FILESDIR}"/${PN}-1.1.0f-winnt.patch # parity
+
 	# make sure the man pages are suffixed #302165
 	# don't bother building man pages if they're disabled
 	# Make DOCDIR Gentoo compliant
@@ -136,7 +137,7 @@ multilib_src_configure() {
 	echoit \
 	./${config} \
 		${sslout} \
-		--api=1.1.0 \
+		--api=1.0.0 \
 		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
 		enable-camellia \
 		disable-deprecated \