diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-09-14 17:48:06 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-09-14 17:48:06 +0000 |
| commit | cdc173488ea4ce60e60563e5baf5c6acd61ca6c9 (patch) | |
| tree | 4d1959515b847509026791aa083bc7e64e08ac3b /net/wireshark | |
| parent | deb2712a8c9673fa3951db17f6e6c11a30dec562 (diff) | |
| download | ports-cdc173488ea4ce60e60563e5baf5c6acd61ca6c9.tar.gz ports-cdc173488ea4ce60e60563e5baf5c6acd61ca6c9.zip | |
Fix detection of libssh 0.9.5+
Reported by: cmt
Obtained from: https://github.com/wireshark/wireshark/commit/fd7739de6bc679036c02c7aabbc3f71783751e3d
Notes
Notes:
svn path=/head/; revision=548664
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/files/patch-libssh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/net/wireshark/files/patch-libssh b/net/wireshark/files/patch-libssh new file mode 100644 index 000000000000..2bde8661f125 --- /dev/null +++ b/net/wireshark/files/patch-libssh @@ -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}) |