diff --git a/.checkpackageignore b/.checkpackageignore index 2e6e8a9cac49..975a7f21f4d7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1486,8 +1486,6 @@ package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch lib_patch.Ups package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch lib_patch.Upstream package/ympd/0001-only-c-language.patch lib_patch.Upstream package/ympd/0002-added-forward-declarations.patch lib_patch.Upstream -package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch lib_patch.Upstream -package/zabbix/0002-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream package/zic/0001-remove-dependency-check-on-version-file.patch lib_patch.Upstream package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch lib_patch.Upstream package/zip/0002-configure-Don-t-use-host-CPP.patch lib_patch.Upstream diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch index ffb1f54ba231..6c742b0d0a20 100644 --- a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zabbix/zabbix/pull/61] +Upstream: https://github.com/zabbix/zabbix/pull/61 --- m4/netsnmp.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index acb5cfc9a676..ad6960f3291f 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -30,7 +30,7 @@ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (no feedback on first patch)] +Upstream: not sent (no feedback on first patch) --- include/zbxcomms.h | 3 ++- src/libs/zbxcomms/tls.c | 5 +++-- @@ -54,9 +54,9 @@ diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c index 54ab0a6ef4..bd4075b3e4 100644 --- a/src/libs/zbxcomms/tls.c +++ b/src/libs/zbxcomms/tls.c -@@ -30,8 +30,9 @@ - #include "zbxstr.h" - #include "zbxtime.h" +@@ -28,8 +28,9 @@ + #include "log.h" + #include "zbxcrypto.h" -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */