mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-27 12:30:34 -09:00
package/zabbix: fix patch fuzz
Fix patch fuzz to avoid the following build failure raised since commit8f88a644edwhich reduced the fuzz factor: Applying 0002-fix-build-with-libressl-3.5.0.patch using patch: patching file include/zbxcomms.h Hunk #1 succeeded at 210 (offset -43 lines). patching file src/libs/zbxcomms/tls.c Hunk #1 FAILED at 30. 1 out of 1 hunk FAILED -- saving rejects to file src/libs/zbxcomms/tls.c.rej While at it, also fix Upstream tags Fixes:8f88a644ed- http://autobuild.buildroot.org/results/75dfe12312b5479669fcdfea623d93880c675e13 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
6084d904de
commit
183f5399ce
@@ -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
|
||||
|
||||
@@ -16,7 +16,7 @@ Fixes:
|
||||
- http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[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(-)
|
||||
|
||||
@@ -30,7 +30,7 @@ Fixes:
|
||||
- http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[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 */
|
||||
|
||||
Reference in New Issue
Block a user