Index: head/dns/openmdns/Makefile =================================================================== --- head/dns/openmdns/Makefile (revision 434656) +++ head/dns/openmdns/Makefile (revision 434657) @@ -1,54 +1,53 @@ # $FreeBSD$ PORTNAME= openmdns -DISTVERSION= 0.6-15 -DISTVERSIONSUFFIX= -gd76ce05 -PORTREVISION= 2 +DISTVERSION= 0.6-24 +DISTVERSIONSUFFIX= -g627cc56 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/libevent \ ${LOCALBASE}/lib/libopenbsd.a:devel/libopenbsd STATIC_MAKE_ENV= NO_SHARED=1 STATIC_LIB_DEPENDS_OFF= libevent.so:devel/libevent \ 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 434656) +++ head/dns/openmdns/distinfo (revision 434657) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477685972 -SHA256 (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = bf307fbe392284b80be922ce24ad78104ecb5eabd173ced9fd12344dcce57889 -SIZE (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = 2935582 +TIMESTAMP = 1487386935 +SHA256 (haesbaert-mdnsd-0.6-24-g627cc56_GH0.tar.gz) = 3da4df8365b8f592bdf579448706b6014717d7884b97d43e4d121af00c7cb263 +SIZE (haesbaert-mdnsd-0.6-24-g627cc56_GH0.tar.gz) = 2936195 Index: head/dns/openmdns/files/patch-compat =================================================================== --- head/dns/openmdns/files/patch-compat (revision 434656) +++ head/dns/openmdns/files/patch-compat (revision 434657) @@ -1,62 +1,86 @@ ---- mdnsd/mdns.h.orig 2015-05-29 14:18:11 UTC +--- mdnsctl/mdnsctl.c.orig 2017-02-18 03:02:15 UTC ++++ mdnsctl/mdnsctl.c +@@ -67,8 +67,10 @@ main(int argc, char *argv[]) + struct mdns mdns; + struct mdns_service ms; + ++#ifdef __OpenBSD__ + if (pledge("stdio unix", NULL) == -1) + err(1, NULL); ++#endif + + /* parse options */ + if ((res = parse(argc - 1, argv + 1)) == NULL) +@@ -77,8 +79,10 @@ main(int argc, char *argv[]) + if ((sockfd = mdns_open(&mdns)) == -1) + err(1, "mdns_open"); + ++#ifdef __OpenBSD__ + if (pledge("stdio", NULL) == -1) + err(1, NULL); ++#endif + + mdns_set_lookup_A_hook(&mdns, my_lookup_A_hook); + mdns_set_lookup_PTR_hook(&mdns, my_lookup_PTR_hook); +--- mdnsd/mdns.h.orig 2017-02-18 03:02:15 UTC +++ mdnsd/mdns.h @@ -31,6 +31,37 @@ #include #include +#ifndef T_NSEC +#define T_NSEC 47 /* from OpenBSD */ +#endif + +#ifndef IFT_CARP +#define IFT_CARP 0xf8 /* from DragonFly and NetBSD */ +#endif + +#ifndef LINK_STATE_IS_UP /* from DragonFly and OpenBSD */ +#define LINK_STATE_IS_UP(_s) ((_s) >= LINK_STATE_UP) +#endif + +/* Copied from on OpenBSD */ +#ifndef timespeccmp +#define timespeccmp(tsp, usp, cmp) \ + (((tsp)->tv_sec == (usp)->tv_sec) ? \ + ((tsp)->tv_nsec cmp (usp)->tv_nsec) : \ + ((tsp)->tv_sec cmp (usp)->tv_sec)) +#endif +#ifndef timespecsub +#define timespecsub(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \ + (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \ + if ((vsp)->tv_nsec < 0) { \ + (vsp)->tv_sec--; \ + (vsp)->tv_nsec += 1000000000L; \ + } \ + } while (0) +#endif + #define MAXCHARSTR MAXHOSTNAMELEN #define MAXLABELLEN 64 #define MAXPROTOLEN 4 ---- mdnsd/mdnsd.c.orig 2015-05-29 14:18:11 UTC +--- mdnsd/mdnsd.c.orig 2017-02-18 03:02:15 UTC +++ mdnsd/mdnsd.c @@ -46,7 +46,9 @@ void fetchmyname(char [MAXHOSTNAMELEN]) void fetchhinfo(struct hinfo *); struct mdnsd_conf *conf = NULL; +#ifdef __OpenBSD__ extern char *malloc_options; +#endif __dead void usage(void) @@ -230,7 +232,9 @@ main(int argc, char *argv[]) switch (ch) { case 'd': debug = 1; +#ifdef __OpenBSD__ malloc_options = "AFGJPX"; +#endif break; case 'v': display_version();