[Buildroot] [PATCH 1/1] package/zabbix: fix patch fuzz

[Buildroot] [PATCH 1/1] package/zabbix: fix patch fuzz

[Fabrice Fontaine]

Fix patch fuzz to avoid the following build failure raised since commit
8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 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: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
 - http://autobuild.buildroot.org/results/75dfe12312b5479669fcdfea623d93880c675e13

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .checkpackageignore                                       | 2 --
 .../0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch     | 2 +-
 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch   | 8 ++++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.checkpackageignore b/.checkpackageignore
index f0fa13eb4f..6d51e80b99 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1478,8 +1478,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 ffb1f54ba2..6c742b0d0a 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 <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(-)
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 acb5cfc9a6..ad6960f329 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 <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 */
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/zabbix: fix patch fuzz

[Thomas Petazzoni via buildroot]

On Sat, 20 Jul 2024 17:31:13 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix patch fuzz to avoid the following build failure raised since commit
> 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 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: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
>  - http://autobuild.buildroot.org/results/75dfe12312b5479669fcdfea623d93880c675e13
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Thanks applied. Please note that the URL from which we download this
tarball no longer works:

--2024-07-20 23:15:29--  https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.7.tar.gz
Resolving cdn.zabbix.com (cdn.zabbix.com)... 2606:4700:20::ac43:4504, 2606:4700:20::681a:694, 2606:4700:20::681a:794, ...
Connecting to cdn.zabbix.com (cdn.zabbix.com)|2606:4700:20::ac43:4504|:443... connected.
HTTP request sent, awaiting response... 404 Not Found

> -[Upstream status: not sent (no feedback on first patch)]
> +Upstream: not sent (no feedback on first patch)

Zabbix is one of those not really open-source projects. It's driven by
a company, released under AGPLv3 so that they can create a business
incentive for their customers to purchase a commercial license. It
looks like if you want to contribute you need to sign a Contributor
License Agreement. See the details
at https://www.zabbix.com/developers, if you're brave enough.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot