aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2014-09-20 18:14:43 +0100
committerStuart Shelton <stuart@shelton.me>2014-09-20 18:14:43 +0100
commitcf2b6df7543ce52a9905238cdb230aae29b83b1c (patch)
tree424eb04d9fb40687d286d232745d85076f38a0ad
parentUpdate sys-devel/llvm-3.4.2, add sys-devel/llvm-3.5.0 with Darwin fixes (diff)
downloadsrcshelton-cf2b6df7543ce52a9905238cdb230aae29b83b1c.tar.gz
srcshelton-cf2b6df7543ce52a9905238cdb230aae29b83b1c.tar.bz2
srcshelton-cf2b6df7543ce52a9905238cdb230aae29b83b1c.zip
Remove net-analyzer/wireshark-1.12.1 - upstream ebuild is now fixed
-rw-r--r--net-analyzer/wireshark/Manifest4
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch20
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch29
-rw-r--r--net-analyzer/wireshark/wireshark-1.12.1.ebuild222
4 files changed, 0 insertions, 275 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index fcfc17fb..283fd1ed 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,8 +1,4 @@
AUX wireshark-1.10.1-pod.patch 305 SHA256 0153df4626adea8f04a37643a8beecfc37c1399584917f56373a57c8340c93ca SHA512 82f89ca736d2e68a66b38191b8c278dfebabf8281a848132ecb6f9b792b645037bad0ee8bd76cbc608095f23d95bbd65d7b952c0c20c1e5921814fd04dd3fe20 WHIRLPOOL 9dd645ed116e5c20dfbd0df7ebee85d3c1f6b76e0a9fa1bbc6d9b6300bd460e6d08fedd4169617ded91e35279a4b929aa784048b9b8abb59849bbd35bd2cea8f
-AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
-AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
DIST wireshark-1.10.1.tar.bz2 26815901 SHA256 06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc SHA512 ae80b4959bd224ce0458055fdb7e8bd5e2395da09b658e1b2a3136540cb2b7d283b10f636cd2f534dd20dc2fc65892e2be4acb65ffa6e259a0539a1f8ee74cbd WHIRLPOOL deb3e8fde197af1cc6991b886b789b02c99f967acb977da42309038f6cf4804e7a500f3727e8bd69a8af8e680510a81cbeb261fab9546219e452038e28c6a1b1
-DIST wireshark-1.12.1.tar.bz2 29059989 SHA256 82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b SHA512 840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929 WHIRLPOOL f98131bde6680370943cf6070cb44c6ad96d42060573e521051b81ad9d934b03741bb4d75a1d30762eebf5f22387f9eb7158acee4caee2503c4eafff52a12ada
EBUILD wireshark-1.10.1-r1.ebuild 5655 SHA256 d0f5b1ffda022a58e6f7fd82f9a845872774e8de48e3dcd1409262934bb7a0ac SHA512 3b36c4c15379cbb0173feac0995acc544c7f99a12670aba2861ec2ae6b6bb1b62b33d7f98b8c9b93f13273eaab9925a9fc4ab33c44ff824deac72cf70d373ef3 WHIRLPOOL b6b297037f7e84d0b381f6a2e622bd020dc5423bf8df75594d53f8a8a75686559e1e55e244d52d4a5ad5cb2862a23359cd0eb794c7f9b8f0f78ccefc49aa94fd
-EBUILD wireshark-1.12.1.ebuild 5424 SHA256 7bf18caa40c5d5ac9dcc802032b8350f18ca478d38fa855057e6e2d99d4afd08 SHA512 f1366710773abf5bb6d8365703824868f3d871e913b32dacfe01c66c8cee0b95828157546007d3e55293e9fd56f97c1b9c23098cae4533a02fd0e3bd405c4b9a WHIRLPOOL 24d131e9cc7c42843e8dd637ea9333b3848ca5f053abb7288c82a072e8e464dd711d45841754e24081acc8eae6760d76537a451391df81cdf8147c8c926eaf42
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
deleted file mode 100644
index 24b5c7dd..00000000
--- a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
+++ /dev/null
@@ -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.11.3-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
deleted file mode 100644
index 1e87ce6e..00000000
--- a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1491,26 +1491,6 @@
- wireshark_man=""
- fi
-
--if test "$have_gtk" = "yes" ; then
-- # If we have GTK then add flags for it.
--
-- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-- if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
-- ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
-- ## The deprecations in Gtk 3.10 will not be fixed ...
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
-- else
-- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
-- fi
-- CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
-- if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
-- # Enable GSEAL when building with GTK > 2.20
-- # (Versions prior to 2.22 lacked some necessary accessors.)
-- CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
-- fi
--fi
--
- # XXX - Is this really necessary? When we build with both Gtk+ and Qt it works...
- if test "$use_glib_cflags" = "true"; then
- # Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/wireshark-1.12.1.ebuild b/net-analyzer/wireshark/wireshark-1.12.1.ebuild
deleted file mode 100644
index 6c407ff0..00000000
--- a/net-analyzer/wireshark/wireshark-1.12.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild,v 1.4 2014/09/18 13:18:52 ago Exp $
-
-EAPI=5
-inherit autotools eutils fcaps 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 +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
- portaudio +qt4 selinux smi ssl zlib
-"
-REQUIRED_USE="
- ssl? ( crypt )
-"
-
-GTK_COMMON_DEPEND="
- x11-libs/gdk-pixbuf
- x11-libs/pango
- x11-misc/xdg-utils
-"
-RDEPEND="
- >=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
- x11-misc/xdg-utils
- )
- selinux? ( sec-policy/selinux-wireshark )
- smi? ( net-libs/libsmi )
- ssl? ( net-libs/gnutls )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-
-DEPEND="
- ${RDEPEND}
- doc? (
- app-doc/doxygen
- app-text/asciidoc
- dev-libs/libxml2
- dev-libs/libxslt
- doc-pdf? ( dev-java/fop )
- www-client/lynx
- )
- >=virtual/perl-Pod-Simple-3.170.0
- sys-devel/bison
- sys-devel/flex
- virtual/perl-Getopt-Long
- virtual/perl-Time-Local
- virtual/pkgconfig
-"
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
- "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
- "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch
-
- # Qt5 support is broken since the build system does not determine
- # properly which `moc' it ought to use
- sed -i -e 's|Qt5||g' acinclude.m4 || die
-
- 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 ; then
- myconf+=( "--enable-wireshark" )
- else
- myconf+=( "--disable-wireshark" )
- 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_enable ipv6) \
- $(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 netlink libnl 3) \
- $(use_with pcap dumpcap-group wireshark) \
- $(use_with pcap) \
- $(use_with portaudio) \
- $(use_with qt4 qt) \
- $(use_with smi libsmi) \
- $(use_with ssl gnutls) \
- $(use_with zlib) \
- --disable-profile-build \
- --disable-usr-local \
- --sysconfdir="${EPREFIX}"/etc/wireshark \
- --without-adns \
- ${myconf[@]}
-}
-
-src_compile() {
- default
- use doc && emake -j1 -C docbook
-}
-
-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,release-notes}-{a4,us}.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; 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
- fi
-
- if use gtk3; then
- domenu wireshark.desktop
- fi
-
- if use qt4; then
- sed -e '/Exec=/s|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 run wireshark as normal user you have to add yourself to"
- ewarn "the wireshark group. This security measure ensures that only trusted"
- ewarn "users are allowed to sniff your traffic."
-}