| 1 |
commit: c091fd56ab55f677cc4517301f6b0939142886d1 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 2 14:11:00 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 14:11:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c091fd56 |
| 7 |
|
| 8 |
dev-libs/openssl: sync, bump winnt patches |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-libs/openssl/Manifest | 2 +- |
| 13 |
dev-libs/openssl/files/gentoo.config-1.0.2 | 8 +++--- |
| 14 |
dev-libs/openssl/files/openssl-1.0.2l-winnt.patch | 31 +++++++++++++++++++++ |
| 15 |
dev-libs/openssl/files/openssl-1.1.0f-winnt.patch | 32 ++++++++++++++++++++++ |
| 16 |
dev-libs/openssl/openssl-1.0.2l.ebuild | 1 + |
| 17 |
...openssl-1.1.0c.ebuild => openssl-1.1.0f.ebuild} | 7 +++-- |
| 18 |
6 files changed, 73 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
| 21 |
index a075dde0e0..2862f957b7 100644 |
| 22 |
--- a/dev-libs/openssl/Manifest |
| 23 |
+++ b/dev-libs/openssl/Manifest |
| 24 |
@@ -1,3 +1,3 @@ |
| 25 |
DIST openssl-1.0.2k.tar.gz 5309236 SHA256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 WHIRLPOOL ffa3d89a078db6829f1fff21779a19c87e059600162e6d7d3114b8440ba5fa7d1a08e04594b6ed8ab47e148782de299d7ec338f2ba2d466bf7737b0749f590cd |
| 26 |
DIST openssl-1.0.2l.tar.gz 5365054 SHA256 ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c SHA512 047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 WHIRLPOOL fa5b303fd7007eb2b7afe0b6a7d90a6676b738bf39addc1005f15a4664e61e72f9465d5020477abcf6b3e420d46a618e44751ad9e21671c70e5dbe8cdc768bfc |
| 27 |
-DIST openssl-1.1.0c.tar.gz 5179668 SHA256 fc436441a2e05752d31b4e46115eb89709a28aef96d4fe786abe92409b2fd6f5 SHA512 e3cfba6c682e5edd6f678df7c1da9c9713880f7dca248e6d62f095185c22ce8fd7571d53a54a119fb5d4422578637746ad2809bb2ba324a5c54564f532307ad9 WHIRLPOOL d6ee4610a6ce5c8d2593bcd9f8a2fc55910006d3f466d0d27409f92b4f60880f96979ccbbdf9da5cf110c59a86e1a906bf20a8eb93338efa9e197bd4755ce4d8 |
| 28 |
+DIST openssl-1.1.0f.tar.gz 5278176 SHA256 12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765 SHA512 340ab3f38c90dea346e543b58bc0eff0adede15be212ad20b7cf38718a7f94fab51996da414855c180540f7488b8bd31d8b9a0d04bb19159f735c46d8f6df22c WHIRLPOOL bb4ce1d100c5eb567de0139e4a1c0a2bb1cd308bd014704d6bb796d3fcfc16b91fe69839068944831746e0b937a6ccb234b5cea3b4911fab4283500ed380f0b6 |
| 29 |
|
| 30 |
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 31 |
index aea716dd63..a2d64d56c4 100755 |
| 32 |
--- a/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 33 |
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 34 |
@@ -1,5 +1,5 @@ |
| 35 |
#!/usr/bin/env bash |
| 36 |
-# Copyright 1999-2014 Gentoo Foundation |
| 37 |
+# Copyright 1999-2017 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
# $Id$ |
| 40 |
# |
| 41 |
@@ -33,7 +33,7 @@ if [[ $1 == "test" ]] ; then |
| 42 |
"i686-apple-darwinX |darwin-i386-cc" \ |
| 43 |
"i386-apple-darwinX |darwin-i386-cc" \ |
| 44 |
"powerpc-apple-darwinX |darwin-ppc-cc" \ |
| 45 |
- "i586-pc-winnt |winnt-parity" \ |
| 46 |
+ "i586-pc-winnt |mingwvc-parity" \ |
| 47 |
"i586-pc-cygwin2.0 |Cygwin" \ |
| 48 |
"x86_64-pc-cygwin |Cygwin-x86_64" \ |
| 49 |
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ |
| 50 |
@@ -65,7 +65,7 @@ case ${CHOST} in |
| 51 |
*-hpux*) system="hpux";; |
| 52 |
*-linux*) system="linux";; |
| 53 |
*-solaris*) system="solaris";; |
| 54 |
- *-winnt*) system="winnt";; |
| 55 |
+ *-winnt*) system="mingwvc";; |
| 56 |
x86_64-*-mingw*) system="mingw64";; |
| 57 |
*mingw*) system="mingw";; |
| 58 |
*) exit 0;; |
| 59 |
@@ -160,7 +160,7 @@ solaris) |
| 60 |
sparc*) machine=sparcv8-${compiler};; |
| 61 |
esac |
| 62 |
;; |
| 63 |
-winnt) |
| 64 |
+mingwvc) |
| 65 |
machine=parity |
| 66 |
;; |
| 67 |
mingw*) |
| 68 |
|
| 69 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch b/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch |
| 70 |
new file mode 100644 |
| 71 |
index 0000000000..cbf1bad692 |
| 72 |
--- /dev/null |
| 73 |
+++ b/dev-libs/openssl/files/openssl-1.0.2l-winnt.patch |
| 74 |
@@ -0,0 +1,31 @@ |
| 75 |
+--- openssl-1.0.2l/Configure 2017-10-02 13:14:38.701296300 +0200 |
| 76 |
++++ openssl-1.0.2l-.default/Configure 2017-10-02 13:19:34.325506800 +0200 |
| 77 |
+@@ -602,6 +602,7 @@ |
| 78 |
+ |
| 79 |
+ # MinGW |
| 80 |
+ "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", |
| 81 |
++"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", |
| 82 |
+ # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll |
| 83 |
+ # compiled with one compiler with application compiled with another |
| 84 |
+ # compiler. It's possible to engage Applink support in mingw64 build, |
| 85 |
+--- openssl-1.0.2l/e_os.h 2017-05-25 14:54:34.000000000 +0200 |
| 86 |
++++ openssl-1.0.2l-.default/e_os.h 2017-10-02 15:13:18.575589700 +0200 |
| 87 |
+@@ -652,7 +652,7 @@ |
| 88 |
+ * Some IPv6 implementations are broken, disable them in known bad versions. |
| 89 |
+ */ |
| 90 |
+ # if !defined(OPENSSL_USE_IPV6) |
| 91 |
+-# if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB) |
| 92 |
++# if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB) && !defined(_WIN32) |
| 93 |
+ # define OPENSSL_USE_IPV6 1 |
| 94 |
+ # else |
| 95 |
+ # define OPENSSL_USE_IPV6 0 |
| 96 |
+--- openssl-1.0.2l/util/mklink.pl 2017-05-25 14:54:34.000000000 +0200 |
| 97 |
++++ openssl-1.0.2l-.default/util/mklink.pl 2017-09-27 17:22:29.528648000 +0200 |
| 98 |
+@@ -52,6 +52,7 @@ |
| 99 |
+ my $file; |
| 100 |
+ $symlink_exists=eval {symlink("",""); 1}; |
| 101 |
+ if ($^O eq "msys") { $symlink_exists=0 }; |
| 102 |
++if ($^O eq "cygwin") { $symlink_exists=0 }; # may use cl.exe on cygwin |
| 103 |
+ foreach $file (@files) { |
| 104 |
+ my $err = ""; |
| 105 |
+ if ($symlink_exists) { |
| 106 |
|
| 107 |
diff --git a/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch b/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch |
| 108 |
new file mode 100644 |
| 109 |
index 0000000000..cb68eb9050 |
| 110 |
--- /dev/null |
| 111 |
+++ b/dev-libs/openssl/files/openssl-1.1.0f-winnt.patch |
| 112 |
@@ -0,0 +1,32 @@ |
| 113 |
+diff -ru openssl-1.1.0f/Configurations/10-main.conf openssl-1.1.0f-.default/Configurations/10-main.conf |
| 114 |
+--- openssl-1.1.0f/Configurations/10-main.conf 2017-05-25 14:46:17.000000000 +0200 |
| 115 |
++++ openssl-1.1.0f-.default/Configurations/10-main.conf 2017-09-28 12:56:22.544307300 +0200 |
| 116 |
+@@ -1463,6 +1463,28 @@ |
| 117 |
+ multilib => "", |
| 118 |
+ apps_aux_src => add("win32_init.c"), |
| 119 |
+ }, |
| 120 |
++ "mingwvc-parity" => { |
| 121 |
++ inherit_from => [ "BASE_unix", asm("x86_asm"), |
| 122 |
++ sub { $disabled{shared} ? () : "uplink_common" } ], |
| 123 |
++ cc => "gcc", |
| 124 |
++ cflags => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", |
| 125 |
++ debug => "-g -O0", |
| 126 |
++ release => "-O3 -fomit-frame-pointer"), |
| 127 |
++ threads("-D_MT")), |
| 128 |
++ sys_id => "WIN32", |
| 129 |
++ ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), |
| 130 |
++ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", |
| 131 |
++ thread_scheme => "winthreads", |
| 132 |
++ perlasm_scheme => "win32", |
| 133 |
++ dso_scheme => "win32", |
| 134 |
++ shared_target => "mingw-shared", |
| 135 |
++ shared_cflag => add("-D_WINDLL"), |
| 136 |
++ shared_ldflag => "-static-libgcc", |
| 137 |
++ shared_rcflag => "--target=pe-i386", |
| 138 |
++ shared_extension => ".dll", |
| 139 |
++ multilib => "", |
| 140 |
++ apps_aux_src => add("win32_init.c"), |
| 141 |
++ }, |
| 142 |
+ "mingw64" => { |
| 143 |
+ # As for OPENSSL_USE_APPLINK. Applink makes it possible to use |
| 144 |
+ # .dll compiled with one compiler with application compiled with |
| 145 |
|
| 146 |
diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild |
| 147 |
index d512d107f2..78e448cb50 100644 |
| 148 |
--- a/dev-libs/openssl/openssl-1.0.2l.ebuild |
| 149 |
+++ b/dev-libs/openssl/openssl-1.0.2l.ebuild |
| 150 |
@@ -78,6 +78,7 @@ src_prepare() { |
| 151 |
epatch "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch |
| 152 |
epatch "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch |
| 153 |
epatch "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch |
| 154 |
+ epatch "${FILESDIR}"/${PN}-1.0.2l-winnt.patch # parity |
| 155 |
|
| 156 |
# remove -arch for Darwin |
| 157 |
sed -i '/^"darwin/s,-arch [^ ]\+,,g' Configure || die |
| 158 |
|
| 159 |
diff --git a/dev-libs/openssl/openssl-1.1.0c.ebuild b/dev-libs/openssl/openssl-1.1.0f.ebuild |
| 160 |
similarity index 96% |
| 161 |
rename from dev-libs/openssl/openssl-1.1.0c.ebuild |
| 162 |
rename to dev-libs/openssl/openssl-1.1.0f.ebuild |
| 163 |
index 33e4913d4d..38100de289 100644 |
| 164 |
--- a/dev-libs/openssl/openssl-1.1.0c.ebuild |
| 165 |
+++ b/dev-libs/openssl/openssl-1.1.0f.ebuild |
| 166 |
@@ -1,6 +1,5 @@ |
| 167 |
# Copyright 1999-2017 Gentoo Foundation |
| 168 |
# Distributed under the terms of the GNU General Public License v2 |
| 169 |
-# $Id$ |
| 170 |
|
| 171 |
EAPI=5 |
| 172 |
|
| 173 |
@@ -13,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" |
| 174 |
|
| 175 |
LICENSE="openssl" |
| 176 |
SLOT="0/1.1" # .so version of libssl/libcrypto |
| 177 |
-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" |
| 178 |
+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" |
| 179 |
IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib" |
| 180 |
RESTRICT="!bindist? ( bindist )" |
| 181 |
|
| 182 |
@@ -51,6 +50,8 @@ src_prepare() { |
| 183 |
epatch_user #332661 |
| 184 |
fi |
| 185 |
|
| 186 |
+ epatch "${FILESDIR}"/${PN}-1.1.0f-winnt.patch # parity |
| 187 |
+ |
| 188 |
# make sure the man pages are suffixed #302165 |
| 189 |
# don't bother building man pages if they're disabled |
| 190 |
# Make DOCDIR Gentoo compliant |
| 191 |
@@ -136,7 +137,7 @@ multilib_src_configure() { |
| 192 |
echoit \ |
| 193 |
./${config} \ |
| 194 |
${sslout} \ |
| 195 |
- --api=1.1.0 \ |
| 196 |
+ --api=1.0.0 \ |
| 197 |
$(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
| 198 |
enable-camellia \ |
| 199 |
disable-deprecated \ |
Archives