Mercurial > mxe-octave

changeset 4570:ddd228f155af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openssl: update to v1.0.2m * src/openssl-1-fixes.patch: update from mxe.cc * src/openssl.mk: update version, checksum * src/mingw-openssl-3-libdeps.patch: removed file * dist-files.mk: remove ref to mingw-openssl-3-libdeps.patch
author John D
date Tue, 05 Dec 2017 07:53:05 -0500
parents 32c1fd6aef7f
children d5eee507aec2
files dist-files.mk src/mingw-openssl-3-libdeps.patch src/openssl-1-fixes.patch src/openssl.mk
diffstat 4 files changed, 70 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon Dec 04 16:47:54 2017 -0500
+++ b/dist-files.mk	Tue Dec 05 07:53:05 2017 -0500
@@ -323,7 +323,6 @@
   mingw-libgcrypt-1-fixes.patch \
   mingw-libmng-1-noundefines.patch \
   mingw-mesa-1-fixes.patch \
-  mingw-openssl-3-libdeps.patch \
   mingw-portaudio-1-pkgconfig.patch \
   mingw-s2tc-1-fixes.patch \
   mingw-texinfo-1-fixes.patch \
--- a/src/mingw-openssl-3-libdeps.patch	Mon Dec 04 16:47:54 2017 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ur a/engines/ccgost/Makefile b/engines/ccgost/Makefile
---- a/engines/ccgost/Makefile	2013-02-11 10:26:04.000000000 -0500
-+++ b/engines/ccgost/Makefile	2013-10-14 13:38:18.595806411 -0400
-@@ -32,7 +32,7 @@
- 		$(MAKE) -f $(TOP)/Makefile.shared -e \
- 			LIBNAME=$(LIBNAME) \
- 			LIBEXTRAS='$(LIBOBJ)' \
--			LIBDEPS='-L$(TOP) -lcrypto' \
-+			LIBDEPS='-L$(TOP) -lcrypto -lgdi32' \
- 			link_o.$(SHLIB_TARGET); \
- 	else \
- 		$(AR) $(LIB) $(LIBOBJ); \
--- a/src/openssl-1-fixes.patch	Mon Dec 04 16:47:54 2017 -0500
+++ b/src/openssl-1-fixes.patch	Tue Dec 05 07:53:05 2017 -0500
@@ -1,7 +1,8 @@
-This file is part of MXE.
-See index.html for further information.
+This file is part of MXE. See LICENSE.md for licensing information.
 
-From 27c7c56780a801db21ba49139239ecafd0e8fb88 Mon Sep 17 00:00:00 2001
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 8 Jan 2014 02:19:10 +0100
 Subject: [PATCH 1/2] winsock2
@@ -9,50 +10,34 @@
 -This patch has been taken from:
 -http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
 
-diff --git a/e_os.h b/e_os.h
-index 6a0aad1..4928713 100644
---- a/e_os.h
-+++ b/e_os.h
-@@ -499,7 +499,7 @@ static unsigned int _strlen31(const char *str)
- #      endif
- #      if !defined(IPPROTO_IP)
-          /* winsock[2].h was included already? */
--#        include <winsock.h>
-+#        include <winsock2.h>
- #      endif
- #      ifdef getservbyname
- #        undef getservbyname
 diff --git a/ssl/dtls1.h b/ssl/dtls1.h
-index e65d501..7762089 100644
+index 1111111..2222222 100644
 --- a/ssl/dtls1.h
 +++ b/ssl/dtls1.h
 @@ -68,7 +68,7 @@
- #endif
- #ifdef OPENSSL_SYS_WIN32
+ # endif
+ # ifdef OPENSSL_SYS_WIN32
  /* Needed for struct timeval */
--#include <winsock.h>
-+#include <winsock2.h>
- #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
- #include <sys/timeval.h>
- #else
+-#  include <winsock.h>
++#  include <winsock2.h>
+ # elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
+ #  include <sys/timeval.h>
+ # else
 diff --git a/ssl/ssltest.c b/ssl/ssltest.c
