Skip to content

Commit 183f539

Browse files
ffontainetpetazzoni
authored andcommitted
package/zabbix: fix patch fuzz
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]>
1 parent 6084d90 commit 183f539

3 files changed

+5
-7
lines changed

.checkpackageignore

-2
Original file line numberDiff line numberDiff line change
@@ -1486,8 +1486,6 @@ package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch lib_patch.Ups
14861486
package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch lib_patch.Upstream
14871487
package/ympd/0001-only-c-language.patch lib_patch.Upstream
14881488
package/ympd/0002-added-forward-declarations.patch lib_patch.Upstream
1489-
package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch lib_patch.Upstream
1490-
package/zabbix/0002-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream
14911489
package/zic/0001-remove-dependency-check-on-version-file.patch lib_patch.Upstream
14921490
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch lib_patch.Upstream
14931491
package/zip/0002-configure-Don-t-use-host-CPP.patch lib_patch.Upstream

package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Fixes:
1616
- http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9
1717

1818
Signed-off-by: Fabrice Fontaine <[email protected]>
19-
[Upstream status: https://github.com/zabbix/zabbix/pull/61]
19+
Upstream: https://github.com/zabbix/zabbix/pull/61
2020
---
2121
m4/netsnmp.m4 | 7 +++++--
2222
1 file changed, 5 insertions(+), 2 deletions(-)

package/zabbix/0002-fix-build-with-libressl-3.5.0.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Fixes:
3030
- http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233
3131

3232
Signed-off-by: Fabrice Fontaine <[email protected]>
33-
[Upstream status: not sent (no feedback on first patch)]
33+
Upstream: not sent (no feedback on first patch)
3434
---
3535
include/zbxcomms.h | 3 ++-
3636
src/libs/zbxcomms/tls.c | 5 +++--
@@ -54,9 +54,9 @@ diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c
5454
index 54ab0a6ef4..bd4075b3e4 100644
5555
--- a/src/libs/zbxcomms/tls.c
5656
+++ b/src/libs/zbxcomms/tls.c
57-
@@ -30,8 +30,9 @@
58-
#include "zbxstr.h"
59-
#include "zbxtime.h"
57+
@@ -28,8 +28,9 @@
58+
#include "log.h"
59+
#include "zbxcrypto.h"
6060

6161
-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
6262
-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */

0 commit comments

Comments
 (0)