diff options
Diffstat (limited to 'net-analyzer')
136 files changed, 878 insertions, 5452 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 48254616acd4..73dfbe813904 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index db816951896e..189f8da72bb3 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -5,6 +5,6 @@ AUX argus-3.0.8.2-fno-common.patch 929 BLAKE2B 9fee5b11eb3d0436547e6d26fef654e6c AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 -EBUILD argus-3.0.8.2-r1.ebuild 2068 BLAKE2B 00e9eb4c63af850f4da2625c2b641936cde356fa1d1eda6745877ad3f4d8c60c1b8b16d0fc115b3b9eca48f9b4faa5ad35ff426457d3c566f4f90c209b80ab77 SHA512 339ffe11920b8ee69d6b6c8efb2f6497ab761b60be0cc78ac42848ea0ddd4d390d0568804fb9e282e13059118ed60cd2e944db53d1cc3f8accf833247c1cbe1e -EBUILD argus-3.0.8.2-r2.ebuild 2166 BLAKE2B cfd0204916f57849156ed13adbcfa57732d93260e0454cc85d087b18e11e05ecb555f129a801d0cdecbe4eb5919fceb7bdf9e29714882eb1929230941b7d1ecc SHA512 deab478d98123dd96ab98db4605f075430a26e1c0f757f81524e2788c8dbc5b20bb0f869796d532c64e17699a58678abee44c70e00ace713e462bc5019c6731c +EBUILD argus-3.0.8.2-r1.ebuild 2067 BLAKE2B ef1fe40bc38cc957a3c637313c34d2339f8ef2f1034928fa476ad8a1f92bdf075cf6b4c8d00b289a090a470221747c6841e1c6fa09566d8d584c892df864705f SHA512 7754f0257a9e35729defab6df1aa626a66c8560fdbad211dc60e79c574bcfcef814f39d8530d81ed3329a5385127b4664a39058df755286a1409d009e32ec9dc +EBUILD argus-3.0.8.2-r2.ebuild 2165 BLAKE2B ccb45a1eedf0d5070bd75ceb28f6d4efb15505cffa2d653a6aabb9669e771e251c31dd3b8445fe667e172b3b86c278ce665da8a8c896379e1ae5b1afbdd7446f SHA512 1439de1ef098d5b0815367e997e7eb9ec93f5c4e3e8bd5262c5707e52e5bbf6ce459bcd5df927841cb629ca15192d05c54cf6ef87966d822c40ed021ef6e7d67 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild index f77fe6f2fe10..2e662864e3e6 100644 --- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild @@ -62,7 +62,7 @@ src_compile() { emake CCOPT="${CFLAGS} ${LDFLAGS}" } -src_install () { +src_install() { doman man/man5/*.5 man/man8/*.8 dosbin bin/argus{,bug} diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild index 73a6fd17e88f..807aab798e06 100644 --- a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild +++ b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild @@ -68,7 +68,7 @@ src_compile() { emake CCOPT="${CFLAGS} ${LDFLAGS}" } -src_install () { +src_install() { doman man/man5/*.5 man/man8/*.8 dosbin bin/argus{,bug} diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest index 00c92bd3ae18..72d81a2d8d7a 100644 --- a/net-analyzer/arpwatch/Manifest +++ b/net-analyzer/arpwatch/Manifest @@ -5,7 +5,7 @@ AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 -EBUILD arpwatch-2.1.15-r11.ebuild 2218 BLAKE2B 7b6734bf7b6bff877416eed579e7856a6c2e09309adca029b29b0788b7eb4fc297ef73ac5883f4bf0eac5c716460077232db11dda290a15769fe937fdf675881 SHA512 014f820a79f7c62ffbc0aa3c85e59af8496b6bca09b3438c532a765c2c6a006e9429bd916c3cff395bed9a3b4e254a5f3d46549ff995279f8a8a32641f2f8947 -EBUILD arpwatch-2.1.15-r8.ebuild 1376 BLAKE2B 0924d01b3126961c45bd7f0db106f051ea8d235d361176b83d35281f29e10cd5557a26c05fca148bb104bacb13af2f92e534e509bc1b5a6e8339b6efb6f26a1f SHA512 90214a7dce649be52522c66a64746879b607d5269b6f57b08448db6347998b01ea35e58a336ff729cb7519ac6b2ec05941290715d5178f73578a382fad382e3b -EBUILD arpwatch-2.1.15-r9.ebuild 1358 BLAKE2B dee35cc7a102f17601627a6eabc537fa54627085e2e87ce1375153679b0d3fbbceb877d31e6fc4d2b6a0a3c20c640055974dce976f5c49f59661ede1f8d977ac SHA512 940b9ddd4d17e217586ec344acf7b40aaa04d060adb7af2572408eac4e828d16a9d578ae526e862a700abac8465f3b06c2fda0215993e66eb517348e31252f2b +EBUILD arpwatch-2.1.15-r11.ebuild 2217 BLAKE2B a1f042a28108e69048d0d5494659fd890633d016bab65637ae3fd85d08bdc65e0c8d73fefbc60f4ba6a7ba40534b3fa3bc154cb8dca3b9e3be60b40480085e6a SHA512 af35788a8c783a35429835039940112fd9f470f99942251720609584c765c933bc49eace118fb401d291bb3d14a3e8599e8eea7d23a099907c513b03bad3ec8c +EBUILD arpwatch-2.1.15-r8.ebuild 1375 BLAKE2B ea7a95aa5dfb0d1f46820bba13da044476e1395a7a22f0b13dd70fbee1824a763d24797ade3d7c74093cbb4c81aad9420a16978716f6210ca35d6a8c364ea89e SHA512 d7228a4473f28162ca9c50b74538ad461193a44db4f583dfa3fe20475a3837f6ef90e096e073396d3932580c8333cfb2675f7d48bf309642847c6d18e8ea81cc +EBUILD arpwatch-2.1.15-r9.ebuild 1357 BLAKE2B 5c18e76a61fb2ad63e7f999bc326fc370cfbc0816a597f2f603b5b4e09214b93326a0340334e55e3edecb03a4934eec6093a47ca305c75c8b6ac4e76eddd1458 SHA512 19e8abb183a16693af2d595798f19cfbcc44ce855c8ae4db5a55b298421f98a95d39be94208a16b66c3106735afeac491588be75ca601171eb98a46016a39d8e MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild index fa78f4e10fa9..d30e87c6a301 100644 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild +++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,7 +50,7 @@ src_prepare() { cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}" } -src_install () { +src_install() { dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild index e8a073a8aae2..cc30e77d1ac7 100644 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild +++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -40,7 +40,7 @@ src_prepare() { cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die } -src_install () { +src_install() { dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild index c592f5b50ab4..bd5f1d4704ce 100644 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild +++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -41,7 +41,7 @@ src_prepare() { cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die } -src_install () { +src_install() { dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest index b80615f9f857..002819586795 100644 --- a/net-analyzer/barnyard/Manifest +++ b/net-analyzer/barnyard/Manifest @@ -3,5 +3,5 @@ AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc67 AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5 DIST barnyard-0.2.0-patches.tar.bz2 12911 BLAKE2B 06215ec8cc8c2fb7ff8e57cfd2f02456180263778722001442faf8f32445fc7fa7fc0da5d00644dbf239949d5e02dd76025428c14c6c1bae8b6565ddf6edf08a SHA512 e8e5243d49b71dd76e3274e27116f99ea6c674983cb18499889c9d27a83740a6b17aa6d30c8a9acdb46103da8314679f4eba8bf1cd252d7fb6b8a34afac46b21 DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6 -EBUILD barnyard-0.2.0-r5.ebuild 2171 BLAKE2B 90208ec91836b57f7d597754642db285c497dcbab56c036b3083b889758559c0fe04938cadc63ae7d730f007ff504afc81407479f16c866f83ef6e5f0ea084b4 SHA512 0874cebfb8d2cce7226744e97dcf8f6c2329b2eaf58c2b71e7d65e407dc20b8b1bddd462ce20c9dcbc29acc0816be34cd9260b20725f4204a16b2cb782e8ec3a +EBUILD barnyard-0.2.0-r5.ebuild 2170 BLAKE2B e0fdeb2924b236856431e31150dcff8c6ca6898d7477ab0911d06e179e9e032d726a5777fd985f2e906ee5dcb29ffcd564ce7fb35194b5ebda0be785b54d1bfe SHA512 da9a7b5ea1bf0e68a152dbcc95dc8af5f4490799052a3d360035805d25bd5c21d7b192c21561c24f25e5cc01621fbd224c63b7aac39969396af1ecd8615fe6db MISC metadata.xml 541 BLAKE2B ddc79b316fd21ac343ddffc0d8d38970583f9cf99d36504a7a55379dadcd32a1e9d3033de894a5a9a26e4d3c4fb42cc69f387c7e55931f4c5c7e0c1d262b0124 SHA512 7a936ec510957c8fb449857a12ff6c54b7498657af33244fcd0759c0786adc9523fda42e6a5e46b0a36c57144f9a2dc2d4179624b1fa700fac53fe83d0d73b1a diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild index 5d369ae6705d..3bdf7cdd9cb9 100644 --- a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild +++ b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,7 +54,7 @@ src_configure() { $(use_enable mysql) } -src_install () { +src_install() { default keepdir /var/log/snort diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest index 90ac598fb49a..926c702995e6 100644 --- a/net-analyzer/barnyard2/Manifest +++ b/net-analyzer/barnyard2/Manifest @@ -7,6 +7,6 @@ AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f63887 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423 DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246 DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 -EBUILD barnyard2-1.13.ebuild 1921 BLAKE2B b91c3c05f834a75e0b68bc2e881552d9db289721869c2418e1f908c78cabd99cea3687750fd6f54fe178c26ec027b32ded738d0ba7e223eb30bc8d7ab7536fc4 SHA512 0e13345b0b1f5c8c73b5eb0ff1ab0eee4e02baee928ab4ee521e51a1032a7044b9fe2148cc725c0cab73aead9accdd33c41a913b5669aff260438bd5c01767d5 -EBUILD barnyard2-1.9-r2.ebuild 1720 BLAKE2B b05ec48d30fc48ecd74d814790ec61df13c7e7d2b98e389859dfdf4a05642e7fd5bb9f47d3b9b8a587f9a6a154657cbbb925af2e493cb951e889239e3a4c28f0 SHA512 0d0967ce5498054f075d163e407d1d04741c2329cee2ab205e1d4990e5918ec63f4948e75456e8b9ae628e9206a95b0a3602473074d9ff2be3313788b6302fcd +EBUILD barnyard2-1.13.ebuild 1920 BLAKE2B 7036c33ca24498c2bf6a72e00f8063e5f0433817ede0a7d0749bd9e7b1cd059b4c3660d2241b98922def38e694e09dc9233e0b2da27f68bf09229b0907f473b2 SHA512 86d88b50effe455c8bd7c1f12164851bf5d7a89d987ac53839b99d47dd2e09e79cc8064c97b048994db468bc6778ea6992c42ea068146826053f9f5981674dec +EBUILD barnyard2-1.9-r2.ebuild 1719 BLAKE2B 7e4bd72ca6fe1b7d08a90aa727808a4afbd426fdd17a54ceaa02fee737ce6529504eabb1d0a8b5db8d0960af64bd2952fc3187d48e38d2eb75e29a04c6b37f22 SHA512 cfcb840afcf1ba4f31d22ad391cd222556974deea51bf81f9654180948270fb5c0e5539d1a18be04741e7fd754a29e6964c17ec24cdd55d677ad6b96f9d73eda MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index 64f00cbb8a96..b5215fde7f42 100644 --- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,7 +61,7 @@ src_configure() { --without-oracle } -src_install () { +src_install() { default newconfd "${FILESDIR}/barnyard2.confd" barnyard2 diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild index e936e8d53c18..7a9d865754c7 100644 --- a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -52,7 +52,7 @@ src_configure() { --without-oracle } -src_install () { +src_install() { default newconfd "${FILESDIR}/barnyard2.confd" barnyard2 diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest index fec1c9b99e06..5f2af23b3d3a 100644 --- a/net-analyzer/bmon/Manifest +++ b/net-analyzer/bmon/Manifest @@ -1,5 +1,5 @@ AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d -EBUILD bmon-4.0.ebuild 977 BLAKE2B 3641494d5435aa6119eb33229482bee50f63a3ddaef852e702d02b89ae208ab5e8f6b0d6bae2f04a915e4f2a902728224f892656c4a4bcbe9afde2fd22ad36bf SHA512 64e34261413488c02d7d84a9baad0c648a06fdfd3703d813b334e344ebcfe382cbda873137c9e3bf944db59181e4c04576add61e4c81113d034613a357078c70 -EBUILD bmon-999.ebuild 897 BLAKE2B d709b1098354d47dd2c67987e8adb63c2e6f02778772d45999bab26c901b504726262aff9d2ab68ba22b7d30fd2feb37213525b3ef33a67d5ade887feffb4294 SHA512 05e6be09ca6566481fcf8d1092d8b46282abddaecf5c6d84c1d4f3c4e1552e9993ed445afab6f29c7f997cf79179d1804e793cebe0fb280c62d5139e4077a5d0 +EBUILD bmon-4.0.ebuild 935 BLAKE2B c617ebeb4143f3c55afdd47723188737eace0cd66f6fa80b6f228d4f7f5e848209a2a0e453064a33dd1779ec3b1f4c9b99e74902763dfc8827a425a7c2ebe864 SHA512 a6c746ed42a66c11a450202c0a3a5a840c5f7f3d9a744b2acd0294b87f09fbf3b8d76801fe474516276bfb1bf203710ba04cca4c7120a3fa5919d88535fb2c50 +EBUILD bmon-999.ebuild 858 BLAKE2B 82354eb979de0f0983e8651ce4aced9f837ca8dcada384abfc14a6a0ac69428182ea843bcf656dd9413f04f8e6b4467654d3323deea277f69e10c111cd1fa084 SHA512 e2f48435f8242d422e94811f5f9b952517ff12a7d26099c0bbc0279d9210b9aa8013d64b34a5599cb6d20293d72f3b552a85057dfe3d0f245206cbc97b0dc2ec MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild index 95e18c2a29a5..01d01f88612b 100644 --- a/net-analyzer/bmon/bmon-4.0.ebuild +++ b/net-analyzer/bmon/bmon-4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,7 +42,5 @@ src_prepare() { } src_configure() { - econf \ - CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \ - --docdir="/usr/share/doc/${PF}" + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" } diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild index cabc2a781616..1939b19057ed 100644 --- a/net-analyzer/bmon/bmon-999.ebuild +++ b/net-analyzer/bmon/bmon-999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -39,7 +39,5 @@ src_prepare() { } src_configure() { - econf \ - CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \ - --docdir="/usr/share/doc/${PF}" + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" } diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest index 3f59a025585c..e99b8f4ad468 100644 --- a/net-analyzer/bwmon/Manifest +++ b/net-analyzer/bwmon/Manifest @@ -3,5 +3,5 @@ AUX bwmon-1.3-overflow.patch 543 BLAKE2B 31728572f5cb4f6d3eb78801c3aa99100b495b9 AUX bwmon-1.3-tinfo.patch 242 BLAKE2B 0f9b6625d10ca61f9728441122aa3db10e6a34c8c5e410231bd147a69aaee51378d2043f9eb7eef90994dd722462f579e0271b61ef3054a00da2e834eaac4ab1 SHA512 710f9cb4ff61b84f717603f5b814cfaed90af95c67cbc051eb9535084cb02c26711e3dd9f539165640ffb7bc770a15d77144de9c5ccb1235a6b11c3619b3d0ec AUX bwmon-1.3-typo-fix.patch 534 BLAKE2B 1037ebbf21c61ba71bd27b02311c8f8674dddda18fca227c285f91aa3a82315bbbc848f20d4dba54b78bd17bd6944c41f2c8688a068b4e511dfc49310d40efb6 SHA512 4c0a23a7b49a86e35239e1b7e0273d3ffafa4ea1a43918557ed26e4680eb2563aa1635670868ab7f39157118d140844a0706828d9f09f938d21e90f3fa5d6854 DIST bwmon-1.3.tar.gz 5668 BLAKE2B b73695ad56516e6134c6b6c6012bcfdf71ad51af99fadabf3af95cc7af745b8cd7ffbfd8c9ced6a13e9d05abb9d2ceebee3e0d7e3c54694ecbcd467be75d8b60 SHA512 6552ba03f0cfe7d2adebe7ae49379cc109b4f8da56dafec1264ac39c114809c7cde161f6321a67516b22b04abbad5d1ab3b4efb313479ad131fb20638c6871e8 -EBUILD bwmon-1.3-r2.ebuild 733 BLAKE2B f5b87e2c9d1be7bb8ec950d3b092c18ba0c16530c6970b4555498e888feff3c9cd6bbc0176a9e324647992ea5113ab9034306dcd346e7ae35134ad0797fdd674 SHA512 8199fb1a3541bca40d1173e2a5b44fda7f810199c4037899149c5b4207578799104996e50c79a1826f4f49428345d22d7c715ecd5d83f86cf2f3a004ebf738cf +EBUILD bwmon-1.3-r2.ebuild 729 BLAKE2B ea987637e5cf81f77fee55f98e4e87596d5362abffca4c6fc0bd0365539f946fd05d2051e733cde45af2c3f1000c31999ead2fa8f538e9a4db977b81cf05753a SHA512 58263d0eb949eaca92198a0bbba0930e6ebbe6de3f7fbcf012fda59ed657b3cfcfc6e08a2dcec2f3348eeed0f020f242db08a64b799ab392a29348fe539e3d48 MISC metadata.xml 424 BLAKE2B e827db7f5ad1bda3988fa53ff64e5c1bbcf72779ea1c3574efd0214682488fdb742ad48e91131aeb090ac9403c70cd042677c19d15017ac12f883783bc743e87 SHA512 56c90d7c0ab1908d42982a62c42ae80a60f825adca80025fb87ae6cd21248501809b0cd639f47ef8edcf33abdffaf17cc0f8ede5a33b7eaee5bbb93c2f19885d diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 3b4912656104..6b247db307f2 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -30,7 +30,7 @@ src_compile() { emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } -src_install () { +src_install() { dobin ${PN} dodoc README } diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest index 306eea39603a..c9bffb644bfe 100644 --- a/net-analyzer/calamaris/Manifest +++ b/net-analyzer/calamaris/Manifest @@ -1,5 +1,5 @@ DIST calamaris-2.59.tar.gz 56168 BLAKE2B 1ab118066c836c2d2e9584594e31db77ed8aa50dd3f74da5f60ea41075abd5873f5d413ebf6e352f5cdf4ecefc86307669c46f88c9048194f31936470040ed82 SHA512 8c8ed820a1af6e21cfe9f03397c159b2261c8253b3395a8d6dbd21064151439406496132917d0ef087eed805c7945cf28f2d12dc1e52340991c18e6a27484ade DIST calamaris-2.99.4.0.tar.gz 105860 BLAKE2B f87b51bab7aac10f9ef0fb50a788a0ad86a3b98171b9d4f1e1f7cc50878ff9f9ad70ed6485e4fa301c713b5551390ee4f2697c37291a540ee3b3feb6960891d4 SHA512 4127a3963fd0ea5baa1d5ce9a784f45658bb685f18e576c134fee1b4e8fdad535676974498119018e771924a8a622ed83b8aa095d3909b7bb3d009dd6024dbef -EBUILD calamaris-2.59.ebuild 466 BLAKE2B 139479166ca57d9e945ba1fef1bbbb4632afc3036acdf2767ffcfad5090da28ec7097182a78d9a367a241ef6a7f3567433e2fff39def07d46a37d67a8ac5033c SHA512 17407d8479042ff1c88e38ebdbd937739fe3bb8c3b2c9b5fd623185702b5ee1f69e5e061ad70f4a023355e0719361f1ae7b58dd38772e15d9ef073adf65c972c +EBUILD calamaris-2.59.ebuild 462 BLAKE2B 00850fe6c0f4cccd044c0d788eff970bb2188225a298286c6f35c3ef6b0c6a6c8d443ee3693c3c6903e133482ed48f6b6743950daabf770322750bb7400d24a2 SHA512 6a7026a71f6383bc83fe0d50425cca5506a5aef16adecadd2af88aecb5bf7453ee52fa9e476c3fe42011673439717d6b3435533ada0549561931500cdab6c697 EBUILD calamaris-2.99.4.0.ebuild 690 BLAKE2B e08c2f9778bc9a1af7ae2d3be1ce0d9085ecdd351be5b79c29aaaef3c2e02c3f8caf499bc3623938d4e8a5eba698281b9ce15d1d4c3323f6fcb8cf850d38bf13 SHA512 b3bca403f0fe47529918a7d0dd20a806638cc6883aca368d6d6c67cde2db1f0bb3b4adadbe87f3b48e9d06c81fd1e4ae5d56dba45e8093cab3bc1e784dc055ed MISC metadata.xml 402 BLAKE2B 31f25457b00332a937d03db17f7bbc324288ffeded9b052ad0bd851d6fff6038d3b0d82511f901b4b6bd99738aaf4ff4e961e533a921329aca997ca369a3a9d0 SHA512 4e5dc9266b664dfa17c7bfc53f2773be0be94fd6c71ae626a2c8adc538bd2996866b571d20947890194286a6300851b9478218b61f8474e38d2963315b3fa910 diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild index 5829b5a2276d..852e4b508c92 100644 --- a/net-analyzer/calamaris/calamaris-2.59.ebuild +++ b/net-analyzer/calamaris/calamaris-2.59.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ KEYWORDS="amd64 ppc x86" DEPEND="dev-lang/perl" -src_install () { +src_install() { dobin calamaris doman calamaris.1 dodoc CHANGES EXAMPLES README diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest index 4d27dd2afa41..f580a00ea69f 100644 --- a/net-analyzer/dhcpdump/Manifest +++ b/net-analyzer/dhcpdump/Manifest @@ -2,5 +2,5 @@ AUX dhcpdump-1.8-Makefile.patch 483 BLAKE2B 3da53d6ad4d1e6808ddb4abd9af7aafa8a7c AUX dhcpdump-1.8-debian.patch 2850 BLAKE2B d7e381388af48a8e0f1ffb78dddf4fb3652907569a84072fbd4efacec18051cce20891f270ae6857a8cf07e698381bb10604821eadcf35b963cd413e24df7143 SHA512 ccc97bb8c8f6dfa09d22407c8a9dec249860118ff9fc09af9488f1d4c8679f94ef6850040535048ba0bdde273a2a8c7759f02742ece0e409a020277349bedbac AUX dhcpdump-1.8-endianness.patch 259 BLAKE2B 65b402fa9c0969887cd0e9802e7736bb6becfcef9a4a0577e865402b6413d92cdabaf8f869eee27d27749fadae42ee70485ac078f9b789596e034d9616c3f281 SHA512 7a04bb0933fe6d54f696f18d7d1cbc1090a6f2bb92061bca0e52311264e35ec3884a2ddbdef2b31de7f81a652189fa9617de754d02aaaf17c1212c92106f07d2 DIST dhcpdump-1.8.tar.gz 10740 BLAKE2B f87f1db539b06cffd68395982476bd7bfcad4e41d86aea7f3be357a07d597cdb34e8888eaf90e6dc11db0252dce418a3b1ad8a00b0d3a7c7faab48f14c6aec85 SHA512 52cd63d581a3c530c2f5baa66808d5b0241853651c720bd513b769b8301b4dff9c87243787014aea98a5b3ebed86ec317b58d262bf5031015141a4da50fb76e6 -EBUILD dhcpdump-1.8.ebuild 688 BLAKE2B 9bc5e60611c8e1ce9ebb0f08df7b4ebc3d9824b4cfc8dbd976ad2b35d8d107cad2526dee9cd756a51cdcfdebd6ae3b61d9d7ac5bfc41a0b2894768ff8d767a34 SHA512 eab875777e17a46ba5908d6f08cc9e5dea6f406f4028b71c26a781d48327e81800c12d6f4f7beff5ebebf6df3b248fb7653ed702588f4686ca5eb42704956de4 +EBUILD dhcpdump-1.8.ebuild 687 BLAKE2B 54e35e85fcfc7173f88bde7623446525d4052ef5890947c6d5b8b034df80db01dead15b34c7e8e24d3dc7a558d1756bf0c6add848bf296f23bc7f329a1b7fdf0 SHA512 13dff958bf5ef60d79a98008c8ec05fd72b748f81a9b663f06d86c4c14c9675a5a7edc73677476c0290bd7e9a61df878b065ab2d6cd9314b19b8ad3e4857e468 MISC metadata.xml 418 BLAKE2B 93c3d8a35aab2e549f4129e3b0ac1f23c479017c1fdc0ff7d92fc31a14567383d5859621e65fbc3e1975cbaf201470cf19e6d92a35a9ac35dfb47cedb6208157 SHA512 776319938dbf31831e5b8655726ee04d2c8cbd3d43163c2ba9d3d9126608de9ca6e49df2c0f9fedfffacdbd2149f792b592d5d5e1881c226f0cb2eaba00a1fa4 diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild index ef15429658e2..f846b315d95e 100644 --- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild +++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,7 +28,7 @@ src_compile() { emake CC=$(tc-getCC) } -src_install () { +src_install() { dobin ${PN} doman ${PN}.8 dodoc CHANGES CONTACT diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest index 45bd446462a1..a40f8d53a535 100644 --- a/net-analyzer/driftnet/Manifest +++ b/net-analyzer/driftnet/Manifest @@ -1,5 +1,5 @@ AUX driftnet-0.1.6-giflib-5.patch 1060 BLAKE2B 6bd972e9c7e66eda935058daf75b5667f93f1a808499023e70087d7dd3a904762cd7139f23338321a0f7292974cd8dd206a97b33e665944fd32c9b14aae3908a SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1818 BLAKE2B cfaa0f1513e946a3ab25d88735f42f3d7c4c0fafd9b8eacb31c7ba4bef35c46f0196a3e4dd2f084e83717abe854fa977a7694170d6b486c7fe6063746571c684 SHA512 344eab963fbaccc2cfbd020fcdf962f6e590c86d77654df5b0eb805d31649126a5bb432de1000ea080488e0d13d2b1905855383372439a3a72c63fc316aace60 -EBUILD driftnet-0.1.6_p20090401.ebuild 1508 BLAKE2B ba8f0598530a6cdbe28915b94549dd15cae6fb251347313e39d90ed2a795bca97d8313fc02d28bb4ffcc65ede5a4478ecfcc2de4dfca877dece9d937107e77c7 SHA512 277740b0b0eb7b4f05f628bafa44f512bcc48ad3a43c49f46a9982e669d2421b7978cda01011ad79a4a101942b855bc3cf7363781f883f602d0c22887d9d6432 +EBUILD driftnet-0.1.6_p20090401.ebuild 1504 BLAKE2B 5074d44094102c0a9026f9506e5c230f662ffa927dc15319607e38c574d6da4f8d3ffad3f9a34f351fb655d52194bb50bbc1aa13f3d1862c1d2fd0551b580861 SHA512 1ac56e06f09a71d7a6c62793ce455ad3ebbfd803bc18a6c1327cf0b3cbe739a13a80d7d51659f68e63de349a4f7d345ce8b31c18fdb6360889904dbfb738b889 MISC metadata.xml 404 BLAKE2B 73ebba8b40a398423b445b4f9a50546ee3752024c06606df966c1e0534dbed717cd5a8158c18bdc440790d186b9d8e70afa0456aacc18b545609d18cb214093f SHA512 e83bea4ca337cbe95398c6310932535246a00ceedf696574624408a5f783c9f5cc3c519216cc16bc9dd44ad2b4b62050707621814a9b2a26a23c6c0272bcfdfc diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild index 22cf099f37a2..9de58dda9d5f 100644 --- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild +++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -48,7 +48,7 @@ src_compile() { emake } -src_install () { +src_install() { dosbin driftnet doman driftnet.1 diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index ad74298af5b4..f13de05a894c 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -9,7 +9,7 @@ DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f5 DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 -EBUILD fping-2.4_beta2_p161-r2.ebuild 1189 BLAKE2B 35539965e840c8603b29b637194a2713d610530b17b7fce83638fb8a36eb1d23377803c515b7215766043f1bb165e41239e4259ee05096c8039c3685c865b272 SHA512 f8960165973e94f329bd22181f7991a8df266391b2abfcdbdd4277bc3991cebb35e816acd4b847bb9b1ca106cee25eef7692d6604ac81e54f47cd339ab59d275 +EBUILD fping-2.4_beta2_p161-r2.ebuild 1188 BLAKE2B 830412a3bc9889b6e9626c6932c2540d1b7e5eadf000c3e34faf74556fd5baef02ab6b1a7f601641df1c39e3a4a47190f7120c407cc87e9ef2a531700ff7b80a SHA512 9672c71fd45269022a9b136dc01cc42e5d0673e7e888a87490c963ad92431a482a39c2af85c99e704d6bfd4096784e7465b6378a99312b8ca91e4ab7d32c8655 EBUILD fping-3.13.ebuild 549 BLAKE2B 03df712a30263a13ca8224be6c4dd288c5a27c133703fdd77dab36b71770ce6a3f82593c904c97b7b560db5d7b43213f61e3700eff2653a42e921411af47a036 SHA512 dd6fd95a7223a9a94fc222b7257b62f069e83769195ed815b2f3c7a0f26fbbe3e39dd7abd92129bbba06df1362840d4aeb7caa90beca6d4a9fdd259a5deacac4 EBUILD fping-4.0.ebuild 524 BLAKE2B 37afe8c889ff6a04e9a452686a22bc06378b20f09bb7eca6e4c9087dddcf3eda4c2db965f2125ad9c584cb13624f54a02fc8225fcc9810b0ec6200dcfe0d35ac SHA512 e561eb0d9a1090dfdaae4d9fbc5d3207ff27969a26d659e9c3d5a35b6488755d00be8064f578e97ef54a7d40d2521e6d761c8a0e1e0ff2dd7443591deb3579b2 EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc915f1cf9a42093f9e40eaa8405a46cc8dbee6111d92fbe440921efe26546cb8eca7552a90e1cbc1fe98a4 SHA512 466941d669576fe07cd4e34b75e8b7e648a8e9997776fad2a2fcb419da54f3810844ac1125d0ddbcdb827d0b1794d7c31363c37d6505b19fdbfe2bc3add3e58f diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild index ad06eea4b316..e26b3ddcc421 100644 --- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild +++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild @@ -48,7 +48,7 @@ src_compile() { fi } -src_install () { +src_install() { dosbin "${S}"/${PN} if use ipv6; then newsbin "${S}"-6/fping fping6 diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest index 19767ede20d8..5b0487ffea05 100644 --- a/net-analyzer/hping/Manifest +++ b/net-analyzer/hping/Manifest @@ -15,6 +15,6 @@ AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 -EBUILD hping-3_pre20051105-r6.ebuild 1595 BLAKE2B 7524084c99cda01e00193274412d5169675b0c06262b4afbcd488d7ea4973e97b7ae4bdfbf6dab2ae463987572c9173f42f0c8f11ef43c6086f8b04fc8ccb82a SHA512 38c9368e02140e73b4afb9f40c91320799cea6c219071d729053d8f2c9144e4ea1e0308952ac29549f70520e0059b37497cda2a5c80bcd893a9c7068752afe5f -EBUILD hping-3_pre20141226.ebuild 1571 BLAKE2B ab837befdc5d18d7d2ceaf015002c7e8a81a2feaf6cb0ed7fea6adf74861bfd8e062eb629325cc1474a4ca8124599d75e1bc193284042f52483d87de8f97d9d7 SHA512 5e9b6abc08d35bdb08f4dd097a565b5b4863ba9b2c82109b2df4b7fb5cbf1a32aa0e2ebe5ffcdca81b59973944906a442180f65836ac3aae934387603f401345 +EBUILD hping-3_pre20051105-r6.ebuild 1594 BLAKE2B efff44e45a13062194eadd1f69cbe51a79e11e2ced8dbe5a7a0fedac21970dce67310072fc06d3f7cc9474ecaf6e6448ee649b4c34d911d0cc368287566ca810 SHA512 d8e5efa035a4d57310035e0b2f18d5457f87cf5cdfa95ba8723ece4e1242b57615e35cd20898a8fc6180efbc86970be1cf019a7586e4749e080a4735ea0f3bc6 +EBUILD hping-3_pre20141226.ebuild 1570 BLAKE2B d383f47c10f3d2efca53240ee7adc07b2a552112e4086598bacec34c7b3e4ebcd1b04bc5a65dfafda1f9fd8ea251aa296c663b2a9188de170f359766d5062af7 SHA512 c8c10c3d93ef8b94222a66a4e87ca282e3154d091cff24a85877e80fc2e190f6dce427310e0f0e00d4ebec204d1905039cd79b5951e94c7ae25d930bd642fdac MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild index 48310b956eee..5cc5d5cf2588 100644 --- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild +++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild @@ -69,7 +69,7 @@ src_compile() { "LIBDIR=$(get_libdir)" } -src_install () { +src_install() { dosbin hping3 dosym /usr/sbin/hping3 /usr/sbin/hping dosym /usr/sbin/hping3 /usr/sbin/hping2 diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild index 3c3a3f166ea6..d58de2c0ec2a 100644 --- a/net-analyzer/hping/hping-3_pre20141226.ebuild +++ b/net-analyzer/hping/hping-3_pre20141226.ebuild @@ -52,7 +52,7 @@ src_compile() { "LIBDIR=$(get_libdir)" } -src_install () { +src_install() { dosbin hping3 dosym hping3 /usr/sbin/hping dosym hping3 /usr/sbin/hping2 diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index b66ea0967914..89856f484aa1 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -3,8 +3,8 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d -EBUILD icinga2-2.10.5.ebuild 4709 BLAKE2B de7e3fc1f4e8726abae4b78dd6a864c3e5fac718e4a6d623c3783e8d339223f64e2ccdb06d0f2065d78198a653dd3a68e45713c0e95bd3b97e90f0085420c389 SHA512 007bd3675d8f1e6ffdd7c9dddb9051b8fc10f1b5606430779dcaa9f652b0a1879716a84b6d851a28379695040b57c2789882a69d9489dd4d157b39c8b55afcdd -EBUILD icinga2-2.10.6.ebuild 4696 BLAKE2B 552f145d511cd701dd28c84d200a0500b3ba885cdd45d3f60e64b20ad65274f547f6e56dec3845b0d4067a59b0f18f59a4ff32d73777109cff636f1f08872855 SHA512 3f5c948c249c4b18466aca3b501a76e978b292189dd20cf91ccfa974b5b65760ddc42928515d4ea67a93bbeca2e7a4a7b6b444d7e7d71cfb03c3d2e03cd9ed23 -EBUILD icinga2-2.11.2.ebuild 4687 BLAKE2B e6c9d2536798ac24ef9e1c4ae318f9888fc3bf45ea3f2846622e31a79924a5367649c6bd62dbe0e51925445d0ef805f40ab2b4c60998b957adc72647d18955b5 SHA512 a71585846d160dbd10870606c65c191e0f1cd18eda90f0fcbc4d2ad5e662e80d864e610a8f82b8c7772a6c95a9d2fa69820d48c88078fed941ef3c2f26eaf83e -EBUILD icinga2-9999.ebuild 4720 BLAKE2B 5ac8c39d0b742106ad47911a1e89027871fd76068c3e8435026db8f7a533dd690cc3f32a83277863ee12012858b121343fa0430646fc2632543939a915760899 SHA512 398a53d5aaf3d7e3569fe56900f20cfdb0886429a36c859f2726be39b194157d0e71a5c9a4292e1697e8e107e9e6f6f6889bf12c8aeb52981f01cbb588f4aa32 -MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5 +EBUILD icinga2-2.10.5.ebuild 4658 BLAKE2B e32a17d5b6e76bda09f46f28323ecf9ea483c523427cc6b61cc54255a9093a480979dcb9aea219e1a4f256c4c53ad7ad6ecdedb77690892b14b265f5880bdf71 SHA512 77a14c8278034b2e768be05080f4bab3bfa45c6f2d1456aa787fc961b66a14af055cbbd6a963cf8920bbedd9c4d42111dc35cb88feb74730ea9701c9aca06860 +EBUILD icinga2-2.10.6.ebuild 4645 BLAKE2B 1a0ea70341877bb5f386475eb8c9dd93bed9a9c0c6d765532a3284c24d7219d5378540b10f4ea34d9d77330f9d10dc0fb1d196cee25a1551ed4ae403cc5efbab SHA512 f7c02edf56b15717e710ef655eac41d12a3abfbc8d23b412d315fbebd3fd70cb75cfcd71a6ff6f5b017b539cce25d8062beae25d32e09a7f4ddc7b6df003d334 +EBUILD icinga2-2.11.2.ebuild 4636 BLAKE2B 8b5a2bc164cd2ff0cf643d478ab96e947b3e8985bf2a572d7f1ae905c26c16bfc6f45a71a9ac40eb57daa2fef1f7868dd5e270049259efbaf5d1fed62d36b57a SHA512 f4bb74c822091bc49db44039dd1ae21fd94fa4de1fcf1c4b6bacb34a0a15d9a8adf0f88f574a5f290b776f975546a1563baa2b4eb44b726baa17b2c41546ded4 +EBUILD icinga2-9999.ebuild 4669 BLAKE2B abaf22a582c9e821c392a49d2754aa6599b9d5c348cfc5a1eae48a55df74ed63c186eb8c026ed9225d2a99194f47a689dc97604f5cb8e23f6458b6200963daab SHA512 6578fd3c8da1cee03afdb192468bf1ef3414bd68e14c73daac844c99bd432989370910bb82f7fc43b67933db35b30eb5296d9b5f1b7b5a5f557369c1f5f0067d +MISC metadata.xml 767 BLAKE2B 5a1f42327c794c6a9c7bc2c12a9d58fc0eb01e414f18a3ef80ac25263166a615ac1e3865544d3cc17bd950e5688b1f092b5061cbb5d4a51bca8c94bc83ddf9e5 SHA512 e92f81fbe17e5a54e509f26fa6b1fd0461c5229eecd3d0c5e078ab35fa6f2b5898e60e0d132b096bd2292d54ec9c4694564e96282fb4157985dfddec80c58675 diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild index 88849f9e78f8..5ca081b66606 100644 --- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild +++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2" LICENSE="GPL-2" SLOT="0" -IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" WX_GTK_VER="3.0" CDEPEND=" @@ -42,8 +42,7 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] )" + mail? ( virtual/mailx )" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild index 36b37867296f..6c9a7ab3cdf3 100644 --- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild +++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2" LICENSE="GPL-2" SLOT="0" -IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" WX_GTK_VER="3.0" CDEPEND=" @@ -41,8 +41,7 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] )" + mail? ( virtual/mailx )" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild index 1af87fa28ecc..ec0fd092da51 100644 --- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild +++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2" LICENSE="GPL-2" SLOT="0" -IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" WX_GTK_VER="3.0" CDEPEND=" @@ -41,8 +41,7 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] )" + mail? ( virtual/mailx )" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 157a2ed119ec..92b7c65b3f1b 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2" LICENSE="GPL-2" SLOT="0" -IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" WX_GTK_VER="3.0" CDEPEND=" @@ -41,8 +41,7 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] )" + mail? ( virtual/mailx )" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml index 6c4dccde701d..2916a6886755 100644 --- a/net-analyzer/icinga2/metadata.xml +++ b/net-analyzer/icinga2/metadata.xml @@ -6,7 +6,6 @@ <name>Matthew Thode</name> </maintainer> <use> - <flag name="classicui">Adds support for the old interface</flag> <flag name="console">Adds support for line-editing in the console</flag> <flag name="lto">Adds support for link time optimization</flag> <flag name="mail">Allows for mailing of alerts</flag> diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest index 49401f590b74..f16af274e8ce 100644 --- a/net-analyzer/jffnms/Manifest +++ b/net-analyzer/jffnms/Manifest @@ -1,3 +1,3 @@ DIST jffnms-0.9.4.tgz 610758 BLAKE2B 2bbe122bae3d358e710895ebd1c38f28644260744d97f5ab88301dc5549c099c9af0931156d47ce0e616c0f6f84b04f2e7ae04f4d0efc8cc3ff72b01dc51e22c SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7 -EBUILD jffnms-0.9.4-r1.ebuild 1352 BLAKE2B 2d604bab19c22607dcb94e1f93755fb52ccb3190c596dc710c57c8c04d880d8b35aca7bdfa075409c7e7da2a8602cbe628323d4684a81ea1a0362967a753c633 SHA512 a9e195307f40390399a3f707942b1b2b77ff0572bcf2545abffabcabea72ba124a42ccaf07bd53dbb93df7a8e3d527d9eb2380dbc9a23b00c4ad9d19f2f38371 +EBUILD jffnms-0.9.4-r1.ebuild 1350 BLAKE2B 6116589cf87bdfd067741f1a6640d72c7a39667b7c1d7d0ee179123f8b682b8bf3baa3560b034a8d467c26fdd1f3ca5ccd5c7ba9c025a7644298f774c4cb97fa SHA512 50b8849c8ab6d1ccd54047b00931c46fda9a29b08dd10da6af076b623837316620759c100342e79ed81b97c9769cad51453ae27ac504dffaad907b65dfb3a970 MISC metadata.xml 356 BLAKE2B 999eb20df883348a87beb333f9c07db6e79f20b0166d6ede78059a82d4978be56af98a3504129cd998d95e3902c4931513e3317c373ba61ddf78e7a2734597e0 SHA512 d9902d5255db25672152c02e26494f9c42137714feb9318a8eaf517c6a62255d036a3c2b1b308a3c32882b7648f33a38a7af344c2e3ec4b2f402fe26870435f1 diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild index ddbea9ec4ebb..c0957c2f5e85 100644 --- a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild +++ b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ pkg_setup() { enewuser jffnms -1 /bin/bash -1 jffnms,apache } -src_install(){ +src_install() { local INSTALL_DIR="/opt/${PN}" local IMAGE_DIR="${D}${INSTALL_DIR}" diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest index 53b5990cc100..eefda7cc0b90 100644 --- a/net-analyzer/masscan/Manifest +++ b/net-analyzer/masscan/Manifest @@ -1,6 +1,6 @@ AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77 DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88 -EBUILD masscan-1.0.4.ebuild 832 BLAKE2B 08a39bd6940f7be65173f896cacf64723f05cde4c42c3fd412c807e4f8206a649b12b35d3b4fb1050be96b8db5f0421df12b7f630b93e22f4d2dcfc70d34722b SHA512 b64aea2e2025894d4ec4ed2673828a8d545ff83fbb9319fef065332f5df5d62f4841739220810b7f5c79195cbd958273417dc86e42f668374343f7004f92da57 -EBUILD masscan-1.0.5.ebuild 820 BLAKE2B 12f12b56b94170cd1382d9a3a571f05939d532b94f56ad0495d6383e88799c27321f6f40578439c166ee863114fddb437e69001615ff5558e2cd136d985c43c0 SHA512 c5adfe477ac43ac5e3cb3ce2c791b970c6ada6e6285701612cd47b3fd37740fca899a7af1ce1cd35c036271daf1672d896106f15309612fab366dc71f83debd9 +EBUILD masscan-1.0.4.ebuild 833 BLAKE2B 6e8f6f5899d3a84b4534ae99db5ebfa1bef4508c7ec48aa42cde9b8f7556836ec717329d08848048d8f3b2426f3b780b28a0d32363fa324742fb86c38236bded SHA512 fee463d8b32f8e1ce75e045c60f8712c0ccd6a9536bcc721ff8b52bf778d72b02953b9ad997d0695129cfb43af4fb0d0f24e9bd8111466258c30a9fc899b8e6a +EBUILD masscan-1.0.5.ebuild 821 BLAKE2B b2db0fe2bcfd8eef6423bd961f451d798e4d5d7420d554b099118a81fbd00ef56cca94ca9f212acae65d58b1292064ce5bd4ffb86ff3371af48c091a368c932b SHA512 4b131f6e8838c2f0b2a541ac98b3b5e6e5eaa5638fae8b0b4e56d75707973add348bf81bc60365f1bf0d5fd05f7f5d1121442c9978f8eb9743245e217d252a4a MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782 diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild index a24963afe763..fda9eec41325 100644 --- a/net-analyzer/masscan/masscan-1.0.4.ebuild +++ b/net-analyzer/masscan/masscan-1.0.4.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND="net-libs/libpcap" -src_prepare(){ +src_prepare() { default sed -i \ diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild index fe850f770c51..96cf9afa0476 100644 --- a/net-analyzer/masscan/masscan-1.0.5.ebuild +++ b/net-analyzer/masscan/masscan-1.0.5.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND="net-libs/libpcap" -src_prepare(){ +src_prepare() { default sed -i \ diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest index 373e9e7a66c6..a471cdea4f59 100644 --- a/net-analyzer/mrtg-ping-probe/Manifest +++ b/net-analyzer/mrtg-ping-probe/Manifest @@ -1,4 +1,4 @@ AUX mrtg-ping-cfg 2077 BLAKE2B 78f267bc07d301c0b8b37b5ea6398fc2390ed1f0103e0f05c58f483693676f907df0d47d3a41fd44363aad97ab1ffd04f6998372a645fc97e375f00c8132b416 SHA512 d4c9f651fff32b7bb417ae07700cc179c4db596270a9f2dba5ccef45992239b0f964ac7cf63478c3c12a02e02adf088b692a66740872ebc8da2edba376f7029c DIST mrtg-ping-probe-2.2.0.tar.gz 36923 BLAKE2B b4556a46d0d644dc5215b686767370542a0b382287aabe4a9c3c7ed8a165005b7602a83135166b9539f3ac479a397ac6e782ef51eda107140ddb426de0f1397c SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea -EBUILD mrtg-ping-probe-2.2.0.ebuild 726 BLAKE2B db518989e11240d7a8b68a0800c8cd7c46aae42bbb92ce486ee3184a27e9578d5b76c68ad6219d0b9831faab6063aa955bb10b91a7c2f2a209096856fbcd8c77 SHA512 9c754fa34ad2693bc994e5c16e5cf7022db7b29c813f41eecfcb85ab93ff4162e69541bdeb522b409fef1c7affbc901f2c326d78616a7d9bee6401cfa80ebd34 +EBUILD mrtg-ping-probe-2.2.0.ebuild 722 BLAKE2B f3d6fd3c1d10b6f3a217dac686c9f2ce4205355e0d0b818277100bc7ed8d1f66413d964a7979459b224ed8635a5fc22a61537ed044688a328d6b90077bf7c011 SHA512 1270bf8ef7eb36d874fc808b0e6083de5ff61f7046da54d866e7336b65710d955fb8254e383963c32ed39b5cc46064e242bca34e16a3b5288b28c7da41d60033 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild index 9ccb0a69e267..98d1db01c9ce 100644 --- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild +++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ src_prepare() { || die } -src_install () { +src_install() { dodoc ChangeLog NEWS README TODO mrtg.cfg-ping doman mrtg-ping-probe.1 dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index 0aeae2cd8d24..806cef501299 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -2,5 +2,5 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 -EBUILD mrtg-2.17.7.ebuild 1016 BLAKE2B e7f4d06a415350f9271da51f4fa9c5b1d6ce09adbabb2505306706523bae31b90d633639ca42e2bde5216a4e9f694d0514b5d1fdde214b4657391f8d042ccd74 SHA512 1f88bb9bab44ecaee915f533c3a73f9d10b0dd587208e59428c6c7c4d50cdd2980c1ad06ec0adffc261652f94ca32f5af20da5f195372acfb3ffd56155f94217 +EBUILD mrtg-2.17.7.ebuild 1015 BLAKE2B 64e6a1cb49e4b446ecfedb2cbc48aff1be8ad1ee5806962794f65e0954c9c4e90a0f61ae064977e73fd1aba934384aa9c7e73a56531934d3326433adf073c531 SHA512 6f88bd77c9e08acfd1aa81b968a2f5b7eec1833657c2054a3b31928b9d39852a3241dd311c164805ad035efdc75631682799fab0a33991843ab0d17b39f2a795 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild index d1c922a90e17..b7136c69d4d7 100644 --- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild +++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild @@ -37,7 +37,7 @@ src_prepare() { default } -src_install () { +src_install() { keepdir /var/lib/mrtg default diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest index fe523fb93408..f8d2d39fbc20 100644 --- a/net-analyzer/nagios-check_mysql_health/Manifest +++ b/net-analyzer/nagios-check_mysql_health/Manifest @@ -1,3 +1,3 @@ DIST check_mysql_health-2.2.2.tar.gz 140250 BLAKE2B 7bdbf5398ed2219ec9a254906c2e0b38160fe8914c218388a4c9f06c401636e500290dea42b420da7881e6dd35116e0f5b54bb448b304c84714bdee610c74d92 SHA512 027e47747aba524d8c7d168f6c440271434db2e152e59821eff06449d98919ab343a7840ecf73a1fcbc864799d6d3094088bb06f6b36b16989a5184676ae2628 -EBUILD nagios-check_mysql_health-2.2.2.ebuild 1147 BLAKE2B ae37cf56fb5c2f575f9c974098893e3cfc7fddfc30ca570b3cd8e8f5e03d61d63814562be9e54c10cf8faf276aeb5b16c029ba7c565c87d7e8547029cce6bd7f SHA512 0a455745c98b4b5fb4576dd851a06e1494abdfd57a466ddfda081e16498cdcccc351c889ef49f2c3c9e7416fdbf8627b1ca293472fe12c6dc0950260c6197b1a +EBUILD nagios-check_mysql_health-2.2.2.ebuild 1148 BLAKE2B 4841b37119954723d5f7a9904d4a06caaaaed1ae23c133d7ebf2b73d32ada4b54065da4aba246e76866c2018970861d00bb0a19587ccc38b2691dd54461028db SHA512 4da3ccde0d062b48f9bfe1ec0f1d42d969bf3b8abf4c60adcb465bf53e7045f9425496a7dee10bb73afbb88a750e35ab2356e60a7a3e1710d19edb24450610d3 MISC metadata.xml 256 BLAKE2B 0a1246bd85dce1cf03b4bbd67a011b248c44282442dd65e9c7f24aa4f4c146708fb0894054418a5e42588a0ceebc455eba9518903cf764c1c5f3563666e44e35 SHA512 2c63ddb5d1254a9c4c14b6a41b12a2152d2230fe5c79fe7e7e2351dd23037c7422dcff80e1731259c6a233020bbd5d438ec1c2ad0fba114ec33ea97a4dc5826e diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild index c1ded10ef9f3..94445a4c903e 100644 --- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild +++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild @@ -26,7 +26,7 @@ RDEPEND="dev-perl/DBD-mysql S="${WORKDIR}/${MY_P}" -src_configure(){ +src_configure() { # Should match net-analyzer/{monitoring,nagios}-plugins. econf --libexecdir="/usr/$(get_libdir)/nagios/plugins" } diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest index d33b7e051698..4cf50aca3f4d 100644 --- a/net-analyzer/nbtscan/Manifest +++ b/net-analyzer/nbtscan/Manifest @@ -3,6 +3,6 @@ AUX nbtscan-1.5.1-includes-declarations.patch 954 BLAKE2B 7cbac59c29c3472fef5a87 AUX nbtscan-1.5.1-script-whitespace.patch 3784 BLAKE2B 3d8651982b85f1adc09726e90367ec40fd14db5480f5a96157ff379e54b955af0040d438fe78381284374c7574b803977d8f741616b90244740af33effe49c30 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6 DIST nbtscan-1.5.1.tar.gz 82107 BLAKE2B dd49ee25995c522f3cf75e35cca427be7a2b5e697b374323b0be4c6a92a2a96c9e30ca1844e953354f3490ed4090682592e1c0ea5192512b2883b1085356783f SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb -EBUILD nbtscan-1.5.1-r3.ebuild 736 BLAKE2B f5fef7112c42755b8f11dfdd3f3dfc1d2af7824c4c5b86db68c3b776e4dd246808a41a7f27dcbb05892f3d5260b5c01a70ec594d12517e6b0ed850a35b4dbb21 SHA512 0f198cff62bcc53416031c3bdb2382ed2ad65570e5c6e7c14a4e7d8bb5f88c2e72d0509494208f1bc5758cff23eae0d4baa111c7187f90d47911a59933e01a0b -EBUILD nbtscan-1.6.ebuild 683 BLAKE2B fd40b34c3689032cd8640e21c81b420a80eb313c44db18c7ff5de83f813718d4e397dc0a288056eeee4910f6a4cc922cfdae38b965d60e717dd12265428fa79a SHA512 d861b27160f4ae782b3ef78bd80b71ea1f4f9013b46a3037286bb1d28db2de825811301a9ff8355f476dad7ee69d0c11f50cbf4598257ec436a7dfc0e2e3da8a +EBUILD nbtscan-1.5.1-r3.ebuild 732 BLAKE2B 32fdb12758993dd8756c1ff1c294969625396b6dc81d3e46e39efad2323f10da45092c78b48e993f58f09ec7f155fdac3d4433f9afe53d668fbaab24e10ea586 SHA512 ea8369d076b29812f78a6274e53d48ef58b9b6eff9e982ccd3ab6ace20a6cac69acebf6639a9228fb4ccb6903132f13165e4375465f53b29bc6fe36dff409eb6 +EBUILD nbtscan-1.6.ebuild 682 BLAKE2B 84b949d9ec3fb593588958d8c33ac5fa3723445b156241205d6c6f7b44c9c5372aa7a33b8b789736401f2ea54544e9d5de3add74600050c23b4eaa83daf0c4f9 SHA512 c227ef6f981047dd2be8677747424b352061efcbfc66e242784200138cf4db25a06f481a36f87133dbc826a4ab0639e0cd6b093da9bffb1e332b6adcd1267127 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild index a44802134398..a7ad294434ed 100644 --- a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild +++ b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,7 +23,7 @@ src_prepare() { "${FILESDIR}"/${P}-script-whitespace.patch } -src_install () { +src_install() { dobin ${PN} dodoc ChangeLog README } diff --git a/net-analyzer/nbtscan/nbtscan-1.6.ebuild b/net-analyzer/nbtscan/nbtscan-1.6.ebuild index 9241d68431a2..b1b5e1ef9c21 100644 --- a/net-analyzer/nbtscan/nbtscan-1.6.ebuild +++ b/net-analyzer/nbtscan/nbtscan-1.6.ebuild @@ -27,6 +27,6 @@ src_prepare() { eautoreconf } -src_install () { +src_install() { default } diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 23b893f0bbab..26cb16c4070c 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -14,9 +14,9 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.8-r3.ebuild 5311 BLAKE2B 8a43574ca0c2356ae08c22895dc8c3e55a74713310740f12d994451365993af84a771562501791fb9991c0a2af7a1178b2daa86c5df66d11eb56b556e4fadb7b SHA512 9de691517dae54cd81c5e0357573ba14512a2b59aaf891ddd259d6ee92a826e3914bd4352a54dbd339be7255591a7d5c2b620378be1062e57632c492de035cfc -EBUILD net-snmp-5.8-r4.ebuild 5367 BLAKE2B 81c24526bb43aadea27269361f76c35e974de60ac338232444d667cb242bc3768a041d00e399cb374a0f4d8d2a477a2b9089e830cbeb6923165f85a9264ddc0c SHA512 8c92c2c0ca11fb84ff0497ac3a96cdaadce722161c005cb1372f2f2c08a8575b538513dfc28b618c2487997e7f39e8065da26a93aa6a6961cfce27e614f98b6e -EBUILD net-snmp-5.8-r5.ebuild 5571 BLAKE2B a1d1bcd9443598893d1b510e7b52f35c8d5eb97c732b12fdf2dd7759805af7a0a261139e7cb361424ec7fbb7fe111682304db1ce4ecd5082fc60c474576836d1 SHA512 cd1d97e4724ac62cf4f7a9b40ef499edf2238829dd7f887a973b594a64d2ad9bd39ff8ca406f49bfce825fe1d7e00652a7379edac6fc453e1a7ce52304ab9303 -EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5575 BLAKE2B 8e0504e321bde15ddc3c2c7c9c01d0cab63c1095cbe5884b8ba43bdd450dc1fcd594a488f0d8bb55a461fbcddd8c5158819a234b5f667b7e9bf8e0c6d86cf226 SHA512 7f51fafbfb50c24d7d39c011aa82fefe73fb052f0bb1e97a6ee17a131fe4fe90f148621d13acb6f16842393ba45d493630b1942f214b1ce15dd44fa9a224c136 -EBUILD net-snmp-99999999.ebuild 5510 BLAKE2B aa096796017ff6c8a7adb6af2ea9afd22c4f7d98e64dcdca88a9fb26b39e3f41c2faa5916adffb71ca9577f251c074b6668f8640118c37239ea6bad91e3c37ce SHA512 d92b29f36a951e4a30384dac03b1cb8e30488310a33b376dbb6968af88564e963b834e99ff335dbac12978ac22ac7701914177ca982d17ee7a5b892af9e89bef +EBUILD net-snmp-5.8-r3.ebuild 5310 BLAKE2B 47a553d78eba3127be3fa4d73614ba180651f1f5c519f945656315cc5ad21049b3174d3691e21082b6cb3f848fd39db55038090cb7bf3af91c39fb8a7c3b3fc4 SHA512 815948a84bebae1ed8c8a35ce87f18bf2b719966ec006a6c62835152d33e613c1f471fb6258bac7e6cd0a0c8d8b49a93708949162c715cca6c4e925e817d4de2 +EBUILD net-snmp-5.8-r4.ebuild 5366 BLAKE2B 630900c16812924fae314ca61665f88bf4de8ced7d25f1c988d5ebcdda4a28fefbcd13ba262ac1977ff335ab5885b961996981e4744d262726e9e8653051525d SHA512 857b6798c98a3aa814fb1c66917aaf748ea4d5962eaa5b4c24c796db7d63b38ba562977f5fa44f9acacd66e00007fff0339a4ed0523af5e37c6d0045c6bcf714 +EBUILD net-snmp-5.8-r5.ebuild 5570 BLAKE2B 5b1fb3cd1c1417a1159bcd2e6f65896657088feb83fd6784d326e8b8567d45d87d3b7f944c777f675445b4ad9d28050120d6bc5ffc26896fd9536cde810156de SHA512 31daac5c51bdd7dc0e421d5fb019a8dac778ac07515eb7395b771fdfb80337f2f58d0b44cc674667b2e0c73a402139a0bbbc3f9f9819698be17f739079920346 +EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5574 BLAKE2B 63e724effb975f1cf5b7c0202b0d7c7154fe5f40c7ec2a0f54f81d6955258199dd0add8332eafba67a28c259985bda9e88700b93ffee4d59bb3802eb5f4fb96f SHA512 175073aa77170649ff5c07ba824a39635fbfeaa20e2f39a59c893dec69557a2b4c48c82eb51b8daf5cfe4682bf16e5e81ccea4e0d2c8afb8c29bd1ac691a3234 +EBUILD net-snmp-99999999.ebuild 5509 BLAKE2B 9621a6effe14d8f835902a07951473acf43700e0620264a23b74273fb22d64ccc21ba8a084f594957bccd012ae6e15f0d266365d5b7d0cbc0e61ad6340c8ff1e SHA512 4e4bbeec20b7be336c2c740a73ec3c41b8d9b5a5026e2ce1e41b39cc42c93e88e83c910ab18e404770c38ed725d3fd4aba11f67124c6a88185bc06110d3b870e MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0 diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild index 5ffc1455c318..ac6797d27dc5 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild @@ -138,7 +138,7 @@ src_compile() { use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild index af24fa8d5e87..ced28fac187f 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild @@ -139,7 +139,7 @@ src_compile() { use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild index 53090888876c..fd31b84d6b69 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild @@ -146,7 +146,7 @@ src_compile() { use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild index d853e1f035cd..3f60c5340f9e 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild @@ -145,7 +145,7 @@ src_compile() { use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild index 12ca0cc534b3..dded84ec7341 100644 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild @@ -149,7 +149,7 @@ src_compile() { use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 7ddf12e918bc..ab82944bf6d2 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,6 +1,8 @@ AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8 AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea +DIST netdata-1.20.0.tar.gz 3598521 BLAKE2B 3837ef2beb1b275af89e5927362ab0b83f13cc1227d156f742f4c29ecc9f79de212987c13d6707ac785abac7ae5ce979333a50d5c521b0f019f8cbdf88f831a1 SHA512 ada398cdccf1b1b4dbac5b24d4539f86aafb964458aa4f3bdfac336362504aab6d74b7f2f12bad18b62a44bb62d1a2a8ddd0c2ed80a7c16bc388854d4210bcb6 EBUILD netdata-1.19.0-r2.ebuild 3334 BLAKE2B aa38cb9caaf21a6a7c5fc4f158f97631d02de9ba7441ddeffed4d4fceca7ba517372db1dde38f1b22b1878f47385686b94a005f50a94342b3de8a3acff77d125 SHA512 074b2876241890485a212174d9e5b71a2ab248d78c3b99adbc425f37faf1030de0639962d5ac63573f2f799557233e102bff1c190fabc2482563bc695b699aec -EBUILD netdata-9999.ebuild 3163 BLAKE2B 9cce464fee7d7e8f007929b33f6a99af51085d6cc4ea5aab092ef0353345aa3ac968316b9e93bc7d8db7631af807fc6d7a9ad51e9c628d2ca1e31372026b213c SHA512 db0513404406a6519e62f2dde8167b8b8f17c6b391586be4b9e7c6ced22abf6b12231ecc24c4dec2969d9d7c29ba90935833e8eff29316d0e35fa215401f4d2f +EBUILD netdata-1.20.0.ebuild 3367 BLAKE2B b7ee50506412d0019b08e67478ca99780cb689cae7e65b1911e52df5f5938976d857f2a1a71138b0c964fd50759ddeabe689a51efc9fe0adaf8f40bb9d4017b1 SHA512 086808e110e8e4b2dac661ae48e21ca11d6fc439ab9c4b82b6a8b44f1f8ef632f1427c79c542b3be2f13bc9cf2de7c5116810594f51a6ded19a33f08f6851c03 +EBUILD netdata-9999.ebuild 3367 BLAKE2B b7ee50506412d0019b08e67478ca99780cb689cae7e65b1911e52df5f5938976d857f2a1a71138b0c964fd50759ddeabe689a51efc9fe0adaf8f40bb9d4017b1 SHA512 086808e110e8e4b2dac661ae48e21ca11d6fc439ab9c4b82b6a8b44f1f8ef632f1427c79c542b3be2f13bc9cf2de7c5116810594f51a6ded19a33f08f6851c03 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf diff --git a/net-analyzer/netdata/netdata-1.20.0.ebuild b/net-analyzer/netdata/netdata-1.20.0.ebuild new file mode 100644 index 000000000000..38d285c386ee --- /dev/null +++ b/net-analyzer/netdata/netdata-1.20.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit autotools fcaps linux-info python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-misc/curl + net-misc/wget + sys-apps/util-linux + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + dev-libs/libuv + app-arch/lz4 + dev-libs/judy + dev-libs/openssl:= + ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( dev-libs/json-c ) + kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + dev-libs/protobuf:= + app-arch/snappy + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') + mysql? ( + || ( + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') + ) + ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable kinesis backend-kinesis) \ + $(use_enable mongodb backend-mongodb) \ + $(use_enable prometheus backend-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + fowners -Rc netdata:netdata /var/lib/netdata + keepdir /var/lib/netdata/registry + + fowners -Rc root:netdata /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 2e1eb0f4a276..38d285c386ee 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) -inherit autotools fcaps linux-info python-r1 systemd +inherit autotools fcaps linux-info python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -63,15 +63,15 @@ RDEPEND=" ) python? ( ${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') mysql? ( || ( - dev-python/mysqlclient[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') ) ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - tor? ( net-libs/stem[${PYTHON_USEDEP}] ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) ) xen? ( app-emulation/xen-tools @@ -85,6 +85,7 @@ FILECAPS=( ) pkg_setup() { + use python && python-single-r1_pkg_setup linux-info_pkg_setup } diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index a5a3b655ea79..174d46a13c17 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad -EBUILD netperf-2.7.0-r2.ebuild 1942 BLAKE2B 5fec2182c7d9d6e61c9cfac7de0844485d56b1a02cc2088c5e838747517a5919fbe083c1f6364dd7ddaca9406639b764e6fc135f446a05d430c9041af4083f86 SHA512 7b078ce7081ad3dc8e9cf110505bd7199efd11d4d69599e3b4594d3feafc3318faf2c9e9385820cc70a5eeb3803a215e5e780bb3173d67b432da341c406fc115 +EBUILD netperf-2.7.0-r2.ebuild 1941 BLAKE2B eb6255f913e4e50a16667730c575df5d81d8d51623273ec11356e5acf92b1fd5ee156f4e398522d171bee84d14be48f438ea5492f80cbd4f22b492eb53e216f2 SHA512 278cff1742f5e88d9cce6070e3a7f50399ecc37b10f4abfc95c7a940500252bea820eb0a986c961de51431d4922c8e05f69ba9291368f0f857c6b3001baf5017 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588 diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index 86849c8d0dd7..dbeb9077af87 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -54,7 +54,7 @@ src_configure() { $(use_enable sctp) } -src_install () { +src_install() { default # move netserver into sbin as we had it before 2.4 was released with its diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest index cc7acf82642c..d1f3e565f938 100644 --- a/net-analyzer/netselect/Manifest +++ b/net-analyzer/netselect/Manifest @@ -2,6 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa -EBUILD netselect-0.4-r1.ebuild 972 BLAKE2B 7912717007ac3c8dd31fb3cdacc78189c64ad4154c71a76c70076e9d7491a16c4185c5220f6fb371d22756b347659a2d02649574d90e860ec2983fa9b23d264f SHA512 15066434c0955e199966031d7fbfc3944601aaa45cdde8ba0278ee077fd4425d2ad66276c366eb47cccfb37f6e42b3d17865e0189d1cea2b1f4054684d627584 -EBUILD netselect-9999.ebuild 900 BLAKE2B 581801a56b90a1a856796e0995c6bd4037d52fd14eeb2e1aad47eaf980c0996d8a865b1e95429bd0913e750b4bd0ded217a4ec8a00b308c1a81f02305c6651f6 SHA512 c2619dacf3aba239f68a245ef283f1a7839fcc639fafcd41e8acbebf36e11396997074faab2e36a61c71c0a7665a695f0df838f351bf95a321cabf9a45493b0f +EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 014c9140477b29f5fab51404d732bf8ffcb28c0cacbf9a714248aecd9e97b26e8967a7ebb98818137b2594c84515285e852f4a20fdb1b38e1baa6e3f02600f65 SHA512 dbd3a0249a539e78b605df9178e14d6caf021619c8b8d6717d84b245f20b593386fa2986eeb8b4ca813e6b47f3fd13bf2ee96df3d0b18086ac8fe4e882c8f810 +EBUILD netselect-9999.ebuild 899 BLAKE2B 3ba6abea554f5c72ebab839ae1649c326a6bb76483dad1ca9f4731637a77fb75ff71746e0560cbb0140921f90e1aeecc85b9f1b3ba18aba85e68fb7a5cf7342c SHA512 3eb340cc66a031be74b83bb77d78fd80f77eadb8c8dd3394987e8651a70f78d008d497a78ed3e7725b88deb08b301df705e06e5fea3a90d3ca8d38bfd403e66f MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild index 5b718ae9995e..00f427e799d0 100644 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild @@ -32,7 +32,7 @@ src_compile() { emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" } -src_install () { +src_install() { dobin netselect if ! use prefix ; then diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild index de08fdebbdfa..c41a3b0d656e 100644 --- a/net-analyzer/netselect/netselect-9999.ebuild +++ b/net-analyzer/netselect/netselect-9999.ebuild @@ -38,7 +38,7 @@ src_compile() { emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" } -src_install () { +src_install() { dobin netselect if ! use prefix ; then diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index 2b2a2c2bafdf..dd35c79ec11a 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -4,7 +4,7 @@ AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b -EBUILD nrpe-3.2.1-r1.ebuild 2517 BLAKE2B 205ce1362868769c66d11a312cacba49fe4386b263848854cf7df101dcb654bbe7a6d1cdd9ddf579eeac2ebea17260cae114dbd8bd9272cdc1aba69784de7992 SHA512 3170103cb4810d98a34c078d02a415f551f8fbd54d6f273492392c29152f46b9097467d7e83353357c0aba29783cc83d2ab8e52c48f9b7d29f02e57023b33fd0 -EBUILD nrpe-3.2.1-r3.ebuild 2822 BLAKE2B 6d2b46889d9da9a40d2d67b21c62aa714b1bcc5dcb504bd5079c87f95dbd5967178ba025d84d9e577c4c8053e4cf3831f8e28814f093b6c51b9dcb5cd2ff5482 SHA512 5097efacb350bea0b2f181a43d950481ce1c1703d488dd27fbd35efe9d15d0fd28e2213f8b77ff1adbfc6d0dff19f57247c98c4cb021342e55f0669802799d51 -EBUILD nrpe-4.0.0.ebuild 2822 BLAKE2B 6d2b46889d9da9a40d2d67b21c62aa714b1bcc5dcb504bd5079c87f95dbd5967178ba025d84d9e577c4c8053e4cf3831f8e28814f093b6c51b9dcb5cd2ff5482 SHA512 5097efacb350bea0b2f181a43d950481ce1c1703d488dd27fbd35efe9d15d0fd28e2213f8b77ff1adbfc6d0dff19f57247c98c4cb021342e55f0669802799d51 +EBUILD nrpe-3.2.1-r1.ebuild 2518 BLAKE2B 04b3c3a51d54fa4224462952fad8a87462e4ec7d7779c9302dba7f02591c42c6df772dca9d0b24fcb1d03d0b22d224511c7388e26efa7d22b8ee5261aefa540a SHA512 ae839675938af1bb739ed9fa7295b7d219b4d751b99c16dbbba3709a89b7e639ebd69e1b4c2ef446f4f1a0836472f1873d698060ae911d093db08fab5cc063a9 +EBUILD nrpe-3.2.1-r3.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75 +EBUILD nrpe-4.0.0.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27 diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild index a40bedffbd07..e6bbf0ba41bb 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild +++ b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild @@ -74,7 +74,7 @@ src_install() { rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' } -pkg_postinst(){ +pkg_postinst() { elog 'Some users have reported incompatibilities between nrpe-2.x and' elog 'nrpe-3.x. We recommend that you use the same major version for' elog 'both your server and clients.' diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild index 0dad49acfdf5..6e332b90dd45 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild +++ b/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild @@ -78,7 +78,7 @@ src_install() { rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' } -pkg_postinst(){ +pkg_postinst() { elog 'Some users have reported incompatibilities between nrpe-2.x and' elog 'nrpe-3.x. We recommend that you use the same major version for' elog 'both your server and clients.' diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild index 0dad49acfdf5..6e332b90dd45 100644 --- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild @@ -78,7 +78,7 @@ src_install() { rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' } -pkg_postinst(){ +pkg_postinst() { elog 'Some users have reported incompatibilities between nrpe-2.x and' elog 'nrpe-3.x. We recommend that you use the same major version for' elog 'both your server and clients.' diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest index 8e61de2e2136..f1e060af6447 100644 --- a/net-analyzer/nsat/Manifest +++ b/net-analyzer/nsat/Manifest @@ -6,5 +6,5 @@ AUX nsat-1.5-misc.patch 2422 BLAKE2B 093cbcb9ec6201f6674a0d191db23fc462c9e6bcdf1 AUX nsat-1.5-strip.patch 205 BLAKE2B ac4b4b54ff6f8cf1771f57497317040eb40be829c8bcbb03c2f063fcaa190419e74b8ff5481f8fab4332af223d9a8ba7526d793d084be1f1498d0046db820227 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f834b123ce6ace47d9fa999102f8606e856b55db4b03243c6a427931ee56092c5e0dbc8e9357b139f26e28892 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0 -EBUILD nsat-1.5-r5.ebuild 1505 BLAKE2B a1a22c52b13874f1989cac52547f8e758b4341901801f6576e2cae198c001a52e3a3571b43f37086903745f4da9a3134f50396889b4ecfb47fb7f3aeeebd9372 SHA512 cbbf8fdc0c51440864e64119805a6c7f9f1d8c55406922df6d972461ee302cb7dc26f53403d3b5327fd4b342abfd573c926abbca4b5a908554b1084edbf9f63a +EBUILD nsat-1.5-r5.ebuild 1501 BLAKE2B 5a4ad7f1414a5229d7582ca8f9bb455a285d60b639377149dd92f61c94f48f60dd169273f64a27002bd51a0d2f4da84d4fe18e5961d5f36487ee2bef604fa180 SHA512 515760217c8e5bf67c81cd47302c05e98096807c355ef537a9b8f5e194fa6a1cb39f33fee3642d9f4775c690e67a670ed36747f20fc8e37b5b0d19e72e12aac3 MISC metadata.xml 468 BLAKE2B abead434d23b600816574da4b21286111215e5a5683b14f4b24dff935bcc79c691e787688d78d3bf33e937b3260650dc0a75a8b231ff59c0a6ecbbd8983426a2 SHA512 54bdd25a484a9b3f2ec4642494f4f8e9433c33f013eadc149a77b0ffc3455579a3598ba323344107143b41ae81e1cef6195dcab5b38c6f093f804e468a650454 diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r5.ebuild index c2decc6abfc8..0b60e57866fa 100644 --- a/net-analyzer/nsat/nsat-1.5-r5.ebuild +++ b/net-analyzer/nsat/nsat-1.5-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,7 +60,7 @@ src_compile() { emake MIXOBJ=-lmix++ } -src_install () { +src_install() { dobin nsat smb-ns use X && dobin tools/xnsat diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest index 62ff12c7942b..875710065ef0 100644 --- a/net-analyzer/nstats/Manifest +++ b/net-analyzer/nstats/Manifest @@ -2,6 +2,6 @@ AUX nstats-0.4-glibc24.patch 4546 BLAKE2B 1ddaf23e1ac6ccad95993b903a3d6637f4e6d2 AUX nstats-0.4-makefile.patch 611 BLAKE2B a876d89f3ecc8c7dddf8ef5b83342bad300acd8b4e0d56e1634cf6d3741163b9d2b77ac1286435fb031608271308178aa822751c23a1de52c4fa6b615febbdf1 SHA512 e47cffad1562f767556baf5086db8039f7b504ca4e4f1ebe458d4ce9b9a65cde5f4d7131e4ff8992379ca3db6ffcf30c5e8499a2993e29874f50b00be2d9b8af AUX nstats-0.4-tinfo.patch 469 BLAKE2B f75ad2c31a66a30c3bbf2cd667a60914289e228ef7a356132f6d5abb93e40c9786bdbf99e2899f735c3c78ed0c87de3a8c30ff363678174de4af8155898d7e8d SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843 DIST nstats-0.4.tar.gz 71526 BLAKE2B bc9e4baab1c425d1248b8669a598f85843465c62a3990ea8ea99f979bee9be8eb351111e58b0ece4748b3e199278acd4f0a06ddde2b4cd6e55ca9ff99096e7e8 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315 -EBUILD nstats-0.4-r2.ebuild 666 BLAKE2B aea120694a33f74267346fdb635a6282e612aa100be0cecefde4ac906190ec1c6a27f0bca9bd195ad1aef9127f1465dc2b36c744892d9a68dd9525119aabb4cd SHA512 638b36ecf53a9f6f7bf906af617f98e71719d61b6b00260873220da5d8a6bbaea164541492f2b46a7d06399dba90a925b22de75d1d9ed48fc51eb26a408c1e82 -EBUILD nstats-0.4-r3.ebuild 726 BLAKE2B cf3bd5942e80a288246236b6b387eb91dcac39cfb6616edf7d40182ae28d23ac4ef8d69ddf8608ec81715162e37a151a1846924f47dd284015f1d71f18b1729b SHA512 caa4166dc3f552f3b697ad3e4db307d506453bb32486a49e9c4a96a66ed4d41d578141da4763d32691ad4b369ea93daa24d54d1f7e53c836c1437525c2e22f8d +EBUILD nstats-0.4-r2.ebuild 664 BLAKE2B 7e6f520f564989ce45210266a76bdb51a3af535d77874b65c1b0429d5425b6400311c6d1621c771212081eed7b624ef6153d6aab8bb21001669f97b1e251c706 SHA512 b9e11a53db8356ca4999f22f81e67ee8077d3c21172a251cad5770e15589166bd9fca12a36da83d54132d141f4064e49f5df1fd7070fbc2717d3a7cd8a4d45c0 +EBUILD nstats-0.4-r3.ebuild 727 BLAKE2B 73b58dbeb327c6c54e26f4dd54c4022d45114f6efab4a10c6159409a1f831bcf58a4137f25fc58b2bc23cf7d4872c6bbcb5b8631c262f0a1777e1c72873de61f SHA512 182068a5cd4fb3e60749b8d292f6545fd7f4fe0942688e0a6874c92a8a4c73cea354fda6c1e8c8df78489033d82a8108a6163f969e3e4766945093eacc1f4541 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild index 7da846ede8c9..18e85bd81fe8 100644 --- a/net-analyzer/nstats/nstats-0.4-r2.ebuild +++ b/net-analyzer/nstats/nstats-0.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,7 +24,7 @@ DEPEND=" DOCS=( BUGS doc/TODO doc/ChangeLog ) -src_prepare(){ +src_prepare() { epatch \ "${FILESDIR}"/${P}-glibc24.patch \ "${FILESDIR}"/${P}-makefile.patch \ diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r3.ebuild index 8a5efdfe1627..2fd06e90cf7c 100644 --- a/net-analyzer/nstats/nstats-0.4-r3.ebuild +++ b/net-analyzer/nstats/nstats-0.4-r3.ebuild @@ -27,7 +27,7 @@ PATCHES=( ) DOCS=( BUGS doc/TODO doc/ChangeLog ) -src_prepare(){ +src_prepare() { default eautoreconf } diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest index 24c31ac6d26b..3167036f8c67 100644 --- a/net-analyzer/ostinato/Manifest +++ b/net-analyzer/ostinato/Manifest @@ -1,5 +1,5 @@ AUX ostinato-0.9_p20180522-buildfix.patch 542 BLAKE2B 7916e581c50b3090415cfdd2607e9614e9fffd057e2b2c8d32458fa2582e30ad37c4c334fb7a610d059e5a4951a376ebcc5795511203333333c102abfd7be1ab SHA512 b7647a4d485e5a814cc75cc86bf1552c78d1498363eb1fafcb0ec17dc9c2191d93744dd6d58c47b704ed3e8f756bab5480b31b67ce5e1ace250e64c4523130b7 AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a -EBUILD ostinato-0.9_p20180522.ebuild 847 BLAKE2B 7314d2836b45cfa187f21362d4958ff095e99d5720448cf0e631e989302da4acf612778c5025686e4c4200ef1911b89c2cfae320b316312ea498add1a4d03d7a SHA512 dfe64994620dffcfb52100c6974592340d0af4318a749293c1608ad3bfec9ba6ab5088349eba41fe95e7eadd018d7304eeb0b853ce16044f52d5df92ca3bcca8 +EBUILD ostinato-0.9_p20180522.ebuild 845 BLAKE2B d8d73899375b3cb13cde7cbac55c4708ed877458108e6e48f35768ef84870bcb4d2fcd31893262fece82764b591d7f76411a8735c925d1b5b143b62f203d4577 SHA512 7a9288195b229d3d25b615cf88a1f564ceded3adc1024b488743abd61cfcde3f67809f4ccb0c8e0588c1cbe95df5e3f6df6bcb7744557e22c718d88ee21782f4 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09 diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild index 1beae2abfc9f..34b40de482cc 100644 --- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild +++ b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -34,6 +34,6 @@ PATCHES=( "${FILESDIR}/${P}-no-modeltest.patch" ) -src_configure(){ +src_configure() { eqmake5 PREFIX="${ED}/usr" ost.pro } diff --git a/net-analyzer/pchar/Manifest b/net-analyzer/pchar/Manifest deleted file mode 100644 index 35b1f554fc7d..000000000000 --- a/net-analyzer/pchar/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX pchar-1.5-snmp.patch 874 BLAKE2B d3aa8be912c7c831e621a1900b7689ebcb6aea1eddae56aa41ab36d57d55969782ecc35ebfeb2f5c3457ff7d4fa247772874155c79234be39652df3e104ed96a SHA512 d0f64b535154534f171f4397afbbee0ce1db03048417aebc625c62b546ce2ae02d9af7c03220c9dec76adf6780db1e74c484dc500c1399bc8e7065c5a5c4aa8f -DIST pchar-1.5.tar.gz 117678 BLAKE2B adf146867fae37e20f33cde9055b2766e3261a4da992de4d12cd937ea4afc0b9e8ed8a5ccfb43a34526b39a84ad06dfd204b979d0a9aefb20f4dcf1090c813bd SHA512 56784589a16638a12230a11a177b8dd97a7abac927624beaaea89e0169423f7242c2b434a36aad1a07d977e6b006fd71eb9132aecb1d35e3e3363eb2d1549d84 -EBUILD pchar-1.5-r1.ebuild 880 BLAKE2B 54cc6e0aa9ed49f6e2b7f973dac8f4d6411f0cdd6087e36d156dbfa9b82edc03773db2f79ff22db587c0706993dc2b6ac749e41a59a7ed3a35f2ba45d9adc93c SHA512 696dfb81fce6220e1b583cb27872d06879435dcaf0ef0deab7e445bd358a8c73436103cd22545ba2b61b85fde1655afa2e4be98ec47fe24b4478b5358a3ffc15 -MISC metadata.xml 626 BLAKE2B 234b32fbd8b65b5c6ad81b39ff0e850527ec1e4a1938c596f8b09af8f1873a866e355957918ee2c5576711c24f602b0fd6c5c10c71d09371aca879a626b13163 SHA512 67dc60bde2d5804b91a19d6037b78ca1df55aa735c8329836817af15875fce11345379812090a7755e4952b43d6cc9bb373db1b6ceba70ae957c927321154fb2 diff --git a/net-analyzer/pchar/files/pchar-1.5-snmp.patch b/net-analyzer/pchar/files/pchar-1.5-snmp.patch deleted file mode 100644 index 9ebfbad39eb0..000000000000 --- a/net-analyzer/pchar/files/pchar-1.5-snmp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- GetIfInfo.h.old 2005-02-12 21:32:18.000000000 +0100 -+++ GetIfInfo.h 2006-09-22 11:08:44.000000000 +0200 -@@ -17,7 +17,7 @@ - bool IsValid(void); - - const char * GetDescription(void) const; -- const char * GetIfInfo::GetName(void) const; -+ const char * GetName(void) const; - const char * GetContact(void) const; - const char * GetLocation(void) const; - const char * GetIfDescription(void) const; ---- configure.in.old 2005-02-12 21:32:18.000000000 +0100 -+++ configure.in 2006-10-24 23:08:38.000000000 +0200 -@@ -128,8 +128,8 @@ - LDFLAGS="-L$with_snmp/lib $LDFLAGS" - CPPFLAGS="-I$with_snmp/include $CPPFLAGS" - fi -- AC_CHECK_LIB(crypto, des_cbc_encrypt) -- AC_CHECK_LIB(snmp, snmp_sess_init,,,-lcrypto) -+ AC_CHECK_LIB(crypto, DES_cbc_encrypt) -+ AC_CHECK_LIB(snmp, snmp_sess_init) - fi - - dnl pcap support if desired. If the user enabled --with-pcap, diff --git a/net-analyzer/pchar/metadata.xml b/net-analyzer/pchar/metadata.xml deleted file mode 100644 index f1fd21ae99d5..000000000000 --- a/net-analyzer/pchar/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> -</maintainer> -<longdescription lang="en"> -pchar is a reimplementation of the pathchar utility, written by Van -Jacobson. Both programs attempt to characterize the bandwidth, -latency, and loss of links along an end-to-end path through the -Internet. pchar works in both IPv4 and IPv6 networks. -</longdescription> -<use> - <flag name="pcap">Use the <pkg>net-libs/libpcap</pkg> library</flag> -</use> -</pkgmetadata> diff --git a/net-analyzer/pchar/pchar-1.5-r1.ebuild b/net-analyzer/pchar/pchar-1.5-r1.ebuild deleted file mode 100644 index 37006d24eeac..000000000000 --- a/net-analyzer/pchar/pchar-1.5-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -WANT_AUTOCONF=2.1 -WANT_AUTOMAKE=none - -inherit eutils autotools toolchain-funcs - -DESCRIPTION="Internet bandwidth, latency, and loss of links analyzer" -HOMEPAGE="http://www.kitchenlab.org/www/bmah/Software/pchar/" -SRC_URI="http://www.kitchenlab.org/www/bmah/Software/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 pcap snmp" - -DEPEND=">=dev-libs/openssl-0.9.7 - snmp? ( net-analyzer/net-snmp[ucd-compat(+)] ) - pcap? ( net-libs/libpcap )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-snmp.patch - - eautoreconf -} - -src_configure() { - tc-export CC CXX - - econf --without-suid \ - $(use_with ipv6) \ - $(use_with snmp snmp /usr/lib) \ - $(use_with pcap) -} - -src_install() { - einstall - dodoc FAQ CHANGES README -} diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index 296aea8be541..2b0584e05e9f 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -2,5 +2,5 @@ AUX 98_pnp4nagios-2.4.conf 725 BLAKE2B ca04f13ad57a90d339980566008d7176aed8be5de AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a955290ce040c263c5848773f24c4ab8e05f5d78ab34693a3636bc8837aae8ef718e64f5c4e3c SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 -EBUILD pnp4nagios-0.6.26-r9.ebuild 3101 BLAKE2B d4c6461563e1dd89223f8684f03c7d093b32846777238e15c8dd2aeff3ee5ab293f5f1ef968cfe229f11f25f2e9e6a3381244c05f0d343ab65499d191466bc2c SHA512 670fb5974ea643834f1a14e8b92b01daf2feafcfdf7af82b3aef11dc918c773693a791475a52eea0af87a4cc40acb048960657114a0e7bb7541cb1ef4418071a +EBUILD pnp4nagios-0.6.26-r9.ebuild 3071 BLAKE2B ed4e1c5b1b8355ae1f146eedf5af02c9a4ebac830b4df49f1b826488b0528b60918430fc9969e09ebb3f40bb7a44aa59d1a68538f3f2bcca0a4669780d7121dc SHA512 9fe5e0722484dadefa047c8fe0bff0f5faae933589d33ee6a3905de0f55e51e4bf1b00a48fb1e0547fad09415fd03393b857bb1bf8a7e57f02b0a8885e6dd143 MISC metadata.xml 716 BLAKE2B 571931c0525f50709ef759d13290bb5606ad311954ce10a8fa60a521cd1fd5d1917316ddc32231c2d16c07b2c0d6fc17c38a81b317e1ed4927645f1663b315ba SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55 diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild index 48d161daa230..6a09ab87188b 100644 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ REQUIRED_USE="^^ ( icinga nagios )" DEPEND=" dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] net-analyzer/rrdtool[graph,perl] - icinga? ( || ( net-analyzer/icinga2 net-analyzer/icinga ) ) + icinga? ( net-analyzer/icinga2 ) nagios? ( net-analyzer/nagios-core )" # A list of modules used in our Apache config file. diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest index cd10a60df82f..0835e5b986d5 100644 --- a/net-analyzer/scapy/Manifest +++ b/net-analyzer/scapy/Manifest @@ -1,8 +1,6 @@ -DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede -EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5 EBUILD scapy-2.4.2.ebuild 1013 BLAKE2B 4af428aa0b92bd5c174fc79d8d5a7ef010b220049d5a3db9b9b204235629ad9711c42d57635905be3f3f50965b215f539086d6fc5bf8be047c98075f90158208 SHA512 0655992680d112db6c7dc5b9c88c5effca5cb274eaaa2f6e055a52162b995f28a29a436279900c7bf1cfe21452b8a10fddc76a43d9b7014eddce0e8fcf946a23 EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78 EBUILD scapy-9999.ebuild 969 BLAKE2B dbf38248cce514847dc8b3dd735c7aefef4a283327db74af9cf39591f543936c5fc91e213d522edbd8aaa0708dee682523ef2fcced676e11a5d272f3f3f97f22 SHA512 b9d85c1dab47372522248772444fe8530ca16dd9ac1c1f4e4419b247c66b102d7236bb3d3c7b58902b55e8c42dadae6b3378e357f97cba30720d9b7fe94fcf6f -MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf +MISC metadata.xml 460 BLAKE2B c2e6394f3ddbbd6fafd1ad50ad4efbdec39016adbdc84b18a2d50ec86d71d28f66c7bd4282b7ff5be8bbc8564c8e2682cdad0678bd84c6244854bbc76a2cd116 SHA512 62b81aff71c77ebd87a6d7f6b84685b3a9350568a549bbc406db05adc33dfe10fa1e4558445ad0fdf8d6a451a9982100b743359a1c2b253005bb17f694d42e34 diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml index 24eb6add1a74..a7791d1ecc1b 100644 --- a/net-analyzer/scapy/metadata.xml +++ b/net-analyzer/scapy/metadata.xml @@ -9,10 +9,6 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <use> - <flag name="pyx">Enable <pkg>dev-python/pyx</pkg> support for psdump/pdfdump commands</flag> - <flag name="tcpreplay">Enable <pkg>net-analyzer/tcpreplay</pkg> support for fast packet replay</flag> - </use> <upstream> <remote-id type="github">secdev/scapy</remote-id> </upstream> diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild deleted file mode 100644 index e3f662d3328b..000000000000 --- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils distutils-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnuplot pyx crypt graphviz imagemagick tcpreplay" - -RDEPEND=" - net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) - pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] ) ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( virtual/imagemagick-tools ) - tcpreplay? ( net-analyzer/tcpreplay ) -" diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest index 70569be35bb7..eb33059a4832 100644 --- a/net-analyzer/sguil-server/Manifest +++ b/net-analyzer/sguil-server/Manifest @@ -3,7 +3,7 @@ AUX sguild.initd 1198 BLAKE2B bd1225afa2e9544a818d234270fa1179db899b400492cea5ef DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab DIST sguil-server-0.8.0.tar.gz 102236 BLAKE2B 15dfe03f79bba92486e12fa85a368e01005c8587abd7119ef5264c14efaf8f8861346c1744590316a2a40160d11b3042abe8456f911fee677d83846561a8ee70 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710 -EBUILD sguil-server-0.8.0.ebuild 2716 BLAKE2B 194464c08905549da414376bdff269f777f3836555cff3ee4a379e2498d5dc6a41bc42ece6bc73bccc1200051c2e7447f615c079b19142ec2dcc7fd3fcd06701 SHA512 69c4956fcec20c7813150fdcbb75f2df7ccc5b7691944967e03a88d63678e27d9d3179fd93a217e24880a5591e072891d0ad81931c7a847e04671d2c6a75383c -EBUILD sguil-server-0.9.0.ebuild 2744 BLAKE2B e7edb0c386675f3a9a216d4728b238a322414533a2547b059611ace37aec043f2fc22b8aec4fa3d293d2e6fcb97d5eb6713abb761087d0452a1fec3ecf204af2 SHA512 bae037820841e967a714d7b054a2830fb8dcc369729fce90132286b07abc7fa09fcb777c667a0b8a69a1182a584962dce47d0a7323f89a5a4762e06ec588e931 -EBUILD sguil-server-1.0.0.ebuild 2693 BLAKE2B 234c8ebeddb6378d33729e9737cb5e176e33b43af5761d2df89fbcbd5ad29324d72ccca9fc48bb4d8cd2b3763d6744ce4e7e511d34fdb601924c907b2e80cf8f SHA512 047af98a08dce9388cf959ddbc874e0bd09e4cfd0a2ec7ed7ecc3e2773cdfa9130768067ea51f1d3aaf40042935fe42bf8906d10da607b12374337944f9959ca +EBUILD sguil-server-0.8.0.ebuild 2716 BLAKE2B 78b73df05a2d73d390dddc051e78a80031a0bf48263f2bb43e1dbac6180d67a5ecea9e76d1c80590b46f8860360253eab5180b4dbe3e5a3dea0df9ce248792fd SHA512 796f7ff1160ebfeaebad19bc778a54cc8d44cf7376ff74dda704f9dc25018a1277500cb3e3e5a08a1dd70a87842a3fe3e1fbeef318ce9cafb01466b534da67c4 +EBUILD sguil-server-0.9.0.ebuild 2744 BLAKE2B 5d64790bf018e24fc99a59beb386f49d4c0f0e97e6ca59c1c183b8228d720e83d3fbd3045da664cb953e51a72938f28dfc6a5d911c0d8f5dc4a74cc39e891583 SHA512 c7a3d412059c9c436a04312cac698559ba6b135ac72fd83b798bceb19ebcb7bb485b106ff91466cc7a94d219051dbbaa873de421b884e88f9b1c936cb5d362e2 +EBUILD sguil-server-1.0.0.ebuild 2696 BLAKE2B 73d8065d9cbf487839c61c85169de7a41fc267a334a191bad48aed2bcbe643e5f01b7f39853699c3f4a52639f4b854de58d035d30140e598942c4648ba8e8e3a SHA512 3faf9efbd2832e93e988e367bbe7161d4028232406eeabe43e45c7cb306abf3c3dfd1efc6068bb104bc23570a29893d2e9362169a1f850470773a14cf0dc5cc0 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3 diff --git a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild index f6727a2fe11c..916e85a177ae 100644 --- a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild +++ b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -33,7 +33,7 @@ pkg_setup() { enewuser sguil -1 -1 /var/lib/sguil sguil } -src_prepare(){ +src_prepare() { sed -i \ -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ -e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \ @@ -43,7 +43,7 @@ src_prepare(){ server/sguild.conf || die } -src_install(){ +src_install() { dodoc server/sql_scripts/* dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ doc/TODO doc/sguildb.dia @@ -70,7 +70,7 @@ src_install(){ } -pkg_postinst(){ +pkg_postinst() { if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then install_cert /etc/sguil/sguild fi diff --git a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild index 22db45ec08fd..2e7c27e1fe29 100644 --- a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild +++ b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -33,7 +33,7 @@ pkg_setup() { enewuser sguil -1 -1 /var/lib/sguil sguil } -src_prepare(){ +src_prepare() { sed -i \ -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ -e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \ @@ -43,7 +43,7 @@ src_prepare(){ server/sguild.conf || die } -src_install(){ +src_install() { dodoc server/sql_scripts/* dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ doc/TODO doc/sguildb.dia @@ -70,7 +70,7 @@ src_install(){ } -pkg_postinst(){ +pkg_postinst() { if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then install_cert /etc/sguil/sguild fi diff --git a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild index 98fc91963aac..08a35d0af331 100644 --- a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild +++ b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild @@ -35,7 +35,7 @@ pkg_setup() { enewuser sguil -1 -1 /var/lib/sguil sguil } -src_prepare(){ +src_prepare() { default sed -i \ -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ @@ -45,7 +45,7 @@ src_prepare(){ server/sguild.conf || die } -src_install(){ +src_install() { dodoc server/sql_scripts/* dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ doc/TODO doc/sguildb.dia @@ -72,7 +72,7 @@ src_install(){ } -pkg_postinst(){ +pkg_postinst() { if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then install_cert /etc/sguil/sguild fi diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest index b6a9cbcce58e..184d3664e6f8 100644 --- a/net-analyzer/sniffit/Manifest +++ b/net-analyzer/sniffit/Manifest @@ -5,6 +5,6 @@ AUX sniffit-0.4.0-fno-common.patch 6287 BLAKE2B 6480ee02366d834b9a6097a36023dd2e AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6 DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 -EBUILD sniffit-0.3.7-r4.ebuild 792 BLAKE2B 91723d785619de8ab8de16708d365e07a43310e093cae0f3b794d5b38054588a9760cf9c26639feef7cb83f612aacfe08b804ff585ec2b01469ac54105254c12 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35 +EBUILD sniffit-0.3.7-r4.ebuild 788 BLAKE2B 3cb0cb745eaf958aca7c4f51f33d78e98f1721883b7f4d993601e83c078f2a90852b93ed5bd6556b0e3c065cd183c07ed5bc9986f02e244f9bbdaa0de1a87758 SHA512 8dcde1e3a6c54476303a8726eadfd53456c1711181717bcde0b805746c847db1ca2dc7d72adcb640e39992049111453073b51e1f338605e9f51e08ce4607fef2 EBUILD sniffit-0.4.0.ebuild 631 BLAKE2B d2411739bbf645031179c22bb82cb6ee485e46aa3e6f73de1ec75e0e38d8700bdafd40ff6fd7e76bbaca72c87bfcf03f46d2cc7d170534289094840250d36675 SHA512 7ca9b61f2da0120d31737c9936901506ec5c51353a500f64efda06d97d4829449b883dec644e48057cfd402661ad93b03b528aa26ca24669936c0d662f2fa94a MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild index 404ae9f3cbc8..7429554093a7 100644 --- a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild +++ b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,7 +32,7 @@ src_prepare() { tc-export CC } -src_install () { +src_install() { dosbin sniffit doman sniffit.5 sniffit.8 diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest index 2166457c903f..6cd13ebb9dd9 100644 --- a/net-analyzer/snortalog/Manifest +++ b/net-analyzer/snortalog/Manifest @@ -1,3 +1,3 @@ DIST snortalog_v2.4.3.tar 1324032 BLAKE2B dae81fe861c7d85ce5fce63ffe773cccb8b643654a861e1b9cc91db22e5683c4a5d2c83ee6a1895386777c600b004978f91e3ed8a333397139bfe6f9644a79ce SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06 -EBUILD snortalog-2.4.3-r1.ebuild 1440 BLAKE2B f4efffc2bd0bc43aca31976a6dca3c795a6ca788d34259dced2571544fcc88e7f333e144b5fa82ad94372ce7a7700413b13b5f2946bc2427d163f44c23789777 SHA512 04ba14a59aae3abc162496d8394be0450b42ff79bca89bcbe70d70a726d60cc5b76561b97243d0f1f1f97454bf3ce6abf238b4ddea76a046b08b6449cd880259 +EBUILD snortalog-2.4.3-r1.ebuild 1439 BLAKE2B d8bc3709fec9b09e1273b1b638a922a7ea63fb7a6bf373a457151301d4c0a827fb8cea4c5b7c0075715d1158280127e30c8ce5b236738a78715bc069b4f1783a SHA512 57b4291d92d321e72c57941a2a9d74b104afd8662d0f679ebb44ab428b2c96fb01785cf8218d84739bef90ed7b88a4ad92c504abcf024303789128068a5d37fa MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild index 076c1310b734..18e2cd14b905 100644 --- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild @@ -41,7 +41,7 @@ src_prepare() { snortalog.pl || die } -src_install () { +src_install() { dobin snortalog.pl insinto /etc/snortalog diff --git a/net-analyzer/sqlninja/Manifest b/net-analyzer/sqlninja/Manifest index f580299437fe..26c78fd031d9 100644 --- a/net-analyzer/sqlninja/Manifest +++ b/net-analyzer/sqlninja/Manifest @@ -1,4 +1,4 @@ AUX sqlninja 47 BLAKE2B ea2fe2997cee59de681528f2a87e0b40c73061ee02893f1e46e4a21bd1f51c936473c9987735481ab6ff1ec7e665538f5af8afca3c72ba82441e25c975e69a24 SHA512 5ad7443ca0691e5e9a309d698d3503e683cf38d9ac980c7aaff562e008fc5120736a826ee87a44ea6c65da15fa868d9fcdf3291f97ad2f747ad3ceddb66065c4 DIST sqlninja-0.2.6-r1.tgz 454841 BLAKE2B c8fc4932c4bffe03e873126801c75dbf9961b97979ff1fd1530aca5f0d132513f62de2516e1649f57955c0ef5ca723b52cd4f9c6e89b27df63b978b0aaf42745 SHA512 18f6c8f0f1eca59d9ce6df80267f1f6bf45d151dfcd395b32d349119e1480389ba28f057778349b4276d480f60c41ca03578a1ca9c4e246f3fcb63653bc6ccf9 -EBUILD sqlninja-0.2.6_p1-r1.ebuild 1085 BLAKE2B fa11d1efd1f0c4158485248cae796d68562f14800122585172baabfd3362d38aac584454a6eceb74a6a3765e49072d5a49deab6d69ec6eb38c2d38975c546b9e SHA512 04a353d57136d745435db0081a3712cda101bd84682b8298fc2e1f414047ee982bf0ecf1629505cf6b92012b64b347f2e41048fc3a2aff8a56821b6fa8167dac +EBUILD sqlninja-0.2.6_p1-r1.ebuild 1081 BLAKE2B 1d9b6aad062c4820c3c78d07cc402918ca681a6c91d7d2837f308a8a4ae12a974d64f37ff3060e865fe2979fc87aba3581680e870581d81ec8ddcf50e4feed9f SHA512 65a03bb791872072133a9431baa07fc796817863c44e9b27432e4aa76dd1a1405044692d3ab40f7b8451bfe61ae1eb4c642d7e80c2395538b68648a763a60ee0 MISC metadata.xml 358 BLAKE2B 56d7f3258c5b1626a7f8ce6ac48a65c366c39cc989ca21f7fe61b760fc82dee3106cae9dea855f803cac5fd405da3fab0a406bc52898b09790308b20105bc206 SHA512 54207d10d599ae5f3fb994b9c60fb3c5631a25b590aec06c86463e101e4d99b3d48a667868c5732a9bcb2feffd9a731166efc75b25d9793107ec11ff4c4cf0cd diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild index e85466b632e4..a4283bd9f1ac 100644 --- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild +++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -30,7 +30,7 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" -src_install () { +src_install() { dodoc sqlninja-howto.html ChangeLog README if use doc; then diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest index ab1abb260b3e..3eadfcaf01ab 100644 --- a/net-analyzer/squid-graph/Manifest +++ b/net-analyzer/squid-graph/Manifest @@ -1,3 +1,3 @@ DIST squid-graph-3.2.tar.gz 20066 BLAKE2B 16c4b9621ad45eefe7be8c83d7339fb832516241e8eb17c7f0906b6dc7cddf06b2ed32d00e84ab390f95f7a57798f7af75a36af940605ce186513c09611c2152 SHA512 ab2529b0b67fb6549dd0837f2208ae712460ad19876baee8000a51c91ab31c464b83b360dfc93690ad6f4b3feb969cc95ca38a179ddefb6e0aa54b0cff866bfd -EBUILD squid-graph-3.2-r1.ebuild 478 BLAKE2B 19d7d79525a3bb2fbe4619bc7ce5e8bbb8991a65db242f93b242e2e0a45ce6bfa5e61cb4e42cd06fc486f322a7f1b5d71aeae13e377b976e60e58c7edbbb9289 SHA512 2073dd5f11f68ec6f3164fe6962b8cd1c0ea975628ac1c23b2e3d0f5a7522fa34fbe46e3e190f3a51de0583e9527cf460f2d15a5a1217e0605b899aa9e416577 +EBUILD squid-graph-3.2-r1.ebuild 474 BLAKE2B b205640cab28ff1cb47fd32eb65709f174f35f8431062dc30b7ede918454b049bc79be23f6509d749380eab42761780e4179c90fdc9764602aed5ace754bd533 SHA512 d400c6e7250e111aa607e5e848e7b22a043fe7986bd24cdf16db4a33ba7245f47eb1fc80b622847ad58757b8ffe59a8efa6d90511c302aa0db394113183da5c5 MISC metadata.xml 440 BLAKE2B 3a2323e854cf053276baf26c951e546fbe3ad63edbd4d753525795faee01e724ba385c7d60b2aec7fa5422670d7cf5958d30d5a6b01cc87c8751152b5360f3fd SHA512 32c8207098291a0c1d4248d3d2a6c726a9627c038be9df16aa9368ae20c6dfd63380152c79b3348d990fa61ea8acc220a87bafe3e3f5ba9913686b142aea23d2 diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild index 2d14d8885f1b..4c5d34c145d1 100644 --- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild +++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,7 +16,7 @@ RDEPEND="dev-perl/GD[png]" S=${WORKDIR}/${PN} -src_install () { +src_install() { dobin apacheconv generate.cgi squid-graph timeconv dodoc README } diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest index d1811f2053a0..b146fa606107 100644 --- a/net-analyzer/squidsites/Manifest +++ b/net-analyzer/squidsites/Manifest @@ -1,4 +1,4 @@ AUX squidsites-1.01-format-security.patch 210 BLAKE2B 27d40d5919f6e94babd32e04c3faf4ab864a0ba8edc6f6138979ef26083f1894561208827d7173948755fb2b9ce4ed0c3e176363ee20c71c1fe21b9f64ce0a09 SHA512 0e5d42ccf3a0ff75b630ae82b4db34d4e04df1e3336a701168df2ceb7194ce64d22f442dd523f7a3e37a74255a71cad162026e43121d0f4d06861cd0f5e8ac5f DIST squidsites-1.01.tar.gz 23646 BLAKE2B 89f236c83cbaffd6671c3d22b51c8325e8224259b2902a6b3d70f5bfd3bd4bd5391434ae4672d7c57165636ba4263da397ed187c3f2bdfe7f3d62512e0e5faff SHA512 ecd6caf4ffbb531de1de85b2d8548e4256603909b1d1bc8c368516b644298803bc0cf3036a370ad679a763b94494bd755043df8a806dcca16990024c515cfed9 -EBUILD squidsites-1.01-r2.ebuild 765 BLAKE2B d5a383c64dd043cfac85c1a63206a91d4a7c10fc164f6691f1768f5d992d73264cc56b6cfb1e1398d81bc88669a8014b5be0455bb125ff430048e4028c78b873 SHA512 96c7504f3da74468cfe9fd371c459e77bbaeadc9b5d3c492edffbc2027457235ce10cc5ce321bbd14645d82446597ca962d893ef724205314cc9fab83bd28fb0 +EBUILD squidsites-1.01-r2.ebuild 761 BLAKE2B 1a5e13ef73a6864724f2cc82231b4c9faf5c66ff070eddf2941f809f96b8da0ed07cc9a0083fc569812b04cc10beba87a067059c107c83656418be89ffb68ef0 SHA512 1ea6c60bc3ee84aa2a90546139ac0583b5b4393b34b2bac3dc0a49ffc631a8305a1b9ba345fde37b0a8f44bb186f983597b19eb1e54321c58188fb536fc97f72 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild index f6bd96865543..01f56bf30cc3 100644 --- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild +++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ src_compile() { emake CC="$(tc-getCC)" } -src_install () { +src_install() { cd "${WORKDIR}" || die dobin src/squidsites dodoc Authors Bugs ChangeLog GNU-Manifesto.html README diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index f286de32b8e7..20ecf09dbb84 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1,4 +1,6 @@ DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f +DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96 EBUILD wapiti-3.0.2.ebuild 1043 BLAKE2B e15a894c9b436994abcbe7c8298f424b12b220000aa30a06f66fef5dcf15faef150fc30264c277e4cd8962e4db1fdbbce85e0bf70f588c7ee3c1164fe6871662 SHA512 abe41d4195058fbcb9175523c39ade25eb94ff803a582eb5aa0ace1da10917d2c7c1d3b063e130fa85888c7e4f39a77f9338cfaa7a05c54df4209966137d625b +EBUILD wapiti-3.0.3.ebuild 1047 BLAKE2B ffaec39d9b48421c38a4eac8f4be90a8223a32f49353718ccdde3c6bb1b9766fda5197b27d393fffdb7146aa28027520aa0a74c8ee20c6a220489503a2b5c4ba SHA512 9851124d15241c153f50b60d6185586c546ac08542f0a37ae4668416f95ad60f7c59b1bcc71978a00eec280bf35b684bc08cf2584ef3b4a63f06386f5200a642 EBUILD wapiti-9999.ebuild 1011 BLAKE2B ad1a5f599415bda5114ec1573e309c649b5e0a9605814d424f2efbfb30fb7020e9a868e3670ce31e11461bda779603c444fb461f45b77f1ae25a28ecfe466ca9 SHA512 3539e6093bd5219b5a6066e9708ee2a99501c01b868b3deef677fc9a45e8a75e8fdf94e05ab8c0a34ae86dc5cdd4b60e8b933162b7695f22cb5f92318a0661d0 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25 diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild new file mode 100644 index 000000000000..a89de4ef3a34 --- /dev/null +++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE='xml' + +inherit distutils-r1 + +MY_P=${PN}3-${PV} +DESCRIPTION="Web-application vulnerability scanner" +HOMEPAGE="http://wapiti.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="kerberos ntlm test" + +RESTRICT="!test? ( test )" + +DEPEND="test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + )" +RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] + dev-python/tld[${PYTHON_USEDEP}] + dev-python/yaswfp[${PYTHON_USEDEP}] + kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) + ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" + +S=${WORKDIR}/${MY_P} + +python_prepare_all() { + sed -e 's/"pytest-runner"//' -i setup.py || die + distutils-r1_python_prepare_all +} diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 287b907d063c..d9267bb78aed 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,40 +1,22 @@ -AUX 2.2/init.d/zabbix-agentd 607 BLAKE2B 664da3e8e9abcd4fea285ccf4bc297c7cb0a2311c435b08d33d041f36f773aa7b104f4d4bb3bd6a8f0d8a3f29f7cb287eea29167ecf9cf492a23405c20c3547c SHA512 e2e974af382fc85e2b44fe2adac36d55470d6b091144ece1e85718639b33e28360e831b357ce6cb4f5db70d540da679f72f55e6ffb7371520faa665b43f32b8c -AUX 2.2/init.d/zabbix-proxy 585 BLAKE2B a24cae2e28d27f2115ccefe94abee9cf8542767a3702af94ba733130e58e734d26c4f354bf40684af87717d7e0cab91cb13707b5f546d4779b90dbaf5a6523f1 SHA512 e996f175bee5cfa459561143ea827053ca56c8db7c8bffba7cd8deb73798ca00b15830afed8b5a50e8ba6db3db1d52ffa1f2ab09f4412259f9cbe16bd1ef2545 -AUX 2.2/init.d/zabbix-server 596 BLAKE2B 5f51e83c4c87551664f6466244c1c625974892c3ac19d1d66d558100f6cf40efedb83fa4cdc2e648ee86bc9dadbe9abd9948d77254f28af8aaf9212574b9ce4f SHA512 b1e7e5b7cc9f68283a6cfb515eefee82b58b7337f4accb8db8486dd8f7b692add2597d2b187336c7ceb40db29fe70e02f9ca0f01ef4cf2e1e12a2e375ce91449 -AUX 2.2/patches/zbx7479.patch 2148 BLAKE2B c015c0af90c71ab97eec7f5ddda164902c3793b1ba1611bf30760d3536698fc855b5cb79423755dafe69f43cb9c917e8ac700d11ef4db9c871d5f1eb05449e0f SHA512 1acaddbdb9e2fa0f09703a8274db53fcb23b8ead3cf8b34f81bb2b38e65d576ccf4198a9504c255f3c6f2f900078e74341d9cf331af53aa697b0420ffccdde9a -AUX 2.2/patches/zbx8151.patch 2328 BLAKE2B bfb904c64bc5f80cae318f8fd11bb204a1e773ef9db19857d8784725e6b7bd717ca29b41178f72de275d727e9ff394be7bb7b151916875aa5074764af846f77b SHA512 f34c478241baf64739b8a2ae964a1c8d0f9e0d59963c8d8442e03b555e1f4d425dc90ab9491509c7e5c38e85ed8f3944c4626c7e2ca627a774219005bba6dba6 -AUX 2.2/zabbix_agent.conf 2138 BLAKE2B b9caab95e3b796de7a3c34a0b485f93d338c854d548ec07dda09372f0e068d9866d8bf6aad63ce39c2ab3c260e05ba26c9f766d47281b6fd083f8a4d7d91e556 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 -AUX 2.2/zabbix_agentd.conf 7009 BLAKE2B 868da133c2d0902565eb5b11691e6f0dfbf600602db1bdd4174568b167aa81bac18c6d32c779dca4acdd962a5c144c1b5129ad19efb5ea0d7a56221db962eb6e SHA512 0474e31279c0cd0083468ec4f354176197bdd9ae7138f15dc19454537248b1218993ba6e79b292c4e526df6230104a5a40781fc44d618d4117ff72132424e699 -AUX 2.2/zabbix_proxy.conf 11353 BLAKE2B 5eb5485a9b547b9a9c97f176f8b88cd72222f8075a9b19b664eb47bf115871a83580879e20557fb9eb8e9c3cc8f53be1d5b0b7474f02e27460c8fbaa0b5dd6e3 SHA512 35e278970a8ca2d1c2ba763d6a57eec4d05586c3eec9c2aa80c67d1eff1b78354dcf823161f03b06ade4c3f9616016a2fc653ea2686e7e0ea4ca00e1bab5e29b -AUX 2.2/zabbix_server.conf 12145 BLAKE2B 817dda949adbc213b50720e4878d8302fbfa42a98164ec957dfc283270c21f219ad7a70fee72caf854a313a5281da138a8f545e9f42b6241b2e192e9c11f120a SHA512 d53801446011d36ede4821207dd507b50d3b8ebc29d54f9a4d9bfc2814746c73b7fc43156a940c3bd154776cb1b358853727e931eff68a9d1fcd9549c10c6e77 -AUX 3.0/conf.d/zabbix-jmx-proxy 432 BLAKE2B 188737819d39b9e8ec8913237ff048a68ef19f2ec8849bab6c62bea612ac927d00a6c7042ba87261297ff580ef9976618d6acbd24c7fda8f6eb26b2b3dc891bb SHA512 0d68b9681528256131e35b5115053242f8558f5ad06254e61a16ab14f6530048551f0b777fa81d4afe07cc6282c31a6204fd0ee2e56e0e792ed3252222212250 -AUX 3.0/init.d/zabbix-agentd 604 BLAKE2B 3839408133cb02b531ddd948e988bc89a9dfe245d1949726e4b1748060e1ac896a0fb70229623f452a65423e6e6fac9a8db39fb4f3abd78988b0f139512dbdf9 SHA512 ccbb2484fc6f2228d05b38a66cf01b9eaa99f8baf0facc71eda223a9bb8cdcd7c2f5e17a09a5056bbdd8c6d7d0f67a9827ff060ed9c5f3fcaeb61b365decb414 -AUX 3.0/init.d/zabbix-jmx-proxy 849 BLAKE2B 14a312911a11d765210f3bd86d38c8ce3a2f230c821a03d2dd3b2a2aaf05a86cf64a59ea283ad0f11b62fe17a81936cef03463e5cee6535f1a51558b7bad790a SHA512 79a1966405546899b2e6eb4cb53f0ea1ec70575cbf97ff0f9de16d662c5750f8bf276bf8eadaf00cb69ffa078b79e9144eb9824eec6a23df6b2cd315b79b05d8 -AUX 3.0/init.d/zabbix-proxy 582 BLAKE2B 69a85a1e93bd4f1759d72252ad7b9de62bbdd2b3fc0876021db420ceb9db89b09e5d249e49f0c65fcbfd77900f3008032c3b3aaf158766ec3fdfc3d8ec31de9e SHA512 9c0b81fedefe6af643800dff3e9955b19ffda3b2266b6ea85705f698d1578e3f550c3776c4343e5867a7c07124a99f1cbba22a549d2e77473e8c0d7c2ae7faed -AUX 3.0/init.d/zabbix-server 593 BLAKE2B aada741274ecf83a5b0487ee84ad2cff0a111c2a220981f71c01b441be6d78b5a4277ee90bcf6a624c514b67b8e870786c0646a740982af2dfba008925323634 SHA512 53336b569563f1b24066bfaddb2d5da71dbdb153b7450ac4866ed800b426b753e38fe7400ae1ac6b75560c6c1f2913a6a0b3808dad89c4bd73457894d50b682d -AUX 3.0/zabbix_agent.conf 2138 BLAKE2B b9caab95e3b796de7a3c34a0b485f93d338c854d548ec07dda09372f0e068d9866d8bf6aad63ce39c2ab3c260e05ba26c9f766d47281b6fd083f8a4d7d91e556 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 -AUX 3.0/zabbix_agentd.conf 10299 BLAKE2B 23ce2d3dd0b3a033ca98127ff62e78af043f8a75750d9956121a6ab6b2d925ef9cf1062a84425ba599add9e05ec9e8db76e80a84c7b94919377e1b9ac53a1994 SHA512 ed2e8fca996b5227616a01a2479ca5910833e67d4c30b99b2f70a1618d0ec6f44b5a9d68de81131e1d84cd93a6e39ddf1ecb79beb7cb853232cb9ea0b5f6a3d9 -AUX 3.0/zabbix_proxy.conf 15824 BLAKE2B 9055f6cd56407a90dd1dff80b2d08686d285f9b9111d8eaa37f4d25604ba8d27a3e1cde35b7b9f57df2993e9c4b1c8e9428cf61939bc9be74a1781688c0d57e9 SHA512 7f06f7e5514cc30d8f477a522fb37d4ff70307a78c9c748bccc6b352031f85947563a3f965986a9549a6a868bdac9c40d2596ea2e91affe507e0387443b1aab7 -AUX 3.0/zabbix_server.conf 14822 BLAKE2B 055a45ccd7199a2adbaf0a1ffe200b73b0aedd8eb72e273d9fa0ef26068e201177aec47bc4c40d43b6da548751370c8d3a216c1c6dd1eacb9fc96f980fb13630 SHA512 755b8b80d8e10620f8d4d19fb22f3b99633a4904d134665aed982da9a43b2666b622753f7990d27d90d9645fa391882e46c8e37540a107852514d2966b0ce5e2 -AUX 4.0/patches/zbx401-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5 -AUX zabbix-agentd.service 254 BLAKE2B 05e1811530fe9df3212c5700f1865c6f888de4e6f34630ebcd704283ed2d87eb12a8302213cd0c88a7c10c64ec2884f0e54a4b1568eb619d4bd4d4cabdaa5aaf SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01 +AUX zabbix-3.0.30-mysql8.patch 608 BLAKE2B 56e2cb893269cdeefbc6ca7c40e73b9af2012e4075d997369c516253211d6de6266a1f565ecbf39cd4520fe76f65968d43320ea8e5b2cd59d2a0eb9f8febc9f4 SHA512 13e95e0f3fd1aff4f2546ce5b3cb48c59e117984192a2574d799ca062ce763982d2984e5fa94b49f077aaebbbb3442a06a0d9982a38a21f5ea739fd0fed87148 +AUX zabbix-3.0.30-security-disable-PidFile.patch 1378 BLAKE2B c1efdfd0b223987c9d9bf1a3f7731f0bdfeb42d1641bbf4387d70ece757f5cb2fb88bafb87f6938a5efbec091f73d5fde0450e8aa0edc3143d589df5efbe5d19 SHA512 854b198b980e4b58dc6149e285bfa6361ab2a10b83a6d8f07b46754316d6764669e68da8018b402b59317ed95b50a13d25f68f28c4c33d76f0ef1e8dedc8da99 +AUX zabbix-4.0.18-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5 +AUX zabbix-4.0.18-security-disable-PidFile.patch 1378 BLAKE2B 27f24c966faed93b79629cf37a301e71360ef6837a188e79fdafb7ae8904391e65e83c752d082c9cd62a778e07fefa18ae629e928017520e202c092925693394 SHA512 b6f388917a27802b861635a2fc824eeccc6dc94fc472d39e308d412996c530e23611aa85972e06cad64fce837739331432bdc2178c7b3516cb100e1697099c25 +AUX zabbix-agentd.init 507 BLAKE2B 6d5f0e631639e766d6857304d205acbdf4d07b59deb43be2735d8caf1b3d9d156dfc3c54236b435383d0182869b8f5eb6cb45499a6dac010f5ea497f4533f80b SHA512 7dbdb94dee4bef1c5771ea02169b7f4d0a21e9d2c4ce44db1376562309e1a24455beb16e65a4bb049a1e713cb51bf38ed39ba48da5cf3c8969b6860bcbe74fc5 +AUX zabbix-agentd.service 277 BLAKE2B 9665032fdbc73e044ce1e897b205358209777440826b899db020ca34e659cf2f0f54696367b939fa544509bad2558e74af734cf7fdf8535458bb523b839799e3 SHA512 fd973db67986a1fcebf170dd108c6d4d21e2cdbf79ac624a202039ffe13b6ecf22f5ba774c3052b3b0282a4b485fef8998671ffbffd3c77d117878c98c8e45c0 AUX zabbix-agentd.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df -AUX zabbix-proxy.service 244 BLAKE2B ff0407fb1818ed776b2d2f13c19a32f81755bde096e4dbfd358b207ba5290106ed40093770a719d386e5d37bf8bae45fd538b777380b80493b8241ff3cd7e12a SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad +AUX zabbix-jmx-proxy.conf 432 BLAKE2B 188737819d39b9e8ec8913237ff048a68ef19f2ec8849bab6c62bea612ac927d00a6c7042ba87261297ff580ef9976618d6acbd24c7fda8f6eb26b2b3dc891bb SHA512 0d68b9681528256131e35b5115053242f8558f5ad06254e61a16ab14f6530048551f0b777fa81d4afe07cc6282c31a6204fd0ee2e56e0e792ed3252222212250 +AUX zabbix-jmx-proxy.init 849 BLAKE2B 14a312911a11d765210f3bd86d38c8ce3a2f230c821a03d2dd3b2a2aaf05a86cf64a59ea283ad0f11b62fe17a81936cef03463e5cee6535f1a51558b7bad790a SHA512 79a1966405546899b2e6eb4cb53f0ea1ec70575cbf97ff0f9de16d662c5750f8bf276bf8eadaf00cb69ffa078b79e9144eb9824eec6a23df6b2cd315b79b05d8 +AUX zabbix-proxy.init 487 BLAKE2B b094521d1ec12ea27f1dec78a858ff3b78acde6a0473a2f8a53cbf46c75c3b0f72a1f44f24dc5294b7157576b06abc631dfed469dcf1a1c7b8c4609a9c81b2b8 SHA512 55f1df96d7d7e6ec16d16162e37a7a494131f4dd53d5988b28663b82a6bbe17b16e901a8f4870f14fd2e1c7dd96a84fe6aa5cd9e6a745462af7b83b3f0455839 +AUX zabbix-proxy.service 275 BLAKE2B 19b594aa010bea3320de1d90277881b0c42ae1ea7f787bd4a456d8960401b0dd0ea4bde21b683e27c84123fefd681fe4f64b81dd9771273b4b6199f4af17d045 SHA512 2522b68c725e80b98655b9ff8cfc97b51add9f095e77422a275b3a30cb34d58e107ee03fdcc293b4ef37c60bd5d9ca2271aef48b727c91da44d507a888578c18 AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df -AUX zabbix-server.service 281 BLAKE2B ca25d550875bc16ebc2cbe3193ec46072d288fa2d87e292949677c66bb7e3e4b9290274a43d88551bc320775fe0efc9fb8302a43147b3f7541c877726c40222e SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff +AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b7063916619aaabc5b39b1ff5d960b968e382615f84b18531465cf0ad0eab5ffa171c0b4b1797e70d58ed3450 SHA512 7dd55ffe8062bee9104218bf673aeeeea56a4a332ef6a5676b83e7f026a2b6ebc70446c63d6116b684ad16abd95de355cdbdf07c81a51daf1424b3fd8d627c74 +AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df -DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd -DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46 -DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f -DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba -DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9 -DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406 -DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114 -EBUILD zabbix-2.2.16-r1.ebuild 9374 BLAKE2B 51863c24bd87b2227e5e6ef2ea6dfd82a4ed7c5724984b05f6a3f65fc7a698a4e4f28348342a28392113cf741691ccc2bb2c3fae3494ed4d43cd49e6736fe2aa SHA512 c6dc8f51a438e0254442c06005daca4788b3b37f2695aa4a43c545f56aa415069c53f1d399fb14f648f9710b716143c44627932401a4f7bb1cef7a4929582041 -EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c035ee023ce377a21ce17077585b048cec5cb18e844ddb8f83ca0b41b5396826d274ad70eaea1f4cf315fb19c68 SHA512 e64d401cf73217c3845baf23d4f869ba96474a98ea76a00dcd486349e83e5a7a07e2c65ed58e03772f72fc1fe187db682c5f5d16735827a3f8c9e5b9605d356c -EBUILD zabbix-3.4.15.ebuild 9190 BLAKE2B 34f7fdb2eabc1b821c0480d3e5d6b3faa6038799d980fb4167c1ef606bc4208ba976b4a556a25ef6e9150413b8eb6618d75100feaeb82e2d35b5d93aaed78491 SHA512 1d7d17f1dbe723459776da9ff2b5d0fbe11e9c8a02cb4bd472147614d2e3e8e81b1988a46957108dda65b7f81177ab5c45cbc6208b504b3facdf16c0817fb986 -EBUILD zabbix-4.0.13.ebuild 9378 BLAKE2B a9561575c6a3f270b92026fa7f6568eb4e6b3233adf33304d262a59f16385073b44bb8689828460c0ef1d5625fb98525add993f462ea3222af48fd1dd09adafd SHA512 2ee7c7bebb9cc5c22b1042fdd40bb7b3173a97da818d8b52c600b708f98b56a8ccaf5025efa47c7a5658daf0861de874ee6e319709490907327442a35bf384e2 -EBUILD zabbix-4.2.7.ebuild 9517 BLAKE2B 596a6172a49b60a8fe225cc3827917f759875fe2f40b58487cd6b2dcb9139950a16ead08af86283ca2e87b99df6d9a5f75de439add860c9da179f16cf2cb8a7c SHA512 7001461570d7d7022742b3e49d894f8d8be125b0a644bcbeeb5ce29f2df8572b3fedcca0e4daf9854a85576f0353d867c9ef654289d6991b2c7a2b31a640ddb2 -EBUILD zabbix-4.4.0-r1.ebuild 9460 BLAKE2B 7d5e689fac185731cd79ffd6c8feee7a78c7b02d49bc9e72191cb0daa3828bd9638337be9a7356967c85a788ac70fd0f4377904d9f13a83997aaaacb6c9701f4 SHA512 d3154d91a3fe4fe69e6f99a69ee255ab5f95360d19597031c382dff6ab76a5f3c8e6c25e4115c484bf39c1400afb74496405f9f5645da40513b9cd417506b8da -EBUILD zabbix-4.4.5.ebuild 9462 BLAKE2B e5b41d8aed5455e1f4cc4aa07c27a7df3b6182567ca4fc3ded111a4034875e5047bab175d4178376dff7932c58d5686847955b9859519f8afc1a0478439a250f SHA512 ffd234f5a352fa96ac592ae4e39ed0e6746f85b4003e897ebda7178623ac8efeba1b4a63099dc4dcf34b96a4373ea22ade4463c8d0a64f0037060edee13a65ac -MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a +DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3 +DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb +DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c +EBUILD zabbix-3.0.30.ebuild 9229 BLAKE2B efeeee4b80c5e0f1fd05e384b0da6a043cf67feed01ab328d916c9000ad41d8e9e80d29336abff6c1f5d78c83f3d3686407a89b263888c330ccac3ff3dc022be SHA512 39d31445d487086c9a4d1038b3c925b979b56f12c1462f6a10e56569247de646cc88facb78bb3f7d5e0f1373b311727ba35114eb906cb93971d97ba631f83dec +EBUILD zabbix-4.0.18.ebuild 9244 BLAKE2B 41ed0452100dc832b18e433c2fcde2e69327d2bc869495b04154d0cd75daefc6d89bb034cecb4e564eceb8ad174dcaa0a6d93cd8314977808c8aeb701e4a287e SHA512 0ff064767a9ad2d361cc8fbf31fa11daca28ac790db72aed5d155f920ea1fa060a570d9067dcf1e9b59df96cc58f368c70df91f079a79170a18164b3ef8ce38b +EBUILD zabbix-4.4.6.ebuild 9121 BLAKE2B ddd2ae448061ceb124ddce5115d2bd17240a44d73f21ac4095f54f13dafa8d3d643e9bbe4b5f7e57ee164104e9cd88056b80dbd87436e1cb6b5d551dc947e4f5 SHA512 fd44d8b1579d111361563ff26f301312ae806d265630eed74a4c2bcf5c7fd4592a9d07b089ef6f68dc13928ff0a966fa67ac3521d38a76148d038df70a08a41f +MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173 diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd deleted file mode 100644 index 50db578f6b5a..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_agentd.pid" - -depend() { - need net - provide zabbix-agent - use zabbix-server -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix agent" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix agent" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy deleted file mode 100644 index 81bd4f3607a1..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_proxy.pid" - -depend() { - need net - provide zabbix-proxy -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix proxy" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix proxy" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server deleted file mode 100644 index abc9002f4646..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_server.pid" - -depend() { - need net - use mysql postgresql -} -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix server" - start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ - --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix server" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch deleted file mode 100644 index 79bb92f4bae0..000000000000 --- a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch +++ /dev/null @@ -1,83 +0,0 @@ -Index: src/libs/zbxsysinfo/sysinfo.c -=================================================================== ---- src/libs/zbxsysinfo/sysinfo.c (revision 40348) -+++ src/libs/zbxsysinfo/sysinfo.c (working copy) -@@ -427,13 +427,49 @@ - test_aliases(); - } - -+static int zbx_check_user_parameter(const char *param, char *error, int max_error_len) -+{ -+ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c; -+ char *buf = NULL; -+ size_t buf_alloc = 128, buf_offset = 0; -+ -+ if (0 != CONFIG_UNSAFE_USER_PARAMETERS) -+ return SUCCEED; -+ -+ for (c = suppressed_chars; '\0' != *c; c++) -+ { -+ if (NULL == strchr(param, *c)) -+ continue; -+ -+ buf = zbx_malloc(buf, buf_alloc); -+ -+ for (c = suppressed_chars; '\0' != *c; c++) -+ { -+ if (c != suppressed_chars) -+ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", "); -+ -+ if (0 != isprint(*c)) -+ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c); -+ else -+ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c); -+ } -+ -+ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf); -+ -+ zbx_free(buf); -+ -+ return FAIL; -+ } -+ -+ return SUCCEED; -+} -+ - static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len) - { - int ret = SUCCEED; - char buf[MAX_STRING_LEN]; - char command[MAX_STRING_LEN]; - char *pl, *pr; -- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c; - - assert(out); - -@@ -465,25 +501,10 @@ - { - get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf)); - -- if (0 == CONFIG_UNSAFE_USER_PARAMETERS) -- { -- for (c = suppressed_chars; '\0' != *c; c++) -- { -- if (NULL != strchr(buf, *c)) -- { -- zbx_snprintf(error, max_error_len, "Special characters '%s'" -- " are not allowed in the parameters", -- suppressed_chars); -- ret = FAIL; -- break; -- } -- } -- } -+ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len))) -+ break; - } - -- if (FAIL == ret) -- break; -- - zbx_strlcat(out, buf, outlen); - outlen -= MIN((int)strlen(buf), (int)outlen); - diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch deleted file mode 100644 index 076e10ab75a4..000000000000 --- a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: frontends/php/include/defines.inc.php -=================================================================== ---- frontends/php/include/defines.inc.php (revision 46596) -+++ frontends/php/include/defines.inc.php (revision 46655) -@@ -835,6 +835,14 @@ - - define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts'); - -+// XML import flags -+// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed -+// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml -+// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND -+// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name - -+// so this flag is not needed here. -+define('LIBXML_IMPORT_FLAGS', LIBXML_NONET); -+ - // API errors - define('ZBX_API_ERROR_INTERNAL', 111); - define('ZBX_API_ERROR_PARAMETERS', 100); -Index: frontends/php/include/classes/import/readers/CXmlImportReader.php -=================================================================== ---- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596) -+++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655) -@@ -32,7 +32,8 @@ - */ - public function read($string) { - libxml_use_internal_errors(true); -- $result = simplexml_load_string($string); -+ libxml_disable_entity_loader(true); -+ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS); - if (!$result) { - $errors = libxml_get_errors(); - libxml_clear_errors(); -Index: frontends/php/include/classes/import/CXmlImport18.php -=================================================================== ---- frontends/php/include/classes/import/CXmlImport18.php (revision 46596) -+++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655) -@@ -390,12 +390,13 @@ - return $array; - } - -- public static function import($file) { -+ public static function import($source) { - - libxml_use_internal_errors(true); -+ libxml_disable_entity_loader(true); - - $xml = new DOMDocument(); -- if (!$xml->loadXML($file)) { -+ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) { - $text = ''; - foreach (libxml_get_errors() as $error) { - switch ($error->level) { diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf deleted file mode 100644 index dcb4b7248c2e..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf +++ /dev/null @@ -1,81 +0,0 @@ -# This is a config file for Zabbix internet service daemon agent -# To get more information about Zabbix visit http://www.zabbix.com - -### Option: Server -# IP address of Zabbix server -# Connections from other hosts will be denied -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: yes -# Default: -# Server= - -Server=127.0.0.1 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agent.userparams.conf -# Include=/usr/local/etc/zabbix_agent.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf deleted file mode 100644 index 4d49d3685e81..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf +++ /dev/null @@ -1,278 +0,0 @@ -# This is a config file for the Zabbix agent daemon (Unix) -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_agentd.pid - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_agentd.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: EnableRemoteCommands -# Whether remote commands from Zabbix server are allowed. -# 0 - not allowed -# 1 - allowed -# -# Mandatory: no -# Default: -# EnableRemoteCommands=0 - -### Option: LogRemoteCommands -# Enable logging of executed shell commands as warnings. -# 0 - disabled -# 1 - enabled -# -# Mandatory: no -# Default: -# LogRemoteCommands=0 - -##### Passive checks related - -### Option: Server -# List of comma delimited IP addresses (or hostnames) of Zabbix servers. -# Incoming connections will be accepted only from the hosts listed here. -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: no -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ListenPort -# Agent will listen on this port for connections from the server. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10050 - -### Option: ListenIP -# List of comma delimited IP addresses that the agent should listen on. -# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: StartAgents -# Number of pre-forked instances of zabbix_agentd that process passive checks. -# If set to 0, disables passive checks and the agent will not listen on any TCP port. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartAgents=3 - -##### Active checks related - -### Option: ServerActive -# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. -# If port is not specified, default port is used. -# IPv6 addresses must be enclosed in square brackets if port for that host is specified. -# If port is not specified, square brackets for IPv6 addresses are optional. -# If this parameter is not specified, active checks are disabled. -# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] -# -# Mandatory: no -# Default: -# ServerActive= - -ServerActive=127.0.0.1 - -### Option: Hostname -# Unique, case sensitive hostname. -# Required for active checks and must match hostname as configured on the server. -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix server - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: HostMetadata -# Optional parameter that defines host metadata. -# Host metadata is used at host auto-registration process. -# An agent will issue an error and not start if the value is over limit of 255 characters. -# If not defined, value will be acquired from HostMetadataItem. -# -# Mandatory: no -# Range: 0-255 characters -# Default: -# HostMetadata= - -### Option: HostMetadataItem -# Optional parameter that defines an item used for getting host metadata. -# Host metadata is used at host auto-registration process. -# During an auto-registration request an agent will log a warning message if -# the value returned by specified item is over limit of 255 characters. -# This option is only used when HostMetadata is not defined. -# -# Mandatory: no -# Default: -# HostMetadataItem= - -### Option: RefreshActiveChecks -# How often list of active checks is refreshed, in seconds. -# -# Mandatory: no -# Range: 60-3600 -# Default: -# RefreshActiveChecks=120 - -### Option: BufferSend -# Do not keep data longer than N seconds in buffer. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# BufferSend=5 - -### Option: BufferSize -# Maximum number of values in a memory buffer. The agent will send -# all collected data to Zabbix Server or Proxy if the buffer is full. -# -# Mandatory: no -# Range: 2-65535 -# Default: -# BufferSize=100 - -### Option: MaxLinesPerSecond -# Maximum number of new lines the agent will send per second to Zabbix Server -# or Proxy processing 'log' and 'logrt' active checks. -# The provided value will be overridden by the parameter 'maxlines', -# provided in 'log' or 'logrt' item keys. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# MaxLinesPerSecond=100 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: AllowRoot -# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Range: 0-1 -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf deleted file mode 100644 index d4bae2ea962f..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf +++ /dev/null @@ -1,519 +0,0 @@ -# This is a configuration file for Zabbix Proxy process -# To get more information about Zabbix, -# visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ProxyMode -# Proxy operating mode -# 0 - proxy in the active mode -# 1 - proxy in the passive mode -# -# Mandatory: no -# Default: -# ProxyMode=0 - -### Option: Server -# IP address (or hostname) of Zabbix server. -# Active proxy will get configuration data from the server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: yes (if ProxyMode is set to 0) -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ServerPort -# Port of Zabbix trapper on Zabbix server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ServerPort=10051 - -### Option: Hostname -# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix proxy - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_proxy.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_proxy.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# Warning: do not attempt to use the same database Zabbix server is using. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix_proxy - -### Option: DBSchema -# Schema name. Used for IBM DB2. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Default: -# DBUser= - -DBUser=root - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -# Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Default (for MySQL): -# DBPort=3306 - -######### PROXY SPECIFIC PARAMETERS ############# - -### Option: ProxyLocalBuffer -# Proxy will keep data locally for N hours, even if the data have already been synced with the server. -# This parameter may be used if local data will be used by third party applications. -# -# Mandatory: no -# Range: 0-720 -# Default: -# ProxyLocalBuffer=0 - -### Option: ProxyOfflineBuffer -# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. -# Older data will be lost. -# -# Mandatory: no -# Range: 1-720 -# Default: -# ProxyOfflineBuffer=1 - -### Option: HeartbeatFrequency -# Frequency of heartbeat messages in seconds. -# Used for monitoring availability of Proxy on server side. -# 0 - heartbeat messages disabled. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 0-3600 -# Default: -# HeartbeatFrequency=60 - -### Option: ConfigFrequency -# How often proxy retrieves configuration data from Zabbix Server in seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ConfigFrequency=3600 - -### Option: DataSenderFrequency -# Proxy will send collected data to the Server every N seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# DataSenderFrequency=1 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender and active agents. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the proxy. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing unnecessary information from history, alert, and alarms tables. -# -# Mandatory: no -# Range: 1-24 -# Default: -# HousekeepingFrequency=1 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size, for storing hosts and items data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# CacheSize=8M - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=8M - -### Option: HistoryTextCacheSize -# Size of text history cache, in bytes. -# Shared memory size for storing character, text or log history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryTextCacheSize=16M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: AllowRoot -# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_proxy.general.conf -# Include=/usr/local/etc/zabbix_proxy.conf.d/ - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of proxy modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at proxy startup. Modules are used to extend functionality of the proxy. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf deleted file mode 100644 index caba0190668e..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_server.conf +++ /dev/null @@ -1,546 +0,0 @@ -# This is a configuration file for Zabbix Server process -# To get more information about Zabbix, -# visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: NodeID -# Unique NodeID in distributed setup. -# 0 - standalone server -# -# Mandatory: no -# Range: 0-999 -# Default: -# NodeID=0 - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_server.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_server.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix - -### Option: DBSchema -# Schema name. Used for IBM DB2. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Mandatory: no -# Default: -# DBUser= - -DBUser=root - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -### Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Range: 1024-65535 -# Default (for MySQL): -# DBPort=3306 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes. -# At least one trapper process must be running to display server availability in the frontend. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: StartTimers -# Number of pre-forked instances of timers. -# Timers process time-based trigger functions and maintenance periods. -# Only the first timer process handles the maintenance periods. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# StartTimers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the server. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -# ListenIP=127.0.0.1 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing unnecessary information from history, alert, and alarms tables. -# -# Mandatory: no -# Range: 1-24 -# Default: -# HousekeepingFrequency=1 - -### Option: MaxHousekeeperDelete -# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: -# [housekeeperid], [tablename], [field], [value]. -# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) -# will be deleted per one task in one housekeeping cycle. -# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. -# If set to 0 then no limit is used at all. In this case you must know what you are doing! -# -# Mandatory: no -# Range: 0-1000000 -# Default: -# MaxHousekeeperDelete=500 - -### Option: SenderFrequency -# How often Zabbix will try to send unsent alerts (in seconds). -# -# Mandatory: no -# Range: 5-3600 -# Default: -# SenderFrequency=30 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size for storing host, item and trigger data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# CacheSize=8M - -### Option: CacheUpdateFrequency -# How often Zabbix will perform update of configuration cache, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# CacheUpdateFrequency=60 - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=8M - -### Option: TrendCacheSize -# Size of trend cache, in bytes. -# Shared memory size for storing trends data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# TrendCacheSize=4M - -### Option: HistoryTextCacheSize -# Size of text history cache, in bytes. -# Shared memory size for storing character, text or log history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryTextCacheSize=16M - -### Option: ValueCacheSize -# Size of history value cache, in bytes. -# Shared memory size for caching item history data requests -# Setting to 0 disables value cache. -# -# Mandatory: no -# Range: 0,128K-64G -# Default: -# ValueCacheSize=8M - -### Option: NodeNoEvents -# If set to '1' local events won't be sent to master node. -# This won't impact ability of this node to propagate events from its child nodes. -# -# Mandatory: no -# Range: 0-1 -# Default: -# NodeNoEvents=0 - -### Option: NodeNoHistory -# If set to '1' local history won't be sent to master node. -# This won't impact ability of this node to propagate history from its child nodes. -# -# Mandatory: no -# Range: 0-1 -# Default: -# NodeNoHistory=0 - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: AlertScriptsPath -# Full path to location of custom alert scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -AlertScriptsPath=/var/lib/zabbix/alertscripts - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -ExternalScripts=/var/lib/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: StartProxyPollers -# Number of pre-forked instances of pollers for passive proxies. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartProxyPollers=1 - -### Option: ProxyConfigFrequency -# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ProxyConfigFrequency=3600 - -### Option: ProxyDataFrequency -# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# ProxyDataFrequency=1 - -### Option: AllowRoot -# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_server.general.conf -#Include=/etc/zabbix/zabbix_server.conf.d/ - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of server modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at server startup. Modules are used to extend functionality of the server. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd deleted file mode 100755 index d803d4450cac..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_agentd.pid" - -depend() { - need net - provide zabbix-agent - use zabbix-server -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix agent" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix agent" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy deleted file mode 100755 index 6aa1793435c8..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_proxy.pid" - -depend() { - need net - provide zabbix-proxy -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix proxy" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix proxy" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server deleted file mode 100755 index 109c6545d456..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_server.pid" - -depend() { - need net - use mysql postgresql -} -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix server" - start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ - --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix server" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf deleted file mode 100644 index dcb4b7248c2e..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf +++ /dev/null @@ -1,81 +0,0 @@ -# This is a config file for Zabbix internet service daemon agent -# To get more information about Zabbix visit http://www.zabbix.com - -### Option: Server -# IP address of Zabbix server -# Connections from other hosts will be denied -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: yes -# Default: -# Server= - -Server=127.0.0.1 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agent.userparams.conf -# Include=/usr/local/etc/zabbix_agent.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf deleted file mode 100644 index 5ff17ce33d65..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf +++ /dev/null @@ -1,390 +0,0 @@ -# This is a configuration file for Zabbix agent daemon (Unix) -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_agentd.pid -PidFile=/run/zabbix/zabbix_agentd.pid - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_agentd.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: EnableRemoteCommands -# Whether remote commands from Zabbix server are allowed. -# 0 - not allowed -# 1 - allowed -# -# Mandatory: no -# Default: -# EnableRemoteCommands=0 - -### Option: LogRemoteCommands -# Enable logging of executed shell commands as warnings. -# 0 - disabled -# 1 - enabled -# -# Mandatory: no -# Default: -# LogRemoteCommands=0 - -##### Passive checks related - -### Option: Server -# List of comma delimited IP addresses (or hostnames) of Zabbix servers. -# Incoming connections will be accepted only from the hosts listed here. -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: no -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ListenPort -# Agent will listen on this port for connections from the server. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10050 - -### Option: ListenIP -# List of comma delimited IP addresses that the agent should listen on. -# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: StartAgents -# Number of pre-forked instances of zabbix_agentd that process passive checks. -# If set to 0, disables passive checks and the agent will not listen on any TCP port. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartAgents=3 - -##### Active checks related - -### Option: ServerActive -# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. -# If port is not specified, default port is used. -# IPv6 addresses must be enclosed in square brackets if port for that host is specified. -# If port is not specified, square brackets for IPv6 addresses are optional. -# If this parameter is not specified, active checks are disabled. -# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] -# -# Mandatory: no -# Default: -# ServerActive= - -ServerActive=127.0.0.1 - -### Option: Hostname -# Unique, case sensitive hostname. -# Required for active checks and must match hostname as configured on the server. -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix server - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. -# Does not support UserParameters or aliases. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: HostMetadata -# Optional parameter that defines host metadata. -# Host metadata is used at host auto-registration process. -# An agent will issue an error and not start if the value is over limit of 255 characters. -# If not defined, value will be acquired from HostMetadataItem. -# -# Mandatory: no -# Range: 0-255 characters -# Default: -# HostMetadata= - -### Option: HostMetadataItem -# Optional parameter that defines an item used for getting host metadata. -# Host metadata is used at host auto-registration process. -# During an auto-registration request an agent will log a warning message if -# the value returned by specified item is over limit of 255 characters. -# This option is only used when HostMetadata is not defined. -# -# Mandatory: no -# Default: -# HostMetadataItem= - -### Option: RefreshActiveChecks -# How often list of active checks is refreshed, in seconds. -# -# Mandatory: no -# Range: 60-3600 -# Default: -# RefreshActiveChecks=120 - -### Option: BufferSend -# Do not keep data longer than N seconds in buffer. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# BufferSend=5 - -### Option: BufferSize -# Maximum number of values in a memory buffer. The agent will send -# all collected data to Zabbix Server or Proxy if the buffer is full. -# -# Mandatory: no -# Range: 2-65535 -# Default: -# BufferSize=100 - -### Option: MaxLinesPerSecond -# Maximum number of new lines the agent will send per second to Zabbix Server -# or Proxy processing 'log' and 'logrt' active checks. -# The provided value will be overridden by the parameter 'maxlines', -# provided in 'log' or 'logrt' item keys. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# MaxLinesPerSecond=20 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. -# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. -# Different Alias keys may reference the same item key. -# For example, to retrieve the ID of user 'zabbix': -# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] -# Now shorthand key zabbix.userid may be used to retrieve data. -# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: AllowRoot -# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# The following characters are not allowed: -# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @ -# Additionally, newline characters are not allowed. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Range: 0-1 -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSConnect -# How the agent should connect to server or proxy. Used for active checks. -# Only one value can be specified: -# unencrypted - connect without encryption -# psk - connect using TLS and a pre-shared key -# cert - connect using TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSConnect=unencrypted - -### Option: TLSAccept -# What incoming connections to accept. -# Multiple values can be specified, separated by comma: -# unencrypted - accept connections without encryption -# psk - accept connections secured with TLS and a pre-shared key -# cert - accept connections secured with TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSAccept=unencrypted - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSServerCertIssuer -# Allowed server certificate issuer. -# -# Mandatory: no -# Default: -# TLSServerCertIssuer= - -### Option: TLSServerCertSubject -# Allowed server certificate subject. -# -# Mandatory: no -# Default: -# TLSServerCertSubject= - -### Option: TLSCertFile -# Full pathname of a file containing the agent certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the agent private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= - -### Option: TLSPSKIdentity -# Unique, case sensitive string used to identify the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKIdentity= - -### Option: TLSPSKFile -# Full pathname of a file containing the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKFile= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf deleted file mode 100644 index f96b0d01f51e..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf +++ /dev/null @@ -1,674 +0,0 @@ -# This is a configuration file for Zabbix proxy daemon -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ProxyMode -# Proxy operating mode. -# 0 - proxy in the active mode -# 1 - proxy in the passive mode -# -# Mandatory: no -# Default: -# ProxyMode=0 - -### Option: Server -# IP address (or hostname) of Zabbix server. -# Active proxy will get configuration data from the server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: yes (if ProxyMode is set to 0) -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ServerPort -# Port of Zabbix trapper on Zabbix server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ServerPort=10051 - -### Option: Hostname -# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix proxy - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_proxy.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_proxy.pid -PidFile=/run/zabbix/zabbix_proxy.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# Warning: do not attempt to use the same database Zabbix server is using. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix_proxy - -### Option: DBSchema -# Schema name. Used for IBM DB2 and PostgreSQL. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Default: -# DBUser= - -DBUser=zabbix - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -# Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Default (for MySQL): -# DBPort=3306 - -######### PROXY SPECIFIC PARAMETERS ############# - -### Option: ProxyLocalBuffer -# Proxy will keep data locally for N hours, even if the data have already been synced with the server. -# This parameter may be used if local data will be used by third party applications. -# -# Mandatory: no -# Range: 0-720 -# Default: -# ProxyLocalBuffer=0 - -### Option: ProxyOfflineBuffer -# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. -# Older data will be lost. -# -# Mandatory: no -# Range: 1-720 -# Default: -# ProxyOfflineBuffer=1 - -### Option: HeartbeatFrequency -# Frequency of heartbeat messages in seconds. -# Used for monitoring availability of Proxy on server side. -# 0 - heartbeat messages disabled. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 0-3600 -# Default: -# HeartbeatFrequency=60 - -### Option: ConfigFrequency -# How often proxy retrieves configuration data from Zabbix Server in seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ConfigFrequency=3600 - -### Option: DataSenderFrequency -# Proxy will send collected data to the Server every N seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# DataSenderFrequency=1 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). -# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers -# are started. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender and active agents. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwarePerfFrequency -# How often Zabbix will connect to VMware service to obtain performance data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwarePerfFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: VMwareTimeout -# Specifies how many seconds vmware collector waits for response from VMware service. -# -# Mandatory: no -# Range: 1-300 -# Default: -# VMwareTimeout=10 - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the proxy. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing outdated information from the database. -# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency -# hours of outdated information are deleted in one housekeeping cycle. -# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start. -# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. -# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the -# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. -# -# Mandatory: no -# Range: 0-24 -# Default: -# HousekeepingFrequency=1 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size, for storing hosts and items data. -# -# Mandatory: no -# Range: 128K-8G -# Default: -# CacheSize=8M - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers. -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=16M - -### Option: HistoryIndexCacheSize -# Size of history index cache, in bytes. -# Shared memory size for indexing history cache. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryIndexCacheSize=4M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -Timeout=4 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -LogSlowQueries=3000 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: AllowRoot -# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_proxy.general.conf -# Include=/usr/local/etc/zabbix_proxy.conf.d/ -# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf - -### Option: SSLCertLocation -# Location of SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCertLocation=${datadir}/zabbix/ssl/certs - -### Option: SSLKeyLocation -# Location of private keys for SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLKeyLocation=${datadir}/zabbix/ssl/keys - -### Option: SSLCALocation -# Location of certificate authority (CA) files for SSL server certificate verification. -# If not set, system-wide directory will be used. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCALocation= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of proxy modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at proxy startup. Modules are used to extend functionality of the proxy. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSConnect -# How the proxy should connect to Zabbix server. Used for an active proxy, ignored on a passive proxy. -# Only one value can be specified: -# unencrypted - connect without encryption -# psk - connect using TLS and a pre-shared key -# cert - connect using TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSConnect=unencrypted - -### Option: TLSAccept -# What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy. -# Multiple values can be specified, separated by comma: -# unencrypted - accept connections without encryption -# psk - accept connections secured with TLS and a pre-shared key -# cert - accept connections secured with TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSAccept=unencrypted - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSServerCertIssuer -# Allowed server certificate issuer. -# -# Mandatory: no -# Default: -# TLSServerCertIssuer= - -### Option: TLSServerCertSubject -# Allowed server certificate subject. -# -# Mandatory: no -# Default: -# TLSServerCertSubject= - -### Option: TLSCertFile -# Full pathname of a file containing the proxy certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the proxy private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= - -### Option: TLSPSKIdentity -# Unique, case sensitive string used to identify the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKIdentity= - -### Option: TLSPSKFile -# Full pathname of a file containing the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKFile= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_server.conf b/net-analyzer/zabbix/files/3.0/zabbix_server.conf deleted file mode 100644 index 81a4961ee587..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_server.conf +++ /dev/null @@ -1,635 +0,0 @@ -# This is a configuration file for Zabbix server daemon -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_server.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_server.pid -PidFile=/run/zabbix/zabbix_server.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix - -### Option: DBSchema -# Schema name. Used for IBM DB2 and PostgreSQL. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Mandatory: no -# Default: -# DBUser= - -DBUser=zabbix - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -### Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Range: 1024-65535 -# Default (for MySQL): -# DBPort=3306 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). -# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers -# are started. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender, active agents and active proxies. -# At least one trapper process must be running to display server availability and view queue -# in the frontend. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: StartTimers -# Number of pre-forked instances of timers. -# Timers process time-based trigger functions and maintenance periods. -# Only the first timer process handles the maintenance periods. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# StartTimers=1 - -### Option: StartEscalators -# Number of pre-forked instances of escalators. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartEscalators=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwarePerfFrequency -# How often Zabbix will connect to VMware service to obtain performance data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwarePerfFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: VMwareTimeout -# Specifies how many seconds vmware collector waits for response from VMware service. -# -# Mandatory: no -# Range: 1-300 -# Default: -# VMwareTimeout=10 - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the server. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -# ListenIP=127.0.0.1 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing outdated information from the database. -# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency -# hours of outdated information are deleted in one housekeeping cycle, for each item. -# To lower load on server startup housekeeping is postponed for 30 minutes after server start. -# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. -# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the -# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. -# -# Mandatory: no -# Range: 0-24 -# Default: -# HousekeepingFrequency=1 - -### Option: MaxHousekeeperDelete -# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: -# [housekeeperid], [tablename], [field], [value]. -# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) -# will be deleted per one task in one housekeeping cycle. -# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. -# If set to 0 then no limit is used at all. In this case you must know what you are doing! -# -# Mandatory: no -# Range: 0-1000000 -# Default: -# MaxHousekeeperDelete=5000 - -### Option: SenderFrequency -# How often Zabbix will try to send unsent alerts (in seconds). -# -# Mandatory: no -# Range: 5-3600 -# Default: -# SenderFrequency=30 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size for storing host, item and trigger data. -# -# Mandatory: no -# Range: 128K-8G -# Default: -# CacheSize=8M - -### Option: CacheUpdateFrequency -# How often Zabbix will perform update of configuration cache, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# CacheUpdateFrequency=60 - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers. -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=16M - -### Option: HistoryIndexCacheSize -# Size of history index cache, in bytes. -# Shared memory size for indexing history cache. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryIndexCacheSize=4M - -### Option: TrendCacheSize -# Size of trend cache, in bytes. -# Shared memory size for storing trends data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# TrendCacheSize=4M - -### Option: ValueCacheSize -# Size of history value cache, in bytes. -# Shared memory size for caching item history data requests. -# Setting to 0 disables value cache. -# -# Mandatory: no -# Range: 0,128K-64G -# Default: -# ValueCacheSize=8M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -Timeout=4 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: AlertScriptsPath -# Full path to location of custom alert scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# AlertScriptsPath=${datadir}/zabbix/alertscripts -AlertScriptsPath=/var/lib/zabbix/alertscripts - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts -ExternalScripts=/var/lib/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3, 4 or 5. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -LogSlowQueries=3000 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: StartProxyPollers -# Number of pre-forked instances of pollers for passive proxies. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartProxyPollers=1 - -### Option: ProxyConfigFrequency -# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ProxyConfigFrequency=3600 - -### Option: ProxyDataFrequency -# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# ProxyDataFrequency=1 - -### Option: AllowRoot -# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_server.general.conf -# Include=/usr/local/etc/zabbix_server.conf.d/ -# Include=/usr/local/etc/zabbix_server.conf.d/*.conf - -### Option: SSLCertLocation -# Location of SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCertLocation=${datadir}/zabbix/ssl/certs - -### Option: SSLKeyLocation -# Location of private keys for SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLKeyLocation=${datadir}/zabbix/ssl/keys - -### Option: SSLCALocation -# Override the location of certificate authority (CA) files for SSL server certificate verification. -# If not set, system-wide directory will be used. -# This parameter is used only in web monitoring and SMTP authentication. -# -# Mandatory: no -# Default: -# SSLCALocation= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of server modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at server startup. Modules are used to extend functionality of the server. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSCertFile -# Full pathname of a file containing the server certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the server private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch new file mode 100644 index 000000000000..7c3694a776ee --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch @@ -0,0 +1,17 @@ +diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c +index a65b9c4..e011c51 100644 +--- a/src/libs/zbxdb/db.c ++++ b/src/libs/zbxdb/db.c +@@ -285,7 +285,11 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d + #if defined(HAVE_IBM_DB2) + char *connect = NULL; + #elif defined(HAVE_MYSQL) +- my_bool mysql_reconnect = 1; ++#if LIBMYSQL_VERSION_ID >= 80000 /* my_bool type is removed in MySQL 8.0 */ ++ bool mysql_reconnect = 1; ++#else ++ my_bool mysql_reconnect = 1; ++#endif + #elif defined(HAVE_ORACLE) + char *connect = NULL; + sword err = OCI_SUCCESS; diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch new file mode 100644 index 000000000000..e0fd74de51c7 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch @@ -0,0 +1,49 @@ +diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf +index b73bd45..c10daca 100644 +--- a/conf/zabbix_agentd.conf ++++ b/conf/zabbix_agentd.conf +@@ -5,6 +5,7 @@ + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf +index 082f14e..de0284d 100644 +--- a/conf/zabbix_proxy.conf ++++ b/conf/zabbix_proxy.conf +@@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf +index 9f754ca..3999196 100644 +--- a/conf/zabbix_server.conf ++++ b/conf/zabbix_server.conf +@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c +index baa8415..04c7e0c 100644 +--- a/src/libs/zbxnix/pid.c ++++ b/src/libs/zbxnix/pid.c +@@ -26,6 +26,8 @@ static int fdpid = -1; + + int create_pid_file(const char *pidfile) + { ++ return SUCCEED; ++ + int fd; + zbx_stat_t buf; + struct flock fl; diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch index c0d1650fb85c..c0d1650fb85c 100644 --- a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch +++ b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch new file mode 100644 index 000000000000..f6a6187b3fc0 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch @@ -0,0 +1,49 @@ +diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf +index 73f1621..825715c 100644 +--- a/conf/zabbix_agentd.conf ++++ b/conf/zabbix_agentd.conf +@@ -5,6 +5,7 @@ + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf +index 7498ffa..de6b579 100644 +--- a/conf/zabbix_proxy.conf ++++ b/conf/zabbix_proxy.conf +@@ -133,6 +133,7 @@ LogFile=/tmp/zabbix_proxy.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf +index 760e685..3a252ae 100644 +--- a/conf/zabbix_server.conf ++++ b/conf/zabbix_server.conf +@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c +index 6b1a333..7a9578a 100644 +--- a/src/libs/zbxnix/pid.c ++++ b/src/libs/zbxnix/pid.c +@@ -26,6 +26,8 @@ static int fdpid = -1; + + int create_pid_file(const char *pidfile) + { ++ return SUCCEED; ++ + int fd; + zbx_stat_t buf; + struct flock fl; diff --git a/net-analyzer/zabbix/files/zabbix-agentd.init b/net-analyzer/zabbix/files/zabbix-agentd.init new file mode 100644 index 000000000000..e2433ff8f6e9 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agentd.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_agentd" +command_args="--foreground --config /etc/zabbix/zabbix_agentd.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service index 8485d06f5a3a..dc13089e0cf5 100644 --- a/net-analyzer/zabbix/files/zabbix-agentd.service +++ b/net-analyzer/zabbix/files/zabbix-agentd.service @@ -1,14 +1,12 @@ [Unit] -Description=Zabbix agent daemon -After=network.target +Description=Zabbix agent +Documentation=https://zabbix.com/manuals +After=network.target network-online.target [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf -PIDFile=/run/zabbix/zabbix_agentd.pid +ExecStart=/usr/sbin/zabbix_agentd --foreground --config /etc/zabbix/zabbix_agentd.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf index 6aa3cf96f84d..6aa3cf96f84d 100644 --- a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy +++ b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init index 5722814173e8..5722814173e8 100755..100644 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy +++ b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init diff --git a/net-analyzer/zabbix/files/zabbix-proxy.init b/net-analyzer/zabbix/files/zabbix-proxy.init new file mode 100644 index 000000000000..8347b481fffb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-proxy.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_proxy" +command_args="--foreground --config /etc/zabbix/zabbix_proxy.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-proxy +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} + diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service index 85ecd79cc889..78b07be05062 100644 --- a/net-analyzer/zabbix/files/zabbix-proxy.service +++ b/net-analyzer/zabbix/files/zabbix-proxy.service @@ -1,14 +1,12 @@ [Unit] Description=Zabbix proxy -After=network.target +Documentation=https://zabbix.com/manuals +After=network.target network-online.target [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf -PIDFile=/run/zabbix/zabbix_proxy.pid +ExecStart=/usr/sbin/zabbix_proxy --foreground --config /etc/zabbix/zabbix_proxy.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/files/zabbix-server.init b/net-analyzer/zabbix/files/zabbix-server.init new file mode 100644 index 000000000000..b0bf752abaf7 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-server.init @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_server" +command_args="--foreground --config /etc/zabbix/zabbix_server.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + use mysql postgresql +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service index 3ea973356eff..a7bdc0d1e06d 100644 --- a/net-analyzer/zabbix/files/zabbix-server.service +++ b/net-analyzer/zabbix/files/zabbix-server.service @@ -1,14 +1,15 @@ [Unit] Description=Zabbix server -After=syslog.target network.target postgresql.service +Documentation=https://zabbix.com/manuals +After=syslog.target syslog.service network.target network-online.target postgresql.service +After=postgresql-9.6.service postgresql-10.service +After=postgresql-11.service postgresql-12.service + [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf -PIDFile=/run/zabbix/zabbix_server.pid +ExecStart=/usr/sbin/zabbix_server --foreground --config /etc/zabbix/zabbix_server.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml index 0a5802a41df4..05a299b3033d 100644 --- a/net-analyzer/zabbix/metadata.xml +++ b/net-analyzer/zabbix/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>fordfrog@gentoo.org</email> + <name>Miroslav Šulc</name> + </maintainer> + <maintainer type="person"> <email>patrick@gentoo.org</email> <name>Patrick Lauer</name> </maintainer> diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild deleted file mode 100644 index 26b70005d753..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd - dosbin \ - src/zabbix_agent/zabbix_agent \ - src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - fperms 0640 \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/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_agent.conf \ - 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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - 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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild deleted file mode 100644 index 09ba412f2f86..000000000000 --- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild +++ /dev/null @@ -1,330 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - 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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.0.30.ebuild index 0169c3ac73bf..7a392ccf3382 100644 --- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild +++ b/net-analyzer/zabbix/zabbix-3.0.30.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 # needed to make webapp-config dep optional WEBAPP_OPTIONAL="yes" @@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and HOMEPAGE="https://www.zabbix.com/" MY_P=${P/_/} MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" @@ -22,60 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )" -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) ldap? ( - net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls + net-nds/openldap ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - ssl? ( dev-libs/openssl:=[-bindist] )" + ssl? ( dev-libs/openssl:=[-bindist] ) + xmpp? ( dev-libs/iksemel ) +" RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] + server? ( app-admin/webapp-config - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] ) frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + 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] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" + ) +" DEPEND="${COMMON_DEPEND} static? ( + curl? ( net-misc/curl[static-libs] ) ldap? ( - net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[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 ) ) - virtual/pkgconfig" +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-security-disable-PidFile.patch" + "${FILESDIR}/${P}-mysql8.patch" +) S=${WORKDIR}/${MY_P} @@ -105,13 +123,8 @@ pkg_setup() { enewgroup zabbix enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - java-pkg_jar-from slf4j-api + java-pkg-opt-2_pkg_setup } src_prepare() { @@ -120,25 +133,25 @@ src_prepare() { src_configure() { econf \ - $(use_enable server) \ - $(use_enable proxy) \ $(use_enable agent) \ $(use_enable ipv6) \ - $(use_enable static) \ $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ $(use_with ldap) \ - $(use_with snmp net-snmp) \ + $(use_with libxml2) \ $(use_with mysql) \ - $(use_with postgres postgresql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) + $(use_with ssl openssl) \ + $(use_with xmpp jabber) } src_compile() { @@ -148,64 +161,74 @@ src_compile() { } src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ + 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 + ) - keepdir \ - /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 + dodir "${dir}" + keepdir "${dir}" + done if use server; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf + doins "${S}"/conf/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf fi if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + 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 + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf fi if use agent; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + 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 - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf fi + fowners root:zabbix /etc/zabbix fowners zabbix:zabbix \ - /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ @@ -253,17 +276,16 @@ src_install() { src/zabbix_java/lib/logback.xml \ src/zabbix_java/lib/android-json-4.3_r3.1.jar \ src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + 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 "You may need to configure your database for Zabbix" + elog "if you have not already done so." elog zabbix_homedir=$(egethome zabbix) diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild deleted file mode 100644 index 2e1f7d320991..000000000000 --- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libpcre - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.0.18.ebuild index 190162272899..28210112c73a 100644 --- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.18.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 # needed to make webapp-config dep optional WEBAPP_OPTIONAL="yes" @@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and HOMEPAGE="https://www.zabbix.com/" MY_P=${P/_/} MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" +SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" @@ -22,63 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )" -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) ldap? ( - net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls + net-nds/openldap ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) + mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) - ssl? ( dev-libs/openssl:=[-bindist] )" + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) + xmpp? ( dev-libs/iksemel ) +" RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] + server? ( app-admin/webapp-config + dev-libs/libevent dev-libs/libpcre - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api + net-analyzer/fping[suid] ) frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + 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] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" + ) +" DEPEND="${COMMON_DEPEND} static? ( + curl? ( net-misc/curl[static-libs] ) ldap? ( - net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[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 ) ) - virtual/pkgconfig" +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) S=${WORKDIR}/${MY_P} @@ -108,41 +123,35 @@ pkg_setup() { enewgroup zabbix enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - java-pkg_jar-from slf4j-api + java-pkg-opt-2_pkg_setup } src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user + default } src_configure() { econf \ - $(use_enable server) \ - $(use_enable proxy) \ $(use_enable agent) \ $(use_enable ipv6) \ - $(use_enable static) \ $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ $(use_with ldap) \ - $(use_with snmp net-snmp) \ + $(use_with libxml2) \ $(use_with mysql) \ - $(use_with postgres postgresql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) + $(use_with ssl openssl) \ + $(use_with xmpp jabber) } src_compile() { @@ -152,67 +161,74 @@ src_compile() { } src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ + 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 + ) - keepdir \ - /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 + dodir "${dir}" + keepdir "${dir}" + done if use server; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf + doins "${S}"/conf/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf fi if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + doins "${S}"/conf/zabbix_proxy.conf fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 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 + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf fi if use agent; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + doins "${S}"/conf/zabbix_agentd.conf fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + 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 - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf fi + fowners root:zabbix /etc/zabbix fowners zabbix:zabbix \ - /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ @@ -260,17 +276,16 @@ src_install() { src/zabbix_java/lib/logback.xml \ src/zabbix_java/lib/android-json-4.3_r3.1.jar \ src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + 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 "You may need to configure your database for Zabbix" + elog "if you have not already done so." elog zabbix_homedir=$(egethome zabbix) diff --git a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild deleted file mode 100644 index bf5db4ac645c..000000000000 --- a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - server? ( dev-libs/libevent ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libpcre ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf - fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.6.ebuild index 2ff7b0830d7d..8d4030480f5e 100644 --- a/net-analyzer/zabbix/zabbix-4.4.5.ebuild +++ b/net-analyzer/zabbix/zabbix-4.4.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 # needed to make webapp-config dep optional WEBAPP_OPTIONAL="yes" @@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and HOMEPAGE="https://www.zabbix.com/" MY_P=${P/_/} MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" +SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" @@ -22,62 +22,77 @@ REQUIRED_USE="|| ( agent frontend proxy server ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )" -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) ldap? ( - net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls + net-nds/openldap ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) + mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) - server? ( dev-libs/libevent ) - ssl? ( dev-libs/openssl:=[-bindist] )" + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) +" RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] + server? ( app-admin/webapp-config - dev-libs/libpcre ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] ) frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + 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] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" + ) +" DEPEND="${COMMON_DEPEND} static? ( + curl? ( net-misc/curl[static-libs] ) ldap? ( - net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] ) - mysql? ( >=virtual/mysql-5.0.3[static] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[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 ) ) - virtual/pkgconfig" +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) S=${WORKDIR}/${MY_P} @@ -107,39 +122,33 @@ pkg_setup() { enewgroup zabbix enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - java-pkg_jar-from slf4j-api + java-pkg-opt-2_pkg_setup } src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user + default } src_configure() { econf \ - $(use_enable server) \ - $(use_enable proxy) \ $(use_enable agent) \ $(use_enable ipv6) \ - $(use_enable static) \ $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ $(use_with ldap) \ - $(use_with snmp net-snmp) \ + $(use_with libxml2) \ $(use_with mysql) \ - $(use_with postgres postgresql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ $(use_with sqlite sqlite3) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ $(use_with ssl openssl) } @@ -150,67 +159,74 @@ src_compile() { } src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ + 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 + ) - keepdir \ - /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 + dodir "${dir}" + keepdir "${dir}" + done if use server; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf + doins "${S}"/conf/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf fi if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + doins "${S}"/conf/zabbix_proxy.conf fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 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 + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf fi if use agent; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + doins "${S}"/conf/zabbix_agentd.conf fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + 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 - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf fi + fowners root:zabbix /etc/zabbix fowners zabbix:zabbix \ - /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ @@ -258,17 +274,16 @@ src_install() { src/zabbix_java/lib/logback.xml \ src/zabbix_java/lib/android-json-4.3_r3.1.jar \ src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + 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 "You may need to configure your database for Zabbix" + elog "if you have not already done so." elog zabbix_homedir=$(egethome zabbix) @@ -280,8 +295,7 @@ pkg_postinst() { ewarn "custom alert scripts." ewarn ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." + ewarn "for custom alert scripts." ewarn ewarn "To change the homedir use:" ewarn " usermod -d /var/lib/zabbix/home zabbix" |