-index 4f80be8..af5f1be 100644
+index 1111111..2222222 100644
 --- a/ssl/ssltest.c
 +++ b/ssl/ssltest.c
-@@ -193,7 +193,7 @@
- 				  */
+@@ -198,7 +198,7 @@
+ #define _XOPEN_SOURCE_EXTENDED  1
  
  #ifdef OPENSSL_SYS_WINDOWS
--#include <winsock.h>
-+#include <winsock2.h>
+-# include <winsock.h>
++# include <winsock2.h>
  #else
- #include OPENSSL_UNISTD
+ # include OPENSSL_UNISTD
  #endif
--- 
-1.8.4.5
 
-
-From 8f930a5f4b18990cf24383fde0e493afbb240c8b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tom Molesworth <tom@entitymodel.com>
 Date: Wed, 8 Jan 2014 02:20:21 +0100
 Subject: [PATCH 2/2] Patch OpenSSL POD docs for perl-5.16+
@@ -63,10 +48,10 @@
 Should be harmless for earlier versions of perl.
 
 diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
-index a76b3e0..9a05fa4 100644
+index 1111111..2222222 100644
 --- a/doc/apps/cms.pod
 +++ b/doc/apps/cms.pod
-@@ -465,28 +465,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
+@@ -483,28 +483,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
  
  =over 4
  
@@ -102,10 +87,10 @@
  the message was verified correctly but an error occurred writing out
  the signers certificates.
 diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
-index d39a59a..1a5cfa6 100644
+index 1111111..2222222 100644
 --- a/doc/apps/smime.pod
 +++ b/doc/apps/smime.pod
-@@ -308,28 +308,28 @@ remains DER.
+@@ -313,28 +313,28 @@ remains DER.
  
  =over 4
  
@@ -141,7 +126,7 @@
  the message was verified correctly but an error occurred writing out
  the signers certificates.
 diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod
-index 1c068c8..8477fda 100644
+index 1111111..2222222 100644
 --- a/doc/crypto/rand.pod
 +++ b/doc/crypto/rand.pod
 @@ -74,16 +74,16 @@ First up I will state the things I believe I need for a good RNG.
@@ -196,10 +181,10 @@
  Given the random number output stream, it should not be possible to determine
  the RNG state or the next random number.
 diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
-index f4d191c..5f2a3f1 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_COMP_add_compression_method.pod
 +++ b/doc/ssl/SSL_COMP_add_compression_method.pod
-@@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values:
+@@ -59,11 +59,11 @@ SSL_COMP_add_compression_method() may return the following values:
  
  =over 4
  
@@ -214,7 +199,7 @@
  The operation failed. Check the error queue to find out the reason.
  
 diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
-index 8e0abd3..f5a487c 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_add_session.pod
 +++ b/doc/ssl/SSL_CTX_add_session.pod
 @@ -52,13 +52,13 @@ The following values are returned by all functions:
@@ -234,7 +219,7 @@
   The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
-index d1d8977..449c8c9 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_load_verify_locations.pod
 +++ b/doc/ssl/SSL_CTX_load_verify_locations.pod
 @@ -100,13 +100,13 @@ The following return values can occur:
@@ -254,7 +239,7 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
-index 5e97392..6b04440 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
 +++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
 @@ -66,13 +66,13 @@ values:
@@ -274,7 +259,7 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
-index 7c9e515..ea36746 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_set_session_id_context.pod
 +++ b/doc/ssl/SSL_CTX_set_session_id_context.pod
 @@ -64,13 +64,13 @@ return the following values:
@@ -294,7 +279,7 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
-index e254f96..c15f86e 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_set_ssl_version.pod
 +++ b/doc/ssl/SSL_CTX_set_ssl_version.pod
 @@ -42,11 +42,11 @@ and SSL_set_ssl_method():
@@ -312,32 +297,23 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
-index 9da7201..a60d041 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
 +++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
 @@ -83,7 +83,7 @@ Return values from the server callback are interpreted as follows:
  
  =over 4
  
