Merge branch 'rosa2019.1' into rosa2019.0

This commit is contained in:
Mikhail Novosyolov 2019-07-23 13:12:25 +03:00
commit f1dcad7bb9

View file

@ -272,7 +272,7 @@ sslarch=linux-generic32
--openssldir=%{_openssldir} ${sslflags} \ --openssldir=%{_openssldir} ${sslflags} \
--enginesdir=%{_libdir}/openssl-%{major}/engines \ --enginesdir=%{_libdir}/openssl-%{major}/engines \
--prefix=%{_prefix} --libdir=%{_lib}/ %{?_with_krb5:--with-krb5-flavor=MIT -I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib}} \ --prefix=%{_prefix} --libdir=%{_lib}/ %{?_with_krb5:--with-krb5-flavor=MIT -I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib}} \
zlib no-idea no-rc5 enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms sctp shared ${sslarch} zlib no-idea no-rc5 enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms enable-md2 sctp shared ${sslarch}
# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
# marked as not requiring an executable stack. # marked as not requiring an executable stack.