commit: 37a7617bdc64e6e7f57180f9a6241d2f63115ca5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 14 17:19:35 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 14 17:23:44 2020 +0000 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 <mgorny <AT> 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..00000000000 --- 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 <string.h> - #include <math.h> - #include <ctype.h> - -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 deleted file mode 100644 index dc3afe54b2e..00000000000 --- a/dev-ruby/json/json-1.8.6-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby22 ruby23 ruby24 ruby25" - -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 ~mips ppc ppc64 ~s390 sparc x86 ~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 extension twice! - # And use rdoc instead of sdoc which we don't have packaged - # And don't call git to list files. We're using the pregenerated spec anyway. - sed -i \ - -e 's| => :compile||' \ - -e 's| => :clean||' \ - -e 's|sdoc|rdoc|' \ - -e 's|`git ls-files`|""|' \ - Rakefile || die "rakefile fix failed" - - # Remove hardcoded and broken -O setting. - sed -i -e '/^ \(if\|unless\)/,/^ end/ s:^:#:' \ - -e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die -} - -each_ruby_compile() { - # Since 1.5.0 a Java extension is provided but it does not compile. - if [[ $(basename ${RUBY}) != "jruby" ]]; then - ${RUBY} -S rake compile || die "extension compile failed" - fi -} - -each_ruby_test() { - JSON=pure \ - ${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "pure ruby tests failed" - - if [[ $(basename ${RUBY}) != "jruby" ]]; then - JSON=ext \ - ${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "ext ruby tests failed" - fi -} - -each_ruby_install() { - each_fakegem_install - if [[ $(basename ${RUBY}) != "jruby" ]]; then - ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname) - ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname) - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index 5efd872d3dc..af1a9772253 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -679,11 +679,6 @@ dev-python/paver # Removal in 30 days. Bug #735334. dev-vcs/git-bz -# Hans de Graaff <gra...@gentoo.org> (2020-08-07) -# Slot with known security issues. Please use a newer slot -# instead. Removal in 30 days. Bug #713478. -dev-ruby/json:0 - # Mikle Kolyada <zlog...@gentoo.org> (2020-08-02) # consolekit is abandoned upstream. # People are encouraged to switch to any logind
