From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77D3E138332 for ; Wed, 7 Feb 2018 21:14:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65D94E09CD; Wed, 7 Feb 2018 21:14:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30E53E09CD for ; Wed, 7 Feb 2018 21:14:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E333E335C50 for ; Wed, 7 Feb 2018 21:14:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4027A1E5 for ; Wed, 7 Feb 2018 21:14:05 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1518038043.cba7859ac9db337e8ae1856ea76b76b12b95497b.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/metadata.xml net-analyzer/wireshark/wireshark-2.5.0.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: cba7859ac9db337e8ae1856ea76b76b12b95497b X-VCS-Branch: master Date: Wed, 7 Feb 2018 21:14:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4d9c4057-e116-475b-a811-90efdc94b0aa X-Archives-Hash: 98c3f4b2addfb6cd057c88ac1bc5b446 commit: cba7859ac9db337e8ae1856ea76b76b12b95497b Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 7 21:12:47 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Feb 7 21:14:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba7859a net-analyzer/wireshark: Version 2.5.0. Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-analyzer/wireshark/Manifest | 1 + net-analyzer/wireshark/metadata.xml | 114 ++++++++++----------- ...hark-99999999.ebuild => wireshark-2.5.0.ebuild} | 53 ++++------ net-analyzer/wireshark/wireshark-99999999.ebuild | 43 ++++---- 4 files changed, 99 insertions(+), 112 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index c1eff3b0239..0f73f429f21 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,3 +1,4 @@ DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc +DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 1dcbdb4e477..9801f150cc4 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -1,62 +1,62 @@ - - netmon@gentoo.org - Gentoo network monitoring and analysis project - - - Wireshark is the world's foremost network protocol analyzer, and is the de - facto (and often de jure) standard across many industries and educational - institutions. Wireshark has a rich feature set which includes 1) deep - inspection of hundreds of protocols, with more being added all the time, 2) - live capture and offline analysis, 3) standard three-pane packet browser, 4) - captured network data can be browsed via a GUI, or via the TTY-mode TShark - utility, 5) the most powerful display filters in the industry, 6) rich VoIP - analysis, 7) read/write many different capture file formats: tcpdump - (libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network - Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer® - Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM - WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks - Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) - capture files compressed with gzip can be decompressed on the fly, 9) live - data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, - Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many - protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and - WPA/WPA2, 11) coloring rules can be applied to the packet list for quick, - intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or - plain text + +netmon@gentoo.org +Gentoo network monitoring and analysis project + + +Wireshark is the world's foremost network protocol analyzer, and is the de +facto (and often de jure) standard across many industries and educational +institutions. Wireshark has a rich feature set which includes 1) deep +inspection of hundreds of protocols, with more being added all the time, 2) +live capture and offline analysis, 3) standard three-pane packet browser, 4) +captured network data can be browsed via a GUI, or via the TTY-mode TShark +utility, 5) the most powerful display filters in the industry, 6) rich VoIP +analysis, 7) read/write many different capture file formats: tcpdump (libpcap), +Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network +General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®, +Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer, +Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime, +WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files +compressed with gzip can be decompressed on the fly, 9) live data can be read +from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame +Relay, FDDI, and others, 10) decryption support for many protocols, including +IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules +can be applied to the packet list for quick, intuitive analysis, 12) output can +be exported to XML, PostScript®, CSV, or plain text. - - Use the GNU net-dns/c-ares library to resolve DNS names - Install androiddump, an extcap interface to capture from Android devices - Install capinfos, to print information about capture files - Install captype, to print the file types of capture files - Install ciscodump, extcap interface to capture from a remote Cisco router - Use dev-libs/libgcrypt to decrypt traffic - Install dftest, to display filter byte-code, for debugging dfilter routines - Build documentation in pdf format (US and a4 paper sizes) - Install dumpcap, to dump network traffic from inside wireshark - Install editcap, to edit and/or translate the format of capture files - Use net-libs/libssh (for sshdump) - Use dev-libs/libxml2 for handling XML configuration in dissectors - Use app-arch/lz4 for compression/decompression - Install mergecap, to merge two or more capture files into one - Use dev-libs/libnl - Use net-libs/nghttp2 for HTTP/2 support - Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) - Install randpkt, a utility for creating pcap trace files full of random packets - Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt) - Install reordercap, to reorder input file by timestamp into output file - Use media-libs/sbc for playing back SBC encoded packets - Install sharkd, the daemon variant of wireshark - Use net-libs/libsmi to resolve numeric OIDs into human readable format - Use app-arch/snappy for snappy compression and decompression - Use media-libs/spandsp for for G.722 and G.726 codec support in the RTP Player - Install sshdump, an extcap interface to capture from a remote host through SSH - Install text2pcap, to generate a capture file from an ASCII hexdump of packets - Install tfshark, a terminal-based version of the FileShark capability - Install tshark, to dump and analyzer network traffic from the command line - Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file - + +Use net-dns/c-ares to resolve DNS names +Install androiddump, an extcap interface to capture from Android devices +Use media-plugins/mediastreamer-bcg729 to play G.729 codec +Install capinfos, to print information about capture files +Install captype, to print the file types of capture files +Install ciscodump, extcap interface to capture from a remote Cisco router +Use dev-libs/libgcrypt to decrypt traffic +Install dftest, to display filter byte-code, for debugging dfilter routines +Build documentation in pdf format (US and a4 paper sizes) +Install dumpcap, to dump network traffic from inside wireshark +Install editcap, to edit and/or translate the format of capture files +Use net-libs/libssh (for sshdump) +Use dev-libs/libxml2 for handling XML configuration in dissectors +Use app-arch/lz4 for compression/decompression +Install mergecap, to merge two or more capture files into one +Use dev-libs/libnl +Use net-libs/nghttp2 for HTTP/2 support +Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) +Install randpkt, a utility for creating pcap trace files full of random packets +Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt) +Install reordercap, to reorder input file by timestamp into output file +Use media-libs/sbc for playing back SBC encoded packets +Install sharkd, the daemon variant of wireshark +Use net-libs/libsmi to resolve numeric OIDs into human readable format +Use app-arch/snappy for snappy compression and decompression +Use media-libs/spandsp for for G.722 and G.726 codec support in the RTP Player +Install sshdump, an extcap interface to capture from a remote host through SSH +Install text2pcap, to generate a capture file from an ASCII hexdump of packets +Install tfshark, a terminal-based version of the FileShark capability +Install tshark, to dump and analyzer network traffic from the command line +Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file + diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild similarity index 82% copy from net-analyzer/wireshark/wireshark-99999999.ebuild copy to net-analyzer/wireshark/wireshark-2.5.0.ebuild index 9d9fca8d8a0..b3cf7e25694 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib qmake-utils user xdg-utils +inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" -EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" +SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="" +KEYWORDS="~amd64 ~hppa ~x86" IUSE=" - adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 - +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua - lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap - tfshark +tshark +udpdump zlib + adns androiddump bcg729 +capinfos +caps +captype ciscodump + cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk + kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio + +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy + spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib " REQUIRED_USE=" ciscodump? ( libssh ) @@ -30,6 +30,7 @@ CDEPEND=" dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) + bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( @@ -104,10 +105,6 @@ pkg_setup() { enewgroup wireshark } -src_unpack() { - git-r3_src_unpack -} - src_prepare() { default @@ -171,6 +168,7 @@ src_configure() { $(use_enable tshark) \ $(use_enable udpdump) \ $(use_with adns c-ares) \ + $(use_with bcg729) \ $(use_with caps libcap) \ $(use_with geoip) \ $(use_with gtk gtk 3) \ @@ -216,16 +214,11 @@ src_install() { default # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README.* \ - doc/{randpkt.txt,README*} + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - if use doc; then - docinto /usr/share/doc/${PF}/html - dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} - if use doc-pdf; then - docinto /usr/share/doc/${PF}/pdf/ - dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf - fi + if use doc-pdf; then + docinto /usr/share/doc/${PF}/pdf/ + dodoc docbook/{developer,user}-guide.pdf fi # install headers @@ -252,16 +245,14 @@ src_install() { doins wiretap/wtap.h if use gtk || use qt5; then - local c d - for c in hi lo; do - for d in 16 32 48; do - insinto /usr/share/icons/${c}color/${d}x${d}/apps - newins image/${c}${d}-app-wireshark.png wireshark.png - done + local s + for s in 16 32 48 64 128 256 512 1024; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins image/wsicon${s}.png wireshark.png done - for d in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes - newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png done fi diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 9d9fca8d8a0..bb1724389ab 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,11 +12,11 @@ LICENSE="GPL-2" SLOT="0/${PV}" KEYWORDS="" IUSE=" - adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 - +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua - lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap - tfshark +tshark +udpdump zlib + adns androiddump bcg729 +capinfos +caps +captype ciscodump + cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk + kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio + +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy + spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib " REQUIRED_USE=" ciscodump? ( libssh ) @@ -30,6 +30,7 @@ CDEPEND=" dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) + bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( @@ -171,6 +172,7 @@ src_configure() { $(use_enable tshark) \ $(use_enable udpdump) \ $(use_with adns c-ares) \ + $(use_with bcg729) \ $(use_with caps libcap) \ $(use_with geoip) \ $(use_with gtk gtk 3) \ @@ -216,16 +218,11 @@ src_install() { default # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README.* \ - doc/{randpkt.txt,README*} + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - if use doc; then - docinto /usr/share/doc/${PF}/html - dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} - if use doc-pdf; then - docinto /usr/share/doc/${PF}/pdf/ - dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf - fi + if use doc-pdf; then + docinto /usr/share/doc/${PF}/pdf/ + dodoc docbook/{developer,user}-guide.pdf fi # install headers @@ -252,16 +249,14 @@ src_install() { doins wiretap/wtap.h if use gtk || use qt5; then - local c d - for c in hi lo; do - for d in 16 32 48; do - insinto /usr/share/icons/${c}color/${d}x${d}/apps - newins image/${c}${d}-app-wireshark.png wireshark.png - done + local s + for s in 16 32 48 64 128 256 512 1024; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins image/wsicon${s}.png wireshark.png done - for d in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes - newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png done fi