| 1 |
vapier 08/06/02 15:26:54 |
| 2 |
|
| 3 |
Added: wine-1.0_rc3-openssl.patch |
| 4 |
Log: |
| 5 |
Add fix from upstream for building with newer openssl #224049. |
| 6 |
(Portage version: 2.2_pre5.spank.spunk) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-emulation/wine/files/wine-1.0_rc3-openssl.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/files/wine-1.0_rc3-openssl.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/files/wine-1.0_rc3-openssl.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: wine-1.0_rc3-openssl.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.winehq.org/show_bug.cgi?id=13561 |
| 17 |
http://bugs.gentoo.org/224049 |
| 18 |
|
| 19 |
commit 7c616799894faa48ee3277bc276a39bed55780e0 |
| 20 |
Author: Alexandre Julliard <julliard@××××××.org> |
| 21 |
Date: Mon Jun 2 12:14:37 2008 +0200 |
| 22 |
|
| 23 |
wininet: Include openssl/ssl.h before Windows headers. |
| 24 |
|
| 25 |
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h |
| 26 |
index 2645686..43b8d8e 100644 |
| 27 |
--- a/dlls/wininet/internet.h |
| 28 |
+++ b/dlls/wininet/internet.h |
| 29 |
@@ -38,18 +38,6 @@ |
| 30 |
# include <sys/types.h> |
| 31 |
# include <netinet/in.h> |
| 32 |
#endif |
| 33 |
-#ifdef HAVE_OPENSSL_SSL_H |
| 34 |
-#define DSA __ssl_DSA /* avoid conflict with commctrl.h */ |
| 35 |
-#undef FAR |
| 36 |
-/* avoid conflict with wincrypt.h */ |
| 37 |
-#undef PKCS7_SIGNER_INFO |
| 38 |
-#undef X509_NAME |
| 39 |
-#undef X509_CERT_PAIR |
| 40 |
-# include <openssl/ssl.h> |
| 41 |
-#undef FAR |
| 42 |
-#define FAR do_not_use_this_in_wine |
| 43 |
-#undef DSA |
| 44 |
-#endif |
| 45 |
#ifdef HAVE_SYS_SOCKET_H |
| 46 |
# include <sys/socket.h> |
| 47 |
#endif |
| 48 |
@@ -69,12 +57,10 @@ typedef struct |
| 49 |
{ |
| 50 |
BOOL useSSL; |
| 51 |
int socketFD; |
| 52 |
-#ifdef HAVE_OPENSSL_SSL_H |
| 53 |
- SSL *ssl_s; |
| 54 |
+ void *ssl_s; |
| 55 |
char *peek_msg; |
| 56 |
char *peek_msg_mem; |
| 57 |
size_t peek_len; |
| 58 |
-#endif |
| 59 |
} WININET_NETCONNECTION; |
| 60 |
|
| 61 |
static inline LPWSTR WININET_strdupW( LPCWSTR str ) |
| 62 |
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c |
| 63 |
index 9cd7917..f55fbf2 100644 |
| 64 |
--- a/dlls/wininet/netconnection.c |
| 65 |
+++ b/dlls/wininet/netconnection.c |
| 66 |
@@ -23,6 +23,7 @@ |
| 67 |
#include "config.h" |
| 68 |
#include "wine/port.h" |
| 69 |
|
| 70 |
+#include <sys/types.h> |
| 71 |
#ifdef HAVE_POLL_H |
| 72 |
#include <poll.h> |
| 73 |
#endif |
| 74 |
@@ -42,6 +43,22 @@ |
| 75 |
#ifdef HAVE_SYS_IOCTL_H |
| 76 |
# include <sys/ioctl.h> |
| 77 |
#endif |
| 78 |
+#include <time.h> |
| 79 |
+#ifdef HAVE_NETDB_H |
| 80 |
+# include <netdb.h> |
| 81 |
+#endif |
| 82 |
+#ifdef HAVE_NETINET_IN_H |
| 83 |
+# include <netinet/in.h> |
| 84 |
+#endif |
| 85 |
+#ifdef HAVE_OPENSSL_SSL_H |
| 86 |
+# include <openssl/ssl.h> |
| 87 |
+#undef FAR |
| 88 |
+#undef DSA |
| 89 |
+#endif |
| 90 |
+#ifdef HAVE_SYS_SOCKET_H |
| 91 |
+# include <sys/socket.h> |
| 92 |
+#endif |
| 93 |
+ |
| 94 |
#include <stdarg.h> |
| 95 |
#include <stdlib.h> |
| 96 |
#include <string.h> |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
-- |
| 101 |
gentoo-commits@l.g.o mailing list |
Archives