cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 6.2.3 and backport a crash fix for ZBX-21373

Browse Source 
from Mark Patruck; ok naddy@, sthen@
This commit is contained in:
robert 2022-09-27 11:31:33 +00:00
parent f910a2a5b6
commit b52cd4fd4d
4 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/zabbix/Makefile
View File

@ -3,7 +3,7 @@ COMMENT-server = network and application monitoring - server
COMMENT-proxy = network and application monitoring - proxy
COMMENT-web = network and application monitoring - web frontend
VERSION = 6.2.2
VERSION = 6.2.3
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@ -12,7 +12,6 @@ PKGNAME-proxy = zabbix-proxy-${VERSION}
FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
REVISION-main = 1
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

4
net/zabbix/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zabbix-6.2.2.tar.gz) = 8Oepq7D2XXAPUxJTuRwxFlB3qclHacyNI4pCOtqFJ3M=
SIZE (zabbix-6.2.2.tar.gz) = 34995538
SHA256 (zabbix-6.2.3.tar.gz) = K+flf7M6Vf7nFIBZjjF/+mqO5aOWOafhtCsupochB7U=
SIZE (zabbix-6.2.3.tar.gz) = 35252249

29
net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_proc_c Normal file
View File

@ -0,0 +1,29 @@
[ZBX-21373] counted proc args on openbsd manually instead of using a syscall
Index: src/libs/zbxsysinfo/openbsd/proc.c
--- src/libs/zbxsysinfo/openbsd/proc.c.orig
+++ src/libs/zbxsysinfo/openbsd/proc.c
@@ -146,7 +146,7 @@ static void proc_data_free(proc_data_t *proc_data)
static int proc_argv(pid_t pid, char ***argv, size_t *argv_alloc, int *argc)
{
size_t sz;
- int mib[4];
+ int mib[4], nargv = 0;
if (NULL == *argv)
{
@@ -171,11 +171,10 @@ retry:
return FAIL;
}
- mib[3] = KERN_PROC_NARGV;
+ while (NULL != (*argv)[nargv])
+ nargv++;
- sz = sizeof(int);
- if (0 != sysctl(mib, 4, argc, &sz, NULL, 0))
- return FAIL;
+ *argc = nargv;
return SUCCEED;
}

6
net/zabbix/pkg/PLIST-web
View File

@ -873,8 +873,6 @@ zabbix/include/classes/html/CLabel.php
zabbix/include/classes/html/CLink.php
zabbix/include/classes/html/CLinkAction.php
zabbix/include/classes/html/CList.php
zabbix/include/classes/html/CListBox.php
zabbix/include/classes/html/CListBoxItem.php
zabbix/include/classes/html/CListItem.php
zabbix/include/classes/html/CMacroValue.php
zabbix/include/classes/html/CMenu.php
@ -1461,6 +1459,10 @@ zabbix/locale/cs/
zabbix/locale/cs/LC_MESSAGES/
zabbix/locale/cs/LC_MESSAGES/frontend.mo
zabbix/locale/cs/LC_MESSAGES/frontend.po
zabbix/locale/da/
zabbix/locale/da/LC_MESSAGES/
zabbix/locale/da/LC_MESSAGES/frontend.mo
zabbix/locale/da/LC_MESSAGES/frontend.po
zabbix/locale/de/
zabbix/locale/de/LC_MESSAGES/
zabbix/locale/de/LC_MESSAGES/frontend.mo