From b75f6d9f58480b3d0cb1dacc497c13e3b0d5993c Mon Sep 17 00:00:00 2001 From: hans Date: Thu, 16 Feb 2012 15:50:15 +0000 Subject: Fix build on SunOS. Also fix a few things that gcc46 complains about. --- chat/telepathy-gabble/distinfo | 7 +- .../patches/patch-lib_ext_wocky_examples_connect.c | 12 ++++ .../patch-lib_ext_wocky_wocky_wocky-openssl.c | 80 ++++++++++++++++++++-- .../patches/patch-src_bytestream-socks5.c | 15 ++++ .../patches/patch-src_ft-manager.c | 14 ++++ 5 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 chat/telepathy-gabble/patches/patch-lib_ext_wocky_examples_connect.c create mode 100644 chat/telepathy-gabble/patches/patch-src_bytestream-socks5.c create mode 100644 chat/telepathy-gabble/patches/patch-src_ft-manager.c (limited to 'chat') diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo index 51750ca6884..f9b016f500a 100644 --- a/chat/telepathy-gabble/distinfo +++ b/chat/telepathy-gabble/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.12 2011/11/27 19:35:27 joerg Exp $ +$NetBSD: distinfo,v 1.13 2012/02/16 15:50:15 hans Exp $ SHA1 (telepathy-gabble-0.11.10.tar.gz) = 26ca4e8a98b01b78007f88caea56b08ae5070fdd RMD160 (telepathy-gabble-0.11.10.tar.gz) = b4906a01b8cc6e6630e1707e97250bcdefeac9c4 Size (telepathy-gabble-0.11.10.tar.gz) = 3443486 bytes +SHA1 (patch-lib_ext_wocky_examples_connect.c) = 4f22cadb5e39f68630c3d09671aaef4e6a480394 SHA1 (patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c) = f53a0b3247df5a5dcf90809a9495966ff26c6c3f -SHA1 (patch-lib_ext_wocky_wocky_wocky-openssl.c) = 31dd925561791d542918e09c4a0ec81683a74c9e +SHA1 (patch-lib_ext_wocky_wocky_wocky-openssl.c) = 21dd4df0c50e766bab0d3d1cbaa9fbe2feef7a17 +SHA1 (patch-src_bytestream-socks5.c) = d6f72478bef2b2502f3955e50dc11b51f0e2b502 +SHA1 (patch-src_ft-manager.c) = d660079ff74dd6f275ab8022ad0f7f5cd9b37897 diff --git a/chat/telepathy-gabble/patches/patch-lib_ext_wocky_examples_connect.c b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_examples_connect.c new file mode 100644 index 00000000000..e185d2e22ac --- /dev/null +++ b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_examples_connect.c @@ -0,0 +1,12 @@ +$NetBSD: patch-lib_ext_wocky_examples_connect.c,v 1.1 2012/02/16 15:50:16 hans Exp $ + +--- lib/ext/wocky/examples/connect.c.orig 2011-02-16 16:40:58.000000000 +0100 ++++ lib/ext/wocky/examples/connect.c 2012-01-25 13:43:46.192213342 +0100 +@@ -2,6 +2,7 @@ + #include + + #include ++#include + + #include + diff --git a/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c index fbb92da5322..4573128b514 100644 --- a/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c +++ b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c @@ -1,17 +1,37 @@ -$NetBSD: patch-lib_ext_wocky_wocky_wocky-openssl.c,v 1.1 2011/11/27 19:35:28 joerg Exp $ +$NetBSD: patch-lib_ext_wocky_wocky_wocky-openssl.c,v 1.2 2012/02/16 15:50:16 hans Exp $ --- lib/ext/wocky/wocky/wocky-openssl.c.orig 2011-11-27 01:49:15.000000000 +0000 +++ lib/ext/wocky/wocky/wocky-openssl.c -@@ -165,7 +165,7 @@ struct _WockyTLSSession +@@ -165,7 +165,11 @@ struct _WockyTLSSession /* openssl structures */ BIO *rbio; BIO *wbio; -- SSL_METHOD *method; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD *method; ++#else + SSL_METHOD *method; ++#endif SSL_CTX *ctx; SSL *ssl; }; -@@ -824,7 +824,7 @@ wocky_tls_session_handshake_finish (Wock +@@ -685,7 +689,6 @@ wocky_tls_session_handshake (WockyTLSSes + + if (want_write) + { +- int ignored; + gchar *wbuf; + GOutputStream *out = g_io_stream_get_output_stream (session->stream); + long wsize = BIO_get_mem_data (session->wbio, &wbuf); +@@ -694,7 +697,7 @@ wocky_tls_session_handshake (WockyTLSSes + if (wsize > 0) + sent = g_output_stream_write (out, wbuf, wsize, NULL, error); + DEBUG ("sent %" G_GSSIZE_FORMAT " cipherbytes", sent); +- ignored = BIO_reset (session->wbio); ++ (void) BIO_reset (session->wbio); + } + + if (want_read) +@@ -824,7 +827,7 @@ wocky_tls_session_handshake_finish (Wock } #define CASELESS_CHARCMP(x, y) \ @@ -20,12 +40,60 @@ $NetBSD: patch-lib_ext_wocky_wocky_wocky-openssl.c,v 1.1 2011/11/27 19:35:28 joe static gboolean compare_wildcarded_hostname (const char *hostname, const char *certname) -@@ -890,7 +890,7 @@ check_peer_name (const char *target, X50 +@@ -890,7 +893,11 @@ check_peer_name (const char *target, X50 { X509_EXTENSION *ext = sk_X509_EXTENSION_value (ci->extensions, i); ASN1_OBJECT *obj = X509_EXTENSION_get_object (ext); -- X509V3_EXT_METHOD *convert = NULL; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L + const X509V3_EXT_METHOD *convert = NULL; ++#else + X509V3_EXT_METHOD *convert = NULL; ++#endif long ni = OBJ_obj2nid (obj); const guchar *p; char *value = NULL; +@@ -1513,8 +1520,6 @@ wocky_tls_session_write_ready (GObject + WockyTLSSession *session = WOCKY_TLS_SESSION (user_data); + gint buffered = BIO_pending (session->wbio); + gssize written; +- /* memory BIO ops generally can't fail: suppress compiler/coverity warnings */ +- gint ignore_warning; + + if (tls_debug_level >= DEBUG_ASYNC_DETAIL_LEVEL) + DEBUG (""); +@@ -1525,7 +1530,7 @@ wocky_tls_session_write_ready (GObject + if (written == buffered) + { + DEBUG ("%d bytes written, clearing write BIO", buffered); +- ignore_warning = BIO_reset (session->wbio); ++ (void) BIO_reset (session->wbio); + wocky_tls_session_try_operation (session, WOCKY_TLS_OP_WRITE); + } + else +@@ -1539,8 +1544,8 @@ wocky_tls_session_write_ready (GObject + { + gchar *pending = g_memdup (buffer + written, psize); + +- ignore_warning = BIO_reset (session->wbio); +- ignore_warning = BIO_write (session->wbio, pending, psize); ++ (void) BIO_reset (session->wbio); ++ (void) BIO_write (session->wbio, pending, psize); + g_free (pending); + } + +@@ -1660,6 +1665,7 @@ set_dh_parameters (WockyTLSSession *sess + static void + set_ecdh_key (WockyTLSSession *session) + { ++#ifndef OPENSSL_NO_EC + EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_sect163r2); + if (ecdh == NULL) + { +@@ -1668,6 +1674,7 @@ set_ecdh_key (WockyTLSSession *session) + } + SSL_CTX_set_tmp_ecdh (session->ctx,ecdh); + EC_KEY_free (ecdh); ++#endif + } + + static void diff --git a/chat/telepathy-gabble/patches/patch-src_bytestream-socks5.c b/chat/telepathy-gabble/patches/patch-src_bytestream-socks5.c new file mode 100644 index 00000000000..aa3ed905c53 --- /dev/null +++ b/chat/telepathy-gabble/patches/patch-src_bytestream-socks5.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_bytestream-socks5.c,v 1.1 2012/02/16 15:50:16 hans Exp $ + +--- src/bytestream-socks5.c.orig 2011-03-31 18:24:26.000000000 +0200 ++++ src/bytestream-socks5.c 2012-01-24 19:56:40.685909024 +0100 +@@ -42,6 +42,10 @@ + #include + #endif + ++#ifdef __sun ++#include ++#endif ++ + #include + #include + #include diff --git a/chat/telepathy-gabble/patches/patch-src_ft-manager.c b/chat/telepathy-gabble/patches/patch-src_ft-manager.c new file mode 100644 index 00000000000..2b5348abb7f --- /dev/null +++ b/chat/telepathy-gabble/patches/patch-src_ft-manager.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_ft-manager.c,v 1.1 2012/02/16 15:50:16 hans Exp $ + +--- src/ft-manager.c.orig 2011-03-31 18:24:26.000000000 +0200 ++++ src/ft-manager.c 2012-01-24 20:00:38.208583782 +0100 +@@ -19,7 +19,9 @@ + */ + + #define _BSD_SOURCE ++#ifndef __sun + #define _XOPEN_SOURCE /* glibc2 needs this */ ++#endif + #include + #include + #include -- cgit v1.2.3