commit:     a96ce7ec5c6115823fb6b2ad7944a920ebf16a52
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 08:44:25 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 08:45:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96ce7ec

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest                    |   1 +
 .../files/wireshark-2.4-androiddump.patch          |  27 +++
 net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild  | 267 +++++++++++++++++++++
 3 files changed, 295 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 10ee44a2506..f71bdada53c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 
75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 
c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e
 WHIRLPOOL 
2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 
689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 
417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 WHIRLPOOL 
0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 
902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 
0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888
 WHIRLPOOL 
988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6
+DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 
cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 
2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d
 WHIRLPOOL 
c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch 
b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
new file mode 100644
index 00000000000..e67ab21b6a8
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -0,0 +1,27 @@
+--- a/extcap/androiddump.c
++++ b/extcap/androiddump.c
+@@ -363,13 +363,13 @@
+     pcap = pcap_open_dead_with_tstamp_precision(encap_ext, 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
+     int err = 0;
+@@ -416,7 +416,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/wireshark-2.4.0_rc2.ebuild 
b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
new file mode 100644
index 00000000000..69dc87248c6
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+       adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf
+       geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux
+       smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl 
tfshark
+       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:* )
+       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/speex
+               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
+)
+
+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
+
+       # dumpcap requires libcap
+       # --disable-profile-build bugs #215806, #292991, #479602
+       econf \
+               $(use androiddump && use pcap && echo 
--enable-androiddump-use-libpcap=yes) \
+               $(use_enable androiddump) \
+               $(use_enable ciscodump) \
+               $(use_enable randpkt) \
+               $(use_enable randpktdump) \
+               $(use_enable sshdump) \
+               $(use_enable tfshark) \
+               $(use_with adns c-ares) \
+               $(use_with caps libcap) \
+               $(use_with geoip) \
+               $(use_with gtk gtk 3) \
+               $(use_with kerberos krb5) \
+               $(use_with libssh ssh) \
+               $(use_with libxml2) \
+               $(use_with lua) \
+               $(use_with nghttp2) \
+               $(use_with pcap dumpcap-group wireshark) \
+               $(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() {
+       # 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."
+}

Reply via email to