From nobody Mon Feb 21 19:59:24 2022 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 5643719D208A; Mon, 21 Feb 2022 19:59:25 +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 4K2Y6P1yRsz3pPX; Mon, 21 Feb 2022 19:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645473565; 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=gbKj9ApAgf25g7Pf4WPi9Zm3NLhetWwOyyV2aJDXBF8=; b=TIOwkPvAiXVvgI7jKWMDFPCHP3uFsHQx3dgAcfASlImpkKyMiBp7+4AOkbqO+inDUWWwah acI8qB9UEKjnRk4+Ae8yKwQVgKEYHGUw8mbCdNS9Na1qo4EltymB7+Vy7nujuOBMuoaLfK vpx30+idzyo1ew2fXpljnfzDXa8sf6BbIHmIiQUv2EaJT6zklduywPuEsn3yCht2xuqQYz wHKt5I8NU+yCifmiaTTJ1lOKL+QaeKxD8txG6pn4KGROsettaY873F4mO+OksKWSdNkliX zvEGu0y3vZoLtz8k8zI0+FOmHU6n4rkYL0e/yO56kaxVAFobbRw2zX5cpRTYjA== 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 1F17316B43; Mon, 21 Feb 2022 19:59:25 +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 21LJxODv090870; Mon, 21 Feb 2022 19:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LJxOb0090869; Mon, 21 Feb 2022 19:59:24 GMT (envelope-from git) Date: Mon, 21 Feb 2022 19:59:24 GMT Message-Id: <202202211959.21LJxOb0090869@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: 575930ac731f - main - net/wireshark: Update MASTER_SITES, fix RTP option, adjust Makefile 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: 575930ac731f8f9c3122cc9b6aa321561fec544b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645473565; 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=gbKj9ApAgf25g7Pf4WPi9Zm3NLhetWwOyyV2aJDXBF8=; b=qy0JbZQ4ZzZ2Ev6U+ErnVVdroepBs2bI/T1hKbIrbDgbtuYJ+2AFB4qACId57FWLjhXG0y qe7XXG2+GZrlJSpoCNNdlIW08OS7iiL1BCoCKT0rNTLdhEmNfZQEurU4f9UdkRHktX1rmV FOGPLtr3z5xEGpCBA6kbPWPf3x+yUb7veSAhyvLI3IdED1ZFFeGZSzaKy348ikZPx7au9v AOQejJ3177XLxWZX4uKBlSSNHL3y87YkgOvUdmLLK/LY01SMDC17QmFBvN3B+mIOGkxwNG b4F3e0qD2pFnYYdDbL8NbkNszYZtOOsEuVbr6AbpfFxa/UmCIZX8Ur/e0/25OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645473565; a=rsa-sha256; cv=none; b=Cjvvjy/Ff4OGLXzgMXQ5+1dsAuKpmbAg3aO1a6+jNLIPspAfhHhNgtulFXrOxquhsud0uN 23Mq3mSjMhKfnPRlmy4rjCNn0/i0es9dknadw5P7TQM1sxmHGaUzCjRYaAcnbwvh7UKCQC oQ0lYzCVGji+PH+I8lJDhnryshh6UGVnwa+k+TDY7ki4UlVQ8li68OuU4iacATiB3cyDN9 tF7EnukchKk5Ym+cl4hCxceD2Pgpvz7ni4F/eR/Vo19AG8feQQUple6Jo3lCNfQaOuoYlQ 1Y5eFUBqX3+a/yMiZwg7qv67BImEUmFvIrYpNVuGp76iJkrTcIfE6psD2iDPyQ== 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=575930ac731f8f9c3122cc9b6aa321561fec544b commit 575930ac731f8f9c3122cc9b6aa321561fec544b Author: Daniel Engberg AuthorDate: 2022-02-21 19:58:15 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-02-21 19:58:15 +0000 net/wireshark: Update MASTER_SITES, fix RTP option, adjust Makefile - Update MASTER_SITES with official mirrors and add main site as last resort Reference: https://www.wireshark.org/mirror.html - Remove unnecessary definitions and switch to DISTVERSION while at it - Fix RTP option PR: 262076 --- net/wireshark/Makefile | 19 ++++++++----------- net/wireshark/pkg-plist | 2 ++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index b79ce8dc8361..79f477a26bbe 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,17 +1,17 @@ # Created by: Bill Fumerola PORTNAME?= wireshark -PORTVERSION= 3.6.2 +DISTVERSION= 3.6.2 CATEGORIES= net -MASTER_SITES= http://www.wireshark.org/download/src/ \ +MASTER_SITES= https://1.na.dl.wireshark.org/src/ \ + https://1.eu.dl.wireshark.org/src/ \ + https://1.as.dl.wireshark.org/src/ \ + https://2.na.dl.wireshark.org/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ - http://wireshark.askapache.com/download/src/all-versions/ \ - ftp://ftp.uni-kl.de/pub/wireshark/src/ \ - http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ - ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ - http://wireshark.zing.org/download/src/ -DISTNAME= ${DATADIR_NAME}-${PORTVERSION} + https://wireshark.marwan.ma/download/src/ \ + https://www.wireshark.org/download/src/ +DISTNAME= ${DATADIR_NAME}-${DISTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool @@ -41,7 +41,6 @@ LIB_DEPENDS+= libgpg-error.so:security/libgpg-error \ libzstd.so:archivers/zstd #CFLAGS+= -funit-at-a-time -PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap captype randpktdump udpdump sharkd etwdump @@ -92,7 +91,6 @@ GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit RTP_LIB_DEPENDS= libspandsp.so:comms/spandsp -RTP_CPPFLAGS= -I${LOCALBASE}/include MAXMIND_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ @@ -100,7 +98,6 @@ 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 -OPUS_CPPFLAGS= -I${LOCALBASE}/include GSSAPI_NONE_CMAKE_ON= -DENABLE_KERBEROS=OFF GSSAPI_NONE_CMAKE_OFF= -DENABLE_KERBEROS=ON diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 31eb70e674a9..1f1b1c91c0c5 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -665,6 +665,8 @@ lib/wireshark/cmake/WiresharkTargets.cmake %%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump %%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump lib/wireshark/plugins/3.6/codecs/g711.so +%%RTP%%lib/wireshark/plugins/3.6/codecs/g722.so +%%RTP%%lib/wireshark/plugins/3.6/codecs/g726.so lib/wireshark/plugins/3.6/codecs/l16mono.so %%OPUS%%lib/wireshark/plugins/3.6/codecs/opus_dec.so lib/wireshark/plugins/3.6/epan/ethercat.so