diff options
| author | joerg <joerg@pkgsrc.org> | 2011-11-27 19:35:27 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-11-27 19:35:27 +0000 |
| commit | 83796265fe7b339ff9c1962a4ad3eb386ae9ac88 (patch) | |
| tree | 512e08b3c74169c04d921b35751d440f728cd474 /chat/telepathy-gabble | |
| parent | 83f6f83cb63ab2eb02f2cb0138c1e1ef23ab6741 (diff) | |
| download | pkgsrc-83796265fe7b339ff9c1962a4ad3eb386ae9ac88.tar.gz | |
Try to deal with OpenSSL changes and stricter GCC warnings.
Diffstat (limited to 'chat/telepathy-gabble')
3 files changed, 49 insertions, 1 deletions
diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo index 80914e66e1b..51750ca6884 100644 --- a/chat/telepathy-gabble/distinfo +++ b/chat/telepathy-gabble/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.11 2011/07/04 07:08:24 obache Exp $ +$NetBSD: distinfo,v 1.12 2011/11/27 19:35:27 joerg 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_tests_wocky-test-sasl-auth-server.c) = f53a0b3247df5a5dcf90809a9495966ff26c6c3f +SHA1 (patch-lib_ext_wocky_wocky_wocky-openssl.c) = 31dd925561791d542918e09c4a0ec81683a74c9e diff --git a/chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c new file mode 100644 index 00000000000..6960d4653b6 --- /dev/null +++ b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c,v 1.1 2011/11/27 19:35:28 joerg Exp $ + +--- lib/ext/wocky/tests/wocky-test-sasl-auth-server.c.orig 2011-11-27 01:52:00.000000000 +0000 ++++ lib/ext/wocky/tests/wocky-test-sasl-auth-server.c +@@ -929,8 +929,8 @@ test_sasl_auth_server_new (GIOStream *st + static gboolean sasl_initialized = FALSE; + int ret; + static sasl_callback_t callbacks[] = { +- { SASL_CB_LOG, test_sasl_server_auth_log, NULL }, +- { SASL_CB_GETOPT, test_sasl_server_auth_getopt, NULL }, ++ { SASL_CB_LOG, (void *)test_sasl_server_auth_log, NULL }, ++ { SASL_CB_GETOPT, (void *)test_sasl_server_auth_getopt, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + 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 new file mode 100644 index 00000000000..fbb92da5322 --- /dev/null +++ b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c @@ -0,0 +1,31 @@ +$NetBSD: patch-lib_ext_wocky_wocky_wocky-openssl.c,v 1.1 2011/11/27 19:35:28 joerg 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 + /* openssl structures */ + BIO *rbio; + BIO *wbio; +- SSL_METHOD *method; ++ const SSL_METHOD *method; + SSL_CTX *ctx; + SSL *ssl; + }; +@@ -824,7 +824,7 @@ wocky_tls_session_handshake_finish (Wock + } + + #define CASELESS_CHARCMP(x, y) \ +- ((x) != '\0') && ((y) != '\0') && (toupper (x) == toupper (y)) ++ ((x) != '\0') && ((y) != '\0') && (toupper ((unsigned char)x) == toupper ((unsigned char)y)) + + static gboolean + compare_wildcarded_hostname (const char *hostname, const char *certname) +@@ -890,7 +890,7 @@ 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; ++ const X509V3_EXT_METHOD *convert = NULL; + long ni = OBJ_obj2nid (obj); + const guchar *p; + char *value = NULL; |