From ba7c5b94bd1a48092f2e771c9c051c2b9f032072 Mon Sep 17 00:00:00 2001 From: zhouganqing Date: Tue, 9 Jul 2024 11:31:48 +0800 Subject: [PATCH] merge upstream 4.030 --- debian/NEWS | 7 ++ debian/README.Debian | 8 -- debian/control | 8 +- debian/copyright | 145 +++++++------------------------- debian/libjson-xs-perl.examples | 1 + debian/patches/series | 1 - debian/rules | 9 ++ debian/watch | 1 - 8 files changed, 52 insertions(+), 128 deletions(-) create mode 100644 debian/NEWS delete mode 100644 debian/README.Debian create mode 100644 debian/libjson-xs-perl.examples delete mode 100644 debian/patches/series diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..02f31e2 --- /dev/null +++ b/debian/NEWS @@ -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 Sun, 21 Jul 2019 15:13:24 +0000 diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 1a39ab8..0000000 --- a/debian/README.Debian +++ /dev/null @@ -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 Tue, 23 Aug 2022 15:39:25 +0800 diff --git a/debian/control b/debian/control index 7d26a0c..d855323 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,20 @@ Source: libjson-xs-perl +Maintainer: openKylin Developers Section: perl +Testsuite: autopkgtest-pkg-perl Priority: optional -Maintainer: OpenKylin Developers Build-Depends: debhelper-compat (= 13), libcanary-stability-perl, libcommon-sense-perl , libtypes-serialiser-perl , perl-xs-dev, perl:native -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Vcs-Browser: https://gitee.com/openkylin/libjson-xs-perl Vcs-Git: https://gitee.com/openkylin/libjson-xs-perl.git Homepage: https://metacpan.org/release/JSON-XS Rules-Requires-Root: no - Package: libjson-xs-perl Architecture: any Depends: ${misc:Depends}, @@ -22,7 +22,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libcommon-sense-perl, libtypes-serialiser-perl -Breaks: libjson-perl (<< 2.90) Description: module for manipulating JSON-formatted data (C/XS-accelerated) JSON::XS is a module for manipulating data stored in the JavaScript Object 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 gains if available. After installing this package, any code using the JSON module (see libjson-perl) will automagically benefit from this. - diff --git a/debian/copyright b/debian/copyright index 21c288e..765293a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,119 +1,38 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: libjson-xs -Source: -# -# Please double check copyright with the licensecheck(1) command. +Upstream-Name: JSON-XS +Upstream-Contact: Marc Lehmann http://home.schmorp.de/ +Source: https://metacpan.org/release/JSON-XS -Files: Changes - MANIFEST - META.json - 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: * +Copyright: 2007-2011, Marc Lehmann http://home.schmorp.de/ +License: Artistic or GPL-1+ -Files: README -Copyright: __NO_COPYRIGHT__ in: README -License: __UNKNOWN__ - personally 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)*complete and worthless idiot*(unquote). - . - In my opinion, instead of pressuring and insulting people who - actually clarify issues with YAML and the wrong statements of some - of its proponents, I would kindly suggest reading the JSON spec - (which is not that difficult or long) and finally make YAML - compatible to it, and educating users about the changes, instead of - 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 - ). - . - {"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: debian/* +Copyright: 2007, Ivan Kohler + 2008-2020, gregor herrmann + 2008, Niko Tyni + 2009, Ansgar Burchardt + 2009, Ryan Niebur + 2010, Franck Joncourt + 2008-2017, Angel Abad + 2010, Jonathan Yu + 2010-2011, Nicholas Bamber + 2012, Alessandro Ghedini + 2016, Nuno Carvalho +License: Artistic or GPL-1+ -Files: XS.pm -Copyright: __NO_COPYRIGHT__ in: XS.pm -License: __UNKNOWN__ - 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(unquote). +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. . - In my opinion, instead of pressuring and insulting people who actually - clarify issues with YAML and the wrong statements of some of its - proponents, I would kindly suggest reading the JSON spec (which is not - that difficult or long) and finally make YAML compatible to it, and - educating users about the changes, instead of spreading lies about the - real compatibility for many I 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. - -Files: bin/json_xs -Copyright: 2008 Marc Lehmann -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 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'. diff --git a/debian/libjson-xs-perl.examples b/debian/libjson-xs-perl.examples new file mode 100644 index 0000000..c0f0d8a --- /dev/null +++ b/debian/libjson-xs-perl.examples @@ -0,0 +1 @@ +eg/* diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4a97dfa..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -# You must remove unused comment lines for the released package. diff --git a/debian/rules b/debian/rules index 2d33f6a..a634f67 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,13 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +PACKAGE = $(shell dh_listpackages) +TMP = $(CURDIR)/debian/$(PACKAGE) + %: dh $@ + +override_dh_installexamples: + dh_installexamples + sed -i '1s|^#!/opt/bin/perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/* diff --git a/debian/watch b/debian/watch index b2d82a8..f7ea905 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=4 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@$ -