forked from buildroot/buildroot
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix patch fuzz to avoid the following build failure raised since commit 8f88a64 which 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: 8f88a64 - http://autobuild.buildroot.org/results/75dfe12312b5479669fcdfea623d93880c675e13 Signed-off-by: Fabrice Fontaine <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
- Loading branch information
1 parent
6084d90
commit 183f539
Showing
3 changed files
with
5 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Fixes: | |
- http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 | ||
|
||
Signed-off-by: Fabrice Fontaine <[email protected]> | ||
[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(-) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ Fixes: | |
- http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 | ||
|
||
Signed-off-by: Fabrice Fontaine <[email protected]> | ||
[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 */ | ||
|