| 1 |
commit: 5f1fdf39a7d536af29a578d167a44cc50d8544c2 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 27 07:52:28 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 07:52:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1fdf39 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Fix header install (bug #638866 by Garri), configure options, androiddump patch. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-analyzer/wireshark/Manifest | 4 ++-- |
| 13 |
net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch | 6 +++--- |
| 14 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 6 +----- |
| 15 |
3 files changed, 6 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest |
| 18 |
index c15d386eaf9..8be664a29b2 100644 |
| 19 |
--- a/net-analyzer/wireshark/Manifest |
| 20 |
+++ b/net-analyzer/wireshark/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
-DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44 |
| 23 |
-DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177 |
| 24 |
+DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 |
| 25 |
+DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 |
| 26 |
|
| 27 |
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch |
| 28 |
index 124a9b8b00b..db1c560848e 100644 |
| 29 |
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch |
| 30 |
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch |
| 31 |
@@ -1,10 +1,10 @@ |
| 32 |
--- a/extcap/Makefile.am |
| 33 |
+++ b/extcap/Makefile.am |
| 34 |
-@@ -49,6 +49,7 @@ |
| 35 |
- androiddump_LDADD = \ |
| 36 |
+@@ -32,6 +32,7 @@ |
| 37 |
+ ../ui/libui.a \ |
| 38 |
../wiretap/libwiretap.la \ |
| 39 |
../wsutil/libwsutil.la \ |
| 40 |
+ @PCAP_LIBS@ \ |
| 41 |
@GLIB_LIBS@ |
| 42 |
|
| 43 |
- if ENABLE_STATIC |
| 44 |
+ randpktdump_SOURCES = \ |
| 45 |
|
| 46 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 47 |
index 5d11c1bd60e..f8b854c9dc0 100644 |
| 48 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 49 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 50 |
@@ -146,8 +146,6 @@ src_configure() { |
| 51 |
use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
| 52 |
use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
| 53 |
|
| 54 |
- # dumpcap requires libcap |
| 55 |
- # --disable-profile-build bugs #215806, #292991, #479602 |
| 56 |
econf \ |
| 57 |
$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
| 58 |
$(use dumpcap && use_with pcap dumpcap-group wireshark) \ |
| 59 |
@@ -173,7 +171,7 @@ src_configure() { |
| 60 |
$(use_with geoip) \ |
| 61 |
$(use_with gtk gtk 3) \ |
| 62 |
$(use_with kerberos krb5) \ |
| 63 |
- $(use_with libssh ssh) \ |
| 64 |
+ $(use_with libssh) \ |
| 65 |
$(use_with libxml2) \ |
| 66 |
$(use_with lua) \ |
| 67 |
$(use_with nghttp2) \ |
| 68 |
@@ -192,7 +190,6 @@ src_configure() { |
| 69 |
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
| 70 |
$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
| 71 |
$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
| 72 |
- --disable-profile-build \ |
| 73 |
--disable-warnings-as-errors \ |
| 74 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
| 75 |
${myconf[@]} |
| 76 |
@@ -236,7 +233,6 @@ src_install() { |
| 77 |
epan/dissectors/*.h \ |
| 78 |
epan/ftypes/*.h \ |
| 79 |
epan/wmem/*.h \ |
| 80 |
- register.h \ |
| 81 |
wiretap/*.h \ |
| 82 |
ws_diag_control.h \ |
| 83 |
ws_symbol_export.h \ |
Archives