gentoo auto-resync : 28:03:2023 - 09:49:10

8 files changed, 807 insertions, 32 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d49ca667ba85..ab0de37efd50 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f6bb80258969..55d0a1c19138 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,7 +1,7 @@
-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-5.0.22-system.sw.packages.patch 1573 BLAKE2B b0105ba6ddd6d503e4be8829422496c0e38cfbca2e8a72548a7f25e94a3b603a378d15cdceb08a5a3ea652d8a6b70ac7772be04c1fc28e38a8501f985f5bb18b SHA512 813b643d43c48a2a69245aaf8088acf2873d0686754bdc1c85f1034aee21b97a1637497c0ce013a93aff3b2832104b11c883f1188db8cb46f2aa8c8d6a149315
-AUX zabbix-6.0.3-system.sw.packages.patch 1573 BLAKE2B 891fc64ed00e3d3d85ee360a04ff285a0efe1aa0720605ebcfe9fd99dca3b94ca8a5809995a944543f0c3dc56e418db809aae73236d822ae50d5e4cda4857374 SHA512 bf3b0ad920008ef907f1c5218f5000cfc3cbacca1b2ffb161ff7c63cf9209144c6efc648822790d4fe3cc2e309e4fc198a2c6a088eec1b57d036cd636989841f
+AUX zabbix-3.0.30-security-disable-PidFile.patch 1012 BLAKE2B 4327b4af0e62e1b519aeb3d5ee4668098800fc90fb3c6f22f1f2890a61161226124268d37bbd338e070d25043f0855b5d3c817efe72b994a88e7df119c3161d0 SHA512 2173d6237ba2b0d862eebeb51e83033492484b787a7afefdb43ae3b3d35232f2d4cb7dbc99a2c3c037052c2f631a083a9e0999b8ade3919085a2d3a0fde7ab98
+AUX zabbix-4.0.18-modulepathfix.patch 258 BLAKE2B d799f91c72a0f184a425d38af9ea45373ff3647f6302822ae3dda06d5117b28da82a59bab1ccc5aeaad9a9464ea073b9eecc382ce8c7a749feb8dfd1895fdf05 SHA512 767e6a5586a0d3f3714532b605dfe366decc9470234725dc5597b39f628dbd1e165436fe9668491425e9749f3f49dd8575aeaca0c19c4f6df815b955725c2c49
+AUX zabbix-5.0.22-system.sw.packages.patch 1204 BLAKE2B 6f0381abf86b07827bb8f90a30390e2818b083aee8b2e9f9786377406c6c893baedab20f9e8b16487167eb37e04f0a48ed9aac6e18b2bfd6b667c1384def632c SHA512 79832e266d2e13737a263fdc2d832a95da40ee4ccd9ac80642d1c6e466335f26730512a26e97e033a784c54dc8847e80037205c52c3018d751b689fe925fccd8
+AUX zabbix-6.0.3-system.sw.packages.patch 1204 BLAKE2B 07326c6762c2cf8655f0555628f42b89826881cfa246923aab181f7c491ddfeada7f2c1091fe63869c46a131aaf795af77aac8c78fcd8bea3d745af654519669 SHA512 e929586d74e5f77644ec03476bd78203bae405d37257ebd7c128f5d95433ac600175b2b1dfa6d0e32442600dc5ce8a931d5eb7d818c39a001924b1321b052a97
 AUX zabbix-agent2.init 507 BLAKE2B 6235831aca66cb2b097c0260ba8c0151c4a98fadc836cff14a248a77f5a0d013b5e6cf56605f63c9b41541daad4f842da74d80658f0a20b38be507909605af77 SHA512 91eaac170c9234229f2969b0d899dc7ffc21aa99aa8b3593b91f52afe786f6cc81c1279bf78b4456c8e462cea924630ee87e4ce7d6f2128c42e778907751e98e
 AUX zabbix-agent2.service 277 BLAKE2B 46ec792441c57c6fb7cad391d736672a3d93cbb9c92c5e3d90de3a5c7502a789359bd9752b8740fd73a626e4ed96272231730a87b179a4e0d13f8fb48571f606 SHA512 8f467e9d7a4ce82dc387ef1ef6ac8c39e943d0bbce938e186bdfa7e207959d9159a9d446b30d39d627b7400ceeb9c4d322b06ad063b42d0edc5bbef4043230f7
 AUX zabbix-agent2.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
