diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-27 22:40:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-27 22:40:05 +0100 |
commit | 8c364c784966be1700ea39ae45028f3e9be9cae0 (patch) | |
tree | c1971211069b79e3831b71accd52a67a9fdc77a3 /net-analyzer/wireshark | |
parent | 6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff) |
gentoo resync : 27.03.2018
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r-- | net-analyzer/wireshark/Manifest | 4 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-2.4.4.ebuild | 293 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-2.4.5.ebuild | 2 |
3 files changed, 2 insertions, 297 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 86eaeb7f23dc..6999d357a90a 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -5,14 +5,12 @@ AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfb AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da 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.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d -EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356 -EBUILD wireshark-2.4.5.ebuild 7396 BLAKE2B a38f625603f0e9145dea4624222a8b340405140810a004e0e6947e3238a8253f2fd114d6099571f6e50293e0adbb6555cbaeffc16617cbe0743e28fe717b08db SHA512 38b4a32b44028d1ac95be8ae8b18711c39de84506c5fb188f2352af7033c4a9511481d39eb47f30364ffb43448f41022b60219be4a1820c74eaf0a754dd78960 +EBUILD wireshark-2.4.5.ebuild 7395 BLAKE2B 73bb2c5d823770c0a175fef12f5307efc015f245037af5250b6d75531dafcf54b212214a7f56c44eeb3d5a97662a0cd854a0c5b2b38dc6a55dc78cab182a2be4 SHA512 9a6f7e143d38fa7703fd5f3e32be729f13fe10fc2185ce4482751b761c63f37e37714487f303386349d174febd6f1d0fbf4a5673424c8479b6dea8861148b23a EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea EBUILD wireshark-2.5.1.ebuild 6664 BLAKE2B a6385ce71f757f3ac7fa7a38b6cacff2b21cbb235af9aeba31088f1965bdad709a848a3f2365c8eb31dd648d5eafb981dd58017719222afda341632b1e9866ca SHA512 fb2d172976a00b24e1bb7507bc0f3f5707a57e515bcccfb6561749d6d0857530c3e7d705ddfb571bc07ef0d4541f9c5d8ec2b30ea966b3e73b165e16284c7af3 EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba diff --git a/net-analyzer/wireshark/wireshark-2.4.4.ebuild b/net-analyzer/wireshark/wireshark-2.4.4.ebuild deleted file mode 100644 index c566995b3bb3..000000000000 --- a/net-analyzer/wireshark/wireshark-2.4.4.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# 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 gnome2-utils 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="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -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 -" -REQUIRED_USE=" - ciscodump? ( libssh ) - sshdump? ( libssh ) -" - -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 ) - caps? ( sys-libs/libcap ) - geoip? ( dev-libs/geoip ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - libssh? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - 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 - || ( - media-libs/speexdsp - <media-libs/speex-1.2.0 - ) - 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 !=sys-libs/zlib-1.2.4 ) -" -# 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 - app-text/asciidoc - dev-libs/libxml2 - dev-libs/libxslt - doc-pdf? ( dev-java/fop ) - www-client/lynx - ) - 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.1.0-sse4_2-r1.patch - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-99999999-androiddump.patch - "${FILESDIR}"/${PN}-2.4.3-libsmi.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconf - - # 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." - myconf+=( "--with-ssl" ) - ;; - esac - fi - - # Enable wireshark binary with any supported GUI toolkit (bug #473188) - if use gtk || use qt5; then - myconf+=( "--enable-wireshark" ) - else - myconf+=( "--disable-wireshark" ) - fi - - if ! use qt5; then - myconf+=( "--with-qt=no" ) - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - # Hack around inability to disable doxygen/fop doc generation - use doc || export ac_cv_prog_HAVE_DOXYGEN=false - use doc-pdf || export ac_cv_prog_HAVE_FOP=false - - econf \ - $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ - $(use dumpcap && use_with pcap dumpcap-group wireshark) \ - $(use_enable androiddump) \ - $(use_enable capinfos) \ - $(use_enable captype) \ - $(use_enable ciscodump) \ - $(use_enable dftest) \ - $(use_enable dumpcap) \ - $(use_enable editcap) \ - $(use_enable mergecap) \ - $(use_enable randpkt) \ - $(use_enable randpktdump) \ - $(use_enable reordercap) \ - $(use_enable sharkd) \ - $(use_enable sshdump) \ - $(use_enable text2pcap) \ - $(use_enable tfshark) \ - $(use_enable tshark) \ - $(use_enable udpdump) \ - $(use_with adns c-ares) \ - $(use_with caps libcap) \ - $(use_with geoip) \ - $(use_with gtk gtk 3) \ - $(use_with kerberos krb5) \ - $(use_with libssh) \ - $(use_with libxml2) \ - $(use_with lua) \ - $(use_with lz4) \ - $(use_with nghttp2) \ - $(use_with pcap) \ - $(use_with portaudio) \ - $(use_with sbc) \ - $(use_with smi libsmi) \ - $(use_with snappy) \ - $(use_with spandsp) \ - $(use_with ssl gnutls) \ - $(use_with zlib) \ - $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ - $(usex netlink --with-libnl=3 --without-libnl) \ - $(usex qt5 --with-qt=5 '') \ - $(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 '') \ - --disable-profile-build \ - --disable-warnings-as-errors \ - --sysconfdir="${EPREFIX}"/etc/wireshark \ - ${myconf[@]} -} - -src_compile() { - default - - if use doc; then - emake -j1 -C docbook - if use doc-pdf; then - addpredict "/root/.java" - emake -C docbook all-pdf - fi - fi -} - -src_install() { - default - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ - doc/{randpkt.txt,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 - fi - - # install headers - local wsheader - for wsheader in \ - config.h \ - epan/*.h \ - epan/crypt/*.h \ - epan/dfilter/*.h \ - epan/dissectors/*.h \ - epan/ftypes/*.h \ - epan/wmem/*.h \ - register.h \ - wiretap/*.h \ - ws_diag_control.h \ - ws_symbol_export.h \ - wsutil/*.h - do - insinto /usr/include/wireshark/$( dirname ${wsheader} ) - doins ${wsheader} - 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 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 - 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 - 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 - - if 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-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild index 730f9e0a9b89..1cd58f62e002 100644 --- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild +++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86 ~x86-fbsd" IUSE=" adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua |