Date: Fri, 15 Feb 2019 15:55:25 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493003 - in head: . net-im/ejabberd net-im/ejabberd/files Message-ID: <201902151555.x1FFtPe8098962@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Fri Feb 15 15:55:24 2019 New Revision: 493003 URL: https://svnweb.freebsd.org/changeset/ports/493003 Log: - Add a patch for the issue 2744 - Also revert a patch-configure.ac change from previous commits - Document the change in UPDATING file Added: head/net-im/ejabberd/files/patch-ejabberd-bug2744.diff (contents, props changed) Modified: head/UPDATING head/net-im/ejabberd/Makefile head/net-im/ejabberd/files/patch-configure.ac Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Feb 15 15:45:23 2019 (r493002) +++ head/UPDATING Fri Feb 15 15:55:24 2019 (r493003) @@ -5,10 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190215: + AFFECTS: users of net-im/ejabberd + AUTHOR: ashish@FreeBSD.org + + If you've mod_mam enabled with compress_xml set to true, then you're affected + by bug where the XML namespace, and tag elements get interchanged in the MAM cache + which results in invalid XML, and causing XMPP clients to disconnect. For more details, + please refer to: https://github.com/processone/ejabberd/issues/2744 + + This upgrade contains the patch that fixes the problem going forward. For fixing already + affected users, you'll need to wipe off the MAM cache for the affected users: + + sudo -u ejabberd -H ejabberdctl remove_mam_for_user <user> <server> + 20190202: AFFECTS: users of archivers/urbackup-server AUTHOR: freebsd@coombscloud.com - + Some of the port's sources previously included absolute references to /etc/urbackup. The upgrade now changes these references to ${PREFIX}/etc/urbackup. If you have placed any configuration files within /etc/urbackup, these should be relocated to Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Fri Feb 15 15:45:23 2019 (r493002) +++ head/net-im/ejabberd/Makefile Fri Feb 15 15:55:24 2019 (r493003) @@ -2,6 +2,7 @@ PORTNAME= ejabberd PORTVERSION= 18.12.1 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org Modified: head/net-im/ejabberd/files/patch-configure.ac ============================================================================== --- head/net-im/ejabberd/files/patch-configure.ac Fri Feb 15 15:45:23 2019 (r493002) +++ head/net-im/ejabberd/files/patch-configure.ac Fri Feb 15 15:55:24 2019 (r493003) @@ -5,7 +5,7 @@ AC_PREREQ(2.53) -AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd]) -+AC_INIT(ejabberd, 18.12.1, [ejabberd@process-one.net], [ejabberd]) ++AC_INIT(ejabberd, %%PORTVERSION%%, [ejabberd@process-one.net], [ejabberd]) REQUIRE_ERLANG_MIN="8.0 (Erlang/OTP 19.0)" REQUIRE_ERLANG_MAX="100.0.0 (No Max)" Added: head/net-im/ejabberd/files/patch-ejabberd-bug2744.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/ejabberd/files/patch-ejabberd-bug2744.diff Fri Feb 15 15:55:24 2019 (r493003) @@ -0,0 +1,35 @@ +From 06d69c5277f08d9a57f74836c247d3927ca390e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net> +Date: Mon, 7 Jan 2019 16:08:58 +0100 +Subject: [PATCH] Fix decompressing of custom elements with custom namespace + +--- src/xml_compress.erl.orig 2018-12-21 09:44:15 UTC ++++ src/xml_compress.erl +@@ -506,8 +506,8 @@ decode_child(<<2:8, Rest/binary>>, PNs, J1, J2) -> + {Children, Rest4} = decode_children(Rest3, PNs, J1, J2), + {{xmlel, Name, Attrs, Children}, Rest4}; + decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) -> +- {Name, Rest2} = decode_string(Rest), +- {Ns, Rest3} = decode_string(Rest2), ++ {Ns, Rest2} = decode_string(Rest), ++ {Name, Rest3} = decode_string(Rest2), + {Attrs, Rest4} = decode_attrs(Rest3), + {Children, Rest5} = decode_children(Rest4, Ns, J1, J2), + {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5}; + src/xml_compress.erl | 4 ++-- + tools/xml_compress_gen.erl | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- tools/xml_compress_gen.erl.orig 2018-12-21 09:44:15 UTC ++++ tools/xml_compress_gen.erl +@@ -117,8 +117,8 @@ gen_decode(Dev, Data, VerId) -> + " {Children, Rest4} = decode_children(Rest3, PNs, J1, J2),~n" + " {{xmlel, Name, Attrs, Children}, Rest4};~n", []), + io:format(Dev, "decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) ->~n" +- " {Name, Rest2} = decode_string(Rest),~n" +- " {Ns, Rest3} = decode_string(Rest2),~n" ++ " {Ns, Rest2} = decode_string(Rest),~n" ++ " {Name, Rest3} = decode_string(Rest2),~n" + " {Attrs, Rest4} = decode_attrs(Rest3),~n" + " {Children, Rest5} = decode_children(Rest4, Ns, J1, J2),~n" + " {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5};~n", []),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902151555.x1FFtPe8098962>