--=item > 0
-+=item * > 0
- 
- PSK identity was found and the server callback has provided the PSK
- successfully in parameter B<psk>. Return value is the length of
-@@ -96,7 +96,7 @@ data to B<psk> and return the length of the random data, so the
- connection will fail with decryption_error before it will be finished
- completely.
- 
 -=item Z<>0
 +=item * Z<>0
  
  PSK identity was not found. An "unknown_psk_identity" alert message
  will be sent and the connection setup fails.
 diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
-index 2239444..5e032e6 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_accept.pod
 +++ b/doc/ssl/SSL_accept.pod
-@@ -44,18 +44,18 @@ The following return values can occur:
+@@ -41,18 +41,18 @@ The following return values can occur:
  
  =over 4
  
@@ -360,7 +336,7 @@
  The TLS/SSL handshake was not successful because a fatal error occurred either
  at the protocol level or a connection failure occurred. The shutdown was
 diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
-index ba192bd..479f97f 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_clear.pod
 +++ b/doc/ssl/SSL_clear.pod
 @@ -56,12 +56,12 @@ The following return values can occur:
@@ -379,7 +355,7 @@
  The SSL_clear() operation was successful.
  
 diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
-index 68e2b82..52c4aa9 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_connect.pod
 +++ b/doc/ssl/SSL_connect.pod
 @@ -41,18 +41,18 @@ The following return values can occur:
@@ -405,10 +381,10 @@
  The TLS/SSL handshake was not successful, because a fatal error occurred either
  at the protocol level or a connection failure occurred. The shutdown was
 diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
-index b35ddf5..871f15c 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_do_handshake.pod
 +++ b/doc/ssl/SSL_do_handshake.pod
-@@ -45,18 +45,18 @@ The following return values can occur:
+@@ -42,18 +42,18 @@ The following return values can occur:
  
  =over 4
  
@@ -431,7 +407,7 @@
  The TLS/SSL handshake was not successful because a fatal error occurred either
  at the protocol level or a connection failure occurred. The shutdown was
 diff --git a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
-index 165c6a5..073e99c 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
 +++ b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
 @@ -36,11 +36,11 @@ before the SSL index is created.
@@ -449,7 +425,7 @@
  An error occurred, check the error stack for a detailed error message.
  
 diff --git a/doc/ssl/SSL_get_fd.pod b/doc/ssl/SSL_get_fd.pod
-index 89260b5..1207658 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_get_fd.pod
 +++ b/doc/ssl/SSL_get_fd.pod
 @@ -26,12 +26,12 @@ The following return values can occur:
@@ -468,35 +444,31 @@
  The file descriptor linked to B<ssl>.
  
 diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
-index 8ca0ce5..14c472f 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_read.pod
 +++ b/doc/ssl/SSL_read.pod
-@@ -81,12 +81,12 @@ The following return values can occur:
+@@ -81,16 +81,16 @@ The following return values can occur:
  
  =over 4
  
--=item E<gt>0
-+=item * E<gt>0
- 
- The read operation was successful; the return value is the number of
- bytes actually read from the TLS/SSL connection.
+-=item E<gt> 0
++=item * E<gt> 0
  
--=item Z<>0
-+=item * Z<>0
+ The read operation was successful.
+ The return value is the number of bytes actually read from the TLS/SSL
+ connection.
  
