From: Jeroen Roovers Date: Wed, 17 Dec 2014 15:19:05 +0000 (+0000) Subject: Same. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb3d094b2f91d86131c94199b997c08fcba0a457;p=gentoo.git Same. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index cb347fbcfa04..1541a783c434 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.679 2014/12/17 15:05:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.680 2014/12/17 15:19:03 jer Exp $ + +*wireshark-1.12.2-r1 (17 Dec 2014) + + 17 Dec 2014; Jeroen Roovers +wireshark-1.12.2-r1.ebuild, + wireshark-99999999.ebuild: + Same. 17 Dec 2014; Jeroen Roovers wireshark-1.99.1.ebuild, +files/wireshark-1.99.1-sbc.patch, metadata.xml: diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 392bf1d011cd..3c5e148b882d 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -10,15 +10,16 @@ AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517 DIST wireshark-1.12.2.tar.bz2 29138867 SHA256 30ae16b408a592642ce3a84dd9877d24df7a6dae8da4847486965190039df292 SHA512 b46f50bc6f748df37c6e35b542b5e813b805d04605a3f8b8f7baf61095597ff6f7eacc25c1f15f1e115c75866489c30c2c3bd9b0be10fdf03fcaa3e9e62cec94 WHIRLPOOL 4b208e81c1680fbe9c4dcdb566b5f80f271cf96e14b1eac66ba95fd48578f34d954e13d12b748f4b8530ca03894fe588b36f944e4f07f17b57d5c4908bdd81a7 DIST wireshark-1.99.1.tar.bz2 29981374 SHA256 59d9fdff72a64626c0bb68bcfb0002d1441a9d6cfe8ec0ec72d23c1d862a4b3f SHA512 055ba559da47441346bbfeb5192884701c8731ab33868b94f432fac02e3d2181f86b3e810d6ec9710297e3a75368a507472157389150cf9c3f79d21e283793d7 WHIRLPOOL 697a2e318f02ad7214e2fe1f8684f70bf2f7cd91fbc715d16f36a72fc9d8275e96da22de6c66ba16c7c9f509eb91fa48017593d929b6f0e1458ca78bb01423eb +EBUILD wireshark-1.12.2-r1.ebuild 6064 SHA256 736b5a536e89a69181b386b249bfd3bf6567e40d61e5104a32471ce1b0d9cc70 SHA512 b9a965676d1e6c53be5f657fd771d55870e8b82d9826dd296db7fe45c1570dddc1e9db99680290a26a5e21ff04f68633168c09884e01b5e54efe3f2a4a5df533 WHIRLPOOL 1476eb530e7fd5c04b66740da87869c480e5a7e76e78a7410dbd1a9edcae3e09b1e7dede26261261204a6ef55399fb8f92548b7bc059364ce5df55c5072f17cf EBUILD wireshark-1.12.2.ebuild 5978 SHA256 aecd0a2d39acd3c8cb1272569f4f030dfbc6a520e80c66ccf818d1a2f2505e98 SHA512 c5d8be585e7fe67f3b6e88fef340d589d96ac70fa1686237ea593d2f61397b4360f0366271279be45bffb8c88ce100ca1e17f65aa1edc3231b6a31a7b88d0808 WHIRLPOOL e471778ccd0e54e2c39152966e28fb5d22940f79db9ac4cbfefbc802f83c7c4df18ecc1f13a6eeb10aa6305bef4076d33e3afc79c61824d54f09a3740c5623e3 EBUILD wireshark-1.99.1.ebuild 6158 SHA256 0799adc63f9d48c78d6d9c8e338d8506c55f545b16adfc9c907954de1266f0e2 SHA512 373af181e2dfe73d1f93f50e9fea79fced02c0b5437e7a9f19b5ff32ca3ff4a2ec43b37dbdb0fbfd5c08a4565969eb24597d0f977b0b82547f8e9d2905dc5d1c WHIRLPOOL 17a5dd750a7c17af09a9a8e899d09fcc02788a9350545bad0c274b50f171f417092c96fb629b1f301b113b11009388025b0444532a270052bff8823889d24833 -EBUILD wireshark-99999999.ebuild 6114 SHA256 5aad3e002e08c37e4c4555474ca8d827ff08e749edf153f245750b73741354c3 SHA512 31f918b0c4b4839e09088204724d8359d3bc62cd86eb1f7c93a38cde0b6467d129f301e05c7edc50cf462a839fa37c573c8efe29a91116af05fce18922c0df52 WHIRLPOOL c73b5725c3656fb3b2bd0f0291830a1680797a2fca76c909f8ac3679dbea688260c8d8d97eabeb9568c30060fb91b1fe9f636462f6b8fde373f84a32dc833d26 -MISC ChangeLog 99225 SHA256 2d5fa6dcc322ee3f1cef5e944fa49ae7a91ee79f9553eadc30cc53254e03b77d SHA512 f6bdd304e454def3da29c65a5823476c0c8ad7dabe69370031cbf9a39b3ccd3ffafff1f7dc649b18585a68384da5d4bd4be507e01ba72e44c076daabf0935949 WHIRLPOOL 8abc6f841fddad4ebf5a9d4dbfdd5a25870b2c2aacc4640ee42614f32241482f8eca9b71288d13c0fb74e082d3c0a1e098daf0931de7de7ebef7192400e37193 +EBUILD wireshark-99999999.ebuild 6204 SHA256 0ad1c2fc8a0a8f1ad3b065a550bcc53a7711a9a1e4b0e38d8e123194626e9b51 SHA512 d5a0b356ac2eb43847bc6c2a45dce1b698d95a237e36800ff38012d518c19045de58cb44dd36acb859999910ea2c23cb9b18e42aef9eb0fc92255e626c6cd02a WHIRLPOOL 996d6b87796f41d32795cbd6b41648a972ea6ae0223d65c44cf112586cf0163f4b25de0b90dabe3502fb71d9cba3788c36753921108b5c64dfc2b6a0fdb859cf +MISC ChangeLog 99375 SHA256 a64fd0f59ed66f193ea3602ca2b6a5cceabb6da5bbaeb2da7e048f35680c009f SHA512 280ec96b4e70e4dbd8157adcf3cf90b01b504a6d5bacfc065b3ef1e92836e13b8c2b04822781ce1e9eb9bd626b8b596ec4750d74ef64d089bf2de2bf024c3222 WHIRLPOOL e21317049c3d957d052d21e00341e548ca02eeb3536c8167e4dd8d91046096749fe67d9ec27adb958dfb55bdc2485b66f69109d6e3ede62bd97f9bb226b9dd8f MISC metadata.xml 2551 SHA256 043959725e25c500c4f38597224b0fa0da62c4a2db3e34dd1a3947f199829cab SHA512 532d03e6258a65b5462b884b6cdb7cdb230914aa595258c05c2be6fd6a01c9ac859e87ed39542a3106764e9c66c166e400df86bbde453b225c577d514a67e676 WHIRLPOOL e7132f0ba9d29b227e0fa76315951d826a31b78cff3d01a488018e1a826820abe1a67cbdb561e6b5b1da469384e6923172032f9da21a03bbcee64b758915a2ac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSRm64ACgkQVWmRsqeSphM3SgCaAxSXb+fA9Z6zp/Wq+CSbMKXU -8l4Aniqx6wYAV403R1X+SymOeEtY4ij4 -=2qfG +iEYEAREIAAYFAlSRnukACgkQVWmRsqeSphP4ZwCeI5M9SwC/sw0UtkbJHmGIBW63 +iogAn3gu7n2mYUe0u/MVxdmJMwEiWACm +=tlAd -----END PGP SIGNATURE----- diff --git a/net-analyzer/wireshark/wireshark-1.12.2-r1.ebuild b/net-analyzer/wireshark/wireshark-1.12.2-r1.ebuild new file mode 100644 index 000000000000..0d4a1487ddfc --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.12.2-r1.ebuild @@ -0,0 +1,245 @@ +# 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.2-r1.ebuild,v 1.1 2014/12/17 15:19:03 jer Exp $ + +EAPI=5 +inherit autotools eutils fcaps multilib 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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE=" + adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap + portaudio +qt4 qt5 sbc selinux smi ssl zlib +" +REQUIRED_USE=" + ssl? ( crypt ) + ?? ( qt4 qt5 ) +" + +GTK_COMMON_DEPEND=" + x11-libs/gdk-pixbuf + x11-libs/pango + x11-misc/xdg-utils + virtual/freedesktop-icon-theme +" +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[accessibility] + 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." +} diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 63950af97bad..81fdea66cbad 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -1,6 +1,6 @@ # 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-99999999.ebuild,v 1.4 2014/11/13 01:09:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.5 2014/12/17 15:19:03 jer Exp $ EAPI=5 inherit autotools eutils fcaps git-r3 multilib qt4-r2 user @@ -14,7 +14,7 @@ SLOT="0/${PV}" KEYWORDS="" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap - portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib + portaudio +qt4 qt5 sbc selinux smi sse4_2 ssl zlib " REQUIRED_USE=" ssl? ( crypt ) @@ -54,6 +54,7 @@ CDEPEND=" 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 ) @@ -97,7 +98,8 @@ src_prepare() { "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \ "${FILESDIR}"/${PN}-1.99.0.1975-gcc_option.patch \ "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ - "${FILESDIR}"/${PN}-1.99.0-qt5.patch + "${FILESDIR}"/${PN}-1.99.0-qt5.patch \ + "${FILESDIR}"/${PN}-1.99.1-sbc.patch epatch_user @@ -152,6 +154,7 @@ src_configure() { $(use_with qt5) \ $(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \ $(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \ + $(use_with sbc) \ $(use_with smi libsmi) \ $(use_with ssl gnutls) \ $(use_with zlib) \