Files
haikuports/net-libs/libssh2/patches/libssh2-1.11.1.patchset
2024-11-05 07:44:39 +01:00

92 lines
2.4 KiB
Plaintext

From f6ff6eed807494e4fc205df37151b378d7e7bf68 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 13 Jun 2014 17:19:49 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 21ae441..4afdcb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ dnl Our configure and build reentrant settings
CURL_CONFIGURE_REENTRANT
# Some systems (Solaris?) have socket() in -lsocket.
-AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(socket,[socket network])
# Solaris has inet_addr() in -lnsl.
AC_SEARCH_LIBS(inet_addr, nsl)
--
2.45.2
From bac932ae90ba0eb6f76c1dc11b61a8e9c876164f Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Thu, 28 Aug 2014 16:32:12 +0000
Subject: Fix for libssh2 1.11.0 scp/sftp examples on Haiku
diff --git a/example/scp_write_nonblock.c b/example/scp_write_nonblock.c
index f3d2b48..171d6f9 100644
--- a/example/scp_write_nonblock.c
+++ b/example/scp_write_nonblock.c
@@ -8,6 +8,10 @@
#include "libssh2_setup.h"
#include <libssh2.h>
+#ifdef __HAIKU__
+#include <sys/select.h>
+#endif
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
diff --git a/example/sftp_RW_nonblock.c b/example/sftp_RW_nonblock.c
index 776a7d6..1a1ed17 100644
--- a/example/sftp_RW_nonblock.c
+++ b/example/sftp_RW_nonblock.c
@@ -14,6 +14,10 @@
#include <libssh2.h>
#include <libssh2_sftp.h>
+#ifdef __HAIKU__
+#include <sys/select.h>
+#endif
+
#ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif
diff --git a/example/sftp_write_nonblock.c b/example/sftp_write_nonblock.c
index d7671b6..9d801c2 100644
--- a/example/sftp_write_nonblock.c
+++ b/example/sftp_write_nonblock.c
@@ -33,6 +33,10 @@
#include <stdio.h>
#include <time.h> /* for time() */
+#ifdef __HAIKU__
+#include <sys/select.h>
+#endif
+
static const char *pubkey = "/home/username/.ssh/id_rsa.pub";
static const char *privkey = "/home/username/.ssh/id_rsa";
static const char *username = "username";
diff --git a/example/sftp_write_sliding.c b/example/sftp_write_sliding.c
index 4390246..9ed9ce9 100644
--- a/example/sftp_write_sliding.c
+++ b/example/sftp_write_sliding.c
@@ -34,6 +34,10 @@
#include <time.h> /* for time() */
#include <string.h>
+#ifdef __HAIKU__
+#include <sys/select.h>
+#endif
+
static const char *pubkey = "/home/username/.ssh/id_rsa.pub";
static const char *privkey = "/home/username/.ssh/id_rsa";
static const char *username = "username";
--
2.45.2