| 1 |
commit: 1ed92cf1f83756341e962f39e9c6f85cda353ed8 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 3 12:11:25 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 3 12:12:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed92cf1 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Update live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../wireshark-99999999-androiddump-wsutil.patch | 34 ++++++++++++++++++++++ |
| 13 |
.../wireshark-99999999-ui-needs-wiretap.patch | 11 +++++++ |
| 14 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 20 ++++--------- |
| 15 |
3 files changed, 51 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..8ceb3ba5488 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch |
| 22 |
@@ -0,0 +1,34 @@ |
| 23 |
+--- a/extcap/CMakeLists.txt |
| 24 |
++++ b/extcap/CMakeLists.txt |
| 25 |
+@@ -68,6 +68,8 @@ |
| 26 |
+ if(HAVE_LIBPCAP) |
| 27 |
+ set(androiddump_LIBS |
| 28 |
+ ui |
| 29 |
++ wiretap |
| 30 |
++ wsutil |
| 31 |
+ ${GLIB2_LIBRARIES} |
| 32 |
+ ${PCAP_LIBRARIES} |
| 33 |
+ ) |
| 34 |
+@@ -78,6 +80,7 @@ |
| 35 |
+ set(androiddump_LIBS |
| 36 |
+ ui |
| 37 |
+ wiretap |
| 38 |
++ wsutil |
| 39 |
+ ${GLIB2_LIBRARIES} |
| 40 |
+ ${ZLIB_LIBRARIES} |
| 41 |
+ ${CMAKE_DL_LIBS} |
| 42 |
+@@ -89,7 +92,6 @@ |
| 43 |
+ ) |
| 44 |
+ |
| 45 |
+ add_executable(androiddump WIN32 ${androiddump_FILES}) |
| 46 |
+- # XXX Shouldn't we add wsutil to androiddump_LIBS instead? |
| 47 |
+ set_extcap_executable_properties(androiddump) |
| 48 |
+ target_link_libraries(androiddump ${androiddump_LIBS}) |
| 49 |
+ install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) |
| 50 |
+@@ -212,4 +214,4 @@ |
| 51 |
+ ${androiddump_FILES} |
| 52 |
+ ${sshdump_FILES} |
| 53 |
+ ${ciscodump_FILES} |
| 54 |
+-) |
| 55 |
+\ No newline at end of file |
| 56 |
++) |
| 57 |
|
| 58 |
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch |
| 59 |
new file mode 100644 |
| 60 |
index 00000000000..c0bfc3acd5a |
| 61 |
--- /dev/null |
| 62 |
+++ b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch |
| 63 |
@@ -0,0 +1,11 @@ |
| 64 |
+--- a/ui/CMakeLists.txt |
| 65 |
++++ b/ui/CMakeLists.txt |
| 66 |
+@@ -76,6 +76,8 @@ |
| 67 |
+ |
| 68 |
+ add_library(ui STATIC ${UI_SRC}) |
| 69 |
+ |
| 70 |
++set(ui_LIBS wiretap) |
| 71 |
++ |
| 72 |
+ set_target_properties(ui PROPERTIES |
| 73 |
+ LINK_FLAGS "${WS_LINK_FLAGS}" |
| 74 |
+ FOLDER "UI" |
| 75 |
|
| 76 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 77 |
index 039381a543b..d1a9875cba3 100644 |
| 78 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 79 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 80 |
@@ -13,8 +13,8 @@ SLOT="0/${PV}" |
| 81 |
KEYWORDS="" |
| 82 |
IUSE=" |
| 83 |
adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc |
| 84 |
- +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 85 |
- nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux |
| 86 |
+ +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 87 |
+ nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux |
| 88 |
+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump |
| 89 |
zlib |
| 90 |
" |
| 91 |
@@ -28,12 +28,6 @@ CDEPEND=" |
| 92 |
adns? ( >=net-dns/c-ares-1.5 ) |
| 93 |
bcg729? ( media-libs/bcg729 ) |
| 94 |
caps? ( sys-libs/libcap ) |
| 95 |
- gtk? ( |
| 96 |
- x11-libs/gdk-pixbuf |
| 97 |
- x11-libs/gtk+:3 |
| 98 |
- x11-libs/pango |
| 99 |
- x11-misc/xdg-utils |
| 100 |
- ) |
| 101 |
kerberos? ( virtual/krb5 ) |
| 102 |
sshdump? ( >=net-libs/libssh-0.6 ) |
| 103 |
ciscodump? ( >=net-libs/libssh-0.6 ) |
| 104 |
@@ -43,7 +37,6 @@ CDEPEND=" |
| 105 |
maxminddb? ( dev-libs/libmaxminddb ) |
| 106 |
nghttp2? ( net-libs/nghttp2 ) |
| 107 |
pcap? ( net-libs/libpcap ) |
| 108 |
- portaudio? ( media-libs/portaudio ) |
| 109 |
qt5? ( |
| 110 |
dev-qt/qtcore:5 |
| 111 |
dev-qt/qtgui:5 |
| 112 |
@@ -81,14 +74,15 @@ DEPEND=" |
| 113 |
" |
| 114 |
RDEPEND=" |
| 115 |
${CDEPEND} |
| 116 |
- gtk? ( virtual/freedesktop-icon-theme ) |
| 117 |
qt5? ( virtual/freedesktop-icon-theme ) |
| 118 |
selinux? ( sec-policy/selinux-wireshark ) |
| 119 |
" |
| 120 |
PATCHES=( |
| 121 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 122 |
- "${FILESDIR}"/${PN}-99999999-qtsvg.patch |
| 123 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 124 |
+ "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch |
| 125 |
+ "${FILESDIR}"/${PN}-99999999-qtsvg.patch |
| 126 |
+ "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch |
| 127 |
) |
| 128 |
|
| 129 |
pkg_setup() { |
| 130 |
@@ -141,7 +135,6 @@ src_configure() { |
| 131 |
-DBUILD_tshark=$(usex tshark) |
| 132 |
-DBUILD_udpdump=$(usex udpdump) |
| 133 |
-DBUILD_wireshark=$(usex qt5) |
| 134 |
- -DBUILD_wireshark_gtk=$(usex gtk) |
| 135 |
-DDISABLE_WERROR=yes |
| 136 |
-DENABLE_BCG729=$(usex bcg729) |
| 137 |
-DENABLE_CAP=$(usex caps) |
| 138 |
@@ -154,7 +147,6 @@ src_configure() { |
| 139 |
-DENABLE_NETLINK=$(usex netlink) |
| 140 |
-DENABLE_NGHTTP2=$(usex nghttp2) |
| 141 |
-DENABLE_PCAP=$(usex pcap) |
| 142 |
- -DENABLE_PORTAUDIO=$(usex portaudio) |
| 143 |
-DENABLE_SBC=$(usex sbc) |
| 144 |
-DENABLE_SMI=$(usex smi) |
| 145 |
-DENABLE_SNAPPY=$(usex snappy) |
| 146 |
@@ -204,7 +196,7 @@ src_install() { |
| 147 |
insinto /usr/include/wiretap |
| 148 |
doins wiretap/wtap.h |
| 149 |
|
| 150 |
- if use gtk || use qt5; then |
| 151 |
+ if use qt5; then |
| 152 |
local s |
| 153 |
for s in 16 32 48 64 128 256 512 1024; do |
| 154 |
insinto /usr/share/icons/hicolor/${s}x${s}/apps |
Archives