| 1 |
commit: 35052c25f69254ae3a4d7e5f0ea7d4f0f712c22b |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 23 14:24:05 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 23 14:28:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35052c25 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Add USE flags, fix src_test() |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/wireshark/metadata.xml | 2 ++ |
| 14 |
net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild | 21 ++++++++++++++++----- |
| 15 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 23 +++++++++++++++++------ |
| 16 |
profiles/features/selinux/package.use.mask | 4 ++++ |
| 17 |
4 files changed, 39 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml |
| 20 |
index d7857925114..3aea5c6b5d5 100644 |
| 21 |
--- a/net-analyzer/wireshark/metadata.xml |
| 22 |
+++ b/net-analyzer/wireshark/metadata.xml |
| 23 |
@@ -35,6 +35,7 @@ be exported to XML, PostScript®, CSV, or plain text. |
| 24 |
<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> |
| 25 |
<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> |
| 26 |
<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag> |
| 27 |
+<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> |
| 28 |
<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> |
| 29 |
<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> |
| 30 |
<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag> |
| 31 |
@@ -49,6 +50,7 @@ be exported to XML, PostScript®, CSV, or plain text. |
| 32 |
<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> |
| 33 |
<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> |
| 34 |
<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> |
| 35 |
+<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag> |
| 36 |
<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> |
| 37 |
<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> |
| 38 |
<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag> |
| 39 |
|
| 40 |
diff --git a/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild |
| 41 |
index e7f6b3df2db..7824e565a93 100644 |
| 42 |
--- a/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild |
| 43 |
+++ b/net-analyzer/wireshark/wireshark-3.0.0_rc2.ebuild |
| 44 |
@@ -13,10 +13,11 @@ LICENSE="GPL-2" |
| 45 |
SLOT="0/${PV}" |
| 46 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" |
| 47 |
IUSE=" |
| 48 |
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap |
| 49 |
- +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 |
| 50 |
- +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy |
| 51 |
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib |
| 52 |
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon |
| 53 |
+ +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 54 |
+ nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd |
| 55 |
+ smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark |
| 56 |
+ +udpdump zlib |
| 57 |
" |
| 58 |
|
| 59 |
S=${WORKDIR}/${P/_/} |
| 60 |
@@ -45,6 +46,7 @@ CDEPEND=" |
| 61 |
x11-misc/xdg-utils |
| 62 |
) |
| 63 |
sbc? ( media-libs/sbc ) |
| 64 |
+ sdjournal? ( sys-apps/systemd ) |
| 65 |
smi? ( net-libs/libsmi ) |
| 66 |
snappy? ( app-arch/snappy ) |
| 67 |
spandsp? ( media-libs/spandsp ) |
| 68 |
@@ -76,7 +78,9 @@ RDEPEND=" |
| 69 |
qt5? ( virtual/freedesktop-icon-theme ) |
| 70 |
selinux? ( sec-policy/selinux-wireshark ) |
| 71 |
" |
| 72 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 73 |
+REQUIRED_USE=" |
| 74 |
+ ${PYTHON_REQUIRED_USE} |
| 75 |
+" |
| 76 |
PATCHES=( |
| 77 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 78 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 79 |
@@ -124,6 +128,7 @@ src_configure() { |
| 80 |
-DBUILD_captype=$(usex captype) |
| 81 |
-DBUILD_ciscodump=$(usex ciscodump) |
| 82 |
-DBUILD_dftest=$(usex dftest) |
| 83 |
+ -DBUILD_dpauxmon=$(usex dpauxmon) |
| 84 |
-DBUILD_dumpcap=$(usex dumpcap) |
| 85 |
-DBUILD_editcap=$(usex editcap) |
| 86 |
-DBUILD_mergecap=$(usex mergecap) |
| 87 |
@@ -131,6 +136,7 @@ src_configure() { |
| 88 |
-DBUILD_randpkt=$(usex randpkt) |
| 89 |
-DBUILD_randpktdump=$(usex randpktdump) |
| 90 |
-DBUILD_reordercap=$(usex reordercap) |
| 91 |
+ -DBUILD_sdjournal=$(usex sdjournal) |
| 92 |
-DBUILD_sharkd=$(usex sharkd) |
| 93 |
-DBUILD_sshdump=$(usex sshdump) |
| 94 |
-DBUILD_text2pcap=$(usex text2pcap) |
| 95 |
@@ -160,6 +166,11 @@ src_configure() { |
| 96 |
cmake-utils_src_configure |
| 97 |
} |
| 98 |
|
| 99 |
+src_test() { |
| 100 |
+ emake -C "${BUILD_DIR}" test-programs |
| 101 |
+ emake -C "${BUILD_DIR}" test |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_install() { |
| 105 |
cmake-utils_src_install |
| 106 |
|
| 107 |
|
| 108 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 109 |
index 1971febe690..e9927cc3b15 100644 |
| 110 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 111 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 112 |
@@ -1,4 +1,4 @@ |
| 113 |
-# Copyright 1999-2018 Gentoo Authors |
| 114 |
+# Copyright 1999-2019 Gentoo Authors |
| 115 |
# Distributed under the terms of the GNU General Public License v2 |
| 116 |
|
| 117 |
EAPI=6 |
| 118 |
@@ -13,10 +13,11 @@ LICENSE="GPL-2" |
| 119 |
SLOT="0/${PV}" |
| 120 |
KEYWORDS="" |
| 121 |
IUSE=" |
| 122 |
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap |
| 123 |
- +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 |
| 124 |
- +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy |
| 125 |
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib |
| 126 |
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon |
| 127 |
+ +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 128 |
+ nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd |
| 129 |
+ smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark |
| 130 |
+ +udpdump zlib |
| 131 |
" |
| 132 |
|
| 133 |
S=${WORKDIR}/${P/_/} |
| 134 |
@@ -45,6 +46,7 @@ CDEPEND=" |
| 135 |
x11-misc/xdg-utils |
| 136 |
) |
| 137 |
sbc? ( media-libs/sbc ) |
| 138 |
+ sdjournal? ( sys-apps/systemd ) |
| 139 |
smi? ( net-libs/libsmi ) |
| 140 |
snappy? ( app-arch/snappy ) |
| 141 |
spandsp? ( media-libs/spandsp ) |
| 142 |
@@ -76,7 +78,9 @@ RDEPEND=" |
| 143 |
qt5? ( virtual/freedesktop-icon-theme ) |
| 144 |
selinux? ( sec-policy/selinux-wireshark ) |
| 145 |
" |
| 146 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 147 |
+REQUIRED_USE=" |
| 148 |
+ ${PYTHON_REQUIRED_USE} |
| 149 |
+" |
| 150 |
PATCHES=( |
| 151 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 152 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 153 |
@@ -124,6 +128,7 @@ src_configure() { |
| 154 |
-DBUILD_captype=$(usex captype) |
| 155 |
-DBUILD_ciscodump=$(usex ciscodump) |
| 156 |
-DBUILD_dftest=$(usex dftest) |
| 157 |
+ -DBUILD_dpauxmon=$(usex dpauxmon) |
| 158 |
-DBUILD_dumpcap=$(usex dumpcap) |
| 159 |
-DBUILD_editcap=$(usex editcap) |
| 160 |
-DBUILD_mergecap=$(usex mergecap) |
| 161 |
@@ -131,6 +136,7 @@ src_configure() { |
| 162 |
-DBUILD_randpkt=$(usex randpkt) |
| 163 |
-DBUILD_randpktdump=$(usex randpktdump) |
| 164 |
-DBUILD_reordercap=$(usex reordercap) |
| 165 |
+ -DBUILD_sdjournal=$(usex sdjournal) |
| 166 |
-DBUILD_sharkd=$(usex sharkd) |
| 167 |
-DBUILD_sshdump=$(usex sshdump) |
| 168 |
-DBUILD_text2pcap=$(usex text2pcap) |
| 169 |
@@ -160,6 +166,11 @@ src_configure() { |
| 170 |
cmake-utils_src_configure |
| 171 |
} |
| 172 |
|
| 173 |
+src_test() { |
| 174 |
+ emake -C "${BUILD_DIR}" test-programs |
| 175 |
+ emake -C "${BUILD_DIR}" test |
| 176 |
+} |
| 177 |
+ |
| 178 |
src_install() { |
| 179 |
cmake-utils_src_install |
| 180 |
|
| 181 |
|
| 182 |
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask |
| 183 |
index d1411f9dbb9..c143824e707 100644 |
| 184 |
--- a/profiles/features/selinux/package.use.mask |
| 185 |
+++ b/profiles/features/selinux/package.use.mask |
| 186 |
@@ -1,6 +1,10 @@ |
| 187 |
# Copyright 1999-2018 Gentoo Foundation |
| 188 |
# Distributed under the terms of the GNU General Public License v2 |
| 189 |
|
| 190 |
+# Jeroen Roovers <jer@g.o> (23 Feb 2019) |
| 191 |
+# sdjournal links against sys-apps/systemd's libraries |
| 192 |
+net-analyzer/wireshark sdjournal |
| 193 |
+ |
| 194 |
# Brian Dolbec <dolsen@g.o> (17 Sep 2014) |
| 195 |
# mask pypy for several utilities due to incompatibility with libselinux |
| 196 |
sys-apps/portage python_targets_pypy python_targets_pypy3 |
Archives