dns/openmdns: update to 0.6.15

No actual changes, only some port patches got merged.

5 files changed, 4 insertions, 92 deletions

diff --git a/dns/openmdns/Makefile b/dns/openmdns/Makefile
index 71c7541caa37..7b4bd651fa91 100644
--- a/dns/openmdns/Makefile
+++ b/dns/openmdns/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	openmdns
-DISTVERSION=	0.6-11
-DISTVERSIONSUFFIX=	-g2008828
-PORTREVISION=	2
+DISTVERSION=	0.6-15
+DISTVERSIONSUFFIX=	-gd76ce05
 CATEGORIES=	dns
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/dns/openmdns/distinfo b/dns/openmdns/distinfo
index 3b9a4962a9ba..189f81e57bef 100644
--- a/dns/openmdns/distinfo
+++ b/dns/openmdns/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1477685972
-SHA256 (haesbaert-mdnsd-0.6-11-g2008828_GH0.tar.gz) = 0b78ad9fc975df9b3a1258359b9ee6f81c2e0f4a47a25ac87d9a69a296cdebdc
-SIZE (haesbaert-mdnsd-0.6-11-g2008828_GH0.tar.gz) = 2935593
+SHA256 (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = bf307fbe392284b80be922ce24ad78104ecb5eabd173ced9fd12344dcce57889
+SIZE (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = 2935582
diff --git a/dns/openmdns/files/patch-mdnsd_kiface.c b/dns/openmdns/files/patch-mdnsd_kiface.c
deleted file mode 100644
index 9545f8423361..000000000000
--- a/dns/openmdns/files/patch-mdnsd_kiface.c
+++ /dev/null
@@ -1,18 +0,0 @@
-In file included from kiface.c:25:0:
-kiface.c:67:1: error: expected ';', identifier or '(' before 'void'
- RB_GENERATE(kif_tree, kif_node, entry, kif_compare)
- ^
-
---- mdnsd/kiface.c.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/kiface.c
-@@ -63,8 +63,8 @@ struct {
- 
- 
- RB_HEAD(kif_tree, kif_node) kit;
--RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare)
--RB_GENERATE(kif_tree, kif_node, entry, kif_compare)
-+RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare);
-+RB_GENERATE(kif_tree, kif_node, entry, kif_compare);
- 
- int
- kif_init(void)
diff --git a/dns/openmdns/files/patch-mdnsd_mdnsd.h b/dns/openmdns/files/patch-mdnsd_mdnsd.h
deleted file mode 100644
index ce4e88c0b8b7..000000000000
--- a/dns/openmdns/files/patch-mdnsd_mdnsd.h
+++ /dev/null
@@ -1,25 +0,0 @@
-In file included from log.c:33:
-In file included from mdnsd/log.h:24:
-In file included from mdnsd/mdnsd.h:30:
-/usr/local/include/imsg.h:31:2: error: type name requires a specifier or qualifier
-        TAILQ_ENTRY(ibuf)        entry;
-        ^
-/usr/local/include/imsg.h:31:14: error: a parameter list without types is only allowed in a function
-      definition
-        TAILQ_ENTRY(ibuf)        entry;
-                    ^
-/usr/local/include/imsg.h:31:19: error: expected ';' at end of declaration list
-        TAILQ_ENTRY(ibuf)        entry;
-                         ^
-[...]
-
---- mdnsd/mdnsd.h.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/mdnsd.h
-@@ -18,6 +18,7 @@
- #define	_MDNSD_H_
- 
- #include <sys/param.h>
-+#include <sys/queue.h>
- #include <sys/socket.h>
- #include <sys/tree.h>
- #include <sys/types.h>
diff --git a/dns/openmdns/files/patch-mdnsd_packet.c b/dns/openmdns/files/patch-mdnsd_packet.c
deleted file mode 100644
index f39f05b05603..000000000000
--- a/dns/openmdns/files/patch-mdnsd_packet.c
+++ /dev/null
@@ -1,44 +0,0 @@
-packet.c:919:22: error: passing 'u_char [64]' to parameter of type 'const char *' converts between
-      pointers to integer types with different sign [-Werror=pointer-sign]
-                if (strlcat(dname, label, MAXHOSTNAMELEN) >= MAXHOSTNAMELEN)  {
-                                   ^~~~~
-/usr/include/string.h:92:59: note: passing argument to parameter here
-size_t   strlcat(char * __restrict, const char * __restrict, size_t);
-                                                           ^
-packet.c:986:7: error: assigning to 'char *' from 'u_int8_t *' (aka 'unsigned char *') converts
-      between pointers to integer types with different sign [-Werror=pointer-sign]
-                buf = *pbuf;
-                    ^ ~~~~~
-packet.c:1025:7: error: assigning to 'char *' from 'u_int8_t *' (aka 'unsigned char *') converts
-      between pointers to integer types with different sign [-Werror=pointer-sign]
-                buf = *pbuf;
-                    ^ ~~~~~
-packet.c:1033:22: error: passing 'char *' to parameter of type 'u_int8_t *' (aka 'unsigned char *')
-      converts between pointers to integer types with different sign [-Werror=pointer-sign]
-                if (rr_parse_dname(buf, tmplen, rr->rdata.SRV.target) == -1)
-                                   ^~~
-packet.c:71:32: note: passing argument to parameter here
-int              rr_parse_dname(u_int8_t *, u_int16_t, char [MAXHOSTNAMELEN]);
-                                          ^
-4 errors generated.
-
---- mdnsd/packet.c.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/packet.c
-@@ -853,7 +853,7 @@ pkt_parse_dname(u_int8_t *buf, u_int16_t
- 	int jumped = 0;
- 	u_int16_t oldlen = len;
- 	size_t slen;
--	u_char label[MAXLABELLEN];
-+	char label[MAXLABELLEN];
- 
- 	/* be extra safe */
- 	bzero(dname, MAXHOSTNAMELEN);
-@@ -948,7 +948,7 @@ pkt_parse_rr(u_int8_t **pbuf, u_int16_t 
- 	u_int16_t us, rdlen, tmplen;
- 	u_int32_t ul;
- 	ssize_t n;
--	char *buf;
-+	u_char *buf;
- 
- 	n = pkt_parse_dname(*pbuf, *len, rr->rrs.dname);
- 	if (n == -1)