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 <[email protected]> @@ -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), */ #endif - unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), - unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), + cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), + cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), Index: security/libssh/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/libssh/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- security/libssh/pkg/PLIST 4 Nov 2015 19:19:20 -0000 1.6 +++ security/libssh/pkg/PLIST 19 Oct 2018 20:11:00 -0000 @@ -11,9 +11,5 @@ lib/cmake/ lib/cmake/libssh/ lib/cmake/libssh/libssh-config-version.cmake lib/cmake/libssh/libssh-config.cmake -lib/libssh.a @lib lib/libssh.so.${LIBssh_VERSION} -lib/libssh_threads.a -@lib lib/libssh_threads.so.${LIBssh_threads_VERSION} lib/pkgconfig/libssh.pc -lib/pkgconfig/libssh_threads.pc Index: x11/x2goclient/Makefile =================================================================== RCS file: /cvs/ports/x11/x2goclient/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- x11/x2goclient/Makefile 10 Sep 2018 15:47:23 -0000 1.8 +++ x11/x2goclient/Makefile 19 Oct 2018 20:11:00 -0000 @@ -3,7 +3,7 @@ COMMENT = Qt4 client for the X2Go system DISTNAME = x2goclient-4.1.2.1 -REVISION = 0 +REVISION = 1 CATEGORIES = x11 @@ -16,13 +16,13 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSvg SM X11 WANTLIB += Xext Xi Xinerama Xpm Xrender c cups fontconfig freetype -WANTLIB += ldap m ssh ssh_threads +WANTLIB += ldap m ssh MASTER_SITES = https://code.x2go.org/releases/source/x2goclient/ MODULES += x11/qt4 -LIB_DEPENDS += security/libssh \ +LIB_DEPENDS += security/libssh>=0.8.4 \ databases/openldap \ print/cups,-libs Index: x11/x2goclient/patches/patch-x2goclient_pro =================================================================== RCS file: /cvs/ports/x11/x2goclient/patches/patch-x2goclient_pro,v retrieving revision 1.4 diff -u -p -r1.4 patch-x2goclient_pro --- x11/x2goclient/patches/patch-x2goclient_pro 10 Sep 2018 15:47:23 -0000 1.4 +++ x11/x2goclient/patches/patch-x2goclient_pro 19 Oct 2018 20:11:00 -0000 @@ -1,7 +1,19 @@ $OpenBSD: patch-x2goclient_pro,v 1.4 2018/09/10 15:47:23 sthen Exp $ + +It's not required to link with libssh_threads anymore since libssh 0.8 + Index: x2goclient.pro --- x2goclient.pro.orig +++ x2goclient.pro +@@ -132,7 +132,7 @@ SOURCES += src/sharewidget.cpp \ + src/compat.cpp \ + src/pulsemanager.cpp + +-LIBS += -lssh -lssh_threads ++LIBS += -lssh + win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 + + RC_FILE = res/x2goclient.rc @@ -168,7 +168,7 @@ else:message("No translation files in project") TEMPLATE = app Index: x11/remmina/Makefile =================================================================== RCS file: /cvs/ports/x11/remmina/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- x11/remmina/Makefile 10 Jul 2018 12:35:01 -0000 1.33 +++ x11/remmina/Makefile 19 Oct 2018 20:11:00 -0000 @@ -6,7 +6,7 @@ GH_TAGNAME= v1.2.30 GH_PROJECT= Remmina GH_ACCOUNT= FreeRDP PKGNAME= remmina-${GH_TAGNAME:S/v//} -REVISION= 3 +REVISION= 4 CATEGORIES= x11 net @@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE SM X11 Xext atk-1.0 avahi-client avahi-common avahi-ui-gtk3 WANTLIB += c cairo freerdp2 freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 gtk-3 intl pango-1.0 pthread ssh ssh_threads +WANTLIB += gthread-2.0 gtk-3 intl pango-1.0 pthread ssh WANTLIB += telepathy-glib vncclient vte-2.91 xkbfile WANTLIB += winpr2 soup-2.4 json-glib-1.0 crypto dbus-1 dbus-glib-1 ssl WANTLIB += cairo-gobject fribidi pangocairo-1.0 secret-1 spice-client-glib-2.0 @@ -36,7 +36,7 @@ LIB_DEPENDS= devel/gettext \ devel/vte3 \ net/avahi,,-gtk3 \ net/libvncserver \ - security/libssh \ + security/libssh>=0.8.4 \ x11/freerdp \ x11/spice-gtk \ x11/gnome/libsecret \ Index: x11/remmina/patches/patch-cmake_FindLIBSSH_cmake =================================================================== RCS file: x11/remmina/patches/patch-cmake_FindLIBSSH_cmake diff -N x11/remmina/patches/patch-cmake_FindLIBSSH_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/remmina/patches/patch-cmake_FindLIBSSH_cmake 19 Oct 2018 20:11:00 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +From 8d654eca784d5e1b2c6e853b7beb7ad3d8322290 Mon Sep 17 00:00:00 2001 +From: Giovanni Panozzo <[email protected]> +Date: Sun, 12 Aug 2018 00:51:32 +0200 +Subject: [PATCH] cmake: include libssh_threads only when available + +Index: cmake/FindLIBSSH.cmake +--- cmake/FindLIBSSH.cmake.orig ++++ cmake/FindLIBSSH.cmake +@@ -51,7 +51,11 @@ include(FindPackageHandleStandardArgs) + + find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR) + +-set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY}) ++if (LIBSSH_THREADS_LIBRARY) ++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY}) ++else() ++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY}) ++endif() + set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR}) + + mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY) -- jasper
