merge upstream 2.0207+dfsg+really+2.0134

This commit is contained in:
zhouganqing 2024-07-10 16:29:31 +08:00 committed by openkylin-cibot
parent 732e214a63
commit 9195f55d45
8 changed files with 151 additions and 360 deletions

View File

@ -1,8 +0,0 @@
libxml-libxml-perl for Debian
Please edit this to provide information specific to
this libxml-libxml-perl Debian package.
(Automatically generated by debmake Version 4.3.1)
-- sufang <sufang@kylinos.cn> Wed, 07 Sep 2022 15:30:14 +0800

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
libxml-libxml-perl (2.0207+dfsg+really+2.0134-ok1) nile; urgency=medium
* Sync upstream version.
-- zhouganqing <zhouganqing@kylinos.cn> Wed, 10 Jul 2024 16:28:24 +0800
libxml-libxml-perl (2.0207-ok3) nile; urgency=medium
* No change rebuild against perl-5.36 on riscv64

4
debian/control vendored
View File

@ -1,7 +1,8 @@
Source: libxml-libxml-perl
Maintainer: openKylin Developers <packaging@lists.openkylin.top>
Section: perl
Testsuite: autopkgtest-pkg-perl
Priority: optional
Maintainer: OpenKylin Developers <packaging@lists.openkylin.top>
Build-Depends: debhelper-compat (= 13),
libdevel-checklib-perl,
libxml-namespacesupport-perl <!nocheck>,
@ -15,7 +16,6 @@ Standards-Version: 4.6.0
Vcs-Browser: https://gitee.com/openkylin/libxml-libxml-perl
Vcs-Git: https://gitee.com/openkylin/libxml-libxml-perl.git
Homepage: https://metacpan.org/release/XML-LibXML
Testsuite: autopkgtest-pkg-perl
Rules-Requires-Root: no
Package: libxml-libxml-perl

416
debian/copyright vendored
View File

