From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 19 20:59:59 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FCDE1B8; Wed, 19 Feb 2014 20:59:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1A333135A; Wed, 19 Feb 2014 20:59:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JKxwxw062009; Wed, 19 Feb 2014 20:59:58 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JKxwjk062007; Wed, 19 Feb 2014 20:59:58 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402192059.s1JKxwjk062007@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 19 Feb 2014 20:59:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r345148 - in branches/2014Q1/net-im/gajim: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 20:59:59 -0000 Author: rm Date: Wed Feb 19 20:59:58 2014 New Revision: 345148 URL: http://svnweb.freebsd.org/changeset/ports/345148 QAT: https://qat.redports.org/buildarchive/r345148/ Log: MFH: r345147 Fix runtime on FreeBSD >=10.0 Gajim relies on nslookup when looking up for an SRV record of jabber server. Since, nslookup was removed from FreeBSD 10, gajim is now fails to connect unless jabber-server hostname and port were defined by user explicitly. This patch make it use host(1) for this task. Submitted by: walker_643 (by email) Approved by: portmgr (erwin) Added: branches/2014Q1/net-im/gajim/files/extra-patch-src-common_resolver.py - copied unchanged from r345147, head/net-im/gajim/files/extra-patch-src-common_resolver.py Modified: branches/2014Q1/net-im/gajim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-im/gajim/Makefile ============================================================================== --- branches/2014Q1/net-im/gajim/Makefile Wed Feb 19 20:41:53 2014 (r345147) +++ branches/2014Q1/net-im/gajim/Makefile Wed Feb 19 20:59:58 2014 (r345148) @@ -3,6 +3,7 @@ PORTNAME= gajim PORTVERSION= 0.15.4 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://gajim.org/downloads/0.15/ @@ -42,6 +43,10 @@ NLS_USES= gettext NO_STAGE= yes .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common_resolver.py +.endif + .if ! ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --disable-nls .endif Copied: branches/2014Q1/net-im/gajim/files/extra-patch-src-common_resolver.py (from r345147, head/net-im/gajim/files/extra-patch-src-common_resolver.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net-im/gajim/files/extra-patch-src-common_resolver.py Wed Feb 19 20:59:58 2014 (r345148, copy of r345147, head/net-im/gajim/files/extra-patch-src-common_resolver.py) @@ -0,0 +1,37 @@ +--- src/common/resolver.py.orig 2014-02-03 11:03:20.000000000 -0500 ++++ src/common/resolver.py 2014-02-04 09:37:37.000000000 -0500 +@@ -238,8 +238,8 @@ + return hosts + + def _parse_srv_result_posix(self, fqdn, result): +- # typical output of bind-tools nslookup command: +- # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org. ++ # typical output of host lookup command ++ # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org. + if not result: + return [] + ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name +@@ -255,11 +255,12 @@ + line = helpers.decode_string(line) + domain = ufqdn # For nslookup 9.6 + if domain: +- rest = line[len(domain):].split('=') ++ # add 4 for ' has' after domain name ++ rest = line[len(domain)+4:].split('record') + if len(rest) != 2: + continue + answer_type, props_str = rest +- if answer_type.strip() != 'service': ++ if answer_type.strip() != 'SRV': + continue + props = props_str.strip().split(' ') + if len(props) < 4: +@@ -309,7 +310,7 @@ + return + + def _compose_command_args(self): +- return ['nslookup', '-type=' + self.type, self.host] ++ return ['host', '-t', self.type, self.host] + + def _return_result(self): + if self.result_handler: