[gentoo-commits] repo/gentoo:master commit in: dev-ruby/json/files/, dev-ruby/json/, profiles/
commit: 37a7617bdc64e6e7f57180f9a6241d2f63115ca5
Author: Michał Górny gentoo org>
AuthorDate: Mon Sep 14 17:19:35 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Sep 14 17:23:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a7617b
dev-ruby/json: Remove masked slot :0
Bug: https://bugs.gentoo.org/713478
Signed-off-by: Michał Górny gentoo.org>
dev-ruby/json/Manifest | 1 -
dev-ruby/json/files/json-1.8.6-heap-exposure.patch | 82 --
dev-ruby/json/json-1.8.6-r1.ebuild | 70 --
profiles/package.mask | 5 --
4 files changed, 158 deletions(-)
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 1744891ca90..158c82c17ff 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,3 +1,2 @@
-DIST json-1.8.6.gem 144384 BLAKE2B
db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345
SHA512
8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
DIST json-2.3.0.gem 114176 BLAKE2B
329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c
SHA512
9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
DIST json-2.3.1.gem 118784 BLAKE2B
6852f5d1733fd5d596b44d095c37d11a129b02fc61dc81afa90aef3623eefdb5515f6755dce42f055954baf2ac45e87620940ccd7c2c839501945923dbe62d18
SHA512
a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
diff --git a/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
b/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
deleted file mode 100644
index d3da7a0f86f..000
--- a/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git ext/json/generator/generator.c ext/json/generator/generator.c
-index a135e28348..2cdca5685f 100644
a/ext/json/ext/generator/generator.c
-+++ b/ext/json/ext/generator/generator.c
-@@ -301,7 +301,7 @@ static char *fstrndup(const char *ptr, unsigned long len) {
- char *result;
- if (len <= 0) return NULL;
- result = ALLOC_N(char, len);
-- memccpy(result, ptr, 0, len);
-+ memcpy(result, ptr, len);
- return result;
- }
-
-@@ -1055,7 +1055,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
- }
- } else {
- if (state->indent) ruby_xfree(state->indent);
--state->indent = strdup(RSTRING_PTR(indent));
-+state->indent = fstrndup(RSTRING_PTR(indent), len);
- state->indent_len = len;
- }
- return Qnil;
-@@ -1093,7 +1093,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
- }
- } else {
- if (state->space) ruby_xfree(state->space);
--state->space = strdup(RSTRING_PTR(space));
-+state->space = fstrndup(RSTRING_PTR(space), len);
- state->space_len = len;
- }
- return Qnil;
-@@ -1129,7 +1129,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE
space_before)
- }
- } else {
- if (state->space_before) ruby_xfree(state->space_before);
--state->space_before = strdup(RSTRING_PTR(space_before));
-+state->space_before = fstrndup(RSTRING_PTR(space_before), len);
- state->space_before_len = len;
- }
- return Qnil;
-@@ -1166,7 +1166,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE
object_nl)
- }
- } else {
- if (state->object_nl) ruby_xfree(state->object_nl);
--state->object_nl = strdup(RSTRING_PTR(object_nl));
-+state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
- state->object_nl_len = len;
- }
- return Qnil;
-@@ -1201,7 +1201,7 @@ static VALUE cState_array_nl_set(VALUE self, VALUE
array_nl)
- }
- } else {
- if (state->array_nl) ruby_xfree(state->array_nl);
--state->array_nl = strdup(RSTRING_PTR(array_nl));
-+state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
- state->array_nl_len = len;
- }
- return Qnil;
-diff --git ext/json/generator/generator.h ext/json/generator/generator.h
-index 298c0a4965..6bbf817b7d 100644
a/ext/json/ext/generator/generator.h
-+++ b/ext/json/ext/generator/generator.h
-@@ -1,7 +1,6 @@
- #ifndef _GENERATOR_H_
- #define _GENERATOR_H_
-
--#include
- #include
- #include
-
-diff --git ext/json/lib/json/version.rb ext/json/lib/json/version.rb
-index b5748334b9..cd7ddf8777 100644
a/lib/json/version.rb
-+++ b/lib/json/version.rb
-@@ -1,7 +1,7 @@
- module JSON
- # JSON version
-- VERSION = '1.8.6'
-+ VERSION = '1.8.6.1'
- VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
- VERSION_MAJOR =
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/json/files/
commit: e78ee8ff8d74b7a28f2248a754605a52c6edea80
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Nov 9 18:36:37 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun Nov 10 03:59:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78ee8ff
dev-ruby/json: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Aaron Bauman gentoo.org>
dev-ruby/json/files/json-2.1.0-ruby26-1.patch | 20
dev-ruby/json/files/json-2.1.0-ruby26-2.patch | 105 ---
dev-ruby/json/files/json-2.1.0-ruby26-3.patch | 143 --
3 files changed, 268 deletions(-)
diff --git a/dev-ruby/json/files/json-2.1.0-ruby26-1.patch
b/dev-ruby/json/files/json-2.1.0-ruby26-1.patch
deleted file mode 100644
index e6f76a4be14..000
--- a/dev-ruby/json/files/json-2.1.0-ruby26-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit bf226a9ac40e2296589004be89b4420b2121e000
-Author: eregon
-Date: Fri Aug 3 15:11:22 2018 +
-
-Fix missed update of parser source in r62429
-
-git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64175
b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-
-diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
-index 29900a4a4a..fba01ac0e5 100644
a/ext/json/ext/parser/parser.rl
-+++ b/ext/json/ext/parser/parser.rl
-@@ -824,6 +824,7 @@ static VALUE cParser_source(VALUE self)
-
- void Init_parser(void)
- {
-+#undef rb_intern
- rb_require("json/common");
- mJSON = rb_define_module("JSON");
- mExt = rb_define_module_under(mJSON, "Ext");
diff --git a/dev-ruby/json/files/json-2.1.0-ruby26-2.patch
b/dev-ruby/json/files/json-2.1.0-ruby26-2.patch
deleted file mode 100644
index 9f1bff9b691..000
--- a/dev-ruby/json/files/json-2.1.0-ruby26-2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-commit e7da0fc34e8ed7fa250fc38f1109e4944cbad808
-Author: eregon
-Date: Fri Aug 3 15:11:36 2018 +
-
-ext/json/parser/parser.c: do not call rb_str_resize() on Time object
-
-* See https://github.com/flori/json/issues/342
-
-git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64177
b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-
-diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
-index b5ed093c1f..c8012796a4 100644
a/ext/json/ext/parser/parser.c
-+++ b/ext/json/ext/parser/parser.c
-@@ -1659,7 +1659,9 @@ case 7:
- if (json->symbolize_names && json->parsing_name) {
- *result = rb_str_intern(*result);
- } else {
-- rb_str_resize(*result, RSTRING_LEN(*result));
-+ if (RB_TYPE_P(*result, T_STRING)) {
-+ rb_str_resize(*result, RSTRING_LEN(*result));
-+ }
- }
- if (cs >= JSON_string_first_final) {
- return p + 1;
-@@ -1830,7 +1832,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv,
VALUE self)
- }
-
-
--#line 1834 "parser.c"
-+#line 1836 "parser.c"
- enum {JSON_start = 1};
- enum {JSON_first_final = 10};
- enum {JSON_error = 0};
-@@ -1838,7 +1840,7 @@ enum {JSON_error = 0};
- enum {JSON_en_main = 1};
-
-
--#line 742 "parser.rl"
-+#line 744 "parser.rl"
-
-
- /*
-@@ -1855,16 +1857,16 @@ static VALUE cParser_parse(VALUE self)
- GET_PARSER;
-
-
--#line 1859 "parser.c"
-+#line 1861 "parser.c"
- {
- cs = JSON_start;
- }
-
--#line 758 "parser.rl"
-+#line 760 "parser.rl"
- p = json->source;
- pe = p + json->len;
-
--#line 1868 "parser.c"
-+#line 1870 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
-@@ -1898,7 +1900,7 @@ st0:
- cs = 0;
- goto _out;
- tr2:
--#line 734 "parser.rl"
-+#line 736 "parser.rl"
- {
- char *np = JSON_parse_value(json, p, pe, , 0);
- if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = ((
np))-1;}
-@@ -1908,7 +1910,7 @@ st10:
- if ( ++p == pe )
- goto _test_eof10;
- case 10:
--#line 1912 "parser.c"
-+#line 1914 "parser.c"
- switch( (*p) ) {
- case 13: goto st10;
- case 32: goto st10;
-@@ -1997,7 +1999,7 @@ case 9:
- _out: {}
- }
-
--#line 761 "parser.rl"
-+#line 763 "parser.rl"
-
- if (cs >= JSON_first_final && p == pe) {
- return result;
-diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
-index fba01ac0e5..edab32b78f 100644
a/ext/json/ext/parser/parser.rl
-+++ b/ext/json/ext/parser/parser.rl
-@@ -554,7 +554,9 @@ static char *JSON_parse_string(JSON_Parser *json, char *p,
char *pe, VALUE *resu
- if (json->symbolize_names && json->parsing_name) {
- *result = rb_str_intern(*result);
- } else {
-- rb_str_resize(*result, RSTRING_LEN(*result));
-+ if (RB_TYPE_P(*result, T_STRING)) {
-+ rb_str_resize(*result, RSTRING_LEN(*result));
-+ }
- }
- if (cs >= JSON_string_first_final) {
- return p + 1;
diff --git a/dev-ruby/json/files/json-2.1.0-ruby26-3.patch
b/dev-ruby/json/files/json-2.1.0-ruby26-3.patch
deleted file mode
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/json/files/, dev-ruby/json/
commit: c934437856bf6c0d00c319c56ce5bc348cc4cf2e
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Sep 1 07:10:59 2017 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Sep 1 07:14:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9344378
dev-ruby/json: fix security bug 629484
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ruby/json/files/json-1.8.6-heap-exposure.patch | 82 ++
dev-ruby/json/json-1.8.6-r1.ebuild | 70 ++
2 files changed, 152 insertions(+)
diff --git a/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
b/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
new file mode 100644
index 000..d3da7a0f86f
--- /dev/null
+++ b/dev-ruby/json/files/json-1.8.6-heap-exposure.patch
@@ -0,0 +1,82 @@
+diff --git ext/json/generator/generator.c ext/json/generator/generator.c
+index a135e28348..2cdca5685f 100644
+--- a/ext/json/ext/generator/generator.c
b/ext/json/ext/generator/generator.c
+@@ -301,7 +301,7 @@ static char *fstrndup(const char *ptr, unsigned long len) {
+ char *result;
+ if (len <= 0) return NULL;
+ result = ALLOC_N(char, len);
+- memccpy(result, ptr, 0, len);
++ memcpy(result, ptr, len);
+ return result;
+ }
+
+@@ -1055,7 +1055,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
+ }
+ } else {
+ if (state->indent) ruby_xfree(state->indent);
+-state->indent = strdup(RSTRING_PTR(indent));
++state->indent = fstrndup(RSTRING_PTR(indent), len);
+ state->indent_len = len;
+ }
+ return Qnil;
+@@ -1093,7 +1093,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
+ }
+ } else {
+ if (state->space) ruby_xfree(state->space);
+-state->space = strdup(RSTRING_PTR(space));
++state->space = fstrndup(RSTRING_PTR(space), len);
+ state->space_len = len;
+ }
+ return Qnil;
+@@ -1129,7 +1129,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE
space_before)
+ }
+ } else {
+ if (state->space_before) ruby_xfree(state->space_before);
+-state->space_before = strdup(RSTRING_PTR(space_before));
++state->space_before = fstrndup(RSTRING_PTR(space_before), len);
+ state->space_before_len = len;
+ }
+ return Qnil;
+@@ -1166,7 +1166,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE
object_nl)
+ }
+ } else {
+ if (state->object_nl) ruby_xfree(state->object_nl);
+-state->object_nl = strdup(RSTRING_PTR(object_nl));
++state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
+ state->object_nl_len = len;
+ }
+ return Qnil;
+@@ -1201,7 +1201,7 @@ static VALUE cState_array_nl_set(VALUE self, VALUE
array_nl)
+ }
+ } else {
+ if (state->array_nl) ruby_xfree(state->array_nl);
+-state->array_nl = strdup(RSTRING_PTR(array_nl));
++state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
+ state->array_nl_len = len;
+ }
+ return Qnil;
+diff --git ext/json/generator/generator.h ext/json/generator/generator.h
+index 298c0a4965..6bbf817b7d 100644
+--- a/ext/json/ext/generator/generator.h
b/ext/json/ext/generator/generator.h
+@@ -1,7 +1,6 @@
+ #ifndef _GENERATOR_H_
+ #define _GENERATOR_H_
+
+-#include
+ #include
+ #include
+
+diff --git ext/json/lib/json/version.rb ext/json/lib/json/version.rb
+index b5748334b9..cd7ddf8777 100644
+--- a/lib/json/version.rb
b/lib/json/version.rb
+@@ -1,7 +1,7 @@
+ module JSON
+ # JSON version
+- VERSION = '1.8.6'
++ VERSION = '1.8.6.1'
+ VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
+ VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
+ VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild
b/dev-ruby/json/json-1.8.6-r1.ebuild
new file mode 100644
index 000..ab9cfddf39e
--- /dev/null
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.md README-json-jruby.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension"
+HOMEPAGE="https://github.com/flori/json;
+LICENSE="|| ( Ruby GPL-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+ dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+ doc? ( dev-ruby/rdoc )"
+
+PATCHES=( "${FILESDIR}/${P}-heap-exposure.patch" )
+
+all_ruby_prepare() {
+ # Avoid building the
