Mercurial > mxe-octave

changeset 3299:45018a221c4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] Update openssl patch to newer version.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 09 Nov 2013 23:28:04 -0500
parents ba6bf08118a8
children 75c25cc8e6b6
files src/msvc-openssl-1.patch
diffstat 1 files changed, 56 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/src/msvc-openssl-1.patch	Sat Nov 09 23:28:04 2013 -0500
+++ b/src/msvc-openssl-1.patch	Sat Nov 09 23:28:04 2013 -0500
@@ -1,7 +1,7 @@
-diff -ur openssl-1.0.1c-orig/Configure openssl-1.0.1c/Configure
---- openssl-1.0.1c-orig/Configure	2012-03-14 18:20:40 -0400
-+++ openssl-1.0.1c/Configure	2013-07-01 12:42:45 -0400
-@@ -532,6 +532,7 @@
+diff -ur openssl-1.0.1e-orig/Configure openssl-1.0.1e/Configure
+--- openssl-1.0.1e-orig/Configure	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/Configure	2013-11-09 12:34:55 -0500
+@@ -534,6 +534,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",
@@ -9,7 +9,7 @@
  # 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,
-@@ -1120,7 +1121,7 @@
+@@ -1122,7 +1123,7 @@
  
  my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
  
@@ -18,7 +18,7 @@
  $exe_ext=".nlm" if ($target =~ /netware/);
  $exe_ext=".pm"  if ($target =~ /vos/);
  $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
-@@ -1175,6 +1176,7 @@
+@@ -1177,6 +1178,7 @@
  my $shared_cflag = $fields[$idx_shared_cflag];
  my $shared_ldflag = $fields[$idx_shared_ldflag];
  my $shared_extension = $fields[$idx_shared_extension];
@@ -26,7 +26,7 @@
  my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
  my $ar = $ENV{'AR'} || "ar";
  my $arflags = $fields[$idx_arflags];
-@@ -1201,6 +1203,11 @@
+@@ -1203,6 +1205,11 @@
  	$shared_ldflag =~ s/\-mno\-cygwin\s*//;
  	}
  
@@ -38,7 +38,7 @@
  my $no_shared_warn=0;
  my $no_user_cflags=0;
  
-@@ -1601,6 +1608,7 @@
+@@ -1603,6 +1610,7 @@
  	s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
  	s/^SHLIB_MINOR=.*/SHLIB_MINOR=$shlib_minor/;
  	s/^SHLIB_EXT=.*/SHLIB_EXT=$shared_extension/;
@@ -46,7 +46,7 @@
  	s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
  	s/^MULTILIB=.*$/MULTILIB=$multilib/;
  	s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
-@@ -1806,6 +1814,12 @@
+@@ -1808,6 +1816,12 @@
  		$foo =~ s/\\/\\\\/g;
  		print OUT "#define ENGINESDIR \"$foo\"\n";
  		}
@@ -59,9 +59,9 @@
  	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
  		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
  			if $export_var_as_fn;
-diff -ur openssl-1.0.1c-orig/Makefile.org openssl-1.0.1c/Makefile.org
---- openssl-1.0.1c-orig/Makefile.org	2012-04-22 09:25:19 -0400
-+++ openssl-1.0.1c/Makefile.org	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/Makefile.org openssl-1.0.1e/Makefile.org
+--- openssl-1.0.1e-orig/Makefile.org	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/Makefile.org	2013-11-09 12:34:55 -0500
 @@ -10,6 +10,7 @@
  SHLIB_MAJOR=
  SHLIB_MINOR=
