diff -Nru erlang-p1-xml-1.1.30/CHANGELOG.md erlang-p1-xml-1.1.32/CHANGELOG.md --- erlang-p1-xml-1.1.30/CHANGELOG.md 2018-04-25 08:42:44.000000000 +0000 +++ erlang-p1-xml-1.1.32/CHANGELOG.md 2018-06-29 09:50:45.000000000 +0000 @@ -1,3 +1,11 @@ +# Version 1.1.32 + +* Don't crash when trying to encode xmlcdata + +# Version 1.1.31 + +* Updating p1_utils to version 1.0.12. + # Version 1.1.30 * Improve detection of rebar3 diff -Nru erlang-p1-xml-1.1.30/debian/changelog erlang-p1-xml-1.1.32/debian/changelog --- erlang-p1-xml-1.1.30/debian/changelog 2018-05-09 15:10:41.000000000 +0000 +++ erlang-p1-xml-1.1.32/debian/changelog 2018-07-04 14:25:07.000000000 +0000 @@ -1,3 +1,10 @@ +erlang-p1-xml (1.1.32-1) unstable; urgency=medium + + * New upstream version 1.1.32 + * Added debian/upstream/metadata + + -- Philipp Huebner Wed, 04 Jul 2018 16:25:07 +0200 + erlang-p1-xml (1.1.30-1) unstable; urgency=medium * New upstream version 1.1.30 diff -Nru erlang-p1-xml-1.1.30/debian/control erlang-p1-xml-1.1.32/debian/control --- erlang-p1-xml-1.1.30/debian/control 2018-05-09 15:10:41.000000000 +0000 +++ erlang-p1-xml-1.1.32/debian/control 2018-07-04 10:34:19.000000000 +0000 @@ -7,7 +7,7 @@ dh-rebar, erlang-base (>= 1:19.2), erlang-eunit, - erlang-p1-utils (>= 1.0.11), + erlang-p1-utils (>= 1.0.12), erlang-syntax-tools, libexpat1-dev Standards-Version: 4.1.4 @@ -21,7 +21,7 @@ ${misc:Depends}, erlang-base (>= 1:19.2) | ${erlang-abi:Depends}, ${erlang:Depends}, - erlang-p1-utils (>= 1.0.11) + erlang-p1-utils (>= 1.0.12) Description: XML utilities for Erlang This library was written for ejabberd which still uses it. It was split off into it's own project to follow diff -Nru erlang-p1-xml-1.1.30/debian/patches/remove-deps.diff erlang-p1-xml-1.1.32/debian/patches/remove-deps.diff --- erlang-p1-xml-1.1.30/debian/patches/remove-deps.diff 2018-05-09 15:10:41.000000000 +0000 +++ erlang-p1-xml-1.1.32/debian/patches/remove-deps.diff 2018-07-04 10:31:59.000000000 +0000 @@ -11,7 +11,7 @@ {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]}, {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}. --{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.11"}}}]}. +-{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.12"}}}]}. {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}. diff -Nru erlang-p1-xml-1.1.30/debian/upstream/metadata erlang-p1-xml-1.1.32/debian/upstream/metadata --- erlang-p1-xml-1.1.30/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ erlang-p1-xml-1.1.32/debian/upstream/metadata 2018-05-31 10:41:41.000000000 +0000 @@ -0,0 +1,10 @@ +Name: fast_xml +Bug-Database: https://github.com/processone/fast_xml/issues +Bug-Submit: https://github.com/processone/fast_xml/issues/new +Changelog: https://github.com/processone/fast_xml/commits/master +Repository: https://github.com/processone/fast_xml.git +Repository-Browse: https://github.com/processone/fast_xml +Registration: https://github.com/join +Contact: XMPP-MUC:ejabberd@conference.process-one.net +Documentation: https://docs.ejabberd.im/ +FAQ: https://docs.ejabberd.im/ejabberd-faq/ diff -Nru erlang-p1-xml-1.1.30/rebar.config erlang-p1-xml-1.1.32/rebar.config --- erlang-p1-xml-1.1.30/rebar.config 2018-04-25 08:42:44.000000000 +0000 +++ erlang-p1-xml-1.1.32/rebar.config 2018-06-29 09:50:45.000000000 +0000 @@ -32,7 +32,7 @@ {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]}, {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}. -{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.11"}}}]}. +{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.12"}}}]}. {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}. diff -Nru erlang-p1-xml-1.1.30/src/fast_xml.app.src erlang-p1-xml-1.1.32/src/fast_xml.app.src --- erlang-p1-xml-1.1.30/src/fast_xml.app.src 2018-04-25 08:42:44.000000000 +0000 +++ erlang-p1-xml-1.1.32/src/fast_xml.app.src 2018-06-29 09:50:45.000000000 +0000 @@ -23,7 +23,7 @@ {application, fast_xml, [{description, "Fast Expat-based Erlang / Elixir XML parsing library"}, - {vsn, "1.1.30"}, + {vsn, "1.1.32"}, {modules, []}, {registered, []}, {applications, [kernel, stdlib, p1_utils]}, diff -Nru erlang-p1-xml-1.1.30/src/fxml_gen.erl erlang-p1-xml-1.1.32/src/fxml_gen.erl --- erlang-p1-xml-1.1.30/src/fxml_gen.erl 2018-04-25 08:42:44.000000000 +0000 +++ erlang-p1-xml-1.1.32/src/fxml_gen.erl 2018-06-29 09:50:45.000000000 +0000 @@ -819,19 +819,23 @@ [?AST({xmlel, _, _, _} = El), ?AST(_)], none, [?AST(El)]), + Clause2 = erl_syntax:clause( + [?AST({xmlcdata, _} = CData), ?AST(_)], + none, + [?AST(CData)]), GetNameCase = [?AST(Mod = get_mod(El)), ?AST(Mod:do_get_name(El))], GetNSCase = [?AST(Mod = get_mod(El)), ?AST(Mod:do_get_ns(El))], KnownTagCase = [?AST(XMLNS = get_attr(<<"xmlns">>, Attrs, TopXMLNS)), ?AST(get_mod(Name, XMLNS) /= undefined)], - Clause2 = erl_syntax:clause( + Clause3 = erl_syntax:clause( [?AST(El), ?AST(TopXMLNS)], none, [?AST(Mod = get_mod(El)), ?AST(Mod:do_encode(El, TopXMLNS))]), [make_function(encode, [?AST(El)], [?AST(encode(El, <<>>))]), - erl_syntax:function(?AST(encode), [Clause1, Clause2]), + erl_syntax:function(?AST(encode), [Clause1, Clause2, Clause3]), make_function(get_name, [?AST(El)], GetNameCase), make_function(get_ns, [?AST(El)], GetNSCase), make_function(is_known_tag,