Index: head/dns/openmdns/Makefile =================================================================== --- head/dns/openmdns/Makefile (revision 428007) +++ head/dns/openmdns/Makefile (revision 428008) @@ -1,54 +1,53 @@ # $FreeBSD$ PORTNAME= openmdns -DISTVERSION= 0.6-11 -DISTVERSIONSUFFIX= -g2008828 -PORTREVISION= 2 +DISTVERSION= 0.6-15 +DISTVERSIONSUFFIX= -gd76ce05 CATEGORIES= dns MAINTAINER= jbeich@FreeBSD.org COMMENT= Multicast DNS and Service Discovery daemon LICENSE= ISCL USE_GITHUB= yes GH_ACCOUNT= haesbaert GH_PROJECT= mdnsd CONFLICTS_INSTALL= mDNSResponder # sbin/mdnsd USES= localbase uidfix USE_RC_SUBR= mdnsd MAKE_ENV= LDADD="${LIBS}" MAKE_ARGS= BINDIR="${PREFIX}/sbin" \ MANDIR="${PREFIX}/man/man" CFLAGS+= -D__dead=__dead2 LDFLAGS+= -Wl,--as-needed # -lutil LIBS+= -lopenbsd SUB_LIST= COMMENT="${COMMENT}" PLIST_FILES= sbin/mdnsctl \ sbin/mdnsd \ man/man8/mdnsctl.8.gz \ man/man8/mdnsd.8.gz PORTDOCS= * USERS= _mdnsd GROUPS= _mdnsd OPTIONS_DEFINE= DOCS STATIC STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:devel/libevent2 \ ${LOCALBASE}/lib/libopenbsd.a:devel/libopenbsd STATIC_MAKE_ENV= NO_SHARED=1 STATIC_LIB_DEPENDS_OFF= libevent.so:devel/libevent2 \ libopenbsd.so:devel/libopenbsd post-patch: # warning: duplicate script for target "maninstall" ignored @${REINPLACE_CMD} '/bsd\.man\.mk/d' ${WRKSRC}/*/Makefile post-install-DOCS-on: (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/dns/openmdns/distinfo =================================================================== --- head/dns/openmdns/distinfo (revision 428007) +++ head/dns/openmdns/distinfo (revision 428008) @@ -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 Index: head/dns/openmdns/files/patch-mdnsd_kiface.c =================================================================== --- head/dns/openmdns/files/patch-mdnsd_kiface.c (revision 428007) +++ head/dns/openmdns/files/patch-mdnsd_kiface.c (nonexistent) @@ -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) Property changes on: head/dns/openmdns/files/patch-mdnsd_kiface.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/openmdns/files/patch-mdnsd_packet.c =================================================================== --- head/dns/openmdns/files/patch-mdnsd_packet.c (revision 428007) +++ head/dns/openmdns/files/patch-mdnsd_packet.c (nonexistent) @@ -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) Property changes on: head/dns/openmdns/files/patch-mdnsd_packet.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/openmdns/files/patch-mdnsd_mdnsd.h =================================================================== --- head/dns/openmdns/files/patch-mdnsd_mdnsd.h (revision 428007) +++ head/dns/openmdns/files/patch-mdnsd_mdnsd.h (nonexistent) @@ -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 -+#include - #include - #include - #include Property changes on: head/dns/openmdns/files/patch-mdnsd_mdnsd.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property