From owner-svn-ports-all@FreeBSD.ORG Mon Jun 24 10:54:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 298CECF9; Mon, 24 Jun 2013 10:54:33 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 016D51CC8; Mon, 24 Jun 2013 10:54:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OAsWmT037962; Mon, 24 Jun 2013 10:54:32 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OAsWq5037959; Mon, 24 Jun 2013 10:54:32 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201306241054.r5OAsWq5037959@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 24 Jun 2013 10:54:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321674 - in head/net-im/openfire: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jun 2013 10:54:33 -0000 Author: gahr Date: Mon Jun 24 10:54:32 2013 New Revision: 321674 URL: http://svnweb.freebsd.org/changeset/ports/321674 Log: - Update to 3.8.2 Announcement: http://community.igniterealtime.org/blogs/ignite/2013/05/28/ - Incorporate a patch to fix broken S2S [1] Issue: http://issues.igniterealtime.org/browse/OF-443 Submitted by: Christian Reiss [1] Added: head/net-im/openfire/files/patch-tls-dialback (contents, props changed) Modified: head/net-im/openfire/Makefile head/net-im/openfire/distinfo Modified: head/net-im/openfire/Makefile ============================================================================== --- head/net-im/openfire/Makefile Mon Jun 24 10:42:25 2013 (r321673) +++ head/net-im/openfire/Makefile Mon Jun 24 10:54:32 2013 (r321674) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openfire -PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTVERSION= 3.8.2 PORTEPOCH= 1 CATEGORIES= net-im java MASTER_SITES= http://download.igniterealtime.org/openfire/ @@ -23,6 +22,7 @@ PLUGINS_DESC= Install bundled plugins USE_ZIP= yes USE_LDCONFIG= yes +USE_DOS2UNIX= src/java/org/jivesoftware/openfire/server/ServerDialback.java USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ Modified: head/net-im/openfire/distinfo ============================================================================== --- head/net-im/openfire/distinfo Mon Jun 24 10:42:25 2013 (r321673) +++ head/net-im/openfire/distinfo Mon Jun 24 10:54:32 2013 (r321674) @@ -1,2 +1,2 @@ -SHA256 (openfire_src_3_8_1.zip) = f65fb70f450e7ab0c0e56329ad85a38a0d85cf38dfb6e8b1650330d6d82e43bd -SIZE (openfire_src_3_8_1.zip) = 72082167 +SHA256 (openfire_src_3_8_2.zip) = a72b9a492e84a71ae2d34ca8731ce6aa6b378b85a1e5b7e31223c00e2237d838 +SIZE (openfire_src_3_8_2.zip) = 72348562 Added: head/net-im/openfire/files/patch-tls-dialback ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/openfire/files/patch-tls-dialback Mon Jun 24 10:54:32 2013 (r321674) @@ -0,0 +1,12 @@ +--- src/java/org/jivesoftware/openfire/server/ServerDialback.java.orig 2013-06-11 09:18:37.000000000 +0200 ++++ src/java/org/jivesoftware/openfire/server/ServerDialback.java 2013-06-11 09:19:07.000000000 +0200 +@@ -236,8 +236,7 @@ + stream.append(" xmlns=\"jabber:server\""); + stream.append(" to=\"").append(remoteDomain).append("\""); + stream.append(" from=\"").append(localDomain).append("\""); +- stream.append(" xmlns:db=\"jabber:server:dialback\""); +- stream.append(" version=\"1.0\">"); ++ stream.append(" xmlns:db=\"jabber:server:dialback\">"); + connection.deliverRawText(stream.toString()); + + // Set a read timeout (of 5 seconds) so we don't keep waiting forever