collectd: Replace custom patch by upstream patch

3 files changed, 46 insertions, 27 deletions

diff --git a/net/collectd/HISTORY b/net/collectd/HISTORY
index 805ead59c4..b7c8a64ca4 100644
--- a/net/collectd/HISTORY
+++ b/net/collectd/HISTORY
@@ -3,6 +3,8 @@
 	* patches/0001-Fix-anonymous-connection_state-pointer.patch,
 	  patches/0001-Fix-non-standard-regex-macro.patch: added build fixes
 	* collectd-4.10.3_fixes.patch: removed, no longer needed
+	* patches/0001-src-netlink.c-remove-REG_NOERROR.patch: added upstream patch
+	* patches/0001-Fix-non-standard-regex-macro.patch: removed, replaced by upstream patch
 
 2011-09-10 David Kowis <dkowis@shlrm.org>
 	* collectd_4.10.3_fixes.patch: patch to get things to build
diff --git a/net/collectd/patches/0001-Fix-non-standard-regex-macro.patch b/net/collectd/patches/0001-Fix-non-standard-regex-macro.patch
deleted file mode 100644
index dce9a814fb..0000000000
--- a/net/collectd/patches/0001-Fix-non-standard-regex-macro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-Subject: [PATCH] Fix non-standard regex macro
-Date: Mon, 15 Aug 2022 15:04:13 +0200
-From: Ismael Luceno <ismael@iodev.co.uk>
-
-REG_NOERROR isn't defined by POSIX; use 0 instead.
-
-Origin: Source Mage GNU/Linux
-Upstream-Status: Pending
-Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
----
- netlink.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/netlink.c b/src/netlink.c
-index 7a5da762c739..ef66a9992efa 100644
---- a/src/netlink.c
-+++ b/src/netlink.c
-@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type,
-   for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) {
- #if HAVE_REGEX_H
-     if (i->rdevice != NULL) {
--      if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
-+      if (regexec(i->rdevice, dev, 0, NULL, 0) != 0)
-         continue;
-     } else
- #endif
diff --git a/net/collectd/patches/0001-src-netlink.c-remove-REG_NOERROR.patch b/net/collectd/patches/0001-src-netlink.c-remove-REG_NOERROR.patch
new file mode 100644
index 0000000000..af1b50fb6a
--- /dev/null
+++ b/net/collectd/patches/0001-src-netlink.c-remove-REG_NOERROR.patch
@@ -0,0 +1,44 @@
+From 5e600ae2ad370ddbb759e84ce55a7dfaa9a0bdd7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 6 Sep 2020 14:17:23 +0200
+Subject: [PATCH] src/netlink.c: remove REG_NOERROR
+
+REG_NOERROR is used since version 5.12.0 and
+https://github.com/collectd/collectd/commit/f7fd32e5209e188db7985a42054252fc4cbfe7c1
+
+However, REG_NOERROR is not defined by musl, even GNU regex do not
+mention REG_NOERROR, so just remove it to avoid the following build
+failure:
+
+src/netlink.c: In function 'check_ignorelist':
+src/netlink.c:243:51: error: 'REG_NOERROR' undeclared (first use in this function); did you mean 'REG_NOTBOL'?
+       if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
+                                                   ^~~~~~~~~~~
+                                                   REG_NOTBOL
+
+Fixes:
+ - http://autobuild.buildroot.org/results/cd4d75888b5259b028132dd224be34f69bcbb702
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+---
+ src/netlink.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/netlink.c b/src/netlink.c
+index 7a5da762c739..fac2fb1eb4f3 100644
+--- a/src/netlink.c
++++ b/src/netlink.c
+@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type,
+   for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) {
+ #if HAVE_REGEX_H
+     if (i->rdevice != NULL) {
+-      if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
++      if (regexec(i->rdevice, dev, 0, NULL, 0))
+         continue;
+     } else
+ #endif
+-- 
+2.37.1
+