- @@ -3102,6 +3102,11 @@ AS_IF([test ${multiarch+set}], [

- @@ -3740,7 +3740,8 @@ AS_CASE(["$ruby_version_dir_name"],

- @@ -3804,6 +3804,8 @@ AC_SUBST(vendorarchdir)dnl

- @@ -3776,6 +3776,10 @@ AC_ARG_WITH(vendorarchdir,

- @@ -3800,6 +3804,7 @@ AC_SUBST(sitearchdir)dnl

- index b47b6e1..0b99408 100755

- @@ -338,6 +338,7 @@ def CONFIG.[](name, mandatory = false)

-  sitearchlibdir = CONFIG["sitearchdir"]

-  vendorlibdir = CONFIG["vendorlibdir"]

-  vendorarchlibdir = CONFIG["vendorarchdir"]

- @@ -565,7 +566,16 @@ def stub

- @@ -3691,9 +3691,6 @@ AS_CASE(["$target_os"],

- @@ -3716,56 +3713,62 @@ AC_ARG_WITH(ridir,

- @@ -3782,6 +3785,7 @@ AC_SUBST(sitearchincludedir)dnl

- @@ -428,7 +428,7 @@ def CONFIG.[](name, mandatory = false)

- @@ -1353,7 +1353,8 @@ def test_self_use_paths

- @@ -1429,7 +1430,7 @@ def test_self_vendor_dir

-  test/fiddle/helper.rb | 105 ------------------------------------------

-  1 file changed, 105 deletions(-)

- @@ -6,111 +6,6 @@

-  libc_so = libm_so = nil

-  

- -case RUBY_PLATFORM

- -when /cygwin/

- -  libc_so = "cygwin1.dll"

- -  libm_so = "cygwin1.dll"

- -when /android/

- -  libdir = '/system/lib'

- -  if [0].pack('L!').size == 8

- -    libdir = '/system/lib64'

- -  end

- -  libc_so = File.join(libdir, "libc.so")

- -  libm_so = File.join(libdir, "libm.so")

- -when /linux/

- -  libdir = '/lib'

- -  case RbConfig::SIZEOF['void*']

- -  when 4

- -    # 32-bit ruby

- -    case RUBY_PLATFORM

- -    when /armv\w+-linux/

- -      # In the ARM 32-bit libc package such as libc6:armhf libc6:armel,

- -      # libc.so and libm.so are installed to /lib/arm-linux-gnu*.

- -      # It's not installed to /lib32.

- -      dirs = Dir.glob('/lib/arm-linux-gnu*')

- -      libdir = dirs[0] if dirs && File.directory?(dirs[0])

- -    else

- -      libdir = '/lib32' if File.directory? '/lib32'

- -    end

- -  when 8

- -    # 64-bit ruby

- -    libdir = '/lib64' if File.directory? '/lib64'

- -  end

- -  libc_so = File.join(libdir, "libc.so.6")

- -  libm_so = File.join(libdir, "libm.so.6")

- -when /mingw/, /mswin/

- -  require "rbconfig"

- -  crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'

- -  libc_so = libm_so = "#{crtname}.dll"

- -when /darwin/

- -  libc_so = "/usr/lib/libc.dylib"

- -  libm_so = "/usr/lib/libm.dylib"

- -when /kfreebsd/

- -  libc_so = "/lib/libc.so.0.1"

- -  libm_so = "/lib/libm.so.1"

- -when /gnu/	#GNU/Hurd

- -  libc_so = "/lib/libc.so.0.3"

- -  libm_so = "/lib/libm.so.6"

- -when /mirbsd/

- -  libc_so = "/usr/lib/libc.so.41.10"

- -  libm_so = "/usr/lib/libm.so.7.0"

- -when /freebsd/

- -  libc_so = "/lib/libc.so.7"

- -  libm_so = "/lib/libm.so.5"

- -when /bsd|dragonfly/

- -  libc_so = "/usr/lib/libc.so"

- -  libm_so = "/usr/lib/libm.so"

- -when /solaris/

- -  libdir = '/lib'

- -  case RbConfig::SIZEOF['void*']

- -  when 4

- -    # 32-bit ruby

- -    libdir = '/lib' if File.directory? '/lib'

- -  when 8

- -    # 64-bit ruby

- -    libdir = '/lib/64' if File.directory? '/lib/64'

- -  end

- -  libc_so = File.join(libdir, "libc.so")

- -  libm_so = File.join(libdir, "libm.so")

- -when /aix/

- -  pwd=Dir.pwd

- -  libc_so = libm_so = "#{pwd}/libaixdltest.so"

- -  unless File.exist? libc_so

- -    cobjs=%w!strcpy.o!

- -    mobjs=%w!floats.o sin.o!

- -    funcs=%w!sin sinf strcpy strncpy!

- -    expfile='dltest.exp'

- -    require 'tmpdir'

- -    Dir.mktmpdir do |dir|

- -      begin

- -        Dir.chdir dir

- -        %x!/usr/bin/ar x /usr/lib/libc.a #{cobjs.join(' ')}!

- -        %x!/usr/bin/ar x /usr/lib/libm.a #{mobjs.join(' ')}!

- -        %x!echo "#{funcs.join("\n")}\n" > #{expfile}!

- -        require 'rbconfig'

- -        if RbConfig::CONFIG["GCC"] = 'yes'

- -          lflag='-Wl,'

- -        else

- -          lflag=''

- -        end

- -        flags="#{lflag}-bE:#{expfile} #{lflag}-bnoentry -lm"

- -        %x!#{RbConfig::CONFIG["LDSHARED"]} -o #{libc_so} #{(cobjs+mobjs).join(' ')} #{flags}!

- -      ensure

- -        Dir.chdir pwd

- -      end

- -    end

- -  end

- -else

- -  libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/

- -  libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/

- -  if( !(libc_so && libm_so) )

- -    $stderr.puts("libc and libm not found: #{$0} <libc> <libm>")

- -  end

- -end

- -

- -libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))

- -libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))

- -

- From f46bac1f3e8634e24c747d06b28e11b874f1e488 Mon Sep 17 00:00:00 2001

- From: Kazuki Yamaguchi <k@rhe.jp>

- Date: Thu, 16 Aug 2018 19:40:48 +0900

- Subject: [PATCH] config: support .include directive

- 

- OpenSSL 1.1.1 introduces a new '.include' directive. Update our config

- parser to support that.

- 

- As mentioned in the referenced GitHub issue, we should use the OpenSSL

- API instead of implementing the parsing logic ourselves, but it will

- need backwards-incompatible changes which we can't backport to stable

- versions. So continue to use the Ruby implementation for now.

- 

- Reference: https://github.com/ruby/openssl/issues/208

- ---

-  ext/openssl/lib/openssl/config.rb | 54 ++++++++++++++++++++-----------

-  test/openssl/test_config.rb       | 54 +++++++++++++++++++++++++++++++

-  2 files changed, 90 insertions(+), 18 deletions(-)

- 

- diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb

- index 88225451..ba3a54c8 100644

- --- a/ext/openssl/lib/openssl/config.rb

- +++ b/ext/openssl/lib/openssl/config.rb

- @@ -77,29 +77,44 @@ def get_key_string(data, section, key) # :nodoc:

-        def parse_config_lines(io)

-          section = 'default'

-          data = {section => {}}

- -        while definition = get_definition(io)

- +        io_stack = [io]

- +        while definition = get_definition(io_stack)

-            definition = clear_comments(definition)

-            next if definition.empty?

- -          if definition[0] == ?[

- +          case definition

- +          when /\A\[/

-              if /\[([^\]]*)\]/ =~ definition

-                section = $1.strip

-                data[section] ||= {}

-              else

-                raise ConfigError, "missing close square bracket"

-              end

- -          else

- -            if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition

- -              if $2

- -                section = $1

- -                key = $2

- -              else

- -                key = $1

- +          when /\A\.include (\s*=\s*)?(.+)\z/

- +            path = $2

- +            if File.directory?(path)

- +              files = Dir.glob(File.join(path, "*.{cnf,conf}"), File::FNM_EXTGLOB)

- +            else

- +              files = [path]

- +            end

- +

- +            files.each do |filename|

- +              begin

- +                io_stack << StringIO.new(File.read(filename))

- +              rescue

- +                raise ConfigError, "could not include file '%s'" % filename

-                end

- -              value = unescape_value(data, section, $3)

- -              (data[section] ||= {})[key] = value.strip

- +            end

- +          when /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/

- +            if $2

- +              section = $1

- +              key = $2

-              else

- -              raise ConfigError, "missing equal sign"

- +              key = $1

-              end

- +            value = unescape_value(data, section, $3)

- +            (data[section] ||= {})[key] = value.strip

- +          else

- +            raise ConfigError, "missing equal sign"

-            end

-          end

-          data

- @@ -212,10 +227,10 @@ def clear_comments(line)

-          scanned.join

-        end

-  

- -      def get_definition(io)

- -        if line = get_line(io)

- +      def get_definition(io_stack)

- +        if line = get_line(io_stack)

-            while /[^\\]\\\z/ =~ line

- -            if extra = get_line(io)

- +            if extra = get_line(io_stack)

-                line += extra

-              else

-                break

- @@ -225,9 +240,12 @@ def get_definition(io)

-          end

-        end

-  

- -      def get_line(io)

- -        if line = io.gets

- -          line.gsub(/[\r\n]*/, '')

- +      def get_line(io_stack)

- +        while io = io_stack.last

- +          if line = io.gets

- +            return line.gsub(/[\r\n]*/, '')

- +          end

- +          io_stack.pop

-          end

-        end

-      end

- diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb

- index 99dcc497..5653b5d0 100644

- --- a/test/openssl/test_config.rb

- +++ b/test/openssl/test_config.rb

- @@ -120,6 +120,49 @@ def test_s_parse_format

-      assert_equal("error in line 7: missing close square bracket", excn.message)

-    end

-  

- +  def test_s_parse_include

- +    in_tmpdir("ossl-config-include-test") do |dir|

- +      Dir.mkdir("child")

- +      File.write("child/a.conf", <<~__EOC__)

- +        [default]

- +        file-a = a.conf

- +        [sec-a]

- +        a = 123

- +      __EOC__

- +      File.write("child/b.cnf", <<~__EOC__)

- +        [default]

- +        file-b = b.cnf

- +        [sec-b]

- +        b = 123

- +      __EOC__

- +      File.write("include-child.conf", <<~__EOC__)

- +        key_outside_section = value_a

- +        .include child

- +      __EOC__

- +

- +      include_file = <<~__EOC__

- +        [default]

- +        file-main = unnamed

- +        [sec-main]

- +        main = 123

- +        .include = include-child.conf

- +      __EOC__

- +

- +      # Include a file by relative path

- +      c1 = OpenSSL::Config.parse(include_file)

- +      assert_equal(["default", "sec-a", "sec-b", "sec-main"], c1.sections.sort)

- +      assert_equal(["file-main", "file-a", "file-b"], c1["default"].keys)

- +      assert_equal({"a" => "123"}, c1["sec-a"])

- +      assert_equal({"b" => "123"}, c1["sec-b"])

- +      assert_equal({"main" => "123", "key_outside_section" => "value_a"}, c1["sec-main"])

- +

- +      # Relative paths are from the working directory

- +      assert_raise(OpenSSL::ConfigError) do

- +        Dir.chdir("child") { OpenSSL::Config.parse(include_file) }

- +      end

- +    end

- +  end

- +

-    def test_s_load

-      # alias of new

-      c = OpenSSL::Config.load

- @@ -299,6 +342,17 @@ def test_clone

-      @it['newsection'] = {'a' => 'b'}

-      assert_not_equal(@it.sections.sort, c.sections.sort)

-    end

- +

- +  private

- +

- +  def in_tmpdir(*args)

- +    Dir.mktmpdir(*args) do |dir|

- +      dir = File.realpath(dir)

- +      Dir.chdir(dir) do

- +        yield dir

- +      end

- +    end

- +  end

-  end

-  

-  end

-  abrt.c    | 12 ++++++++++++++

- @@ -1439,10 +1439,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)

- @@ -202,10 +202,10 @@ class Bundler::Persistent::Net::HTTP::Persistent

- %global minor_version 7

- #%%global revision af11efd377

- %global release 127

- %global rubygems_version 3.1.2

- %global bundler_version 2.1.2

- %global io_console_version 0.5.3

- %global irb_version 1.2.1

- %global minitest_version 5.13.0

- %global net_telnet_version 0.2.0

- %global openssl_version 2.1.2

- %global power_assert_version 1.1.5

- %global racc_version 1.4.16

- %global rake_version 13.0.1

- %global test_unit_version 3.3.4

- %global xmlrpc_version 0.3.0

- # Might not be needed in the future, if we are lucky enough.

- # https://bugzilla.redhat.com/show_bug.cgi?id=888262

- %global tapset_root %{_datadir}/systemtap

- %global tapset_dir %{tapset_root}/tapset

- %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*

- %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/')

- 

- # Add support for .include directive used by OpenSSL config files.

- # https://github.com/ruby/openssl/pull/216

- Patch22: ruby-2.6.0-config-support-include-directive.patch

- Requires: rubygem(did_you_mean) >= %{did_you_mean_version}

- Recommends: rubygem(racc) >= %{racc_version}

- # Tcl/Tk support was removed from stdlib in Ruby 2.4, i.e. F27 timeframe

- # so lets obsolete it. This is not the best place, but we don't have

- # better, unless https://fedorahosted.org/fpc/ticket/645 provides some

- # generic solution.

- Requires:   ruby(rubygems) = %{version}-%{release}

- %package -n rubygem-rake

- Summary:    Ruby based make-like utility

- Version:    %{rake_version}

- License:    MIT

- Requires:   ruby(release)

- Provides:   rake = %{version}-%{release}

- Provides:   rubygem(rake) = %{version}-%{release}

- %description -n rubygem-rake

- Rake is a Make-like program implemented in Ruby. Tasks and dependencies are

- specified in standard Ruby syntax.

- %package -n rubygem-did_you_mean

- Summary:    "Did you mean?" experience in Ruby

- Version:    %{did_you_mean_version}

- License:    MIT

- Requires:   ruby(release)

- Requires:   ruby(rubygems) >= %{rubygems_version}

- Provides:   rubygem(did_you_mean) = %{version}-%{release}

- BuildArch:  noarch

- 

- %description -n rubygem-did_you_mean

- "did you mean?" experience in Ruby: the error message will tell you the right

- one when you misspelled something.

- 

- 

- %package -n rubygem-openssl

- Summary:    OpenSSL provides SSL, TLS and general purpose cryptography

- Version:    %{openssl_version}

- License:    Ruby or BSD

- Requires:   ruby(release)

- Requires:   ruby(rubygems) >= %{rubygems_version}

- Provides:   rubygem(openssl) = %{version}-%{release}

- 

- %description -n rubygem-openssl

- OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the

- OpenSSL library.

- 

- 

- %package -n rubygem-psych

- Summary:    A libyaml wrapper for Ruby

- Version:    %{psych_version}

- Provides:   rubygem(psych) = %{version}-%{release}

- 

- %description -n rubygem-psych

- Psych is a YAML parser and emitter. Psych leverages

- libyaml[http://pyyaml.org/wiki/LibYAML] for its YAML parsing and emitting

- capabilities. In addition to wrapping libyaml, Psych also knows how to

- serialize and de-serialize most Ruby objects to and from the YAML format.

- 

- 

- %package -n rubygem-net-telnet

- Summary:    Provides telnet client functionality

- Version:    %{net_telnet_version}

- Requires:   ruby(release)

- Requires:   ruby(rubygems) >= %{rubygems_version}

- Provides:   rubygem(net-telnet) = %{version}-%{release}

- %description -n rubygem-net-telnet

- Provides telnet client functionality.

- 

- This class also has, through delegation, all the methods of a socket object

- (by default, a TCPSocket, but can be set by the Proxy option to new()). This

- provides methods such as close() to end the session and sysread() to read data

- directly from the host, instead of via the waitfor() mechanism. Note that if

- you do use sysread() directly when in telnet mode, you should probably pass

- the output through preprocess() to extract telnet command sequences.

- %package -n rubygem-xmlrpc

- Summary:    XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP

- Version:    %{xmlrpc_version}

- License:    Ruby or BSD

- Provides:   rubygem(xmlrpc) = %{version}-%{release}

- %description -n rubygem-xmlrpc

- XMLRPC is a lightweight protocol that enables remote procedure calls over

- HTTP.

- 

- 

- %package -n rubygem-bundler

- Summary:    Library and utilities to manage a Ruby application's gem dependencies

- Version:    %{bundler_version}

- License:    MIT

- Requires:   ruby(release)

- Requires:   ruby(rubygems) >= %{rubygems_version}