Re: CVS commit: pkgsrc/x11

["OBATA Akio" <obache%netbsd.org@localhost>]

On Fri, 19 Aug 2011 15:53:59 +0900, OBATA Akio <obache%netbsd.org@localhost> 
wrote:

> Failed to build with NetBSD-5.1.
>
> probably, need to some changes as followins:
>
> <#if OPENSSL_VERSION_NUMBER >= 0x10000000
> > #if OPENSSL_VERSION_NUMBER >= 0x00909000
>
> (I'm confirming...)

my machine is still building it...

If someone have high-speed build machine, please confirm that following two 
patches
fix build for NetBSD-5.1 (and/or not break others), then commit.

patch-src_network_ssl_qsslsocket__openssl__symbols.cpp:

--- 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)



patch-src_network_ssl_qsslsocket__openssl__symbols__p.h:

$NetBSD$

--- 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();


--
OBATA Akio / obache%NetBSD.org@localhost