@@ -154,9 +154,9 @@
  			fi; \
  		done; \
  		(	here="`pwd`"; \
-diff -ur openssl-1.0.1c-orig/Makefile.shared openssl-1.0.1c/Makefile.shared
---- openssl-1.0.1c-orig/Makefile.shared	2010-08-21 07:37:17 -0400
-+++ openssl-1.0.1c/Makefile.shared	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/Makefile.shared openssl-1.0.1e/Makefile.shared
+--- openssl-1.0.1e-orig/Makefile.shared	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/Makefile.shared	2013-11-09 12:34:55 -0500
 @@ -261,13 +261,15 @@
  	SHLIB=cyg$(LIBNAME); \
  	base=-Wl,--enable-auto-image-base; \
@@ -213,9 +213,9 @@
  	[ -f apps/$$dll_name ] && rm apps/$$dll_name; \
  	[ -f test/$$dll_name ] && rm test/$$dll_name; \
  	$(LINK_SO_A) || exit 1; \
-diff -ur openssl-1.0.1c-orig/crypto/Makefile openssl-1.0.1c/crypto/Makefile
---- openssl-1.0.1c-orig/crypto/Makefile	2011-12-09 20:37:55 -0500
-+++ openssl-1.0.1c/crypto/Makefile	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/crypto/Makefile openssl-1.0.1e/crypto/Makefile
+--- openssl-1.0.1e-orig/crypto/Makefile	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/Makefile	2013-11-09 12:34:55 -0500
 @@ -33,7 +33,7 @@
  GENERAL=Makefile README crypto-lib.com install.com
  
@@ -225,14 +225,13 @@
  LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
  	ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
  LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
-diff -ur openssl-1.0.1c-orig/crypto/cryptlib.c openssl-1.0.1c/crypto/cryptlib.c
---- openssl-1.0.1c-orig/crypto/cryptlib.c	2012-01-21 07:18:29 -0500
-+++ openssl-1.0.1c/crypto/cryptlib.c	2013-07-01 12:42:45 -0400
-@@ -924,3 +924,81 @@
- 	}
+diff -ur openssl-1.0.1e-orig/crypto/cryptlib.c openssl-1.0.1e/crypto/cryptlib.c
+--- openssl-1.0.1e-orig/crypto/cryptlib.c	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/cryptlib.c	2013-11-09 13:25:02 -0500
+@@ -926,6 +926,84 @@
  
  void *OPENSSL_stderr(void)	{ return stderr; }
-+
+ 
 +#ifdef _MSC_VER
 +char* OPENSSL_relocate(const char* path)
 +{
@@ -310,11 +309,15 @@
 +    return OPENSSL_strdup(path);
 +}
 +#endif
-diff -ur openssl-1.0.1c-orig/crypto/cryptlib.h openssl-1.0.1c/crypto/cryptlib.h
---- openssl-1.0.1c-orig/crypto/cryptlib.h	2011-06-28 09:31:57 -0400
-+++ openssl-1.0.1c/crypto/cryptlib.h	2013-07-01 12:42:45 -0400
++
+ int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
+ 	{
+ 	size_t i;
+diff -ur openssl-1.0.1e-orig/crypto/cryptlib.h openssl-1.0.1e/crypto/cryptlib.h
+--- openssl-1.0.1e-orig/crypto/cryptlib.h	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/cryptlib.h	2013-11-09 12:34:55 -0500
 @@ -103,6 +103,9 @@
- void OPENSSL_showfatal(const char *,...);
+ void OPENSSL_showfatal(const char *fmta,...);
  void *OPENSSL_stderr(void);
  extern int OPENSSL_NONPIC_relocated;
 +#ifdef _MSC_VER
@@ -323,9 +326,9 @@
  
  #ifdef  __cplusplus
  }
-diff -ur openssl-1.0.1c-orig/crypto/dso/dso_win32.c openssl-1.0.1c/crypto/dso/dso_win32.c
---- openssl-1.0.1c-orig/crypto/dso/dso_win32.c	2009-07-15 07:01:40 -0400
-+++ openssl-1.0.1c/crypto/dso/dso_win32.c	2013-07-01 12:44:21 -0400
+diff -ur openssl-1.0.1e-orig/crypto/dso/dso_win32.c openssl-1.0.1e/crypto/dso/dso_win32.c
+--- openssl-1.0.1e-orig/crypto/dso/dso_win32.c	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/dso/dso_win32.c	2013-11-09 12:34:55 -0500
 @@ -638,7 +638,9 @@
  			(strstr(filename, ":") == NULL));
  	if(transform)
@@ -346,9 +349,9 @@
  	else
  		sprintf(translated, "%s", filename);
  	return(translated);
-diff -ur openssl-1.0.1c-orig/crypto/engine/eng_list.c openssl-1.0.1c/crypto/engine/eng_list.c
---- openssl-1.0.1c-orig/crypto/engine/eng_list.c	2010-03-27 14:28:13 -0400
-+++ openssl-1.0.1c/crypto/engine/eng_list.c	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/crypto/engine/eng_list.c openssl-1.0.1e/crypto/engine/eng_list.c
+--- openssl-1.0.1e-orig/crypto/engine/eng_list.c	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/engine/eng_list.c	2013-11-09 12:34:55 -0500
 @@ -401,8 +401,12 @@
  #ifdef OPENSSL_SYS_VMS
  		if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
@@ -378,9 +381,9 @@
  	ENGINE_free(iterator);
  	ENGINEerr(ENGINE_F_ENGINE_BY_ID,ENGINE_R_NO_SUCH_ENGINE);
  	ERR_add_error_data(2, "id=", id);
-diff -ur openssl-1.0.1c-orig/crypto/opensslconf.h.in openssl-1.0.1c/crypto/opensslconf.h.in
---- openssl-1.0.1c-orig/crypto/opensslconf.h.in	2005-12-16 05:37:23 -0500
-+++ openssl-1.0.1c/crypto/opensslconf.h.in	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/crypto/opensslconf.h.in openssl-1.0.1e/crypto/opensslconf.h.in
+--- openssl-1.0.1e-orig/crypto/opensslconf.h.in	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/crypto/opensslconf.h.in	2013-11-09 12:34:55 -0500
 @@ -5,6 +5,7 @@
  
  #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
