merge upstream 4.030

This commit is contained in:
zhouganqing 2024-07-09 11:31:48 +08:00
parent fcf89a67c8
commit ba7c5b94bd
8 changed files with 52 additions and 128 deletions

7
debian/NEWS vendored Normal file
View File

@ -0,0 +1,7 @@
libjson-xs-perl (4.020-1) unstable; urgency=medium
* Security implication: this release enables allow_nonref by default
for compatibility with RFC 7159 and newer. See "old" vs. "new"
JSON under SECURITY CONSIDERATIONS in JSON::XS POD.
-- intrigeri <intrigeri@debian.org> Sun, 21 Jul 2019 15:13:24 +0000

View File

@ -1,8 +0,0 @@
libjson-xs-perl for Debian
Please edit this to provide information specific to
this libjson-xs Debian package.
(Automatically generated by debmake Version 4.3.1)
-- zhangyichun <zhangyichun@kylinos.cn> Tue, 23 Aug 2022 15:39:25 +0800

8
debian/control vendored
View File

@ -1,20 +1,20 @@
Source: libjson-xs-perl Source: libjson-xs-perl
Maintainer: openKylin Developers <packaging@lists.openkylin.top>
Section: perl Section: perl
Testsuite: autopkgtest-pkg-perl
Priority: optional Priority: optional
Maintainer: OpenKylin Developers <packaging@list.openkylin.top>
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
libcanary-stability-perl, libcanary-stability-perl,
libcommon-sense-perl <!nocheck>, libcommon-sense-perl <!nocheck>,
libtypes-serialiser-perl <!nocheck>, libtypes-serialiser-perl <!nocheck>,
perl-xs-dev, perl-xs-dev,
perl:native perl:native
Standards-Version: 4.5.0 Standards-Version: 4.6.0
Vcs-Browser: https://gitee.com/openkylin/libjson-xs-perl Vcs-Browser: https://gitee.com/openkylin/libjson-xs-perl
Vcs-Git: https://gitee.com/openkylin/libjson-xs-perl.git Vcs-Git: https://gitee.com/openkylin/libjson-xs-perl.git
Homepage: https://metacpan.org/release/JSON-XS Homepage: https://metacpan.org/release/JSON-XS
Rules-Requires-Root: no Rules-Requires-Root: no
Package: libjson-xs-perl Package: libjson-xs-perl
Architecture: any Architecture: any
Depends: ${misc:Depends}, Depends: ${misc:Depends},
@ -22,7 +22,6 @@ Depends: ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
libcommon-sense-perl, libcommon-sense-perl,
libtypes-serialiser-perl libtypes-serialiser-perl
Breaks: libjson-perl (<< 2.90)
Description: module for manipulating JSON-formatted data (C/XS-accelerated) Description: module for manipulating JSON-formatted data (C/XS-accelerated)
JSON::XS is a module for manipulating data stored in the JavaScript Object JSON::XS is a module for manipulating data stored in the JavaScript Object
Notation (JSON) serialization format (defined in RFC 4627), which serves as Notation (JSON) serialization format (defined in RFC 4627), which serves as
@ -31,4 +30,3 @@ Description: module for manipulating JSON-formatted data (C/XS-accelerated)
This C/XS-accelerated JSON implementation confers significant performance This C/XS-accelerated JSON implementation confers significant performance
gains if available. After installing this package, any code using the JSON gains if available. After installing this package, any code using the JSON
module (see libjson-perl) will automagically benefit from this. module (see libjson-perl) will automagically benefit from this.

145
debian/copyright vendored
View File

