Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
chat/telepathy-gabble/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.43 2015/06/07 14:05:57 youri Exp $
# $NetBSD: Makefile,v 1.50 2016/07/09 13:03:33 wiz Exp $
DISTNAME= telepathy-gabble-0.11.10
PKGREVISION= 21
DISTNAME= telepathy-gabble-0.18.3
PKGREVISION= 3
CATEGORIES= chat
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-gabble/
@@ -18,7 +18,8 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
CONFIGURE_ENV+= UUID_CFLAGS=" " UUID_LIBS=" "
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.11.10
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 0.11.10
REPLACE_PYTHON+= plugins/telepathy-gabble-xmpp-console
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)

14
chat/telepathy-gabble/PLIST
View File

@@ -1,5 +1,15 @@
@comment $NetBSD: PLIST,v 1.5 2011/04/05 18:47:20 drochner Exp $
lib/telepathy/gabble-0/gateways.la
@comment $NetBSD: PLIST,v 1.6 2015/12/01 12:45:43 jaapb Exp $
bin/telepathy-gabble-xmpp-console
lib/telepathy/gabble-0/lib/libgabble-plugins-0.18.3.so
lib/telepathy/gabble-0/lib/libgabble-plugins.a
lib/telepathy/gabble-0/lib/libgabble-plugins.la
lib/telepathy/gabble-0/lib/libgabble-plugins.so
lib/telepathy/gabble-0/lib/libwocky-telepathy-gabble-0.18.3.so
lib/telepathy/gabble-0/lib/libwocky.a
lib/telepathy/gabble-0/lib/libwocky.la
lib/telepathy/gabble-0/lib/libwocky.so
lib/telepathy/gabble-0/plugins/libconsole.la
lib/telepathy/gabble-0/plugins/libgateways.la
libexec/telepathy-gabble
man/man8/telepathy-gabble.8
share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service

18
chat/telepathy-gabble/distinfo
View File

@@ -1,15 +1,7 @@
$NetBSD: distinfo,v 1.17 2014/03/06 15:43:23 joerg Exp $
$NetBSD: distinfo,v 1.19 2015/12/01 12:45:43 jaapb 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_test-resolver_h) = 4fc2950543c9ea9b902c1608082e60c644659a91
SHA1 (patch-lib_ext_wocky_tests_wocky-connector-test.c) = 9e5b06621583229b0fd05d057dce778698ea223f
SHA1 (patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c) = ae1d8dcbc4c875696921cbb8c44e2d6841c47f8f
SHA1 (telepathy-gabble-0.18.3.tar.gz) = 1c71c5acf2c506788aa4b1604390f38979d88887
RMD160 (telepathy-gabble-0.18.3.tar.gz) = a227c369090c2020f510cf050f35e4c12b01fe74
Size (telepathy-gabble-0.18.3.tar.gz) = 2793195 bytes
SHA1 (patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c) = d8f0192f7f34e6fb98150283f5ff05de6313ee4a
SHA1 (patch-lib_ext_wocky_wocky_wocky-muc.c) = 769dae27f20fd7e1c196d65a4753ccf65a77926b
SHA1 (patch-lib_ext_wocky_wocky_wocky-openssl.c) = 21dd4df0c50e766bab0d3d1cbaa9fbe2feef7a17
SHA1 (patch-src_bytestream-socks5.c) = d6f72478bef2b2502f3955e50dc11b51f0e2b502
SHA1 (patch-src_ft-manager.c) = d660079ff74dd6f275ab8022ad0f7f5cd9b37897
SHA1 (patch-tests_twisted_test-resolver_h) = d5539523e6ef34c4a8ce495457cfee1224d82891
SHA1 (patch-lib_ext_wocky_wocky_wocky-muc.c) = 2c4a5840787f061e8d477cac74d4f5d655ba1513

12
chat/telepathy-gabble/patches/patch-lib_ext_wocky_examples_connect.c
View File

@@ -1,12 +0,0 @@
$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 <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <glib.h>

