diff options
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-99999999.ebuild | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index c15d386eaf91..8be664a29b23 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,2 +1,2 @@ -DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44 -DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177 +DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 +DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch index 124a9b8b00be..db1c560848ec 100644 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch +++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch @@ -1,10 +1,10 @@ --- a/extcap/Makefile.am +++ b/extcap/Makefile.am -@@ -49,6 +49,7 @@ - androiddump_LDADD = \ +@@ -32,6 +32,7 @@ + ../ui/libui.a \ ../wiretap/libwiretap.la \ ../wsutil/libwsutil.la \ + @PCAP_LIBS@ \ @GLIB_LIBS@ - if ENABLE_STATIC + randpktdump_SOURCES = \ diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 5d11c1bd60e1..f8b854c9dc0b 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -146,8 +146,6 @@ src_configure() { use doc || export ac_cv_prog_HAVE_DOXYGEN=false use doc-pdf || export ac_cv_prog_HAVE_FOP=false - # dumpcap requires libcap - # --disable-profile-build bugs #215806, #292991, #479602 econf \ $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ $(use dumpcap && use_with pcap dumpcap-group wireshark) \ @@ -173,7 +171,7 @@ src_configure() { $(use_with geoip) \ $(use_with gtk gtk 3) \ $(use_with kerberos krb5) \ - $(use_with libssh ssh) \ + $(use_with libssh) \ $(use_with libxml2) \ $(use_with lua) \ $(use_with nghttp2) \ @@ -192,7 +190,6 @@ src_configure() { $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ - --disable-profile-build \ --disable-warnings-as-errors \ --sysconfdir="${EPREFIX}"/etc/wireshark \ ${myconf[@]} @@ -236,7 +233,6 @@ src_install() { epan/dissectors/*.h \ epan/ftypes/*.h \ epan/wmem/*.h \ - register.h \ wiretap/*.h \ ws_diag_control.h \ ws_symbol_export.h \ |