Date: Mon, 14 Sep 2020 17:48:06 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548664 - head/net/wireshark/files Message-ID: <202009141748.08EHm6S0011034@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Sep 14 17:48:06 2020 New Revision: 548664 URL: https://svnweb.freebsd.org/changeset/ports/548664 Log: Fix detection of libssh 0.9.5+ Reported by: cmt Obtained from: https://github.com/wireshark/wireshark/commit/fd7739de6bc679036c02c7aabbc3f71783751e3d Added: head/net/wireshark/files/patch-libssh (contents, props changed) Added: head/net/wireshark/files/patch-libssh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireshark/files/patch-libssh Mon Sep 14 17:48:06 2020 (r548664) @@ -0,0 +1,29 @@ +Obtained from: https://github.com/wireshark/wireshark/commit/fd7739de6bc679036c02c7aabbc3f71783751e3d + +--- cmake/modules/FindLIBSSH.cmake.orig 2020-08-12 17:53:19 UTC ++++ cmake/modules/FindLIBSSH.cmake +@@ -59,15 +59,21 @@ else () + ${LIBSSH_LIBRARY} + ) + +- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR ++ # libssh >= 0.9.5 has libssh_version.h ++ set(_libssh_version_header "${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h") ++ if(NOT EXISTS "${_libssh_version_header}") ++ set(_libssh_version_header "${LIBSSH_INCLUDE_DIR}/libssh/libssh.h") ++ endif() ++ ++ file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_MAJOR + REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+") + # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR + if(LIBSSH_VERSION_MAJOR) + string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR}) +- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR ++ file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_MINOR + REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+") + string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR}) +- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH ++ file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_PATCH + REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+") + string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH}) + set(LIBSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009141748.08EHm6S0011034>