public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/
Date: Tue, 24 Jul 2018 08:57:13 +0000 (UTC)	[thread overview]
Message-ID: <1532422630.e8fe71341eb7f6a169d62dcad74a7650423eef24.jer@gentoo> (raw)

commit:     e8fe71341eb7f6a169d62dcad74a7650423eef24
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 08:56:23 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 08:57:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fe7134

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-analyzer/wireshark/Manifest                    |   1 -
 .../wireshark/files/wireshark-2.6.0-qtsvg.patch    |  29 ---
 .../wireshark/files/wireshark-2.6.1-Qt-5.11.patch  |  54 -----
 net-analyzer/wireshark/wireshark-2.6.1.ebuild      | 243 ---------------------
 4 files changed, 327 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f21c28363cc..251aec24554 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
-DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
deleted file mode 100644
index 63327727590..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -926,14 +926,12 @@
- 			Qt5LinguistTools
- 			Qt5Multimedia
- 			Qt5PrintSupport
--			Qt5Svg
- 			Qt5Widgets
- 		)
- 		set(Qt5Core_OPTIONS REQUIRED)
- 		set(Qt5LinguistTools_OPTIONS REQUIRED)
- 		set(Qt5Multimedia_OPTIONS REQUIRED)
- 		set(Qt5PrintSupport_OPTIONS REQUIRED)
--		set(Qt5Svg_OPTIONS REQUIRED)
- 		set(Qt5Widgets_OPTIONS REQUIRED)
- 		if (APPLE)
- 			set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
-@@ -1229,11 +1227,6 @@
- 		# That's the name autofoo uses
- 		set(QT_MULTIMEDIA_LIB 1)
- 	endif()
--	if(Qt5Svg_FOUND)
--		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
--		# That's the name autofoo uses
--		set(QT_SVG_LIB 1)
--	endif()
- 	if(Qt5MacExtras_FOUND)
- 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
- 		# That's the name autofoo uses

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
deleted file mode 100644
index c8d8bb9ce9c..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
-From: Roland Knall <rknall@gmail.com>
-Date: Wed, 25 Apr 2018 10:28:30 +0200
-Subject: [PATCH] Qt: Fix various missing header includes
-
-Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
-
-Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
-Reviewed-on: https://code.wireshark.org/review/27145
-Petri-Dish: Roland Knall <rknall@gmail.com>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: Roland Knall <rknall@gmail.com>
----
- ui/qt/packet_format_group_box.cpp | 1 +
- ui/qt/time_shift_dialog.cpp       | 1 +
- ui/qt/wireless_frame.cpp          | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
-index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644
---- a/ui/qt/packet_format_group_box.cpp
-+++ b/ui/qt/packet_format_group_box.cpp
-@@ -10,6 +10,7 @@
- #include <ui_packet_format_group_box.h>
- 
- #include <QStyle>
-+#include <QStyleOption>
- 
- PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
-     QGroupBox(parent),
-diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
-index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644
---- a/ui/qt/time_shift_dialog.cpp
-+++ b/ui/qt/time_shift_dialog.cpp
-@@ -14,6 +14,7 @@
- #include <ui/time_shift.h>
- #include <ui/qt/utils/tango_colors.h>
- 
-+#include <QStyleOption>
- 
- TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
-     QDialog(parent),
-diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
-index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644
---- a/ui/qt/wireless_frame.cpp
-+++ b/ui/qt/wireless_frame.cpp
-@@ -23,6 +23,7 @@
- #include <wsutil/frequency-utils.h>
- 
- #include <QProcess>
-+#include <QAbstractItemView>
- 
- // To do:
- // - Disable or hide invalid channel types.

diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
deleted file mode 100644
index 9e43a2a0eac..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune 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="alpha amd64 arm hppa ia64 ~ppc64 x86"
-IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
-	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
-	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
-	zlib
-"
-
-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 )
-	bcg729? ( media-libs/bcg729 )
-	filecaps? ( sys-libs/libcap )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	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
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.6.1-Qt-5.11.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# 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."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DBUILD_wireshark_gtk=$(usex gtk)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_CAP=no
-		-DENABLE_CARES=$(usex adns)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PORTAUDIO=$(usex portaudio)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	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 gtk || use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && 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."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}


             reply	other threads:[~2018-07-24  8:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-24  8:57 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-20 23:57 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/ Sam James
2025-01-01 16:48 Andreas Sturmlechner
2024-10-11  2:27 Sam James
2024-06-01  1:27 Sam James
2023-01-30  7:17 Florian Schmaus
2022-02-20  6:31 Sam James
2021-12-07  7:13 Sam James
2021-03-04  4:58 Sam James
2020-11-16  6:10 Sam James
2020-01-17 12:29 Jeroen Roovers
2019-01-09 12:14 Jeroen Roovers
2018-12-13 14:21 Jeroen Roovers
2018-07-19 12:07 Jeroen Roovers
2018-06-03 11:06 Jeroen Roovers
2018-06-03 10:51 Jeroen Roovers
2018-05-04 18:01 Jeroen Roovers
2018-05-02 18:37 Jeroen Roovers
2018-01-16  9:56 Jeroen Roovers
2017-11-27  7:52 Jeroen Roovers
2016-06-30 19:24 Jeroen Roovers
2016-01-20  6:06 Jeroen Roovers
2015-12-24 12:50 Jeroen Roovers
2015-11-12  7:42 Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1532422630.e8fe71341eb7f6a169d62dcad74a7650423eef24.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox