diff options
author | Steve Wills <swills@FreeBSD.org> | 2013-02-24 17:09:12 +0000 |
---|---|---|
committer | Steve Wills <swills@FreeBSD.org> | 2013-02-24 17:09:12 +0000 |
commit | 9f9a1a0e4da62abc056004ef15f84c5b4e011867 (patch) | |
tree | d2e411ec4ec0ed4357fb4af8949b7f13fa00ecbb /lang/ruby19 | |
parent | - Fix WWW (current location return 404) (diff) |
- Update to 1.9.3p392
Security: forthcoming
Notes
Notes:
svn path=/head/; revision=312881
Diffstat (limited to 'lang/ruby19')
-rw-r--r-- | lang/ruby19/distinfo | 4 | ||||
-rw-r--r-- | lang/ruby19/files/patch-json | 172 |
2 files changed, 2 insertions, 174 deletions
diff --git a/lang/ruby19/distinfo b/lang/ruby19/distinfo index 32eed247d5bc..32347489a501 100644 --- a/lang/ruby19/distinfo +++ b/lang/ruby19/distinfo @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-1.9.3-p385.tar.bz2) = f991ee50414dc795696bad0fc5c7b0b94d93b9b38fed943326d20ce4e9dda42b -SIZE (ruby/ruby-1.9.3-p385.tar.bz2) = 10021486 +SHA256 (ruby/ruby-1.9.3-p392.tar.bz2) = 5a7334dfdf62966879bf539b8a9f0b889df6f3b3824fb52a9303c3c3d3a58391 +SIZE (ruby/ruby-1.9.3-p392.tar.bz2) = 10024221 diff --git a/lang/ruby19/files/patch-json b/lang/ruby19/files/patch-json deleted file mode 100644 index 898b5597baaa..000000000000 --- a/lang/ruby19/files/patch-json +++ /dev/null @@ -1,172 +0,0 @@ ---- ext/json/parser/parser.c.orig -+++ ext/json/parser/parser.c -@@ -1671,7 +1671,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) - if (option_given_p(opts, tmp)) { - json->create_additions = RTEST(rb_hash_aref(opts, tmp)); - } else { -- json->create_additions = 1; -+ json->create_additions = 0; - } - tmp = ID2SYM(i_create_id); - if (option_given_p(opts, tmp)) { -@@ -1718,7 +1718,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) - } - - --#line 1719 "parser.c" -+#line 1722 "parser.c" - static const int JSON_start = 1; - static const int JSON_first_final = 10; - static const int JSON_error = 0; -@@ -1726,7 +1726,7 @@ static const int JSON_error = 0; - static const int JSON_en_main = 1; - - --#line 726 "parser.rl" -+#line 729 "parser.rl" - - - static VALUE cParser_parse_strict(VALUE self) -@@ -1737,16 +1737,16 @@ static VALUE cParser_parse_strict(VALUE self) - GET_PARSER; - - --#line 1738 "parser.c" -+#line 1741 "parser.c" - { - cs = JSON_start; - } - --#line 736 "parser.rl" -+#line 739 "parser.rl" - p = json->source; - pe = p + json->len; - --#line 1747 "parser.c" -+#line 1750 "parser.c" - { - if ( p == pe ) - goto _test_eof; -@@ -1802,7 +1802,7 @@ case 5: - goto st1; - goto st5; - tr3: --#line 715 "parser.rl" -+#line 718 "parser.rl" - { - char *np; - json->current_nesting = 1; -@@ -1811,7 +1811,7 @@ tr3: - } - goto st10; - tr4: --#line 708 "parser.rl" -+#line 711 "parser.rl" - { - char *np; - json->current_nesting = 1; -@@ -1823,7 +1823,7 @@ st10: - if ( ++p == pe ) - goto _test_eof10; - case 10: --#line 1824 "parser.c" -+#line 1827 "parser.c" - switch( (*p) ) { - case 13: goto st10; - case 32: goto st10; -@@ -1880,7 +1880,7 @@ case 9: - _out: {} - } - --#line 739 "parser.rl" -+#line 742 "parser.rl" - - if (cs >= JSON_first_final && p == pe) { - return result; -@@ -1892,7 +1892,7 @@ case 9: - - - --#line 1893 "parser.c" -+#line 1896 "parser.c" - static const int JSON_quirks_mode_start = 1; - static const int JSON_quirks_mode_first_final = 10; - static const int JSON_quirks_mode_error = 0; -@@ -1900,7 +1900,7 @@ static const int JSON_quirks_mode_error = 0; - static const int JSON_quirks_mode_en_main = 1; - - --#line 764 "parser.rl" -+#line 767 "parser.rl" - - - static VALUE cParser_parse_quirks_mode(VALUE self) -@@ -1911,16 +1911,16 @@ static VALUE cParser_parse_quirks_mode(VALUE self) - GET_PARSER; - - --#line 1912 "parser.c" -+#line 1915 "parser.c" - { - cs = JSON_quirks_mode_start; - } - --#line 774 "parser.rl" -+#line 777 "parser.rl" - p = json->source; - pe = p + json->len; - --#line 1921 "parser.c" -+#line 1924 "parser.c" - { - if ( p == pe ) - goto _test_eof; -@@ -1954,7 +1954,7 @@ st0: - cs = 0; - goto _out; - tr2: --#line 756 "parser.rl" -+#line 759 "parser.rl" - { - char *np = JSON_parse_value(json, p, pe, &result); - if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;} -@@ -1964,7 +1964,7 @@ st10: - if ( ++p == pe ) - goto _test_eof10; - case 10: --#line 1965 "parser.c" -+#line 1968 "parser.c" - switch( (*p) ) { - case 13: goto st10; - case 32: goto st10; -@@ -2053,7 +2053,7 @@ case 9: - _out: {} - } - --#line 777 "parser.rl" -+#line 780 "parser.rl" - - if (cs >= JSON_quirks_mode_first_final && p == pe) { - return result; ---- ext/json/parser/parser.rl.orig -+++ ext/json/parser/parser.rl -@@ -602,6 +602,9 @@ static VALUE convert_encoding(VALUE source) - * defaults to true. - * * *object_class*: Defaults to Hash - * * *array_class*: Defaults to Array -+ * * *quirks_mode*: Enables quirks_mode for parser, that is for example -+ * parsing single JSON values instead of documents is possible. -+ * - */ - static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) - { -@@ -652,7 +655,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) - if (option_given_p(opts, tmp)) { - json->create_additions = RTEST(rb_hash_aref(opts, tmp)); - } else { -- json->create_additions = 1; -+ json->create_additions = 0; - } - tmp = ID2SYM(i_create_id); - if (option_given_p(opts, tmp)) { - |