old

2 files changed, 0 insertions, 137 deletions

diff --git a/app-emulation/wine/files/wine-0.9.51-valgrind.patch b/app-emulation/wine/files/wine-0.9.51-valgrind.patch
deleted file mode 100644
index acd0bb11dcf9..000000000000
--- a/app-emulation/wine/files/wine-0.9.51-valgrind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-http://bugs.gentoo.org/202542
-
-fix from Rafal Muzylo building with newer versions of valgrind
-
---- dlls/ntdll/heap.c
-+++ dlls/ntdll/heap.c
-@@ -142,6 +142,8 @@
-     if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size );
- #ifdef VALGRIND_MAKE_NOACCESS
-     VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ));
-+#elif defined(VALGRIND_MAKE_MEM_NOACCESS)
-+    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size ));
- #endif
- }
- 
-@@ -150,6 +152,8 @@
- {
- #ifdef VALGRIND_MAKE_READABLE
-     VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ));
-+#elif defined(VALGRIND_MAKE_MEM_DEFINED)
-+    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ));
- #endif
- }
- 
-@@ -158,6 +162,8 @@
- {
- #ifdef VALGRIND_MAKE_WRITABLE
-     VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
-+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
-+    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
- #endif
-     if (TRACE_ON(heap) || WARN_ON(heap))
-     {
-@@ -165,6 +171,8 @@
- #ifdef VALGRIND_MAKE_WRITABLE
-         /* make it uninitialized to valgrind again */
-         VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
-+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
-+	VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
- #endif
-     }
- }
---- dlls/ntdll/signal_i386.c
-+++ dlls/ntdll/signal_i386.c
-@@ -936,8 +936,10 @@
-     }
- 
-     stack--;  /* push the stack_layout structure */
--#ifdef HAVE_VALGRIND_MEMCHECK_H
-+#ifdef VALGRIND_MAKE_WRITABLE
-     VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));
-+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
-+     VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack));
- #endif
-     stack->ret_addr     = (void *)0xdeadbabe;  /* raise_func must not return */
-     stack->rec_ptr      = &stack->rec;
diff --git a/app-emulation/wine/files/wine-1.0_rc3-openssl.patch b/app-emulation/wine/files/wine-1.0_rc3-openssl.patch
deleted file mode 100644
index b0ef483902fd..000000000000
--- a/app-emulation/wine/files/wine-1.0_rc3-openssl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-http://bugs.winehq.org/show_bug.cgi?id=13561
-http://bugs.gentoo.org/224049
-
-commit 7c616799894faa48ee3277bc276a39bed55780e0
-Author: Alexandre Julliard <julliard@winehq.org>
-Date:   Mon Jun 2 12:14:37 2008 +0200
-
-    wininet: Include openssl/ssl.h before Windows headers.
-
-diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
-index 2645686..43b8d8e 100644
---- a/dlls/wininet/internet.h
-+++ b/dlls/wininet/internet.h
-@@ -38,18 +38,6 @@
- # include <sys/types.h>
- # include <netinet/in.h>
- #endif
--#ifdef HAVE_OPENSSL_SSL_H
--#define DSA __ssl_DSA  /* avoid conflict with commctrl.h */
--#undef FAR
--/* avoid conflict with wincrypt.h */
--#undef PKCS7_SIGNER_INFO
--#undef X509_NAME
--#undef X509_CERT_PAIR
--# include <openssl/ssl.h>
--#undef FAR
--#define FAR do_not_use_this_in_wine
--#undef DSA
--#endif
- #ifdef HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #endif
-@@ -69,12 +57,10 @@ typedef struct
- {
-     BOOL useSSL;
-     int socketFD;
--#ifdef HAVE_OPENSSL_SSL_H
--    SSL *ssl_s;
-+    void *ssl_s;
-     char *peek_msg;
-     char *peek_msg_mem;
-     size_t peek_len;
--#endif
- } WININET_NETCONNECTION;
- 
- static inline LPWSTR WININET_strdupW( LPCWSTR str )
-diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
-index 9cd7917..f55fbf2 100644
---- a/dlls/wininet/netconnection.c
-+++ b/dlls/wininet/netconnection.c
-@@ -23,6 +23,7 @@
- #include "config.h"
- #include "wine/port.h"
- 
-+#include <sys/types.h>
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-@@ -42,6 +43,22 @@
- #ifdef HAVE_SYS_IOCTL_H
- # include <sys/ioctl.h>
- #endif
-+#include <time.h>
-+#ifdef HAVE_NETDB_H
-+# include <netdb.h>
-+#endif
-+#ifdef HAVE_NETINET_IN_H
-+# include <netinet/in.h>
-+#endif
-+#ifdef HAVE_OPENSSL_SSL_H
-+# include <openssl/ssl.h>
-+#undef FAR
-+#undef DSA
-+#endif
-+#ifdef HAVE_SYS_SOCKET_H
-+# include <sys/socket.h>
-+#endif
-+
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>