From 392287d18bf53970fb2a8e934a32e31b52d570d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 5 Mar 2019 10:39:38 +0100 Subject: [PATCH] Fix ".include =" support in openssl.cnf. Because of rhbz#1668916, OpenSSL now supports = character in openssl.cnf. --- ruby-2.6.0-config-support-include-directive.patch | 6 +++--- ruby.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ruby-2.6.0-config-support-include-directive.patch b/ruby-2.6.0-config-support-include-directive.patch index 37a89d6..5b2024b 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 a4f11d7..cbebc7a 100644 --- a/ruby.spec +++ b/ruby.spec @@ -21,7 +21,7 @@ %endif -%global release 114 +%global release 115 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} # The RubyGems library has to stay out of Ruby directory tree, since the @@ -1170,6 +1170,9 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS" %{_mandir}/man5/gemfile.5* %changelog +* Tue Mar 05 2019 Vít Ondruch - 2.6.1-115 +- Fix ".include =" support in openssl.cnf (rhbz#1668916). + * Sun Feb 17 2019 Igor Gnatenko - 2.6.1-114 - Rebuild for readline 8.0