Fixes build with openssl<1.0.0.

taken from upstream:
  http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a

resolve PR#45832.

4 files changed, 53 insertions, 13 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index dd0b87b145a..ae9bb763a0f 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2012/01/12 22:59:58 adam Exp $
+$NetBSD: distinfo,v 1.67 2012/01/14 10:23:18 obache Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e
 RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e
@@ -42,5 +42,6 @@ SHA1 (patch-qmake_generators_makefile.cpp) = 54184d85fd06c86a62640add6c8334ca323
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 9e4a68fe02204e5fda7272f988d991992dfd281e
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = d24cc8fca0f4cf7579641da8447163d351f876c5
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = c2fbda4e7d00ae0e586f7408b798cc05824b4cc0
+SHA1 (patch-src_network_ssl_qsslsocket__openssl.cpp) = 927582af26ffcfdf5afcb27b36fc27dd5b60865b
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 152b2da94f32e87b649f7f02b11b92145bfc269c
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 3f54beefab0907ed834ec88ecfc84ebf65f84cc5
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
new file mode 100644
index 00000000000..3ea40fbad82
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl.cpp,v 1.1 2012/01/14 10:23:18 obache Exp $
+
+* fix build with -openssl-linked for OpenSSL 0.9.8*
+  http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
+
+--- src/network/ssl/qsslsocket_openssl.cpp.orig	2011-12-08 05:06:02.000000000 +0000
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -451,11 +451,7 @@ init_context:
+         if (!ace.isEmpty()
+             && !QHostAddress().setAddress(tlsHostName)
+             && !(configuration.sslOptions & QSsl::SslOptionDisableServerNameIndication)) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+             if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.data()))
+-#else
+-            if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.constData()))
+-#endif
+                 qWarning("could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled");
+         }
+     }
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
index e800e78fe7b..6360f8aae51 100644
--- 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
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.2 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.3 2012/01/14 10:23:18 obache Exp $
+
+* fixes build with OpenSSL 0.9.9-dev
+* fix build with -openssl-linked for OpenSSL 0.9.8*
+  http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
 
 --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2011-12-08 05:06:02.000000000 +0000
 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -11,16 +15,18 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.2 2012/01/12
  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 @@ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+@@ -210,18 +210,14 @@ DEFINEFUNC(int, SSL_library_init, void, 
+ DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
+ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
  DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
- #else
+-#else
 -DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return)
-+DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
- #endif
+-#endif
  #endif
  DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return)
-@@ -221,7 +221,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
+ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG)
  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)
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
index 5de4e830597..fd45503d906 100644
--- 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
@@ -1,8 +1,11 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.2 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.3 2012/01/14 10:23:18 obache Exp $
 
 * fixes build with OpenSSL 0.9.9-dev
+* fix build with -openssl-linked for OpenSSL 0.9.8*
+  http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
 
---- 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.orig	2011-12-08 05:06:02.000000000 +0000
 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h
 @@ -279,7 +279,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX 
  #endif
@@ -13,7 +16,18 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.2 2012/01/1
  SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
  #else
  SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a);
-@@ -329,7 +329,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
+@@ -318,18 +318,14 @@ int q_SSL_library_init();
+ void q_SSL_load_error_strings();
+ SSL *q_SSL_new(SSL_CTX *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
+-#else
+-long q_SSL_ctrl(SSL *ssl,int cmd, long larg, const void *parg);
+-#endif
+ #endif
+ int q_SSL_read(SSL *a, void *b, int c);
+ void q_SSL_set_bio(SSL *a, BIO *b, BIO *c);
  void q_SSL_set_accept_state(SSL *a);
  void q_SSL_set_connect_state(SSL *a);
  int q_SSL_shutdown(SSL *a);