From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 803CB13888F for ; Thu, 15 Oct 2015 10:02:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D58DE0810; Thu, 15 Oct 2015 10:02:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2B2721C00D for ; Thu, 15 Oct 2015 10:02:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B671340A99 for ; Thu, 15 Oct 2015 10:02:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07B4A10B1 for ; Thu, 15 Oct 2015 10:01:58 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1444903306.e75103aae62cab076e708faebb27f6c5cef4200b.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch net-analyzer/wireshark/wireshark-1.99.9.ebuild X-VCS-Directories: net-analyzer/wireshark/files/ net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: e75103aae62cab076e708faebb27f6c5cef4200b X-VCS-Branch: master Date: Thu, 15 Oct 2015 10:01:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9eeb1b46-2757-464c-9a95-23100def3b95 X-Archives-Hash: cd95e794798c81424290905b4ddb61cc commit: e75103aae62cab076e708faebb27f6c5cef4200b Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 15 09:05:35 2015 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 15 10:01:46 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75103aa net-analyzer/wireshark: Old. Package-Manager: portage-2.2.23 net-analyzer/wireshark/Manifest | 1 - .../files/wireshark-1.99.6-gcc_option.patch | 40 ---- net-analyzer/wireshark/wireshark-1.99.9.ebuild | 264 --------------------- 3 files changed, 305 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index bdbbfbc..9754278 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,4 +1,3 @@ DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9 -DIST wireshark-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c DIST wireshark-2.0.0rc1.tar.bz2 30779877 SHA256 a201938913f770cb1f022165574d312b66b97efaa6ad7a9c90daf325f7806582 SHA512 95b1995a1d6684ab8a0a93c86cd1101c9df6ee1f6d0c76d663ec32396d3ad10d4765b598c19a068bd95994ac6568060c64461a3de58d1d582ebec8f953e868f9 WHIRLPOOL a64cd0be0a145e461c9c2e4b7e495f30a72521ef0069809b1bf5da048c2e75e08516eef49eff838e328fb8aad91c41c5814f3986af1641270ae6495d3b9647a6 diff --git a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch deleted file mode 100644 index e7124ad..0000000 --- a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1735,15 +1735,15 @@ - CXXFLAGS_saved="$CXXFLAGS" - if expr "x$GCC_OPTION" : "x-W.*" >/dev/null - then -- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error" - elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null - then -- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" - elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null - then -- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" - else -- CXXFLAGS="$CXXFLAGS $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS" - fi - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE( -@@ -1773,7 +1773,7 @@ - # added them, by setting CXXFLAGS to the saved value plus - # just the new option. - # -- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" - ], - [ - AC_MSG_RESULT(yes) -@@ -1785,7 +1785,7 @@ - # added them, by setting CXXFLAGS to the saved value plus - # just the new option. - # -- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" -+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" - fi - ], - [ diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild deleted file mode 100644 index 348d4e4..0000000 --- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# 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="" -IUSE=" - adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap - portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib -" -REQUIRED_USE=" - ssl? ( crypt ) - ?? ( qt4 qt5 ) -" - -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/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 - ! 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." -}