@ -1,119 +1,38 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libjson-xs Upstream-Name: JSON-XS
Source: <url://example.com> Upstream-Contact: Marc Lehmann <schmorp@schmorp.de> http://home.schmorp.de/
# Source: https://metacpan.org/release/JSON-XS
# Please double check copyright with the licensecheck(1) command.
Files: Changes Files: *
MANIFEST Copyright: 2007-2011, Marc Lehmann <schmorp@schmorp.de> http://home.schmorp.de/
META.json License: Artistic or GPL-1+
META.yml
Makefile.PL
XS.xs
XS/Boolean.pm
eg/bench
t/00_load.t
t/01_utf8.t
t/02_error.t
t/03_types.t
t/04_dwiw_encode.t
t/05_dwiw_decode.t
t/06_pc_pretty.t
t/07_pc_esc.t
t/08_pc_base.t
t/09_pc_extra_number.t
t/10_pc_keysort.t
t/11_pc_expo.t
t/12_blessed.t
t/13_limit.t
t/14_latin1.t
t/15_prefix.t
t/16_tied.t
t/17_relaxed.t
t/18_json_checker.t
t/19_incr.t
t/20_faihu.t
t/21_evans.t
t/22_comment_at_eof.t
t/52_object.t
t/99_binary.t
typemap
Copyright: __NO_COPYRIGHT_NOR_LICENSE__
License: __NO_COPYRIGHT_NOR_LICENSE__
Files: README Files: debian/*
Copyright: __NO_COPYRIGHT__ in: README Copyright: 2007, Ivan Kohler <ivan-debian@420.am>
License: __UNKNOWN__ 2008-2020, gregor herrmann <gregoa@debian.org>
personally bitten by this "JSON is YAML" lie, I refused and said I 2008, Niko Tyni <ntyni@debian.org>
will continue to educate people about these issues, so others do not 2009, Ansgar Burchardt <ansgar@debian.org>
run into the same problem again and again. After this, Brian called 2009, Ryan Niebur <ryanryan52@gmail.com>
me a (quote)*complete and worthless idiot*(unquote). 2010, Franck Joncourt <franck@debian.org>
. 2008-2017, Angel Abad <angel@debian.org>
In my opinion, instead of pressuring and insulting people who 2010, Jonathan Yu <jawnsy@cpan.org>
actually clarify issues with YAML and the wrong statements of some 2010-2011, Nicholas Bamber <nicholas@periapt.co.uk>
of its proponents, I would kindly suggest reading the JSON spec 2012, Alessandro Ghedini <ghedo@debian.org>
(which is not that difficult or long) and finally make YAML 2016, Nuno Carvalho <smash@cpan.org>
compatible to it, and educating users about the changes, instead of License: Artistic or GPL-1+
spreading lies about the real compatibility for many *years* and
trying to silence people who point out that it isn't true.
.
Addendum/2009: the YAML 1.2 spec is still incompatible with JSON,
even though the incompatibilities have been documented (and are
known to Brian) for many years and the spec makes explicit claims
that YAML is a superset of JSON. It would be so easy to fix, but
apparently, bullying people and corrupting userdata is so much
easier.
.
SPEED
It seems that JSON::XS is surprisingly fast, as shown in the following
tables. They have been generated with the help of the "eg/bench" program
in the JSON::XS distribution, to make it easy to compare on your own
system.
.
First comes a comparison between various modules using a very short
single-line JSON string (also available at
<http://dist.schmorp.de/misc/json/short.json>).
.
{"method": "handleMessage", "params": ["user1",
"we were just talking"], "id": null, "array":[1,11,234,-5,1e5,1e7,
1, 0]}
.
It shows the number of encodes/decodes per second (JSON::XS uses the
functional interface, while JSON::XS/2 uses the OO interface with
pretty-printing and hashkey sorting enabled, JSON::XS/3 enables shrink.
JSON::DWIW/DS uses the deserialise function, while JSON::DWIW::FJ uses
Files: XS.pm License: Artistic
Copyright: __NO_COPYRIGHT__ in: XS.pm This program is free software; you can redistribute it and/or modify
License: __UNKNOWN__ it under the terms of the Artistic License, which comes with Perl.
bitten by this "JSON is YAML" lie, I refused and said I will continue to
educate people about these issues, so others do not run into the same
problem again and again. After this, Brian called me a (quote)I<complete
and worthless idiot>(unquote).
. .
In my opinion, instead of pressuring and insulting people who actually On Debian systems, the complete text of the Artistic License can be
clarify issues with YAML and the wrong statements of some of its found in `/usr/share/common-licenses/Artistic'.
proponents, I would kindly suggest reading the JSON spec (which is not
that difficult or long) and finally make YAML compatible to it, and License: GPL-1+
educating users about the changes, instead of spreading lies about the This program is free software; you can redistribute it and/or modify
real compatibility for many I<years> and trying to silence people who it under the terms of the GNU General Public License as published by
point out that it isn't true. the Free Software Foundation; either version 1, or (at your option)
. any later version.
Addendum/2009: the YAML 1.2 spec is still incompatible with JSON, even
though the incompatibilities have been documented (and are known to Brian)
for many years and the spec makes explicit claims that YAML is a superset
of JSON. It would be so easy to fix, but apparently, bullying people and
corrupting userdata is so much easier.
Files: bin/json_xs
Copyright: 2008 Marc Lehmann <json@schmorp.de>
License: __NO_LICENSE__
#----------------------------------------------------------------------------
# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
# license/copyright files.
#----------------------------------------------------------------------------
# License file: COPYING
This module is licensed under the same terms as perl itself.
. .
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'.

1
debian/libjson-xs-perl.examples vendored Normal file
View File

@ -0,0 +1 @@
eg/*

View File

@ -1 +0,0 @@
# You must remove unused comment lines for the released package.

9
debian/rules vendored
View File

@ -1,4 +1,13 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
PACKAGE = $(shell dh_listpackages)
TMP = $(CURDIR)/debian/$(PACKAGE)
%: %:
dh $@ dh $@
override_dh_installexamples:
dh_installexamples
sed -i '1s|^#!/opt/bin/perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/*

1
debian/watch vendored
View File

@ -1,4 +1,3 @@
version=4 version=4
opts=uversionmangle=s/\.(\d)$/.${1}00/;s/\.(\d\d)$/.${1}0/;s/\.(\d\d\d)(\d)$/.${1}.${2}/ \ opts=uversionmangle=s/\.(\d)$/.${1}00/;s/\.(\d\d)$/.${1}0/;s/\.(\d\d\d)(\d)$/.${1}.${2}/ \
https://metacpan.org/release/JSON-XS .+/JSON-XS-v?@ANY_VERSION@@ARCHIVE_EXT@$ https://metacpan.org/release/JSON-XS .+/JSON-XS-v?@ANY_VERSION@@ARCHIVE_EXT@$