svn commit: r321674 - in head/net-im/openfire: . files

[Pietro Cerutti]

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 <email at christian-reiss.de> [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