From owner-dev-commits-ports-all@freebsd.org Thu Apr 22 21:19:20 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D36B25FEFAC; Thu, 22 Apr 2021 21:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR9KN4YhCz4nsR; Thu, 22 Apr 2021 21:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B26D20FBF; Thu, 22 Apr 2021 21:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MLJKrs098732; Thu, 22 Apr 2021 21:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MLJKbj098731; Thu, 22 Apr 2021 21:19:20 GMT (envelope-from git) Date: Thu, 22 Apr 2021 21:19:20 GMT Message-Id: <202104222119.13MLJKbj098731@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 8d4498eee8b7 - main - net/wireshark: Update to 3.4.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d4498eee8b756d08cf3d2f0201a9030beacbbea Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 21:19:20 -0000 The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d4498eee8b756d08cf3d2f0201a9030beacbbea commit 8d4498eee8b756d08cf3d2f0201a9030beacbbea Author: Joe Marcus Clarke AuthorDate: 2021-04-22 21:17:50 +0000 Commit: Joe Marcus Clarke CommitDate: 2021-04-22 21:17:50 +0000 net/wireshark: Update to 3.4.5 See https://www.wireshark.org/docs/relnotes/wireshark-3.4.5.html for a list of what has changed in this release. --- net/wireshark/Makefile | 3 +-- net/wireshark/distinfo | 6 +++--- net/wireshark/files/patch-CMakeLists.txt | 13 ------------- net/wireshark/files/patch-ui_qt_CMakeLists.txt | 13 ------------- net/wireshark/pkg-plist | 4 ++-- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 7269d101fd2a..a409d0584ade 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,8 +1,7 @@ # Created by: Bill Fumerola PORTNAME?= wireshark -PORTVERSION= 3.4.4 -PORTREVISION?= 1 +PORTVERSION= 3.4.5 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 7db56859b19c..45a193cc64af 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615731455 -SHA256 (wireshark-3.4.4.tar.xz) = 729cd11e9715c600e5ad74ca472bacf8af32c20902192d5f2b271268511d4d29 -SIZE (wireshark-3.4.4.tar.xz) = 32290424 +TIMESTAMP = 1619125184 +SHA256 (wireshark-3.4.5.tar.xz) = de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333 +SIZE (wireshark-3.4.5.tar.xz) = 32300144 diff --git a/net/wireshark/files/patch-CMakeLists.txt b/net/wireshark/files/patch-CMakeLists.txt deleted file mode 100644 index c13394013648..000000000000 --- a/net/wireshark/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2021-04-15 19:26:54 UTC -+++ CMakeLists.txt -@@ -1083,6 +1083,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) - - # Build the Qt GUI? - if(BUILD_wireshark) -+ set(CMAKE_AUTOMOC ON) -+ set(CMAKE_AUTOUIC ON) -+ set(CMAKE_AUTORCC ON) -+ - # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten - # somewhere. The if WIN32 in this place is annoying as well. - if(WIN32) diff --git a/net/wireshark/files/patch-ui_qt_CMakeLists.txt b/net/wireshark/files/patch-ui_qt_CMakeLists.txt deleted file mode 100644 index 712144d68d39..000000000000 --- a/net/wireshark/files/patch-ui_qt_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/qt/CMakeLists.txt.orig 2021-04-15 19:26:54 UTC -+++ ui/qt/CMakeLists.txt -@@ -631,10 +631,6 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ) - --set(CMAKE_AUTOMOC TRUE) --set(CMAKE_AUTOUIC TRUE) --set(CMAKE_AUTORCC TRUE) -- - if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") - # Drop the file modification time of source files from generated files - # to help with reproducible builds. We do not use QFileInfo.lastModified diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 7782b805bbb8..9202dbee0153 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -618,10 +618,10 @@ include/wireshark/wsutil/ws_printf.h include/wireshark/wsutil/xtea.h lib/libwireshark.so lib/libwireshark.so.14 -lib/libwireshark.so.14.0.4 +lib/libwireshark.so.14.0.5 lib/libwiretap.so lib/libwiretap.so.11 -lib/libwiretap.so.11.0.4 +lib/libwiretap.so.11.0.5 lib/libwsutil.so lib/libwsutil.so.12 lib/libwsutil.so.12.0.0