@@ -1,3 +1,6 @@

+# FIXME: noarch or generate debuginfo

+%define debug_package %{nil}

+

 Summary:	A Distributed init System

 Name:		fleet

 Version:	0.11.5

deleted file mode 100644

@@ -1,70 +0,0 @@

-diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c

-index a135e28348..2cdca5685f 100644

-+++ b/ext/json/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

-+++ b/ext/json/generator/generator.h

-@@ -1,7 +1,6 @@

- #ifndef _GENERATOR_H_

- #define _GENERATOR_H_

- 

--#include <string.h>

- #include <math.h>

- #include <ctype.h>

- 

deleted file mode 100644

@@ -1,117 +0,0 @@

-Index: b/regparse.c

-===================================================================

-+++ b/regparse.c	(revision 57909)

-@@ -4570,11 +4570,11 @@ parse_char_class(Node** np, Node** asc_n https://github.com/ruby/ruby/blob/trunk/ruby_2_4/regparse.c#L4570

-   enum CCVALTYPE val_type, in_type;

-   int val_israw, in_israw;

- 

-+  *np = *asc_np = NULL_NODE;

-   env->parse_depth++;

-   if (env->parse_depth > ParseDepthLimit)

-     return ONIGERR_PARSE_DEPTH_LIMIT_OVER;

-   prev_cc = asc_prev_cc = (CClassNode* )NULL;

--  *np = *asc_np = NULL_NODE;

-   r = fetch_token_in_cc(tok, src, end, env);

-   if (r == TK_CHAR && tok->u.c == '^' && tok->escaped == 0) {

-     neg = 1;

-Index: b/ext/-test-/regexp/init.c

-===================================================================

-+++ b/ext/-test-/regexp/init.c	(revision 57909)

-@@ -0,0 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/-test-/regexp/init.c#L1

-+#include "ruby.h"

-+

-+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}

-+

-+void

-+Init_regexp(void)

-+{

-+    VALUE mBug = rb_define_module("Bug");

-+    VALUE klass = rb_define_class_under(mBug, "Regexp", rb_cRegexp);

-+    TEST_INIT_FUNCS(init);

-+}

-

-Property changes on: ruby_2_4/ext/-test-/regexp/init.c

-___________________________________________________________________

-Added: svn:eol-style

-   + LF

-

-Index: b/ext/-test-/regexp/extconf.rb

-===================================================================

-+++ b/ext/-test-/regexp/extconf.rb	(revision 57909)

-@@ -0,0 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/-test-/regexp/extconf.rb#L1

-+# frozen_string_literal: false

-+require_relative "../auto_ext.rb"

-+auto_ext

-

-Property changes on: ruby_2_4/ext/-test-/regexp/extconf.rb

-___________________________________________________________________

-Added: svn:eol-style

-   + LF

-

-Index: b/ext/-test-/regexp/parse_depth_limit.c

-===================================================================

-+++ b/ext/-test-/regexp/parse_depth_limit.c	(revision 57909)

-@@ -0,0 +1,23 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/-test-/regexp/parse_depth_limit.c#L1

-+#include <ruby.h>

-+#include <ruby/onigmo.h>

-+

-+static VALUE

-+get_parse_depth_limit(VALUE self)

-+{

-+    unsigned int depth = onig_get_parse_depth_limit();

-+    return UINT2NUM(depth);

-+}

-+

-+static VALUE

-+set_parse_depth_limit(VALUE self, VALUE depth)

-+{

-+    onig_set_parse_depth_limit(NUM2UINT(depth));

-+    return depth;

-+}

-+

-+void

-+Init_parse_depth_limit(VALUE klass)

-+{

-+    rb_define_singleton_method(klass, "parse_depth_limit", get_parse_depth_limit, 0);

-+    rb_define_singleton_method(klass, "parse_depth_limit=", set_parse_depth_limit, 1);

-+}

-

-Property changes on: ruby_2_4/ext/-test-/regexp/parse_depth_limit.c

-___________________________________________________________________

-Added: svn:eol-style

-   + LF

-

-Index: b/test/ruby/test_regexp.rb

-===================================================================

-+++ b/test/ruby/test_regexp.rb	(revision 57909)

-@@ -1198,6 +1198,25 @@ class TestRegexp < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_regexp.rb#L1198

-     RUBY

-   end

- 

-+  def test_invalid_free_at_parse_depth_limit_over

-+    assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}")

-+    begin;

-+      begin

-+        require '-test-/regexp'

-+      rescue LoadError

-+      else

-+        bug = '[ruby-core:79624] [Bug #13234]'

-+        Bug::Regexp.parse_depth_limit = 10

-+        src = "[" * 100

-+        3.times do

-+          assert_raise_with_message(RegexpError, /parse depth limit over/, bug) do

-+            Regexp.new(src)

-+          end

-+        end

-+      end

-+    end;

-+  end

-+

-   # This assertion is for porting x2() tests in testpy.py of Onigmo.

-   def assert_match_at(re, str, positions, msg = nil)

-     re = Regexp.new(re) unless re.is_a?(Regexp)

@@ -1,29 +1,26 @@

-Summary:    Ruby

-Name:       ruby

-Version:    2.4.0

-Release:    6%{?dist}

-License:    BSDL

-URL:        https://www.ruby-lang.org/en/

-Group:      System Environment/Security

-Vendor:     VMware, Inc.

-Distribution: Photon

-Source0:    http://cache.ruby-lang.org/pub/ruby/%{version}/%{name}-%{version}.tar.gz

-%define sha1 ruby=d44a3c50a0e742341ed3033d5db79d865151a4f4