@ -1,210 +1,81 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libxml-libxml-perl
Source: <url://example.com>
#
# Please double check copyright with the licensecheck(1) command.
Upstream-Name: XML-LibXML
Upstream-Contact: Shlomi Fish <shlomif@shlomifish.org>
Source: https://metacpan.org/release/XML-LibXML
Files-Excluded: debian
example/thedieline.rss
example/JBR-ALLENtrees.htm
example/yahoo-finance-html-with-errors.html
Files: Av_CharPtrPtr.c
Av_CharPtrPtr.h
Changes
HACKING.txt
LibXML.pod
MANIFEST
META.json
META.yml
README
TODO
example/cb_example.pl
example/utf-16-1.html
example/utf-16-2.html
example/utf-16-2.xml
example/xpath.pl
lib/XML/LibXML/AttributeHash.pm
perl-libxml-mm.h
perl-libxml-sax.h
scripts/bump-version-number.pl
scripts/fast-eumm.pl
scripts/prints-to-comments.pl
scripts/tag-release.pl
scripts/total-build-and-test.bash
scripts/update-HACKING-file.bash
t/00-report-prereqs.t
t/01basic.t
t/02parse.t
t/03doc.t
t/04node.t
t/05text.t
t/06elements.t
t/07dtd.t
t/08findnodes.t
t/09xpath.t
t/10ns.t
t/11memory.t
t/12html.t
t/13dtd.t
t/14sax.t
t/15nodelist.t
t/16docnodes.t
t/17callbacks.t
t/18docfree.t
t/19encoding.t
t/20extras.t
t/21catalog.t
t/23rawfunctions.t
t/24c14n.t
t/25relaxng.t
t/26schema.t
t/27new_callbacks_simple.t
t/28new_callbacks_multiple.t
t/29id.t
t/30keep_blanks.t
t/30xpathcontext.t
t/31xpc_functions.t
t/32xpc_variables.t
t/35huge_mode.t
t/40reader.t
t/40reader_mem_error.t
t/41xinclude.t
t/42common.t
t/43options.t
t/44extent.t
t/45regex.t
t/46err_column.t
t/47load_xml_callbacks.t
t/48_RH5_double_free_rt83779.t
t/48_SAX_Builder_rt_91433.t
t/48_gh_pr63_detect_undef_values.t
t/48_memleak_rt_83744.t
t/48_removeChild_crashes_rt_80395.t
t/48_replaceNode_DTD_nodes_rT_80521.t
t/48_rt123379_setNamespace.t
t/48_rt55000.t
t/48_rt93429_recover_2_in_html_parsing.t
t/48importing_nodes_IDs_rt_69520.t
t/49callbacks_returning_undef.t
t/49global_extent.t
t/50devel.t
t/51_parse_html_string_rt87089.t
t/60struct_error.t
t/61error.t
t/62overload.t
t/71overloads.t
t/72destruction.t
t/80registryleak.t
t/90shared_clone_failed_rt_91800.t
t/90stack.t
t/90threads.t
t/91unique_key.t
t/cpan-changes.t
t/lib/Collector.pm
t/lib/Counter.pm
t/lib/Stacker.pm
t/lib/TestHelpers.pm
t/pod-files-presence.t
t/pod.t
t/release-kwalitee.t
t/style-trailing-space.t
test/xinclude/entity.txt
typemap
xpath.h
xpathcontext.h
Copyright: __NO_COPYRIGHT_NOR_LICENSE__
License: __NO_COPYRIGHT_NOR_LICENSE__
Files: *
Copyright: 2006-2009, Petr Pajas <pajas@matfyz.cz>
2002-2006, Christian Glahn <phish@cpan.org>
2001-2007, AxKit.com Ltd
License: Artistic or GPL-1+
Files: lib/XML/LibXML/Attr.pod
lib/XML/LibXML/CDATASection.pod
lib/XML/LibXML/Comment.pod
lib/XML/LibXML/Common.pod
lib/XML/LibXML/DOM.pod
lib/XML/LibXML/Document.pod
lib/XML/LibXML/DocumentFragment.pod
lib/XML/LibXML/Dtd.pod
lib/XML/LibXML/Element.pod
lib/XML/LibXML/ErrNo.pod
lib/XML/LibXML/Error.pod
lib/XML/LibXML/InputCallback.pod
lib/XML/LibXML/Namespace.pod
lib/XML/LibXML/Node.pod
lib/XML/LibXML/PI.pod
lib/XML/LibXML/Parser.pod
lib/XML/LibXML/Pattern.pod
lib/XML/LibXML/Reader.pod
lib/XML/LibXML/RegExp.pod
lib/XML/LibXML/RelaxNG.pod
lib/XML/LibXML/SAX.pod
lib/XML/LibXML/SAX/Builder.pod
lib/XML/LibXML/Schema.pod
lib/XML/LibXML/Text.pod
lib/XML/LibXML/XPathContext.pod
lib/XML/LibXML/XPathExpression.pod
ppport.h
Copyright: __NO_COPYRIGHT__ in: lib/XML/LibXML/Attr.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/CDATASection.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Comment.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Common.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/DOM.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Document.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/DocumentFragment.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Dtd.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Element.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/ErrNo.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Error.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/InputCallback.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Namespace.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Node.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/PI.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Parser.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Pattern.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Reader.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/RegExp.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/RelaxNG.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/SAX.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/SAX/Builder.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Schema.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/Text.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/XPathContext.pod
__NO_COPYRIGHT__ in: lib/XML/LibXML/XPathExpression.pod
__NO_COPYRIGHT__ in: ppport.h
License: Perl
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
Files: Devel.xs
lib/XML/LibXML/Devel.pm
Copyright: 2011, Joachim Zobel
License: Artistic or GPL-1+
Files: LibXML.pm
LibXML.xs
Makefile.PL
dom.c
example/xmllibxmldocs.pl
lib/XML/LibXML/Boolean.pm
lib/XML/LibXML/Common.pm
lib/XML/LibXML/Devel.pm
lib/XML/LibXML/ErrNo.pm
lib/XML/LibXML/Error.pm
lib/XML/LibXML/Literal.pm
lib/XML/LibXML/NodeList.pm
lib/XML/LibXML/Number.pm
lib/XML/LibXML/Reader.pm
lib/XML/LibXML/SAX.pm
lib/XML/LibXML/SAX/Builder.pm
lib/XML/LibXML/SAX/Generator.pm
lib/XML/LibXML/SAX/Parser.pm
lib/XML/LibXML/XPathContext.pm
perl-libxml-sax.c
xpath.c
Copyright: 2001-2003 AxKit.com Ltd., 2002-2006 Christian Glahn, 2006-2009 Petr Pajas
2003 christian p. glahn
2011 Joachim Zobel
License: __NO_LICENSE__
Files: scripts/Test.pm-to-Test-More.pl
t/19die_on_invalid_utf8_rt_58848.t
t/48importing_nodes_IDs_rt_69520.t
t/49_load_html.t
t/60error_prev_chain.t
Copyright: 2011, Shlomi Fish
License: Expat
Files: example/create-sample-html-document.pl
scripts/Test.pm-to-Test-More.pl
t/19die_on_invalid_utf8_rt_58848.t
t/49_load_html.t
t/60error_prev_chain.t
Copyright: 2011-2016 Shlomi Fish
License: Expat
This program is distributed under the MIT (X11) License:
L<http://www.opensource.org/licenses/mit-license.php>
Files: t/48_reader_undef_warning_on_empty_str_rt106830.t
Copyright: 2015, Shlomi Fish
License: Expat
Files: example/create-sample-html-document.pl
Copyright: 2016, Shlomi Fish
License: Expat
Files: inc/Devel/CheckLib.pm
Copyright: 2007, David Cantrell
2007, David Golden.
License: Artistic or GPL-1+
Files: ppport.h
Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan@gmx.net>
2001, Paul Marquess <pmqs@cpan.org> (Version 2.x)
1999, Kenneth Albanowski <kjahds@kjahds.com> (Version 1.x)
License: Artistic or GPL-1+
Files: debian/*
Copyright: 2001-2003, Ardo van Rangelrooij <ardo@debian.org>
2003-2004, Michael K. Edwards <mkedeb@sane.net>
2004, Enrico Zini <enrico@debian.org>
2004, Michael Kröll <michael.kroell@uibk.ac.at>
2005, Andrew Pollock <apollock@debian.org>
2005-2007, Florian Ragwitz <rafl@debian.org>
2007, Andreas Barth <aba@not.so.argh.org>
2008, Gunnar Wolf <gwolf@debian.org>
2008-2022, gregor herrmann <gregoa@debian.org>
2009, Jonathan Yu <jawnsy@cpan.org>
2011, Alessandro Ghedini <ghedo@debian.org>
License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
it under the terms of the Artistic License, which comes with Perl.
.
On Debian systems, the complete text of the Artistic License can be
found in `/usr/share/common-licenses/Artistic'.
License: GPL-1+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 1, or (at your option)
any later version.
.
On Debian systems, the complete text of version 1 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-1'.
License: Expat
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
@ -225,146 +96,3 @@ License: Expat
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Files: t/48_reader_undef_warning_on_empty_str_rt106830.t
Copyright: 2015 Shlomi Fish
License: Expat
This program is distributed under the MIT (Expat) License:
L<http://www.opensource.org/licenses/mit-license.php>
.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Files: dom.h
Copyright: __NO_COPYRIGHT__ in: dom.h
License: __HEADER___
This header file provides some definitions for wrapper functions.
These functions hide most of libxml2 code, and should make the
code in the XS file more readable .
.
The Functions are sorted in four parts:
part 0 ..... general wrapper functions which do not belong
to any of the other parts and not specified in DOM.
part A ..... wrapper functions for general nodeaccess
part B ..... document wrapper
part C ..... element wrapper
.
I did not implement any Text, CDATASection or comment wrapper functions,
since it is pretty straightforeward to access these nodes.
Files: perl-libxml-mm.c
Copyright: 2001-2003 AxKit.com Ltd., 2002-2006 Christian Glahn, 2006-2009 Petr Pajas
License: __UNKNOWN__
Basic concept:
perl varies in the implementation of UTF8 handling. this header (together
with the c source) implements a few functions, that can be used from within
the core module inorder to avoid cascades of c pragmas
Files: Devel.xs
Copyright: 2011 Joachim Zobel
License: __UNKNOWN__
This module gives external access to the functions needed to create
and use XML::LibXML::Nodes from C functions. These functions are made
accessible from Perl to have cleaner dependencies.
The idea is to pass xmlNode * pointers (as typemapped void *) to and
from Perl and call the functions that turns them to and from
XML::LibXML::Nodes there.
.
Be aware that using this module gives you the ability to easily create
segfaults and memory leaks.
#----------------------------------------------------------------------------
# xml and html files (skipped):
# docs/libxml.dbk
# t/data/callbacks_returning_undef.xml
# t/data/chinese.xml
# test/textReader/countries.xml
# test/xinclude/xinclude.xml
# test/xinclude/test.xml
# test/schema/demo.xml
# test/schema/invaliddemo.xml
# test/schema/schema.xsd
# test/schema/net.xsd
# test/schema/badschema.xsd
# test/relaxng/demo.xml
# test/relaxng/demo4.rng
# test/relaxng/invaliddemo.xml
# test/relaxng/net.rng
# test/relaxng/demo.rng
# test/relaxng/badschema.rng
# test/relaxng/demo2.rng
# test/relaxng/schema.rng
# test/relaxng/demo3.rng
# example/dtd.xml
# example/enc_latin2.html
# example/test.dtd
# example/enc2_latin2.html
# example/article_internal_bad.xml
# example/bad.dtd
# example/article.xml
# example/article_internal.xml
# example/article_bad.xml
# example/bad.xml
# example/yahoo-finance-html-with-errors.html
# example/test.xhtml
# example/ns.xml
# example/test2.xml
# example/article_external_bad.xml
# example/JBR-ALLENtrees.htm
# example/test3.xml
# example/test4.xml
# example/catalog.xml
# example/ext_ent.dtd
# example/test.html
# example/test.xml
# example/dromeds.xml
# example/thedieline.rss
# example/xmlns/badguy.xml
# example/xmlns/goodguy.xml
# example/complex/complex.xml
# example/complex/complex2.xml
# example/complex/complex.dtd
# example/complex/dtd/f.dtd
# example/complex/dtd/g.dtd
#----------------------------------------------------------------------------
# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
# license/copyright files.
#----------------------------------------------------------------------------
# License file: LICENSE
LICENSE
=======
.
This is free software, you may use it and distribute it under the same terms as
Perl itself.
.
Copyright 2001-2003 AxKit.com Ltd., 2002-2006 Christian Glahn, 2006-2009 Petr
Pajas
.
.
DISCLAIMER
==========
.
THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY
WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
PARTICULAR PURPOSE.
.

5
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,5 @@
[DEFAULT]
pristine-tar = True
[import-orig]
filter = [ '.gitignore', '.travis.yml', '.git*' ]

View File

@ -0,0 +1,65 @@
From: zhouganqing <zhouganqing@kylinos.cn>
Date: Wed, 10 Jul 2024 16:29:31 +0800
Subject: merge upstream 2.0207+dfsg+really+2.0134
---
LibXML.pm | 18 +++++++++++-------
Makefile.PL | 2 +-
t/48_reader_undef_warning_on_empty_str_rt106830.t | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/LibXML.pm b/LibXML.pm
index 700ad9b..4925967 100644
--- a/LibXML.pm
+++ b/LibXML.pm
@@ -220,13 +220,17 @@ sub threads_shared_enabled {
#-------------------------------------------------------------------------#
# test exact version (up to patch-level) #
#-------------------------------------------------------------------------#
-{
- my ($runtime_version) = LIBXML_RUNTIME_VERSION() =~ /^(\d+)/;
- if ( $runtime_version < LIBXML_VERSION ) {
- warn "Warning: XML::LibXML compiled against libxml2 ".LIBXML_VERSION.
- ", but runtime libxml2 is older $runtime_version\n";
- }
-}
+#
+# disabled in Debian; cf. https://bugs.debian.org/783610 and
+# https://rt.cpan.org/Public/Bug/Display.html?id=104156
+#
+#{
+# my ($runtime_version) = LIBXML_RUNTIME_VERSION() =~ /^(\d+)/;
+# if ( $runtime_version < LIBXML_VERSION ) {
+# warn "Warning: XML::LibXML compiled against libxml2 ".LIBXML_VERSION.
+# ", but runtime libxml2 is older $runtime_version\n";
+# }
+#}
#-------------------------------------------------------------------------#
diff --git a/Makefile.PL b/Makefile.PL
index 5e49473..db85a65 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -223,7 +223,7 @@ unless ( $is_Win32 ) { # cannot get config in W32
$libxml2_version = $1;
}
# 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors)
- exit 0 if !$FORCE and $libxml2_version ne "2.9.4";
+ exit 1 if !$FORCE and $libxml2_version ne "2.9.4";
}
if ( $@ =~ /^UNTESTED (\S*)/ ) {
warn "Note: libxml2 $1 was not tested with this XML::LibXML version.\n"
diff --git a/t/48_reader_undef_warning_on_empty_str_rt106830.t b/t/48_reader_undef_warning_on_empty_str_rt106830.t
index f3d3f52..9671555 100644
--- a/t/48_reader_undef_warning_on_empty_str_rt106830.t
+++ b/t/48_reader_undef_warning_on_empty_str_rt106830.t
@@ -32,7 +32,7 @@ use XML::LibXML::Reader;
# TEST
SKIP:
{
- if (XML::LibXML::LIBXML_VERSION() >= 20905)
+ if (XML::LibXML::LIBXML_RUNTIME_VERSION() >= 20905)
{
skip 'libxml2 accepts empty strings since 2.9.5 version', 1;
}

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
0001-merge-upstream-2.0207-dfsg-really-2.0134.patch

View File

@ -1,6 +0,0 @@
---
Archive: CPAN
Bug-Database: https://github.com/shlomif/perl-XML-LibXML/issues
Bug-Submit: https://github.com/shlomif/perl-XML-LibXML/issues/new
Repository: https://github.com/shlomif/perl-XML-LibXML.git
Repository-Browse: https://github.com/shlomif/perl-XML-LibXML