@@ -389,9 +392,9 @@
  #define ENGINESDIR "/usr/local/lib/engines"
  #define OPENSSLDIR "/usr/local/ssl"
  #endif
-diff -ur openssl-1.0.1c-orig/crypto/x509/x509_def.c openssl-1.0.1c/crypto/x509/x509_def.c
---- openssl-1.0.1c-orig/crypto/x509/x509_def.c	1999-09-11 13:54:11 -0400
-+++ openssl-1.0.1c/crypto/x509/x509_def.c	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/crypto/x509/x509_def.c openssl-1.0.1e/crypto/x509/x509_def.c
+--- openssl-1.0.1e-orig/crypto/x509/x509_def.c	2013-02-11 10:02:48 -0500
++++ openssl-1.0.1e/crypto/x509/x509_def.c	2013-11-09 12:34:55 -0500
 @@ -61,21 +61,31 @@
  #include <openssl/crypto.h>
  #include <openssl/x509.h>
@@ -431,9 +434,9 @@
 -	{ return(X509_CERT_FILE_EVP); }
 +	{ X509_GET_DEFAULT_PATH(X509_CERT_FILE_EVP); }
  
-diff -ur openssl-1.0.1c-orig/engines/Makefile openssl-1.0.1c/engines/Makefile
---- openssl-1.0.1c-orig/engines/Makefile	2010-08-24 17:46:58 -0400
-+++ openssl-1.0.1c/engines/Makefile	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/engines/Makefile openssl-1.0.1e/engines/Makefile
+--- openssl-1.0.1e-orig/engines/Makefile	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/engines/Makefile	2013-11-09 12:34:56 -0500
 @@ -116,7 +116,7 @@
  				*DSO_BEOS*)	sfx=".so";;	\
  				*DSO_DLFCN*)	sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;	\
@@ -443,9 +446,9 @@
  				*)		sfx=".bad";;	\
  				esac; \
  				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-diff -ur openssl-1.0.1c-orig/engines/ccgost/Makefile openssl-1.0.1c/engines/ccgost/Makefile
---- openssl-1.0.1c-orig/engines/ccgost/Makefile	2012-04-26 06:42:20 -0400
-+++ openssl-1.0.1c/engines/ccgost/Makefile	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/engines/ccgost/Makefile openssl-1.0.1e/engines/ccgost/Makefile
+--- openssl-1.0.1e-orig/engines/ccgost/Makefile	2013-11-09 12:34:06 -0500
++++ openssl-1.0.1e/engines/ccgost/Makefile	2013-11-09 12:34:56 -0500
 @@ -50,7 +50,7 @@
  			*DSO_BEOS*) sfx=".so";; \
  			*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
@@ -455,9 +458,9 @@
  			*) sfx=".bad";; \
  			esac; \
  			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-diff -ur openssl-1.0.1c-orig/ssl/Makefile openssl-1.0.1c/ssl/Makefile
---- openssl-1.0.1c-orig/ssl/Makefile	2012-01-02 11:41:11 -0500
-+++ openssl-1.0.1c/ssl/Makefile	2013-07-01 12:42:45 -0400
+diff -ur openssl-1.0.1e-orig/ssl/Makefile openssl-1.0.1e/ssl/Makefile
+--- openssl-1.0.1e-orig/ssl/Makefile	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/ssl/Makefile	2013-11-09 12:34:56 -0500
 @@ -19,7 +19,7 @@
  APPS=
  
@@ -466,10 +469,10 @@
 +SHARED_LIB= $(SHLIB_PRE)ssl$(SHLIB_EXT)
  LIBSRC=	\
  	s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
- 	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
-diff -ur openssl-1.0.1c-orig/util/mkdef.pl openssl-1.0.1c/util/mkdef.pl
---- openssl-1.0.1c-orig/util/mkdef.pl	2011-12-31 18:49:45 -0500
-+++ openssl-1.0.1c/util/mkdef.pl	2013-07-01 12:42:45 -0400
+ 	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
+diff -ur openssl-1.0.1e-orig/util/mkdef.pl openssl-1.0.1e/util/mkdef.pl
+--- openssl-1.0.1e-orig/util/mkdef.pl	2013-02-11 10:26:04 -0500
++++ openssl-1.0.1e/util/mkdef.pl	2013-11-09 12:34:56 -0500
 @@ -1306,7 +1306,7 @@
  ; Definition file for the DLL version of the $name library from OpenSSL
  ;