@@ -23,6 +23,8 @@ DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 38bf33002e6dbae95b39579383f8b
 DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb SHA512 7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
 DIST zabbix-5.0.32-go-deps.tar.xz 34470664 BLAKE2B aedd50682e9e71686852f5d69c1645c16d52a5c16a0628692452b6fbb1577a775473daad8ab687d23302966aa989dd0257ab38143f3db8ce4fdcf386d94b9689 SHA512 2ca7f5cf5e11eb0770bc16008a9e52436510bcee9e222b17ac58ea47acffd455a1278a9cdee9df9a6e045bfb7deb1df9950fb9ea19e767b8733b8036d9dc1d81
 DIST zabbix-5.0.32.tar.gz 21664895 BLAKE2B d70e68727eec0181398c7624c56aa2ef721a738a7549fa075a66cd94b6225243b7e73ff1b4d2ed96482ca5ac79ac8bcb230e9736f63a5dbe66cc4d0b10a88e24 SHA512 f58ecac976cc3b9e81f738e19ac23185747c005a73060f35137b5964d4144b96263b7dcba7db6d895f39908217aae9ba260ce5a772a4c53d4b24ccd41083f524
+DIST zabbix-5.0.33-go-deps.tar.xz 34386484 BLAKE2B 43228e628666ad841054c11d7031991903b9cd0ebd521350f33a94485d834be4d8ab30660e375bb0bf769f15b57f8125f9bb5239a65b7415ead07d2cf652c2b6 SHA512 19884c90024065839f38456b66e85e4fd228099f3746c8a63010686bcfffa0a1224b889ff4b7774efba838753cc97ae8a741d92beeebef1e0f154256a7381bfb
+DIST zabbix-5.0.33.tar.gz 21791284 BLAKE2B 920adfe2d078a58bc658ab8d815bc426ab654fe6356ed46950b572e4fc480d5986adf03e05ab780cae61166178e60e0eaee6be6a02f4d1d33744c84ce04f1ea1 SHA512 c5c6046d53a8341270cd0642e41df77f61ae0d472c1c3ee6fe86f7c3a4433ab30ced0b25ade3291f67872cf0b38e60eaffec8b16bb89e6d9729c7e277de321a7
 DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3 SHA512 c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
 DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
@@ -35,17 +37,21 @@ DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B f7e155040a60ac48236084b404d469
 DIST zabbix-6.2.7.tar.gz 41462274 BLAKE2B 52d82c1eb00f003f53758840af4621b15dcc0c4dbb09f051fa323a53fada303dc5123d3fc99238688e73eb9506a54ec88890d48bd7f21ecfccd5f8b0dd02e102 SHA512 5cafae600d7a83729ac2d28c1cace2a6fb0ac1bdca06ac89e7fd272f1227d2d19e3aa3ccfaefb00229a61f55c608c4d97a5595724c600d8a46950a92c6e20fd0
 DIST zabbix-6.2.8-go-deps.tar.xz 17973508 BLAKE2B b0aa8bd692a6572d65daeb41ab36daaa6af6fc4c64692e9617dbd90bd0a14ba5031253bd7d326474dfb5b6a730785fba1ef8f1acd783b028de1d725ff2c657b7 SHA512 631e2d9d9f9f9b5504f8ba580b46fcf32dca1c5eb4308d2beff1a836f2b392924b481690c78fe43ff5332739746ddb75e2db89f9b1195f4f7390b01c1df8b942
 DIST zabbix-6.2.8.tar.gz 41784711 BLAKE2B eb5ebe5647a115da138336315b7af81fa39feb4428c609f604a6d13821226db65443faa49e3dbf3c2668ae917b37df9e7946ed79deb4e79f9a91f00fc18cc90b SHA512 0d77fd07128d3a20959385b458fb58408b0e1fd9673c4156286ef2dee6772d217ea285108470458fc6388510e897fb32cf7b046d2e28dc9d2e17ecb484cf3dde