15
chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_test-resolver_h
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-lib_ext_wocky_tests_test-resolver_h,v 1.1 2012/05/09 03:57:45 dholland Exp $
Fix build with latest glib2.
--- lib/ext/wocky/tests/test-resolver.h~ 2009-10-07 11:33:35.000000000 +0000
+++ lib/ext/wocky/tests/test-resolver.h
@@ -22,7 +22,7 @@
#define __TEST_RESOLVER_H__
#include <gio/gio.h>
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS

22
chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test.c
View File

@@ -1,22 +0,0 @@
$NetBSD: patch-lib_ext_wocky_tests_wocky-connector-test.c,v 1.1 2013/03/02 18:19:10 joerg Exp $
--- lib/ext/wocky/tests/wocky-connector-test.c.orig 2013-03-01 14:38:21.000000000 +0000
+++ lib/ext/wocky/tests/wocky-connector-test.c
@@ -3428,7 +3428,7 @@ run_test (gpointer data)
g_object_get (wcon, "identity", &identity, "features", &feat, NULL);
g_assert (identity != NULL);
- g_assert (*identity |= '\0');
+ g_assert (*identity != '\0');
g_assert (feat != NULL);
g_assert (G_OBJECT_TYPE (feat) == WOCKY_TYPE_STANZA);
g_free (identity);
@@ -3442,7 +3442,7 @@ run_test (gpointer data)
g_object_get (wcon, "resource", &identity, NULL);
g_assert (identity != NULL);
- g_assert (*identity |= '\0');
+ g_assert (*identity != '\0');
g_free (identity);
g_object_get (wcon, "legacy", &jabber, "old-ssl", &oldssl, NULL);

24
chat/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c,v 1.2 2014/03/06 15:43:23 joerg Exp $
--- lib/ext/wocky/tests/wocky-test-sasl-auth-server.c.orig 2010-10-20 14:56:06.000000000 +0000
+++ lib/ext/wocky/tests/wocky-test-sasl-auth-server.c
@@ -154,7 +154,7 @@ test_sasl_auth_server_dispose (GObject *
priv->stream = NULL;
#ifdef HAVE_LIBSASL2
- if (&priv->sasl_conn != NULL)
+ if (priv->sasl_conn != NULL)
sasl_dispose (&priv->sasl_conn);
priv->sasl_conn = NULL;
#endif
@@ -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 },
};

3
chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-muc.c
View File

@@ -1,5 +1,6 @@
$NetBSD: patch-lib_ext_wocky_wocky_wocky-muc.c,v 1.1 2013/03/02 18:19:10 joerg Exp $
$NetBSD: patch-lib_ext_wocky_wocky_wocky-muc.c,v 1.2 2015/12/01 12:45:43 jaapb Exp $
Use correct enum.
--- lib/ext/wocky/wocky/wocky-muc.c.orig 2013-03-01 14:32:26.000000000 +0000
+++ lib/ext/wocky/wocky/wocky-muc.c
@@ -1480,7 +1480,7 @@ extract_chat_state (WockyNode *msg)

99
chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-openssl.c
View File

@@ -1,99 +0,0 @@
$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,11 @@ struct _WockyTLSSession
/* openssl structures */
BIO *rbio;
BIO *wbio;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD *method;
+#else
SSL_METHOD *method;
+#endif
SSL_CTX *ctx;
SSL *ssl;
};
@@ -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) \
- ((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 +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);
+#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

15
chat/telepathy-gabble/patches/patch-src_bytestream-socks5.c
View File

@@ -1,15 +0,0 @@
$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 <ifaddrs.h>
#endif
+#ifdef __sun
+#include <sys/sockio.h>
+#endif
+
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <telepathy-glib/interfaces.h>

14
chat/telepathy-gabble/patches/patch-src_ft-manager.c
View File

@@ -1,14 +0,0 @@
$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 <time.h>
#include <dbus/dbus-glib.h>
#include <errno.h>

15
chat/telepathy-gabble/patches/patch-tests_twisted_test-resolver_h
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-tests_twisted_test-resolver_h,v 1.1 2012/05/09 03:57:45 dholland Exp $
Fix build with latest glib2.
--- tests/twisted/test-resolver.h~ 2011-02-16 15:06:35.000000000 +0000
+++ tests/twisted/test-resolver.h
@@ -22,7 +22,7 @@
#define __TEST_RESOLVER_H__
#include <gio/gio.h>
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS