ports/98770: Update port: net-im/gajim to 10.1
Stephan Maka
stephan at spaceboyz.net
Fri Jun 9 22:50:18 UTC 2006
>Number: 98770
>Category: ports
>Synopsis: Update port: net-im/gajim to 10.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 09 22:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stephan Maka
>Release: 6.1-STABLE
>Organization:
>Environment:
FreeBSD hooker.sin 6.1-STABLE FreeBSD 6.1-STABLE #5: Wed May 31 12:36:26 CEST 2006 root at hooker.sin:/usr/obj/usr/src/sys/HOOKER i386
>Description:
This is a new Gajim version. A developer notified me immediately about the update because it contains FreeBSD-specific fixes.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-im/gajim/Makefile net-im/gajim/Makefile
--- /usr/ports/net-im/gajim/Makefile Sun May 28 17:54:09 2006
+++ net-im/gajim/Makefile Sat Jun 10 00:32:43 2006
@@ -6,8 +6,7 @@
#
PORTNAME= gajim
-PORTVERSION= 0.10
-PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= net-im
MASTER_SITES= http://www.gajim.org/downloads/
@@ -16,8 +15,6 @@
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
-
-PATCH_DIST_STRIP=-p1
USE_X_PREFIX= yes
USE_PYTHON= 2.3+
diff -urN /usr/ports/net-im/gajim/distinfo net-im/gajim/distinfo
--- /usr/ports/net-im/gajim/distinfo Sun May 7 13:54:21 2006
+++ net-im/gajim/distinfo Sat Jun 10 00:35:39 2006
@@ -1,3 +1,3 @@
-MD5 (gajim-0.10.tar.bz2) = 0d568857ea25acf8366cff43d2317757
-SHA256 (gajim-0.10.tar.bz2) = 77b0069e4283d1905ba640a7fa87d2f8acac4248c9b58de7f3d1fdffc86d4c2a
-SIZE (gajim-0.10.tar.bz2) = 2073760
+MD5 (gajim-0.10.1.tar.bz2) = 392d9d1e06f6db49a892b9aea4a178c7
+SHA256 (gajim-0.10.1.tar.bz2) = b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
+SIZE (gajim-0.10.1.tar.bz2) = 2066396
diff -urN /usr/ports/net-im/gajim/files/patch-Changeset6314 net-im/gajim/files/patch-Changeset6314
--- /usr/ports/net-im/gajim/files/patch-Changeset6314 Sun May 21 21:04:20 2006
+++ net-im/gajim/files/patch-Changeset6314 Thu Jan 1 01:00:00 1970
@@ -1,39 +0,0 @@
-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)
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list