tnet-analyzer/wireshark: Update to 2.2.2 - parlay - yet another gentoo overlay
HTML git clone https://git.parazyd.org/parlay
DIR Log
DIR Files
DIR Refs
DIR README
---
DIR commit 757659f07d59ce7290ef82946ad932833c66eda3
DIR parent 227120280cf9db01ab0cd37a977ccf0476007bac
HTML Author: parazyd <parazyd@dyne.org>
Date: Thu, 17 Nov 2016 14:38:42 +0100
net-analyzer/wireshark: Update to 2.2.2
Diffstat:
M net-analyzer/wireshark/Manifest | 2 +-
D net-analyzer/wireshark/wireshark-2… | 275 -------------------------------
A net-analyzer/wireshark/wireshark-2… | 275 +++++++++++++++++++++++++++++++
3 files changed, 276 insertions(+), 276 deletions(-)
---
DIR diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
t@@ -1 +1 @@
-DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994
+DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
DIR diff --git a/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
t@@ -1,275 +0,0 @@
-# Copyright 1999-2016 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 ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
- geoip +gtk +gtk2 gtk3 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
- libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
- ?? ( qt4 qt5 )
- ciscodump? ( libssh )
- sshdump? ( libssh )
- ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
- gtk? (
- x11-libs/gdk-pixbuf
- x11-libs/pango
- x11-misc/xdg-utils
- )
- gtk3? ( x11-libs/gtk+:3 )
- gtk2? ( x11-libs/gtk+:2 )
- kerberos? ( virtual/krb5 )
- libssh? ( >=net-libs/libssh-0.6 )
- 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
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( 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.99.8-qtchooser.patch \
- "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
- "${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || 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 ciscodump) \
- $(use_enable randpkt) \
- $(use_enable randpktdump) \
- $(use_enable sshdump) \
- $(use_enable tfshark) \
- $(use_with adns c-ares) \
- $(use_with caps libcap) \
- $(use_with crypt gcrypt) \
- $(use_with geoip) \
- $(use_with gtk3 gtk 3) \
- $(use_with gtk2 gtk 2) \
- $(use_with kerberos krb5) \
- $(use_with libssh ssh) \
- $(use_with lua) \
- $(use_with pcap dumpcap-group wireshark) \
- $(use_with pcap) \
- $(use_with portaudio) \
- $(use_with sbc) \
- $(use_with smi libsmi) \
- $(use_with ssl gnutls) \
- $(use_with zlib) \
- $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
- $(usex netlink --with-libnl=3 --without-libnl) \
- $(usex qt4 --with-qt=4 '') \
- $(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
- $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
- $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
- $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
- $(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
-
- 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 \
- 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 gtk || 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
-
- 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."
-}
DIR diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
t@@ -0,0 +1,275 @@
+# Copyright 1999-2016 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 ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+ geoip +gtk +gtk2 gtk3 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+ libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+ ?? ( qt4 qt5 )
+ ciscodump? ( libssh )
+ sshdump? ( libssh )
+ ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+ x11-misc/xdg-utils
+ )
+ gtk3? ( x11-libs/gtk+:3 )
+ gtk2? ( x11-libs/gtk+:2 )
+ kerberos? ( virtual/krb5 )
+ libssh? ( >=net-libs/libssh-0.6 )
+ 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
+ )
+ qt5? (
+ dev-qt/linguist-tools:5
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ gtk? ( 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.99.8-qtchooser.patch \
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+ "${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || 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 ciscodump) \
+ $(use_enable randpkt) \
+ $(use_enable randpktdump) \
+ $(use_enable sshdump) \
+ $(use_enable tfshark) \
+ $(use_with adns c-ares) \
+ $(use_with caps libcap) \
+ $(use_with crypt gcrypt) \
+ $(use_with geoip) \
+ $(use_with gtk3 gtk 3) \
+ $(use_with gtk2 gtk 2) \
+ $(use_with kerberos krb5) \
+ $(use_with libssh ssh) \
+ $(use_with lua) \
+ $(use_with pcap dumpcap-group wireshark) \
+ $(use_with pcap) \
+ $(use_with portaudio) \
+ $(use_with sbc) \
+ $(use_with smi libsmi) \
+ $(use_with ssl gnutls) \
+ $(use_with zlib) \
+ $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+ $(usex netlink --with-libnl=3 --without-libnl) \
+ $(usex qt4 --with-qt=4 '') \
+ $(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+ $(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
+
+ 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 \
+ 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 gtk || 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
+
+ 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."
+}