Update to 1096.0.2

8 files changed, 120 insertions, 64 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 5244b3656e7b..763ee05d0863 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	878.260.1
+PORTVERSION=	1096.0.2
 CATEGORIES=	net dns
 MASTER_SITES=	https://opensource.apple.com/tarballs/mDNSResponder/
 
@@ -30,7 +30,7 @@ USE_RC_SUBR=	mdnsd mdnsresponderposix
 CPE_VENDOR=	apple
 CPE_PRODUCT=	${PORTNAME:tl}
 
-EXTRA_BIN=	mDNSClientPosix mDNSIdentify mDNSNetMonitor mDNSProxyResponderPosix mDNSResponderPosix
+EXTRA_BIN=	mDNSClientPosix mDNSNetMonitor mDNSProxyResponderPosix mDNSResponderPosix
 EXTRA_MAN1=	dns-sd.1
 EXTRA_MAN8=	dnsextd.8 mDNSResponderPosix.8
 EXTRA_SBIN=	dnsextd
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 5895bdde980c..6595ade1326b 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566662980
-SHA256 (mDNSResponder-878.260.1.tar.gz) = 3cc71582e8eee469c2de8ecae1d769e7f32b3468dfb7f2ca77f1dee1f30a7d1e
-SIZE (mDNSResponder-878.260.1.tar.gz) = 2590786
+TIMESTAMP = 1582222938
+SHA256 (mDNSResponder-1096.0.2.tar.gz) = 14d481b537942d7e60dcc9b57f8f80b21eb530c376a96528fff8bb0f26f2ae55
+SIZE (mDNSResponder-1096.0.2.tar.gz) = 2110853
diff --git a/net/mDNSResponder/files/patch-mDNSCore-mDNS.c b/net/mDNSResponder/files/patch-mDNSCore-mDNS.c
new file mode 100644
index 000000000000..3fe093e1ec49
--- /dev/null
+++ b/net/mDNSResponder/files/patch-mDNSCore-mDNS.c
@@ -0,0 +1,10 @@
+--- mDNSCore/mDNS.c.orig	2019-07-20 09:39:10 UTC
++++ mDNSCore/mDNS.c
+@@ -23,6 +23,7 @@
+  * routines, or types (which may or may not be present on any given platform).
+  */
+ 
++#include <stddef.h>
+ #include "DNSCommon.h"                  // Defines general DNS utility routines
+ #include "uDNS.h"                       // Defines entry points into unicast-specific routines
+ #include "nsec.h"
diff --git a/net/mDNSResponder/files/patch-mDNSPosix-Makefile b/net/mDNSResponder/files/patch-mDNSPosix-Makefile
index 7ca313b9d19f..8d970dd1166c 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix-Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix-Makefile
@@ -1,17 +1,17 @@
---- mDNSPosix/Makefile.orig	2016-04-24 15:07:24 UTC
+--- mDNSPosix/Makefile.orig	2020-01-31 03:01:55 UTC
 +++ mDNSPosix/Makefile
-@@ -54,8 +54,8 @@ COREDIR = ../mDNSCore
- SHAREDDIR ?= ../mDNSShared
- JDK = /usr/jdk
- 
--CC = @cc
--BISON = @bison
-+CC ?= @cc
-+BISON = @yacc
- FLEX = @flex
- ST = @strip
- LD = ld -shared
-@@ -121,9 +121,9 @@ else
+@@ -62,8 +62,8 @@ else ifeq ($(SYSTEM), Linux)
+   os=linux
+ endif
+ 
+-CC = cc
+-BISON = bison
++CC ?= cc
++BISON = yacc
+ FLEX = flex
+ ST = strip
+ LD = ld
+@@ -144,9 +144,9 @@ else
  
  ifeq ($(os),freebsd)
  # If not already defined, set LOCALBASE to /usr/local
@@ -24,73 +24,77 @@
  # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
  # and requires that the "-lpthread" link option NOT be used
  # This appies only to FreeBSD -- "man cc" on FreeBSD says:
-@@ -185,12 +185,7 @@ CFLAGS_OS += -DHAVE_IPV6=0
- endif
+@@ -211,11 +211,12 @@ endif
  endif
  
--# If directory /usr/share/man exists, then we install man pages into that, else /usr/man
+ # If directory /usr/share/man exists, then we install man pages into that, else /usr/man
 -ifeq ($(wildcard /usr/share/man), /usr/share/man)
 -MANPATH := /usr/share/man
 -else
 -MANPATH := /usr/man
 -endif
++#ifeq ($(wildcard /usr/share/man), /usr/share/man)
++#MANPATH := /usr/share/man
++#else
++#MANPATH := /usr/man
++#endif
 +MANPATH := $(DESTDIR)$(MAN_PATH)
  
  # If directories /etc/init.d/rc*.d exist, then we install into that (Suse)
  ifeq ($(wildcard /etc/init.d/rc2.d/), /etc/init.d/rc2.d/)
