From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FB1F139695 for ; Thu, 8 Jun 2017 12:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B16721C099; Thu, 8 Jun 2017 12:24:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A6AA21C099 for ; Thu, 8 Jun 2017 12:24:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F0BB341B06 for ; Thu, 8 Jun 2017 12:24:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28D877471 for ; Thu, 8 Jun 2017 12:24:31 +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: <1496924669.f4580cbf465a0506987d8c398432a109271c9ede.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-99999999-sse4_2.patch net-analyzer/wireshark/metadata.xml net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: f4580cbf465a0506987d8c398432a109271c9ede X-VCS-Branch: master Date: Thu, 8 Jun 2017 12:24:31 +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: c2431da7-5048-47e6-a244-f2a9acf61c0a X-Archives-Hash: c277f33a31040479b7121681ef3de089 commit: f4580cbf465a0506987d8c398432a109271c9ede Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jun 8 12:24:04 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jun 8 12:24:29 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4580cbf net-analyzer/wireshark: Version bump. Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-analyzer/wireshark/Manifest | 1 + .../files/wireshark-99999999-sse4_2.patch | 20 ------------- net-analyzer/wireshark/metadata.xml | 4 +++ ...-99999999.ebuild => wireshark-2.4.0_rc1.ebuild} | 35 ++++++++++++---------- net-analyzer/wireshark/wireshark-99999999.ebuild | 25 +++++++++++----- 5 files changed, 42 insertions(+), 43 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index c41c16adbbb..657a747face 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,3 +1,4 @@ DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d DIST wireshark-2.2.6.tar.bz2 32317335 SHA256 f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 SHA512 d373254801b2d9ae248ff45be09ac36e1916b832430b8f57271421cbd2113c1ffa914ef23c7a1e704d8d5f666f0d4de5bcd9ef9d3801686a35511a5f2a230f3f WHIRLPOOL 859588103ea21fa4e8511a873af81d50e053c5a8b3a92bca2fca317e2ab3e8c4e0e37d89102b887d88a0ef7c6fc90ca45667a43466ac0d71f4ffeec4b9bbf0e0 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44 +DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888 WHIRLPOOL 988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6 diff --git a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch deleted file mode 100644 index daef2a1a7cb..00000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch +++ /dev/null @@ -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/metadata.xml b/net-analyzer/wireshark/metadata.xml index 286f7d28adb..461d8656cff 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -34,12 +34,16 @@ Use dev-libs/libgcrypt to decrypt traffic Build documentation in pdf format (US and a4 paper sizes) Use net-libs/libssh (for sshdump) + Use dev-libs/libxml2 for handling XML configuration in dissectors Use dev-libs/libnl + Use net-libs/nghttp2 for HTTP/2 support Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) Install randpkt, a utility for creating pcap trace files full of random packets Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt) Use media-libs/sbc for playing back SBC encoded packets Use net-libs/libsmi to resolve numeric OIDs into human readable format + Use app-arch/snappy for snappy compression and decompression + Use media-libs/spandsp for for G.722 and G.726 codec support in the RTP Player Install sshdump, an extcap interface to capture from a remote host through SSH Install tfshark, a terminal-based version of the FileShark capability diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild similarity index 88% copy from net-analyzer/wireshark/wireshark-99999999.ebuild copy to net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild index 6b4c32ee842..a7271a99e3f 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild @@ -2,31 +2,33 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="http://www.wireshark.org/" -EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" +HOMEPAGE="https://www.wireshark.org/" +SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" 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 + adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf + geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux + smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark + zlib " REQUIRED_USE=" ciscodump? ( libssh ) sshdump? ( libssh ) - ssl? ( crypt ) " +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 ) - crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( @@ -37,7 +39,9 @@ CDEPEND=" ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) + libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) + nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( @@ -51,6 +55,8 @@ CDEPEND=" ) 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 ) " @@ -84,18 +90,14 @@ RDEPEND=" " PATCHES=( "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch "${FILESDIR}"/${PN}-99999999-androiddump.patch - "${FILESDIR}"/${PN}-99999999-sse4_2.patch ) pkg_setup() { enewgroup wireshark } -src_unpack() { - git-r3_src_unpack -} - src_prepare() { default @@ -150,17 +152,20 @@ src_configure() { $(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 libxml2) \ $(use_with lua) \ + $(use_with nghttp2) \ $(use_with pcap dumpcap-group wireshark) \ $(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 '') \ diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 6b4c32ee842..68d8ab35815 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -5,28 +5,30 @@ EAPI=6 inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="http://www.wireshark.org/" +HOMEPAGE="https://www.wireshark.org/" EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" LICENSE="GPL-2" SLOT="0/${PV}" KEYWORDS="" 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 + adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf + geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux + smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark + zlib " REQUIRED_USE=" ciscodump? ( libssh ) sshdump? ( libssh ) - ssl? ( crypt ) " +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 ) - crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( @@ -37,7 +39,9 @@ CDEPEND=" ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) + libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) + nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( @@ -51,6 +55,8 @@ CDEPEND=" ) 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 ) " @@ -84,8 +90,8 @@ RDEPEND=" " PATCHES=( "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch "${FILESDIR}"/${PN}-99999999-androiddump.patch - "${FILESDIR}"/${PN}-99999999-sse4_2.patch ) pkg_setup() { @@ -150,17 +156,20 @@ src_configure() { $(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 libxml2) \ $(use_with lua) \ + $(use_with nghttp2) \ $(use_with pcap dumpcap-group wireshark) \ $(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 '') \