diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /net-analyzer/wireshark | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r-- | net-analyzer/wireshark/Manifest | 16 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch | 27 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch | 10 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch | 19 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch | 10 | ||||
-rw-r--r-- | net-analyzer/wireshark/metadata.xml | 130 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.2.6.ebuild | 261 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.2.7.ebuild | 261 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.4.0.ebuild (renamed from net-analyzer/wireshark/wireshark-3.3.0.ebuild) | 25 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-99999999.ebuild | 18 |
10 files changed, 92 insertions, 685 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index a76b2933fe8c..dbde11b7181a 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,14 +1,6 @@ -AUX wireshark-2.4-androiddump.patch 1167 BLAKE2B dcbb99f89e25f83e28bf4d7e1379967ba98bac6b712d897e68329a85f2f19ec6ecbc0a87c59db39c619eba1e27227577b9efe2399add981a93ed589f5baade38 SHA512 b5553ff8f80309791741f7d7e82364ab754a905b062f3b477ee542ee59ce7bbe0a272c517188b0480769e170c73d2a37260222b7d517796f9b16a9b6dc0d17ef AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66 -AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362 -AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e -AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 -DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442 SHA512 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 -DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad SHA512 c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b -DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece SHA512 1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a -EBUILD wireshark-3.2.6.ebuild 7045 BLAKE2B 2a0720dae27a7107ee5d4befc453381bbe823f5ca5a79ead2064922ed124901f03060b631b56d28f08b8ff62dffd6b83fb829aed035d4a856d733e93c6c98647 SHA512 f06a5f4253320cfd44cfdd55fa03cba0222fab6310ae7fdfafb475c95e9c879e1c889370f5a67a757c73a3f71e68b67f4f1493044adfc6d810256b1ee5a9c2cc -EBUILD wireshark-3.2.7.ebuild 7049 BLAKE2B 27333a50c3ddc495611adc472e28b161378a41f544a571c256f99bbefda4e36ecd3a71ca75d848674b94ef820786e3c136b5ac279e5e42fa5e0fe7c65f6fcafc SHA512 19cc1d7536fd75a1ee67e4d035c22afe0e73e85ccc4b8658eba07b2a5166a08dfa933ef9dd4d287837264bdcb22ecfa4030a39322ed646ed983118836eed9296 -EBUILD wireshark-3.3.0.ebuild 6958 BLAKE2B 7cc52200981228568376a3ffdab962a7d610ead91dfa67237fcf313f5fe8a564acf8d578f82c9815dded47795ca1b43f082938896b04a3f6e41d95bfcd20bac3 SHA512 50af2109a63fb3672afa55906a9d7aa7dfe0c5a7cee6fc4b06b4e9d429af664949e258bd3478aeb46ad1f2decece5b9dfbd3487183d39a3d21c106ecbe4bc8ea -EBUILD wireshark-99999999.ebuild 6883 BLAKE2B 93a85e82b44a92298cde281cdcaa4e1ebfc26a832b922850fdce3438409cbf8a2e2b68ba3b3bf74c2975dce89a8948cc24571df551889f4b54fc81484a5fb127 SHA512 013ceac4f3c654df13a0b3bc2b03a99488b68bc0901ece57c6a2684c753577abcec1b82bc657cc9f4da13020e07b53fbe4748cf9fc9a9edb5566c929c3229e94 -MISC metadata.xml 5040 BLAKE2B f90a667752c84ec9f7098916a62d280caa2abde9c02eb751e9564ace0e4832f58a277d0a379fc549145488442463e7885d89c235ed707f09e167afe98fb0a380 SHA512 67a13228dcbecbeff78cabdf8de7f6b6dd0836321f5d17e09f65866d8258688dea033cdbccd8447c8f857637da55228c5c74ac9311543b74f574510aa0d6935c +DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649 +EBUILD wireshark-3.4.0.ebuild 6897 BLAKE2B 40060ac8da3fe5d0bb0a324f44c41816018b45f659caa329e1e391b69f055cedb9b02d8cb1f1201c9b5738d3e09688b8fae2a9c51f83432896007880964e8e9d SHA512 b0cb8dfa42527a9a6f69d36b23514d7f374d08c090fdee37f57fbf55ab39518df309160561da64a661a6f2e9ca6f3953f46d42a79b491f3c59c94ce8a25e109e +EBUILD wireshark-99999999.ebuild 6787 BLAKE2B 37a68da765e48fa4fd7105bb4c57ca7e88549a4044d92e45aa0c9fefff95f0e2efbc018edb9797cbd52074cd4b92d1eaea9963dfe2262eda2b2d712b99d4fde7 SHA512 49cb20297b5321cfb427783fec1d202c5ea236e772a3ebc5154e0919702f29867478d861d4f835005925979e45e7bfe250700a15bdc4489109df076265464624 +MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch deleted file mode 100644 index 2272ef891c27..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/extcap/androiddump.c -+++ b/extcap/androiddump.c -@@ -438,13 +438,13 @@ - pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO); - extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo); - if (!extcap_dumper.dumper.pcap) { -- g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap)); -+ g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap)); - pcap_close(pcap); - exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP); - } - extcap_dumper.encap = encap; - if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { -- g_warning("Write to %s failed: %s", g_strerror(errno)); -+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); - } - #else - wtap_dump_params params = WTAP_DUMP_PARAMS_INIT; -@@ -480,7 +480,7 @@ - - pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer); - if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { -- g_warning("Write to %s failed: %s", g_strerror(errno)); -+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); - } - #else - int err = 0; diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch deleted file mode 100644 index 40082c435010..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2314,6 +2314,7 @@ - - if(BUILD_tfshark) - set(tfshark_LIBS -+ m - ui - wiretap - epan diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch deleted file mode 100644 index 3d3a2a9c9323..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/extcap/CMakeLists.txt -+++ b/extcap/CMakeLists.txt -@@ -91,6 +91,8 @@ if(BUILD_androiddump) - if(HAVE_LIBPCAP) - set(androiddump_LIBS - ui -+ wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${WIN_WS2_32_LIBRARY} - $<$<BOOL:${PCAP_FOUND}>:pcap::pcap> -@@ -102,6 +104,7 @@ if(BUILD_androiddump) - set(androiddump_LIBS - ui - wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CMAKE_DL_LIBS} diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch deleted file mode 100644 index 8cff4bdd0752..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1058,7 +1058,6 @@ - Qt5LinguistTools - Qt5Multimedia - Qt5PrintSupport -- Qt5Svg - Qt5Widgets - ) - if(APPLE) diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 940a96ed59a5..715f6af2e195 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -1,65 +1,73 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription> -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. -</longdescription> -<use> -<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> -<flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> -<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> -<flag name="capinfos">Install capinfos, to print information about capture files</flag> -<flag name="captype">Install captype, to print the file types of capture files</flag> -<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> -<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> -<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> -<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> -<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> -<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> -<flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag> -<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> -<flag name="lto">Enable link time optimization</flag> -<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> -<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> -<flag name="minizip">Build with zip file compression support</flag> -<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> -<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> -<flag name="plugin-ifdemo">Install plugin interface demo</flag> -<flag name="plugins">Install plugins</flag> -<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> -<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> -<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> -<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> -<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag> -<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> -<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> -<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> -<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> -<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> -<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> -<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> -<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> -</use> + <maintainer type="person"> + <email>zlogene@gentoo.org</email> + <name>Mikle Kolyada</name> + </maintainer> + <maintainer type="person"> + <email>bman@gentoo.org</email> + <name>Aaron Bauman</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <longdescription> + 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. + </longdescription> + <use> + <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> + <flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> + <flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> + <flag name="capinfos">Install capinfos, to print information about capture files</flag> + <flag name="captype">Install captype, to print the file types of capture files</flag> + <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> + <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> + <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> + <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> + <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> + <flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> + <flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag> + <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> + <flag name="lto">Enable link time optimization</flag> + <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> + <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> + <flag name="minizip">Build with zip file compression support</flag> + <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> + <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> + <flag name="plugin-ifdemo">Install plugin interface demo</flag> + <flag name="plugins">Install plugins</flag> + <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> + <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> + <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> + <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> + <flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag> + <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> + <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> + <flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> + <flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> + <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> + <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> + <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> + <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> + </use> </pkgmetadata> diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild b/net-analyzer/wireshark/wireshark-3.2.6.ebuild deleted file mode 100644 index 275d063e26e3..000000000000 --- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - minizip? ( sys-libs/zlib[minizip] ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - dev-python/pytest - dev-python/pytest-xdist - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - plugin-ifdemo? ( plugins ) -" -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch - "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_BROTLI=$(usex brotli) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_MINIZIP=$(usex minizip) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) - cmake_src_test -} - -src_install() { - cmake_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - 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 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 - - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild b/net-analyzer/wireshark/wireshark-3.2.7.ebuild deleted file mode 100644 index 5b16741cb38c..000000000000 --- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - minizip? ( sys-libs/zlib[minizip] ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - dev-python/pytest - dev-python/pytest-xdist - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - plugin-ifdemo? ( plugins ) -" -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch - "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_BROTLI=$(usex brotli) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_MINIZIP=$(usex minizip) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) - cmake_src_test -} - -src_install() { - cmake_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - 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 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 - - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild b/net-analyzer/wireshark/wireshark-3.4.0.ebuild index d2607c117e43..21e823418e48 100644 --- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild +++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild @@ -2,8 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -11,17 +13,18 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86" IUSE=" androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt + +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd " S=${WORKDIR}/${P/_/} CDEPEND=" + acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 @@ -38,6 +41,7 @@ CDEPEND=" maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 @@ -94,10 +98,6 @@ PATCHES=( "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch ) -pkg_setup() { - enewgroup wireshark -} - src_configure() { local mycmakeargs @@ -148,7 +148,6 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_BROTLI=$(usex brotli) @@ -163,6 +162,7 @@ src_configure() { -DENABLE_MINIZIP=$(usex minizip) -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) @@ -239,17 +239,16 @@ pkg_postinst() { xdg_mimeinfo_database_update # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap + chgrp pcap "${EROOT}"/usr/bin/dumpcap if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ + fcaps -o 0 -g pcap -m 4710 -M 0710 \ cap_dac_read_search,cap_net_raw,cap_net_admin \ "${EROOT}"/usr/bin/dumpcap fi ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" + ewarn "add yourself to the pcap group. This security measure ensures" ewarn "that only trusted users are allowed to sniff your traffic." } diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 580fa7c54d0b..bb74c3376075 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -3,11 +3,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake +inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" -EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" +EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" LICENSE="GPL-2" SLOT="0/${PV}" @@ -19,9 +19,11 @@ IUSE=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd " +RESTRICT="!test? ( test )" S=${WORKDIR}/${P/_/} CDEPEND=" + acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 @@ -93,10 +95,6 @@ PATCHES=( "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch ) -pkg_setup() { - enewgroup wireshark -} - src_configure() { local mycmakeargs @@ -147,7 +145,6 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_BROTLI=$(usex brotli) @@ -238,17 +235,16 @@ pkg_postinst() { xdg_mimeinfo_database_update # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap + chgrp pcap "${EROOT}"/usr/bin/dumpcap if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ + fcaps -o 0 -g pcap -m 4710 -M 0710 \ cap_dac_read_search,cap_net_raw,cap_net_admin \ "${EROOT}"/usr/bin/dumpcap fi ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" + ewarn "add yourself to the pcap group. This security measure ensures" ewarn "that only trusted users are allowed to sniff your traffic." } |