Fixes build on NetBSD-5.1 (OpenSSL 0.9.9-dev).

3 files changed, 51 insertions, 1 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index e46ce1badeb..dac6c3ae17c 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2011/08/18 20:52:21 mrg Exp $
+$NetBSD: distinfo,v 1.59 2011/08/19 14:55:15 obache Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e
 RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645
@@ -46,3 +46,5 @@ SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a
 SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979
 SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697
 SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 87c48f97ba2026f4bb553aa0b855bc1b1f653abf
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = e05f420bd532a8964d293e4bad848636dc716d0f
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
new file mode 100644
index 00000000000..149c1cb47e9
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.1 2011/08/19 14:55:15 obache Exp $
+
+* fixes build with OpenSSL 0.9.9-dev
+
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2011-03-30 05:19:09.000000000 +0000
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -170,7 +170,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke
+ #endif
+ DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return)
+ DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+ DEFINEFUNC(SSL_CTX *, SSL_CTX_new, const SSL_METHOD *a, a, return 0, return)
+ #else
+ DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return)
+@@ -213,7 +213,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
+ DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
new file mode 100644
index 00000000000..daf6346f12f
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.1 2011/08/19 14:55:15 obache Exp $
+
+* fixes build with OpenSSL 0.9.9-dev
+
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2011-03-30 05:19:09.000000000 +0000
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -278,7 +278,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX 
+ #endif
+ long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d);
+ void q_SSL_CTX_free(SSL_CTX *a);
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
+ #else
+ SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a);
+@@ -321,7 +321,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
+ void q_SSL_set_accept_state(SSL *a);
+ void q_SSL_set_connect_state(SSL *a);
+ int q_SSL_shutdown(SSL *a);
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+ const SSL_METHOD *q_SSLv2_client_method();
+ const SSL_METHOD *q_SSLv3_client_method();
+ const SSL_METHOD *q_SSLv23_client_method();