Djam/openssl
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/openssl.git synced 2025-02-23 16:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate libgost.so to openssl-gost-engines

Browse source
This commit is contained in:
Mikhail Novosyolov 2019-12-28 17:13:20 +03:00
parent c950a1728e
commit e3ec224807
2 changed files with 10 additions and 8205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8199
openssl-1.0.2j-gost-engine-2.patch
View file

File diff suppressed because it is too large Load diff

16
openssl.spec
View file

@ -1,3 +1,4 @@
%define openssl_ver 1.0.2
%define major 1.0.0 %define major 1.0.0
%define engines_name %mklibname openssl-engines %{major} %define engines_name %mklibname openssl-engines %{major}
%define libcrypto %mklibname crypto %{major} %define libcrypto %mklibname crypto %{major}
@ -26,8 +27,8 @@
Summary: Secure Sockets Layer communications libs & utils Summary: Secure Sockets Layer communications libs & utils
Name: openssl Name: openssl
Version: 1.0.2t Version: %{openssl_ver}t
Release: 1 Release: 2
License: BSD-like License: BSD-like
Group: System/Libraries Group: System/Libraries
Url: https://www.openssl.org Url: https://www.openssl.org
@ -41,9 +42,6 @@ Source6: openssl.macros
# Based on https://github.com/gost-engine/engine # Based on https://github.com/gost-engine/engine
# Never remove gost-engine patches # Never remove gost-engine patches
Patch0: openssl-1.0.2l-gost-engine.patch Patch0: openssl-1.0.2l-gost-engine.patch
# Copy https://github.com/gost-engine/engine/tree/openssl_1_0_2
# over engines/ccgost/ and make diff
Patch1: openssl-1.0.2j-gost-engine-2.patch
# Handle RPM_OPT_FLAGS in Configure # Handle RPM_OPT_FLAGS in Configure
Patch2: openssl-1.0.2e-optflags.patch Patch2: openssl-1.0.2e-optflags.patch
Patch3: openssl-1.0.1c-fix-perlpath.pl Patch3: openssl-1.0.1c-fix-perlpath.pl
@ -100,6 +98,10 @@ RSA and SSL.
Summary: Engines for openssl Summary: Engines for openssl
Group: System/Libraries Group: System/Libraries
Provides: openssl-engines = %{EVRD} Provides: openssl-engines = %{EVRD}
# libgost.so was moved to openssl-gost-engine
# An atrificial provide in openssl-gost-engine
# ! dependency loop with Conflicts in openssl-gost-engine
Requires: openssl-gost-engine-openssl-api = %{openssl_ver}
%description -n %{engines_name} %description -n %{engines_name}
This package provides engines for openssl. This package provides engines for openssl.
@ -227,7 +229,6 @@ and protocols, including DES, RC4, RSA and SSL.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .gost %patch0 -p1 -b .gost
%patch1 -p1 -b .gost2
%patch2 -p1 -b .optflags %patch2 -p1 -b .optflags
%patch3 -p1 -b .perl %patch3 -p1 -b .perl
%patch6 -p1 -b .icpbrasil %patch6 -p1 -b .icpbrasil
@ -410,3 +411,6 @@ cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > %{buildroot}/%{_sys_
chmod 0644 %{buildroot}/%{_sys_macros_dir}/openssl.macros chmod 0644 %{buildroot}/%{_sys_macros_dir}/openssl.macros
# verify openssl.macros # verify openssl.macros
grep -q '%{_openssldir}' %{buildroot}%{_sys_macros_dir}/openssl.macros grep -q '%{_openssldir}' %{buildroot}%{_sys_macros_dir}/openssl.macros
# is now built in openssl-gost-engines
rm -fv %{buildroot}%{_libdir}/openssl-%{major}/engines/libgost.so