| 1 |
commit: b2d0c75fce89f9157d296fd2cc647a6c69712844 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 24 01:42:40 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 24 01:43:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d0c75f |
| 7 |
|
| 8 |
net-analyzer/wireshark: add 3.6.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-analyzer/wireshark/Manifest | 1 + |
| 13 |
...ireshark-9999.ebuild => wireshark-3.6.0.ebuild} | 27 ---------------------- |
| 14 |
net-analyzer/wireshark/wireshark-9999.ebuild | 27 ---------------------- |
| 15 |
3 files changed, 1 insertion(+), 54 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest |
| 18 |
index beb51ec249d5..aed666cce349 100644 |
| 19 |
--- a/net-analyzer/wireshark/Manifest |
| 20 |
+++ b/net-analyzer/wireshark/Manifest |
| 21 |
@@ -2,3 +2,4 @@ DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe00081 |
| 22 |
DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0 |
| 23 |
DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8 |
| 24 |
DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb |
| 25 |
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094 |
| 26 |
|
| 27 |
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-3.6.0.ebuild |
| 28 |
similarity index 92% |
| 29 |
copy from net-analyzer/wireshark/wireshark-9999.ebuild |
| 30 |
copy to net-analyzer/wireshark/wireshark-3.6.0.ebuild |
| 31 |
index 9d120d24bcf1..77c36361aafe 100644 |
| 32 |
--- a/net-analyzer/wireshark/wireshark-9999.ebuild |
| 33 |
+++ b/net-analyzer/wireshark/wireshark-3.6.0.ebuild |
| 34 |
@@ -107,7 +107,6 @@ REQUIRED_USE=" |
| 35 |
PATCHES=( |
| 36 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 37 |
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch |
| 38 |
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch |
| 39 |
) |
| 40 |
|
| 41 |
pkg_setup() { |
| 42 |
@@ -214,32 +213,6 @@ src_install() { |
| 43 |
# FAQ is not required as is installed from help/faq.txt |
| 44 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 45 |
|
| 46 |
- # install headers |
| 47 |
- insinto /usr/include/wireshark |
| 48 |
- doins ws_diag_control.h ws_symbol_export.h \ |
| 49 |
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h |
| 50 |
- |
| 51 |
- local dir dirs=( |
| 52 |
- epan |
| 53 |
- epan/crypt |
| 54 |
- epan/dfilter |
| 55 |
- epan/dissectors |
| 56 |
- epan/ftypes |
| 57 |
- epan/wmem |
| 58 |
- wiretap |
| 59 |
- wsutil |
| 60 |
- ) |
| 61 |
- |
| 62 |
- for dir in "${dirs[@]}" ; do |
| 63 |
- insinto /usr/include/wireshark/${dir} |
| 64 |
- doins ${dir}/*.h |
| 65 |
- done |
| 66 |
- |
| 67 |
- #with the above this really shouldn't be needed, but things may be looking |
| 68 |
- # in wiretap/ instead of wireshark/wiretap/ |
| 69 |
- insinto /usr/include/wiretap |
| 70 |
- doins wiretap/wtap.h |
| 71 |
- |
| 72 |
if use qt5; then |
| 73 |
local s |
| 74 |
for s in 16 32 48 64 128 256 512 1024; do |
| 75 |
|
| 76 |
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 77 |
index 9d120d24bcf1..77c36361aafe 100644 |
| 78 |
--- a/net-analyzer/wireshark/wireshark-9999.ebuild |
| 79 |
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 80 |
@@ -107,7 +107,6 @@ REQUIRED_USE=" |
| 81 |
PATCHES=( |
| 82 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 83 |
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch |
| 84 |
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch |
| 85 |
) |
| 86 |
|
| 87 |
pkg_setup() { |
| 88 |
@@ -214,32 +213,6 @@ src_install() { |
| 89 |
# FAQ is not required as is installed from help/faq.txt |
| 90 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 91 |
|
| 92 |
- # install headers |
| 93 |
- insinto /usr/include/wireshark |
| 94 |
- doins ws_diag_control.h ws_symbol_export.h \ |
| 95 |
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h |
| 96 |
- |
| 97 |
- local dir dirs=( |
| 98 |
- epan |
| 99 |
- epan/crypt |
| 100 |
- epan/dfilter |
| 101 |
- epan/dissectors |
| 102 |
- epan/ftypes |
| 103 |
- epan/wmem |
| 104 |
- wiretap |
| 105 |
- wsutil |
| 106 |
- ) |
| 107 |
- |
| 108 |
- for dir in "${dirs[@]}" ; do |
| 109 |
- insinto /usr/include/wireshark/${dir} |
| 110 |
- doins ${dir}/*.h |
| 111 |
- done |
| 112 |
- |
| 113 |
- #with the above this really shouldn't be needed, but things may be looking |
| 114 |
- # in wiretap/ instead of wireshark/wiretap/ |
| 115 |
- insinto /usr/include/wiretap |
| 116 |
- doins wiretap/wtap.h |
| 117 |
- |
| 118 |
if use qt5; then |
| 119 |
local s |
| 120 |
for s in 16 32 48 64 128 256 512 1024; do |
Archives