From 158d695c2e567032c2e497e3f50b138fbd63f22d Mon Sep 17 00:00:00 2001 From: "Michael A. Peters" Date: Sun, 21 May 2023 19:52:24 -0700 Subject: [PATCH] fix libressl build issue --- SPECS/libressl.spec | 34 +++++++++++++++++++++++++++++++++- SPECS/perl-Net-SSLeay.spec | 7 ++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/SPECS/libressl.spec b/SPECS/libressl.spec index c6ab2f0..c1a89bc 100644 --- a/SPECS/libressl.spec +++ b/SPECS/libressl.spec @@ -19,7 +19,7 @@ Name: libressl Version: 3.7.2 -Release: %{?repo}0.rc2%{?dist} +Release: %{?repo}0.rc3%{?dist} Summary: OpenBSD fork of the OpenSSL Cryptography Suite Group: System Environment/Libraries @@ -85,6 +85,19 @@ Conflicts: openssl-devel %description devel This package provides the development header files for LibreSSL. +%package openssl-compat +Group: Compatability +Summary: OpenSSL command compatibility +Requires: libressl = %{version}-%{release} +BuildArch: noarch +Conflicts: openssl +Conflicts: openssl-devel + +%description openssl-compat +This package is intended for the build system, to allow packages +that want an executable named "openssl" to still build against +LibreSSL + %package dhe-cron Summary: Cron scripts to generate DHE groups Group: System Administration/Miscellaneous @@ -176,6 +189,15 @@ mv %{buildroot}/%{_lib}/libtls.a %{buildroot}%{_libdir}/ %{buildroot}/%{_lib}/pkgconfig/openssl.pc mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}/ +# compatibility +ln -s libressl %{buildroot}%{_bindir}/openssl +ln -s libressl.cnf %{buildroot}%{_ssldir}/openssl.cnf +cat > %{buildroot}%{_mandir}/man1/openssl.1 << "EOF" +.so man1/libressl.1 +EOF +cat > %{buildroot}%{_mandir}/man5/openssl.cnf.5 << "EOF" +.so man5/libressl.cnf.5 +EOF #MODP IKE @@ -281,6 +303,13 @@ EOF %{_mandir}/man3/*.3* %attr(0644,root,root) %{_libdir}/pkgconfig/*.pc +%files openssl-compat +%defattr(-,root,root,-) +%{_bindir}/openssl +%{_ssldir}/openssl.cnf +%attr(0644,root,root) %{_mandir}/man1/openssl.1* +%attr(0644,root,root) %{_mandir}/man5/openssl.cnf.5* + %files dhe-cron %defattr(-,root,root,-) %attr(0755,root,root) %{_sysconfdir}/cron.daily/generate_dh_params.sh @@ -289,6 +318,9 @@ EOF %doc README.DHE.md %changelog +* Sun May 21 2023 Michael A. Peters - 3.7.2-0.rc3 +- openssl-compat package + * Fri May 19 2023 Michael A. Peters - 3.7.2-0.rc2 - Rebuild in gcc 12.3.0 diff --git a/SPECS/perl-Net-SSLeay.spec b/SPECS/perl-Net-SSLeay.spec index f62a5ee..11ac379 100644 --- a/SPECS/perl-Net-SSLeay.spec +++ b/SPECS/perl-Net-SSLeay.spec @@ -4,7 +4,7 @@ Name: perl-%{cpanname} Version: 1.93 -Release: %{?repo}0.rc1%{?dist} +Release: %{?repo}0.rc2%{?dist} Summary: Perl bindings for OpenSSL and LibreSSL Group: Development/Libraries @@ -16,8 +16,10 @@ Source0: https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.93_01.ta BuildRequires: zlib-devel %if 0%{?libresslAPI:1} == 1 BuildRequires: libressl-devel +BuildRequires: libressl-openssl-compat %else BuildRequires: openssl-devel +BuildRequires: openssl %endif BuildRequires: perl-devel BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 @@ -97,5 +99,8 @@ make install DESTDIR=%{buildroot} %changelog +* Sun May 21 2023 Michael A. Peters - 1.93-0.rc2 +- Fix BuildRequires for openssl-compat + * Sat Apr 29 2023 Michael A. Peters - 1.93-0.rc1 - Initial spec file for YJL (RPM bootstrapping LFS/BLFS 11.3)