-Patch0:     ruby-CVE-2017-9224.patch

-Patch1:     ruby-CVE-2017-9226.patch

-Patch2:     ruby-CVE-2017-9227.patch

-Patch3:     ruby-CVE-2017-9229.patch

-Patch4:	    ruby-CVE-2017-6181.patch

-Patch5:	    ruby-CVE-2017-9228.patch

-#https://github.com/flori/json/commit/8f782fd8e181d9cfe9387ded43a5ca9692266b85

-Patch6:     ruby-CVE-2017-14064.patch

+Summary:        Ruby

+Name:           ruby

+Version:        2.4.2

+Release:        1%{?dist}

+License:        BSDL

+URL:            https://www.ruby-lang.org/en/

+Group:          System Environment/Security

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://cache.ruby-lang.org/pub/ruby/%{name}-%{version}.tar.xz

+%define sha1    ruby=8373e32c63bba2180799da091b572664aa9faf6f

+Patch0:         ruby-CVE-2017-9224.patch

+Patch1:         ruby-CVE-2017-9226.patch

+Patch2:         ruby-CVE-2017-9227.patch

+Patch3:         ruby-CVE-2017-9229.patch

+Patch4:         ruby-CVE-2017-9228.patch

 BuildRequires:  openssl-devel

 BuildRequires:  ca-certificates

 BuildRequires:  readline-devel

 BuildRequires:  readline

-Requires:   ca-certificates

-Requires:   openssl

-Requires:   gmp

+Requires:       ca-certificates

+Requires:       openssl

+Requires:       gmp

 %description

 The Ruby package contains the Ruby development environment.

 This is useful for object-oriented scripting.

@@ -35,11 +32,9 @@ This is useful for object-oriented scripting.

 %patch2 -p1

 %patch3 -p1

 %patch4 -p1

-%patch5 -p1

-%patch6 -p1

 %build

 ./configure \

-    --prefix=%{_prefix}   \

+        --prefix=%{_prefix}   \

         --enable-shared \

         --docdir=%{_docdir}/%{name}-%{version}

 make %{?_smp_mflags}

@@ -64,6 +59,8 @@ rm -rf %{buildroot}/*

 %{_docdir}/%{name}-%{version}

 %{_mandir}/man1/*

 %changelog

+*   Thu Sep 28 2017 Xiaolin Li <xiaolinl@vmware.com> 2.4.2-1

+-   Update to version 2.4.2

 *   Fri Sep 15 2017 Xiaolin Li <xiaolinl@vmware.com> 2.4.0-6

 -   [security] CVE-2017-14064

 *   Tue Aug 08 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-5

@@ -5,7 +5,7 @@

 Summary:        Provides Ruby language bindings for the GNOME Libxml2 XML toolkit

 Name:           rubygem-libxml-ruby

 Version:        3.0.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 Group:          Applications/Programming

 License:        BSD

 Vendor:         VMware, Inc.

@@ -13,9 +13,9 @@ Distribution:   Photon

 URL:            https://rubygems.org/gems/%{gem_name}

 Source0:        https://rubygems.org/downloads/libxml-ruby-%{version}.gem

 %define sha1    libxml-ruby=9a4f28d019da0aef73773d676f9ba3ce9294b6bb

-BuildRequires:  ruby = 2.4.0

+BuildRequires:  ruby >= 2.4.0

 BuildRequires:  libxml2-devel 

-Requires: ruby = 2.4.0

+Requires:       ruby >= 2.4.0

 %description

 Provides Ruby language bindings for the GNOME Libxml2 XML toolkit

 %prep

@@ -27,6 +27,8 @@ gem install -V --local --force --install-dir %{buildroot}/%{gemdir} %{SOURCE0}

 %defattr(-,root,root,-)

 %{gemdir}

 %changelog

+*   Thu Sep 28 2017 Xiaolin Li <xiaolinl@vmware.com> 3.0.0-2

+-   Build with ruby 2.4.2.

 *   Wed Mar 22 2017 Xiaolin Li <xiaolinl@vmware.com> 3.0.0-1

 -   Updated to version 3.0.0.

 *   Tue Jan 31 2017 Anish Swaminathan <anishs@vmware.com> 2.8.0-4

@@ -4,7 +4,7 @@

 Name:           rubygem-nokogiri

 Version:        1.7.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Nokogiri is an HTML, XML, SAX, and Reader parser.

 Group:          Development/Languages

 License:        MIT

@@ -13,11 +13,11 @@ Distribution:   Photon

 URL:            https://rubygems.org/gems/nokogiri/

 Source0:        https://rubygems.org/downloads/nokogiri-%{version}.gem

 %define sha1    nokogiri=5731c2d494381be8440f6ace6e5fcb62e7850581

-BuildRequires:  ruby = 2.4.0

+BuildRequires:  ruby >= 2.4.0

 BuildRequires:  rubygem-mini_portile2

 BuildRequires:  libxml2-devel

 BuildRequires:  libxslt-devel

-Requires:       ruby = 2.4.0

+Requires:       ruby >= 2.4.0

 Requires:       rubygem-mini_portile2

 Requires:       libxml2

 Requires:       libxslt

@@ -35,6 +35,8 @@ NOKOGIRI_USE_SYSTEM_LIBRARIES=1 gem install -V --local --force --install-dir %{b

 %{gemdir}

 %changelog

+*   Thu Sep 28 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.1-2

+-   Build with ruby 2.4.2.

 *   Wed Mar 22 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.1-1

 -   Updated to version 1.7.1.

 *   Tue Jan 31 2017 Anish Swaminathan <anishs@vmware.com> 1.6.7.2-5