[gentoo-commits] repo/gentoo:master commit in: dev-erlang/fast_xml/files/, dev-erlang/fast_xml/

[Pacho Ramos]

commit:     4f4da0c56e94e61ea42c79d8a418ccd39099eea6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 18:53:53 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 19:01:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4da0c5

dev-erlang/fast_xml: Drop old, to allow removal of vulnerable erlang

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 dev-erlang/fast_xml/Manifest                       |  4 -
 dev-erlang/fast_xml/fast_xml-1.1.14.ebuild         | 24 ------
 dev-erlang/fast_xml/fast_xml-1.1.15.ebuild         | 24 ------
 dev-erlang/fast_xml/fast_xml-1.1.18.ebuild         | 26 ------
 dev-erlang/fast_xml/fast_xml-1.1.3.ebuild          | 25 ------
 .../fast_xml/files/1.1.18-0001-Fix-unittests.patch | 92 ----------------------
 6 files changed, 195 deletions(-)

diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index 90308ea73b6..c0eae9502ea 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1,5 +1 @@
-DIST fast_xml-1.1.14.tar.gz 86918 BLAKE2B d95616c8908b66a93b2df01f333b9d9f7ded67bbf462c58b464eddbf9fea164bc1f65a95b69f2cd9512d206e93d2341f773208efb70c9336e798f4eb5d549ae6 SHA512 3475d5cc5ab670cade221b5ffb610d2dbc52d9699e8d32d17eb3b13da1a486d8351776a50284cdd37ee9d4b6606221c60928f836669a325cb1692290a88d5d1e
-DIST fast_xml-1.1.15.tar.gz 86948 BLAKE2B 6bd4ac68fd93346d775efe58184cb8c976c27ce994f58ace0855b18f3d68e5211a69a53ef2ef6c0dee0f1609b9a14eb7b38baa0722b1e56962d282a1ba3a393e SHA512 3792ec8aca5ee8c40f53a356badcc9685ed071903500b0405a4d8b3620605eba1b8d1351efb5115497e022811dfca3382522318decc6207df1e4d81db3d0c94a
-DIST fast_xml-1.1.18.tar.gz 89244 BLAKE2B 834ae5125e72d909b6a8c4784d9a2a5a4f3664996c200b5e55e0c1c2a272a54a278a952ac542c1eed481c0785f64d6bb855f590223fc0ac7bc8dfb1e8a610bf6 SHA512 5f6867e2f56d8e3d68337d477f215ac52fe01b3f31792605dcca31f3d8dc8b590d5d24798cf245f7af3cb5dc903530e5950d5ea4d8e0d650c091b7d87cf32e0c
 DIST fast_xml-1.1.22.tar.gz 92408 BLAKE2B efd6c69c4dcfe3c36162c0b47ee8b56561102fde130f8be503c767e40d66c0f698876ed384bd27aea41e18f6530bf712eeeca2ea497c4b1aafc630fe1b016981 SHA512 33c79cf34d6b0093cf98d11c5b68855d4201a6891786cc3caabd7dded81a04118638ce091cda1f1c86729ea8c8765214332cc34a361bbfb3c5958dbc2027a384
-DIST fast_xml-1.1.3.tar.gz 84926 BLAKE2B 4aa86452f6c66040920618d728a93430312faee06584199d4f33c4af4dc00b40e398b43b0216fe1ac4bb4673c9c7e71f4483867aec0509598250b042255f5d51 SHA512 644934d6538ddf2b49863883a66255966b47f933594aff10325dca7785802d28d3223f79941fb4cfa33776e5a1a5fa74fe84422b7077241fb33fff1c52bd044a

diff --git a/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
deleted file mode 100644
index 75a9c8e2828..00000000000
--- a/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Expat based Erlang XML parsing library"
-HOMEPAGE="https://github.com/processone/fast_xml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/elixir-1.1 )"
-
-DOCS=( CHANGELOG.md  README.md )

diff --git a/dev-erlang/fast_xml/fast_xml-1.1.15.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.15.ebuild
deleted file mode 100644
index b37d24b8cec..00000000000
--- a/dev-erlang/fast_xml/fast_xml-1.1.15.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Expat based Erlang XML parsing library"
-HOMEPAGE="https://github.com/processone/fast_xml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/elixir-1.1 )"
-
-DOCS=( CHANGELOG.md  README.md )

diff --git a/dev-erlang/fast_xml/fast_xml-1.1.18.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.18.ebuild
deleted file mode 100644
index 4fb74ffd263..00000000000
--- a/dev-erlang/fast_xml/fast_xml-1.1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Expat based Erlang XML parsing library"
-HOMEPAGE="https://github.com/processone/fast_xml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/elixir-1.1 )"
-
-DOCS=( CHANGELOG.md  README.md )
-
-PATCHES=( "${FILESDIR}"/${PV}-0001-Fix-unittests.patch )

