pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/libssh libssh: Fix build on SunOS/SmartOS



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2f4f2dbb4a5
branches:  trunk
changeset: 439073:c2f4f2dbb4a5
user:      otis <otis%pkgsrc.org@localhost>
date:      Sun Sep 13 18:45:36 2020 +0000

description:
libssh: Fix build on SunOS/SmartOS

Instruct cmake to look for sshd executable also in /usr/lib/ssh

diffstat:

 security/libssh/distinfo                           |   3 ++-
 security/libssh/patches/patch-tests_CMakeLists.txt |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 6a50fceff493 -r c2f4f2dbb4a5 security/libssh/distinfo
--- a/security/libssh/distinfo  Sun Sep 13 16:14:48 2020 +0000
+++ b/security/libssh/distinfo  Sun Sep 13 18:45:36 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2020/09/13 09:22:57 wiz Exp $
+$NetBSD: distinfo,v 1.25 2020/09/13 18:45:36 otis Exp $
 
 SHA1 (libssh-0.9.5.tar.xz) = cac8772e6bea068e4defea067d4290991d566964
 RMD160 (libssh-0.9.5.tar.xz) = 2ebc61443caa488bacdffe363775129e88c83f8a
@@ -6,4 +6,5 @@
 Size (libssh-0.9.5.tar.xz) = 502876 bytes
 SHA1 (patch-CompilerChecks.cmake) = 77b93572006132c557cb9a57698e8455f7874073
 SHA1 (patch-examples_sshd__direct-tcpip.c) = 62de8625d58dbc03c38b0eb23f6e7f20a46e91de
+SHA1 (patch-tests_CMakeLists.txt) = 61d9e21d612545766b00f577b3d342eb20a0a9a5
 SHA1 (patch-tests_torture.c) = 2c70e9d827f15ec36a62e0d0f5dd98774f24f79e
diff -r 6a50fceff493 -r c2f4f2dbb4a5 security/libssh/patches/patch-tests_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libssh/patches/patch-tests_CMakeLists.txt        Sun Sep 13 18:45:36 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-tests_CMakeLists.txt,v 1.1 2020/09/13 18:45:36 otis Exp $
+
+Search for sshd also in /usr/lib/ssh where it is located
+in SunOS/SmartOS.
+
+--- tests/CMakeLists.txt.orig  2020-09-10 12:43:04.000000000 +0000
++++ tests/CMakeLists.txt
+@@ -117,7 +117,8 @@ find_program(SSHD_EXECUTABLE
+              PATHS
+                 /sbin
+                 /usr/sbin
+-                /usr/local/sbin)
++                /usr/local/sbin
++                /usr/lib/ssh)
+ 
+ if (CLIENT_TESTING OR SERVER_TESTING)
+     find_package(socket_wrapper 1.1.5 REQUIRED)



Home | Main Index | Thread Index | Old Index