-@@ -219,7 +214,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $
+@@ -244,7 +245,7 @@ MDNSCFLAGS = $(CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_OS) $
  
- all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor $(OPTIONALTARG)
+ all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder NetMonitor $(OPTIONALTARG)
  
 -install: setup InstalledStartup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
 +install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
  
  # 'setup' sets up the build directory structure the way we want
  setup:
-@@ -259,13 +254,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$
+@@ -286,13 +287,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
  CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
  
  $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
--	@$(LD) $(LINKOPTS) -o $@ $+
-+	@$(CC) $(LINKOPTS) -shared -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+
- 	@$(STRIP) $@
+-	$(LD) $(SOOPTS) $(LINKOPTS) -o $@ $+
++	$(CC) $(SOOPTS) $(LINKOPTS) -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+
+ 	$(STRIP) $@
  
 -Clients: setup libdns_sd ../Clients/build/dns-sd
-+Clients: ../Clients/build/dns-sd
++Clients: setup ../Clients/build/dns-sd
  	@echo "Clients done"
  
--../Clients/build/dns-sd:
-+../Clients/build/dns-sd: setup libdns_sd
- 	@$(MAKE) -C ../Clients
+-../Clients/build/dns-sd: ../Clients/dns-sd.c
++../Clients/build/dns-sd: setup libdns_sd ../Clients/dns-sd.c
+ 	$(MAKE) -C ../Clients DEBUG=$(DEBUG) SUPMAKE_CFLAGS="$(MDNSCFLAGS)"
  
  # nss_mdns target builds the Name Service Switch module
-@@ -273,7 +268,7 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE
+@@ -300,7 +301,7 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
  	@echo "Name Service Switch module done"
  
  $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
--	@$(LD) $(LINKOPTS) -o $@ $+
-+	@$(CC) $(LINKOPTS) -shared -Wl,-soname=$(NSSLINKNAME) -o $@ $+
- 	@$(STRIP) $@
+-	$(LD) $(SOOPTS) $(LINKOPTS) -o $@ $+
++	$(CC) $(SOOPTS) $(LINKOPTS) -Wl,-soname=$(NSSLINKNAME) -o $@ $+
+ 	$(STRIP) $@
  
  #############################################################################
-@@ -298,14 +293,12 @@ InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNA
+@@ -325,14 +326,12 @@ InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_m
  	@echo $+ " installed"
  
  # Note: If daemon already installed, we make sure it's stopped before overwriting it
 -$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
--	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
+-	if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
 +$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
  	$(CP) $< $@
