From 22d9b04bd1063defef58b1c2506bc562d7385a69 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Apr 30 2019 15:45:32 +0000 Subject: Fix ".include =" support in openssl.cnf. Because of rhbz#1668916, OpenSSL now supports = character in openssl.cnf. --- diff --git a/ruby-2.6.0-config-support-include-directive.patch b/ruby-2.6.0-config-support-include-directive.patch index 27ef50f..31cc721 100644 --- a/ruby-2.6.0-config-support-include-directive.patch +++ b/ruby-2.6.0-config-support-include-directive.patch @@ -46,8 +46,8 @@ index 88225451..ba3a54c8 100644 - key = $2 - else - key = $1 -+ when /\A\.include (.+)\z/ -+ path = $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 @@ -141,7 +141,7 @@ index 99dcc497..5653b5d0 100644 + file-main = unnamed + [sec-main] + main = 123 -+ .include include-child.conf ++ .include = include-child.conf + __EOC__ + + # Include a file by relative path diff --git a/ruby.spec b/ruby.spec index 3af1d90..bf2a2b7 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1091,6 +1091,7 @@ make check TESTS="-v $DISABLE_TESTS" %changelog * Tue Apr 30 2019 Jun Aruga - 2.5.5-105 - Update to Ruby 2.5.5. +- Fix ".include =" support in openssl.cnf (rhbz#1668916). * Mon Jan 14 2019 Björn Esser - 2.5.3-104 - Rebuilt for libcrypt.so.2 (#1666033)