haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-24 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

libssh, revbump for openssl3 (#11027)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-09-01 17:17:51 +02:00
committed by GitHub
parent 05198e537f
commit 7189a5d495
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net-libs/libssh/libssh-0.10.5.recipe
View File

@@ -18,7 +18,7 @@ COPYRIGHT="1995 Tatu Ylonen
2019 Simo Sorce" 2019 Simo Sorce"
LICENSE="GNU LGPL v2.1 LICENSE="GNU LGPL v2.1
BSD (2-clause)" BSD (2-clause)"
REVISION="1" REVISION="2"
SOURCE_URI="https://www.libssh.org/files/${portVersion%.*}/libssh-$portVersion.tar.xz" SOURCE_URI="https://www.libssh.org/files/${portVersion%.*}/libssh-$portVersion.tar.xz"
CHECKSUM_SHA256="b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234" CHECKSUM_SHA256="b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234"
PATCHES="libssh-$portVersion.patchset" PATCHES="libssh-$portVersion.patchset"
@@ -51,8 +51,9 @@ REQUIRES_devel="
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
devel:libcmocka$secondaryArchSuffix devel:libcmocka$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix >= 3
devel:libssl$secondaryArchSuffix devel:libssl$secondaryArchSuffix >= 3
devel:libssp_nonshared$secondaryArchSuffix
devel:libz$secondaryArchSuffix devel:libz$secondaryArchSuffix
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
@@ -140,5 +141,6 @@ INSTALL()
TEST() TEST()
{ {
# 96% tests passed, 1 tests failed out of 27
make -C build test make -C build test
} }

39
net-libs/libssh/patches/libssh-0.10.5.patchset
View File

@@ -1,4 +1,4 @@
From 9e381e6b4af287418707e296a556a6acd44cf720 Mon Sep 17 00:00:00 2001 From 764ce1740ddb3df2fea1206fcc2fd507531d2642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com> From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 22 Sep 2018 16:20:25 +0200 Date: Sat, 22 Sep 2018 16:20:25 +0200
Subject: Haiku networking functions lives in lnetwork Subject: Haiku networking functions lives in lnetwork
@@ -39,16 +39,14 @@ index d6245c0..e596c93 100644
set(LIBSSH_PRIVATE_INCLUDE_DIRS set(LIBSSH_PRIVATE_INCLUDE_DIRS
${LIBSSH_PRIVATE_INCLUDE_DIRS} ${LIBSSH_PRIVATE_INCLUDE_DIRS}
-- --
2.37.3 2.45.2
From 873d12efaad41821dd01fbb59b2c5ed0a1a11bd9 Mon Sep 17 00:00:00 2001
From 4ba126b58167eaa7ad64f52d960ec47cbe5c6cbe Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 6 May 2023 18:37:22 +0200 Date: Sat, 6 May 2023 18:37:22 +0200
Subject: [PATCH] disable x11 example Subject: disable x11 example
---
examples/CMakeLists.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 72ceed2..22dbe51 100644 index 72ceed2..22dbe51 100644
@@ -70,5 +68,30 @@ index 72ceed2..22dbe51 100644
if (WITH_SERVER AND (ARGP_LIBRARIES OR HAVE_ARGP_H)) if (WITH_SERVER AND (ARGP_LIBRARIES OR HAVE_ARGP_H))
if (HAVE_LIBUTIL) if (HAVE_LIBUTIL)
-- --
2.37.3 2.45.2
From ea844cc8bc871197ee4c4ac2c8a8cde901f7afee Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 1 Sep 2024 17:09:27 +0200
Subject: Silence some deprecated warnings
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3565f0..850bcc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,10 @@ include(GNUInstallDirs)
include(CompilerChecks.cmake)
+if (HAIKU)
+ add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now
+endif()
+
# disallow in-source build
include(MacroEnsureOutOfSourceBuild)
macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
--
2.45.2