collectd: rename patches in preparation for 5.11.0 update

[Edgar Fuß <ef%math.uni-bonn.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Fri Jul 17 19:35:31 2020 +0200
Changeset:	c74c76b782a685f4fa057c84f6ca70a962787868

Added Files:
	collectd/patches/patch-src_utils_dns_dns.c
	collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
Removed Files:
	collectd/patches/patch-src_utils__dns.c
	collectd/patches/patch-src_utils__format__kairosdb.c

Log Message:
collectd: rename patches in preparation for 5.11.0 update

In preparation for updating collectd to 5.11.0, rename two patches where the corresponding files have moved upstream.
No change to patch contents or distinfo yet (leaving the package in a broken state).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c74c76b782a685f4fa057c84f6ca70a962787868

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 collectd/patches/patch-src_utils__dns.c               | 19 -------------------
 collectd/patches/patch-src_utils__format__kairosdb.c  | 19 -------------------
 collectd/patches/patch-src_utils_dns_dns.c            | 19 +++++++++++++++++++
 ...atch-src_utils_format__kairosdb_format__kairosdb.c | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 38 deletions(-)

diffs:
diff --git a/collectd/patches/patch-src_utils__dns.c b/collectd/patches/patch-src_utils__dns.c
deleted file mode 100644
index 8643e9c3bd..0000000000
--- a/collectd/patches/patch-src_utils__dns.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_utils__dns.c,v 1.3 2020/02/03 09:12:32 triaxx Exp $
-
-Resolve conflict with pkgsrc PCAP on NetBSD 7 and 8.
-
---- src/utils_dns.c.orig	2017-11-18 09:03:27.370749644 +0000
-+++ src/utils_dns.c
-@@ -91,6 +91,12 @@
- #endif
- 
- #if HAVE_PCAP_H
-+# if defined(DLT_MATCHING_MAX)
-+#  undef DLT_MATCHING_MAX
-+# endif
-+# if defined(DLT_IEEE802_15_4)
-+#  undef DLT_IEEE802_15_4
-+# endif
- #include <pcap.h>
- #endif
- 
diff --git a/collectd/patches/patch-src_utils__format__kairosdb.c b/collectd/patches/patch-src_utils__format__kairosdb.c
deleted file mode 100644
index a1d8eec823..0000000000
--- a/collectd/patches/patch-src_utils__format__kairosdb.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_utils__format__kairosdb.c,v 1.4 2017/01/19 17:20:42 he Exp $
-
-Cast arguments to isalnum() and tolower() to "unsigned char" to
-squelch warnings.
-
---- src/utils_format_kairosdb.c.orig	2016-11-30 08:52:01.000000000 +0000
-+++ src/utils_format_kairosdb.c
-@@ -80,9 +80,9 @@ static int kairosdb_escape_string(char *
-   /* authorize -_. and alpha num but also escapes " */
-   BUFFER_ADD('"');
-   for (size_t src_pos = 0; string[src_pos] != 0; src_pos++) {
--    if (isalnum(string[src_pos]) || 0x2d == string[src_pos] ||
-+    if (isalnum((unsigned char)string[src_pos]) || 0x2d == string[src_pos] ||
-         0x2e == string[src_pos] || 0x5f == string[src_pos])
--      BUFFER_ADD(tolower(string[src_pos]));
-+      BUFFER_ADD(tolower((unsigned char)string[src_pos]));
-   } /* for */
-   BUFFER_ADD('"');
-   buffer[dst_pos] = 0;
diff --git a/collectd/patches/patch-src_utils_dns_dns.c b/collectd/patches/patch-src_utils_dns_dns.c
new file mode 100644
index 0000000000..8643e9c3bd
--- /dev/null
+++ b/collectd/patches/patch-src_utils_dns_dns.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_utils__dns.c,v 1.3 2020/02/03 09:12:32 triaxx Exp $
+
+Resolve conflict with pkgsrc PCAP on NetBSD 7 and 8.
+
+--- src/utils_dns.c.orig	2017-11-18 09:03:27.370749644 +0000
++++ src/utils_dns.c
+@@ -91,6 +91,12 @@
+ #endif
+ 
+ #if HAVE_PCAP_H
++# if defined(DLT_MATCHING_MAX)
++#  undef DLT_MATCHING_MAX
++# endif
++# if defined(DLT_IEEE802_15_4)
++#  undef DLT_IEEE802_15_4
++# endif
+ #include <pcap.h>
+ #endif
+ 
diff --git a/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c b/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
new file mode 100644
index 0000000000..a1d8eec823
--- /dev/null
+++ b/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_utils__format__kairosdb.c,v 1.4 2017/01/19 17:20:42 he Exp $
+
+Cast arguments to isalnum() and tolower() to "unsigned char" to
+squelch warnings.
+
+--- src/utils_format_kairosdb.c.orig	2016-11-30 08:52:01.000000000 +0000
++++ src/utils_format_kairosdb.c
+@@ -80,9 +80,9 @@ static int kairosdb_escape_string(char *
+   /* authorize -_. and alpha num but also escapes " */
+   BUFFER_ADD('"');
+   for (size_t src_pos = 0; string[src_pos] != 0; src_pos++) {
+-    if (isalnum(string[src_pos]) || 0x2d == string[src_pos] ||
++    if (isalnum((unsigned char)string[src_pos]) || 0x2d == string[src_pos] ||
+         0x2e == string[src_pos] || 0x5f == string[src_pos])
+-      BUFFER_ADD(tolower(string[src_pos]));
++      BUFFER_ADD(tolower((unsigned char)string[src_pos]));
+   } /* for */
+   BUFFER_ADD('"');
+   buffer[dst_pos] = 0;