From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, profiles/features/selinux/
Date: Sat, 23 Feb 2019 14:28:26 +0000 (UTC) [thread overview]
Message-ID: <1550932103.35052c25f69254ae3a4d7e5f0ea7d4f0f712c22b.jer@gentoo> (raw)
commit: 35052c25f69254ae3a4d7e5f0ea7d4f0f712c22b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 14:24:05 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 14:28:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35052c25
net-analyzer/wireshark: Add USE flags, fix src_test()
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/metadata.xml | 2 ++
net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild | 21 ++++++++++++++++-----
net-analyzer/wireshark/wireshark-99999999.ebuild | 23 +++++++++++++++++------
profiles/features/selinux/package.use.mask | 4 ++++
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index d7857925114..3aea5c6b5d5 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -35,6 +35,7 @@ be exported to XML, PostScript®, CSV, or plain text.
<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
@@ -49,6 +50,7 @@ be exported to XML, PostScript®, CSV, or plain text.
<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag>
<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild
index e7f6b3df2db..7824e565a93 100644
--- a/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild
@@ -13,10 +13,11 @@ 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 kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
- +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+ +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+ nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+ smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+ +udpdump zlib
"
S=${WORKDIR}/${P/_/}
@@ -45,6 +46,7 @@ CDEPEND="
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
+ sdjournal? ( sys-apps/systemd )
smi? ( net-libs/libsmi )
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
@@ -76,7 +78,9 @@ RDEPEND="
qt5? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -124,6 +128,7 @@ src_configure() {
-DBUILD_captype=$(usex captype)
-DBUILD_ciscodump=$(usex ciscodump)
-DBUILD_dftest=$(usex dftest)
+ -DBUILD_dpauxmon=$(usex dpauxmon)
-DBUILD_dumpcap=$(usex dumpcap)
-DBUILD_editcap=$(usex editcap)
-DBUILD_mergecap=$(usex mergecap)
@@ -131,6 +136,7 @@ src_configure() {
-DBUILD_randpkt=$(usex randpkt)
-DBUILD_randpktdump=$(usex randpktdump)
-DBUILD_reordercap=$(usex reordercap)
+ -DBUILD_sdjournal=$(usex sdjournal)
-DBUILD_sharkd=$(usex sharkd)
-DBUILD_sshdump=$(usex sshdump)
-DBUILD_text2pcap=$(usex text2pcap)
@@ -160,6 +166,11 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ emake -C "${BUILD_DIR}" test-programs
+ emake -C "${BUILD_DIR}" test
+}
+
src_install() {
cmake-utils_src_install
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 1971febe690..e9927cc3b15 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,10 +13,11 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap
- +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
- +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+ +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+ nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+ smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+ +udpdump zlib
"
S=${WORKDIR}/${P/_/}
@@ -45,6 +46,7 @@ CDEPEND="
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
+ sdjournal? ( sys-apps/systemd )
smi? ( net-libs/libsmi )
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
@@ -76,7 +78,9 @@ RDEPEND="
qt5? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -124,6 +128,7 @@ src_configure() {
-DBUILD_captype=$(usex captype)
-DBUILD_ciscodump=$(usex ciscodump)
-DBUILD_dftest=$(usex dftest)
+ -DBUILD_dpauxmon=$(usex dpauxmon)
-DBUILD_dumpcap=$(usex dumpcap)
-DBUILD_editcap=$(usex editcap)
-DBUILD_mergecap=$(usex mergecap)
@@ -131,6 +136,7 @@ src_configure() {
-DBUILD_randpkt=$(usex randpkt)
-DBUILD_randpktdump=$(usex randpktdump)
-DBUILD_reordercap=$(usex reordercap)
+ -DBUILD_sdjournal=$(usex sdjournal)
-DBUILD_sharkd=$(usex sharkd)
-DBUILD_sshdump=$(usex sshdump)
-DBUILD_text2pcap=$(usex text2pcap)
@@ -160,6 +166,11 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ emake -C "${BUILD_DIR}" test-programs
+ emake -C "${BUILD_DIR}" test
+}
+
src_install() {
cmake-utils_src_install
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index d1411f9dbb9..c143824e707 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Jeroen Roovers <jer@gentoo.org> (23 Feb 2019)
+# sdjournal links against sys-apps/systemd's libraries
+net-analyzer/wireshark sdjournal
+
# Brian Dolbec <dolsen@gentoo.org> (17 Sep 2014)
# mask pypy for several utilities due to incompatibility with libselinux
sys-apps/portage python_targets_pypy python_targets_pypy3
reply other threads:[~2019-02-23 14:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1550932103.35052c25f69254ae3a4d7e5f0ea7d4f0f712c22b.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