diff --git a/dev-erlang/fast_xml/fast_xml-1.1.3.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.3.ebuild
deleted file mode 100644
index 4c98982c6ed..00000000000
--- a/dev-erlang/fast_xml/fast_xml-1.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Expat based Erlang XML parsing library"
-HOMEPAGE="https://github.com/processone/fast_xml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-erlang/p1_utils-1.0.0
-	>=dev-lang/erlang-17.1
-	<dev-lang/erlang-19
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/elixir-1.1 )"
-
-DOCS=( CHANGELOG.md  README.md )

diff --git a/dev-erlang/fast_xml/files/1.1.18-0001-Fix-unittests.patch b/dev-erlang/fast_xml/files/1.1.18-0001-Fix-unittests.patch
deleted file mode 100644
index c5113bde70d..00000000000
--- a/dev-erlang/fast_xml/files/1.1.18-0001-Fix-unittests.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 4b65d1603c9b16cf440e0b434673de9d7bdca6b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@×××××××××××.net>
-Date: Mon, 2 Jan 2017 10:58:33 +0100
-Subject: [PATCH] Load locally build .so file when performing tests
-
-This should help with issue #19 and #20
----
- src/fxml.erl        |  5 ++++-
- src/fxml_stream.erl | 11 +++++++----
- test/fxml_test.erl  |  6 ++----
- 3 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/fxml.erl b/src/fxml.erl
-index 935bf28..ed6e535 100644
---- a/src/fxml.erl
-+++ b/src/fxml.erl
-@@ -36,7 +36,7 @@
- 	 append_subtags/2, get_path_s/2,
- 	 replace_tag_attr/3, replace_subtag/2, to_xmlel/1]).
- 
---export([load_nif/0]).
-+-export([load_nif/0, load_nif/1]).
- 
- -include("fxml.hrl").
- -export_type([xmlel/0]).
-@@ -44,6 +44,9 @@
- %% Replace element_to_binary/1 with NIF
- load_nif() ->
-     SOPath = p1_nif_utils:get_so_path(?MODULE, [fast_xml], "fxml"),
-+    load_nif(SOPath).
-+
-+load_nif(SOPath) ->
-     case catch erlang:load_nif(SOPath, 0) of
-         ok -> ok;
-         Err -> error_logger:warning_msg("unable to load fxml NIF: ~p~n", [Err]),
-diff --git a/src/fxml_stream.erl b/src/fxml_stream.erl
-index a2fcb01..ee1a949 100644
---- a/src/fxml_stream.erl
-+++ b/src/fxml_stream.erl
-@@ -30,7 +30,7 @@
- -export([new/1, new/2, new/3, parse/2, close/1, reset/1,
- 	 change_callback_pid/2, parse_element/1]).
- 
---export([load_nif/0]).
-+-export([load_nif/0, load_nif/1]).
- 
- -include("fxml.hrl").
- 
-@@ -54,13 +54,16 @@
- -export_type([xml_stream_state/0, xml_stream_el/0]).
- 
- load_nif() ->
--    NifFile = p1_nif_utils:get_so_path(?MODULE, [fast_xml], "fxml_stream"),
--    case erlang:load_nif(NifFile, 0) of
-+    SOPath = p1_nif_utils:get_so_path(?MODULE, [fast_xml], "fxml_stream"),
-+    load_nif(SOPath).
-+
-+load_nif(SOPath) ->
-+    case erlang:load_nif(SOPath, 0) of
- 	ok ->
- 	    ok;
-         {error, {Reason, Txt}} ->
-             error_logger:error_msg("failed to load NIF ~s: ~s",
--                                   [NifFile, Txt]),
-+                                   [SOPath, Txt]),
-             {error, Reason}
-     end.
- 
-diff --git a/test/fxml_test.erl b/test/fxml_test.erl
-index e41a3dc..0bd2f91 100644
---- a/test/fxml_test.erl
-+++ b/test/fxml_test.erl
-@@ -39,7 +39,8 @@ close(State) ->
-     ?assertEqual(true, fxml_stream:close(State)).
- 
- start_test() ->
--    ?assertEqual(ok, application:start(fast_xml)).
-+    ?assertEqual(ok, fxml:load_nif(p1_nif_utils:get_so_path(fxml, [], "fxml"))),
-+    ?assertEqual(ok, fxml_stream:load_nif(p1_nif_utils:get_so_path(fxml_stream, [], "fxml_stream"))).
- 
- tag_test() ->
-     ?assertEqual(#xmlel{name = <<"root">>},
-@@ -877,6 +878,3 @@ rpc_empty_response_test() ->
-     Result = {response, []},
-     ?assertEqual({ok, Result}, fxmlrpc:decode(Response)),
-     ?assertEqual(Response, fxmlrpc:encode(Result)).
--
--application_stop_test() ->
--    ?assertEqual(ok, application:stop(fast_xml)).
--- 
-2.11.0
-