linux-from-scratch/LFS-RPM
1
0
Fork 0
mirror of https://github.com/YellowJacketLinux/LFS.git synced 2025-01-23 14:32:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes LibreSSL build

Browse Source
This commit is contained in:
YellowJacketLinux 2023-05-13 04:13:32 -07:00
parent ddc4563eb9
commit 2be026f912
3 changed files with 19 additions and 1755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SOURCES/libssh2-1.10.0-libressl.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ur a/src/openssl.h b/src/openssl.h
--- a/src/openssl.h 2023-05-13 03:52:34.322982701 -0700
+++ b/src/openssl.h 2023-05-13 03:55:46.175978837 -0700
@@ -58,7 +58,8 @@
#include <openssl/rand.h>
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(LIBRESSL_VERSION_NUMBER)
+ !defined(LIBRESSL_VERSION_NUMBER) || \
+ LIBRESSL_VERSION_NUMBER >= 0x3050000fL
# define HAVE_OPAQUE_STRUCTS 1
#endif

1754
SOURCES/libssh2-1.10.0-upstream_fix-1.patch
View File

File diff suppressed because it is too large Load Diff

7
SPECS/libssh2.spec
View File

@ -1,6 +1,6 @@
Name: libssh2
Version: 1.10.0
Release: %{?repo}0.rc1%{?dist}
Release: %{?repo}0.rc2%{?dist}
Summary: C library SSH2 implementation
Group: System Environment/Libraries
@ -8,6 +8,7 @@ License: BSD-3-Clause
URL: https://www.libssh2.org/
Source0: https://www.libssh2.org/download/libssh2-%{version}.tar.gz
Patch0: https://www.linuxfromscratch.org/patches/blfs/11.3/libssh2-1.10.0-upstream_fix-1.patch
Patch1: libssh2-1.10.0-libressl.patch
BuildRequires: gnupg-devel
BuildRequires: pkgconfig(libgcrypt)
@ -40,6 +41,7 @@ that links against the libssh2 library.
%prep
%setup -q
%patch 0 -p1
%patch 1 -p1
%build
@ -79,5 +81,8 @@ make install DESTDIR=%{buildroot}
%changelog
* Sat May 13 2023 Michael A. Peters <anymouseprophet@gmail.com> - 1.10.0-0.rc2
- Fix build against LibreSSL
* Sat May 13 2023 Michael A. Peters <anymouseprophet@gmail.com> - 1.10.0-0.rc1
- Initial spec file for YJL (RPM bootstrapping LFS/BLFS 11.3)