+DIST zabbix-6.2.9-go-deps.tar.xz 17974816 BLAKE2B a942d2ee65aaee0286d335951f8641e7f03db09c76ec5a2c421a5967773c1432280f61690630922d3eb55b9a492ac3cc37fa68b2ae765aec111f47f5f53c654c SHA512 7e025baedcb23a8139873429cb7fa8aa1dd0d8302f0426d9d55ae7b67fee120e3dbc5465d1851fab4c7f84471afb630f56bd90f5d6781a3fe5337c87cf2c0ae2
+DIST zabbix-6.2.9.tar.gz 41776052 BLAKE2B 59f103883e982296cb7b400db81c02e602b5cf39c9ed10670d0c8017c77331e2a378d1a0f716671d1a9a0670a5800fde2f9b6663eaae85fce9a1c0a91a3487d9 SHA512 a2712bc194adfc707831f32360984332591fe0b9e2f72a92f96c2d4994b1539d27ca53963a98b68c7f94cf13c1afc0438d9bbc7db733773fdb05d507873f09a9
 DIST zabbix-6.4.0-go-deps.tar.xz 21481908 BLAKE2B 83280695c1f47c9d5c794e8da0e4140ff2c432aa2d2ff14e755f855a621472c81d2dbd5dfad7fd0d735d784f834e0a2c220acb35cb5c3dddeba22494a5a0d674 SHA512 f07faa620d885a3fb81ec1e273de44831f6e95295c309997cc650958b870a9d458289e3dfaf9cea97f1e8067a9b624d2e9a5125394ac3a3117c0875f9f76f8ea
 DIST zabbix-6.4.0.tar.gz 42787621 BLAKE2B defb3819e5320488f5f35d6fbc52877a30313e9f745447559eea40b74d786a55d4a3971b1ff6072eedf805296c9b5bfe98fa3395affb50e2ba5be439091212d6 SHA512 e572c6de1a7e2f1cf5ea4a56886aabe0915d41c0f8fb6e6812dba6f7766deebe8cd743dbc8a80839fc49a794b799b93cd30dfa0741cf6fa7e1652058211f97bb
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-5.0.30.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.31.ebuild 10143 BLAKE2B 1433c673da12c17346047fbad4aa120855171c758aa227c924fad313da8eb4e6cac2f05a19ff24eb1d00d618c3dd242e2b0c5af4e9dc724703b8c9a82b3231b3 SHA512 090492b3bd5240ee41f3bc31f97281833b2b37ef78965a15cc84aa4eacf04a61683e9de29d1945c31c3d0baa09a7a06a7d7ee1286a5b102d6f669639ef6e3f57
 EBUILD zabbix-5.0.32.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
+EBUILD zabbix-5.0.33.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-6.0.12.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.0.13.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb198d04b065597d303ec14ff2b9bdbabbfc570fc62dacd94c4971c3d4142673b117f81dcfa9f3137a853b02fe51 SHA512 0a5210f2ddd059fe0894ac644158fa7cdbe13c67dceb925573d724084104d56414fa50fa5db48e0c12a1ebe8556c7699f3f3cca3028d02c88f227e950d2eb6d6
 EBUILD zabbix-6.0.14.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.2.6.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.2.7.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb198d04b065597d303ec14ff2b9bdbabbfc570fc62dacd94c4971c3d4142673b117f81dcfa9f3137a853b02fe51 SHA512 0a5210f2ddd059fe0894ac644158fa7cdbe13c67dceb925573d724084104d56414fa50fa5db48e0c12a1ebe8556c7699f3f3cca3028d02c88f227e950d2eb6d6
 EBUILD zabbix-6.2.8.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.2.9.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.4.0.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
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
index e0fd74de51c7..b2635ff7d8a1 100644
--- 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
@@ -1,5 +1,3 @@
-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 @@
@@ -10,8 +8,6 @@ index b73bd45..c10daca 100644
  #
  # 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
