From nobody Sat Mar 11 20:34:40 2023 X-Original-To: dev-commits-ports-main@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 4PYvmJ4pv3z3wpnw; Sat, 11 Mar 2023 20:34:40 +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 4PYvmJ4M8tz44Jw; Sat, 11 Mar 2023 20:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678566880; 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=ECmMKREDHs7ziW8BNjeK6E7B0zfYvByUCwh85TsALFQ=; b=xd/XNNZNbbtPOLdP2AUEQA22vsfaPiJ8eVNV4QkR/YV7jZ2baVNMSMtFtV9VCupGgs9tdM Blblifg6l3z0vs/09f1jedj69kILTDUIACRMasZEj9XvyK/j0OtrLs5SP86F9FuqYTJj9y xiyw6cEBD/hZHwSwZOX9/i+acrDZ8mY12wzFrUV2I4s1uYJuDCEr+FUKo0tuiTIvm24eOK p1MmmoqntQ/d1mp0y1PCHtc5EOgM0zBX/3ykgESPOWCwsXU+FiMctZUOayHkkzxlqQB+n3 w8Zt3/bIju2zfaF1Fg0omcCbpkBH7rmeOjy+/y0k15onRFjdJwByuXisTFc9yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678566880; 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=ECmMKREDHs7ziW8BNjeK6E7B0zfYvByUCwh85TsALFQ=; b=WhEQCRjYJ+YCQFnHZLexiYWRwIhwJF0t95wnGIxfxljdcFtZ46JDAAPnyhF9ghCZtjGzu/ 84XvJABxnuEXZi1u2KglIDS2N0rOKlm6rEtmpyFZKD3RXH7gs72G1d+rM9sQKyeQgcIdVl 2OXGJikPcVfTqP5EwnIcxsP/PgIyZQ2PgxrgmsHw75x8ZJaQJUQcMUvXQSGG3fTUBWHTJq lpBQd9/kMQLQr4a3G3aPieGxUMoO9+geh/nRYTtc+TB5FyujPBJ9x42hkV7TKWDtPtle5P VgksMThZ5Nc2ILbigtG4/7rjPN7jGg6eNpc2cLUCZh9NUUJUqXrDkjIjtrkm2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678566880; a=rsa-sha256; cv=none; b=YHx+umQ2Ir24YR7VLl6QGQceRru7Aizz2le/hBT9Ai3TVUHClc0Hk+2KUR1mSO3bGuZP/j VeikbnP51f6E5YbckdJMWTdHwikBIPTPSVoA1xWj184PM/vivZLmDHg/K2CLX5IP1gRR0C Xq9ZADTTE3ZgUKanwCBIJsf4IArbdXrF1xN0FWS4RVlydVNJEtMUxj3NC+f/EXy7YMAO/e IGVpDygMXwxjfs/bBvdspNC0Mskq1coa5pxi1aNVjTn8IIN+pu5AKPLlIj4iwwwlXIhBX7 zGqGET3rHSxEo/JkntdkdgMHHpxLNYX8AqLeuuaIUj2j9bnx7HaOVqKdkd1/Fw== 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 4PYvmJ3PRDzk11; Sat, 11 Mar 2023 20:34:40 +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 32BKYewK066971; Sat, 11 Mar 2023 20:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32BKYekk066970; Sat, 11 Mar 2023 20:34:40 GMT (envelope-from git) Date: Sat, 11 Mar 2023 20:34:40 GMT Message-Id: <202303112034.32BKYekk066970@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: ed01d8084556 - main - net/wireshark: Restore ANDROIDDUMP OPTION List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: ed01d8084556dd08f9ebae54985bbe053da0129c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed01d8084556dd08f9ebae54985bbe053da0129c commit ed01d8084556dd08f9ebae54985bbe053da0129c Author: Joe Marcus Clarke AuthorDate: 2023-03-11 20:32:39 +0000 Commit: Joe Marcus Clarke CommitDate: 2023-03-11 20:32:39 +0000 net/wireshark: Restore ANDROIDDUMP OPTION If you have TCP blackhole enabled, having androiddump built adds ~ 70 seconds to wireshark's start time (if you don't have the Android Debugger running). Leave this OPTION default enabled as it doesn't introduce any other dependencies. Reported by: Boris Korzun --- net/wireshark/Makefile | 17 ++++++++++++++--- net/wireshark/pkg-plist | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index c52b81693a32..f2d67443c073 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -43,26 +43,31 @@ CMAKE_OFF= ENABLE_ILBC ENABLE_MINIZIP ENABLE_SBC CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN:BOOL=True \ -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=True -OPTIONS_DEFINE= DOCS GNUTLS GUI LIBSSH LTO LUA MANPAGES MAXMIND \ - RTP SNMP +OPTIONS_DEFINE= ANDROIDDUMP DOCS GNUTLS GUI LIBSSH LTO LUA \ + MANPAGES MAXMIND RTP SNMP .if ${FLAVOR} == nox11 COMMENT+= (without GUI) OPTIONS_EXCLUDE= GUI RTP .endif -OPTIONS_DEFAULT= GNUTLS GSSAPI_BASE GUI MANPAGES MAXMIND RTP SNMP +OPTIONS_DEFAULT= ANDROIDDUMP GNUTLS GSSAPI_BASE GUI MANPAGES MAXMIND \ + RTP SNMP OPTIONS_DEFAULT_aarch64=LTO OPTIONS_DEFAULT_amd64= LTO OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes +ANDROIDDUMP_DESC= Build androiddump extcap tool GNUTLS_DESC= Enable crypto support for SSL and IPSec via GnuTLS GUI_DESC= Enable Qt 5 based Wireshark GUI LIBSSH_DESC= Enable libssh support (req by cisco/ssh/wifidump) MAXMIND_DESC= Enable MaxMindDB-based GeoIP geolocation support RTP_DESC= Enable codec support for RTP streams (implies GUI) +ANDROIDDUMP_CMAKE_ON=-DBUILD_androiddump=ON +ANDROIDDUMP_CMAKE_OFF=-DBUILD_androiddump=OFF + DOCS_IMPLIES= MANPAGES GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls @@ -111,6 +116,12 @@ IGNORE= cannot build with base Kerberos if krb5 port is installed. \ Use ``make config'' to choose a different option .endif +.if ${PORT_OPTIONS:MANDROIDDUMP} +PLIST_SUB+= ANDROIDDUMP="" +.else +PLIST_SUB+= ANDROIDDUMP="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \ s|/usr/share|${LOCALBASE}/share|g' \ diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 721f7865c5cf..e84e2dd21c2d 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -670,7 +670,7 @@ lib/wireshark/cmake/WiresharkConfig.cmake lib/wireshark/cmake/WiresharkConfigVersion.cmake lib/wireshark/cmake/WiresharkTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/wireshark/cmake/WiresharkTargets.cmake -lib/wireshark/extcap/androiddump +%%ANDROIDDUMP%%lib/wireshark/extcap/androiddump %%LIBSSH%%lib/wireshark/extcap/ciscodump lib/wireshark/extcap/randpktdump %%LIBSSH%%lib/wireshark/extcap/sshdump @@ -696,7 +696,7 @@ lib/wireshark/plugins/4.0/epan/wimaxasncp.so lib/wireshark/plugins/4.0/epan/wimaxmacphy.so lib/wireshark/plugins/4.0/wiretap/usbdump.so libdata/pkgconfig/wireshark.pc -%%MANPAGES%%share/man/man1/androiddump.1.gz +%%ANDROIDDUMP%%%%MANPAGES%%share/man/man1/androiddump.1.gz %%MANPAGES%%share/man/man1/capinfos.1.gz %%MANPAGES%%share/man/man1/captype.1.gz %%MANPAGES%%%%LIBSSH%%share/man/man1/ciscodump.1.gz