- The read operation was not successful. The reason may either be a clean
- shutdown due to a "close notify" alert sent by the peer (in which case
-@@ -103,7 +103,7 @@ only be detected, whether the underlying connection was closed. It cannot
- be checked, whether the closure was initiated by the peer or by something
- else.
+-=item Z<><= 0
++=item * Z<><= 0
+ 
  
 -=item E<lt>0
 +=item * E<lt>0
  
- The read operation was not successful, because either an error occurred
- or action must be taken by the calling process. Call SSL_get_error() with the
+ The read operation was not successful, because either the connection was closed,
+ an error occurred or action must be taken by the calling process.
 diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
-index b09d8a7..7f49da1 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_session_reused.pod
 +++ b/doc/ssl/SSL_session_reused.pod
 @@ -27,11 +27,11 @@ The following return values can occur:
@@ -514,7 +486,7 @@
  A session was reused.
  
 diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
-index 1480871..bfc39ed 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_set_fd.pod
 +++ b/doc/ssl/SSL_set_fd.pod
 @@ -35,11 +35,11 @@ The following return values can occur:
@@ -532,7 +504,7 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
-index 197b521..fbdee4c 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_set_session.pod
 +++ b/doc/ssl/SSL_set_session.pod
 @@ -37,11 +37,11 @@ The following return values can occur:
@@ -550,7 +522,7 @@
  The operation succeeded.
  
 diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod
-index fe01308..879a33a 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_set_shutdown.pod
 +++ b/doc/ssl/SSL_set_shutdown.pod
 @@ -24,16 +24,16 @@ The shutdown state of an ssl connection is a bitmask of:
@@ -574,7 +546,7 @@
  A shutdown alert was received form the peer, either a normal "close notify"
  or a fatal error.
 diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
-index 85d4a64..9fe029b 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_shutdown.pod
 +++ b/doc/ssl/SSL_shutdown.pod
 @@ -92,19 +92,19 @@ The following return values can occur:
@@ -595,39 +567,27 @@
  The shutdown was successfully completed. The "close notify" alert was sent
  and the peer's "close notify" alert was received.
  
--=item -1
-+=item * -1
+-=item E<lt>0
++=item * E<lt>0
  
  The shutdown was not successful because a fatal error occurred either
  at the protocol level or a connection failure occurred. It can also occur if
 diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
-index a57617f..70c1630 100644
+index 1111111..2222222 100644
 --- a/doc/ssl/SSL_write.pod
 +++ b/doc/ssl/SSL_write.pod
 @@ -74,12 +74,12 @@ The following return values can occur:
  
  =over 4
  
--=item E<gt>0
-+=item * E<gt>0
+-=item E<gt> 0
++=item * E<gt> 0
  
  The write operation was successful, the return value is the number of
  bytes actually written to the TLS/SSL connection.
  
--=item Z<>0
-+=item * Z<>0
- 
- The write operation was not successful. Probably the underlying connection
- was closed. Call SSL_get_error() with the return value B<ret> to find out,
-@@ -90,7 +90,7 @@ SSLv2 (deprecated) does not support a shutdown alert protocol, so it can
- only be detected, whether the underlying connection was closed. It cannot
- be checked, why the closure happened.
+-=item Z<><= 0
++=item * Z<><= 0
  
--=item E<lt>0
-+=item * E<lt>0
- 
- The write operation was not successful, because either an error occurred
- or action must be taken by the calling process. Call SSL_get_error() with the
--- 
-1.8.4.5
-
+ The write operation was not successful, because either the connection was
+ closed, an error occurred or action must be taken by the calling process.
--- a/src/openssl.mk	Mon Dec 04 16:47:54 2017 -0500
+++ b/src/openssl.mk	Tue Dec 05 07:53:05 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := openssl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.1k
-$(PKG)_CHECKSUM := 19d818e202558c212a9583fcdaf876995a633ddf
+$(PKG)_VERSION  := 1.0.2m
+$(PKG)_CHECKSUM := 27fb00641260f97eaa587eb2b80fab3647f6013b
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.openssl.org/source/$($(PKG)_FILE)
@@ -26,6 +26,7 @@
 else
   $(PKG)_CROSS_COMPILE_MAKE_ARG := CROSS_COMPILE='$(MXE_TOOL_PREFIX)'
   $(PKG)_CC := $(MXE_CC)
+  $(PKG)_RC := $(MXE_WINDRES)
   ifeq ($(TARGET),x86_64-w64-mingw32)
     $(PKG)_CONFIGURE := ./Configure mingw64
   else
@@ -41,7 +42,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && CC='$($(PKG)_CC)' \
+    cd '$(1)' && CC='$($(PKG)_CC)' RC='$($(PKG)_RC)' \
         $($(PKG)_CONFIGURE) \
         zlib \
         shared \