3
0
forked from pool/openssl-3

Accepting request 808417 from home:jengelh:branches:security:tls

- Use find -exec +. Replace `pwd` by simply $PWD.
- Drop Obsoletes on libopenssl1*. libopenssl3 has a new SONAME and
  does not conflict with anything previously.

OBS-URL: https://build.opensuse.org/request/show/808417
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2020-05-24 07:32:32 +00:00 committed by Git OBS Bridge
parent 6596d9810e
commit 1a7003e813
2 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat May 23 14:06:54 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Use find -exec +. Replace `pwd` by simply $PWD.
- Drop Obsoletes on libopenssl1*. libopenssl3 has a new SONAME and
does not conflict with anything previously.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 20 12:46:24 UTC 2020 - Vítězslav Čížek <vcizek@suse.com> Wed May 20 12:46:24 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>

View File

@ -64,9 +64,6 @@ OpenSSL contains an implementation of the SSL and TLS protocols.
%package -n libopenssl3 %package -n libopenssl3
Summary: Secure Sockets and Transport Layer Security Summary: Secure Sockets and Transport Layer Security
Recommends: ca-certificates-mozilla Recommends: ca-certificates-mozilla
# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
Obsoletes: libopenssl1_1_0
Obsoletes: libopenssl1_1
%description -n libopenssl3 %description -n libopenssl3
OpenSSL is a software library to be used in applications that need to OpenSSL is a software library to be used in applications that need to
@ -148,7 +145,7 @@ perl configdata.pm --dump
%check %check
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
LD_LIBRARY_PATH=`pwd` make test -j1 LD_LIBRARY_PATH="$PWD" make test -j1
# show cyphers # show cyphers
gcc -o showciphers %{optflags} -I%{buildroot}%{_includedir} %{SOURCE5} -L%{buildroot}%{_libdir} -lssl -lcrypto gcc -o showciphers %{optflags} -I%{buildroot}%{_includedir} %{SOURCE5} -L%{buildroot}%{_libdir} -lssl -lcrypto
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers
@ -166,7 +163,7 @@ 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} pushd %{buildroot}/%{_mandir}
find . -type f -exec chmod 644 {} \; find . -type f -exec chmod 644 {} +
# some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check. # some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check.
# replace spaces by underscores # replace spaces by underscores
#for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done #for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done
@ -191,7 +188,7 @@ done
popd popd
# Do not install demo scripts executable under /usr/share/doc # Do not install demo scripts executable under /usr/share/doc
find demos -type f -perm /111 -exec chmod 644 {} \; find demos -type f -perm /111 -exec chmod 644 {} +
# Place showciphers.c for %%doc macro # Place showciphers.c for %%doc macro
cp %{SOURCE5} . cp %{SOURCE5} .