@@ -22,8 +18,6 @@ index 082f14e..de0284d 100644
  #
  # 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
@@ -34,8 +28,6 @@ index 9f754ca..3999196 100644
  #
  # 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;
diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch
index c0d1650fb85c..3e4ed297ebc0 100644
--- a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch
+++ b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch
@@ -1,5 +1,5 @@
---- zabbix-4.0.1/configure	2018-10-29 10:36:05.000000000 -0700
-+++ zfx/configure	2018-11-07 16:59:28.015968345 -0800
+--- zabbix-4.0.1/configure
++++ zfx/configure
 @@ -12510,7 +12510,7 @@
  CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs"
  CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys"
diff --git a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch
index 353dac72b876..537c3491bb5f 100644
--- a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch
+++ b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch
@@ -4,13 +4,6 @@ Date: Mon, 21 Mar 2022 11:23:54 +0300
 Subject: [PATCH] Allow to use system.sw.packages on gentoo linux
 
 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
----
- src/go/plugins/system/sw/sw.go       | 1 +
- src/libs/zbxsysinfo/linux/software.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go
-index f0e4df0b55c..dda25380f40 100644
 --- a/src/go/plugins/system/sw/sw.go
 +++ b/src/go/plugins/system/sw/sw.go
 @@ -164,6 +164,7 @@ func getManagers() []manager {
@@ -21,8 +14,6 @@ index f0e4df0b55c..dda25380f40 100644
  	}
  }
  
-diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
-index 2ee885ac14a..c950e65d607 100644
 --- a/src/libs/zbxsysinfo/linux/software.c
 +++ b/src/libs/zbxsysinfo/linux/software.c
 @@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER	package_managers[] =
diff --git a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch
index 2649e118151e..3cb4b74fb15d 100644
--- a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch
+++ b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch
@@ -4,13 +4,6 @@ Date: Mon, 21 Mar 2022 11:23:54 +0300
 Subject: [PATCH] Allow to use system.sw.packages on gentoo linux
 
 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
----
- src/go/plugins/system/sw/sw.go       | 1 +
- src/libs/zbxsysinfo/linux/software.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go
-index 0abaf05fb3b..1d8a94b5924 100644
 --- a/src/go/plugins/system/sw/sw.go
 +++ b/src/go/plugins/system/sw/sw.go
 @@ -165,6 +165,7 @@ func getManagers() []manager {
@@ -21,8 +14,6 @@ index 0abaf05fb3b..1d8a94b5924 100644
  	}
  }
  
-diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
-index 749deaa9258..3a6ee97ec4c 100644
 --- a/src/libs/zbxsysinfo/linux/software.c
 +++ b/src/libs/zbxsysinfo/linux/software.c
 @@ -177,6 +177,7 @@ static ZBX_PACKAGE_MANAGER	package_managers[] =
diff --git a/net-analyzer/zabbix/zabbix-5.0.33.ebuild b/net-analyzer/zabbix/zabbix-5.0.33.ebuild
new file mode 100644
index 000000000000..6e481bc98c71
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.33.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
+)
+
+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
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	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
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.2.9.ebuild b/net-analyzer/zabbix/zabbix-6.2.9.ebuild
new file mode 100644
index 000000000000..f3edadcff0ce
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.9.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+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
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	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
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}