Hi, this is the diff to update libssh to latest release 0.6.0.
It needs the new port devel/cmocka also attached, for regress tests. Are you ok? Cheers, Remi.
cmocka-0.3.2.tar.gz
Description: GNU Zip compressed data
Index: Makefile =================================================================== RCS file: /cvs/ports/security/libssh/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 9 Aug 2013 19:26:56 -0000 1.9 +++ Makefile 8 Jan 2014 13:01:39 -0000 @@ -2,15 +2,17 @@ COMMENT = C library implementing server and client side # XXX if updating, check the number in the MASTER_SITES path -DISTNAME = libssh-0.5.5 +DISTNAME = libssh-0.6.0 -SHARED_LIBS += ssh 0.0 # 4.2 -SHARED_LIBS += ssh_threads 0.0 # 4.2 +EXTRACT_SUFX = .tar.xz + +SHARED_LIBS += ssh 1.0 # 4.3 +SHARED_LIBS += ssh_threads 1.0 # 4.3 CATEGORIES = security devel HOMEPAGE = http://www.libssh.org/ -MASTER_SITES = https://red.libssh.org/attachments/download/51/ +MASTER_SITES = https://red.libssh.org/attachments/download/71/ MAINTAINER = Remi Pointel <rpoin...@openbsd.org> @@ -23,7 +25,8 @@ MODULES = devel/cmake WRKBUILD = ${WRKDIST}/build/ -BUILD_DEPENDS = devel/cmockery +BUILD_DEPENDS = devel/cmocka \ + devel/argp-standalone CONFIGURE_ARGS += -DWITH_TESTING=ON Index: distinfo =================================================================== RCS file: /cvs/ports/security/libssh/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 9 Aug 2013 19:14:50 -0000 1.6 +++ distinfo 8 Jan 2014 13:01:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (libssh-0.5.5.tar.gz) = wN8PBfyBLb4m/UEYvsB3aqnoksBxlZDzlxEwSJxrjp0= -SIZE (libssh-0.5.5.tar.gz) = 321583 +SHA256 (libssh-0.6.0.tar.xz) = TG3nyqI9675GOfg/ov9BGSRkPmU1bWrwSNqjHkoaL3E= +SIZE (libssh-0.6.0.tar.xz) = 275664 Index: patches/patch-cmake_Modules_DefineCompilerFlags_cmake =================================================================== RCS file: /cvs/ports/security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-cmake_Modules_DefineCompilerFlags_cmake --- patches/patch-cmake_Modules_DefineCompilerFlags_cmake 2 Nov 2013 10:43:04 -0000 1.2 +++ patches/patch-cmake_Modules_DefineCompilerFlags_cmake 8 Jan 2014 13:01:39 -0000 @@ -2,10 +2,10 @@ $OpenBSD: patch-cmake_Modules_DefineComp Check for compiler flags not available with gcc < 4. ---- cmake/Modules/DefineCompilerFlags.cmake.orig Fri Jul 26 08:39:39 2013 -+++ cmake/Modules/DefineCompilerFlags.cmake Sat Nov 2 11:37:07 2013 -@@ -10,9 +10,14 @@ if (UNIX AND NOT WIN32) - if (${CMAKE_C_COMPILER_ID} MATCHES GNU) +--- cmake/Modules/DefineCompilerFlags.cmake.orig Sat Dec 21 18:37:12 2013 ++++ cmake/Modules/DefineCompilerFlags.cmake Wed Jan 8 14:00:39 2014 +@@ -11,9 +11,14 @@ if (UNIX AND NOT WIN32) + # add -Wconversion ? set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement") Index: patches/patch-src_channels_c =================================================================== RCS file: patches/patch-src_channels_c diff -N patches/patch-src_channels_c --- patches/patch-src_channels_c 2 Nov 2013 10:43:04 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_channels_c,v 1.4 2013/11/02 10:43:04 ajacoutot Exp $ ---- src/channels.c.orig Fri Jul 26 08:42:26 2013 -+++ src/channels.c Sat Nov 2 11:36:51 2013 -@@ -683,21 +683,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) { - } - - if (strcmp(request,"signal") == 0) { -- ssh_string signal; -+ ssh_string libssh_signal; - char *sig; - - SAFE_FREE(request); - ssh_log(session, SSH_LOG_PACKET, "received signal"); - -- signal = buffer_get_ssh_string(packet); -- if (signal == NULL) { -+ libssh_signal = buffer_get_ssh_string(packet); -+ if (libssh_signal == NULL) { - ssh_log(session, SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST"); - leave_function(); - return SSH_PACKET_USED; - } - -- sig = ssh_string_to_char(signal); -- ssh_string_free(signal); -+ sig = ssh_string_to_char(libssh_signal); -+ ssh_string_free(libssh_signal); - if (sig == NULL) { - leave_function(); - return SSH_PACKET_USED; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/libssh/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 9 Aug 2013 19:14:50 -0000 1.3 +++ pkg/PLIST 8 Jan 2014 13:01:39 -0000 @@ -6,6 +6,9 @@ include/libssh/libssh.h include/libssh/server.h include/libssh/sftp.h include/libssh/ssh2.h +lib/cmake/ +lib/cmake/libssh-config-version.cmake +lib/cmake/libssh-config.cmake lib/libssh.a @lib lib/libssh.so.${LIBssh_VERSION} lib/libssh_threads.a
