3
0
forked from pool/openssl-3

Accepting request 844996 from home:pmonrealgonzalez:branches:security:tls

* Fix tests failing: 30-test_acvp.t and 30-test_evp.t
- Add openssl-AES_XTS.patch for ppc64, ppc64le and aarch64

OBS-URL: https://build.opensuse.org/request/show/844996
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=20
This commit is contained in:
Pedro Monreal Gonzalez 2020-10-30 09:36:36 +00:00 committed by Git OBS Bridge
parent 8a70474d1d
commit a7eccb4727
2 changed files with 12 additions and 12 deletions

View File

@ -2,9 +2,9 @@
Fri Oct 16 10:58:53 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
- Fix build on ppc* architectures
* Tests failing: 30-test_acvp.t and 30-test_evp.t
* Fix tests failing: 30-test_acvp.t and 30-test_evp.t
* https://github.com/openssl/openssl/pull/13133
- Add openssl-AES_XTS.patch ppc64, ppc64le and aarch64
- Add openssl-AES_XTS.patch for ppc64, ppc64le and aarch64
-------------------------------------------------------------------
Fri Oct 16 08:43:10 UTC 2020 - Pedro Monreal <pmonreal@suse.com>

View File

@ -38,7 +38,7 @@ Source3: https://www.%{_rname}.org/source/%{_rname}-%{dash_version}.tar.g
# http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA2D29B7BF295C759#/openssl.keyring
Source4: %{_rname}.keyring
Source5: showciphers.c
# PATCH-FIX-OPENSUSE: do not install html mans it takes ages
# PATCH-FIX-OPENSUSE: do not install html mans as it takes ages
Patch1: openssl-1.1.0-no-html.patch
Patch2: openssl-truststore.patch
Patch3: openssl-pkgconfig.patch
@ -79,7 +79,7 @@ OpenSSL contains an implementation of the SSL and TLS protocols.
Summary: Development files for OpenSSL
Requires: libopenssl3 = %{version}
Recommends: %{name} = %{version}
# we need to have around only the exact version we are able to operate with
# We need to have around only the exact version we are able to operate with
Conflicts: libopenssl-devel < %{version}
Conflicts: libopenssl-devel > %{version}
Conflicts: ssl-devel
@ -157,20 +157,20 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers
%install
%make_install %{?_smp_mflags}
# kill static libs
# Kill static libs
rm -f %{buildroot}%{_libdir}/lib*.a
# remove the cnf.dist
# Remove the cnf.dist
rm -f %{buildroot}%{_sysconfdir}/ssl/openssl.cnf.dist
ln -sf ./%{_rname} %{buildroot}/%{_includedir}/ssl
mkdir %{buildroot}/%{_datadir}/ssl
mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl/
# avoid file conflicts with man pages from other packages
#
# Avoid file conflicts with man pages from other packages
pushd %{buildroot}/%{_mandir}
find . -type f -exec chmod 644 {} +
# some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check.
# replace spaces by underscores
# Some man pages now contain spaces. This makes several
# scripts go havoc, among them /usr/sbin/Check.
# Replace spaces by underscores
# for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done
which readlink &>/dev/null || function readlink { ( set +x; target=$(file $1 2>/dev/null); target=${target//* }; test -f $target && echo $target; ) }
for i in man?/*; do
@ -183,10 +183,10 @@ for i in man?/*; do
fi
case "$i" in
*.1)
# these are the pages mentioned in openssl(1). They go into the main package.
# These are the pages mentioned in openssl(1). They go into the main package.
echo %doc %{_mandir}/${i}ssl%{?ext_man} >> $OLDPWD/filelist;;
*)
# the rest goes into the openssl-doc package.
# The rest goes into the openssl-doc package.
echo %doc %{_mandir}/${i}ssl%{?ext_man} >> $OLDPWD/filelist.doc;;
esac
done