diff --git a/SOURCES/wireshark-0028-find-libssh.patch b/SOURCES/wireshark-0028-find-libssh.patch new file mode 100644 index 0000000..0ec82c7 --- /dev/null +++ b/SOURCES/wireshark-0028-find-libssh.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake +index 46dbe04..65dd5d2 100644 +--- a/cmake/modules/FindLIBSSH.cmake ++++ b/cmake/modules/FindLIBSSH.cmake +@@ -59,15 +59,15 @@ else () + ${LIBSSH_LIBRARY} + ) + +- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR ++ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h 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_INCLUDE_DIR}/libssh/libssh_version.h 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_INCLUDE_DIR}/libssh/libssh_version.h 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}) diff --git a/SPECS/wireshark.spec b/SPECS/wireshark.spec index 2f362ae..2c7e29b 100644 --- a/SPECS/wireshark.spec +++ b/SPECS/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 2.6.2 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -61,6 +61,9 @@ Patch25: wireshark-0025-drop-count.patch Patch26: wireshark-0026-mptcp.patch Patch27: wireshark-0027-ibm-smc.patch +#Change in libssh header files forces a different technique on finding definitons +Patch28: wireshark-0028-find-libssh.patch + #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -308,6 +311,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Aug 24 2022 Michal Ruprich - 1:2.6.2-15 +- Resolves: #2119126 - Wireshark source rpm fails to build due to looking for incorrect libssh header files + * Mon Apr 19 2021 Michal Ruprich - 1:2.6.2-14 - Resolves: #1851465 - [IBM 8.5 FEAT] wireshark: Update to include SMC support