diff --git a/openssl1.1.rpmlintrc b/openssl1.1.rpmlintrc index 91e6407..4fe6147 100644 --- a/openssl1.1.rpmlintrc +++ b/openssl1.1.rpmlintrc @@ -1,2 +1,4 @@ # HTML docs must not be compressed to be usable addFilter("W: manpage-not-compressed.*.html") +# for rpm5 platforms +addFilter("E: description-line-too-long") diff --git a/openssl1.1.spec b/openssl1.1.spec index e9b5057..aba07a8 100644 --- a/openssl1.1.spec +++ b/openssl1.1.spec @@ -39,8 +39,12 @@ BuildRequires: perl(File::Basename) BuildRequires: perl(FindBin) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +%if %{mdvver} <= 201610 +BuildRequires: perl +%else BuildRequires: /usr/bin/pod2html BuildRequires: /usr/bin/pod2man +%endif Requires: %{engines_name} = %{EVRD} Requires: perl-base Requires: rootcerts @@ -113,7 +117,18 @@ and protocols, including DES, RC4, RSA and SSL. cp %{SOURCE4} openssl-thread-test.c %build + +# In rosa2016.1: /usr/bin/ld: crypto/bio/bio_cb.o: relocation R_X86_64_PC32 against undefined symbol +# `stderr@@GLIBC_2.2.5' can not be used when making a shared object; recompile with -fPIC +%if %{mdvver} <= 201610 +%setup_compile_flags +# (From openssl rosa2016.1) +# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be +# marked as not requiring an executable stack. +export CFLAGS="$CFLAGS -Wa,--noexecstack" +%else %serverbuild +%endif # Figure out which flags we want to use. # default