mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

Update to 3.2.7.

Browse Source 
See https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html for
a list of changes in this release.
This commit is contained in:
Joe Marcus Clarke 2020-09-24 20:42:33 +00:00
parent d7e8cf2227
commit 347c18a00f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549954
4 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/wireshark/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= wireshark
PORTVERSION= 3.2.6
PORTVERSION= 3.2.7
PORTREVISION?= 0
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \

6
net/wireshark/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1597329322
SHA256 (wireshark-3.2.6.tar.xz) = ebb1eebe39bcecee02195dc328dd25f6862fc9e9dea4c2e29eae50537d5eb4f2
SIZE (wireshark-3.2.6.tar.xz) = 31635628
TIMESTAMP = 1600979017
SHA256 (wireshark-3.2.7.tar.xz) = be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da
SIZE (wireshark-3.2.7.tar.xz) = 31659996

29
net/wireshark/files/patch-libssh
View File

@ -1,29 +0,0 @@
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})

4
net/wireshark/pkg-plist
View File

@ -610,10 +610,10 @@ include/wireshark/wsutil/ws_printf.h
include/wireshark/wsutil/xtea.h
lib/libwireshark.so
lib/libwireshark.so.13
lib/libwireshark.so.13.0.6
lib/libwireshark.so.13.0.7
lib/libwiretap.so
lib/libwiretap.so.10
lib/libwiretap.so.10.0.6
lib/libwiretap.so.10.0.7
lib/libwsutil.so
lib/libwsutil.so.11
lib/libwsutil.so.11.0.0