Mercurial > mxe-octave

annotate src/openssl-1-winsock2.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2279
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1037
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 This patch has been taken from:
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 diff -urN a/e_os.h b/e_os.h
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 --- a/e_os.h 2010-05-31 15:18:08.000000000 +0200
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 +++ b/e_os.h 2010-06-04 17:43:44.370181869 +0200
2279
17099fd15d61 update package openssl
Mark Brand <mabrand@mabrand.nl>
parents: 1076
diff changeset
10 @@ -492,7 +492,7 @@
1037
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 # endif
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 # if !defined(IPPROTO_IP)
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 /* winsock[2].h was included already? */
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 -# include <winsock.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +# include <winsock2.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 # endif
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 # ifdef getservbyname
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 # undef getservbyname
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 diff -urN a/ssl/dtls1.h b/ssl/dtls1.h
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 --- a/ssl/dtls1.h 2010-04-14 02:17:29.000000000 +0200
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +++ b/ssl/dtls1.h 2010-06-04 17:44:27.318182412 +0200
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 @@ -68,7 +68,7 @@
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 #endif
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 #ifdef OPENSSL_SYS_WIN32
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 /* Needed for struct timeval */
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 -#include <winsock.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 +#include <winsock2.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 #include <sys/timeval.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 #else
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 diff -urN a/ssl/ssltest.c b/ssl/ssltest.c
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 --- a/ssl/ssltest.c 2010-01-24 17:57:38.000000000 +0100
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 +++ b/ssl/ssltest.c 2010-06-04 17:44:26.134181765 +0200
2279
17099fd15d61 update package openssl
Mark Brand <mabrand@mabrand.nl>
parents: 1076
diff changeset
34 @@ -193,7 +193,7 @@
1037
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 */
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 #ifdef OPENSSL_SYS_WINDOWS
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 -#include <winsock.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 +#include <winsock2.h>
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 #else
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 #include OPENSSL_UNISTD
5a68e969a9d2 converted sed hack to patch for package openssl
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 #endif