diff options
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/Manifest.gz | bin | 43291 -> 43287 bytes | |||
-rw-r--r-- | net-analyzer/tcpdump/Manifest | 2 | ||||
-rw-r--r-- | net-analyzer/tcpdump/tcpdump-4.99.5.ebuild | 2 | ||||
-rw-r--r-- | net-analyzer/wireshark/Manifest | 19 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/release-notes.html | 6 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch | 98 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-4.0.17.ebuild (renamed from net-analyzer/wireshark/wireshark-4.0.11.ebuild) | 2 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-4.2.7.ebuild (renamed from net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild) | 17 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-4.4.0.ebuild | 343 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-9999.ebuild | 63 | ||||
-rw-r--r-- | net-analyzer/zabbix/Manifest | 3 | ||||
-rw-r--r-- | net-analyzer/zabbix/zabbix-6.0.34.ebuild | 389 |
12 files changed, 889 insertions, 55 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex f8c5578f954d..3c1b6cbb199c 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 0c2eded1115e..221d6a064642 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -8,6 +8,6 @@ DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb DIST tcpdump-4.99.5.tar.gz 2045086 BLAKE2B 754c25eafe84754465356042faa1369678655aa93d1b736c259ca9a6bd1e18c44784ae136dc6a3e64af9903c05c29e1379aafd7badc0e129c5a29ae908db13ff SHA512 69bc52ef7af7fd562370adf2e95cb592aad6193df9ab1708de52ac86a4c1cff72e8b256a739b435c324ee2df61051abde7d2659bc40f061d7c4fbcab1dcaa2e2 DIST tcpdump-4.99.5.tar.gz.sig 442 BLAKE2B 8742616147e2965ea6879b471662669f1942cdb8892834ac3ebfd4a6f610bde1a091bb85dc8c0836b26d1db7036d072608d7242ee4ddfbf590a07beb584a67cc SHA512 e36d2023973335cb95e91cb13414f6c0e6386175ed88fdeb2c0afabf7c39ad43f138d13b18ff2e88b142aad5147d37ddc03c3111e9d4d22bf3697e0acc30905c EBUILD tcpdump-4.99.4-r1.ebuild 2139 BLAKE2B 2e76d9fdbe4bb979801f2041ebb026b27a4217ac8da216e550f9071d943aed0e9904d5f43b5970f3b2d2bfb7bcf98ccc9a6b5db82f10a00a973d5c29519a2208 SHA512 36bdacb4767164524300be5810125665df6b79c3073dc68a1942deac32fbdd155e8047a34018e2468dc8dcb62f8b32501f90997c6f9c3ead0fbaa1b7748bcbe3 -EBUILD tcpdump-4.99.5.ebuild 2088 BLAKE2B f8e0eb9fee2687871f9d35e9c66d33fc847c48a845fb015358bddb99ec109bc4638836aad057b169ab609b32b2d12de2c7f19a7da437935110e33872337d951e SHA512 8983149aaa9b875b3291695aacb836db2abd5f5d492f1be3e76aa85b91c21026537f849a470fe3a10fcdce05a75761bc8ab4981ea145a7c20b68eae6483d63f4 +EBUILD tcpdump-4.99.5.ebuild 2084 BLAKE2B 235e0879e0ef5ff2fc61345d205c8e55f82152db96f5dc49128c7bce186ac6d404670bd9c370462a6064ee5453f1c007aaeba7dc94f9cef08d23b8f11bcb46da SHA512 183f42d83def676325593fecb703380ef9194305c54e2db7eb203cbe2acb7d3cd5754caceaf1070682444db5b3a50a65287e4b0fb0632cc07442120fefafd4e7 EBUILD tcpdump-9999.ebuild 1996 BLAKE2B eaf2fae7b34caa7f5b14f4b0bfa28add04cbea8f48eeb421ea2112336fd73137996421362bd5e0bdd487d5d97c4ef8df216b565816b2379c88144ee4b2b68178 SHA512 bebdfd1d866945bc416c4348a943987d7e3e70a05a2f5857eb430908c716287106dbf6fefd1e5ba9ebe9234445e3581fde87f65c20523567bfed446e7348b1e6 MISC metadata.xml 593 BLAKE2B 7b4608973227459d0700d2f402e583a8cad512ca898287c2b32c71f42f6674a2c27cdc94d60e4af6fbe0df1478b8c2a2e0832d249adefbb7768ca1db0f3650b4 SHA512 45196d5f82e8bd5b26e2327a9a85ff7e49daabc5f396d7183a8cd6f3fbabef0d84014e355aa257c861487570f695ec07698e783624447d8d5120a03bbcf0fcd3 diff --git a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild index 15b4ace7bf12..e53d68ee2421 100644 --- a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="BSD" diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index e28c9132f3fd..cda4795de93e 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,21 +1,26 @@ AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959 +AUX release-notes.html 153 BLAKE2B 5b211857ba0be0d40d218f4bea1fabf7a6034b1219d08307ec958684d194898ef96ef152e8996fe1e4b89acf36faaf3d094763244983372ca8a3a0a47942c5f0 SHA512 056da005da67fa1e7ae76bc2243b63b08ccefd437e24d32a2794ac051d9869b83961f5eaeab1838c92a1a46af7417b6d31d7a7f993717a919cf9f38a57f037fc AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff AUX wireshark-4.2.5-http2-test.patch 1191 BLAKE2B 60ea4213237f0f7bf8899c6f0b470b8277c3d17286de9c9e75bfa08b2b52ecbc4c3305bfca3e6da111269333dd9c299e2651da3733b38bf83b0d1511e5b4c03a SHA512 8c42c33cbb4a93d07651c1fbe4d1332ac8191341979229ededafe86d04a778140eae4774ee854950ab4f74d0301a7efa298f9f67991199bb0e95285b425e1afb -DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c SHA512 d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4 -DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc SHA512 c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f +AUX wireshark-4.4.0-fix-filesystem-absolute-paths.patch 3769 BLAKE2B 94acc40c774628af36d986beaaa6929f8cdb23363e5f08ad01c96422733411e8dd77e7c3b785d7aee23d2e53ea764fb7812e434e26394e2e122cd1f475c3e0ea SHA512 281bb07e215114403911bf0277aa45f17dfff99af9b0ae2579e2c62a75b3ad7f9756ebe6ed5a565078a87b071f562ae439982599cbc3d6a93d1980e3b7bfd9e2 DIST wireshark-4.0.15-signatures.txt 2521 BLAKE2B 2ca4163fff33708288b355978220014707fa8ba84ea2237a9a4dcb9da8cd7986811ee3805416cd82d348968edc9d873fa63b5fd121f40e623f0099ab1fd01716 SHA512 e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987eeee594c565 DIST wireshark-4.0.15.tar.xz 43197644 BLAKE2B 6720ee6c879a0005c37452da32bc8e99051baf3eadd53d42b5e93a7f7e2c3cf63657393fd2d4e2d245f1b33ffc10b52c6e5af9fd527e78497dc8d1ad9405473b SHA512 6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a -DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 -DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 +DIST wireshark-4.0.17-signatures.txt 2521 BLAKE2B 9f855e5c66572b62b46518f3c5be90351a69ba1283b1792057bac4fd8bbc492b1b7d6f7adacb114888543b1c44d6dc52ab10c8e842a44d283f8daae2f0db2d6c SHA512 6671ffd4f7de2d0835d33287c159acfb62db739ce58ba3b81bb602b3e4e2f7a969dc4444459c37718d69aa7a1f2e1ab370bd843b62ba59e9e37ae61301b3f3a7 +DIST wireshark-4.0.17.tar.xz 43210400 BLAKE2B 818d518e84ac9bc4814df1d907cfe239c2cfb2a659ecb546f03e1b0e77e101cc0b0c3728d9b9e9626a0dd10ce3dfabba30a6b808f31561f84a8cf3da70cc8d24 SHA512 c7eb6375df60009a6f2efd02385d959cffcfd565fc7254cd0d6aa595127266799d0d296894f8a2ff626103ecc64b763bc617543f7718b8788578711609e29797 DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B d10f6e9b4d8bcd8f0a30501bbbfee9ee696d82c7ca95957532f6614905e7836e5865d1b7093ca6aab2ebc1da5365648803f8b20508c95cdf5b42e8ac8e288f65 SHA512 050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0 DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc SHA512 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b DIST wireshark-4.2.6-signatures.txt 2706 BLAKE2B b9666d6aaef774e08ec903bbda90067adaa357cee65cdd6b711b6caef7b1cd540290a93d80d2f3f29c861d212c97793303e51fc8f297d7945c379a237acfa3f8 SHA512 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b DIST wireshark-4.2.6.tar.xz 45015272 BLAKE2B 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 SHA512 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 -EBUILD wireshark-4.0.11.ebuild 8623 BLAKE2B 992148191f9860f4be07e97e3aec3523020d0e3173bf3beb1a4c838b7f769d6492e36e5ec7f8cf92ff67f67549f09143a1e8444381b8ba08caab5478fdccb961 SHA512 0e28fadec59141c2a9eab0a8715890fc3d7ff33a260978748d0c25c12e4af4068434f4fafb1c56391b9cc0e8e855f6391bdd1ffac8456b9f36186191169edc5c +DIST wireshark-4.2.7-signatures.txt 2706 BLAKE2B e209123e0785f7cdda0083c142575a89d5874f647bd5ee3ef3010b9bca558bf90297c1434191d1c199a02035fe3305f38642410e76ee4b00bfa459e950d2fbb8 SHA512 3bc3f0a9e9de25c9e025ba6d91259f038f15444a1c10197a138a7558cfb69e80163e7b1064d6dbd9701ee37b71834caadc9843b2f21a41ec683853e7c5f0f24a +DIST wireshark-4.2.7.tar.xz 45017312 BLAKE2B ab82c4ff9afa0fecb3cddbabc7441c3f457c2ccfc39f8a1e65f5d4df752bbdf7cb3d892db5a3de86ec055b12c512f4d067f6d98626ecd2f58f31052e10415be8 SHA512 22ef36bb18610c36d848277c95df17734ac266ea301e636fd19900da0ac49c3d5ce8b59c3fce3a2ef1e919c70fa4003647cbd417c06248dabe498f5772f62c15 +DIST wireshark-4.4.0-signatures.txt 2706 BLAKE2B 46337f24dfe32b1ff39f8a0b1f30c29a43d7a02a4e8e787833dde47a98206f36501b3e7fe449cc874f81733f8a7b2a16b4e5b07a2fae20d7ddae0121adbc8f98 SHA512 1725790d0671d31814b92508079a135d328df58bd94305e2406a3edf9e08bc5e2bb4ac487045b99684acb8cc8343422cececa32319bbcb36712bb3b2c860cb0c +DIST wireshark-4.4.0.tar.xz 46786568 BLAKE2B 679b774e780201d1d188f5ce2ec1eb21d98250d2dd45b37b741a3cd5d6dc59d983e473a3f87e3ae1b8eef0b0f9b0c02227eecee644697ec19b6c3b2a21a5ad31 SHA512 a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e EBUILD wireshark-4.0.15.ebuild 8623 BLAKE2B 992148191f9860f4be07e97e3aec3523020d0e3173bf3beb1a4c838b7f769d6492e36e5ec7f8cf92ff67f67549f09143a1e8444381b8ba08caab5478fdccb961 SHA512 0e28fadec59141c2a9eab0a8715890fc3d7ff33a260978748d0c25c12e4af4068434f4fafb1c56391b9cc0e8e855f6391bdd1ffac8456b9f36186191169edc5c -EBUILD wireshark-4.2.4-r1.ebuild 8904 BLAKE2B 3d9d741806defe5c9d87d6ecf240632cb4a18561aaa9c5c59672ce351c04d8d601e26694e2bd25a82a19a110099bcc982286dad2f0c2b0ba2f829b44ccb69079 SHA512 6b22e258580abc67c34da5ab9b8430cbd9533c5c026bbf46ffbe61966f218dba7e6797769ae43800400664ca3ced3606c976ea60cb0f8a8a8e6beeadc129cb27 +EBUILD wireshark-4.0.17.ebuild 8628 BLAKE2B b8ec7b14e352cf51d61a060a69ce455b33426599bff5e690b718d1a697f1d15d839b93b5fc26e7e4ea17a15cb609531221e7c2721dd676629b80d4d45038d320 SHA512 dab15b984402326cd6d07f1d5a21b2be5c38fb029830f1552f6b42d7d9c4b9a82f876745718fd3541d9b89dd600b0a21de7d9cb0641d5bb15cb18ee198aa97cd EBUILD wireshark-4.2.5.ebuild 8833 BLAKE2B 129f9c0384dfce149b9cd6312fe68d5627730a84291d6c66caef8cb85d71fbf4d6eea47b580334800cd0545d75c908e0a387d50cdba397908387a2555895699c SHA512 a1cf1743ce049a7a1362d766d60da2bfb24c3cd1cda7787aba4df1e9a77b69497259570a6ec81963bc75c3a8312790d9afe6a72b861c0d24a95131a5704fa352 EBUILD wireshark-4.2.6.ebuild 8816 BLAKE2B 0a0a1150be1ce3d3cfa05a7f92992d531bace95ed950cf278257d30da2974a5f77491bf0b65d996a7fe93b4db208a02d6fcb72dd63635abb8ecff92eff96f718 SHA512 29e2fc674d8964eb23878634199b1865277a4823cdced6552814e6c82eba12838d460fd4b49b4da68a902d6db277575106407b072ac4cc3c518cdcf46b28352c -EBUILD wireshark-9999.ebuild 8813 BLAKE2B 0475fbfc384e18d3621ff9317ed71c7504e8d90a7378552b6c88e999c8835a7cb86aa0511bd66e95bda3c7e260c59766a57eac88a690a4ca545989dd0b135925 SHA512 8dd3122d0e77f4ad4ac17fa692c4b3f765c612244b62c393001fd5cc0d3f9ac13e42dac0c05ba45f25858088c9bbb717b74ee8c17b728d57599e9a4a41ccbf4a +EBUILD wireshark-4.2.7.ebuild 8820 BLAKE2B 094c80ccd41f08d069b3bbafb458254ee5671bcbe27aa24ff8fbb3b60520434ba12628102f6c8f0c95ef4cfdb940e3c2e111b37194add62f025dd34b3fdc5bdb SHA512 0bd38d485b507aa2e7871471c96dc5896fcbd3b2e3df91f340ce4bd6ba570d174d739392879e40788376dd26281cf4e68f4d27e865a48695b03b3da6c643efa9 +EBUILD wireshark-4.4.0.ebuild 9032 BLAKE2B 05a167b04e0b178c2a7d905c21bfb1cd172fc65b89978a5c19d30787f9295727f7920fbc5223f1e54c73f6600170f2ccdaa6024f43d44f75d71ab53a2f90393f SHA512 da0ea59bb7de61f1685581df37bf6082e6f0c04fea638b933932079a668c3024af569f36e96131ac7ef7a2cd09de447b4a8b4ed419dd823bf5637b83683ec58a +EBUILD wireshark-9999.ebuild 8953 BLAKE2B b523ba1ec63efc9cc2515610eaf4c966d8daa87cf34ec311bfc56ebaa3e175c491485eec3d7156391fb67c5a1f19efb206e65dc41a45ca42e6d054cc84273f35 SHA512 f64a4e7a726838c1623183afb8f27ce0dd85221225050758dfec150cb4c92a8d672ba1296b88da44d73074a1399640c91d01d7def740ebcbd7184677443ab83d MISC metadata.xml 5352 BLAKE2B 319ae9385ccf49cf52abdc3bb2292a6181f8bad974eecb1863b69dc248e8e1b17d95de5c7267e4e70ee28809bffc82a13f06de3e7d15541d32e2e2ab7ada638f SHA512 15580364ef3f86e9d4020c8b7e2e765a2be97742dc398d11697b87e15085e1a95e951d0200eea71484fb8d124d54b86da8542921c0b8f29d064a26681192d919 diff --git a/net-analyzer/wireshark/files/release-notes.html b/net-analyzer/wireshark/files/release-notes.html new file mode 100644 index 000000000000..fae4810cc97c --- /dev/null +++ b/net-analyzer/wireshark/files/release-notes.html @@ -0,0 +1,6 @@ +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="refresh" content="0; url='https://www.wireshark.org/docs/relnotes/#VERSION#'" /> + </head> +</html> diff --git a/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch new file mode 100644 index 000000000000..ff7a8f25591c --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch @@ -0,0 +1,98 @@ + +Patch from https://gitlab.com/wireshark/wireshark/-/merge_requests/17202 + +From ac7e2e846ed8cbcaf7938d3bda3e289068af743c Mon Sep 17 00:00:00 2001 +From: John Thacker <johnthacker@gmail.com> +Date: Mon, 9 Sep 2024 08:49:44 -0400 +Subject: [PATCH] filesystem: Work around CMake absolute paths + +CMake recommends that the various CMAKE_INSTALL_<dir> variables +be relative paths, and we have been assuming that they are. +Absolute paths are technically allowed. + +Work around absolute paths, and just don't look for the doc +dir, etc. in relocated paths if they are. + +Fix #20055 +--- + wsutil/CMakeLists.txt | 5 +++++ + wsutil/filesystem.c | 26 +++++++++++++++++++++----- + 2 files changed, 26 insertions(+), 5 deletions(-) + +diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt +index 2daf371ca2f..976446bcfe7 100644 +--- a/wsutil/CMakeLists.txt ++++ b/wsutil/CMakeLists.txt +@@ -7,6 +7,11 @@ + # SPDX-License-Identifier: GPL-2.0-or-later + # + ++# CMake says that these paths should be relative to the install prefix ++# https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html ++# Things generally work if they're not, but it becomes impossible ++# to relocate paths. Work around that, and just don't try to support ++# relocation. + file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" PATH_INSTALL_PREFIX) + string(REPLACE "\\" "\\\\" PATH_INSTALL_PREFIX "${PATH_INSTALL_PREFIX}") + file(TO_NATIVE_PATH "${CMAKE_INSTALL_DATADIR}" PATH_DATA_DIR) +diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c +index bec1cea25b6..942a8c7dcf0 100644 +--- a/wsutil/filesystem.c ++++ b/wsutil/filesystem.c +@@ -1107,7 +1107,11 @@ get_datafile_dir(void) + */ + datafile_dir = g_strdup(progfile_dir); + } else { +- datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ if (g_path_is_absolute(DATA_DIR)) { ++ datafile_dir = g_build_filename(DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ } else { ++ datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ } + } + #endif + return datafile_dir; +@@ -1159,7 +1163,11 @@ get_doc_dir(void) + */ + doc_dir = g_strdup(progfile_dir); + } else { +- doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL); ++ if (g_path_is_absolute(DOC_DIR)) { ++ doc_dir = g_strdup(DOC_DIR); ++ } else { ++ doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL); ++ } + } + #endif + return doc_dir; +@@ -1246,7 +1254,11 @@ init_plugin_dir(void) + */ + plugin_dir = g_build_filename(get_progfile_dir(), "plugins", (char *)NULL); + } else { +- plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL); ++ if (g_path_is_absolute(PLUGIN_DIR)) { ++ plugin_dir = g_strdup(PLUGIN_DIR); ++ } else { ++ plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL); ++ } + } + #endif // HAVE_MSYSTEM / _WIN32 + #endif /* defined(HAVE_PLUGINS) || defined(HAVE_LUA) */ +@@ -1379,8 +1391,12 @@ init_extcap_dir(void) + CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); + } + else { +- extcap_dir = g_build_filename(install_prefix, +- is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL); ++ if (g_path_is_absolute(EXTCAP_DIR)) { ++ extcap_dir = g_strdup(is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR); ++ } else { ++ extcap_dir = g_build_filename(install_prefix, ++ is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL); ++ } + } + #endif // HAVE_MSYSTEM / _WIN32 + } +-- +GitLab + diff --git a/net-analyzer/wireshark/wireshark-4.0.11.ebuild b/net-analyzer/wireshark/wireshark-4.0.17.ebuild index ad1bce936375..7f406bb3655e 100644 --- a/net-analyzer/wireshark/wireshark-4.0.11.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.17.ebuild @@ -23,7 +23,7 @@ else S="${WORKDIR}/${P/_/}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~hppa ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86" fi fi diff --git a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.2.7.ebuild index 4b5688aeff54..e6493d6e836c 100644 --- a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.2.7.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) # TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -24,7 +24,7 @@ else S="${WORKDIR}/${P/_/}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm64 ~hppa" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" fi fi @@ -139,10 +139,6 @@ if [[ ${PV} != *9999* ]] ; then BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" fi -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch -) - python_check_deps() { use test || return 0 @@ -206,6 +202,10 @@ src_configure() { # Force bundled lemon (bug 933119) -DLEMON_EXECUTABLE= + -DRPMBUILD_EXECUTABLE= + -DGIT_EXECUTABLE= + -DENABLE_CCACHE=OFF + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') @@ -272,11 +272,6 @@ src_configure() { src_test() { cmake_build test-programs - EPYTEST_DESELECT=( - # TODO: investigate - suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream - ) - # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html epytest \ --disable-capture \ diff --git a/net-analyzer/wireshark/wireshark-4.4.0.ebuild b/net-analyzer/wireshark/wireshark-4.4.0.ebuild new file mode 100644 index 000000000000..f82761643441 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.4.0.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3..4} ) +PYTHON_COMPAT=( python3_{10..13} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtdeclarative:6 + dev-qt/qtmultimedia:6 + x11-misc/xdg-utils + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + dev-libs/libxslt + ) + gui? ( + dev-qt/qttools:6[linguist] + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( "${FILESDIR}/wireshark-4.4.0-fix-filesystem-absolute-paths.patch" ) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + # Force bundled lemon (bug 933119) + -DLEMON_EXECUTABLE= + + -DRPMBUILD_EXECUTABLE= + -DGIT_EXECUTABLE= + -DENABLE_CCACHE=OFF + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '') + $(usex gui MOC=$(qt6_get_bindir)/moc '') + $(usex gui RCC=$(qt6_get_bindir)/rcc '') + $(usex gui UIC=$(qt6_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex gui) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DLUA_FIND_VERSIONS="${ELUA#lua}" + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # prepare Relase Notes redirector if necessary (bug #939195) + local relnotes="doc/release-notes.html" + + if ! use doc; then + # by default create a link for our specific version + local relversion="wireshark-${PV}.html" + + # for 9999 we link to the release notes index page + if [[ ${PV} == *9999* ]] ; then + relversion="" + fi + + sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die + fi + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes} + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 1a49b2ff63b7..8e531a1680b6 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -3,8 +3,7 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..2} ) -# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +LUA_COMPAT=( lua5-{3..4} ) PYTHON_COMPAT=( python3_{10..13} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -24,7 +23,7 @@ else S="${WORKDIR}/${P/_/}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" fi fi @@ -32,7 +31,7 @@ LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" -IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" @@ -67,20 +66,11 @@ RDEPEND=" opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtdeclarative:6 + dev-qt/qtmultimedia:6 x11-misc/xdg-utils - qt6? ( - dev-qt/qtbase:6[concurrent,dbus,gui,widgets] - dev-qt/qt5compat:6 - dev-qt/qtmultimedia:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) @@ -95,11 +85,6 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - gui? ( - !qt6? ( - dev-qt/qtdeclarative:5 - ) - ) " # TODO: 4.0.0_rc1 release notes say: # "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." @@ -115,12 +100,7 @@ BDEPEND=" dev-libs/libxslt ) gui? ( - qt6? ( - dev-qt/qttools:6[linguist] - ) - !qt6? ( - dev-qt/linguist-tools:5 - ) + dev-qt/qttools:6[linguist] ) test? ( $(python_gen_any_dep ' @@ -207,10 +187,10 @@ src_configure() { -DENABLE_CCACHE=OFF $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex gui MOC=$(qt5_get_bindir)/moc '') - $(usex gui RCC=$(qt5_get_bindir)/rcc '') - $(usex gui UIC=$(qt5_get_bindir)/uic '') + $(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '') + $(usex gui MOC=$(qt6_get_bindir)/moc '') + $(usex gui RCC=$(qt6_get_bindir)/rcc '') + $(usex gui UIC=$(qt6_get_bindir)/uic '') -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) @@ -234,7 +214,7 @@ src_configure() { -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex gui) - -DUSE_qt6=$(usex qt6) + -DUSE_qt6=$(usex gui) -DENABLE_WERROR=OFF -DENABLE_BCG729=$(usex bcg729) @@ -284,8 +264,23 @@ src_install() { # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd cmake_src_install install-headers + # prepare Relase Notes redirector if necessary (bug #939195) + local relnotes="doc/release-notes.html" + + if ! use doc; then + # by default create a link for our specific version + local relversion="wireshark-${PV}.html" + + # for 9999 we link to the release notes index page + if [[ ${PV} == *9999* ]] ; then + relversion="" + fi + + sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die + fi + # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes} # install headers insinto /usr/include/wireshark diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 3f13e901b706..6d3ed562c7f1 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -23,6 +23,8 @@ DIST zabbix-5.0.44-go-deps.tar.xz 27826116 BLAKE2B 0b96e7cbb40da4652945b7092d71e DIST zabbix-5.0.44.tar.gz 21884200 BLAKE2B ca5c75a789692b0b30c897a965ab6365848320cb1f3b1adfdcfa42e5ca731ca9058429964e7cfe8eac9a36982ae53c3a377a2e7d5062830adbe4255f10d10e5c SHA512 9624159c131736d8d4a8dfae72ab57427466298ed7b05f9ac28254aa4cbfdb23b94e37b633664b36bd0d65fe156b2d7b0f069cd5baaf7fc95fa9348f73ba892c DIST zabbix-6.0.33-go-deps.tar.xz 30931784 BLAKE2B 675550b5573917aa091ed5a84670d3aa218484e5c224f02e9fa7f93a99beb11296506f69d6d3858b4382d83e8fc0db78414ceb9868fff5ddd83ceadb8df3e7d5 SHA512 62c61406b0f327bdf2362c6aa3a31a2c12fd9b8e55fa8e0667035a3ff28a26f41703adc9f195937a5fad0ff0f13538684c5cf99cbf8734540a0e7e04404b3129 DIST zabbix-6.0.33.tar.gz 45392256 BLAKE2B 736c5b46193e7e7f93dfa00eb56c65fdf3fa6e36a647d0f910118923950114dbbbe9382563e96db4d8ee6199b4e0342037fb8ec6ec8d349884612f5ef18db966 SHA512 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d +DIST zabbix-6.0.34-go-deps.tar.xz 30898908 BLAKE2B fb37b29d4127cac5911cc84632047a835f167917d4c5651bb82cf15303c138782efc69c72580d7862c1fa8029efe30676c5a62ebf0dce586a85f2604734931a7 SHA512 b003b0bacbda0867d812a316a867ee5256714f957f19d343d66eacc91917fb4396782607b0510318b4d39d8bf3ba9a34c329ae3af3549203da9f1fb86f3557d2 +DIST zabbix-6.0.34.tar.gz 45586283 BLAKE2B c1448065d32fea1f3b08566a82f165cf1f37c9f44f3bd0c5228f1df2d86173ee073216e11be5af9df13e48ede20a1ced52afa645c451c0bab98b06fa46ce0b03 SHA512 17f4481d0c480f52c21d58774c79de9101f30842d2e48dde373087e457bfad45155baa61e64502b3fe908051f019e3fe08b61c994afd1ad9db2c2e0dc6aee9e4 DIST zabbix-6.4.18-go-deps.tar.xz 33714692 BLAKE2B abb5899e8ce233fe20a84e167b3615e46c578901df6786cb7e7781f355b108a44bb06ba68426483d5c5eb11fd5c0984efa945224d53f0ebd4a358e9a35c48b26 SHA512 8032fca6dff2f48f16e6c7e37d3df06336276c7f242654996b80f7c5eb083d289f5e6d65c8df79e22b956d28ba498e68eb2fe42adeedac97942bb73a23122d1e DIST zabbix-6.4.18.tar.gz 46907603 BLAKE2B 978c51a40995687537c453feac1232d39490fa4f49973f3a7febe6e7a0d5424b056b26f7f2509cb7e8fca8c9c648e7fe16208e7f72850fb3a73d92d09e0115c0 SHA512 b7a6b7bd5321bd7921a9ecb5fb205a872dc5db06a82cb307a26233cf5ee644f8a6d8087b03396bdef4a86095839e5c79cc269b19b27adefb13aa387bc5607cbd DIST zabbix-6.4.19-go-deps.tar.xz 33706768 BLAKE2B 721512ca80a4b9b256d66f19b4cfd03b6b16837e3ae3cc2df5fe0511551feb078a3d138607e7c27ed8adab91c461ccf30d65a912dc24b43cbf6b45500691acc8 SHA512 acf37fed3897002db5a772e2d118640f20e67ed3edfc1ab06b9bd76cdfd3d5b0cdab290a42e08486a42b18900b022cf4f259814f51639abe2e26c9f6a4a78f1a @@ -34,6 +36,7 @@ DIST zabbix-7.0.4.tar.gz 48621273 BLAKE2B fdd1acd8d1f97495005338f4eb0a4c35818a02 EBUILD zabbix-5.0.43.ebuild 9819 BLAKE2B 7be0b02fa0842b250033f883c48f41963d6a0998054fa443ef26c910ffb77c1c1e40e54628fd90de8a8a24c20f45783d7570408a40e6eef727a1fd0ecaabfc3b SHA512 793e988e130abde40652ef3e9d594c46918332aa11da855b68196f23ffd206d237a21d031b21a836ab2ec19b1bdd860b21f8733631f9b2874b51787dc9b681d3 EBUILD zabbix-5.0.44.ebuild 9820 BLAKE2B 2dd36519889153b919fde6e9d10459ca36628a6dee8fd69234c39db7962cdc9286e21811ae8f6d1298fe382028b629cb632ec5a47bd8daad01c62b41ce55940c SHA512 122716188711a194d8ebf11cdb5500f1a3375a4316ee55934e07cb7d396482f77a72c5ec80251636e8bb980898d4988d11b9e95a781d927187c4d7ca9b21ac65 EBUILD zabbix-6.0.33.ebuild 9934 BLAKE2B 82ced7b4693f61272cd933c319188ee41934b7be0494c1ff81312e1426f54180bd32dd267fd8073cd10f054b17dbb4204924f379c9b3b5a77eb82a8109002895 SHA512 fb1cebac60d5f86d5073f09ca85b48de0e42639eb622a49e8be4774edc4d6f25c7c4150c98611945eebff92a09dd5058329a7506386a178cc8e3d905ff2bf9cf +EBUILD zabbix-6.0.34.ebuild 9935 BLAKE2B 709f063488c60e870ca41ae8e4fad65d56745d0cf0434ee63015b52508910f98c4eed268ca59c4a5cf0ec00591ebe74e1653f0ff0491c0b5421719a9a2945ad2 SHA512 fadde9d5c32db0c9d7ac9102542093b7168e1b4b2bd1f5ce4515f5186b3cf94de244cf5f54066308a25f6836dc5b3ed4c00c89c3a7528c5e937e3fc1c95d2662 EBUILD zabbix-6.4.18.ebuild 10035 BLAKE2B 9e857bb98ddbb1113728eedff05e3f1c510c73b9448035b378079635eb18bc8b40459267d6ed9d98339ef99428a15dc5725e93e8e45dfe6395d02ee056073955 SHA512 60248c83b12efe4d84bfc071955190899f28686578f2784530e7f8aacd87fe4146d6d828b02fb3ecc3c7e381716bb9d1f3f9686bb23a391baa62c8de6dcd226e EBUILD zabbix-6.4.19.ebuild 10036 BLAKE2B c38223752b0afba1c5398215a842bec17ec8c96b0dbb5c60542578a71ad76d60a9b788b706577aa1915ed4a6569a33ca4c3f11619db141a1d9a0fd6f934c81a8 SHA512 e587a9af5800306ede457d139860ccbbe38214ed26007fbc60d2fe7cbfb288f562a225c04dca05655c1f3ccbf1c3f97b1347e86cd4a4e32269ef950f0a51a772 EBUILD zabbix-7.0.3.ebuild 9369 BLAKE2B d3d3f3a57eb064fba1114a43a876513186c7230818c0a339d6866827608c935f5663b1296e0010f3d090f0eaec125557038f15ffaebc6aacb685ea7a3968ccc5 SHA512 a604c5e07a50fd9f538e2beed48c63d29decc95ed9b379ec0089d25f58d1ae8dc0308e0bfb547b9f14f348e5b364aa727f33cfc96edb4e74fc507a926fe69b2c diff --git a/net-analyzer/zabbix/zabbix-6.0.34.ebuild b/net-analyzer/zabbix/zabbix-6.0.34.ebuild new file mode 100644 index 000000000000..44884d9f45ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.34.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} |