aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2013-06-24 18:54:32 +0800
committergahr <gahr@FreeBSD.org>2013-06-24 18:54:32 +0800
commitd23dddad7dfe8a327ad96169263da2d42de8c329 (patch)
treed0fb82efc5cacba9b20db42b144fd70ecbcf9dd7
parent2d2c2ba989c07bdf0e89545b2875c82f251011a8 (diff)
downloadfreebsd-ports-gnome-d23dddad7dfe8a327ad96169263da2d42de8c329.tar.gz
freebsd-ports-gnome-d23dddad7dfe8a327ad96169263da2d42de8c329.tar.zst
freebsd-ports-gnome-d23dddad7dfe8a327ad96169263da2d42de8c329.zip
- 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@christian-reiss.de> [1]
-rw-r--r--net-im/openfire/Makefile4
-rw-r--r--net-im/openfire/distinfo4
-rw-r--r--net-im/openfire/files/patch-tls-dialback12
3 files changed, 16 insertions, 4 deletions
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index ebd5964d8089..82008469b056 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -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+
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 940c3220ddf4..288f96f8e65f 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -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
diff --git a/net-im/openfire/files/patch-tls-dialback b/net-im/openfire/files/patch-tls-dialback
new file mode 100644
index 000000000000..7e088ce1e17b
--- /dev/null
+++ b/net-im/openfire/files/patch-tls-dialback
@@ -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