diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /net-analyzer/wireshark | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r-- | net-analyzer/wireshark/Manifest | 12 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch | 10 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch | 17 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch | 18 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch | 10 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-2.6.7.ebuild | 240 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.0.1.ebuild | 2 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.0.2.ebuild | 246 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-3.0.3.ebuild | 2 |
9 files changed, 4 insertions, 553 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 791854b89309..516d7a546e00 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,22 +1,14 @@ -AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66 -AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc -AUX wireshark-2.6.6-androiddump-wsutil.patch 324 BLAKE2B f72415948a15cdfa2eae24bd2af00c64ede367007c8ee969ae76a7d391a209f47d96431a61484ac9d780111f05e2262083601a9e3ca81453b6a5a1293979021e SHA512 2b26ac08ade3ba51c53fd17db7722fd7182330bf68ac3db851b19e246f8ac808cf7f5e6a85a58d91a2566a254c4e57b14b61188e56f75e3df0028a7ae0726125 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362 AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e -AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 -DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d -DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9 -EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5 -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.0.1.ebuild 6603 BLAKE2B e6a553eaadb1eb0098088bc18f2603359f6b3c5c3a411d4abdc879c21e2b927362d383cdab19072f333beba35da851368263ea9fb059eb9726ea5bf6f5a969ef SHA512 33362ce11dd19ce6c93c47325907dbbea2f504724ad94464217d98744b19dad1f3461319ba709edb21ad442d22fce6db4d8fae596d1e0714520b34598bdbfcb2 +EBUILD wireshark-3.0.3.ebuild 6578 BLAKE2B 3a333b229fdb0c26aeb66221d4f578ff0b83ab1d531e2fcb9e34c1d6bc3f3b64f760ec421bfd2a8a3be9c323c7182dda8eecc8ffceb90a8815066ad2ea83ecc9 SHA512 7c69e9e51897bbea7d460be38a8ba714e01cb4e0240fbcf5a568f0b76044499d007859b71cd088fde25109b8ca2d6d884ff5d53055bcb85b4ad50f034e0c70a9 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/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch deleted file mode 100644 index 47459515ee79..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2149,7 +2149,6 @@ - # -qt={version} argument, otherwise we look for particular - # tool versions using tool name suffixes. - # -- AC_PATH_PROG(QTCHOOSER, qtchooser) - if test ! -z "$QTCHOOSER"; then - # - # We found qtchooser; we assume that means that diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch deleted file mode 100644 index 445851090a69..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -939,14 +939,12 @@ - Qt5LinguistTools - Qt5Multimedia - Qt5PrintSupport -- Qt5Svg - Qt5Widgets - ) - set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) -- set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - if (APPLE) - set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch deleted file mode 100644 index 654c2c82db17..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2843,6 +2843,7 @@ - if(HAVE_LIBPCAP) - set(androiddump_LIBS - ui -+ wsutil - ${GLIB2_LIBRARIES} - ${PCAP_LIBRARIES} - ) -@@ -2853,6 +2854,7 @@ - set(androiddump_LIBS - ui - wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CMAKE_DL_LIBS} diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch deleted file mode 100644 index db1c560848ec..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/extcap/Makefile.am -+++ b/extcap/Makefile.am -@@ -32,6 +32,7 @@ - ../ui/libui.a \ - ../wiretap/libwiretap.la \ - ../wsutil/libwsutil.la \ -+ @PCAP_LIBS@ \ - @GLIB_LIBS@ - - randpktdump_SOURCES = \ diff --git a/net-analyzer/wireshark/wireshark-2.6.7.ebuild b/net-analyzer/wireshark/wireshark-2.6.7.ebuild deleted file mode 100644 index d947b47f07b1..000000000000 --- a/net-analyzer/wireshark/wireshark-2.6.7.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ppc64 x86" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc - +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux - +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump - zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.14:2 - dev-libs/libgcrypt:0 - netlink? ( dev-libs/libnl:3 ) - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - filecaps? ( sys-libs/libcap ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - sshdump? ( >=net-libs/libssh-0.6 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - nghttp2? ( net-libs/nghttp2 ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - 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 ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !<virtual/perl-Pod-Simple-3.170 - !<perl-core/Pod-Simple-3.170 - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -RDEPEND=" - ${CDEPEND} - gtk? ( virtual/freedesktop-icon-theme ) - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch - "${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-androiddump.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 - - 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_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_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) - -DBUILD_wireshark_gtk=$(usex gtk) - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_CAP=no - -DENABLE_CARES=$(usex adns) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex nghttp2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PORTAUDIO=$(usex portaudio) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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 gtk || 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 - - prune_libtool_files -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_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() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.0.1.ebuild b/net-analyzer/wireshark/wireshark-3.0.1.ebuild index b51c9dc2b5ae..32c6c317528f 100644 --- a/net-analyzer/wireshark/wireshark-3.0.1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86" +KEYWORDS="arm" IUSE=" adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink diff --git a/net-analyzer/wireshark/wireshark-3.0.2.ebuild b/net-analyzer/wireshark/wireshark-3.0.2.ebuild deleted file mode 100644 index 124702089cb3..000000000000 --- a/net-analyzer/wireshark/wireshark-3.0.2.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) -inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd - smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark - +udpdump zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/libgcrypt:0 - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - netlink? ( dev-libs/libnl:3 ) - nghttp2? ( net-libs/nghttp2 ) - 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 ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} - !<perl-core/Pod-Simple-3.170 - !<virtual/perl-Pod-Simple-3.170 - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" -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 'python3*' - - 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="/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_CARES=$(usex adns) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex nghttp2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake-utils_src_configure -} - -src_test() { - emake -C "${BUILD_DIR}" test-programs - emake -C "${BUILD_DIR}" test -} - -src_install() { - cmake-utils_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 - - prune_libtool_files -} - -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.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild index f7585e7fc2ff..6898a01da4d2 100644 --- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild +++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}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=" adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |