diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
| commit | 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch) | |
| tree | 844bea44d85dc7218f54970af1c42cc9d55c3f1a /net-analyzer/wireshark | |
| parent | 89c6c06b8c42107dd231687a1012354e7d3039fc (diff) | |
gentoo resync : 01.12.2017
Diffstat (limited to 'net-analyzer/wireshark')
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 8 | ||||
| -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, 8 insertions, 12 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index ca9c11c611b8..c9088e7a6337 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,10 +1,10 @@ AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790fd305555480d804c5c13915f1b46ddc1be8b4d967f1dd60fa70263a663d4f345386399dabc33c63c97a55ba8c43b565ac SHA512 1938754656a0654a3e40909c30c9416e65078b2d664b44d31ef9e75cd2d0dbb360982106c9300ffca60da81aeb27c8a37298c9aff762d0800d77d17e46b9a524 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b -AUX wireshark-99999999-androiddump.patch 198 BLAKE2B f98e555f0a8e7ca64c665d49cd99266155e08f9daac081256d515736105e7721aab69dd6e95f68bd33b530ce2c221377329a4b2642aaadcdc9411590e8f44259 SHA512 7fd971d2b7bbf0bc3685021e0bf55e412e9995cb5d95be85da92d3191227f4af4de94b13a99cfef4f71c74225aa3fd471e5ca23ac6586ab9372f563f3c18c967 -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 +AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da +DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 +DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 EBUILD wireshark-2.2.7.ebuild 6489 BLAKE2B ef6b2cfc35890633c5936cf7513a4570b6006b92d6b5cfd504b3b097bb2f978c5c1b59253cd81b9704ba105a84f5adfdf9f9b0cc75a99f4f6a0b175fa3f1f9de SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439 -EBUILD wireshark-99999999.ebuild 7244 BLAKE2B 7efda1e67a4ea4579f77f7052902133ee794435b35c3d0ead045f50f7e44bfdc03bed4a846a44387e6fa2363dc1d0d36645db61a3e8e54f3a6787fa910dd9b11 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 +EBUILD wireshark-99999999.ebuild 7112 BLAKE2B 1523fd808c7c82714c3562e430960a3665bcc92f21ff801c8cf50f9240f7f59339007d32244a54e60842849b415d36e19a9cce816bd91c11882eddc44e8e25b6 SHA512 f7fbcbadcd41ef497b2d01af12c5a6299c89d5b6554778571fba05428e0df021c03750fe40ba6aae7cf926b92fbf7cf2fc556eae64e8698b6935a9502caf8dff MISC metadata.xml 4696 BLAKE2B 1492ecb0d92c063457da068e82af411ffeb77d6f50f89f16d380062dcbb51a90281c3a82e59830b9e67dc3e5aabbdca8e89febbd852286f9c4bb87711210fe66 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51 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 \ |