From nobody Mon Oct 10 13:27:13 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MmKTF5kD5z4fR7H; Mon, 10 Oct 2022 13:27:13 +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 4MmKTF505lz3wt9; Mon, 10 Oct 2022 13:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665408433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWDiVPOwp9NYb3sxEihGtD4/Wl156gYwU6mWUAZACwk=; b=iYy7sfFYTSntykp7M0LBy5zVHY71iHXH6AJ5Zli2mjOpmIc7WK3mp+4UyNKwD6WrPx8u+o /N/qT2ZVjsFxPdJEHtSwPmYjqtV9bKVXXUaNiFpiomjcIr5IwvIQe5aru8i0p7WAocDU2m j6E4cRQZ5WWETS2OhQJRIPw5rqgIDKlAGXItNzmXeAAyWkpCQ8rDjDutJfJ/j4KZDOEbtw 8tiXuQKiIs/J226ZLgPSe3R9n0fTQPm55Yy9PoRAG/mPGR3ghZ/S+samf54A3oUdSOhpyN l9GwfqD8iHhN9vHOcd6tkmhXTTpHXi5MoPR/vmUqpWDlOtXBb+HonD93n24tGg== 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 4MmKTF3xdbzdNK; Mon, 10 Oct 2022 13:27:13 +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 29ADRDGe076109; Mon, 10 Oct 2022 13:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29ADRDXK076108; Mon, 10 Oct 2022 13:27:13 GMT (envelope-from git) Date: Mon, 10 Oct 2022 13:27:13 GMT Message-Id: <202210101327.29ADRDXK076108@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: 65884b23ce86 - main - net/wireshark: wifidump also requires libssh List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 65884b23ce8632e1f74c1441c9a482858efaacdb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665408433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWDiVPOwp9NYb3sxEihGtD4/Wl156gYwU6mWUAZACwk=; b=H4wTmZf0VtJDUjkPri8TDFXpgIysRAQ29nlxSBMJrBySNKt5nBePjGr8+6fkLgdqrXMHqG QwJp73FO0daV5XDXknNeWEffqxZm5G9xW4WVvbWmYVduZZwGNO5lB0E2Nsx4T0QUMxO5m3 6NlwlRxw94l5crzD+jMfsZAwfheahdFuGVJSfAKAleZ8DPtOpeQjR+IvDYPUhW+3wUk5RP OCccrp8K8QE6vuqhqDkZk4eJxSYX3Qw4qkAg/KEr3/tXxvPF+xcc9bchI/rlGUxbEd8RSC A7XTpe4J7YRS3WZE3FM8As0yIVO9SvtVJM0M6FOVpJCk+ahc5z/nb19YXjjZYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665408433; a=rsa-sha256; cv=none; b=TnGppsgEIZIOSdOjhzEN+yzdQkGbx/g8n4uhQ+KALjSouuH5kHVfjkSJ9Hvk6jHFubVbcE ws+FpWhODYMzXgawU38X5jYd30PM3IxSmyilqKb+3QlcSJb/MAzMg8BHu+ImR69kzY92ug ih/rfTJQu04toncmmMMeCDiYyKlzzFe5FAhYUs3UXoimLj5/70dpvEwP7bs4LqhFMhQWUu gx7uwxVEkZ1kxs6VoWmRT4AbfKariNS8USNY9USf6kf0tQgBKzTh86MSq1fo+O/JyqFMwx /DPpE8p9+dlIDbfi2iCSDb0E+F0nOIgiQTsp78QT2UIu0zRdZs5WwCbgpr5AeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=65884b23ce8632e1f74c1441c9a482858efaacdb commit 65884b23ce8632e1f74c1441c9a482858efaacdb Author: Joe Marcus Clarke AuthorDate: 2022-10-10 13:25:32 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-10-10 13:25:32 +0000 net/wireshark: wifidump also requires libssh --- net/wireshark/Makefile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 51dca2c698cc..717bd8fad358 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,5 +1,6 @@ PORTNAME?= wireshark DISTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://1.na.dl.wireshark.org/src/ \ https://1.eu.dl.wireshark.org/src/ \ @@ -42,7 +43,7 @@ LIB_DEPENDS+= libgpg-error.so:security/libgpg-error \ #CFLAGS+= -funit-at-a-time .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ - reordercap captype randpktdump udpdump sharkd etwdump wifidump + reordercap captype randpktdump udpdump sharkd etwdump .if defined(LITE) PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ @@ -50,7 +51,7 @@ PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CMAKE_ARGS+= -DBUILD_$x=OFF EXTRA_PATCHES= ${FILESDIR}/extra-patch-doc_CMakeLists.txt -OPTIONS_EXCLUDE+= RTP SNMP LUA ANDROIDDUMP CISCODUMP SSHDUMP +OPTIONS_EXCLUDE+= RTP SNMP LUA ANDROIDDUMP CISCODUMP SSHDUMP WIFIDUMP .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" \ @@ -58,7 +59,8 @@ PLIST_SUB+= ${x:tu}=bin/$x \ .endif .endfor -OPTIONS_DEFINE= GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP OPUS +OPTIONS_DEFINE= GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP OPUS \ + WIFIDUMP OPTIONS_SINGLE= GSSAPI @@ -79,6 +81,7 @@ GSSAPI_NONE_DESC= Disable Kerberos support SSHDUMP_DESC= Build sshdump extcap tool CISCODUMP_DESC= Build ciscodump extcap tool OPUS_DESC= Build opus decoder plugin +WIFIDUMP_DESC= Build wifidump extcap tool GUI_USES= qt:5 GUI_USE= qt=core,concurrent,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build @@ -97,6 +100,7 @@ DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ SSHDUMP_LIB_DEPENDS= libssh.so:security/libssh CISCODUMP_LIB_DEPENDS= libssh.so:security/libssh OPUS_LIB_DEPENDS= libopus.so:audio/opus +WIFIDUMP_LIB_DEPENDS= libssh.so:security/libssh GSSAPI_NONE_CMAKE_ON= -DENABLE_KERBEROS=OFF GSSAPI_NONE_CMAKE_OFF= -DENABLE_KERBEROS=ON @@ -118,6 +122,8 @@ CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF OPUS_CMAKE_ON= -DENABLE_OPUS=ON OPUS_CMAKE_OFF= -DENABLE_OPUS=OFF +WIFIDUMP_CMAKE_ON=-DBUILD_wifidump=ON +WIFIDUMP_CMAKE_OFF=-DBUILD_wifidump=OFF LUA_CPPFLAGS= -I${LUA_INCDIR} @@ -137,7 +143,9 @@ PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ SSHDUMP_MAN="@comment " \ CISCODUMP_LIB="@comment " \ CISCODUMP_MAN="@comment " \ - OPUS="@comment " + OPUS="@comment " \ + WIFIDUMP_LIB="@comment " \ + WIFIDUMP_MAN="@comment " .endif .include @@ -183,6 +191,13 @@ PLIST_SUB+= OPUS="" .else PLIST_SUB+= OPUS="@comment " .endif +.if ${PORT_OPTIONS:MWIFIDUMP} +PLIST_SUB+= WIFIDUMP_LIB="" \ + WIFIDUMP_MAN="" +.else +PLIST_SUB+= WIFIDUMP_LIB="@comment " \ + WIFIDUMP_MAN="@comment " +.endif .endif .if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/include/krb5.h)