diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-14 12:32:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-14 12:32:28 +0100 |
| commit | e8aa09f74c8ba0c9e1c5ae3ab49f93b6a0820330 (patch) | |
| tree | 14ad0b4141ec6704388a9130b87976ed75435984 /net-analyzer/zabbix | |
| parent | 6fcdccbe589d724b6c268b49f66414e40eb0d807 (diff) | |
gentoo auto-resync : 14:09:2024 - 12:32:27
Diffstat (limited to 'net-analyzer/zabbix')
| -rw-r--r-- | net-analyzer/zabbix/Manifest | 1 | ||||
| -rw-r--r-- | net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index f6ffb9a5a066..92ceb864e9c9 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -3,7 +3,6 @@ AUX zabbix-4.0.18-modulepathfix.patch 258 BLAKE2B d799f91c72a0f184a425d38af9ea45 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-6.4.0-configure-sscanf.patch 305 BLAKE2B 1a1a7f47e75f0f21ec313ce785acd6af2cf8790774b5dc058c83e6f55104b6740ecf55f00e62d1beb3b88e22f7549fc009a45d538c68b39784308299238538d2 SHA512 c659ef9e257d90cbe5c7050bb9e31ccb2591c377d00ae0e5ef250fb516e36d11830134be7473dabf1a5cee70e3b91819d588f452d2049dcb33fe76726b8a170d -AUX zabbix-6.4.6-clang16-build-fix.patch 2514 BLAKE2B 0f6fdd5004476f041a0c64d3c28c9295e2172458bfdd8adade5ad27314e5f8f44a1cb7e06d3d63057225ee4683af32af6fc434c71d41a2dd2f1a4c5578252ba4 SHA512 46e020358ec0dd7ce8c804546874b050f2ee21c8bda8817234a98ddf38d58fa8a820b3b1b2bfa38f92d80a0091cc131a81dd1b37d8eb6b0c7c65bc1c5e1f3900 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 diff --git a/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch b/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch deleted file mode 100644 index 4160a42ee6eb..000000000000 --- a/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://github.com/zabbix/zabbix/pull/110 -From: Brahmajit Das <brahmajit.xyz@gmail.com> -Date: Sun, 24 Sep 2023 14:40:05 +0000 -Subject: [PATCH] Fix incompatible pointer to integer conversion initializing - -Makes struct members explicit. - -First found on Gentoo linux, with MUSL LLVM profile. Most probably due -to newer compilers (like Clang 16 and GCC 14) have turned various errors -on by default and we get build errors such as: - -``` -net.c:115:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] - struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; - ^~~~ -/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' - ^~~~~~~~~~ -net.c:121:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] - struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; - ^~~~ -/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' -``` - -Bug: https://bugs.gentoo.org/897840 -Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> ---- a/src/libs/zbxsysinfo/linux/net.c -+++ b/src/libs/zbxsysinfo/linux/net.c -@@ -112,13 +112,25 @@ static int find_tcp_port_by_state_nl(unsigned short port, int state, int *found) - - struct sockaddr_nl s_sa = { AF_NETLINK, 0, 0, 0 }; - struct iovec s_io[1] = { { &request, sizeof(request) } }; -- struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; -+ struct msghdr s_msg = { .msg_name = (void *)&s_sa, -+ .msg_namelen = sizeof(struct sockaddr_nl), -+ .msg_iov = s_io, -+ .msg_iovlen = 1, -+ .msg_control = NULL, -+ .msg_controllen = 0, -+ .msg_flags = 0}; - - char buffer[BUFSIZ] = { 0 }; - - struct sockaddr_nl r_sa = { AF_NETLINK, 0, 0, 0 }; - struct iovec r_io[1] = { { buffer, BUFSIZ } }; -- struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; -+ struct msghdr r_msg = { .msg_name = (void *)&r_sa, -+ .msg_namelen = sizeof(struct sockaddr_nl), -+ .msg_iov = r_io, -+ .msg_iovlen = 1, -+ .msg_control = NULL, -+ .msg_controllen = 0, -+ .msg_flags = 0}; - - struct nlmsghdr *r_hdr; - --- -2.42.0 - |