--	@$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) start
+-	$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) start
  
  $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
  	$(CP) $< $@
 -	$(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
 +	$(LN) $(notdir $@) $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
  ifdef LDCONFIG
-     # -m means 'merge into existing database', -R means 'rescan directories'
+ 	# -m means 'merge into existing database', -R means 'rescan directories'
  	$(LDCONFIG) -mR
-@@ -338,7 +331,7 @@ $(MANPATH)/man8/%.8: %.8
+@@ -365,7 +364,7 @@ $(MANPATH)/man8/%.8: %.8
  	cp $< $@
  	chmod 444 $@
  
@@ -99,12 +103,12 @@
  	cp $< $@
  	chmod 444 $@
  
-@@ -491,6 +484,8 @@ $(OBJDIR)/NetMonitor.c.o:            $(C
+@@ -509,6 +508,8 @@ $(OBJDIR)/NetMonitor.c.o:            $(COREDIR)/mDNS.c
+ 
  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
- 
-+$(OBJDIR)/dnsextd_lexer.l.o:         $(OBJDIR)/dnsextd_parser.y.o
 +
++$(OBJDIR)/dnsextd_lexer.l.o:         $(OBJDIR)/dnsextd_parser.y.o
+ 
  #############################################################################
  
- # Implicit rules
diff --git a/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c b/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c
index 432f0e33ed43..63f5f505ab66 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c
+++ b/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c
@@ -1,6 +1,6 @@
---- mDNSPosix/mDNSPosix.c.orig	2017-04-20 05:25:37 UTC
+--- mDNSPosix/mDNSPosix.c.orig	2019-06-27 09:29:40 UTC
 +++ mDNSPosix/mDNSPosix.c
-@@ -648,7 +648,7 @@ mDNSlocal int SetupSocket(struct sockadd
+@@ -971,7 +971,7 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, m
          // to bind to the socket. Our suggestion was to switch the order in which
          // SO_REUSEPORT and SO_REUSEADDR was tested so that SO_REUSEADDR stays on
          // top and SO_REUSEPORT to be used only if SO_REUSEADDR doesn't exist.
@@ -9,22 +9,23 @@
          err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
          #elif defined(SO_REUSEPORT)
          err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEPORT, &kOn, sizeof(kOn));
-@@ -749,7 +749,13 @@ mDNSlocal int SetupSocket(struct sockadd
+@@ -1074,16 +1074,28 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, m
      {
          struct ipv6_mreq imr6;
          struct sockaddr_in6 bindAddr6;
 -    #if defined(IPV6_PKTINFO)
 +    #if defined(IPV6_RECVPKTINFO)
-+        if (err == 0)
-+        {
+         if (err == 0)
+         {
 +            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
 +            if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
 +        }
 +    #elif defined(IPV6_PKTINFO)
-         if (err == 0)
-         {
++        if (err == 0)
++        {
              err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn));
-@@ -758,7 +764,13 @@ mDNSlocal int SetupSocket(struct sockadd
+             if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); }
+         }
      #else
          #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
      #endif
diff --git a/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c b/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c
deleted file mode 100644
index 123069f42921..000000000000
--- a/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mDNSPosix/mDNSUNP.c.orig	2018-06-05 21:34:11 UTC
-+++ mDNSPosix/mDNSUNP.c
-@@ -460,6 +460,8 @@ struct ifi_info *get_ifi_info(int family
-                     ifi->ifi_netmask = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in6));
-                     if (ifi->ifi_netmask == NULL) goto gotError;
-                     sinptr6 = (struct sockaddr_in6 *) &ifr6.ifr_ifru.ifru_addr;
-+                    /* SIOCGIFNETMASK_IN6 does not always set sin6_family */
-+                    sinptr6->sin6_family = AF_INET6;
-                     memcpy(ifi->ifi_netmask, sinptr6, sizeof(struct sockaddr_in6));
-                 }
- #endif
diff --git a/net/mDNSResponder/files/patch-mDNSShared-PlatformCommon.c b/net/mDNSResponder/files/patch-mDNSShared-PlatformCommon.c
new file mode 100644
index 000000000000..eccf1e2212b5
--- /dev/null
+++ b/net/mDNSResponder/files/patch-mDNSShared-PlatformCommon.c
@@ -0,0 +1,53 @@
+--- mDNSShared/PlatformCommon.c.orig	2019-06-27 09:29:40 UTC
++++ mDNSShared/PlatformCommon.c
+@@ -335,7 +335,9 @@ mDNSexport mDNSBool mDNSPosixTCPSocketSetup(int *fd, m
+     int sa_family = (addrType == mDNSAddrType_IPv4) ? AF_INET : AF_INET6;
+     int err;
+     int sock;
++#if !defined(TARGET_OS_FREEBSD)
+     mDNSu32 lowWater = 15384;
++#endif
+ 
+     sock = socket(sa_family, SOCK_STREAM, IPPROTO_TCP);
+     if (sock < 3)
+@@ -398,12 +400,14 @@ mDNSexport mDNSBool mDNSPosixTCPSocketSetup(int *fd, m
+     if (port)
+         port->NotAnInteger = outTcpPort->NotAnInteger;
+ 
++#if !defined(TARGET_OS_FREEBSD)
+     err = setsockopt(sock, IPPROTO_TCP, TCP_NOTSENT_LOWAT, &lowWater, sizeof lowWater);
+     if (err < 0)
+     {
+         LogMsg("mDNSPosixTCPSocketSetup: TCP_NOTSENT_LOWAT failed: %s", strerror(errno));
+         return mDNSfalse;
+     }
++#endif
+ 
+     return mDNStrue;
+ }
+@@ -426,7 +430,9 @@ mDNSexport TCPSocket *mDNSPosixDoTCPListenCallback(int
+     int failed;
+     char *nbp;
+     int i;
++#if !defined(TARGET_OS_FREEBSD)
+     mDNSu32 lowWater = 16384;
++#endif
+     // When we remember our connection, we remember a name that we can print for logging.   But
+     // since we are the listener in this case, we don't /have/ a name for it.   This buffer
+     // is used to print the IP address into a human readable string which will serve that purpose
+@@ -448,6 +454,7 @@ mDNSexport TCPSocket *mDNSPosixDoTCPListenCallback(int
+         goto out;
+     }
+ 
++#if !defined(TARGET_OS_FREEBSD)
+     failed = setsockopt(remoteSock, IPPROTO_TCP, TCP_NOTSENT_LOWAT,
+                         &lowWater, sizeof lowWater);
+     if (failed < 0)
+@@ -456,6 +463,7 @@ mDNSexport TCPSocket *mDNSPosixDoTCPListenCallback(int
+         LogMsg("mDNSPosixDoTCPListenCallback: TCP_NOTSENT_LOWAT returned %d", errno);
+         goto out;
+     }
++#endif
+     
+     if (address.sa.sa_family == AF_INET6)
+     {
diff --git a/net/mDNSResponder/pkg-plist b/net/mDNSResponder/pkg-plist
index cffc76ff8b69..c271ced5f50f 100644
--- a/net/mDNSResponder/pkg-plist
+++ b/net/mDNSResponder/pkg-plist
@@ -1,6 +1,5 @@
 bin/dns-sd
 bin/mDNSClientPosix
-bin/mDNSIdentify
 bin/mDNSNetMonitor
 bin/mDNSProxyResponderPosix
 bin/mDNSResponderPosix