Fix ".include =" support in openssl.cnf.
Because of rhbz#1668916, OpenSSL now supports = character in openssl.cnf.
This commit is contained in:
parent
b4195d1ec6
commit
22d9b04bd1
2 changed files with 4 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1091,6 +1091,7 @@ make check TESTS="-v $DISABLE_TESTS"
|
|||
%changelog
|
||||
* Tue Apr 30 2019 Jun Aruga <jaruga@redhat.com> - 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 <besser82@fedoraproject.org> - 2.5.3-104
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue