cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill sentinel problems

Browse Source
This commit is contained in:
espie 2010-05-28 09:19:53 +00:00
parent f721912b78
commit c67a081008
10 changed files with 136 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_examples_register_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_examples_register_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/examples/register.c.orig Mon May 24 11:19:58 2010
+++ lib/ext/wocky/examples/register.c Mon May 24 11:20:05 2010
@@ -73,7 +73,7 @@ main (int argc,
"password" , pass,
"xmpp-server", host, NULL);
- g_object_set (G_OBJECT (wcon), "email", email, NULL);
+ g_object_set (G_OBJECT (wcon), "email", email, (void *)0);
wocky_connector_register_async (wcon, connector_callback, NULL);
g_main_loop_run (mainloop);

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_tests_wocky-connector-test_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/tests/wocky-connector-test.c.orig Mon May 24 11:20:50 2010
+++ lib/ext/wocky/tests/wocky-connector-test.c Mon May 24 11:22:07 2010
@@ -73,6 +73,8 @@
#define OK 0
#define CONNECTOR_OK { OK, OK, OK, OK, OK, OK }
+#undef NULL
+#define NULL (void *)0
gboolean running_test = FALSE;
static GError *error = NULL;

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-connector-server_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_tests_wocky-test-connector-server_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/tests/wocky-test-connector-server.c.orig Mon May 24 11:22:19 2010
+++ lib/ext/wocky/tests/wocky-test-connector-server.c Mon May 24 11:22:26 2010
@@ -587,7 +587,7 @@ iq_set_query_JABBER_AUTH (TestConnectorServer *self,
}
else if (sha1hash != NULL)
{
- gchar *hsrc = g_strconcat (INITIAL_STREAM_ID, priv->pass, NULL);
+ gchar *hsrc = g_strconcat (INITIAL_STREAM_ID, priv->pass, (void *)0);
gchar *sha1 = g_compute_checksum_for_string (G_CHECKSUM_SHA1, hsrc, -1);
DEBUG ("checksum: %s vs %s", sha1, sha1hash->content);
if (wocky_strdiff (priv->user, username->content) ||

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/tests/wocky-xmpp-readwrite-test.c.orig Mon May 24 11:20:21 2010
+++ lib/ext/wocky/tests/wocky-xmpp-readwrite-test.c Mon May 24 11:20:26 2010
@@ -68,7 +68,7 @@ test_readwrite (void)
"from", &from,
"version", &version,
"lang", &lang,
- NULL);
+ (void *)0);
g_assert (!wocky_strdiff (to, TO));
g_assert (!wocky_strdiff (from, FROM));

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-connector_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-connector_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-connector.c.orig Mon May 24 11:16:54 2010
+++ lib/ext/wocky/wocky/wocky-connector.c Mon May 24 11:17:02 2010
@@ -1062,7 +1062,7 @@ jabber_auth_try_digest (WockyConnector *self)
{
WockyConnectorPrivate *priv = WOCKY_CONNECTOR_GET_PRIVATE (self);
WockyXmppConnection *conn = priv->conn;
- gchar *hsrc = g_strconcat (priv->session_id, priv->pass, NULL);
+ gchar *hsrc = g_strconcat (priv->session_id, priv->pass, (void *)0);
gchar *sha1 = g_compute_checksum_for_string (G_CHECKSUM_SHA1, hsrc, -1);
gchar *iqid = wocky_xmpp_connection_new_id (priv->conn);
WockyXmppStanza *iq = wocky_xmpp_stanza_build (WOCKY_STANZA_TYPE_IQ,

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-node_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-pubsub-node_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-pubsub-node.c.orig Mon May 24 11:18:37 2010
+++ lib/ext/wocky/wocky/wocky-pubsub-node.c Mon May 24 11:18:42 2010
@@ -166,7 +166,7 @@ wocky_pubsub_node_constructed (GObject *object)
g_object_get (priv->service,
"jid", &(priv->service_jid),
"session", &session,
- NULL);
+ (void *)0);
g_assert (priv->service_jid != NULL);
g_assert (session != NULL);

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-roster_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-roster_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-roster.c.orig Mon May 24 11:18:19 2010
+++ lib/ext/wocky/wocky/wocky-roster.c Mon May 24 11:18:24 2010
@@ -498,7 +498,7 @@ roster_update (WockyRoster *self,
"name", wocky_xmpp_node_get_attribute (n, "name"),
"subscription", subscription_type,
"groups", groups,
- NULL);
+ (void *)0);
g_hash_table_insert (priv->items, g_strdup (jid), contact);

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-tls_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-tls.c.orig Mon May 24 11:18:53 2010
+++ lib/ext/wocky/wocky/wocky-tls.c Mon May 24 11:19:36 2010
@@ -528,7 +528,7 @@ add_certfiles (gnutls_certificate_credentials cred,
for (entry = readdir (dir); entry != NULL; entry = readdir (dir))
{
struct stat file;
- gchar *path = g_build_path ("/", thing, entry->d_name, NULL);
+ gchar *path = g_build_path ("/", thing, entry->d_name, (char *)0);
if ((stat (path, &file) == 0) && S_ISREG (file.st_mode))
n += add (cred, path, GNUTLS_X509_FMT_PEM);

28
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-xmpp-connection.c.orig Mon May 24 11:17:17 2010
+++ lib/ext/wocky/wocky/wocky-xmpp-connection.c Mon May 24 11:17:45 2010
@@ -639,19 +639,19 @@ wocky_xmpp_connection_recv_open_finish (WockyXmppConne
priv->input_open = TRUE;
if (to != NULL)
- g_object_get (priv->reader, "to", to, NULL);
+ g_object_get (priv->reader, "to", to, (void *)0);
if (from != NULL)
- g_object_get (priv->reader, "from", from, NULL);
+ g_object_get (priv->reader, "from", from, (void *)0);
if (version != NULL)
- g_object_get (priv->reader, "version", version, NULL);
+ g_object_get (priv->reader, "version", version, (void *)0);
if (lang != NULL)
- g_object_get (priv->reader, "lang", lang, NULL);
+ g_object_get (priv->reader, "lang", lang, (void *)0);
if (id != NULL)
- g_object_get (priv->reader, "id", id, NULL);
+ g_object_get (priv->reader, "id", id, (void *)0);
return TRUE;
}

12
net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-node_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_ext_wocky_wocky_wocky-xmpp-node_c,v 1.1 2010/05/28 09:19:53 espie Exp $
--- lib/ext/wocky/wocky/wocky-xmpp-node.c.orig Mon May 24 11:17:54 2010
+++ lib/ext/wocky/wocky/wocky-xmpp-node.c Mon May 24 11:18:03 2010
@@ -816,7 +816,7 @@ wocky_xmpp_node_append_content (WockyXmppNode *node,
const gchar *content)
{
gchar *t = node->content;
- node->content = g_strconcat (t, content, NULL);
+ node->content = g_strconcat (t, content, (void *)0);
g_free (t);
}