From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- net-analyzer/wireshark/Manifest | 6 +++--- net-analyzer/wireshark/metadata.xml | 1 + net-analyzer/wireshark/wireshark-3.1.0.ebuild | 13 +++++++------ net-analyzer/wireshark/wireshark-99999999.ebuild | 13 +++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) (limited to 'net-analyzer/wireshark') diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 9551926f8d72..791854b89309 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -17,6 +17,6 @@ EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e4 EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147 EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9 EBUILD wireshark-3.0.3.ebuild 6582 BLAKE2B 903e0d9984291cf6a19d02b037ebaf81dbada4e64665800bd8411291bcb4835d4d89f167c5e4626bb7c103376c51d6504759df17c82983f9dcf61fee08c13b57 SHA512 7f6b2b4333b81835f719ce22684e0a5c0a213399b16aa41575544957376ce258de5784abf088c78347fd5bdc1e95a9482bbfe2a9a64f51fc276ab0388478b5c5 -EBUILD wireshark-3.1.0.ebuild 6736 BLAKE2B f06505598eaafeb3299579665ebc28a3e01c14b595c39b62aea0b48e5d00c9dd01a6f54a1b420cedabaf560cddc7a19009717c8a4cc759a0eaa55eb2f16e5752 SHA512 7b442698ccda0e6c932012aaec2530c7b3c835b8568575c6e2c6459cc93094f50c85c7a40e11bca3786ca354b667fad593451feb4ce0cfc52423ac2cef1b093e -EBUILD wireshark-99999999.ebuild 6741 BLAKE2B 32a56fe750a8f75cb8dd242570171c63ab6b06f209ba01109aed7cca903f47ed6b4b77be567a58ee7720f410e83432b16042601c5ba1f6bb4b941f5bf0e469cd SHA512 b42a66200147a7ea82f038fa1766b2cee29575f4df5a02eb62d908e9d347a7fc494eb5fe8099d1464863d5ed48d778e7c59c88e4a51b4e88673b45d9a699e272 -MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd +EBUILD wireshark-3.1.0.ebuild 6786 BLAKE2B 7b05213d7d7ba5b672a5f220ddf59933d32cc0a3a721794748309e7db4084ab850f7f8b7cb41ef7ae766d5aaaf15e39e29383490084c97a3f592eee8e0d06582 SHA512 df91871153094a2a3c0ab7346c6f88ae96ec1ca094585bbc7caf1640a1569f637a4b83faa27aad13a8f36eaa13563bb64c6176bdd93d4e83510e5cbd931a46a4 +EBUILD wireshark-99999999.ebuild 6791 BLAKE2B 30a9e0c25a67f859feabdee9edf89b4ce04399dd0e5ab32b49555bed905d133fa6cd6c6c987d8a687a49a1f153740dc8917369ce34c0c6a0febdcaeb8348032c SHA512 ba9ee5fb66214cac558e2b4aed29760535c095b5df46ec24b02a344d414613c41b09322c8ad644ca78f27090b8d2d0e4abfb0405909c88709a2d471a624d427d +MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69 diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 4a20e26519da..17945000941a 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -42,6 +42,7 @@ be exported to XML, PostScript®, CSV, or plain text. Use app-arch/lz4 for compression/decompression Use dev-libs/libmaxminddb for IP address geolocation Install mergecap, to merge two or more capture files into one +Build with zip file compression support Use dev-libs/libnl Use net-libs/nghttp2 for HTTP/2 support Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild index bd412c65b24c..cb28f93ddffa 100644 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils +inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -15,9 +15,9 @@ KEYWORDS="" IUSE=" adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap - +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - +text2pcap tfshark +tshark +udpdump zlib + +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt + +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl + sdjournal +text2pcap tfshark +tshark +udpdump zlib " S=${WORKDIR}/${P/_/} @@ -34,6 +34,7 @@ CDEPEND=" lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) + minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) @@ -81,7 +82,6 @@ RDEPEND=" selinux? ( sec-policy/selinux-wireshark ) " REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} plugin_ifdemo? ( plugins ) " PATCHES=( @@ -118,7 +118,7 @@ src_configure() { append-cxxflags -fPIC -DPIC fi - python_setup 'python3*' + python_setup mycmakeargs+=( $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) @@ -158,6 +158,7 @@ src_configure() { -DENABLE_LIBXML2=$(usex libxml2) -DENABLE_LUA=$(usex lua) -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex nghttp2) -DENABLE_PCAP=$(usex pcap) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index c964508b1b07..a4453c74df19 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils cmake-utils +inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -15,9 +15,9 @@ KEYWORDS="" IUSE=" adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap - +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - +text2pcap tfshark +tshark +udpdump zlib + +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt + +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl + sdjournal +text2pcap tfshark +tshark +udpdump zlib " S=${WORKDIR}/${P/_/} @@ -34,6 +34,7 @@ CDEPEND=" lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) + minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) @@ -81,7 +82,6 @@ RDEPEND=" selinux? ( sec-policy/selinux-wireshark ) " REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} plugin_ifdemo? ( plugins ) " PATCHES=( @@ -118,7 +118,7 @@ src_configure() { append-cxxflags -fPIC -DPIC fi - python_setup 'python3*' + python_setup mycmakeargs+=( $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) @@ -158,6 +158,7 @@ src_configure() { -DENABLE_LIBXML2=$(usex libxml2) -DENABLE_LUA=$(usex lua) -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex nghttp2) -DENABLE_PCAP=$(usex pcap) -- cgit v1.2.3