parlay

yet another gentoo overlay
git clone https://git.parazyd.org/parlay
Log | Files | Refs | README

commit b1e920dee42d09823de6c2f1f5cb306c112ad6fd
parent 289fc880bfa715bef0501b9c880d60ee7acaacad
Author: parazyd <parazyd@dyne.org>
Date:   Tue,  7 Feb 2017 16:23:41 +0100

net-analyzer/wireshark: Remove.

Diffstat:
Dnet-analyzer/wireshark/Manifest | 1-
Dnet-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch | 20--------------------
Dnet-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch | 14--------------
Dnet-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch | 10----------
Dnet-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch | 10----------
Dnet-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch | 21---------------------
Dnet-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch | 20--------------------
Dnet-analyzer/wireshark/files/wireshark-99999999-androiddump.patch | 10----------
Dnet-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch | 62--------------------------------------------------------------
Dnet-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch | 20--------------------
Dnet-analyzer/wireshark/wireshark-2.2.4.ebuild | 275-------------------------------------------------------------------------------
11 files changed, 0 insertions(+), 463 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest @@ -1 +0,0 @@ -DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164 diff --git a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch @@ -1,20 +0,0 @@ ---- a/epan/Makefile.am -+++ b/epan/Makefile.am -@@ -137,6 +137,7 @@ - # Add the object files for missing routines, if any. - # - libwireshark_la_LIBADD = \ -+ ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \ - libwireshark_generated.la \ - libwireshark_asmopt.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ -@@ -144,8 +145,7 @@ - wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -- ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ -- ${top_builddir}/wsutil/libwsutil.la -lm -+ @GLIB_LIBS@ -lm - - libwireshark_la_DEPENDENCIES = \ - libwireshark_generated.la \ diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch @@ -1,14 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -61,9 +61,9 @@ - # "-R" here. - # - AC_DEFUN([AC_WIRESHARK_ADD_DASH_L], --[$1="$$1 -L$2" --case "$host_os" in -+[case "$host_os" in - solaris*) -+ $1="$$1 -L$2" - $1="$$1 -R$2" - ;; - esac diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch @@ -1,10 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2149,7 +2149,6 @@ - # -qt={version} argument, otherwise we look for particular - # tool versions using tool name suffixes. - # -- AC_PATH_PROG(QTCHOOSER, qtchooser) - if test ! -z "$QTCHOOSER"; then - # - # We found qtchooser; we assume that means that diff --git a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch @@ -1,10 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -549,6 +549,7 @@ - wiretap/libwiretap.la \ - wsutil/libwsutil.la \ - @GLIB_LIBS@ \ -+ @PCAP_LIBS@ \ - @SOCKET_LIBS@ - - androiddump_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch @@ -1,21 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -818,6 +818,7 @@ - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) - -+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ - WS_CFLAGS_saved="$WS_CFLAGS" - AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) - if test "x$can_add_to_cflags" = "xyes" -@@ -844,6 +845,10 @@ - ac_sse4_2_flag=-xarch=sse4_2 - fi - fi -+],[ -+AC_MSG_RESULT(no) -+]) -+ - WS_CFLAGS="$WS_CFLAGS_saved" - - if test "x$ac_sse4_2_flag" != x; then diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1101,6 +1101,7 @@ - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) - -+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ - WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS" - AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) - if test "x$can_add_to_cflags" = "xyes" -@@ -1132,6 +1133,9 @@ - ac_sse4_2_flag=-xarch=sse4_2 - fi - fi -+],[ -+AC_MSG_RESULT(no) -+]) - - # - # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again! diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch @@ -1,10 +0,0 @@ ---- a/extcap/Makefile.am -+++ b/extcap/Makefile.am -@@ -49,6 +49,7 @@ - androiddump_LDADD = \ - ../wiretap/libwiretap.la \ - ../wsutil/libwsutil.la \ -+ @PCAP_LIBS@ \ - @GLIB_LIBS@ - - if ENABLE_STATIC diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch @@ -1,62 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -242,7 +242,7 @@ - # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros - # like PKG_CHECK_MODULES. If the first call to such a macro is under an - # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see --# the comments in acolocal.m4 -+# the comments in aclocal.m4 - # - # We want version 0.7 or better. (XXX - explain why. Is that just - # because our Qt tests were originally based on AM_PATH_GTK, and *it* -@@ -1910,6 +1910,19 @@ - AC_SUBST(plugins_dir) - - # -+# Find out where to store wireshark.pc and what should be in it -+# -+ -+PKG_INSTALLDIR -+ -+AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix]) -+AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`]) -+PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir" -+AC_SUBST(PLUGIN_INSTALL_DIR) -+PROJECT_VERSION="$PACKAGE_VERSION" -+AC_SUBST(PROJECT_VERSION) -+ -+# - # If we have <dlfcn.h>, check whether we have dladdr. - # - if test "$ac_cv_header_dlfcn_h" = "yes" -@@ -3080,10 +3093,15 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - -+# -+# Configuration output -+# -+ - AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg -+ wireshark.pc - asn1/Makefile - _CUSTOM_ASN1_AC_OUTPUT_ - asn1/acp133/Makefile ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,6 +56,12 @@ - smi_modules ipmap.html pdml2html.xsl - - # -+# Install a pkgconfig file -+# -+ -+pkgconfig_DATA = wireshark.pc -+ -+# - # Install global profiles in the "profiles" subdirectory - # - profilesdir = $(pkgdatadir) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1101,6 +1101,7 @@ - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) - -+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ - WS_CFLAGS_saved="$WS_CFLAGS" - AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) - if test "x$can_add_to_cflags" = "xyes" -@@ -1128,6 +1129,9 @@ - fi - fi - WS_CFLAGS="$WS_CFLAGS_saved" -+],[ -+AC_MSG_RESULT(no) -+]) - - if test "x$ac_sse4_2_flag" != x; then - # diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild @@ -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." -}