Fix ".include =" support in openssl.cnf.
Because of rhbz#1668916, OpenSSL now supports = character in openssl.cnf.
This commit is contained in:
parent
a889754fa2
commit
392287d18b
@ -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
|
||||
|
@ -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 <vondruch@redhat.com> - 2.6.1-115
|
||||
- Fix ".include =" support in openssl.cnf (rhbz#1668916).
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.6.1-114
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user