aboutsummaryrefslogtreecommitdiffstats
path: root/net-im/gajim-devel
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2006-05-22 03:04:20 +0800
committerarved <arved@FreeBSD.org>2006-05-22 03:04:20 +0800
commit38826514f79aebf4206e875eee91614078eef331 (patch)
tree82bef66cd4e09c128af16058cd5abd7a0d0a75a2 /net-im/gajim-devel
parentce895b61df3bb4d643c5fde0453f7f94d31ec75f (diff)
downloadfreebsd-ports-gnome-38826514f79aebf4206e875eee91614078eef331.tar.gz
freebsd-ports-gnome-38826514f79aebf4206e875eee91614078eef331.tar.zst
freebsd-ports-gnome-38826514f79aebf4206e875eee91614078eef331.zip
fix file-transfer connection problems, patch by Dimitur Kirov
PR: 97358 Submitted by: Stephan Maka <stephan@spaceboyz.net>
Diffstat (limited to 'net-im/gajim-devel')
-rw-r--r--net-im/gajim-devel/Makefile3
-rw-r--r--net-im/gajim-devel/files/patch-Changeset631439
2 files changed, 42 insertions, 0 deletions
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 8a2710437dde..9c7bbe459c5b 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gajim
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.gajim.org/downloads/
@@ -16,6 +17,8 @@ COMMENT= Gajim is a Jabber client based on a plugin system
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
+PATCH_DIST_STRIP=-p1
+
USE_X_PREFIX= yes
USE_PYTHON= 2.3+
USE_GMAKE= yes
diff --git a/net-im/gajim-devel/files/patch-Changeset6314 b/net-im/gajim-devel/files/patch-Changeset6314
new file mode 100644
index 000000000000..c828e687ffcc
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-Changeset6314
@@ -0,0 +1,39 @@
+diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py
+--- src/common/proxy65_manager.py Mon May 1 18:49:14 2006
++++ src/common/proxy65_manager.py Tue May 16 19:55:10 2006
+@@ -15,6 +15,7 @@
+ ##
+ import socket
+ import struct
++import errno
+
+ import common.xmpp
+ from common import gajim
+@@ -246,16 +247,18 @@
+ self._recv=self._sock.recv
+ except Exception, ee:
+ (errnum, errstr) = ee
+- if errnum == 111:
+- self.on_failure()
+- return None
++ if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK):
++ # still trying to connect
++ return
+ # win32 needs this
+- elif errnum != 10056 or self.state != 0:
+- return None
+- else: # socket is already connected
+- self._sock.setblocking(False)
+- self._send=self._sock.send
+- self._recv=self._sock.recv
++ if errnum not in (0, 10056, errno.EISCONN):
++ # connection failed
++ self.on_failure()
++ return
++ # socket is already connected
++ self._sock.setblocking(False)
++ self._send=self._sock.send
++ self._recv=self._sock.recv
+ self.buff = ''
+ self.state = 1 # connected
+ self.idlequeue.plug_idle(self, True, False)