commit: c8b7cd9bd54644735ae2b7bd1553c8a0e3188365 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Apr 11 05:54:46 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Apr 11 05:56:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b7cd9b
net-analyzer/wireshark: Old. Package-Manager: Portage-2.3.28, Repoman-2.3.9 net-analyzer/wireshark/Manifest | 2 - net-analyzer/wireshark/metadata.xml | 1 - net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild | 262 -------------------- net-analyzer/wireshark/wireshark-2.4.3-r1.ebuild | 293 ----------------------- 4 files changed, 558 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index cbe510385a8..3df54a763b2 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,5 +1,3 @@ -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.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 1b60471afb8..d7857925114 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -33,7 +33,6 @@ be exported to XML, PostScript®, CSV, or plain text. <flag name="capinfos">Install capinfos, to print information about capture files</flag> <flag name="captype">Install captype, to print the file types of capture files</flag> <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> -<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag> <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag> <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> diff --git a/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild deleted file mode 100644 index 06faecde42e..00000000000 --- a/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild +++ /dev/null @@ -1,262 +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 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.bz2" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha" -IUSE=" - adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf - geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi - libssh randpkt randpktdump sshdump ssl tfshark zlib -" -REQUIRED_USE=" - 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/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - libssh? ( >=net-libs/libssh-0.6 ) - lua? ( >=dev-lang/lua-5.1:* ) - 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 ) - 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}-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 crypt gcrypt) \ - $(use_with geoip) \ - $(use_with gtk gtk 3) \ - $(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 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." -} diff --git a/net-analyzer/wireshark/wireshark-2.4.3-r1.ebuild b/net-analyzer/wireshark/wireshark-2.4.3-r1.ebuild deleted file mode 100644 index e63e4d8f74f..00000000000 --- a/net-analyzer/wireshark/wireshark-2.4.3-r1.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 -}
