- update telepathy-gabble to 0.7.27

This commit is contained in:
jasper 2009-06-02 04:43:33 +00:00
parent 90568abe69
commit f06d00cb46
7 changed files with 109 additions and 18 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2009/03/24 20:07:05 jasper Exp $
# $OpenBSD: Makefile,v 1.14 2009/06/02 04:43:33 jasper Exp $
COMMENT= flexible communications framework, xmpp component
DISTNAME= telepathy-gabble-0.7.18
PKGNAME= ${DISTNAME}p1
DISTNAME= telepathy-gabble-0.7.27
MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-gabble/}
@ -18,7 +17,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \
::net/py-xmpp
RUN_DEPENDS= ::textproc/libxslt
LIB_DEPENDS= loudmouth-1.>=3::net/loudmouth \
telepathy-glib.>=3::net/telepathy/telepathy-glib
telepathy-glib.>=4::net/telepathy/telepathy-glib
USE_GMAKE= Yes
USE_LIBTOOL= Yes

View File

@ -1,5 +1,5 @@
MD5 (telepathy-gabble-0.7.18.tar.gz) = gHJgA3vnCIK+O822sm/wMQ==
RMD160 (telepathy-gabble-0.7.18.tar.gz) = WF0OtSz04JKq/6QvOZkot727v7U=
SHA1 (telepathy-gabble-0.7.18.tar.gz) = 1exxK9WY/DMtCSJRaQyi59Bd0Us=
SHA256 (telepathy-gabble-0.7.18.tar.gz) = LT8MOwaLMjvdN/XQLW/Bz8RnAUqi+SvOv5GlshCBoUE=
SIZE (telepathy-gabble-0.7.18.tar.gz) = 1474712
MD5 (telepathy-gabble-0.7.27.tar.gz) = C9T9+2PYbV4peuBprUiXBA==
RMD160 (telepathy-gabble-0.7.27.tar.gz) = 9zyMuSD6z4oncRdS/xRWm/tWpcs=
SHA1 (telepathy-gabble-0.7.27.tar.gz) = 8kTrVnfai/TuEDLbY4ae8HSRhoI=
SHA256 (telepathy-gabble-0.7.27.tar.gz) = mkzlK9frm4AQpIG+cRF9gU6xX+nIV5gXx7SGGZo4Aaw=
SIZE (telepathy-gabble-0.7.27.tar.gz) = 1780387

View File

@ -1,7 +1,10 @@
$OpenBSD: patch-configure,v 1.5 2009/01/20 10:28:28 jasper Exp $
--- configure.orig Tue Jan 20 10:52:27 2009
+++ configure Tue Jan 20 10:53:08 2009
@@ -12449,7 +12449,7 @@ fi
$OpenBSD: patch-configure,v 1.6 2009/06/02 04:43:33 jasper Exp $
Don't try to pickup e2fs' uuid, it doesn't properly work yet.
--- configure.orig Thu May 7 08:59:10 2009
+++ configure Mon Jun 1 18:25:10 2009
@@ -14161,7 +14161,7 @@ fi
# >= 2.3 with the standard library will do. We prefer older versions,
# to ensure that when we claim that 2.3 is sufficient we are telling the truth.
PYTHON=
@ -10,12 +13,30 @@ $OpenBSD: patch-configure,v 1.5 2009/01/20 10:28:28 jasper Exp $
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12500,7 +12500,7 @@ fi
@@ -14212,7 +14212,7 @@ fi
# Check for a Python >= 2.5 with Twisted, to run the tests
{ echo "$as_me:$LINENO: checking for Python >= 2.5 with Twisted and XMPP protocol support" >&5
echo $ECHO_N "checking for Python >= 2.5 with Twisted and XMPP protocol support... $ECHO_C" >&6; }
-for TEST_PYTHON in python2.5 python2.6 python; do
{ $as_echo "$as_me:$LINENO: checking for Python >= 2.5 with Twisted and XMPP protocol support" >&5
$as_echo_n "checking for Python >= 2.5 with Twisted and XMPP protocol support... " >&6; }
-for TEST_PYTHON in python2.6 python2.5 python; do
+for TEST_PYTHON in python${MODPY_VERSION}; do
if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
if $TEST_PYTHON -c "import twisted.words.xish.domish, twisted.words.protocols.jabber, twisted.internet.reactor" >/dev/null 2>&1; then
{ echo "$as_me:$LINENO: result: $TEST_PYTHON" >&5
{ $as_echo "$as_me:$LINENO: result: $TEST_PYTHON" >&5
@@ -14473,7 +14473,7 @@ fi
-
+if false; then
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for UUID" >&5
$as_echo_n "checking for UUID... " >&6; }
@@ -14557,7 +14557,7 @@ else
$as_echo "$as_me: WARNING: libuuid not found, falling back to generating random IDs" >&2;}
fi
-
+fi

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_gibber_asyncns_c,v 1.1 2009/06/02 04:43:33 jasper Exp $
--- lib/gibber/asyncns.c.orig Mon Jun 1 17:55:19 2009
+++ lib/gibber/asyncns.c Mon Jun 1 17:55:28 2009
@@ -29,6 +29,7 @@
#include <signal.h>
#include <unistd.h>
#include <sys/select.h>
+#include <sys/resource.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-lib_gibber_gibber-resolver_c,v 1.1 2009/06/02 04:43:33 jasper Exp $
--- lib/gibber/gibber-resolver.c.orig Mon Apr 20 15:18:10 2009
+++ lib/gibber/gibber-resolver.c Mon Jun 1 18:19:42 2009
@@ -37,6 +37,17 @@
#include "gibber-resolver-asyncns.h"
#endif
+#ifndef NS_GET16
+#define NS_INT16SZ 2 /* #/bytes of data in a u_int16_t */
+#define NS_GET16(s, cp) do { \
+ register const u_char *t_cp = (const u_char *)(cp); \
+ (s) = ((u_int16_t)t_cp[0] << 8) \
+ | ((u_int16_t)t_cp[1]) \
+ ; \
+ (cp) += NS_INT16SZ; \
+} while (0)
+#endif /* !NS_GET16 */
+
static GibberResolver *resolver_singleton = NULL;
static GType resolver_singleton_type = 0;
@@ -735,7 +746,9 @@ gibber_resolver_gai_error_to_g_error (int error)
break;
case EAI_MEMORY:
+#ifdef EAI_OVERFLOW
case EAI_OVERFLOW:
+#endif
code = GIBBER_RESOLVER_ERROR_MEMORY;
break;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_util_c,v 1.1 2009/06/02 04:43:33 jasper Exp $
--- src/util.c.orig Mon Jun 1 17:56:48 2009
+++ src/util.c Mon Jun 1 17:57:01 2009
@@ -30,7 +30,7 @@
#include <telepathy-glib/handle-repo-dynamic.h>
#ifdef HAVE_UUID
-# include <uuid.h>
+# include <uuid/uuid.h>
#endif
#define DEBUG_FLAG GABBLE_DEBUG_JID

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-tests_twisted_resolver-fake_c,v 1.1 2009/06/02 04:43:33 jasper Exp $
--- tests/twisted/resolver-fake.c.orig Mon Jun 1 18:45:01 2009
+++ tests/twisted/resolver-fake.c Mon Jun 1 18:55:20 2009
@@ -20,10 +20,11 @@
#include "resolver-fake.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
#include <netdb.h>
#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
#define DEBUG(format, ...) \
g_debug ("%s: " format, G_STRFUNC, ##__VA_ARGS__)