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 491D1138335 for ; Mon, 11 Mar 2019 16:55:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7AA1E0AF1; Mon, 11 Mar 2019 16:55:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E32AE0AE9 for ; Mon, 11 Mar 2019 16:55:36 +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 B18B333DF47 for ; Mon, 11 Mar 2019 16:55:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83461503 for ; Mon, 11 Mar 2019 16:55:32 +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: <1552323327.bfbc0055575d1e00111409cb708f011fb62241e3.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-2.1.0-sse4_2-r1.patch net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch net-analyzer/wireshark/metadata.xml net-analyzer/wireshark/wireshark-2.4.5.ebuild X-VCS-Directories: net-analyzer/wireshark/files/ net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: bfbc0055575d1e00111409cb708f011fb62241e3 X-VCS-Branch: master Date: Mon, 11 Mar 2019 16:55:32 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c62c46cc-9540-4feb-b8ed-954c16f36445 X-Archives-Hash: 3a12250c55df0ce6e38d2be5abc662b8 commit: bfbc0055575d1e00111409cb708f011fb62241e3 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Mar 11 16:49:08 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Mar 11 16:55:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbc0055 net-analyzer/wireshark: Old Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/wireshark/Manifest | 1 - .../files/wireshark-2.1.0-sse4_2-r1.patch | 21 -- .../wireshark/files/wireshark-2.4.3-libsmi.patch | 233 ----------------- net-analyzer/wireshark/metadata.xml | 2 - net-analyzer/wireshark/wireshark-2.4.5.ebuild | 291 --------------------- 5 files changed, 548 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 9e5bc3e93b8..c4ba02e145b 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,4 +1,3 @@ -DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80 DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56 DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 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 deleted file mode 100644 index 8efe5aff6c5..00000000000 --- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch +++ /dev/null @@ -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.4.3-libsmi.patch b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch deleted file mode 100644 index 288efb7d66f..00000000000 --- a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch +++ /dev/null @@ -1,233 +0,0 @@ -From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Jo=C3=A3o=20Valverde?= -Date: Sun, 5 Nov 2017 12:05:43 +0000 -Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Change-Id: Icecea743739aa7e1a65753f623f311514260d373 -Reviewed-on: https://code.wireshark.org/review/24252 -Petri-Dish: João Valverde -Tested-by: Petri Dish Buildbot -Reviewed-by: João Valverde ---- - Makefile.am | 2 +- - configure.ac | 27 +++++++++--- - epan/Makefile.am | 2 +- - m4/libsmi.m4 | 125 ------------------------------------------------------- - 4 files changed, 24 insertions(+), 132 deletions(-) - delete mode 100644 m4/libsmi.m4 - -diff --git a/Makefile.am b/Makefile.am -index a2851e0..e6ed5eb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -422,7 +422,7 @@ EPAN_EXTRA_LIBS = \ - @KRB5_LIBS@ \ - @LIBGCRYPT_LIBS@ \ - @LIBGNUTLS_LIBS@ \ -- @LIBSMI_LDFLAGS@ -+ @LIBSMI_LIBS@ - - # Libraries and plugin flags with which to link wireshark. - # -diff --git a/configure.ac b/configure.ac -index 3b3475b..326561c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -432,10 +432,6 @@ linux*) - fi - esac - --# libsmi --# FIXME: currently the path argument to with-libsmi is being ignored --AX_LIBSMI -- - # - # Check if we should build the Wireshark User's Guide - # -@@ -2427,6 +2423,27 @@ else - fi - AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes") - -+# -+# Libsmi check -+# -+AC_ARG_WITH(libsmi, -+ AC_HELP_STRING([--with-libsmi=@<:@yes/no@:>@], -+ [use libsmi MIB/PIB library @<:@default=yes, if available@:>@]), -+ [], [with_libsmi="if_available"]) -+ -+have_libsmi=no -+if test "x$with_libsmi" != "xno"; then -+ PKG_CHECK_MODULES(LIBSMI, libsmi, -+ [have_libsmi=yes -+ AC_DEFINE(HAVE_LIBSMI, 1, [Define if you have libsmi]) -+ ], -+ [if test "x$with_libsmi" = "xyes"; then -+ # Error out if the user explicitly requested libsmi -+ AC_MSG_ERROR([Libsmi was requested, but is not installed for development]) -+ fi -+ ] -+ ) -+fi - - dnl - dnl check whether plugins should be enabled -@@ -3012,7 +3029,7 @@ echo " Use pcap library : $want_pcap" - echo " Use zlib library : $zlib_message" - echo " Use kerberos library : $krb5_message" - echo " Use c-ares library : $c_ares_message" --echo " Use SMI MIB library : $libsmi_message" -+echo " Use SMI MIB library : $have_libsmi" - echo " Use GNU gcrypt library : yes" - echo " Use GnuTLS library : $tls_message" - echo " Use POSIX capabilities library : $libcap_message" -diff --git a/epan/Makefile.am b/epan/Makefile.am -index 9f7de62..e85f97b 100644 ---- a/epan/Makefile.am -+++ b/epan/Makefile.am -@@ -330,7 +330,7 @@ libwireshark_la_LIBADD = \ - @KRB5_LIBS@ \ - @LIBGCRYPT_LIBS@ \ - @LIBGNUTLS_LIBS@ \ -- @LIBSMI_LDFLAGS@ \ -+ @LIBSMI_LIBS@ \ - @LZ4_LIBS@ \ - @NGHTTP2_LIBS@ \ - @SNAPPY_LIBS@ \ -diff --git a/m4/libsmi.m4 b/m4/libsmi.m4 -deleted file mode 100644 -index d719438..0000000 ---- a/m4/libsmi.m4 -+++ /dev/null -@@ -1,125 +0,0 @@ --# Configure paths for libsmi --# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html -- --# Synopsis: AX_LIBSMI([minimum library version]) --# The default minimum library version is 2 -- --# This macro sets/substitutes the following: --# AC_DEFINE(HAVE_LIBSMI) --# AC_SUBST(LIBSMI_CFLAGS) --# AC_SUBST(LIBSMI_LDFLAGS) --# AC_SUBST(LIBSMI_VERSION) --# $libsmi_message is set to "yes" or "no" -- --AC_DEFUN([AX_LIBSMI], --[ -- AC_ARG_WITH([libsmi], -- AC_HELP_STRING( -- [--with-libsmi=@<:@DIR@:>@], -- [use libsmi MIB/PIB library @<:@default=yes@:>@, optionally specify the prefix for libsmi] -- ), -- [ -- if test "$withval" = "no"; then -- WANT_LIBSMI="no" -- elif test "$withval" = "yes"; then -- WANT_LIBSMI="yes" -- ac_libsmi_path="" -- else -- WANT_LIBSMI="yes" -- ac_libsmi_path="$withval" -- fi -- ], -- [WANT_LIBSMI="yes"] -- ) -- -- libsmi_message="no" -- LIBSMI_CFLAGS="" -- LIBSMI_LDFLAGS="" -- LIBSMI_VERSION="" -- -- if test "x$WANT_LIBSMI" = "xyes"; then -- -- ac_libsmi_header="smi.h" -- -- libsmi_version_req=ifelse([$1], [], [2], [$1]) -- -- AC_MSG_CHECKING([for libsmi >= $libsmi_version_req]) -- -- if test "$ac_libsmi_path" != ""; then -- ac_libsmi_ldflags="-L$ac_libsmi_path/lib" -- ac_libsmi_cflags="-I$ac_libsmi_path/include" -- else -- for ac_libsmi_path_tmp in /usr /usr/local /opt $prefix; do -- if test -f "$ac_libsmi_path_tmp/include/$ac_libsmi_header" \ -- && test -r "$ac_libsmi_path_tmp/include/$ac_libsmi_header"; then -- ac_libsmi_path=$ac_libsmi_path_tmp -- ac_libsmi_ldflags="-L$ac_libsmi_path_tmp/lib" -- ac_libsmi_cflags="-I$ac_libsmi_path_tmp/include" -- break; -- fi -- done -- fi -- -- ac_libsmi_ldflags="$ac_libsmi_ldflags -lsmi" -- -- saved_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $ac_libsmi_cflags" -- -- AC_LANG_PUSH(C) -- AC_COMPILE_IFELSE( -- [ -- AC_LANG_PROGRAM([[@%:@include ]], -- [[ -- int current, revision, age, n; -- const int required = $libsmi_version_req; -- if (smiInit("")) -- exit(1); -- if (strcmp(SMI_LIBRARY_VERSION, smi_library_version)) -- exit(2); -- n = sscanf(smi_library_version, "%d:%d:%d", ¤t, &revision, &age); -- if (n != 3) -- exit(3); -- if (required < current - age || required > current) -- exit(4); -- ]] -- ) -- ], -- [ -- AC_MSG_RESULT([yes]) -- libsmi_message="yes" -- ], -- [ -- AC_MSG_RESULT([not found]) -- libsmi_message="no" -- ] -- ) -- AC_LANG_POP([C]) -- -- CFLAGS="$saved_CFLAGS" -- -- if test "$libsmi_message" = "yes"; then -- -- LIBSMI_CFLAGS="$ac_libsmi_cflags" -- LIBSMI_LDFLAGS="$ac_libsmi_ldflags" -- -- ac_libsmi_header_path="$ac_libsmi_path/include/$ac_libsmi_header" -- -- dnl Retrieve libsmi release version -- if test "x$ac_libsmi_header_path" != "x"; then -- ac_libsmi_version=`cat $ac_libsmi_header_path \ -- | grep '#define.*SMI_LIBRARY_VERSION.*\"' | sed -e 's/.* "//' \ -- | sed -e 's/"//'` -- if test $ac_libsmi_version != ""; then -- LIBSMI_VERSION=$ac_libsmi_version -- else -- AC_MSG_WARN([Can not find SMI_LIBRARY_VERSION macro in smi.h header to retrieve libsmi version!]) -- fi -- fi -- -- AC_SUBST(LIBSMI_CFLAGS) -- AC_SUBST(LIBSMI_LDFLAGS) -- AC_SUBST(LIBSMI_VERSION) -- AC_DEFINE(HAVE_LIBSMI, 1, [Define to 1 if you have the `smi' library (-lsmi).]) -- fi -- fi --]) --- -2.7.4 - diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 3aea5c6b5d5..754f3279fc5 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -34,11 +34,9 @@ be exported to XML, PostScript®, CSV, or plain text. Install captype, to print the file types of capture files Install ciscodump, extcap interface to capture from a remote Cisco router Install dftest, to display filter byte-code, for debugging dfilter routines -Build documentation in pdf format (US and a4 paper sizes) Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers Install dumpcap, to dump network traffic from inside wireshark Install editcap, to edit and/or translate the format of capture files -Use net-libs/libssh (for sshdump) Use dev-libs/libxml2 for handling XML configuration in dissectors Use app-arch/lz4 for compression/decompression Use dev-libs/libmaxminddb for IP address geolocation diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild deleted file mode 100644 index c1819bafbf8..00000000000 --- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~arm64 ~x86-fbsd" -IUSE=" - adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 - +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua - lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap - tfshark +tshark +udpdump zlib -" -REQUIRED_USE=" - ciscodump? ( libssh ) - sshdump? ( libssh ) -" - -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 ) - caps? ( sys-libs/libcap ) - geoip? ( dev-libs/geoip ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - libssh? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - nghttp2? ( net-libs/nghttp2 ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - >=media-libs/speex-1.2.0 - media-libs/speexdsp - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !