Re: [UPDATE] security/libssh

On Wed, Aug 15, 2018 at 09:01:45AM +0200, Remi Pointel wrote:
> Hi,
>
> this diff updates libssh to latest release.
>
> Ok?
>
> Cheers,
>
> Remi.

Here's an updated diff that also fixes remmina and x2goclient.
Since version 0.8 it's no longer needed to link with libssh_threads for these two ports.
See: http://api.libssh.org/master/libssh_tutor_threads.html

OK?

Index: security/libssh/Makefile
===================================================================
RCS file: /cvs/ports/security/libssh/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- security/libssh/Makefile 26 Jun 2018 20:45:41 -0000 1.17
+++ security/libssh/Makefile 19 Oct 2018 20:11:00 -0000
@@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.17 2018/06/26 20:45:41 rsadowski Exp $

COMMENT = C library implementing server and client side
-DISTNAME = libssh-0.7.5
+DISTNAME = libssh-0.8.4

-SHARED_LIBS += ssh 3.0 # 4.5
-SHARED_LIBS += ssh_threads 2.0 # 4.5
+SHARED_LIBS += ssh 4.0 # 4.5

CATEGORIES = security devel

HOMEPAGE = https://www.libssh.org/
-MASTER_SITES = https://www.libssh.org/files/0.7/
+MASTER_SITES = https://www.libssh.org/files/0.8/
EXTRACT_SUFX = .tar.xz

MAINTAINER = Remi Pointel <rpointel@openbsd.org>
@@ -26,6 +25,6 @@ WRKBUILD = ${WRKDIST}/build
BUILD_DEPENDS = devel/cmocka \
devel/argp-standalone

-CONFIGURE_ARGS += -DWITH_TESTING=ON
+CONFIGURE_ARGS += -DUNIT_TESTING=ON

.include <bsd.port.mk>
Index: security/libssh/distinfo
===================================================================
RCS file: /cvs/ports/security/libssh/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- security/libssh/distinfo 21 Sep 2017 17:07:52 -0000 1.12
+++ security/libssh/distinfo 19 Oct 2018 20:11:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.7.5.tar.xz) = VOht1dwg5TZ+WPPKqzN843Z1+GP4DfhbaxYUlmozcJU=
-SIZE (libssh-0.7.5.tar.xz) = 351632
+SHA256 (libssh-0.8.4.tar.xz) = a7B3EwIahYa6ISCyw2xGjcmsgJbQQ/mxcmY5qkJ1uBs=
+SIZE (libssh-0.8.4.tar.xz) = 425848
Index: security/libssh/patches/patch-ConfigureChecks_cmake
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-ConfigureChecks_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ConfigureChecks_cmake
--- security/libssh/patches/patch-ConfigureChecks_cmake 21 Sep 2017 17:07:52 -0000 1.2
+++ security/libssh/patches/patch-ConfigureChecks_cmake 19 Oct 2018 20:11:00 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-ConfigureChecks_cmake,v
Index: ConfigureChecks.cmake
--- ConfigureChecks.cmake.orig
+++ ConfigureChecks.cmake
-@@ -205,7 +205,7 @@ check_c_source_compiles("
+@@ -259,7 +259,7 @@ check_c_source_compiles("
__thread int tls;

int main(void) {
Index: security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
===================================================================
RCS file: security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
diff -N security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
--- security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake 9 Mar 2014 20:41:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-cmake_Modules_DefineCompilerFlags_cmake,v 1.3 2014/03/09 20:41:14 rpointel Exp $
-
-Check for compiler flags not available with gcc < 4.
-
---- 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")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
-+
-+ check_c_compiler_flag("-Wdeclaration-after-statement" WITH_WDECL)
-+ if (WITH_WDECL)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement")
-+ endif (WITH_WDECL)
-
- # with -fPIC
- check_c_compiler_flag("-fPIC" WITH_FPIC)
Index: security/libssh/patches/patch-tests_unittests_torture_misc_c
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-tests_unittests_torture_misc_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tests_unittests_torture_misc_c
--- security/libssh/patches/patch-tests_unittests_torture_misc_c 11 May 2017 00:21:50 -0000 1.3
+++ security/libssh/patches/patch-tests_unittests_torture_misc_c 19 Oct 2018 20:11:00 -0000
@@ -2,13 +2,13 @@ $OpenBSD: patch-tests_unittests_torture_
Index: tests/unittests/torture_misc.c
--- tests/unittests/torture_misc.c.orig
+++ tests/unittests/torture_misc.c
-@@ -209,7 +209,8 @@ int torture_run_tests(void) {
+@@ -361,7 +361,8 @@ int torture_run_tests(void) {
#ifdef _WIN32
- unit_test(torture_path_expand_tilde_win),
+ cmocka_unit_test(torture_path_expand_tilde_win),
#else
-- unit_test(torture_path_expand_tilde_unix),
+- cmocka_unit_test(torture_path_expand_tilde_unix),
+ /* failed with our make regress ("env -i"), need a real user to be tested.
+ unit_test(torture_path_expand_tilde_unix), */