From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-perl/XML-LibXML/Manifest | 5 +- dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild | 79 ---------------------- dev-perl/XML-LibXML/XML-LibXML-2.20.700.ebuild | 2 +- .../XML-LibXML-2.12.800-disable-expanding.patch | 72 -------------------- 4 files changed, 2 insertions(+), 156 deletions(-) delete mode 100644 dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild delete mode 100644 dev-perl/XML-LibXML/files/XML-LibXML-2.12.800-disable-expanding.patch (limited to 'dev-perl/XML-LibXML') diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest index 48020f8918bd..687be3b733be 100644 --- a/dev-perl/XML-LibXML/Manifest +++ b/dev-perl/XML-LibXML/Manifest @@ -1,6 +1,3 @@ -AUX XML-LibXML-2.12.800-disable-expanding.patch 2608 BLAKE2B b21eef9abb75a885c89d22efeff633a376576240808773b60f8ce271345994f5ad3d6c83d227350c4d11edb98ea869f72d7755606fd86cc47b2f152f7ea3fc95 SHA512 77d620da3315c930e42bbc4d0f5a528f6f2d3cbf70e5ea1d0ab461244a898260617c59aa92d41aab6b1c5b8c2ccc9cb0a9f0030bf0ece90a94e98994bfd3a0cf -DIST XML-LibXML-2.0201.tar.gz 462237 BLAKE2B 17313daca3e87b12f0d3161f628dbd5ee3fbd233747a9602b275e13f14e9710eba424804b1f57b40c2f0f340d1c29ca0518ffc395b808b0e9851c61943d73b22 SHA512 988bc98e7f3e426202b9770ef055df68abc861b935dcdd8ecbefaaa7cd528abc35cce9bd75f2f10412917178f6b74ac6bf953feac130b1f9afe9e18c16139e47 DIST XML-LibXML-2.0207.tar.gz 462595 BLAKE2B 9ebb4786dcd45f552ef31ba0854693e876b6f8098b577401429651e5eb55792bb623185db371d2578432c00031ce2cfb66603e08290d7cf8f74dee5fe45c143d SHA512 86bf4200c800e1295161c3217892398dbc65e107ad1a3df8ea7f237350ba67d88ad7b18ab7123e647053a8721bc13a8959ddb101fdc6de18dcaef02c0f0f5b58 -EBUILD XML-LibXML-2.20.100.ebuild 1763 BLAKE2B 846c7d04b0d7fce1fd464fcb3980300c5bc6bcc4a47cdef8754ee7fde6c7c2cca70699f6ca9021ddd974b9302b0c70a714ad4883e8f89e18509305147371146d SHA512 817910c5d1033c497f0fdedf45da8fe697fd8d91427d267aeeb2647c6dc0921feee9a570dbf173e17cd7b8babd9476029818b173196f07da034fa361219ff682 -EBUILD XML-LibXML-2.20.700.ebuild 1721 BLAKE2B ac6b2a4ceb36024288b670f6a1a105480f455f60cb52d552aa329962ea9fd3e8e84a9951bf02396139556e51e741bb1e00959a3c74db2dcf2d685d45d93e6489 SHA512 e72ebf9903708add46fadbda4e4704da6acaf72850f16262b537eb06ba484da94924389bec418601fed20da3b51443b51bafed8dba90faa274abe8e46015a0a9 +EBUILD XML-LibXML-2.20.700.ebuild 1713 BLAKE2B 22d964fe3387997070b01fbb0e0643be5e74af074c7e946f004947bd0f71db75a689f557d5f098f50bf83c086caeea78672a4b835428f0941012c1a432e2f999 SHA512 b1337518936f3c282244b30a13582ae6c483f7623269ba23b8e7baa2d93ea9d95e344ad9145a7c06cd93d1490f07a81b4c39724d56f4ed7a97ab667186b508a3 MISC metadata.xml 2783 BLAKE2B 69d8723dca61cd70c875f502d74213a4b8ab6d33b89438b0f0bd11bf00d9a88c5c9d5d5d2e23af2d7c8fcdd5a0442c3ec6edccc9b3e359063519fe2d0cdea698 SHA512 8ad240f84906b05144327e68baa16be3e4866dbf7d364ed6cf0b13f1031ef7632a4628715ef84c7ada5e5864b56bf588de0ecb5b7aafb2eafe4762f234cd3be7 diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild deleted file mode 100644 index 6d299633b342..000000000000 --- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=SHLOMIF -DIST_VERSION=2.0201 -DIST_EXAMPLES=("example/*") -inherit perl-module - -DESCRIPTION="Perl binding for libxml2" - -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="test minimal" -RESTRICT="!test? ( test )" - -RDEPEND=" - virtual/perl-Carp - virtual/perl-Encode - >=virtual/perl-Exporter-5.570.0 - virtual/perl-IO - virtual/perl-Scalar-List-Utils - >=dev-perl/XML-SAX-0.120.0 - >=dev-libs/libxml2-2.6.21:2= - dev-perl/XML-SAX-Base - >=dev-perl/XML-NamespaceSupport-1.70.0 - virtual/perl-XSLoader - virtual/perl-parent -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - dev-perl/Alien-Libxml2 - test? ( - !minimal? ( - dev-perl/Test-LeakTrace - ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.12.800-disable-expanding.patch" -) - -PERL_RM_FILES=( - "t/cpan-changes.t" "t/pod-files-presence.t" "t/pod.t" - "t/release-kwalitee.t" "t/style-trailing-space.t" - "t/11memory.t" -) - -src_compile() { - export SKIP_SAX_INSTALL=1 - perl-module_src_compile -} - -pkg_postinst() { - pkg_update_parser add XML::LibXML::SAX::Parser - pkg_update_parser add XML::LibXML::SAX -} - -pkg_postrm() { - pkg_update_parser remove XML::LibXML::SAX::Parser - pkg_update_parser remove XML::LibXML::SAX -} - -pkg_update_parser() { - # pkg_update_parser [add|remove] $parser_module - local action=$1 - local parser_module=$2 - - if [[ "$ROOT" = "/" ]] ; then - einfo "Update Parser: $1 $2" - perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \ - || ewarn "Update Parser: $1 $2 failed" - else - elog "To $1 $2 run:" - elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'" - fi -} diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.700.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.700.ebuild index 1d213896cdab..ebe51ebbecf4 100644 --- a/dev-perl/XML-LibXML/XML-LibXML-2.20.700.ebuild +++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.700.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Perl binding for libxml2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="minimal" RDEPEND=" diff --git a/dev-perl/XML-LibXML/files/XML-LibXML-2.12.800-disable-expanding.patch b/dev-perl/XML-LibXML/files/XML-LibXML-2.12.800-disable-expanding.patch deleted file mode 100644 index 8be7783ef679..000000000000 --- a/dev-perl/XML-LibXML/files/XML-LibXML-2.12.800-disable-expanding.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 05749ae525317d05bd9d4232c080e530854f1d88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 30 Sep 2016 14:31:26 +0200 -Subject: [PATCH] Do not enable expanding entities by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Expanding external entity is insecure. -. -This patch makes expand_entities option disabled by default. - -CPAN RT#118032 - -Signed-off-by: Petr Písař ---- - LibXML.pm | 2 +- - docs/libxml.dbk | 2 +- - t/43options.t | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/LibXML.pm b/LibXML.pm -index eb3cbd6..9ab4748 100644 ---- a/LibXML.pm -+++ b/LibXML.pm -@@ -261,7 +261,7 @@ use constant { - HTML_PARSE_NOERROR => (1<<5), # suppress error reports - }; - --$XML_LIBXML_PARSE_DEFAULTS = ( XML_PARSE_NODICT | XML_PARSE_DTDLOAD | XML_PARSE_NOENT ); -+$XML_LIBXML_PARSE_DEFAULTS = ( XML_PARSE_NODICT | XML_PARSE_DTDLOAD ); - - # this hash is made global so that applications can add names for new - # libxml2 parser flags as temporary workaround -diff --git a/docs/libxml.dbk b/docs/libxml.dbk -index 30f279b..2c6674b 100644 ---- a/docs/libxml.dbk -+++ b/docs/libxml.dbk -@@ -1676,7 +1676,7 @@ local $XML::LibXML::setTagCompression = 1; - expand_entities - - /parser, reader/ -- substitute entities; possible values are 0 and 1; default is 1 -+ substitute entities; possible values are 0 and 1; default is 0 - Note that although this flag disables entity substitution, it - does not prevent the parser from loading external entities; - when substitution of an external entity is disabled, the -diff --git a/t/43options.t b/t/43options.t -index 826f0ad..53dd35e 100644 ---- a/t/43options.t -+++ b/t/43options.t -@@ -50,7 +50,7 @@ no_network - { - my $p = XML::LibXML->new(); - for my $opt (@all) { -- my $ret = (($opt =~ /^(?:load_ext_dtd|expand_entities)$/) ? 1 : 0); -+ my $ret = (($opt =~ /^(?:load_ext_dtd)$/) ? 1 : 0); - # TEST*$all - ok( - ($p->get_option($opt)||0) == $ret -@@ -110,7 +110,7 @@ no_network - ok( $p->get_option('recover') == 2, ' TODO : Add test name' ); - - # TEST -- ok( $p->expand_entities() == 1, ' TODO : Add test name' ); -+ ok( $p->expand_entities() == 0, ' TODO : Add test name' ); - # TEST - ok( $p->load_ext_dtd() == 1, ' TODO : Add test name' ); - $p->load_ext_dtd(0); --- -2.7.4 - -- cgit v1.2.3