Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 May 2013 15:19:41 +0000 (UTC)
From:      Ruslan Mahmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317027 - in head/net-im/gajim: . files
Message-ID:  <201305011519.r41FJf3V090854@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Wed May  1 15:19:41 2013
New Revision: 317027
URL: http://svnweb.freebsd.org/changeset/ports/317027

Log:
  - add upstream patch to fix connection to servers w/o StartTLS support (r14476)
  - remove conflicts with no more existing gajim-devel, while here
  - bump PORTREVISION
  
  Reported by:	arrowdodger <6yearold@gmail.com> (by email)

Added:
  head/net-im/gajim/files/patch-src-common_connection.py   (contents, props changed)
Modified:
  head/net-im/gajim/Makefile

Modified: head/net-im/gajim/Makefile
==============================================================================
--- head/net-im/gajim/Makefile	Wed May  1 15:10:34 2013	(r317026)
+++ head/net-im/gajim/Makefile	Wed May  1 15:19:41 2013	(r317027)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	0.15.3
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/0.15/
 
@@ -14,8 +15,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}open
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
 
-CONFLICTS=	gajim-devel-[0-9]*
-
 FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes

Added: head/net-im/gajim/files/patch-src-common_connection.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gajim/files/patch-src-common_connection.py	Wed May  1 15:19:41 2013	(r317027)
@@ -0,0 +1,11 @@
+--- src/common/connection.py.orig	2013-03-17 21:55:32.000000000 +0400
++++ src/common/connection.py	2013-05-01 18:47:51.000000000 +0400
+@@ -1331,7 +1331,7 @@
+                     certificate=con.Connection.ssl_certificate[i]))
+                 return True
+             i += 1
+-        if hasattr(con.Connection, 'ssl_fingerprint_sha1'):
++        if con.Connection.ssl_fingerprint_sha1:
+             saved_fingerprint = gajim.config.get_per('accounts', self.name,
+                 'ssl_fingerprint_sha1')
+             if saved_fingerprint:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305011519.r41FJf3V090854>