diff options
author | taca <taca@pkgsrc.org> | 2017-06-12 16:34:13 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2017-06-12 16:34:13 +0000 |
commit | 2c8ddf61c0ecfb03489bc618d2a94c893358f29e (patch) | |
tree | 9f4af2246f3e3c115ee992c2790ce5be5eb9b402 | |
parent | d67b0642717d573c74c8940d2362072db67ad600 (diff) | |
download | pkgsrc-2c8ddf61c0ecfb03489bc618d2a94c893358f29e.tar.gz |
Update ruby-json and ruby-json-pure to 2.1.0.
## 2017-04-18 (2.1.0)
* Allow passing of `decimal_class` option to specify a class as which to parse
JSON float numbers.
## 2017-03-23 (2.0.4)
* Raise exception for incomplete unicode surrogates/character escape
sequences. This problem was reported by Daniel Gollahon (dgollahon).
* Fix arbitrary heap exposure problem. This problem was reported by Ahmad
Sherif (ahmadsherif).
## 2017-01-12 (2.0.3)
* Set `required_ruby_version` to 1.9
* Some small fixes
## 2016-07-26 (2.0.2)
* Specify `required_ruby_version` for json\_pure.
* Fix issue #295 failure when parsing frozen strings.
## 2016-07-01 (2.0.1)
* Fix problem when requiring json\_pure and Parser constant was defined top
level.
* Add `RB_GC_GUARD` to avoid possible GC problem via Pete Johns.
* Store `current_nesting` on stack by Aaron Patterson.
## 2015-09-11 (2.0.0)
* Now complies to newest JSON RFC 7159.
* Implements compatibiliy to ruby 2.4 integer unification.
* Drops support for old rubies whose life has ended, that is rubies < 2.0.
Also see https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/
* There were still some mentions of dual GPL licensing in the source, but JSON
has just the Ruby license that itself includes an explicit dual-licensing
clause that allows covered software to be distributed under the terms of
the Simplified BSD License instead for all ruby versions >= 1.9.3. This is
however a GPL compatible license according to the Free Software Foundation.
I changed these mentions to be consistent with the Ruby license setting in
the gemspec files which were already correct now.
-rw-r--r-- | textproc/ruby-json-pure/Makefile | 4 | ||||
-rw-r--r-- | textproc/ruby-json-pure/PLIST | 32 | ||||
-rw-r--r-- | textproc/ruby-json-pure/distinfo | 12 | ||||
-rw-r--r-- | textproc/ruby-json-pure/patches/patch-aa | 8 | ||||
-rw-r--r-- | textproc/ruby-json/Makefile | 4 | ||||
-rw-r--r-- | textproc/ruby-json/PLIST | 35 | ||||
-rw-r--r-- | textproc/ruby-json/distinfo | 12 | ||||
-rw-r--r-- | textproc/ruby-json/patches/patch-ab | 8 |
8 files changed, 60 insertions, 55 deletions
diff --git a/textproc/ruby-json-pure/Makefile b/textproc/ruby-json-pure/Makefile index a609516cedf..3c5ec5de89d 100644 --- a/textproc/ruby-json-pure/Makefile +++ b/textproc/ruby-json-pure/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2015/12/13 15:04:46 taca Exp $ +# $NetBSD: Makefile,v 1.26 2017/06/12 16:34:13 taca Exp $ -DISTNAME= json_pure-1.8.3 +DISTNAME= json_pure-2.1.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} CATEGORIES= textproc diff --git a/textproc/ruby-json-pure/PLIST b/textproc/ruby-json-pure/PLIST index f562f1bb44c..8380b91a2af 100644 --- a/textproc/ruby-json-pure/PLIST +++ b/textproc/ruby-json-pure/PLIST @@ -1,13 +1,12 @@ -@comment $NetBSD: PLIST,v 1.16 2015/12/13 15:04:46 taca Exp $ +@comment $NetBSD: PLIST,v 1.17 2017/06/12 16:34:13 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/CHANGES +${GEM_LIBDIR}/CHANGES.md ${GEM_LIBDIR}/Gemfile -${GEM_LIBDIR}/README-json-jruby.markdown -${GEM_LIBDIR}/README.rdoc +${GEM_LIBDIR}/README-json-jruby.md +${GEM_LIBDIR}/README.md ${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/TODO ${GEM_LIBDIR}/VERSION ${GEM_LIBDIR}/data/example.json ${GEM_LIBDIR}/data/index.html @@ -63,7 +62,7 @@ ${GEM_LIBDIR}/lib/json/pure.rb ${GEM_LIBDIR}/lib/json/pure/generator.rb ${GEM_LIBDIR}/lib/json/pure/parser.rb ${GEM_LIBDIR}/lib/json/version.rb -${GEM_LIBDIR}/tests/fixtures/fail1.json +${GEM_LIBDIR}/references/rfc7159.txt ${GEM_LIBDIR}/tests/fixtures/fail10.json ${GEM_LIBDIR}/tests/fixtures/fail11.json ${GEM_LIBDIR}/tests/fixtures/fail12.json @@ -87,6 +86,7 @@ ${GEM_LIBDIR}/tests/fixtures/fail6.json ${GEM_LIBDIR}/tests/fixtures/fail7.json ${GEM_LIBDIR}/tests/fixtures/fail8.json ${GEM_LIBDIR}/tests/fixtures/fail9.json +${GEM_LIBDIR}/tests/fixtures/obsolete_fail1.json ${GEM_LIBDIR}/tests/fixtures/pass1.json ${GEM_LIBDIR}/tests/fixtures/pass15.json ${GEM_LIBDIR}/tests/fixtures/pass16.json @@ -94,15 +94,17 @@ ${GEM_LIBDIR}/tests/fixtures/pass17.json ${GEM_LIBDIR}/tests/fixtures/pass2.json ${GEM_LIBDIR}/tests/fixtures/pass26.json ${GEM_LIBDIR}/tests/fixtures/pass3.json -${GEM_LIBDIR}/tests/setup_variant.rb -${GEM_LIBDIR}/tests/test_json.rb -${GEM_LIBDIR}/tests/test_json_addition.rb -${GEM_LIBDIR}/tests/test_json_encoding.rb -${GEM_LIBDIR}/tests/test_json_fixtures.rb -${GEM_LIBDIR}/tests/test_json_generate.rb -${GEM_LIBDIR}/tests/test_json_generic_object.rb -${GEM_LIBDIR}/tests/test_json_string_matching.rb -${GEM_LIBDIR}/tests/test_json_unicode.rb +${GEM_LIBDIR}/tests/json_addition_test.rb +${GEM_LIBDIR}/tests/json_common_interface_test.rb +${GEM_LIBDIR}/tests/json_encoding_test.rb +${GEM_LIBDIR}/tests/json_ext_parser_test.rb +${GEM_LIBDIR}/tests/json_fixtures_test.rb +${GEM_LIBDIR}/tests/json_generator_test.rb +${GEM_LIBDIR}/tests/json_generic_object_test.rb +${GEM_LIBDIR}/tests/json_parser_test.rb +${GEM_LIBDIR}/tests/json_string_matching_test.rb +${GEM_LIBDIR}/tests/test_helper.rb +${GEM_LIBDIR}/tools/diff.sh ${GEM_LIBDIR}/tools/fuzz.rb ${GEM_LIBDIR}/tools/server.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/textproc/ruby-json-pure/distinfo b/textproc/ruby-json-pure/distinfo index d4a0dd68a1f..cb2a35bacec 100644 --- a/textproc/ruby-json-pure/distinfo +++ b/textproc/ruby-json-pure/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.25 2015/12/13 15:04:46 taca Exp $ +$NetBSD: distinfo,v 1.26 2017/06/12 16:34:13 taca Exp $ -SHA1 (json_pure-1.8.3.gem) = 8deab664226574ff23a2f199d24ad18a42a9b10e -RMD160 (json_pure-1.8.3.gem) = f9e0cb94452024e9cd9d979e6b38bd3aed0d5850 -SHA512 (json_pure-1.8.3.gem) = 7f33325687a1f7f42d6e305e805f3fe87843e88195bfcb4d7d96946c301afccd7c2726025bde950320692381dd6ec4887ef0db81331f5a731c4f86696bf14e78 -Size (json_pure-1.8.3.gem) = 143872 bytes -SHA1 (patch-aa) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6 +SHA1 (json_pure-2.1.0.gem) = 76335531acc823813ef02754fec2af856fc46996 +RMD160 (json_pure-2.1.0.gem) = 0edd6180f1f7ac0fdb30318264f9745b6ff11391 +SHA512 (json_pure-2.1.0.gem) = 30d28f75faee32562fa7fbb3c61f0da16b4ad796943d4c29a3c5fce2bf06e304ae802ca0d4796c0cb06f07f802764600d5bae6da2187948d1b8d123b07d14b45 +Size (json_pure-2.1.0.gem) = 140800 bytes +SHA1 (patch-aa) = b0c387b14521d6ffe8c1b34bc3cb7b445a175434 diff --git a/textproc/ruby-json-pure/patches/patch-aa b/textproc/ruby-json-pure/patches/patch-aa index ad566009279..81043606faf 100644 --- a/textproc/ruby-json-pure/patches/patch-aa +++ b/textproc/ruby-json-pure/patches/patch-aa @@ -1,10 +1,12 @@ -$NetBSD: patch-aa,v 1.1 2010/05/04 02:48:22 taca Exp $ +$NetBSD: patch-aa,v 1.2 2017/06/12 16:34:13 taca Exp $ ---- tools/fuzz.rb.orig 2010-04-30 09:05:37.000000000 +0000 +* Add shbang line. + +--- tools/fuzz.rb.orig 2017-03-02 11:01:15.000000000 +0000 +++ tools/fuzz.rb @@ -1,3 +1,5 @@ +#!ruby + require 'json' - require 'iconv' + class Fuzzer diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile index 0d4219319e2..78989657d30 100644 --- a/textproc/ruby-json/Makefile +++ b/textproc/ruby-json/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2017/05/30 14:22:40 taca Exp $ +# $NetBSD: Makefile,v 1.38 2017/06/12 16:34:13 taca Exp $ -DISTNAME= json-1.8.3 +DISTNAME= json-2.1.0 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-json/PLIST b/textproc/ruby-json/PLIST index 0d434d7c0d0..564cf674467 100644 --- a/textproc/ruby-json/PLIST +++ b/textproc/ruby-json/PLIST @@ -1,19 +1,15 @@ -@comment $NetBSD: PLIST,v 1.20 2015/03/08 15:17:21 taca Exp $ +@comment $NetBSD: PLIST,v 1.21 2017/06/12 16:34:13 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/gem.build_complete ${GEM_EXTSDIR}/json/ext/generator.${RUBY_DLEXT} ${GEM_EXTSDIR}/json/ext/parser.${RUBY_DLEXT} ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/CHANGES -${GEM_LIBDIR}/COPYING -${GEM_LIBDIR}/COPYING-json-jruby -${GEM_LIBDIR}/GPL +${GEM_LIBDIR}/CHANGES.md ${GEM_LIBDIR}/Gemfile -${GEM_LIBDIR}/README-json-jruby.markdown -${GEM_LIBDIR}/README.rdoc +${GEM_LIBDIR}/README-json-jruby.md +${GEM_LIBDIR}/README.md ${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/TODO ${GEM_LIBDIR}/VERSION ${GEM_LIBDIR}/data/example.json ${GEM_LIBDIR}/data/index.html @@ -71,7 +67,7 @@ ${GEM_LIBDIR}/lib/json/pure.rb ${GEM_LIBDIR}/lib/json/pure/generator.rb ${GEM_LIBDIR}/lib/json/pure/parser.rb ${GEM_LIBDIR}/lib/json/version.rb -${GEM_LIBDIR}/tests/fixtures/fail1.json +${GEM_LIBDIR}/references/rfc7159.txt ${GEM_LIBDIR}/tests/fixtures/fail10.json ${GEM_LIBDIR}/tests/fixtures/fail11.json ${GEM_LIBDIR}/tests/fixtures/fail12.json @@ -95,6 +91,7 @@ ${GEM_LIBDIR}/tests/fixtures/fail6.json ${GEM_LIBDIR}/tests/fixtures/fail7.json ${GEM_LIBDIR}/tests/fixtures/fail8.json ${GEM_LIBDIR}/tests/fixtures/fail9.json +${GEM_LIBDIR}/tests/fixtures/obsolete_fail1.json ${GEM_LIBDIR}/tests/fixtures/pass1.json ${GEM_LIBDIR}/tests/fixtures/pass15.json ${GEM_LIBDIR}/tests/fixtures/pass16.json @@ -102,15 +99,17 @@ ${GEM_LIBDIR}/tests/fixtures/pass17.json ${GEM_LIBDIR}/tests/fixtures/pass2.json ${GEM_LIBDIR}/tests/fixtures/pass26.json ${GEM_LIBDIR}/tests/fixtures/pass3.json -${GEM_LIBDIR}/tests/setup_variant.rb -${GEM_LIBDIR}/tests/test_json.rb -${GEM_LIBDIR}/tests/test_json_addition.rb -${GEM_LIBDIR}/tests/test_json_encoding.rb -${GEM_LIBDIR}/tests/test_json_fixtures.rb -${GEM_LIBDIR}/tests/test_json_generate.rb -${GEM_LIBDIR}/tests/test_json_generic_object.rb -${GEM_LIBDIR}/tests/test_json_string_matching.rb -${GEM_LIBDIR}/tests/test_json_unicode.rb +${GEM_LIBDIR}/tests/json_addition_test.rb +${GEM_LIBDIR}/tests/json_common_interface_test.rb +${GEM_LIBDIR}/tests/json_encoding_test.rb +${GEM_LIBDIR}/tests/json_ext_parser_test.rb +${GEM_LIBDIR}/tests/json_fixtures_test.rb +${GEM_LIBDIR}/tests/json_generator_test.rb +${GEM_LIBDIR}/tests/json_generic_object_test.rb +${GEM_LIBDIR}/tests/json_parser_test.rb +${GEM_LIBDIR}/tests/json_string_matching_test.rb +${GEM_LIBDIR}/tests/test_helper.rb +${GEM_LIBDIR}/tools/diff.sh ${GEM_LIBDIR}/tools/fuzz.rb ${GEM_LIBDIR}/tools/server.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/textproc/ruby-json/distinfo b/textproc/ruby-json/distinfo index 5b93b4e296c..61e2e8c5551 100644 --- a/textproc/ruby-json/distinfo +++ b/textproc/ruby-json/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.25 2015/11/04 02:00:08 agc Exp $ +$NetBSD: distinfo,v 1.26 2017/06/12 16:34:13 taca Exp $ -SHA1 (json-1.8.3.gem) = dcd00a477bbb8c0c722f68f9c28bc8460a7b1d6f -RMD160 (json-1.8.3.gem) = eee9b51a51533ddf697b9d8d5fcca2da170bf42b -SHA512 (json-1.8.3.gem) = 313f6016aca5eba4d4a14a72b60b3e9c5e863a6681eb9e499cacedb63969694be563990af0a44dae52963f07b6e6c7aa7e0876ab1348b214f53d925bdc5e83ea -Size (json-1.8.3.gem) = 152064 bytes -SHA1 (patch-ab) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6 +SHA1 (json-2.1.0.gem) = 8b9e81a2a6ff57f97bec1f65940c61cc6b6d81be +RMD160 (json-2.1.0.gem) = 9575feed2966369083d20b355f32ec226dd823bb +SHA512 (json-2.1.0.gem) = bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b +Size (json-2.1.0.gem) = 140800 bytes +SHA1 (patch-ab) = 2d57333da18fbc5a53ab757a61a7dc8c99a192a4 diff --git a/textproc/ruby-json/patches/patch-ab b/textproc/ruby-json/patches/patch-ab index 2f02e273758..7265759c9b2 100644 --- a/textproc/ruby-json/patches/patch-ab +++ b/textproc/ruby-json/patches/patch-ab @@ -1,10 +1,12 @@ -$NetBSD: patch-ab,v 1.1 2010/05/04 02:46:50 taca Exp $ +$NetBSD: patch-ab,v 1.2 2017/06/12 16:34:13 taca Exp $ ---- tools/fuzz.rb.orig 2010-04-30 09:05:37.000000000 +0000 +* Add shbang line. + +--- tools/fuzz.rb.orig 2017-03-02 10:53:41.000000000 +0000 +++ tools/fuzz.rb @@ -1,3 +1,5 @@ +#!ruby + require 'json' - require 'iconv' + class Fuzzer |