commit:     e8bb387b7f4d1631ceb8a20b7e89283beec4063a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 07:03:50 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 07:05:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bb387b

net-analyzer/wireshark: Version bump (bug #570564).

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 279 ++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c5bad4f..effdccf 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 
357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 
24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5
 WHIRLPOOL 
ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
 DIST wireshark-2.0.0.tar.bz2 30976957 SHA256 
90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd SHA512 
ba3b8b5fa7b441c0494e833da887566c70ec30c20a161bcb6a77ec1deff0503e00f9cf6cf7d892f2cbb189dcf21b548844abe8106dfd29c565868944c10aa7c0
 WHIRLPOOL 
82d6563fdc40680bb4b79af779e844cb76524305350f19c0ea85892ceaf9db4cf9383ac9f46e0033fcfc1782b02ba7ceb8307bfc84759f9e60be6f0b57fbaf15
+DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 
c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 
fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca
 WHIRLPOOL 
45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild 
b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
new file mode 100644
index 0000000..66c2681
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/";
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+       adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+       +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+       cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+       ssl? ( crypt )
+       ?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+GTK_COMMON_DEPEND="
+       x11-libs/gdk-pixbuf
+       x11-libs/pango
+       x11-misc/xdg-utils
+"
+CDEPEND="
+       >=dev-libs/glib-2.14:2
+       netlink? ( dev-libs/libnl:3 )
+       adns? ( >=net-dns/c-ares-1.5 )
+       crypt? ( dev-libs/libgcrypt:0 )
+       caps? ( sys-libs/libcap )
+       geoip? ( dev-libs/geoip )
+       gtk3? (
+               ${GTK_COMMON_DEPEND}
+               x11-libs/gtk+:3
+       )
+       kerberos? ( virtual/krb5 )
+       lua? ( >=dev-lang/lua-5.1:* )
+       pcap? ( net-libs/libpcap )
+       portaudio? ( media-libs/portaudio )
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4[accessibility]
+               x11-misc/xdg-utils
+               )
+       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 )
+       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
+       )
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+"
+RDEPEND="
+       ${CDEPEND}
+       gtk3? ( virtual/freedesktop-icon-theme )
+       qt4? ( virtual/freedesktop-icon-theme )
+       qt5? ( virtual/freedesktop-icon-theme )
+       selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+       enewgroup wireshark
+}
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+               "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+               "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
+               "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+               "${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+               "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch \
+
+       epatch_user
+
+       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 gtk3 || use qt4 || use qt5; then
+               myconf+=( "--enable-wireshark" )
+       else
+               myconf+=( "--disable-wireshark" )
+       fi
+
+       if ! use qt4 && ! use qt5; then
+               myconf+=( "--with-qt=no" )
+       fi
+
+       if use qt4; then
+               export QT_MIN_VERSION=4.6.0
+       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 ipv6) \
+               $(use_enable tfshark) \
+               $(use_with adns c-ares) \
+               $(use_with caps libcap) \
+               $(use_with crypt gcrypt) \
+               $(use_with geoip) \
+               $(use_with gtk3) \
+               $(use_with kerberos krb5) \
+               $(use_with lua) \
+               $(use_with pcap dumpcap-group wireshark) \
+               $(use_with pcap) \
+               $(use_with portaudio) \
+               $(usex qt4 --with-qt=4 '') \
+               $(usex qt5 --with-qt=5 '') \
+               $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+               $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+               $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+               $(use_with sbc) \
+               $(use_with smi libsmi) \
+               $(use_with ssl gnutls) \
+               $(use_with zlib) \
+               $(usex netlink --with-libnl=3 --without-libnl) \
+               $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+               --disable-profile-build \
+               --disable-usr-local \
+               --disable-warnings-as-errors \
+               --sysconfdir="${EPREFIX}"/etc/wireshark \
+               --without-adns \
+               ${myconf[@]}
+}
+
+src_compile() {
+       default
+       if use doc; then
+               use doc-pdf && addpredict "/root/.java"
+               emake -j1 -C docbook
+       fi
+}
+
+src_install() {
+       default
+
+       if use doc; then
+               dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+               if use doc-pdf; then
+                       insinto /usr/share/doc/${PF}/pdf/
+                       doins docbook/{developer,user}-guide-{a4,us}.pdf 
docbook/release-notes.pdf
+               fi
+       fi
+
+       # FAQ is not required as is installed from help/faq.txt
+       dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+               doc/{randpkt.txt,README*}
+
+       # install headers
+       local wsheader
+       for wsheader in \
+               color.h \
+               config.h \
+               epan/*.h \
+               epan/crypt/*.h \
+               epan/dfilter/*.h \
+               epan/dissectors/*.h \
+               epan/ftypes/*.h \
+               epan/wmem/*.h \
+               register.h \
+               wiretap/*.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 gtk3 || use qt4 || 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
+
+       if use gtk3; then
+               domenu wireshark.desktop
+       fi
+
+       if use qt4 || use qt5; then
+               sed \
+                       -e '/Exec=/s|wireshark|&-qt|g' \
+                       -e 's|^Name.*=Wireshark|& (Qt)|g' \
+                       wireshark.desktop > wireshark-qt.desktop \
+                       || die
+               domenu wireshark-qt.desktop
+       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